From 473bc88e44ad3e60b207012130507824cb32f04a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 10 一月 2024 16:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

---
 src/main/java/com/zy/core/thread/RgvThread.java             |    6 +++---
 src/main/java/com/zy/asrs/utils/RouteUtils.java             |    1 +
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 3 files changed, 5 insertions(+), 4 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 45fc16e..66df567 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2491,7 +2491,7 @@
                 // 鍙湁褰揜GV绌洪棽銆佽嚜鍔�,宸ヤ綅涓�鏃犵墿//rgv鍙敤
                 if (rgvProtocol.getStatusType() == RgvStatusType.IDLE
                         && rgvProtocol.getModeType() == RgvModeType.AUTO
-                        && rgvProtocol.getLoaded1()==0  //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊¢兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
+//                        && rgvProtocol.getLoaded1()==0  //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊¢兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
                         && rgvProtocol.getTaskNo1()==0
                         && rgvProtocol.getTaskNo2()==0
                 ) {
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index acfdf6d..cba980b 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -12,6 +12,7 @@
  */
 public class RouteUtils {
 
+    //闂2  鍛ㄤ繆鏉�
     public static final List<Integer> MERGE_STA_NO_One = new ArrayList<Integer>() {{
 //        add(116);add(117);
     }};
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 6c259f9..27b3fda 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -191,9 +191,9 @@
                 rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
                 rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
                 rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
-                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
-                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
-                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+//                rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+//                rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+//                rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                 rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                 rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                 rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));

--
Gitblit v1.9.1