From 718dd839d68cea067b554624b044c1a2be30659e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 一月 2021 11:24:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 6 +++---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 32 +++++++++++++++-----------------
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 358631e..2290116 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -37,14 +37,14 @@
// 绌烘澘淇″彿
private boolean emptyMk;
+ // 婊℃墭鐩�
+ private boolean fullPlt;
+
// 楂�
private boolean high;
// 浣�
private boolean low;
-
- // 闇�姹�1
- private boolean inreq1;
// 閿佸畾鏍囪
private boolean pakMk = true;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f1da677..173f38b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,9 +50,9 @@
int divides = (int) Arith.divides(0, siteId, 100);
int remainder = (int) Arith.remainder(siteId, 100);
int index = ((divides - 1) * 50) + remainder;
- System.out.print(siteId + " 浠诲姟鍦板潃 锛� " + index*2);
- System.out.print(" 鐩爣鍦板潃 锛� " + (index*2+200) );
- System.out.println(" 鐘舵�� 锛� " + (index+500) );
+// System.out.print(siteId + " 浠诲姟鍦板潃 锛� " + index*2);
+// System.out.print(" 鐩爣鍦板潃 锛� " + (index*2+200) );
+ System.out.println(siteId + " 鐘舵�� 锛� " + (index*2) );
}
}
@@ -141,16 +141,17 @@
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
int divides = (int) Arith.divides(0, siteId, 100);
int remainder = (int) Arith.remainder(siteId, 100);
- int index = ((divides - 1) * 50) + remainder;
-
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i-1, 1);
- StaProtocol staProtocol = station.get(i);
+ int index = ((divides - 1) * 100) + remainder;
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, index, 1);
+ StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+ staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+ staProtocol.setHigh(status[6]); // 楂樺簱浣�
+ staProtocol.setLow(status[7]); // 浣庡簱浣�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -191,16 +192,13 @@
if (null == staProtocol) {
return;
}
- OperateResult write = siemensS7Net.Write("DB100." + (staProtocol.getSiteId() - 1) * 2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ int divides = (int) Arith.divides(0, staProtocol.getSiteId(), 100);
+ int remainder = (int) Arith.remainder(staProtocol.getSiteId(), 100);
+ int index = ((divides - 1) * 50) + remainder;
+
+ OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(300);
- OperateResult write1 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) * 2 + 20), staProtocol.getStaNo()); // 鐩爣绔�
-// boolean[] status = new boolean[8];
-// status[0] = staProtocol.isAutoing();
-// status[1] = staProtocol.isLoading();
-// status[2] = staProtocol.isInEnable();
-// status[3] = staProtocol.isOutEnable();
-// status[4] = staProtocol.isEmptyMk();
-// OperateResult write2 = siemensS7Net.Write("DB100." + ((staProtocol.getSiteId() - 1) + 40), status); // 鐘舵��
+ OperateResult write1 = siemensS7Net.Write("DB100." + (index*2 + 200), staProtocol.getStaNo()); // 鐩爣绔�
if (!write.IsSuccess || !write1.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
--
Gitblit v1.9.1