From fdb6c647f4b9bf1a9dae9349cfd64a5e533433d2 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期四, 21 九月 2023 09:38:59 +0800
Subject: [PATCH] #补丁

---
 src/main/java/com/zy/asrs/controller/WrkMastController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 8b1f0d1..70f6812 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -123,6 +123,9 @@
     }
 
     public Boolean juBge(Long wrkSts1,WrkMast wrkMast1){
+        if (wrkSts1>20){
+            throw new CoolException("澶т簬20鐨勭姸鎬佷笉鑳借繘琛屼慨鏀癸紒锛侊紒");
+        }
         switch (wrkMast1.getIoType()){
             case 1:
             case 10:
@@ -142,8 +145,6 @@
                             throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗f墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佸紓甯革紝璇风淮鎶ゅ簱浣嶆暟鎹�");
                         }
                     }
-                    return false;
-                }else if (wrkSts1>20){
                     return false;
                 }
                 return true;
@@ -165,8 +166,6 @@
                             throw new CoolException("宸ヤ綔鍙�"+wrkMast1.getWrkNo()+"宸ヤ綔妗f墍瀵瑰簲鐨勫簱浣嶅彿鐘舵�佸紓甯革紝璇风淮鎶ゅ簱浣嶆暟鎹�");
                         }
                     }
-                    return false;
-                }else if (wrkSts1>20){
                     return false;
                 }
                 return true;
@@ -419,6 +418,7 @@
             wrkDetl.setModiTime(now);
             wrkDetl.setAppeUser(1L);
             wrkDetl.setModiUser(1L);
+            wrkDetl.setMatType(locDetl.getMatType());
             wrkDetlService.insert(wrkDetl);
 
         }

--
Gitblit v1.9.1