From f1b1ba2ea0373b9b74884b57f5cc5d6408f12345 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 17 十二月 2023 13:34:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 5 ++++-
src/main/java/com/zy/asrs/controller/CrnController.java | 16 ++++++++++++++++
src/main/java/com/zy/core/model/command/CrnCommand.java | 1 +
src/main/webapp/views/deviceOperate/crnOperate.html | 2 +-
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index eb9a0dd..96bca08 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -729,6 +729,22 @@
return crnControl2(command)?R.ok():R.error();
}
+ @ManagerAuth(memo = "澶嶄綅")
+ @PostMapping("/crn/operator/reset")
+ public R crnReset(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setReset((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+
private boolean crnControl2(CrnCommand command){
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index e04212a..cea2f4d 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -82,6 +82,7 @@
private Short onlineWrk3 = 0;
//鎭㈠鑱旀満浠诲姟
private Short onlineWrk4 = 0;
+ private Short reset = 0;
// 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
private Short command = 0;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 04a8923..1cf8438 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -196,7 +196,7 @@
if (resetFlag) {
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
- if (write2(crnCommand)) {
+ if (write(crnCommand)) {
resetFlag = false;
//鍫嗗灈鏈轰换鍔″畬鎴愬悗璁块棶wms璇锋眰浠诲姟瀹屾垚 locationDone 璐т綅澶勭悊瀹屾垚
@@ -515,6 +515,9 @@
}else if (command.getOnlineWrk4() != 0){
array[0] = command.getOnlineWrk4();
result = siemensNet.Write("DB103.8", array);
+ } else if (command.getReset() != 0) {
+ array[0] = command.getReset();
+ result = siemensNet.Write("DB103.10", array);
}
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 6defda2..f606a22 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -79,7 +79,7 @@
<el-button @click="requestOperate('siteMove')" type="primary">绔欏埌绔�</el-button>
<el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
<el-button @click="requestOperate('clearCommand')" type="primary">娓呴櫎鍛戒护</el-button>
-<!-- <el-button @click="requestOperate('handleReset')" type="primary">澶嶄綅</el-button>-->
+ <el-button @click="requestOperate('reset')" type="primary">澶嶄綅</el-button>
<br/>
<br/>
<el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>
--
Gitblit v1.9.1