From eda0ec8e97499e151cc254aaedfe4894573865c8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 17 六月 2025 08:32:21 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
index 58f74b5..3d3b55c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java
@@ -51,20 +51,23 @@
* get available agv list which is idle
*/
private List<String> getAvailableAgvNos(List<String> agvNos) {
- List<Agv> agvList = new ArrayList<>();
- if (Cools.isEmpty(agvNos)) {
- // global
- agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
- } else {
- // local
- agvList = agvNos.stream().map(agvService::selectByUuid).filter(Agv::getStatusBool).collect(Collectors.toList());
+// List<Agv> agvList = new ArrayList<>();
+// if (Cools.isEmpty(agvNos)) {
+// // global
+// agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+// } else {
+// // local
// for (String agvNo : agvNos) {
// Agv agv = agvService.selectByUuid(agvNo);
// if (agv.getStatusBool()) {
// agvList.add(agv);
// }
// }
- }
+// }
+
+ List<Agv> agvList = Cools.isEmpty(agvNos)
+ ? agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val))
+ : agvNos.stream().map(agvService::selectByUuid).filter(Agv::getStatusBool).collect(Collectors.toList());
List<String> result = new ArrayList<>();
for (Agv agv : agvList) {
@@ -79,7 +82,7 @@
continue;
}
// 2. in idle status
- if (!agvService.judgeEnable(agv.getId(), true)) {
+ if (!agvService.judgeEnable(agv.getId(), true,false)) {
continue;
}
--
Gitblit v1.9.1