Merge remote-tracking branch 'origin/dev' into dev

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

@@ -24,7 +24,7 @@ public class MesNumberRuleMatchDispatchService implements IMesNumberRuleMatchDis
 
         List<Object> resultList = new ArrayList<>();
 
-        if (numberRuleList.get(0) instanceof MesProdRuleNosortCfg) numberRuleList.forEach(o -> matchNumberRule(organizeCode, sn, resultList, o, "mesNumberRuleMatchRegularExpressionService", ((MesProdRuleNosortCfg) o).getInPartNoRule()));
+        if (numberRuleList.get(0) instanceof MesProdRuleNosortCfg) numberRuleList.forEach(o -> matchNumberRule(organizeCode, sn, resultList, o, "mesNumberRuleMatchRegularExpressionService",o, ((MesProdRuleNosortCfg) o).getInPartNoRule()));
 
         return resultList;
 
@@ -34,7 +34,7 @@ public class MesNumberRuleMatchDispatchService implements IMesNumberRuleMatchDis
 
         if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(sn) || StringUtils.isEmpty(strategyClass) || null == o) return;
 
-        Boolean result = ((IMesNumberRuleMatchDispatchService) SpringContextsUtil.getBean(strategyClass)).matchNumberRule(organizeCode, sn, o, params);
+        Boolean result = ((IMesNumberRuleMatchDispatchService) SpringContextsUtil.getBean(strategyClass)).matchNumberRule(organizeCode, sn, params);
 
         if (result) resultList.add(o);
 

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

@@ -14,7 +14,7 @@ public class MesNumberRuleMatchRegularExpressionService implements IMesNumberRul
     @Override
     public Boolean matchNumberRule(String organizeCode, String sn, Object... params) {
 
-        String matchRule = (String) params[0];
+        String matchRule =  params[1].toString();
 
 
         return true;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java

@@ -78,7 +78,8 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
          // 整合班次加工数量
         List<StationKvBean> productionStatisticsContext = mesProductionDispatchContextStepService.getProductionStatisticsContext(reqBean);
         if (CollectionUtils.isEmpty(productionStatisticsContext)) {
-            productionStatisticsContext = StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(), new StationKvBean(new StringJoiner(MesPcnExtConstWords.AND).add(mesProdShiftKvBean.getShiftGroup()).add(mesProdShiftKvBean.getShiftCode()).toString(), "加工次数", "0"));
+            productionStatisticsContext = StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(), new StationKvBean(new StringJoiner(MesPcnExtConstWords.AND).add(mesProdShiftKvBean.getShiftGroup()).add(mesProdShiftKvBean.getShiftCode()).toString(), "加工次数", "0"),
+                    new StationKvBean("color", "颜色", MesExtEnumUtil.COLOR.BLACK.getValue()));
         }
         StationResultBean shiftCountBean = getStationResultBean(reqBean, productionStatisticsContext,mesWorkCell);
         this.sendMessage(reqBean, shiftCountBean);
@@ -101,6 +102,14 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
         return resultBean;
     }
 
+    private List<AttrBean> packDataAttrList() {
+        List<AttrBean> attrBeanList = new ArrayList<>();
+        PojoAttrUtil.loadPojoAttrs(attrBeanList, "index", "序号",true);
+        PojoAttrUtil.loadPojoAttrs(attrBeanList, "custPartNo", "客户零件号", true);
+        PojoAttrUtil.loadPojoAttrs(attrBeanList, "orderNo", "工单号", true);
+
+        return attrBeanList;
+    }
     private StationResultBean getStationResultBean(StationRequestBean reqBean, List<StationKvBean> productionStatisticsContext, MesWorkCell mesWorkCell) {
         StationResultBean resultBean = new StationResultBean();
         resultBean.setBusiType(MesPcnEnumUtil.STATION_BUSI_TYPE.MODULE_CUSTOM_CONTENT.getValue());
@@ -136,14 +145,6 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
 
         return resultBean;
     }
-    private List<AttrBean> packDataAttrList() {
-        List<AttrBean> attrBeanList = new ArrayList<>();
-        PojoAttrUtil.loadPojoAttrs(attrBeanList, "index", "序号",true);
-        PojoAttrUtil.loadPojoAttrs(attrBeanList, "custPartNo", "客户零件号", true);
-        PojoAttrUtil.loadPojoAttrs(attrBeanList, "orderNo", "工单号", true);
-
-        return attrBeanList;
-    }
     @Override
     public boolean execStateModule(StationRequestBean reqBean, List<MesStateMachineStatus> states, Map<String, String> wcpcMap) {
         return true;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionStatisticsService.java

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station.function;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdShiftContext;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseSwsService;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IShippingDispatchService;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.function.IFsmModuleFunctionService;
+import cn.estsh.i3plus.mes.pcn.util.StationKvBeanUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import cn.estsh.i3plus.pojo.mes.model.ButtonDynamicModel;
+import cn.estsh.i3plus.pojo.mes.model.StationKvBean;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringJoiner;
+
+/**
+ * @Description : 工位参数按钮事件接口实现【切换工位】
+ **/
+@Service
+public class MesFunctionProductionStatisticsService extends BaseSwsService implements IFsmModuleFunctionService {
+
+    @Autowired
+    private IShippingDispatchService shippingDispatchService;
+
+    @Autowired
+    private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
+
+    @Override
+    public boolean doFunction(StationRequestBean reqBean, StationResultBean resultBean, ButtonDynamicModel buttonDynamicModel) {
+        // 获取班次信息
+        List<StationKvBean> productionStatisticsContext = mesProductionDispatchContextStepService.getProductionStatisticsContext(reqBean);
+        if (!CollectionUtils.isEmpty(productionStatisticsContext)) {
+            mesProductionDispatchContextStepService.deleteProductionStatisticsContext(reqBean);
+        }
+
+        this.sendMessage(reqBean, resultBean.writeDbLog(), String.format("生产线[%s]工位[%s]%s,加工次数已清零!",
+                reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), buttonDynamicModel.getButtonName()), MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT);
+
+        return true;
+
+    }
+
+}

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

@@ -0,0 +1,67 @@
+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.apiservice.util.MesPcnException;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
+import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
+import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
+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 cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesProduceSnRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import cn.hutool.core.date.DateUtil;
+import com.google.common.base.Objects;
+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.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description : 完成工步
+ * @Author : zxw
+ **/
+@Slf4j
+@Service
+public class MesEndStepService extends BaseStepService {
+
+
+    @Autowired
+    private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
+
+    /*
+     * @param reqBean
+     * @return
+     */
+    @Override
+    public StepResult execute(StationRequestBean reqBean) {
+
+        StationResultBean resultBean = new StationResultBean();
+
+        StepResult stepResult = StepResult.getSuccessComplete();
+
+        mesProductionDispatchContextStepService.deleteFirstMouldNoContext(reqBean);
+        mesProductionDispatchContextStepService.deleteMouldNoContext(reqBean);
+        mesProductionDispatchContextStepService.deleteProductResultContext(reqBean);
+        mesProductionDispatchContextStepService.deleteReadySignalContext(reqBean);
+
+        return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "完成工步执行成功");
+
+    }
+}

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

@@ -202,11 +202,12 @@ public class MesProductSnScanStepService extends BaseStepService {
         //扫描条码 剔除finishCode信息
         List<String> filterList1 = equipVariableCollectContextList.stream().filter(o -> (null != o && !o.getEquipVariableValue().equals(productionProcessContext.getFinishCode()))).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList());
         //已验证条码 剔除finishCode信息
-        List<String> filterList2 = productionPsInContextList.stream().filter(o -> (null != o && !o.getProductSn().equals(productionProcessContext.getFinishCode()))).map(MesProductionPsInContext::getProductSn).collect(Collectors.toList());
+        List<String> filterList2 = CollectionUtils.isEmpty(productionPsInContextList) ? null :
+                productionPsInContextList.stream().filter(o -> (null != o && !o.getProductSn().equals(productionProcessContext.getFinishCode()))).map(MesProductionPsInContext::getProductSn).collect(Collectors.toList());
 
         List<String> filterList = new ArrayList<>();
-        if (CollectionUtils.isEmpty(filterList1)) filterList.addAll(filterList1);
+        if (!CollectionUtils.isEmpty(filterList1)) filterList.addAll(filterList1);
-        if (CollectionUtils.isEmpty(filterList2)) filterList.addAll(filterList2);
+        if (!CollectionUtils.isEmpty(filterList2)) filterList.addAll(filterList2);
 
         //验证是否存在重复条码
         if (!CollectionUtils.isEmpty(filterList) && filterList.size() != filterList.stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList()).size()) return true;

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

@@ -90,12 +90,8 @@ public class MesSaveProcessResultStepService extends BaseStepService {
         /**
          * 报工
          */
-        mesReportGenerateStepService.execute(reqBean);
+        // mesReportGenerateStepService.execute(reqBean);
 
-        mesProductionDispatchContextStepService.deleteFirstMouldNoContext(reqBean);
-        mesProductionDispatchContextStepService.deleteMouldNoContext(reqBean);
-        mesProductionDispatchContextStepService.deleteProductResultContext(reqBean);
-        mesProductionDispatchContextStepService.deleteReadySignalContext(reqBean);
 
         return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "保存加工结果成功");
   }

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

@@ -516,7 +516,8 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
         if (CollectionUtils.isEmpty(stationKvBeans)) {
             String name = "加工次数";
             String value = count + "";
-            List<StationKvBean> generateStationKvBeans = StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(), new StationKvBean(key, name, value));
+            List<StationKvBean> generateStationKvBeans = StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(), new StationKvBean(key, name, value),
+                    new StationKvBean("color", "颜色", MesExtEnumUtil.COLOR.BLACK.getValue()));
             saveProductionStatisticsContext(reqBean, generateStationKvBeans);
         } else {
             stationKvBeans.stream().forEach(stationKvBean -> {