From 49cf92d200288feaf43ce94eb2638cb51d54f02a Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 14:38:39 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 0980805..98ea21d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -316,7 +316,7 @@
                     try{
                         staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 灏忚溅鐩爣浣�
 
-                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 褰撳墠浣嶇疆
+                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 0));   // 褰撳墠浣嶇疆
 
                         boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
                         staProtocol.setRGV1(status[0]);  // 灏忚溅鏃犺揣绌洪棽
@@ -326,15 +326,15 @@
 //                        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.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4));//灏忚溅鏀瑰乏渚ц揣鐗╃洰鏍囩珯
-                        staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6));  //灏忚溅鏀瑰彸渚ц揣鐗╃洰鏍囩珯
-                        staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 8));  // 涓婁綅鏈烘竻闄ゅ钩绉昏溅璧勬枡
+                        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.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){
-                        System.out.println(e.getMessage());
+                        log.error("璇诲彇RGV淇℃伅澶辫触"+e.getMessage());
                     }
                 }
             }
@@ -644,7 +644,7 @@
         writeCount = 1;
         do {
             try{
-                if(!result1.IsSuccess){
+                if(!result2.IsSuccess){
                     log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔�  鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                     result2 = siemensS7Net.Write(resultV1, resultS2);
 

--
Gitblit v1.9.1