From 745685781d952e92c03124842a4d58514eb7ff8e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 26 九月 2025 15:57:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 4 ++++
src/main/java/com/zy/core/enums/ShuttleTaskModeType.java | 1 +
src/main/webapp/views/shuttleNew.html | 5 +++++
3 files changed, 10 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 a7716ca..39a37da 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -372,6 +372,10 @@
//娓呴櫎璺緞
shuttleAction.clearPath(shuttleProtocol.getShuttleNo());
return R.ok();
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.RESTART_CALC_PATH) {
+ //閲嶆柊璁＄畻璺緞
+ shuttleThread.restartCalcPath();
+ return R.ok();
} else {
throw new CoolException("鏈煡鍛戒护");
}
diff --git a/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java b/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
index 1a588bc..f2d1ae4 100644
--- a/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
@@ -20,6 +20,7 @@
CHARGE_ON(15, "鍏呯數-寮�"),
CHARGE_OFF(16, "鍏呯數-鍏�"),
CLEAR_PATH(17, "娓呴櫎璺緞"),
+ RESTART_CALC_PATH(18, "閲嶆柊璁＄畻璺緞"),
;
public Integer id;
diff --git a/src/main/webapp/views/shuttleNew.html b/src/main/webapp/views/shuttleNew.html
index 1314abe..138a1ff 100644
--- a/src/main/webapp/views/shuttleNew.html
+++ b/src/main/webapp/views/shuttleNew.html
@@ -234,6 +234,9 @@
<button class="btn bg-slate-600 hover:bg-slate-500" @click="shuttleOperator('clearPath')">
<i class="fas fa-anchor mr-1"></i>娓呴櫎璺緞
</button>
+ <button class="btn bg-slate-600 hover:bg-slate-500" @click="shuttleOperator('restartCalcPath')">
+ <i class="fas fa-anchor mr-1"></i>閲嶆柊璁＄畻璺緞
+ </button>
</div>
</div>
</div>
@@ -569,6 +572,8 @@
requestParam.shuttleTaskMode = 13;
}else if (type == 'clearPath') {
requestParam.shuttleTaskMode = 17;
+ }else if (type == 'restartCalcPath') {
+ requestParam.shuttleTaskMode = 18;
}else if (type == 'writeTaskNo') {
requestParam.workNo = this.controlData.taskNo;
requestParam.pakMk = "Y";
--
Gitblit v1.9.1