From fc147addd6f957585002a242af54c33eaa326aba Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 23 五月 2024 14:22:00 +0800
Subject: [PATCH] #
---
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 3f59baa..37fd458 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -178,8 +178,9 @@
station.put(i, staProtocol);
}
staProtocol.setWorkNo((short) 0);
- staProtocol.setNearbySta((short) 3);
+ staProtocol.setNearbySta((short) 1);
staProtocol.setLoading(false);
+ staProtocol.setAutoing(false);
}
}
}
@@ -258,17 +259,18 @@
OperateResultExOne<byte[]> resultRgvLocation = siemensS7Net.Read("DB43.0", (short) 8);
OperateResultExOne<byte[]> resultRgvload = siemensS7Net.Read("DB192.0", (short) 8);
if (resultRgvWrkNo.IsSuccess && resultRgvLocation.IsSuccess && resultRgvload.IsSuccess){
- for (int i = 1;i<5;i++){
+ for (int i = 0;i<4;i++){
short wrkNo = siemensS7Net.getByteTransform().TransInt16(resultRgvWrkNo.Content, i * 32);
short location = siemensS7Net.getByteTransform().TransInt16(resultRgvLocation.Content, i * 2);
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgvload.Content, i*2, 1);
- StaProtocol staProtocol = station.get(i);
+ StaProtocol staProtocol = station.get((i+1));
if (null == staProtocol) {
staProtocol = new StaProtocol();
- staProtocol.setSiteId(i);
- station.put(i, staProtocol);
+ staProtocol.setSiteId((i+1));
+ station.put((i+1), staProtocol);
}
staProtocol.setWorkNo(wrkNo);
+ staProtocol.setAutoing(true);
staProtocol.setNearbySta(location);
staProtocol.setLoading(status[0]);
}
--
Gitblit v1.9.1