From 18dd3559d3876ed8e97353cfc20d4c77eea5c8b1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 13:30:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 0df3a98..3c86275 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -18,6 +18,7 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.CrnThread;
+import com.zy.core.RgvThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -66,7 +67,7 @@
@ManagerAuth(memo = "澶嶄綅")
- @PostMapping("/rgv/operator/reset")
+ @PostMapping("/operator/reset")
public R crnReset(RgvOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -77,27 +78,27 @@
command.setRgvNo(param.getRgvNo()); // 鍫嗗灈鏈虹紪鍙�
command.setReset(true);
- return rgvControl(command)?R.ok():R.error();
+ return rgvControl2(command)?R.ok():R.error();
}
- private boolean rgvControl(CrnCommand command){
- if (command.getCrnNo() == null) {
+ private boolean rgvControl2(RgvCommand command){
+ if (command.getRgvNo() == null) {
throw new CoolException("璇烽�夋嫨RGV");
}
for (RgvSlave rgv : slaveProperties.getRgv()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
- if (command.getCrnNo().equals(rgv.getId())) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
- if (crnThread == null) {
+ if (command.getRgvNo().equals(rgv.getId())) {
+ SiemensRgvThread rgvThread = (SiemensRgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
+ if (rgvThread == null) {
throw new CoolException("RGV涓嶅湪绾�");
}
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
throw new CoolException("RGV涓嶅湪绾�");
}
// 绌洪棽鍒ゆ柇
// if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
- if (MessageQueue.offer(SlaveType.Rgv, rgv.getId(), new Task(4, command))) {
+ if (MessageQueue.offer(SlaveType.Rgv, rgv.getId(), new Task(2, command))) {
return true;
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
--
Gitblit v1.9.1