From fdf9554e4022247f38b3a1ff5dd866d9e00d8e35 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 25 三月 2024 13:13:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 9 +++++++++
src/main/java/com/zy/core/thread/SiemensRgvThread.java | 3 +++
src/main/java/com/zy/core/model/command/RgvCommand.java | 1 +
src/main/webapp/views/deviceOperate/rgvOperate.html | 1 +
4 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 64ea3f3..0e53b0a 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -107,6 +107,15 @@
return rgvControl2(command)?R.ok():R.error();
}
+ @ManagerAuth(memo = "鍙栨秷鎬ュ仠")
+ @PostMapping("/operator/noStop")
+ public R rgvNoStop(RgvOperatorParam param){
+ RgvCommand command = new RgvCommand();
+ command.setRgvNo(param.getRgvNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setNoStop(true);
+ return rgvControl2(command)?R.ok():R.error();
+ }
+
private boolean rgvControl2(RgvCommand command){
if (command.getRgvNo() == null) {
throw new CoolException("璇烽�夋嫨RGV");
diff --git a/src/main/java/com/zy/core/model/command/RgvCommand.java b/src/main/java/com/zy/core/model/command/RgvCommand.java
index 6fd1df1..94ce8a1 100644
--- a/src/main/java/com/zy/core/model/command/RgvCommand.java
+++ b/src/main/java/com/zy/core/model/command/RgvCommand.java
@@ -89,6 +89,7 @@
private boolean compTask;
private boolean reset;
private boolean stop;
+ private boolean noStop;
public void setTaskMode1(Short taskMode1){
this.taskMode1 = taskMode1;
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index 4bef755..5a38018 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -266,6 +266,9 @@
else if (command.isReset()) {
result = siemensNet.Write("DB99.0.4", true);
}
+ else if (command.isNoStop()) {
+ result = siemensNet.Write("DB99.0.3", false);
+ }
// if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
// short commandFinish = 3; //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index f00cab1..a61524b 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -58,6 +58,7 @@
<br/>
<br/>
<el-button @click="requestOperate('stop')" type="warning">杩滅▼鎬ュ仠</el-button>
+ <el-button @click="requestOperate('noStop')" type="warning">鍙栨秷鎬ュ仠</el-button>
<el-button @click="requestOperate('reset')" type="warning">绯荤粺澶嶄綅</el-button>
</div>
</div>
--
Gitblit v1.9.1