From 5796d43a6bedd35edb3c04b73c8aae43cae1a29c Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期五, 27 六月 2025 11:37:43 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 8 ++++
src/main/java/com/zy/core/thread/RgvThread.java | 8 ++++
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 8 ++++
src/main/java/com/zy/core/thread/LedThread.java | 8 ++++
src/main/java/com/zy/asrs/controller/RgvController.java | 17 ++++++++
src/main/java/com/zy/core/ThreadHandler.java | 2 +
src/main/java/com/zy/core/thread/ScaleThread.java | 8 ++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 8 ++++
src/main/webapp/views/deviceOperate/rgvOperate.html | 3 +
9 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 112568f..0e3be20 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -101,6 +101,23 @@
return R.ok("浠诲姟娓呯┖鎴愬姛");
}
+ @PostMapping("/run/del2")//Take Put Walk
+ @ManagerAuth(memo = "娓呴櫎浣滀笟鍚姩涓�")
+ public R rgvRunDel2(@RequestParam(defaultValue = "0") Integer rgvNo
+ ) {
+ if (rgvNo==null || rgvNo==0){
+ return R.error("璇烽�夋嫨灏忚溅");
+ }
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo);
+ try {
+ rgvThread.setWrkSign();
+ } catch (Exception e) {
+ return R.error("娓呴櫎浣滀笟鍚姩涓け璐�"+e.getMessage());
+ }
+
+ return R.ok("浠诲姟娓呯┖鎴愬姛");
+ }
+
@PostMapping("/run/walk")//Take Put Walk
@ManagerAuth(memo = "灏忚溅琛岃蛋")
public R rgvRunWalk(@RequestParam(defaultValue = "0") Integer rgvNo,
diff --git a/src/main/java/com/zy/core/ThreadHandler.java b/src/main/java/com/zy/core/ThreadHandler.java
index 9b08feb..1713bcc 100644
--- a/src/main/java/com/zy/core/ThreadHandler.java
+++ b/src/main/java/com/zy/core/ThreadHandler.java
@@ -6,4 +6,6 @@
void close();
+ void setWrkSign();
+
}
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 00ffb2a..03b9a90 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -60,4 +60,12 @@
}
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 1c33808..550c2c0 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -468,4 +468,12 @@
}
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 70700dc..7ee4342 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -1341,6 +1341,14 @@
}
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ this.wrkSign = 0;
+ }
+
public void setDelRgvTask() {
delRgvTask = true;
}
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 614dd85..62c7ac2 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -205,4 +205,12 @@
return true;
}
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 8137225..61575fa 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -495,4 +495,12 @@
isRunning = false;
}
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 878e2d5..a499bb1 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -624,4 +624,12 @@
//
// }
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index fe04738..27c2c4c 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -59,7 +59,8 @@
<el-button @click="requestOperate('TakeAndPut')" type="primary">鍙栨斁璐�</el-button>
<el-button @click="requestOperate('walk')" type="warning">琛岃蛋</el-button>
<el-button @click="requestOperate('del')" type="warning">浠诲姟娓呯┖</el-button>
- <el-button @click="requestOperate('delRgvTask')" type="warning">灏忚溅寮哄埗澶嶄綅锛堣繍琛屾椂涓嶈鎿嶄綔,闇�瑕侀厤鍚堟寜閽級</el-button>
+ <el-button @click="requestOperate('del2')" type="warning">娓呴櫎浣滀笟鍚姩涓�</el-button>
+ <el-button @click="requestOperate('delRgvTask')" type="warning">娓呯┖wcs涓嬪彂鏁版嵁锛堣繍琛屾暟鎹渶瑕佺‖浠跺浣�9S锛�</el-button>
</div>
</div>
</el-card>
--
Gitblit v1.9.1