From f82afda0b3256628f362e30b5470f14f4cca0e7e Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 08 一月 2026 09:48:37 +0800
Subject: [PATCH] 扫码枪配置
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 0772200..3ca8cfc 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -57,9 +57,16 @@
public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
- add(1002); add(1004);add(1006); add(1008);
+ add(5);add(6);add(7);add(8);
}};
public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
+ add(1); add(2); add(3); add(4);
+ }};
+
+ public static final ArrayList<Integer> ErrList1 = new ArrayList<Integer>() {{
+ add(1002); add(1004);add(1006); add(1008);
+ }};
+ public static final ArrayList<Integer> ErrList2 = new ArrayList<Integer>() {{
add(1041); add(1043);add(1045); add(1047);
}};
@@ -90,6 +97,15 @@
return BarcodeList2;
}else {
return BarcodeList1;
+ }
+
+ }
+
+ private ArrayList<Integer> getErrList() {
+ if (slave.getId() == 1){
+ return ErrList2;
+ }else {
+ return ErrList1;
}
}
@@ -247,11 +263,12 @@
}
}
+ ArrayList<Integer> errList = getErrList();
// 澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (barcodeList.size() *6)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (errList.size() *6)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
if (resultErr.IsSuccess){
- for (int i = 0;i<barcodeList.size();i++){
- StaProtocol staProtocol = station.get(barcodeList.get(i));
+ for (int i = 0;i<errList.size();i++){
+ StaProtocol staProtocol = station.get(errList.get(i));
short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4);
staProtocol.setGoodsHeight(goodsHeight);
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
--
Gitblit v1.9.1