From 9ff1f1f221aeafc99653c846b2c2442f9c033ee5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 11 十月 2022 08:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

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

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3e48d6f..ea0e6b9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -82,7 +82,7 @@
                     //澶嶄綅娴嬭瘯淇″彿
                     case 3:
                         StaProtocol staProtocol = (StaProtocol)task.getData();
-                        siemensS7Net.Write("DB200." + staProtocol.getSiteId(), staProtocol.getStaNo());
+                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
                         break;
                     default:
                         break;
@@ -188,10 +188,10 @@
         }
 
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB200.0", (short) 96);
+        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
         if(result3.IsSuccess) {
             for(int i=0; i<48; i++){
-                startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result.Content, i*2);
+                startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
             }
         }
 //        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");

--
Gitblit v1.9.1