From 0ab29c6d89777a832e21c5d2934e3e3e1544c6d8 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 19 十月 2025 08:51:46 +0800
Subject: [PATCH] 联调

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 5833612..8e3ac1c 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -772,14 +772,18 @@
         if (Cools.isEmpty(wrkMast)) {
             throw new CoolException(workNo + "宸ヤ綔妗d笉瀛樺湪");
         }
-        if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() >= 14) {
+        if (wrkMast.getWrkSts() == 4 || (wrkMast.getWrkSts() >= 14 && wrkMast.getWrkSts() <= 15)) {
             throw new CoolException("褰撳墠宸ヤ綔妗e凡瀹屾垚");
         }
         // 鍏ュ簱 + 搴撲綅杞Щ
         if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
             wrkMast.setWrkSts(4L);
             // 鍑哄簱
-        } else if (wrkMast.getWrkSts() > 10) {
+        } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() < 15) {
+            wrkMast.setWrkSts(14L);
+        }else if(wrkMast.getWrkSts() >= 103 && wrkMast.getWrkSts() <= 105){
+            wrkMast.setWrkSts(4L);
+        }else if (wrkMast.getWrkSts() >= 106 && wrkMast.getWrkSts() <=108){
             wrkMast.setWrkSts(14L);
         }
         Date now = new Date();
@@ -930,7 +934,7 @@
         String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣�
         String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬�
         // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級
-        if (wrkMast.getWrkSts() < 4) {
+        if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts()>= 103 && wrkMast.getWrkSts() <= 105)) {
             locNo = wrkMast.getLocNo();
             locSts = "O";
 
@@ -947,7 +951,7 @@
                 locMastService.updateById(locMast);
             }
             // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛�
-        } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
+        } else if ((wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14)) {
             locNo = wrkMast.getSourceLocNo();
             // 鍑哄簱 ===>> F.鍦ㄥ簱
             if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {

--
Gitblit v1.9.1