未结生产订单结束卷 sxm 2022-3-17

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1968,10 +1968,7 @@ public class ScheduleServiceImpl implements ScheduleService {
                 String msg = String.valueOf(resultMap.get("resultMsg"));
                 throw new RRException(msg);
             }
-            if ("Y".equals(pageData.getCreateNewRollFlag())) {
-                //调用存储过程校验每一个卷的数量
-                this.finishRollProcessSFDCNewRoll(site, orderNo, itemNo, seqNo,rollNo, pageData.getNewCreateRollQty(), pageData.getOperatorId());
-            }
+
             return resultMap;
         }
         return null;
@@ -2145,6 +2142,10 @@ public class ScheduleServiceImpl implements ScheduleService {
         if ("Y".equalsIgnoreCase(exceptionFlag)) {
             this.finishRollProcessException(site, orderNo, itemNo, seqNo, rollNo, exceptionReason, username);
         }
+        // 调用未结生产生产订单下机卷
+        if ("Y".equals(pageData.getCreateNewRollFlag())) {
+            this.finishRollProcessSFDCNewRoll(site, orderNo, itemNo, seqNo,rollNo, pageData.getNewCreateRollQty(), pageData.getOperatorId());
+        }
     }
 
     /**