装配件

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/rulematch/MesNumberRuleMatchSortDoubleCheckService.java

@@ -44,15 +44,21 @@ public class MesNumberRuleMatchSortDoubleCheckService implements IMesNumberRuleM
             return result;
         }
 
-        //验证是否离线
         MesProductionAssemblySortContext context =  (MesProductionAssemblySortContext) params[0];
 
+        if (StringUtils.isEmpty(context.getMatchRule()) && StringUtils.isEmpty(context.getAssemblyPartNo())) {
+            result.put(MesPcnExtConstWords.RESULT, false);
+            result.put(MesPcnExtConstWords.MESSAGE, "参数匹配规则信息未维护[扫描规则]或[装配件零件编码]!");
+            return result;
+        }
+
         //校验正则表达式
         if (!StringUtils.isEmpty(context.getMatchRule())) {
             result = ((IMesNumberRuleMatchDispatchService) SpringContextsUtil.getBean(MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_20.getStrategyClass())).matchNumberRule(organizeCode, sn, params);
             if (!(Boolean) result.get(MesPcnExtConstWords.RESULT)) return result;
         }
 
+        //验证是否离线
         if (context.getIsClosedCheck()) return result;
 
         result.put(MesPcnExtConstWords.RESULT, false);

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

@@ -25,7 +25,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * @Description : 生成零件号工步 【非排序】
+ * @Description : 非排序无显示装配件匹配工步 【广州还在用, 后续作废, 使用mesAssemblyMatchNosortRetrodictStepService】
  * @Author : wangjie
  **/
 @Slf4j

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

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
+
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import cn.estsh.i3plus.pojo.mes.model.StepResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 生成零件号工步 【非排序】
+ * @Author : wangjie
+ **/
+@Slf4j
+@Service("mesAssemblyMatchPartNoStepService")
+public class MesAssemblyMatchPartNoStepService extends BaseStepService {
+
+    @Override
+    public StepResult execute(StationRequestBean reqBean) {
+
+        return null;
+
+    }
+
+}