From 63bdaac47e9717cec820343874a782de1735d9d7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 15:13:30 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
index c1c59c1..ea476a5 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
@@ -88,7 +88,7 @@
private void read() throws InterruptedException {
ArrayList<BasConveyorSta> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB1000.100", (short) (staNoSize*8));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB1000.100", (short) (staNoSize * 40));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
BasConveyorSta siteStation = staNos.get(i);
@@ -99,42 +99,20 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setStaNo( siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 )); // 鐩爣绔�
- Thread.sleep(300);
- staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8+6, 2);
- 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]); // 浣庡簱浣�
+ staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 40 + 2)); // 宸ヤ綔鍙�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 4)); // 鐩爣绔�
+ staProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 40 + 6) == 2); // 鑷姩
+ staProtocol.setLoading(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 40 + 6) == 2); // 鏈夌墿
+// 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);
}
- }
- }
-
- Thread.sleep(200);
- ArrayList<BasConveyorSta> errorStaNo = getStaNo();
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.800.0", (short) (errorStaNo.size() * 4));
- if (result3.IsSuccess) {
- for (int i = 0; i < errorStaNo.size(); i++) {
- BasConveyorSta siteStation = errorStaNo.get(i);
- Integer siteId = siteStation.getSiteNo(); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, (i * 4 + 2), 2);
- staProtocol.setFrontErr(status[0]);//鍓嶈秴闄�
- staProtocol.setBackErr(status[1]);//鍚庤秴闄�
- staProtocol.setHighErr(status[2]);//瓒呴珮
- staProtocol.setLeftErr(status[3]);//宸﹁秴闄�
- staProtocol.setRightErr(status[4]);//鍙宠秴闄�
- staProtocol.setWeightErr(status[5]);//瓒呴噸
- staProtocol.setBarcodeErr(status[6]);//鎵爜澶辫触
}
}
--
Gitblit v1.9.1