From 0942ab515cabac249e6f66d04d02946267c81a25 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Tue, 18 May 2021 18:39:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4projectid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/om/implments/WorkOrder.dao.impl.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dao/om/implments/WorkOrder.dao.impl.go b/dao/om/implments/WorkOrder.dao.impl.go index 628f2f0..c199d11 100644 --- a/dao/om/implments/WorkOrder.dao.impl.go +++ b/dao/om/implments/WorkOrder.dao.impl.go @@ -558,8 +558,12 @@ 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 = ?", meta.WorkOrder_PlantNr.ColumnName, meta.WorkOrder_PlanResourceId.ColumnName, meta.WorkOrderStatus_Status.ColumnName) - err := session.Where(where, impl.plantNr, workLineId, common.WO_STATUS_LOCKED).Asc(meta.WorkOrder_PlanStartTime.ColumnName).Find(&data) + where := fmt.Sprintf("%s = ? and %s = ? and %s = ? and %s = ?", + meta.WorkOrder_PlantNr.ColumnName, + meta.WorkOrder_PlanResourceId.ColumnName, + meta.WorkOrderStatus_Status.ColumnName, + meta.WorkOrder_ProjectId.ColumnName) + err := session.Where(where, impl.plantNr, workLineId, common.WO_STATUS_LOCKED, common.ProjectId).Asc(meta.WorkOrder_PlanStartTime.ColumnName).Find(&data) if err != nil { return nil, err }