From 4501ec94feef7504a8b43859983254ce3ae7dbd1 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 28 六月 2023 14:11:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 545eb41..7065f1b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -143,9 +143,9 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2 + 2 )); // 鐩爣绔�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2 )); // 鐩爣绔�
}
}
Thread.sleep(200);
@@ -176,10 +176,10 @@
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]);
- staProtocol.setHigh1(status[7]);
- staProtocol.setLow(status[8]);
- staProtocol.setLow1(status[9]);
+ staProtocol.setLow(status[6]); // 浣� -- 楂�
+ staProtocol.setLow1(status[7]);
+ staProtocol.setHigh(status[8]);
+ staProtocol.setHigh1(status[9]);
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -188,10 +188,10 @@
}
// 鏉＄爜鎵弿鍣�
- if(slave.getId() == 2) {
+ if(slave.getId() == 1) {
Thread.sleep(200);
OperateResultExOne<byte[]> result2 = null;
- result2 = siemensS7Net.Read("DB100.200", (short) (barcodeSize * 8));
+ result2 = siemensS7Net.Read("DB100.150", (short) (barcodeSize * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
@@ -259,11 +259,11 @@
short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
array[1] = staProtocol.getStaNo();
-// OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
+ OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
- OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(300);
- OperateResult write1 = siemensS7Net.Write("DB100." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
+// OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+// Thread.sleep(300);
+// OperateResult write1 = siemensS7Net.Write("DB100." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
if (!write.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
--
Gitblit v1.9.1