From 4c9169967a879b54c04b0754ab9830a5a6baa708 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 18 三月 2025 14:30:48 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 67c5841..e396ba6 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
@@ -177,10 +177,10 @@
return new ArrayList<>();
}
return agvNoList.stream().filter(agvNo -> {
- Agv agv = agvService.selectByUuid(agvNo);
+ Long agvId = agvService.getAgvId(agvNo);
+ int transportTasksCount = taskService.findTransportTasksCountByAgv(agvId);
AgvModel agvModel = agvModelService.getByAgvNo(agvNo);
- List<Task> transportTasks = taskService.findTransportTasksByAgv(agv.getId());
- return transportTasks.size() < agvModel.getBackpack();
+ return transportTasksCount < agvModel.getBackpack();
}).collect(Collectors.toList());
}
@@ -190,9 +190,9 @@
Long agvId = agvService.getAgvId(agvNo);
// backpack
- List<Task> transportTasks = taskService.findTransportTasksByAgv(agvId);
- if (!Cools.isEmpty(transportTasks)) {
- weight = weight + transportTasks.size() * 100000;
+ Integer transportTasksCount = taskService.findTransportTasksCountByAgv(agvId);
+ if (!Cools.isEmpty(transportTasksCount)) {
+ weight = weight + transportTasksCount * 100000;
}
// distance
--
Gitblit v1.9.1