CAPP返修工艺路线接口修改

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";
+        String lastStepId = "9999";
-        RouterStep routerStep = new RouterStep();
+        if (router.endsWith("FX")) {
-        routerStep.setSequence(new BigDecimal(returnStepId));
+            //工艺路线编号“FX”结尾，标识返修工艺路线，添加返回原始工序步骤
-        RouterComponentContext routerComponentContext = new RouterComponentContext();
+            RouterStep routerStep = new RouterStep();
-        RouterReturnStep routerReturnStep = new RouterReturnStep();
+            routerStep.setSequence(new BigDecimal(lastStepId));
-        routerReturnStep.setReturnType(ReturnType.ORIGINAL_OPERATION);
+            RouterComponentContext routerComponentContext = new RouterComponentContext();
-        routerReturnStep.setCompleteOriginal(true);
+            RouterReturnStep routerReturnStep = new RouterReturnStep();
-        routerComponentContext.setRouterReturnStep(routerReturnStep);
+            routerReturnStep.setReturnType(ReturnType.ORIGINAL_OPERATION);
-        routerStep.setRouterComponentContext(routerComponentContext);
+            routerReturnStep.setCompleteOriginal(true);
-        routerStep.setStepId(returnStepId);
+            routerComponentContext.setRouterReturnStep(routerReturnStep);
-
+            routerStep.setRouterComponentContext(routerComponentContext);
-        routerStepList.add(routerStep);
+            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);