From 4dfe6a8238e9036a10198f72ce811f5902f27bea Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 22 十月 2025 16:52:44 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 ff462b8..dd643fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -616,8 +616,8 @@
                     rgvCommand.setTaskMode1(RgvTaskModeType.CANCEL); // 宸ヤ綅1浠诲姟妯″紡:  鍙栨秷
                     rgvCommand.setSourceStaNo1((short)-1);   //宸ヤ綅1璧风偣
                     rgvCommand.setDestinationStaNo1((short)-1);   //宸ヤ綅1鐩爣绔欑偣
-                    rgvCommand.setCommand((short) 1);   //宸ヤ綅1浠诲姟纭
-                    rgvCommand.setRgvSome((short) 1);
+//                    rgvCommand.setCommand((short) 1);   //宸ヤ綅1浠诲姟纭
+//                    rgvCommand.setRgvSome((short) 1);
                     if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(4, rgvCommand))) {
                         //
                         log.error("RGV鍙栨秷鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvProtocol.getRgvNo(), JSON.toJSON(rgvCommand));
@@ -628,7 +628,7 @@
                     }
                     log.info("RGV鍙栨秷鍛戒护涓嬪彂鎴愬姛锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvProtocol.getRgvNo(), JSON.toJSON(rgvCommand));
 
-                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", rgvProtocol.getTaskNo1().longValue()).eq("rgv_no",rgvProtocol.getRgvNo()));
+                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", rgvCommand.getTaskNo1().longValue()).eq("rgv_no",rgvCommand.getRgvNo()));
                     if (Cools.isEmpty(wrkMast) || !wrkMast.getWrkSts().equals(2L)) {
                         log.error("鏈煡鍒板皬杞︽墽琛屼换鍔℃垨鑰呮墽琛屼换鍔$姸鎬佷笉绗﹀悎锛�" + wrkMast);
                         continue;

--
Gitblit v1.9.1