From 27917bf679759fb1aadcbf148db27b0407053db5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 15 一月 2025 16:36:43 +0800
Subject: [PATCH] 优化库位检索逻辑,移除冗余参数

---
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 eecfc9d..d95a035 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -507,6 +507,9 @@
             case 30:
                 br = 3;
                 break;
+            case 31:
+                br = 6;
+                break;
             case 40:
                 br = 5;
                 break;
@@ -525,6 +528,8 @@
             locType = 2;
         } else if (containerType == 30) {
             locType = 3;
+        } else if (containerType == 31) {
+            locType = 6;
         } else {
             locType = agvBasDevp.getLocType1();
         }
@@ -623,6 +628,9 @@
 
         // 绔欑偣妫�娴�
         AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
+        if (Cools.isEmpty(agvBasDevp)) {
+            throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦�");
+        }
         if (!agvBasDevp.getLocSts().equals("O")) {
             throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts() + ",鏃犳硶杩涜绌烘澘鍑哄簱");
         }
@@ -1242,6 +1250,9 @@
             throw new CoolException(matnr + "鍟嗗搧缁存姢澶辫触");
         }
         OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), batch, csocode);
+        if (orderDetl == null) {
+            throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+        }
         AgvWrkDetl wrkDetl = new AgvWrkDetl();
         wrkDetl.sync(mat);
         if (orderDetl != null) {

--
Gitblit v1.9.1