From d32e7031776a4f1cf46744dd8e9aecbafb362009 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 13:14:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..391b353 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -77,16 +77,16 @@
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())) {
+ if (command.getRgvNo().equals(rgv.getId())) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
if (crnThread == null) {
throw new CoolException("RGV涓嶅湪绾�");
@@ -97,7 +97,7 @@
}
// 绌洪棽鍒ゆ柇
// 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