Merge pull request '排程bug修复' (#400) from fix_scheduler into develop

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

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

@@ -356,7 +356,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.PlanResourceId = ? and ((OM_WorkOrder.PlanStartTime >= ? and OM_WorkOrder.PlanStartTime < ?) or (OM_WorkOrder.PlanEndTime >= ? and OM_WorkOrder.PlanEndTime < ?))", impl.plantNr, common.ProjectId, common.WO_STATUS_LOCKED, workLineid, startData, endData, startData, endData).Asc("OM_WorkOrder.PlanStartDate").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_RUNNING, common.WO_STATUS_LOCKED, workLineid, startData, endData, startData, endData).Asc("OM_WorkOrder.PlanStartDate").Find(&vdatalst); err != nil {
 		return
 	}
 	datalst = make([]model.WorkOrder, 0)
@@ -387,7 +387,7 @@ func (impl *WorkOrderDAOImplement) SelectLockedTasks(startTime time.Time, endTim
 	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.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, workLineid, startData, endData, startData, endData).Asc("OM_WorkOrder.PlanStartDate").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.PlanStartTime >= ? and OM_WorkOrder.PlanStartTime < ?) or (OM_WorkOrder.PlanEndTime >= ? and OM_WorkOrder.PlanEndTime < ?))", impl.plantNr, common.ProjectId, common.WO_STATUS_PLANNED, workLineid, startData, endData, startData, endData).Asc("OM_WorkOrder.PlanStartDate").Find(&vdatalst); err != nil {
 		return
 	}
 	datalst = make([]model.WorkOrder, 0)
@@ -589,6 +589,7 @@ func (impl *WorkOrderDAOImplement) SelectByPage(projectId, artId, start, end, wo
 	}
 	return grmi.PagingResult{Records: data, Count: count, PageNumber: int64(pageIndex), PageSize: int64(pageSize)}, nil
 }
+
 /******************************************************************************
  *
  * @Reference LAPP_GAAS_GFrame_BACKEND/dao/om/WorkOrderDAO.SelectLockWorkOrder
@@ -710,4 +711,4 @@ func (impl *WorkOrderDAOImplement) ClearOldData(end string) (err error) {
 		return err
 	}
 	return nil
-}
+}

services/schedule/Scheduler.Ctrl.go

@@ -202,7 +202,7 @@ func (schedsrv *SchedulerSrv) LoadSchedTaskData(worklineid string) (err error) {
 	schedsrv.PlannedTaskArray = []TaskSrv{}
 	schedsrv.UnPlannedTaskArray = []TaskSrv{}
 	// 加载调度任务数据
-	// 1. 按实际开始时间先后加载状态 >= 24已开始的任务
+	// 1. 按实际开始时间先后加载状态 >= 24 and <=40已开始的任务
 
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()