From 21bb64bf45bb46c7d65361c0f73ce499d60b14e9 Mon Sep 17 00:00:00 2001
From: DOUDOU <877258667@qq.com>
Date: Tue, 15 Nov 2022 14:54:43 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"2022-11-15=20=E6=8D=A2=E6=96=99?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6=E5=81=9C=E6=9C=BA=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E8=B0=83=E6=9C=BA=E7=9A=84=E9=AA=8C=E8=AF=81"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 951973c9ada0e568ad0dd20e9cd985f527f7adf0.
---
 .../schedule/service/impl/ScheduleServiceImpl.java        | 8 ++++----
 1 file changed, 4 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 e65099d..96573ce 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
@@ -1863,10 +1863,10 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
 
         //检查是否是上材料的时机
-        //String resultCode = this.checkProcessMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, currentTime);
-        //if ("N".equalsIgnoreCase(resultCode)) {
-            //throw new XJException("当前卷号不在调试过程中/不处于停机状态（停机原因是更换材料）,不允许上/更换材料!");
-        //}
+        String resultCode = this.checkProcessMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, currentTime);
+        if ("N".equalsIgnoreCase(resultCode)) {
+            throw new XJException("当前卷号不在调试过程中/不处于停机状态（停机原因是更换材料）,不允许上/更换材料!");
+        }
 
         //调用存储过程检查是否可以接料
         //调用是否可以切换刀具的存储过程