From 297aaba86ef2c39dc6b8e9160365b8d3c026d5b8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 01 六月 2023 13:16:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 +++++++-----
1 files changed, 7 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 21d278d..ee14cc7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -84,10 +84,10 @@
case 4:
write103((String)task.getData());
break;
- // 鍐欐暟鎹� 103绔欑偣鍐欏叆PACK鐮�
+ // 鐏淇″彿
case 5:
StaProtocol staProtocol2 = (StaProtocol)task.getData();
- siemensS7Net.Write("DB102.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
+ siemensS7Net.Write("DB108.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
break;
//澶嶄綅娴嬭瘯淇″彿
case 3:
@@ -206,7 +206,7 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.0", (short) 96);
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
if(result3.IsSuccess) {
for(int i=0; i<48; i++){
startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
@@ -251,7 +251,7 @@
*/
private void write103(String packNo){
try{
- OperateResult write = siemensS7Net.Write("DB100.", packNo);
+ OperateResult write = siemensS7Net.Write("DB109.", packNo);
if (!write.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(packNo)));
log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(packNo));
@@ -275,7 +275,9 @@
short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
array[1] = staProtocol.getStaNo();
- OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
+ OperateResult write;
+
+ write = siemensS7Net.Write("DB100." + index*4, array);
// OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
// Thread.sleep(500);
--
Gitblit v1.9.1