作业调整

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -421,7 +421,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     } else {
                         previousProcessVo = new PreviousProcessVo();
                         //首道工序
-                        if (blanckdata.getStr("PREPAREMATERIAL").equals("是") && apsCraftRouteStepDo.getIfblankprocess().equals("是")) {
+                        if ((blanckdata.getStr("BLANKCOMEFROM").equals("备料")||blanckdata.getStr("BLANKCOMEFROM").equals("借料")) && apsCraftRouteStepDo.getIfblankprocess().equals("是")) {
                             hasFirst = false;
                             secondProcessId = apsCraftRouteStepDo.getNextstepid();
                         }
@@ -916,7 +916,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 } else {
                     previousProcessVo = new PreviousProcessVo();
                     //首道工序
-                    if (blanckdata.getStr("PREPAREMATERIAL").equals("是") && apsProcessOperationDo.getIfblankprocess().equals("是")) {
+                    if ((blanckdata.getStr("BLANKCOMEFROM").equals("备料")||blanckdata.getStr("BLANKCOMEFROM").equals("借料")) && apsProcessOperationDo.getIfblankprocess().equals("是")) {
                         hasFirst = false;
                         secondProcessId = apsProcessOperationDo.getNextprocessid();
                     }