From 73121ec6ec5219dcd8f2c3c5271e87d51bad4420 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期五, 23 一月 2026 16:12:37 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 8ad50c7..4763a54 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
@@ -64,7 +64,6 @@
List<String> result = new ArrayList<>();
for (Agv agv : agvList) {
if (!hasRunning) {
- // 1. without running tasks
if (0 < taskService.count(new LambdaQueryWrapper<Task>()
.eq(Task::getAgvId, agv.getId())
.and(i -> i
@@ -75,10 +74,13 @@
)) {
continue;
}
- }
- // 2. in idle status
- if (!agvService.judgeEnable(agv.getId(), true)) {
- continue;
+ if (!agvService.judgeEnable(agv.getId(), true, true)) {
+ continue;
+ }
+ } else {
+ if (!agvService.judgeEnable(agv.getId(), true, false)) {
+ continue;
+ }
}
result.add(agv.getUuid());
@@ -227,15 +229,11 @@
if (null == currTravelInRollerWaiting) {
continue;
}
-// Segment currSeg = segmentService.getRollerWaiting(agvId, sta.getCode(), TaskPosDto.PosType.ORI_STA);
-// if (null == currSeg) {
-// continue;
-// }
// has enough backpack space to load
- Integer backpack = agvService.getBackpack(agvId);
+ Integer backpackCap = agvService.getBackpack(agvId);
List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(currTravelInRollerWaiting.getId(), agvId);
- if (usedBackpacks.size() >= backpack) {
+ if (usedBackpacks.size() >= backpackCap) {
continue;
}
--
Gitblit v1.9.1