工序完成 优化

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionCustomContextStepService.java

@@ -26,9 +26,6 @@ public interface IMesProductionCustomContextStepService {
     @ApiOperation(value = "发送设备质量信息")
     void sendEquipQualityMessage(StationRequestBean reqBean, MesCellEquipContext cellEquipContext);
 
-    @ApiOperation(value = "发送工序完成音")
-    void sendProcessCompleteSound(StationRequestBean reqBean);
-
     @ApiOperation(value = "存储上个扫描/读取信息")
     Boolean saveLastScanContext(StationRequestBean reqBean, List<StationKvBean> dataList);
 

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

@@ -149,7 +149,7 @@ public class MesProductSnGenerateStepService extends BaseStepService {
         try {
 
             produceSn.setProductSn((null != productionPsInContext && !StringUtils.isEmpty(productionPsInContext.getProductSn())) ? productionPsInContext.getProductSn() :
-                    syncFuncService.syncSerialNo(new GenSerialNoModel(getProduceSnNumberRule(reqBean, resultBean, part)).partNo(part.getPartNo()), reqBean.getUserInfo(), reqBean.getOrganizeCode(), 1).getResultList().get(0).toString());
+                    syncFuncService.syncSerialNo(new GenSerialNoModel(getProduceSnNumberRule(reqBean, resultBean, part)).prodLocation(reqBean.getWorkCenterCode()).partNo(part.getPartNo()), reqBean.getUserInfo(), reqBean.getOrganizeCode(), 1).getResultList().get(0).toString());
 
             produceSn.setSerialNumber(syncFuncService.syncSerialNo(new GenSerialNoModel(MesPcnExtConstWords.DEFAULT_SERIAL_NUMBER_RULE).prodLocation(reqBean.getWorkCenterCode()), reqBean.getUserInfo(), reqBean.getOrganizeCode(), 1).getResultList().get(0).toString());
 

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

@@ -1,35 +0,0 @@
-package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step.context;
-
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService;
-import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
-import cn.estsh.i3plus.mes.pcn.actor.shipping.dispatch.FsmJumpProcessService;
-import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
-import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-
-@Service
-@Primary
-public class MesProductionContextFlushService extends FsmJumpProcessService {
-
-    @Autowired
-    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
-
-    @Autowired
-    private IMesProductionCustomContextStepService productionCustomContextStepService;
-
-    //重置工序业务实现
-    @Override
-    public Boolean doJumpProcess(StationRequestBean requestBean, Integer jumpProcessSource) {
-
-        //清除上下文中的所有业务数据
-        productionDispatchContextStepService.doFlushProductionDispatchContext(requestBean);
-
-        //发送工序完成音
-        if (MesPcnEnumUtil.FSM_JUMP_PROCESS_SOURCE.TASK_COMPLETE.getValue() == jumpProcessSource) productionCustomContextStepService.sendProcessCompleteSound(requestBean);
-
-        return true;
-    }
-
-}

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

@@ -38,16 +38,9 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
         this.sendMessage(reqBean, resultBean);
     }
 
-    //发送工序完成音
-    @Override
-    public void sendProcessCompleteSound(StationRequestBean reqBean) {
-        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.PROCESS_COMPLETE).busiType(MesPcnEnumUtil.STATION_BUSI_TYPE.CUSTOM_COMPONENT.getValue()).dataType(MesPcnEnumUtil.STATION_DATA_TYPE.SOUND.getValue()));
-    }
-
     //工位加工锁KEY
     private String getProductionLockContextKey(StationRequestBean reqBean) { return getFsmBusikey(reqBean, new StringJoiner(MesPcnExtConstWords.COLON).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.PRODUCTION_LOCK_CONTEXT).toString()); }
 
-
     //验证上下文工位加工锁是否存在
     @Override
     public Boolean checkProductionLockIsExistContext(StationRequestBean reqBean) {

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

@@ -5,12 +5,10 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesRawPartCharging;
 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 com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import lombok.extern.slf4j.Slf4j;
@@ -39,8 +37,6 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
     public void doFlushProductionDispatchContext(StationRequestBean reqBean) {
         //清除上下文中的所有业务数据
         deleteFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean));
-        //清除工步客制化区域数据【装配件清单】
-        this.sendMessage(reqBean, new StationResultBean().busiType(MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_CUSTOM_CONTENT.getValue()).dataType(MesPcnEnumUtil.STATION_DATA_TYPE.TABLES.getValue()));
     }
 
     //存储展示组件MODULE_CONTENT内容

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step.context;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionCustomContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
+import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.process.BaseProcessMonitorService;
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+@Service
+@Primary
+public class MesProductionProcessMonitorService extends BaseProcessMonitorService {
+
+    @Autowired
+    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
+
+    @Autowired
+    private IMesProductionCustomContextStepService productionCustomContextStepService;
+
+    @Override
+    public Boolean doProcessStart(StationRequestBean requestBean) {
+        return super.doProcessStart(requestBean);
+    }
+
+    @Override
+    public Boolean doProcessComplete(StationRequestBean requestBean) {
+        doJumpProcess(requestBean);
+        //发送工序完成音
+        this.sendMessage(requestBean, new StationResultBean().resultObj(MesPcnExtConstWords.PROCESS_COMPLETE).busiType(MesPcnEnumUtil.STATION_BUSI_TYPE.CUSTOM_COMPONENT.getValue()).dataType(MesPcnEnumUtil.STATION_DATA_TYPE.SOUND.getValue()));
+        return true;
+    }
+
+    @Override
+    public Boolean doJumpProcess(StationRequestBean requestBean) {
+        //清除上下文中的所有业务数据
+        productionDispatchContextStepService.doFlushProductionDispatchContext(requestBean);
+        //清除工步客制化区域数据【装配件清单】
+        this.sendMessage(requestBean, new StationResultBean().busiType(MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_CUSTOM_CONTENT.getValue()).dataType(MesPcnEnumUtil.STATION_DATA_TYPE.TABLES.getValue()));
+        return true;
+    }
+}