From a30a61a2d537cd090eb5ec7c52f0751056f4d3e7 Mon Sep 17 00:00:00 2001
From: zhangxin <Xin.zhang@le-it.com.cn>
Date: Wed, 28 Jul 2021 15:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=9F=E6=88=90=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=B7=A5=E5=8D=95=E7=9A=84=E4=B8=9A=E5=8A=A1=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/om/implments/WorkOrder.service.impl.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/om/implments/WorkOrder.service.impl.go b/services/om/implments/WorkOrder.service.impl.go
index 43d3428..c515949 100644
--- a/services/om/implments/WorkOrder.service.impl.go
+++ b/services/om/implments/WorkOrder.service.impl.go
@@ -1081,14 +1081,13 @@ func (impl *WorkOrderServiceImplement) LockWorkOrder(user *models.Usertab, workO
 			processPos := 1
 			opPos := 1
 			for _, op := range opLi {
-				if PO == 0 {
-					PO = op.Process.PO
-				}
 				if PO != op.Process.PO {
+					PO = op.Process.PO
 					serialOrderWorkPlace := model.SerialOrderPOLst{
 						SerialOrderId: serialOrderStatus.SerialOrderId,
 						PO:            PO,
 						Pos:           processPos,
+						Status: baseModel.WO_STATUS_LOCKED,
 					}
 					err = PODao.InsertOne(&serialOrderWorkPlace)
 					if err != nil {
@@ -1096,7 +1095,7 @@ func (impl *WorkOrderServiceImplement) LockWorkOrder(user *models.Usertab, workO
 						return nil, grmi.NewBusinessError("插入serialOrder工序数据失败,error:" + err.Error())
 					}
 					processPos++
-					PO = 0
+
 				}
 				serialOrderStep := model.SerialOrderStepLst{
 					PO:            op.Process.PO,
@@ -1108,7 +1107,9 @@ func (impl *WorkOrderServiceImplement) LockWorkOrder(user *models.Usertab, workO
 					AttrCode:      op.ArticleAtcodLst.AttrCode,
 					AttrValue:     op.ArticleAtcodLst.AttrValue,
 					StepType:      op.StepType.StepTypeName,
+					Status: baseModel.WO_STATUS_LOCKED,
 				}
+				opPos++
 				err = stepDao.InsertOne(&serialOrderStep)
 				if err != nil {
 					_ = session.Rollback()
@@ -1175,6 +1176,7 @@ func (impl *WorkOrderServiceImplement) LockWorkOrder(user *models.Usertab, workO
 							Pos:           pos,
 							StepNo: serialOrderStep.StepNo,
 							StepType:      model.STEP_CHECK_RULE,
+							Status: baseModel.WO_STATUS_LOCKED,
 							// 扫码校验 AttriCodeDesc
 							CharPara1: rule.AttriCodeDesc,
 							// 扫码校验 SubObject
@@ -1210,6 +1212,7 @@ func (impl *WorkOrderServiceImplement) LockWorkOrder(user *models.Usertab, workO
 							SubArtId:      serialOrderStep.SubArtId,
 							Pos:           pos,
 							StepType:      model.STEP_OPC_RULE,
+							Status: baseModel.WO_STATUS_LOCKED,
 							StepNo: serialOrderStep.StepNo,
 							// OPC STEP DESC
 							CharPara1: opc.OPCComRule.StepDesc,