From 04be06484c74bfae048f58bcb4f41791e0d02692 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 18:40:55 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 0ef6dc6..8a038ff 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -290,14 +290,14 @@
}
// 璇诲彇姝ｉ潰鏉＄爜
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB103.0", (short) (5 * 40));
- if (result2.IsSuccess) {
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB103.0", (short) (5 * 40));
+ if (result3.IsSuccess) {
for (int i = 0; i < 5; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 40, 40, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(result3.Content, i * 40, 40, "UTF-8");
if (!Cools.isEmpty()) {
barcode = barcode.trim();
}
- List<String> barcodeList = Arrays.stream(barcode.split(",")).collect(Collectors.toList());
+ List<String> barcodeList = Arrays.stream(barcode.split(";")).collect(Collectors.toList());
Iterator<String> iterator = barcodeList.iterator();
while (iterator.hasNext()) {
String next = iterator.next();
@@ -308,7 +308,7 @@
}
}
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i);
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
@@ -519,7 +519,7 @@
String workNoAddress;
// 鐩爣绔欏湴鍧�
String staNoAddress;
- // 楂樺害绫诲瀷鍦板潃
+ // 鐩爣绔欏湴鍧�
String heightAddress = null;
if (index < 16) {
workNoAddress = "DB100." + index * 4;
@@ -537,12 +537,15 @@
boolean writeFlag = false;
while (writeCount < 5) {
OperateResult writeResult1 = siemensS7Net.Write(workNoAddress, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo());// 鐩爣绔�
+ OperateResult writeResult2 = siemensS7Net.Write(staNoAddress, staProtocol.getStaNo()); // 鐩爣绔�
if (!Cools.isEmpty(staProtocol.getHeight()) && heightAddress != null) {
- OperateResult writeResult3 = siemensS7Net.Write(heightAddress, Short.valueOf(staProtocol.getHeight())); // 楂樺害绫诲瀷
+ OperateResult writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight()); // 鐩爣绔�
if (!writeResult3.IsSuccess) {
- log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触锛屽皾璇曢噸鏂板啓鍏ワ紝杈撳叆鍙傛暟={}锛岃緭鍑哄弬鏁�={}", JSON.toJSON(staProtocol), writeResult3);// 鍐欏叆杈撻�佺嚎鍛戒护澶辫触锛屽皾璇曢噸鏂板啓鍏ワ紝杈撳叆鍙傛暟={}锛岃緭鍑哄弬鏁�={}", JSON.toJSON(staProtocol), writeResult3);
- writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight()); // 楂樺害绫诲瀷
+ //fangzhi xierukushibai,jiu duoxiejici,meixunhuan
+ writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight());
+ if (!writeResult3.IsSuccess) {
+ writeResult3 = siemensS7Net.Write(heightAddress, staProtocol.getHeight()); // 鐩爣绔�
+ }
}
}
if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
--
Gitblit v1.9.1