step

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

@@ -63,18 +63,21 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService {
         //存储生产过程上下文对象
         productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
 
+        //获取上下文产品加工规则数据信息集合
+        List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
+
+        if (CollectionUtils.isEmpty(prodRuleContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前上下文中不存在非排序加工规则数据,请重置工序!");
+
         //从上下文中取出生产线对象
         MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
 
+
         //获取上下文产出零件数据信息集合
         List<MesProductionPartContext> productionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean);
 
         //获取上下文进料零件条码信息集合
         List<MesProductionPsInContext> productionPsInContextList = productionDispatchContextStepService.getProductionPsInContext(reqBean);
 
-        //获取上下文产品加工规则数据信息集合
-        List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
-
         //获取上下文生产扫/读信息:装配件条码
         List<MesEquipVariableCollectContext> equipVariableCollectContextList = productionDispatchContextStepService.getScanAssemblySnContext(reqBean);
 
@@ -99,15 +102,11 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService {
 
     }
 
-
-
     //存在产出零件 存在进料主条码
     private StepResult doMatchAssemblyHasPpAndPs(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult,
                                                  List<MesProductionPartContext> productionPartContextList, List<MesProductionPsInContext> productionPsInContextList,
                                                  List<MesProdRuleContext> prodRuleContextList, List<MesEquipVariableCollectContext> equipVariableCollectContextList) {
 
-        if (CollectionUtils.isEmpty(prodRuleContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "当前上下文中不存在非排序加工规则数据,请重置工序!");
-
         //存在产出零件 存在进料主条码 不存在待验证装配件条码
         if (CollectionUtils.isEmpty(equipVariableCollectContextList))
             return hasUnBindAssembly(prodRuleContextList) ?
@@ -203,7 +202,73 @@ public class MesAssemblyMatchNosortStepService extends BaseStepService {
     }
 
     //存在产出零件 不存在进料主条码
-    private void doMatchAssemblyHasPp(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesCellEquipContext cellEquipContext, List<MesProductionPartContext> productionPartContextList, List<MesProdRuleContext> prodRuleContextList, List<MesEquipVariableCollectContext> equipVariableCollectContextList) {
+    private StepResult doMatchAssemblyHasPp(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesCellEquipContext cellEquipContext, List<MesProductionPartContext> productionPartContextList, List<MesProdRuleContext> prodRuleContextList, List<MesEquipVariableCollectContext> equipVariableCollectContextList) {
+
+        //存在产出零件 存在进料主条码 不存在待验证装配件条码
+        if (CollectionUtils.isEmpty(equipVariableCollectContextList))
+            return hasUnBindAssembly(prodRuleContextList) ? stepResult.isCompleted(false).nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_ASSEMBLY).msg("当前上下文中不存在待验证的装配件条码,但还存在未装配的装配件清单!") : stepResult;
+
+        //遍历产品加工规则
+        for (MesProdRuleContext prodRuleContext : prodRuleContextList) {
+
+            //没有装配件的条件
+            if (null == prodRuleContext || StringUtils.isEmpty(prodRuleContext.getAssemblyDataJson())) continue;
+
+            //获取非排序装配件清单
+            List<MesProductionAssemblyNosortContext> productionAssemblyNosortContextList = prodRuleContext.getNosortAssemblyDataContext();
+
+            //遍历装配件清单
+            for (MesProductionAssemblyNosortContext productionAssemblyNosortContext : productionAssemblyNosortContextList) {
+
+                //已装配
+                if (null == productionAssemblyNosortContext || productionAssemblyNosortContext.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) != 0) continue;
+
+                //遍历装配件条码
+                for (MesEquipVariableCollectContext equipVariableCollectContext : equipVariableCollectContextList) {
+
+                    //已被消费
+                    if (null == equipVariableCollectContext || equipVariableCollectContext.getIsConsume().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0) continue;
+
+                    //匹配规则
+                    List<MesProductionAssemblyNosortContext> filterList = (List<MesProductionAssemblyNosortContext>)
+                            numberRuleMatchDispatchService.matchNumberRule(reqBean.getOrganizeCode(), equipVariableCollectContext.getEquipVariableValue(), Stream.of(productionAssemblyNosortContext).collect(Collectors.toList()));
+
+                    //匹配失败
+                    if (CollectionUtils.isEmpty(filterList)) continue;
+
+                    //匹配成功
+                    equipVariableCollectContext.isConsume();
+
+                    //装配件清单该数据标记已装配
+                    productionAssemblyNosortContext.assemblyStatus().assemblySn(equipVariableCollectContext.getEquipVariableValue());
+
+                }
+
+                //是否验证顺序装配
+                if (!StringUtils.isEmpty(prodRuleContext.getIsCheckBindSeq()) &&
+                        prodRuleContext.getIsCheckBindSeq().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0 && equipVariableCollectContextList.get(0).getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue()) != 0 &&
+                        productionAssemblyNosortContext.getAssemblyStatus().compareTo(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()) != 0) break;
+
+            }
+
+            //TODO 发送设备加工参数
+            if (equipVariableCollectContextList.get(0).getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue()) != 0) doSendEquipProdParam(reqBean, resultBean, stepResult, prodRuleContext, productionAssemblyNosortContextList);
+
+        }
+
+        List<MesEquipVariableCollectContext> filterList = equipVariableCollectContextList.stream().filter(o -> (null != o && o.getIsConsume().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).collect(Collectors.toList());
+
+        if (CollectionUtils.isEmpty(filterList)) {
+            Boolean hasUnBindAssembly = hasUnBindAssembly(prodRuleContextList);
+            if ((!hasUnBindAssembly && equipVariableCollectContextList.get(0).getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue()) == 0) || equipVariableCollectContextList.get(0).getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue()) != 0)
+                productionDispatchContextStepService.saveProdRuleDataContext(reqBean, prodRuleContextList);
+            String msg = String.format("当前上下文中的装配件条码%s匹配完成", filterList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList()).toString());
+            return hasUnBindAssembly ? stepResult.isCompleted(false).nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_ASSEMBLY).msg(String.format("%s,但还存在未装配的装配件清单!", msg)) : stepResult.msg(msg);
+        } else {
+            String msg = String.format("当前上下文中的装配件条码%s匹配失败", filterList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList()).toString());
+            return hasUnBindAssembly(prodRuleContextList) ? stepResult.isCompleted(false).nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_ASSEMBLY).msg(String.format("%s,但还存在未装配的装配件清单!", msg)) : stepResult.msg(msg);
+        }
+
     }
 
     //不存在产出零件 存在进料主条码

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

@@ -1,73 +0,0 @@
-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.MesProdRuleContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
-import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsInContext;
-import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService;
-import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
-import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
-import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
-import cn.estsh.i3plus.pojo.mes.model.StepResult;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
- * @Description : 生成零件条码
- * @Author : wangjie
- **/
-@Slf4j
-@Service("mesProductSnGenerateStepService2")
-public class MesProductSnGenerateStepService2 extends BaseStepService {
-
-    @Autowired
-    private IMesProductionProcessContextStepService productionProcessContextStepService;
-
-    @Autowired
-    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
-
-    @Autowired
-    private ISyncFuncService syncFuncService;
-
-    @Override
-    public StepResult execute(StationRequestBean reqBean) {
-
-        StationResultBean resultBean = new StationResultBean();
-
-        StepResult stepResult = StepResult.getSuccessComplete();
-
-        //获取上下文信息
-        MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
-
-        //配置错误 抛出异常
-        if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
-
-        //存储生产过程上下文对象
-        productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
-
-        //获取上下文产出零件数据信息集合
-        List<MesProductionPartContext> productionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean);
-
-        //获取上下文进料零件条码信息集合
-        List<MesProductionPsInContext> productionPsInContextList = productionDispatchContextStepService.getProductionPsInContext(reqBean);
-
-        //获取上下文产品加工规则数据信息集合
-        List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
-
-        if (CollectionUtils.isEmpty(prodRuleContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "上下文中不存在加工规则信息,请重置");
-
-
-            return  stepResult;
-
-    }
-
-
-
-
-}