完善生成序列工单的业务逻辑

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,