From 17420fde727bc00f123b332335df8e37e3871226 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 一月 2026 14:52:19 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 389c575..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() + "浠诲姟淇濆瓨澶辫触");
         }
@@ -289,13 +289,13 @@
                 if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                     throw new BusinessException("destSta锛�" + destSta.getStaNo() + " 棰勭害澶辫触");
                 }
-                staReserveService.allocateCallBack(task, agv.getId());
-
                 // 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
@@ -311,7 +311,6 @@
                 if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                     throw new BusinessException("oriSta锛�" + oriSta.getStaNo() + " 棰勭害澶辫触");
                 }
-                staReserveService.allocateCallBack(task, agv.getId());
 
                 // destLoc
                 if (!Cools.isEmpty(param.getEndLocNo())) {
@@ -337,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
@@ -352,7 +353,7 @@
                 if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                     throw new BusinessException("oriSta锛�" + oriSta.getStaNo() + " 棰勭害澶辫触");
                 }
-                staReserveService.allocateCallBack(task, agv.getId());
+
 
                 // destSta
                 if (!Cools.isEmpty(param.getEndStaNo())) {
@@ -367,13 +368,14 @@
                 if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                     throw new BusinessException("destSta锛�" + destSta.getStaNo() + " 棰勭害澶辫触");
                 }
-                staReserveService.allocateCallBack(task, agv.getId());
 
                 // task
                 task.setOriSta(oriSta.getId());
                 task.setOriCode(oriSta.getCode());
                 task.setDestSta(destSta.getId());
                 task.setDestCode(destSta.getCode());
+
+                staReserveService.allocateCallBack(task, agv.getId());
                 break;
             default:
                 break;

--
Gitblit v1.9.1