From 3bb3a6268339027643b3e85b5162f78788b30086 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 一月 2026 07:56:05 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 89173d1..0814a51 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
@@ -171,7 +171,7 @@
task.setPriority(999);
task.setIoTime(now);
task.setStartTime(now);
- task.setMemo("HANDLE");
+ task.setMemo("AUTO");
if (!taskService.save(task)) {
throw new BusinessException(task.getSeqNum() + "浠诲姟淇濆瓨澶辫触");
}
@@ -193,12 +193,20 @@
if (null == endCode) {
return R.error();
}
+ if (!taskService.removeById(task.getId())) {
+ throw new BusinessException("failed to remove task");
+ }
+ task = null;
if (!mainLockWrapService.buildMinorTask(agv.getId(), param.getTaskMode(), endCode.getData(), null)) {
return R.error();
}
break;
case TO_CHARGE:
case TO_STANDBY:
+ if (!taskService.removeById(task.getId())) {
+ throw new BusinessException("failed to remove task");
+ }
+ task = null;
if (!mainLockWrapService.buildMinorTask(agv.getId(), param.getTaskMode(), null, null)) {
return R.error();
}
@@ -281,12 +289,13 @@
if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
throw new BusinessException("destSta锛�" + destSta.getStaNo() + " 棰勭害澶辫触");
}
-
// task
task.setOriLoc(oriLoc.getId());
task.setOriCode(oriLoc.getCode());
task.setDestSta(destSta.getId());
task.setDestCode(destSta.getCode());
+
+ staReserveService.allocateCallBack(task, agv.getId());
break;
case STA_TO_LOC:
// oriSta
@@ -327,6 +336,8 @@
task.setOriCode(oriSta.getCode());
task.setDestLoc(destLoc.getId());
task.setDestCode(destLoc.getCode());
+
+ staReserveService.allocateCallBack(task, agv.getId());
break;
case STA_TO_STA:
// oriSta
@@ -342,6 +353,7 @@
if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
throw new BusinessException("oriSta锛�" + oriSta.getStaNo() + " 棰勭害澶辫触");
}
+
// destSta
if (!Cools.isEmpty(param.getEndStaNo())) {
@@ -362,13 +374,17 @@
task.setOriCode(oriSta.getCode());
task.setDestSta(destSta.getId());
task.setDestCode(destSta.getCode());
+
+ staReserveService.allocateCallBack(task, agv.getId());
break;
default:
break;
}
- if (!taskService.updateById(task)) {
- throw new BusinessException("浠诲姟鏇存柊澶辫触");
+ if (null != task) {
+ if (!taskService.updateById(task)) {
+ throw new BusinessException("浠诲姟鏇存柊澶辫触");
+ }
}
return R.ok();
}
--
Gitblit v1.9.1