From 816dd2c85762f5430842e61f17c467c29bfdc76e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 31 五月 2024 08:36:35 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index b71cbd0..f875725 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -647,7 +647,10 @@
                 }
             }
             // 鑷姩璋冩嫧鍑哄簱鍙栨秷
-        } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111) {
+        } else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 111 || wrkMast.getIoType() == 112) {
+            if (wrkMast.getIoType() == 112) {
+                throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
+            }
             // 婧愬簱浣�
             String locNo = wrkMast.getSourceLocNo();
             // 鐩爣搴撲綅
@@ -658,9 +661,15 @@
                     agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
                 }
             } else {
-                if (wrkMast.getWrkSts() != 22) {
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
+                if (wrkMast.getWrkSts() != 207L && wrkMast.getWrkSts() != 205L) {
+                    if (wrkMast.getWrkSts() != 22) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(targetLocNo,"O","",wrkMast.getWhsType().shortValue());
+                    }
+                } else {
+                    throw new CoolException("褰撳墠浣滀笟涓嶈兘鍙栨秷锛�");
                 }
+
+
             }
 
             List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));

--
Gitblit v1.9.1