From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 09:38:29 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 b389fe9..5d6cdb2 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
@@ -178,7 +178,7 @@
}
return agvNoList.stream().filter(agvNo -> {
Agv agv = agvService.selectByUuid(agvNo);
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvModel agvModel = agvModelService.getByAgvNo(agvNo);
List<Task> transportTasks = taskService.findTransportTasksByAgv(agv.getId());
return transportTasks.size() < agvModel.getBackpack();
}).collect(Collectors.toList());
@@ -232,13 +232,13 @@
return -weight;
}
- public Boolean validCapacityOfLane(Agv agv, Code code) {
+ public Boolean validCapacityOfLane(String agvNo, Code code) {
Lane lane = laneService.search(code.getData());
if (null != lane) {
Integer maxAgvCountInLane = configService.getVal("maxAgvCountInLane", Integer.class);
List<String> agvNosByLane = this.findAgvNosByLane(lane);
- agvNosByLane.remove(agv.getUuid());
+ agvNosByLane.remove(agvNo);
if (agvNosByLane.size() >= maxAgvCountInLane) {
return false;
}
--
Gitblit v1.9.1