Merge branch 'uat-temp-wj-2502060000-chongqing-step' into dev

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsInContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
@@ -22,7 +24,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * @Description : 根据读取条码生成零件条码工步
+ * @Description : 根据读取条码生成零件条码工步 【读取的主条码无须进行验证,直接通过此工步生成产品条码信息】
  * @Author : wangjie
  **/
 @Slf4j
@@ -30,6 +32,9 @@ import java.util.stream.Collectors;
 public class MesProductSnGenerateByReadStepService extends BaseStepService {
 
     @Autowired
+    private IMesProductionProcessContextStepService productionProcessContextStepService;
+
+    @Autowired
     private IMesProductionDispatchContextStepService productionDispatchContextStepService;
 
     @Override
@@ -39,6 +44,15 @@ public class MesProductSnGenerateByReadStepService extends BaseStepService {
 
         StepResult stepResult = StepResult.getSuccessComplete();
 
+        //获取上下文信息
+        MesProductionProcessContext productionProcessContext = productionProcessContextStepService.dispatchCurCellEquipment(reqBean);
+
+        //配置错误 抛出异常
+        if (!productionProcessContext.getSuccess()) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
+
+        //存储生产过程上下文对象
+        productionProcessContextStepService.dispatchProductionProcessContext(reqBean, productionProcessContext);
+
         //获取上下文产品加工规则数据信息集合
         List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
         if (CollectionUtils.isEmpty(prodRuleContextList)) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前不存在非排序加工规则数据,请重置工序!");
@@ -52,13 +66,18 @@ public class MesProductSnGenerateByReadStepService extends BaseStepService {
         //清除本次已获取得到的主条码信息
         productionDispatchContextStepService.removeScanProductSnContext(reqBean);
 
-        //搜集主条码值
-        List<String> productSnList = equipVariableCollectContextList.stream().filter(
-                o -> (null != o && !StringUtils.isEmpty(o.getEquipVariableValue()))).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList());
+        //搜集主条码值,去除空腔,去重
+        List<String> productSnList = (equipVariableCollectContextList.stream()
+                .filter(o -> (null != o && !StringUtils.isEmpty(o.getEquipVariableValue()) && !o.getEquipVariableValue().equals(productionProcessContext.getFinishCode())))
+                .map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList())
+        ).stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
+
+        //没有待验证的主条码
+        if (CollectionUtils.isEmpty(productSnList)) return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前未获取到有效的主条码!");
 
-        if (CollectionUtils.isEmpty(productSnList) || productSnList.size() < prodRuleContextList.size()) {
+        if (productSnList.size() < prodRuleContextList.size()) {
             return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult,
-                    String.format("当前读取到主条码个数[%s]不满足当前实际产品腔数[%s]", CollectionUtils.isEmpty(productSnList) ? MesPcnExtConstWords.ZERO : productSnList.size(), prodRuleContextList.size()));
+                    String.format("当前读取到主条码%s个数[%s]不满足当前实际产品腔数[%s]", productSnList.toString(), productSnList.size(), prodRuleContextList.size()));
         }
 
         //封装上下文进料零件条码信息集合