From 438ef01503b8e9e0e51bcf6655136839c0b81c15 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 16:07:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 98ea21d..dc39b89 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -316,23 +316,30 @@
                     try{
                         staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 灏忚溅鐩爣浣�
 
-                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 0));   // 褰撳墠浣嶇疆
+                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 褰撳墠浣嶇疆
 
                         boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
                         staProtocol.setRGV1(status[0]);  // 灏忚溅鏃犺揣绌洪棽
                         staProtocol.setRGV2(status[1]);  // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
                         staProtocol.setRGV3(status[2]); // 灏忚溅杩愯涓�
 
-//                        staProtocol.setRGV11(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));  // 灏忚溅鏃犺揣绌洪棽
-//                        staProtocol.setRGV22(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));  // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
-//                        staProtocol.setRGV33(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); //灏忚溅杩愯涓�
+//                        staProtocol.setRGV1(false);  // 灏忚溅鏃犺揣绌洪棽
+//                        staProtocol.setRGV2(true);  // 灏忚溅杈撻�佺嚎鍙栬揣鍒颁綅
+//                        staProtocol.setRGV3(false); // 灏忚溅杩愯涓�
+
                         staProtocol.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 2));//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
                         staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4));  //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
                         staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6));  // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+//
+//                        staProtocol.setRGV44((short) 0);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
+//                        staProtocol.setRGV55((short) 0);  //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
+//                        staProtocol.setRGV66((short) 0);  // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
 
                         staProtocol.setRGV4(staProtocol.getRGV44() != 0 && staProtocol.getRGV44() != 2);//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
                         staProtocol.setRGV5(staProtocol.getRGV55() != 0 && staProtocol.getRGV55() != 2);  //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
                         staProtocol.setRGV6(staProtocol.getRGV66() != 0 && staProtocol.getRGV66() != 2);  // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+
+
                     }catch (Exception e){
                         log.error("璇诲彇RGV淇℃伅澶辫触"+e.getMessage());
                     }

--
Gitblit v1.9.1