From 61d02c1796f3bedc6650e29cc33d9ee85e3a78fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 19 六月 2023 08:07:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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) {

--
Gitblit v1.9.1