From c8665267b20dba943566b9ddbd40364cb7870234 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 17 Mar 2022 13:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=BB=93=E7=94=9F=E4=BA=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BB=93=E6=9D=9F=E5=8D=B7=20=20sxm=202022-3-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/service/impl/ScheduleServiceImpl.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 07d6491..b148163 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/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());
+        }
     }
 
     /**