From f049bb4a433b3fba1859b78e097689628f72af45 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 一月 2026 16:00:03 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
index d0ad1cb..3511d61 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
@@ -269,6 +269,8 @@
             if (!matches) {
                 throw new CoolException("鏉$爜涓庣珯鐐逛笉鍖归厤");
             }
+        } else {
+            throw new CoolException("鏁版嵁寮傚父锛氶獙璇佸熀纭�淇℃伅");
         }
 
         return basStation;
@@ -331,12 +333,14 @@
 //            boolean matches = containers.stream()
 //                    .map(BasContainer::getCodeType)
 //                    .anyMatch(codeType -> barcode.matches(codeType));
-            if (!matches) {
-                throw new CoolException("鏉$爜涓庣珯鐐逛笉鍖归厤");
-            }
             if (!matches2) {
                 throw new CoolException("鏌ヨ鍒扮殑瀹瑰櫒涓嶆敮鎸佺洰鏍囧簱鍖�");
             }
+            if (!matches) {
+                throw new CoolException("鏉$爜涓庣珯鐐逛笉鍖归厤");
+            }
+        } else {
+            throw new CoolException("鏁版嵁寮傚父锛氶獙璇佸熀纭�淇℃伅");
         }
 
         return basStation;

--
Gitblit v1.9.1