jx pcn

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

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.step.jx;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.ISxWorkOrderExtService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.jx.IJxProdBusiStrategyService;
-import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.station.jx.JxSnLineOnModuleService;
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi.station.jx.JxSnProcessingModuleService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.bean.MesWorkOrderExt;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.WorkOrderExtModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.jx.JxProdBusiStrategyParamsBuilder;
@@ -35,7 +35,7 @@ import java.util.StringJoiner;
 public class JxSnProcessingCheckMcOrPsStepService extends BaseStepService {
 
     @Autowired
-    private JxSnLineOnModuleService snLineOnModuleService;
+    private JxSnProcessingModuleService snProcessingModuleService;
 
     @Autowired
     private ISxWorkOrderExtService workOrderExtService;
@@ -51,7 +51,7 @@ public class JxSnProcessingCheckMcOrPsStepService extends BaseStepService {
         reqBean.setProductSn(null);
         reqBean.setTray(null);
         clearStepContent(reqBean);
-        snLineOnModuleService.doHandleBindKeyPartData(reqBean, 3, new StringJoiner(MesPcnExtConstWords.COMMA).add(MesPcnExtConstWords.BIND_KEY_PART).add(MesPcnExtConstWords.EXEC_BIND_KEY).toString(), null);
+        snProcessingModuleService.doHandleBindKeyPartData(reqBean, 3, new StringJoiner(MesPcnExtConstWords.COMMA).add(MesPcnExtConstWords.BIND_KEY_PART).add(MesPcnExtConstWords.EXEC_BIND_KEY).toString(), null);
         return super.init(reqBean);
     }
 
@@ -80,7 +80,7 @@ public class JxSnProcessingCheckMcOrPsStepService extends BaseStepService {
     }
 
     private String getCurExecWorkOrderNo(StationRequestBean reqBean, StationResultBean resultBean) {
-        String curExecWorkOrderNo = (String) snLineOnModuleService.doHandleCurExecWorkOrder(reqBean, 1, null);
+        String curExecWorkOrderNo = (String) snProcessingModuleService.doHandleCurExecWorkOrder(reqBean, 1, null);
         if (StringUtils.isEmpty(curExecWorkOrderNo)) execExpSendMsgAndThrowEx(reqBean, resultBean, "此前操作的工单号已丢失,请选择启动状态的生产工单!");
         return curExecWorkOrderNo;
     }
@@ -113,15 +113,10 @@ public class JxSnProcessingCheckMcOrPsStepService extends BaseStepService {
 
         this.sendMessage(reqBean, resultBean, result.getMsg(), MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, result.isCompleted() ? MesPcnEnumUtil.STATION_DATA_TYPE.TEXT : MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
 
-        stepResult.setCompleted(result.isCompleted());
-
         reqBean.setSerialNumber(params.getSerialNumber());
         reqBean.setProductSn(params.getProductSn());
-        reqBean.setTray(null == params.getProduceSnMcRecordDb() ? params.getManageCode() : new StringJoiner(MesPcnExtConstWords.AND).add(params.getProduceSnMcRecordDb().getManageCode()).add(params.getProduceSnMcRecordDb().getId().toString()).toString());
-
-        if (result.isCompleted() && (null != params.getProduceSnMcRecordDb() || null != params.getProduceSnExtDb())) stepResult.nextTriggerEvent(MesPcnExtConstWords.BIND_KEY_PART).isCompleted(false);
 
-        return stepResult;
+        return stepResult.isCompleted(result.isCompleted());
     }
 
 }