From c851a06ffee1079c178d2e5a64b2f1d306c6f9a9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 17:44:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java | 4 ++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 7 +++++--
zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml | 3 ---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
index 34b83ff..8c50d32 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
@@ -289,6 +289,7 @@
if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
throw new BusinessException("destSta锛�" + destSta.getStaNo() + " 棰勭害澶辫触");
}
+ staReserveService.allocateCallBack(destSta, task, agv.getId());
// task
task.setOriLoc(oriLoc.getId());
@@ -310,6 +311,7 @@
if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
throw new BusinessException("oriSta锛�" + oriSta.getStaNo() + " 棰勭害澶辫触");
}
+ staReserveService.allocateCallBack(oriSta, task, agv.getId());
// destLoc
if (!Cools.isEmpty(param.getEndLocNo())) {
@@ -350,6 +352,7 @@
if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
throw new BusinessException("oriSta锛�" + oriSta.getStaNo() + " 棰勭害澶辫触");
}
+ staReserveService.allocateCallBack(oriSta, task, agv.getId());
// destSta
if (!Cools.isEmpty(param.getEndStaNo())) {
@@ -364,6 +367,7 @@
if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
throw new BusinessException("destSta锛�" + destSta.getStaNo() + " 棰勭害澶辫触");
}
+ staReserveService.allocateCallBack(destSta, task, agv.getId());
// task
task.setOriSta(oriSta.getId());
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index 89cdf17..ce88ece 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -128,9 +128,10 @@
public Boolean cancel(Long segmentId, Long userId) {
Date now = new Date();
Segment segment = this.getById(segmentId);
+ Long travelId = segment.getTravelId();
String groupId = segment.getGroupId();
// update segment list
- List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getGroupId, groupId));
+ List<Segment> segmentList = this.list(new LambdaQueryWrapper<Segment>().eq(Segment::getTravelId, travelId));
for (Segment seg : segmentList) {
Task task = taskService.getById(segment.getTaskId());
if (task != null &&
@@ -145,7 +146,9 @@
}
this.processNext(segmentList);
// update action list
- actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
+ if (!Cools.isEmpty(groupId)) {
+ actionService.updateStsByGroupId(groupId, ActionStsType.EXPIRED.val());
+ }
return Boolean.TRUE;
}
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
index 77ad9ab..276331e 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
@@ -13,7 +13,6 @@
AND type = #{type}
AND deleted = 0
AND status = 1
--- AND state IN ('WAITING','RESERVED')
</update>
<update id="updateStateToWaiting">
@@ -27,7 +26,6 @@
AND type = #{type}
AND deleted = 0
AND status = 1
--- AND state IN ('RESERVED','WAITING')
</update>
<update id="updateStateBackToWaiting">
@@ -40,7 +38,6 @@
AND type = #{type}
AND deleted = 0
AND status = 1
--- AND state = 'WAITING'
</update>
</mapper>
--
Gitblit v1.9.1