From 876db5fee890311a1d7eaea983af20826b817e01 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 13 八月 2024 19:33:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index bda6582..1236dc9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -56,7 +56,7 @@
add(112);add(113);add(114);
}};
public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
- add(212);add(213);add(214);
+ add(212);add(214);add(213);
}};
public boolean charge0;
@@ -154,9 +154,9 @@
// 鏇存柊鍏ュ嚭搴撴ā寮�
updateIoMode();
ArrayList<Integer> staNos = getStaNo();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 50);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNos.size()*2));
if (result.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -168,9 +168,9 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 50);
+ OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNos.size()*2));
if (result0.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -182,11 +182,11 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 50);
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) (staNos.size()*2));
if (result1.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i * 2, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -199,10 +199,10 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
- }else if (staProtocol.getSiteId().equals(300)){
+ } else if (staProtocol.getSiteId().equals(300)) {
BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
BasDevp basDevp = basDevpMapper.selectByDevNo(300);
- if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())){
+ if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())) {
staProtocol.setPakMk(true);
}
}
--
Gitblit v1.9.1