diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/step/jx/JxInitOrderStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/step/jx/JxInitOrderStepService.java index 09ecbd0..86d0a31 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/step/jx/JxInitOrderStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/step/jx/JxInitOrderStepService.java @@ -77,7 +77,7 @@ public class JxInitOrderStepService extends BaseStepService { curExecWorkOrderNoReal = checkSelectOrderIsValidCenter(reqBean, stepResult, workOrderExt, curExecWorkOrderNo, suffix); if (!stepResult.isCompleted()) break outerLoop; - curExecWorkOrderNoReal = checkWorkOrderExtIsValid(reqBean, stepResult, workOrderExt, curExecWorkOrderNo, suffix); + curExecWorkOrderNoReal = checkWorkOrderExtIsValid(stepResult, workOrderExt, curExecWorkOrderNo, suffix); if (!stepResult.isCompleted()) break outerLoop; curExecWorkOrderNoReal = doCacheCurExecWorkOrderNo(reqBean, resultBean, stepResult, selectWorkOrderNoReal, curExecWorkOrderNo, suffix); @@ -91,7 +91,7 @@ public class JxInitOrderStepService extends BaseStepService { if (!StringUtils.isEmpty(curExecWorkOrderNoReal)) { workOrderExt = workOrderExtService.getWorkOrderExtByOrderNo(reqBean.getOrganizeCode(), curExecWorkOrderNoReal); - checkWorkOrderExtIsValid(reqBean, stepResult, workOrderExt, curExecWorkOrderNo, + checkWorkOrderExtIsValid(stepResult, workOrderExt, curExecWorkOrderNo, String.format("%s此前操作的工单号[%s]", stepResult.isCompleted() ? MesPcnExtConstWords.EMPTY : stepResult.isCompleted(true).getMsg(), curExecWorkOrderNoReal)); } @@ -121,7 +121,7 @@ public class JxInitOrderStepService extends BaseStepService { } - private String checkWorkOrderExtIsValid(StationRequestBean reqBean, StepResult stepResult, MesWorkOrderExt workOrderExt, String curExecWorkOrderNo, String suffix) { + private String checkWorkOrderExtIsValid(StepResult stepResult, MesWorkOrderExt workOrderExt, String curExecWorkOrderNo, String suffix) { if (MesPcnExtEnumUtil.WORK_ORDER_STATUS.OPEN.getValue() != workOrderExt.getWorkOrderStatus()) stepResult.isCompleted(false).msg(String.format("%s状态[%s],不支持在此工位操作!", suffix, MesPcnExtEnumUtil.WORK_ORDER_STATUS.valueOfDescription(workOrderExt.getWorkOrderStatus())));