From 1a86e48b073132cdcff7a36a7d58714d77274be9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期四, 29 八月 2024 19:12:55 +0800
Subject: [PATCH] 配置
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 40 ++++++++++++++++++++--------------------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index dcacb7a..d638180 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -121,7 +121,7 @@
// if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
// continue;
// }
- System.out.println(staProtocol);
+ //System.out.println(staProtocol);
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (!staProtocol.isLoading()) {
continue;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a8ee7b6..6c09518 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -194,8 +194,8 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize * 4));
-// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
+// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -205,24 +205,11 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4)); // 宸ヤ綔鍙�
-
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2)); // 鐩爣绔�
- }
- }
-
- Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.2", (short) (staNoSize * 4));
- if (result1.IsSuccess) {
- for (int i = 0; i < staNoSize; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- //boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
- StaProtocol staProtocol = station.get(siteId);
-
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8)); // 宸ヤ綔鍙�
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8, 1);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -232,7 +219,7 @@
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
staProtocol.setHigh(status[6]); // 楂樺簱浣�
staProtocol.setLow(status[7]); // 浣庡簱浣�
-
+ System.out.println(staProtocol);
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
@@ -243,8 +230,21 @@
//lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
staProtocol.setStamp(staProtocol.getStamp() + 1);
}
+
}
}
+
+// Thread.sleep(200);
+// OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize * 4));
+// if (result1.IsSuccess) {
+// for (int i = 0; i < staNoSize; i++) {
+// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+// StaProtocol staProtocol = station.get(siteId);
+//
+//
+//
+// }
+// }
// Thread.sleep(200);
// OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
@@ -262,7 +262,7 @@
// }
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0", (short) (barcodeSize * 8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.200", (short) (barcodeSize * 8));
if (result2.IsSuccess && 1 != 1) {
if (slave.getId() == 1) {
for (int i = 0; i < barcodeSize / 3; i++) {
@@ -294,7 +294,7 @@
}
}
- if (result.IsSuccess && result1.IsSuccess) {
+ if (result.IsSuccess /*&& result1.IsSuccess*/) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1