From 4d45de01e35f8b271e5ba25439b574a8b67bc5eb Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 26 十二月 2025 14:00:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
index 71829bb..5ddf526 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java
@@ -64,7 +64,9 @@
return Collections.emptyList();
}
List<Long> areaIds = areaGovernService.queryAreas(code);
- return areaAgvService.queryAgvIdsByAreaIds(areaIds);
+ List<Long> agvIds = areaAgvService.queryAgvIdsByAreaIds(areaIds);
+ agvIds.addAll(areaAgvService.findAgvIdsWithoutAreaAgv());
+ return agvIds;
}
public List<String> getAgvNosByStaNo(String staNo) {
@@ -77,4 +79,13 @@
return areaGovernService.queryCodes(areaIds);
}
+ // 鍒ゆ柇杞﹁締鏄惁琚玜rea缁戝畾锛屽鏋滅粦瀹氳繑鍥� true锛� 濡傛灉娌＄粦瀹氳繑鍥� false
+ public Boolean isAgvExistsInAnyArea(Long agvId) {
+ List<Long> agvIdsWithoutAreaAgv = areaAgvService.findAgvIdsWithoutAreaAgv(); // 娌℃湁琚粦瀹氱殑杞﹁締闆嗗悎
+ if (Cools.isEmpty(agvIdsWithoutAreaAgv)) {
+ return true;
+ }
+ return !agvIdsWithoutAreaAgv.contains(agvId);
+ }
+
}
--
Gitblit v1.9.1