From 9517d27f0e801a7f2afd3bee8144ef42f5ec403f Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 10 十月 2024 13:11:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 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 9306a2b..f1fabb8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2319,6 +2319,7 @@
                         param.setIoType(10);
                         param.setSourceStaNo(122);
                         param.setLocType1((short)1);
+                        param.setRgvNo(rgvProtocol.getRgvNo());
                         String response = new HttpHandler.Builder()
                                 .setUri(wmsUrl)
                                 .setPath("/rpc/pakin/empty/loc/v1")
@@ -3379,6 +3380,26 @@
                 if (!staProtocol.isLoading()){
                     continue;
                 }
+                StaProtocol staProtocol120 = devpThread.getStation().get(120);
+                if (staProtocol120 == null) {
+                    continue;
+                } else {
+                    staProtocol120 = staProtocol120.clone();
+                }
+
+                if (staProtocol120.isLoading()){
+                    continue;
+                }
+                StaProtocol staProtocol121 = devpThread.getStation().get(121);
+                if (staProtocol121 == null) {
+                    continue;
+                } else {
+                    staProtocol121 = staProtocol121.clone();
+                }
+
+                if (staProtocol121.isLoading()){
+                    continue;
+                }
 //                if (!staProtocol.getWorkNo().equals(wrkMast131.getWrkNo())){
 //                    log.info("绔欑偣宸ヤ綔鍙�={} 涓庤创鏍囧伐浣滃彿={} 涓嶄竴鑷达紝寮傚父锛�",staProtocol.getWorkNo(),wrkMast131.getWrkNo().shortValue());
 //                }

--
Gitblit v1.9.1