jx pcn sn line on

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

@@ -14,13 +14,14 @@ import java.util.List;
 public interface IJxProduceSnMcRecordService {
 
     /**
-     * 根据管理码查询管理码信息
+     * 根据管理码,生产线代码查询管理码信息
      * @param organizeCode 组织代码
      * @param manageCode 管理码
+     * @param workCenterCode 生产线代码
      * @return 管理码信息
      */
-    @ApiOperation(value = "根据管理码查询管理码信息", notes = "根据管理码查询管理码信息")
+    @ApiOperation(value = "根据管理码,生产线代码查询管理码信息", notes = "根据管理码,生产线代码查询管理码信息")
-    MesManageCode getManageCodeDb(String organizeCode, String manageCode);
+    MesManageCode getManageCodeDb(String organizeCode, String manageCode, String workCenterCode);
 
     /**
      * 根据生产工单查询管理码与工单条码关系信息

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

@@ -71,7 +71,7 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi
 
         if (StringUtils.isEmpty(params.getManageCode())) return params;
 
-        MesManageCode manageCodeDb = produceSnMcRecordService.getManageCodeDb(params.getOrganizeCode(), params.getManageCode());
+        MesManageCode manageCodeDb = produceSnMcRecordService.getManageCodeDb(params.getOrganizeCode(), params.getManageCode(), params.getWorkCenterCode());
 
         if (null == manageCodeDb) return params.manageCode();
 

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

@@ -31,11 +31,11 @@ public class JxProduceSnMcRecordService implements IJxProduceSnMcRecordService {
     private MesProduceSnMcRecordRepository produceSnMcRecordRepository;
 
     @Override
-    public MesManageCode getManageCodeDb(String organizeCode, String manageCode) {
+    public MesManageCode getManageCodeDb(String organizeCode, String manageCode, String workCenterCode) {
-        if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(manageCode)) return null;
+        if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(manageCode) || StringUtils.isEmpty(workCenterCode)) return null;
         return manageCodeRepository.getByProperty(
-                new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.MANAGE_CODE},
+                new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.MANAGE_CODE, MesPcnExtConstWords.WORK_CENTER_CODE},
-                new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), manageCode});
+                new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), manageCode, workCenterCode});
     }
 
     @Override

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

@@ -105,7 +105,7 @@ public class JxSnLineOnBindMcStepService extends BaseStepService {
         log.info("工厂{}生产线{}工位{}: --- STEP EXECUTE --- JxSnLineOnBindMcStepService --- SUCCESS --- MesProduceSnMcRecord:{} ---", reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), JSONObject.toJSONString(produceSnMcRecord));
 
         return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean, String.format("管理编码[%s]%s绑定生产工单[%s]成功!",
-                reqBean.getTray(), !StringUtils.isEmpty(serialNumber) ? String.format("关联过程条码[%s]", serialNumber) : MesPcnExtConstWords.EMPTY, orderModel.getOrderNo()));
+                produceSnMcRecord.getManageCode(), !StringUtils.isEmpty(serialNumber) ? String.format("关联过程条码[%s]", serialNumber) : MesPcnExtConstWords.EMPTY, orderModel.getOrderNo()));
     }
 
     private String getCurExecWorkOrderNo(StationRequestBean reqBean, StationResultBean resultBean) {

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

@@ -50,8 +50,9 @@ public class JxSnLineOnCheckMcOrPsStepService extends BaseStepService {
         reqBean.setSerialNumber(null);
         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);
-        return StepResult.getSuccessComplete();
+        return super.init(reqBean);
     }
 
     @Override
@@ -110,17 +111,15 @@ public class JxSnLineOnCheckMcOrPsStepService extends BaseStepService {
 
         StepResult result = ((IJxProdBusiStrategyService) SpringContextsUtil.getBean(MesPcnExtEnumUtil.JX_PROD_BUSI_STRATEGY.valueOfClazz(orderModel.getWorkOrderType()))).checkLineOn(params);
 
-        if (!result.isCompleted()) this.sendMessage(reqBean, resultBean, result.getMsg(), MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
+        this.sendMessage(reqBean, resultBean, result.getMsg(), MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, result.isCompleted() ? MesPcnEnumUtil.STATION_DATA_TYPE.TEXT : MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
-        else reqBean.setTray(params.getManageCode());
 
         stepResult.setCompleted(result.isCompleted());
 
-        if (result.isCompleted() && (null != params.getProduceSnMcRecordDb() || null != params.getProduceSnExtDb())) {
+        reqBean.setSerialNumber(params.getSerialNumber());
-            reqBean.setSerialNumber(params.getSerialNumber());
+        reqBean.setProductSn(params.getProductSn());
-            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 (null != params.getProduceSnMcRecordDb()) reqBean.setTray(new StringJoiner(MesPcnExtConstWords.AND).add(params.getProduceSnMcRecordDb().getManageCode()).add(params.getProduceSnMcRecordDb().getId().toString()).toString());
+
-            stepResult.nextTriggerEvent(MesPcnExtConstWords.BIND_KEY_PART).isCompleted(false);
+        if (result.isCompleted() && (null != params.getProduceSnMcRecordDb() || null != params.getProduceSnExtDb())) stepResult.nextTriggerEvent(MesPcnExtConstWords.BIND_KEY_PART).isCompleted(false);
-        }
 
         return stepResult;
     }