From 1be269037e8cff8043b8f046fec70509ebfd951c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 21 八月 2023 14:41:58 +0800
Subject: [PATCH] 小车手动管制操作
---
src/main/java/com/zy/asrs/controller/ShuttleController.java | 12 ++++++++++++
src/main/java/com/zy/core/enums/ShuttleTaskModeType.java | 2 ++
src/main/webapp/views/shuttle.html | 2 ++
3 files changed, 16 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 99bf851..ce4aa87 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -311,6 +311,18 @@
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
shuttleProtocol.setPakMk(true);//浣滀笟鏍囪澶嶄綅
return R.ok();
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CONTROL) {
+ //灏忚溅绠″埗
+ NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
+ ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
+ commands.add(suspendCommand);
+ assignCommand.setCommands(commands);
+ } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CANCEL_CONTROL) {
+ //灏忚溅鍙栨秷绠″埗
+ NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), false);
+ ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
+ commands.add(suspendCommand);
+ assignCommand.setCommands(commands);
} 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 d1760b9..529423e 100644
--- a/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/ShuttleTaskModeType.java
@@ -23,6 +23,8 @@
TRANSPORT(18, "鎼繍浠诲姟"),
SHUTTLE_MOVE_LOC_NO(19, "灏忚溅绉诲簱浠诲姟"),
SHUTTLE_LOC_TO_LOC(20, "搴撲綅绉昏浆"),
+ SHUTTLE_CONTROL(21, "灏忚溅绠″埗"),
+ SHUTTLE_CANCEL_CONTROL(22, "灏忚溅鍙栨秷绠″埗"),
;
public Integer id;
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index f786948..d553a77 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -133,6 +133,8 @@
<button class="item" onclick="shuttleOperator(4)">鎵樼洏涓嬮檷</button>
<button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
<button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
+ <button class="item" onclick="shuttleOperator(21)">绠″埗</button>
+ <button class="item" onclick="shuttleOperator(22)">鍙栨秷绠″埗</button>
</div>
</div>
</div>
--
Gitblit v1.9.1