From 36dcec12994c82fffe2a86a6acf12ecbd071fffb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 一月 2025 16:26:18 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 1c7f530..6434f28 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
@@ -87,7 +87,7 @@
public synchronized Agv execute(Task task) {
List<Agv> availableAgvList = getAvailableAgv();
if (Cools.isEmpty(availableAgvList)) {
- log.warn("No available agv to assign the task[{}]", task.getSeqNum());
+// log.warn("No available agv to assign the task[{}]", task.getSeqNum());
return null;
}
List<String> availableAgvNos = availableAgvList.stream().map(Agv::getUuid).distinct().collect(Collectors.toList());
@@ -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());
@@ -187,17 +187,17 @@
// calculate wight = backpack + distance
private int calcAllocateWeight(String agvNo, Task task) {
int weight = 0;
- Agv agv = agvService.selectByUuid(agvNo);
+ Long agvId = agvService.getAgvId(agvNo);
// backpack
- List<Task> transportTasks = taskService.findTransportTasksByAgv(agv.getId());
+ List<Task> transportTasks = taskService.findTransportTasksByAgv(agvId);
if (!Cools.isEmpty(transportTasks)) {
weight = weight + transportTasks.size() * 100000;
}
// distance
// from
- AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agvId);
Code agvCurrCode = codeService.getById(agvDetail.getRecentCode());
Double[] fromPosition = new Double[]{agvCurrCode.getX(), agvCurrCode.getY()};
// to
--
Gitblit v1.9.1