diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java index 92b093ec..ebc37490 100644 --- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java +++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java @@ -350,23 +350,34 @@ public class InterfaceServiceImpl implements InterfaceService { customFieldsList.add(customFields); }//end for - //添加返回原始工序步骤 - String returnStepId = "9099"; - RouterStep routerStep = new RouterStep(); - routerStep.setSequence(new BigDecimal(returnStepId)); - RouterComponentContext routerComponentContext = new RouterComponentContext(); - RouterReturnStep routerReturnStep = new RouterReturnStep(); - routerReturnStep.setReturnType(ReturnType.ORIGINAL_OPERATION); - routerReturnStep.setCompleteOriginal(true); - routerComponentContext.setRouterReturnStep(routerReturnStep); - routerStep.setRouterComponentContext(routerComponentContext); - routerStep.setStepId(returnStepId); - - routerStepList.add(routerStep); + + String lastStepId = "9999"; + if (router.endsWith("FX")) { + //工艺路线编号“FX”结尾,标识返修工艺路线,添加返回原始工序步骤 + RouterStep routerStep = new RouterStep(); + routerStep.setSequence(new BigDecimal(lastStepId)); + RouterComponentContext routerComponentContext = new RouterComponentContext(); + RouterReturnStep routerReturnStep = new RouterReturnStep(); + routerReturnStep.setReturnType(ReturnType.ORIGINAL_OPERATION); + routerReturnStep.setCompleteOriginal(true); + routerComponentContext.setRouterReturnStep(routerReturnStep); + routerStep.setRouterComponentContext(routerComponentContext); + routerStep.setStepId(lastStepId); + routerStepList.add(routerStep); + } else { + //添加完成工序 + RouterStep routerDoneStep = new RouterStep(); + routerDoneStep.setSequence(new BigDecimal(lastStepId)); + routerDoneStep.setStepId(lastStepId); + RouterComponentContext routerDoneStepComponentContext = new RouterComponentContext(); + routerDoneStepComponentContext.setRouterDoneStep(true); + routerDoneStep.setRouterComponentContext(routerDoneStepComponentContext); + routerStepList.add(routerDoneStep); + } //完成工序添加到下一步骤 RouterNextStep routerNextStep = new RouterNextStep(); - routerNextStep.setNextStepId(returnStepId); + routerNextStep.setNextStepId(lastStepId); routerStepList.get(routerStepList.size()-2).getRouterNextStepList().add(routerNextStep);