From 877b2519157cea762b1e63e9c57c09614216d684 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 24 七月 2025 19:27:46 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ShuttleController.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index f7bdebb..0f41a90 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -35,6 +35,7 @@
 import com.zy.core.model.param.ShuttleMoveLocParam;
 import com.zy.core.model.protocol.ShuttleProtocol;
 import com.zy.core.thread.ShuttleThread;
+import com.zy.core.thread.TrafficControlThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -346,6 +347,9 @@
             assignCommand.setCommands(commands);
         } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
             //澶嶄綅
+            TrafficControlThread trafficControlThread = (TrafficControlThread) SlaveConnection.get(SlaveType.TrafficControl, 1);
+            trafficControlThread.cancelTrafficControl(shuttleProtocol.getShuttleNo(), shuttleProtocol.getTaskNo());
+
             shuttleThread.setSyncTaskNo(0);//宸ヤ綔鍙锋竻绌�
             shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
             shuttleThread.setPakMk(true);//浣滀笟鏍囪澶嶄綅

--
Gitblit v1.9.1