From 4937f052ec2c91b3fdcbb669aef7991912cde98e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 31 十二月 2025 10:48:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 c5ed4b9..f2c6663 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
@@ -91,25 +91,33 @@
return result;
}
- public synchronized Agv execute(Task task) {
+ public synchronized String execute(Task task, AllocateSupport inbound, AllocateSupport normal) {
// inbound roller station
Sta rollerOriSta = getInboundRollerSta(task);
- Agv inboundAgv = tryAllocateForRoller(task, rollerOriSta, true);
- if (inboundAgv != null) {
+ String inboundAgv = tryAllocateForRoller(task, rollerOriSta, true);
+ if (!Cools.isEmpty(inboundAgv)) {
+ inbound.success(task, inboundAgv);
return inboundAgv;
}
// outbound roller station
Sta rollerDestSta = getOutboundRollerSta(task);
- Agv outboundAgv = tryAllocateForRoller(task, rollerDestSta, false);
- if (outboundAgv != null) {
+ String outboundAgv = tryAllocateForRoller(task, rollerDestSta, false);
+ if (!Cools.isEmpty(outboundAgv)) {
+ normal.success(task, outboundAgv);
return outboundAgv;
}
- return this.normalExecute(task);
+ String normalAgv = this.normalExecute(task);
+ if (!Cools.isEmpty(normalAgv)) {
+ normal.success(task, normalAgv);
+ return normalAgv;
+ }
+
+ return null;
}
- private Agv tryAllocateForRoller(Task task, Sta rollerSta, boolean inbound) {
+ private String tryAllocateForRoller(Task task, Sta rollerSta, boolean inbound) {
if (rollerSta == null) {
return null;
}
@@ -135,7 +143,7 @@
task.setDestLaneHash(filterLaneDto.getDestinationLane().getHashCode());
}
- return agvService.selectByUuid(agvNo);
+ return agvNo;
}
/**
@@ -147,7 +155,7 @@
*
* it can break the limit of the number of agv backpack
*/
- public synchronized Agv normalExecute(Task task) {
+ public synchronized String normalExecute(Task task) {
List<String> availableAgvNos = this.getAvailableAgvNos(agvAreaDispatcher.getAgvNosByTask(task), false);
// List<String> availableAgvNos = this.getAvailableAgvNos(null);
if (Cools.isEmpty(availableAgvNos)) {
@@ -177,7 +185,7 @@
task.setDestLaneHash(destinationLane.getHashCode());
}
- return agvService.selectByUuid(actualAvailableAgvNos.get(0));
+ return actualAvailableAgvNos.get(0);
}
private String checkoutAgvForInboundRoller(Task task, Sta sta, List<String> availableAgvNos) {
@@ -209,14 +217,14 @@
)
);
if (taskCnt == 0) {
- break;
+ continue;
}
// has enough backpack space to load
Integer backpack = agvService.getBackpack(agvId);
int countRemainingBackpack = segmentService.countRemainingBackpack(null, agvId);
if (countRemainingBackpack >= backpack) {
- break;
+ continue;
}
return agvNo;
--
Gitblit v1.9.1