From 08ef6986872d4fd9b280d2bfdd8cc6b2e24f6042 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 19:03:24 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 8a038ff..f129732 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -524,10 +524,13 @@
if (index < 16) {
workNoAddress = "DB100." + index * 4;
staNoAddress = "DB100." + (index * 4 + 2);
- heightAddress = "DB104." + (index * 4);
} else {
workNoAddress = "DB100." + (400 + (index - 16) * 4);
staNoAddress = "DB100." + (400 + (index - 16) * 4 + 2);
+ }
+ int i = barcodeSite2.indexOf(staProtocol.getSiteId());
+ if (i != -1) {
+ heightAddress = "DB104." + (i * 4);
}
OperateResult writeResult;
@@ -539,12 +542,12 @@
OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo()); // 鐩爣绔�
if (!Cools.isEmpty(staProtocol.getHeight()) && heightAddress != null) {
- OperateResult writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight()); // 鐩爣绔�
+ OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight())); // 鐩爣绔�
if (!writeResult3.IsSuccess) {
//fangzhi xierukushibai,jiu duoxiejici,meixunhuan
- writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight());
+ writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight()));
if (!writeResult3.IsSuccess) {
- writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight()); // 鐩爣绔�
+ writeResult3 = siemensS7Net.Write(heightAddress, Short.parseShort(staProtocol.getHeight())); // 鐩爣绔�
}
}
}
@@ -619,9 +622,10 @@
// array[1] = staProtocol.getStaNo();
// OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
//
-//// OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
-//// Thread.sleep(500);
-//// OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
+
+ /// / OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ /// / Thread.sleep(500);
+ /// / OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
//
// if (!write.IsSuccess) {
// staProtocol = station.get(staProtocol.getSiteId());
@@ -641,7 +645,6 @@
// }
// }
// }
-
private void write2(StaProtocol staProtocol) throws InterruptedException {
if (null == staProtocol) {
return;
--
Gitblit v1.9.1