From cd81647ca01d3afedabe40ccc2ba02c3f5be821a Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期日, 30 六月 2024 15:01:50 +0800
Subject: [PATCH] 输送线回读

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 2b020ed..b27c739 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -431,12 +431,12 @@
                     Thread.sleep(200);
                     OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*6, (short)4);
                     Thread.sleep(200);
-                    OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + index*6+4, (short)2);
+                    OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB100." + (index*6+4), (short)2);
                     //OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB1000." + index*4, (short)4);
                     if(readResult.IsSuccess && readResult1.IsSuccess){
-                        short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-                        short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 2);
-                        if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
+                        int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
+                        short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
+                        if(staProtocol.getWorkNo().equals((short)workNo) && staProtocol.getStaNo().equals(staNo)){
                             //浠诲姟鍛戒护鍐欏叆鎴愬姛
                             writeFlag = true;
                             log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -472,7 +472,7 @@
                 log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
 
                 //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔¢槦鍒�
-                boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
+//                boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
                 read();//璇诲彇1娆¤澶囩姸鎬�
                 return;
             } else {

--
Gitblit v1.9.1