From 32503cc754caa4984f408f7c2a6d10701a72522e Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 06 十二月 2022 13:28:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/StartupDto.java | 29 +++++++++++++++++++++++++++++
src/main/java/com/zy/core/thread/LedThread.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++++-
3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 44c8d87..12aca3a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -188,7 +188,13 @@
barcodeThread.setBarcode("");
staProtocol.setWorkNo(dto.getWorkNo().shortValue());
- staProtocol.setStaNo(dto.getStaNo().shortValue());
+
+ if(Cools.isEmpty(dto.getRgvNo()) || dto.getRgvNo() <= 0) {
+ staProtocol.setStaNo(dto.getStaNo().shortValue());
+ } else {//濡傛灉瀛樺湪RGV缂栧彿锛岃鏄庨渶瑕丷GV鎺ラ┏锛屽厛涓嬪彂浠诲姟鍒癛GV婧愮珯
+ staProtocol.setStaNo(dto.getRgvSstaNo().shortValue());
+ }
+
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
index b0ecc3e..f4bf893 100644
--- a/src/main/java/com/zy/common/model/StartupDto.java
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -8,14 +8,43 @@
@Data
public class StartupDto {
+ /**
+ * 婧愮珯
+ */
private Integer sourceStaNo;
+ /**
+ * 鐩爣绔�
+ */
private Integer staNo;
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
private Integer crnNo;
+ /**
+ * 搴撲綅鍙�
+ */
private String locNo;
+ /**
+ * 宸ヤ綔鍙�
+ */
private Integer workNo;
+ /**
+ * RGV缂栧彿
+ */
+ private Integer rgvNo;
+
+ /**
+ * RGV婧愮珯
+ */
+ private Integer rgvSstaNo;
+
+ /**
+ * RGV鐩爣绔�
+ */
+ private Integer rgvDstaNo;
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 46dc9d6..0cbc00a 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -63,7 +63,7 @@
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
- connect();
+// connect();
close();
while (true) {
try {
--
Gitblit v1.9.1