条件查询项目为G-FRAME

dao/om/implments/WorkOrder.dao.impl.go

@@ -353,7 +353,7 @@ func (impl *WorkOrderDAOImplement) SelectStartedTasks(startTime, endTime time.Ti
 	session := impl.session.Table(impl.meta.TableName)
 	if err = session.Join("INNER", "OM_WorkOrderStatus",
 		"OM_WorkOrderStatus.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderStatus.WorkOrderId = OM_WorkOrder.WorkOrderId").Join("INNER", "OM_WorkOrderQty",
-		"OM_WorkOrderQty.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderQty.WorkOrderId = OM_WorkOrder.WorkOrderId").Where("OM_WorkOrder.PlantNr = ? and OM_WorkOrderStatus.Status >= ? and ((OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?) or (OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?))", impl.plantNr, common.WO_STATUS_INTERRUPT, startData,  endData, startData,endData).Find(&vdatalst); err != nil {
+		"OM_WorkOrderQty.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderQty.WorkOrderId = OM_WorkOrder.WorkOrderId").Where("OM_WorkOrder.PlantNr = ? and OM_WorkOrder.ProjectId = ? and OM_WorkOrderStatus.Status >= ? and ((OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?) or (OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?))", impl.plantNr,common.ProjectId, common.WO_STATUS_INTERRUPT, startData,  endData, startData,endData).Find(&vdatalst); err != nil {
 		return
 	}
 	fmt.Println(vdatalst)
@@ -385,7 +385,7 @@ func (impl *WorkOrderDAOImplement) SelectPlannedTasks(startTime, endTime time.Ti
 	session := impl.session.Table(impl.meta.TableName)
 	if err = session.Join("INNER", "OM_WorkOrderStatus",
 		"OM_WorkOrderStatus.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderStatus.WorkOrderId = OM_WorkOrder.WorkOrderId").Join("INNER", "OM_WorkOrderQty",
-		"OM_WorkOrderQty.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderQty.WorkOrderId = OM_WorkOrder.WorkOrderId").Where("OM_WorkOrder.PlantNr = ? and OM_WorkOrderStatus.Status >= ? and OM_WorkOrderStatus.Status < ? and ((OM_WorkOrder.PlanStartTime >= ? and OM_WorkOrder.PlanStartTime < ?) or (OM_WorkOrder.PlanEndTime >= ? and OM_WorkOrder.PlanEndTime < ?))", impl.plantNr, common.WO_STATUS_PLANNED, common.WO_STATUS_INTERRUPT, startData, endData, startData, endData).Find(&vdatalst); err != nil {
+		"OM_WorkOrderQty.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderQty.WorkOrderId = OM_WorkOrder.WorkOrderId").Where("OM_WorkOrder.PlantNr = ? and OM_WorkOrder.ProjectId = ? and OM_WorkOrderStatus.Status >= ? and OM_WorkOrderStatus.Status < ? and ((OM_WorkOrder.PlanStartTime >= ? and OM_WorkOrder.PlanStartTime < ?) or (OM_WorkOrder.PlanEndTime >= ? and OM_WorkOrder.PlanEndTime < ?))", impl.plantNr,common.ProjectId, common.WO_STATUS_PLANNED, common.WO_STATUS_INTERRUPT, startData, endData, startData, endData).Find(&vdatalst); err != nil {
 		return
 	}
 	datalst = make([]model.WorkOrder, 0)
@@ -415,7 +415,7 @@ func (impl *WorkOrderDAOImplement) SelectUnPlannedTasks() (datalst []model.WorkO
 	session := impl.session.Table(impl.meta.TableName)
 	if err = session.Join("INNER", "OM_WorkOrderStatus",
 		"OM_WorkOrderStatus.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderStatus.WorkOrderId = OM_WorkOrder.WorkOrderId").Join("INNER", "OM_WorkOrderQty",
-		"OM_WorkOrderQty.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderQty.WorkOrderId = OM_WorkOrder.WorkOrderId").Where("OM_WorkOrder.PlantNr = ? and OM_WorkOrderStatus.Status = ?", impl.plantNr, common.WO_STATUS_UNPLANNED).Find(&vdatalst); err != nil {
+		"OM_WorkOrderQty.PlantNr = OM_WorkOrder.PlantNr and OM_WorkOrderQty.WorkOrderId = OM_WorkOrder.WorkOrderId").Where("OM_WorkOrder.PlantNr = ? and OM_WorkOrderStatus.Status = ? and OM_WorkOrder.ProjectId = ?", impl.plantNr, common.WO_STATUS_UNPLANNED,common.ProjectId).Find(&vdatalst); err != nil {
 		return
 	}
 	datalst = make([]model.WorkOrder, 0)

models/base/Const.go

@@ -4,6 +4,8 @@ package base
 const (
 	PlantNr = 100
 
+	ProjectId = "G-FRAME"
+
 	ORDER_STATUS_UNPLANED = 10 // 未计划
 	ORDER_STATUS_PLANNED  = 20 // 已计划
 	ORDER_STATUS_RELEASED = 26 // 已下达