Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND into feature_xml

dao/base/implments/Operation.dao.impl.go

@@ -310,9 +310,19 @@ func (impl *OperationDAOImplement) GetOperationRelData(artIdLi []string, workLin
 	where := fmt.Sprintf("%s = ? and %s = ? and %s = ?", meta.Operation_PlantNr.ColumnName, meta.Process_WorkLineId.ColumnName, meta.Operation_ActivateInStation.ColumnName)
 	data := make([]model.OperationRelData, 0)
 	POCondition := fmt.Sprintf("%s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.Process_PlantNr.ColumnName, meta.Operation_PO.ColumnName, meta.Process_PO.ColumnName)
-	artCondition := fmt.Sprintf("%s = %s and %s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.ArticleAtcodLst_PlantNr.ColumnName, meta.Operation_AttrCode.ColumnName, meta.Operation_AttrCode.ColumnName, meta.Operation_AttrValue.ColumnName, meta.ArticleAtcodLst_AttrValue.ColumnName)
+	artCondition := fmt.Sprintf("%s = %s and %s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.ArticleAtcodLst_PlantNr.ColumnName, meta.Operation_AttrCode.ColumnName, meta.ArticleAtcodLst_AttrCode.ColumnName, meta.Operation_AttrValue.ColumnName, meta.ArticleAtcodLst_AttrValue.ColumnName)
 	//stepCondition := fmt.Sprintf("%s = %s and %s = %s", meta.Operation_PlantNr.ColumnName, meta.StepType_PlantNr.ColumnName, meta.Operation_StepType.ColumnName, meta.StepType_StepTypeName.ColumnName)
 	session := impl.session.Table(impl.meta.TableName).Join("LEFT", meta.Process.TableName, POCondition).Join("LEFT", meta.ArticleAtcodLst.TableName, artCondition)
-	err := session.Where(where, impl.plantNr, workLineId, 1).In(meta.ArticleAtcodLst_ArtId.ColumnName, artIdLi).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data)
+	artIdStr := ""
+	for index, artId := range artIdLi {
+		if index != 0 {
+			artIdStr += ", "
+			artIdStr += artId
+		}
+		artIdStr += artId
+	}
+	where += fmt.Sprintf(" and ( %s in (%s) or %s = ?) ", meta.ArticleAtcodLst_ArtId.ColumnName, artIdStr, meta.Operation_AttrCode.ColumnName)
+	//err := session.Where(where, impl.plantNr, workLineId, 1).In(meta.ArticleAtcodLst_ArtId.ColumnName, artIdLi).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data)
+	err := session.Where(where, impl.plantNr, workLineId, 1, -1).OrderBy(meta.Process_PO.ColumnName).OrderBy(meta.Operation_StepNo.ColumnName).Find(&data)
 	return data, err
 }

services/om/implments/WorkOrder.service.impl.go

@@ -1119,6 +1119,7 @@ func (impl *WorkOrderServiceImplement) LockWorkOrder(user *models.Usertab, workO
 			processPos := 1
 			opPos := 1
 			for _, op := range opLi {
+
 				if PO != op.Process.PO {
 					PO = op.Process.PO
 					serialOrderWorkPlace := model.SerialOrderPOLst{
@@ -1152,6 +1153,7 @@ func (impl *WorkOrderServiceImplement) LockWorkOrder(user *models.Usertab, workO
 				err = stepDao.InsertOne(&serialOrderStep)
 				if err != nil {
 					_ = session.Rollback()
+
 					return nil, grmi.NewBusinessError("插入序列工单工艺数据失败, error:" + err.Error())
 				}
 				if serialOrderStep.StepType == baseModel.STEP_CHECK_RULE { // 生成扫码校验的工艺数据
@@ -1372,6 +1374,7 @@ func (impl *WorkOrderServiceImplement) OPCCommunication(user *models.Usertab, se
 				}
 				opcComLi[index] = opcCom
 			}
+			opcBasic.OPCComRuleLi = opcComLi
 			opcBasicLi[index] = opcBasic
 		}
 		opcBasicMap[serialOrderStep.OperationId] = make([]baseModel.OPCBasicComInfo, 0)
@@ -1756,7 +1759,6 @@ func (impl *WorkOrderServiceImplement) CreateLockWorkOrder(user *models.Usertab,
 		_ = session.Rollback()
 		return grmi.NewBusinessError("获取工艺操作失败,error:" + err.Error())
 	}
-
 	allocateMap := make(map[string][]baseModel.ArtQtyAllocate)
 	checkRuleMap := make(map[string]baseModel.ArtCheckRule)
 	opcBasicMap := make(map[int][]baseModel.OPCBasicComInfo)
@@ -1815,6 +1817,7 @@ func (impl *WorkOrderServiceImplement) CreateLockWorkOrder(user *models.Usertab,
 				checkRuleMap = *checkRuleMapPointer
 				allocateMap = *allocateMapPointer
 			} else if serialOrderStep.StepType == baseModel.STEP_OPC_RULE { // 生成OPC通讯的工艺数据
+
 				opcBasicMapPointer, err := impl.OPCCommunication(user, session, opcBasicMap, &serialOrderStep, attributeMap, workOrderId)
 				if err != nil {
 					_ = session.Rollback()