From 2ba44c4a74840e94c24ff6dad2e2896ffcff7872 Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Wed, 28 Jul 2021 16:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=A8=8Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/om/implments/WorkOrder.dao.impl.go | 7 ++++--- services/schedule/Scheduler.Ctrl.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dao/om/implments/WorkOrder.dao.impl.go b/dao/om/implments/WorkOrder.dao.impl.go index 5a688cd..525fccc 100644 --- a/dao/om/implments/WorkOrder.dao.impl.go +++ b/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 -} \ No newline at end of file +} diff --git a/services/schedule/Scheduler.Ctrl.go b/services/schedule/Scheduler.Ctrl.go index b688911..a0277eb 100644 --- a/services/schedule/Scheduler.Ctrl.go +++ b/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()