From c33901750d296f75180f6051fbb743738ffcae7e Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 18 五月 2023 08:46:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 6182266..5334814 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -573,8 +573,8 @@
             throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
         }else if (Cools.isEmpty(param.getPackName())){
             throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
-        }else if (Cools.isEmpty(param.getSettingTimes())){
-            throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
+//        }else if (Cools.isEmpty(param.getSettingTimes())){
+//            throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
         }else if (Cools.isEmpty(param.getRequestTime())){
             throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
         }
@@ -612,6 +612,7 @@
             if (!matService.insert(matNew)){
                 throw new CoolException(param.getPackName() + "鍟嗗搧妗f鑷姩鐢熸垚澶辫触");
             }
+            mat=matNew;
 //            throw new CoolException(param.getPackName() + "鍟嗗搧妗f涓嶅瓨鍦�");
         }
         WaitPakin waitPakin = new WaitPakin();
@@ -627,7 +628,7 @@
         waitPakin.setAppeTime(new Date());
         waitPakin.setModiUser(null);
         waitPakin.setModiTime(new Date());
-        waitPakin.setDeadWarn(param.getSettingTimes());
+        waitPakin.setDeadWarn(mat.getDeadWarn());
         if (!waitPakinService.insert(waitPakin)) {
             throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
         }

--
Gitblit v1.9.1