From 908355b47d7be47fee424dbf1775385695c92f0d Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Wed, 28 Jul 2021 17:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/om/implments/WorkOrder.dao.impl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dao/om/implments/WorkOrder.dao.impl.go b/dao/om/implments/WorkOrder.dao.impl.go index 525fccc..114833b 100644 --- a/dao/om/implments/WorkOrder.dao.impl.go +++ b/dao/om/implments/WorkOrder.dao.impl.go @@ -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)