From 37d56f39a3831f5ca6ed873bc1c42f02865cbbf3 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 26 Aug 2021 11:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89ProjectiD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/om/implments/WorkOrder.dao.impl.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dao/om/implments/WorkOrder.dao.impl.go b/dao/om/implments/WorkOrder.dao.impl.go index 0c63795..0f076a6 100644 --- a/dao/om/implments/WorkOrder.dao.impl.go +++ b/dao/om/implments/WorkOrder.dao.impl.go @@ -609,14 +609,13 @@ func (impl *WorkOrderDAOImplement) SelectLockWorkOrder(workLineId string) ([]mod meta.WorkOrderQty_WorkOrderId.ColumnName) session = session.Join("LEFT", meta.WorkOrderStatus.TableName, statusCondition) session = session.Join("LEFT", meta.WorkOrderQty.TableName, qtyCondition) - where := fmt.Sprintf("%s = ? and %s = ? and %s = ? and (%s = ? or %s = ? or %s = ?)", + where := fmt.Sprintf("%s = ? and %s = ? and (%s = ? or %s = ? or %s = ?)", meta.WorkOrder_PlantNr.ColumnName, meta.WorkOrder_PlanResourceId.ColumnName, - meta.WorkOrder_ProjectId.ColumnName, meta.WorkOrderStatus_Status.ColumnName, meta.WorkOrderStatus_Status.ColumnName, meta.WorkOrderStatus_Status.ColumnName) - err := session.Where(where, impl.plantNr, workLineId, common.ProjectId, common.WO_STATUS_LOCKED, common.WO_STATUS_RELEASED, common.WO_STATUS_RUNNING).Asc(meta.WorkOrder_PlanStartTime.ColumnName).Find(&data) + err := session.Where(where, impl.plantNr, workLineId, common.WO_STATUS_LOCKED, common.WO_STATUS_RELEASED, common.WO_STATUS_RUNNING).Asc(meta.WorkOrder_PlanStartTime.ColumnName).Find(&data) if err != nil { return nil, err }