Merge branch 'mes-uat-changshu0609-temp-wj-250616-xisu' into mes-uat-changshu0609-temp-wj-250616-xisu-merge-nht

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyGeneratePartNoStepService.java

@@ -273,6 +273,9 @@ public class MesAssemblyGeneratePartNoStepService extends BaseStepService {
 
                 if (null == productionAssemblyNosortContext) continue;
 
+                if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkIsNeedCustomStepMatch(productionAssemblyNosortContext.getMatchType()))
+                    stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("当前工序模版不支持匹配[%s]确认方式的装配件信息!", MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.valueOfDescription(productionAssemblyNosortContext.getMatchType())));
+
                 for (MesEquipVariableCollectContext equipVariableCollectContext : equipVariableCollectContextListTemp) {
 
                     //已被消费

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortRetrodictStepService.java

@@ -271,6 +271,9 @@ public class MesAssemblyMatchNosortRetrodictStepService extends BaseStepService
 
                     if (null == productionAssemblyNosortContext) continue;
 
+                    if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkIsNeedCustomStepMatch(productionAssemblyNosortContext.getMatchType()))
+                        stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("当前工序模版不支持匹配[%s]确认方式的装配件信息!", MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.valueOfDescription(productionAssemblyNosortContext.getMatchType())));
+
                     for (MesEquipVariableCollectContext equipVariableCollectContext : equipVariableCollectContextListTemp) {
 
                         //已被消费

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchNosortStepService.java

@@ -114,7 +114,7 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService {
         Boolean isSkip = checkIsSkip(productionProcessContext, equipVariableCollectContextList);
 
         //处理待验证的装配件条码 [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成]
-        Boolean result = doHandleMatchAssembly(reqBean, stepResult, productionProcessContext.getWorkCenter(), prodRuleContextList, equipVariableCollectContextList, isSkip);
+        Boolean result = doHandleMatchAssembly(reqBean, resultBean, stepResult, productionProcessContext.getWorkCenter(), prodRuleContextList, equipVariableCollectContextList, isSkip);
 
         //验证是否存在待绑定数据
         hasUnBindAssembly = hasUnBindAssembly(prodRuleContextList);
@@ -236,7 +236,7 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService {
     }
 
     //处理待验证的装配件条码   [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成]
-    private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StepResult stepResult, MesWorkCenter workCenter, List<MesProdRuleContext> prodRuleContextList, List<MesEquipVariableCollectContext> equipVariableCollectContextList, Boolean isSkip) {
+    private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesWorkCenter workCenter, List<MesProdRuleContext> prodRuleContextList, List<MesEquipVariableCollectContext> equipVariableCollectContextList, Boolean isSkip) {
 
         //遍历产品加工规则
         for (MesProdRuleContext prodRuleContext : prodRuleContextList) {
@@ -256,6 +256,9 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService {
                 //已装配
                 if (null == productionAssemblyNosortContext || productionAssemblyNosortContext.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) != 0) continue;
 
+                if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkIsNeedCustomStepMatch(productionAssemblyNosortContext.getMatchType()))
+                    stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("当前工序模版不支持匹配[%s]确认方式的装配件信息!", MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.valueOfDescription(productionAssemblyNosortContext.getMatchType())));
+
                 //遍历装配件条码
                 for (MesEquipVariableCollectContext equipVariableCollectContext : equipVariableCollectContextList) {
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyMatchSortStepService.java

@@ -106,7 +106,7 @@ public class MesAssemblyMatchSortStepService extends BaseStepService {
         Boolean isCavitySkip = checkIsCavitySkip(productionProcessContext, equipVariableCollectContextList);
 
         //处理待验证的装配件条码 [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成]
-        Boolean result = doHandleMatchAssembly(reqBean, stepResult, productionProcessContext.getWorkCenter(), prodRuleContextList, equipVariableCollectContextList, isSkip, isCavitySkip);
+        Boolean result = doHandleMatchAssembly(reqBean, resultBean, stepResult, productionProcessContext.getWorkCenter(), prodRuleContextList, equipVariableCollectContextList, isSkip, isCavitySkip);
 
         //验证是否存在待绑定数据
         hasUnBindAssembly = hasUnBindAssembly(prodRuleContextList);
@@ -199,7 +199,7 @@ public class MesAssemblyMatchSortStepService extends BaseStepService {
     }
 
     //处理待验证的装配件条码   [扫描模式匹配成功返回true, 否则返回flase, 非扫描模式需要验证是否全部匹配完成]
-    private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StepResult stepResult, MesWorkCenter workCenter, List<MesProdRuleContext> prodRuleContextList, List<MesEquipVariableCollectContext> equipVariableCollectContextList, Boolean isSkip, Boolean isCavitySkip) {
+    private Boolean doHandleMatchAssembly(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesWorkCenter workCenter, List<MesProdRuleContext> prodRuleContextList, List<MesEquipVariableCollectContext> equipVariableCollectContextList, Boolean isSkip, Boolean isCavitySkip) {
 
         //遍历产品加工规则
         for (MesProdRuleContext prodRuleContext : prodRuleContextList) {
@@ -219,6 +219,9 @@ public class MesAssemblyMatchSortStepService extends BaseStepService {
                 //已装配
                 if (null == productionAssemblySortContext || productionAssemblySortContext.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) != 0) continue;
 
+                if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.checkIsNeedCustomStepMatch(productionAssemblySortContext.getMatchType()))
+                    stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), String.format("当前工序模版不支持匹配[%s]确认方式的装配件信息!", MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.valueOfDescription(productionAssemblySortContext.getMatchType())));
+
                 //遍历装配件条码
                 for (MesEquipVariableCollectContext equipVariableCollectContext : equipVariableCollectContextList) {
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionAssemblyContext.java

@@ -133,6 +133,9 @@ public class MesProductionAssemblyContext implements Serializable {
     @ApiParam("容器匹配信息")
     public String containerSnData;
 
+    @ApiParam("是否已经验证过原料调配")
+    public String isCheckedRawMix;
+
     public String repeatKeyToString() {
         if (StringUtils.isEmpty(this.equipmentCode) || StringUtils.isEmpty(this.matchType) || (StringUtils.isEmpty(this.matchRule) && StringUtils.isEmpty(this.assemblyPartNo))) return null;
         return String.format("%s:%s&%s:%s&%s:%s&%s:%s",