From ee536f9aedaf642d64ba2681778fd4e74731d00c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 16 一月 2026 16:47:28 +0800
Subject: [PATCH] lsh#空板流程
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..7ddb9d0 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;
@@ -319,8 +321,8 @@
for (BasContainer container : containers) {
String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
if (barcode.matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
- List<String> areaList2 = JSONObject.parseArray(container.getAreas(), String.class);
- if (!areaList2.contains(area)) {
+ List<Integer> areaList2 = container.getAreas();
+ if (!areaList2.contains(Integer.valueOf(area))) {
matches2 = false;
continue;
}
@@ -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