Merge pull request '产线修改' (#247) from fix_scheduler into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/247
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>

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

@@ -353,7 +353,7 @@ func (impl *WorkOrderDAOImplement) SelectStartedTasks(startTime time.Time, endTi
 	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_WorkOrder.ProjectId = ? and OM_WorkOrderStatus.Status >= ? and OM_WorkOrder.WorkOrderId = ? and ((OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?) or (OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?))", impl.plantNr, common.ProjectId, common.WO_STATUS_INTERRUPT, workLineid, 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.PlanResourceId = ? and ((OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?) or (OM_WorkOrder.ActStartTime >= ? and OM_WorkOrder.ActEndTime < ?))", impl.plantNr, common.ProjectId, common.WO_STATUS_INTERRUPT, workLineid, startData, endData, startData, endData).Find(&vdatalst); err != nil {
 		return
 	}
 	fmt.Println(vdatalst)
@@ -385,7 +385,7 @@ func (impl *WorkOrderDAOImplement) SelectPlannedTasks(startTime time.Time, endTi
 	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_WorkOrder.ProjectId = ? and OM_WorkOrderStatus.Status >= ? and OM_WorkOrderStatus.Status < ? and OM_WorkOrder.WorkOrderId = ? 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, workLineid, 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.PlanResourceId = ? 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, workLineid, startData, endData, startData, endData).Find(&vdatalst); err != nil {
 		return
 	}
 	datalst = make([]model.WorkOrder, 0)
@@ -415,7 +415,7 @@ func (impl *WorkOrderDAOImplement) SelectUnPlannedTasks(workLineid string) (data
 	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.ProjectId = ? and OM_WorkOrder.WorkOrderId = ? ", impl.plantNr, common.WO_STATUS_UNPLANNED, common.ProjectId, workLineid).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 = ? and OM_WorkOrder.PlanResourceId = ? ", impl.plantNr, common.WO_STATUS_UNPLANNED, common.ProjectId, workLineid).Find(&vdatalst); err != nil {
 		return
 	}
 	datalst = make([]model.WorkOrder, 0)