From fb5b2e35fd234d8f8068c690df1bcbf956e05880 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 03 十一月 2020 09:35:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/DevpThread.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index 55be879..90d5837 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -139,7 +139,7 @@
}
}
// 鍙拌溅浣嶇疆
- OperateResultExOne<Integer> result2 = siemensS7Net.ReadInt32("DB100.48");
+ OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB100.48");
if (result2.IsSuccess) {
StaProtocol staProtocol = station.get(8);
staProtocol.setPosition(result2.Content);
@@ -192,6 +192,7 @@
// status[4] = staProtocol.isEmptyMk();
// OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status); // 鐘舵��
if (!write.IsSuccess || !write1.IsSuccess) {
+ staProtocol = station.get(staProtocol.getSiteId());
if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
staProtocol.setPakMk(true);
}
@@ -250,6 +251,16 @@
}
}
+ /**
+ * 璁剧疆鍏ュ簱鏍囪
+ */
+ public void setPakMk(Integer siteId, boolean pakMk) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null != staProtocol) {
+ staProtocol.setPakMk(pakMk);
+ }
+ }
+
@Override
public void close() {
siemensS7Net.ConnectClose();
--
Gitblit v1.9.1