From 526a013303588e54db3bd1ad26ad789c69fb983a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 06 十二月 2022 12:47:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 22 ++++++++++++++++++++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 22 ++++++++++++++++++----
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 2290116..d707a20 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -49,6 +49,28 @@
// 閿佸畾鏍囪
private boolean pakMk = true;
+ // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+ // 鍓嶈秴闄�
+ private Boolean frontErr;
+
+ // 鍚庤秴闄�
+ private Boolean backErr;
+
+ // 楂樿秴闄�
+ private Boolean highErr;
+
+ // 宸﹁秴闄�
+ private Boolean leftErr;
+
+ // 鍙宠秴闄�
+ private Boolean rightErr;
+
+ // 瓒呴噸
+ private Boolean weightErr;
+
+ // 鎵爜澶辫触
+ private Boolean barcodeErr;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 69a088e..26c91d2 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -150,20 +150,19 @@
//璇绘潯鐮�
Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(barcodeSize*8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0",(short)31);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*16,15, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
}
-
}
// 鍏呯數淇″彿浣�
- Thread.sleep(100);
+ Thread.sleep(50);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.128", (short)1);
if (result3.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
@@ -172,6 +171,21 @@
charge2 = status[2];
}
+ // 澶栧舰妫�娴� - 102
+ Thread.sleep(50);
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.129.", (short)1);
+ if (result4.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
+ System.out.println(JSON.toJSONString(status));
+ }
+ // 澶栧舰妫�娴� - 203
+ Thread.sleep(50);
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB102.130.", (short)1);
+ if (result5.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result5.Content, 0, 1);
+ System.out.println(JSON.toJSONString(status));
+ }
+
if (result.IsSuccess && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1