From a71d7a7a4b437a718e68ec41dcecd30ee7ff55e7 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期日, 04 一月 2026 09:45:30 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
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 bfbc67f..513df59 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
@@ -276,7 +276,7 @@
int backpackLev = 0;
int backpack = agvService.getBackpack(agvId);
List<Integer> usedBackpacks = segmentService.selectUsedBackpacks(currSeg.getTravelId(), agvId);
- if (usedBackpacks.size() == backpackLev) {
+ if (usedBackpacks.size() >= backpack) {
throw new CoolException("[Agv:" + agvNo + "] allocate inbound segment failed: no idle backpack to use");
}
for (int lev = 1; lev <= backpack; lev++) {
@@ -293,7 +293,8 @@
currSeg.setState(SegmentStateType.INIT.toString());
currSeg.setUpdateTime(now);
if (!segmentService.updateById(currSeg)) {
- log.error("Segment [{}] failed to update 锛侊紒锛�", currSeg.getGroupId() + " - " + currSeg.getSerial());
+// log.error("Segment [{}] failed to update 锛侊紒锛�", currSeg.getGroupId() + " - " + currSeg.getSerial());
+ throw new CoolException("failed to update segment [" + currSeg.getGroupId() + "-" + currSeg.getSerial() + "] failed");
}
// new oriSta seg
@@ -310,7 +311,8 @@
loadSeg.setCreateTime(now);
loadSeg.setUpdateTime(now);
if (!segmentService.save(loadSeg)) {
- log.error("Segment [{}] failed to save 锛侊紒锛�", loadSeg.getTravelId() + " - " + loadSeg.getSerial());
+// log.error("Segment [{}] failed to save 锛侊紒锛�", loadSeg.getTravelId() + " - " + loadSeg.getSerial());
+ throw new CoolException("failed to save segment [" + loadSeg.getGroupId() + "-" + loadSeg.getSerial() + "] failed");
}
// place segment
@@ -368,7 +370,7 @@
});
// get placeSeg serial
- int placeSegSerial = 9999;
+ int placeSegSerial;
// query placeSeg idx
int idx = -1;
for (int i = 0; i < destPosList.size(); i++) {
@@ -383,11 +385,10 @@
}
// 鍚庣户鐐�
- TaskPosDto afterTaskPos = ((idx + 1) < destPosList.size()) ? destPosList.get(idx + 1) : null;
- if (null == afterTaskPos) {
- // loadSeg is the last one
+ if (idx + 1 == destPosList.size()) {
placeSegSerial = destSegList.get(destSegList.size() - 1).getSerial() + 1;
} else {
+ TaskPosDto afterTaskPos = destPosList.get(idx + 1);
Segment afterSeg = destSegList.stream()
.filter(destSeg -> Objects.equals(destSeg.getId(), afterTaskPos.getSegId()))
.findFirst()
@@ -424,7 +425,8 @@
placeSeg.setCreateTime(now);
placeSeg.setUpdateTime(now);
if (!segmentService.save(placeSeg)) {
- log.error("Segment [{}] failed to save 锛侊紒锛�", placeSeg.getTravelId() + " - " + placeSeg.getSerial());
+// log.error("Segment [{}] failed to save 锛侊紒锛�", placeSeg.getTravelId() + " - " + placeSeg.getSerial());
+ throw new CoolException("failed to save segment [" + placeSeg.getGroupId() + "-" + placeSeg.getSerial() + "] failed");
}
// update task
--
Gitblit v1.9.1