From efbd157c0d810c39d04cd86752e769a3f3a1a1fc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 九月 2025 16:57:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 0f41a90..a7716ca 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -348,7 +348,7 @@
} else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
//澶嶄綅
TrafficControlThread trafficControlThread = (TrafficControlThread) SlaveConnection.get(SlaveType.TrafficControl, 1);
- trafficControlThread.cancelTrafficControl(shuttleProtocol.getShuttleNo(), shuttleProtocol.getTaskNo());
+ trafficControlThread.forceCancelTrafficControl(shuttleProtocol.getShuttleNo());
shuttleThread.setSyncTaskNo(0);//宸ヤ綔鍙锋竻绌�
shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
@@ -368,6 +368,10 @@
//婕旂ず妯″紡-鍏�
shuttleThread.enableDemo(false);
return R.ok();
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.CLEAR_PATH) {
+ //娓呴櫎璺緞
+ shuttleAction.clearPath(shuttleProtocol.getShuttleNo());
+ return R.ok();
} else {
throw new CoolException("鏈煡鍛戒护");
}
--
Gitblit v1.9.1