From be822b9065892ab857580faea950d8cb377d2280 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 10:02:52 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a2fd278..78edd2e 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -323,25 +323,33 @@
}
}
}
+ int[] staW = new int[]{1004,1014,1020};
//鏉＄爜
// Thread.sleep(50);
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
+ Integer siteId = staW[i]; // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ station.put(siteId, staProtocol);
+ }
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
+ staProtocol.setBarcodeNow(barcode);
}
}
//鏉＄爜
// Thread.sleep(50);
- int[] staW = new int[]{1004,1014,1020};
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4));
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0",(short) (staW.length*4));
if (result3.IsSuccess) {
for (int i = 0; i < staW.length; i++) {
Integer siteId = staW[i]; // 绔欑偣缂栧彿
@@ -357,6 +365,19 @@
staProtocol.setHighErr(status[2]); // 楂樿秴闄�
staProtocol.setLeftErr(status[3]); // 宸﹁秴闄�
staProtocol.setRightErr(status[4]); // 鍙宠秴闄�
+ staProtocol.setWeightErr(status[5]); // 瓒呴噸
+ staProtocol.setBarcodeErr(status[6]); // 鎵爜澶辫触
+ if (resultErr.IsSuccess){
+ boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4 + 2, 2);
+ staProtocol.setErrOther1(statusErr[0]); // 鐢佃矾淇濇姢鍣ㄦ柇寮�
+ staProtocol.setErrOther1(statusErr[1]); // 鍏夌數寮傚父
+ staProtocol.setErrOther1(statusErr[2]); // 杩愯瓒呮椂
+ staProtocol.setErrOther1(statusErr[3]); // 鍗犱綅瓒呮椂
+ staProtocol.setErrOther1(statusErr[4]); // 鏈変换鍔℃棤璐ф晠闅�
+ staProtocol.setErrOther1(statusErr[5]); // 鍙橀鍣ㄦ晠闅�
+ staProtocol.setErrOther1(statusErr[6]); // 鎺ヨЕ鍣ㄦ晠闅�
+ staProtocol.setErrOther1(statusErr[7]); // 椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ }
}
}
--
Gitblit v1.9.1