From 58d62142408b64ddd597aab2ed06138300b4a571 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 31 十二月 2025 10:42:20 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 20 ++++++++++++++++----
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateService.java | 30 ++++++++++++++++++------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateSupport.java | 9 +++++++++
3 files changed, 43 insertions(+), 16 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..eee2bb3 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,31 @@
return result;
}
- public synchronized Agv execute(Task task) {
+ public synchronized String execute(Task task, AllocateSupport support) {
// 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)) {
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)) {
return outboundAgv;
}
- return this.normalExecute(task);
+ String normalAgv = this.normalExecute(task);
+ if (!Cools.isEmpty(normalAgv)) {
+ support.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 +141,7 @@
task.setDestLaneHash(filterLaneDto.getDestinationLane().getHashCode());
}
- return agvService.selectByUuid(agvNo);
+ return agvNo;
}
/**
@@ -147,7 +153,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 +183,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 +215,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;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateSupport.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateSupport.java
new file mode 100644
index 0000000..5536983
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AllocateSupport.java
@@ -0,0 +1,9 @@
+package com.zy.acs.manager.core.service;
+
+import com.zy.acs.manager.manager.entity.Task;
+
+public interface AllocateSupport {
+
+ void success(Task task, String agvNo);
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 10ff983..8853796 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -247,14 +247,26 @@
List<Long> taskIds = taskList.stream().map(Task::getId).distinct().collect(Collectors.toList());
for (Task task : taskList) {
- Agv agv = allocateService.execute(task, () => {
-
+ String agvNo = allocateService.execute(task, new AllocateSupport() {
+ @Override
+ public void success(Task task, String agvNo) {
+ if (Cools.isEmpty(agvNo)) {
+ return;
+ }
+ task.setAgvId(agvService.getAgvId(agvNo));
+ task.setTaskSts(TaskStsType.WAITING.val());
+ task.setIoTime(now);
+ task.setUpdateTime(now);
+ if (!taskService.updateById(task)) {
+ throw new BusinessException("seqNum: " + task.getSeqNum() + " failed to update");
+ }
+ }
});
- if (null == agv) {
+ if (Cools.isEmpty(agvNo)) {
// log.warn("Task[{}] has an issue锛� because it failed to check out agv which is idle...", task.getSeqNum());
continue;
}
- task.setAgvId(agv.getId());
+ task.setAgvId(agvService.getAgvId(agvNo));
task.setTaskSts(TaskStsType.WAITING.val());
task.setIoTime(now);
task.setUpdateTime(now);
--
Gitblit v1.9.1