From 5252d40ed210204c9055207a834f1162f9616e08 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 04 十一月 2022 16:01:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 11 ++++++++---
1 files changed, 8 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..63a0566 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");
@@ -254,6 +254,11 @@
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ Integer siteId = staProtocol.getSiteId();
+ staProtocol = station.get(siteId);
+ if ( siteId == 102 && (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
+ staProtocol.setPakMk(true);
+ }
}
}
--
Gitblit v1.9.1