From 6c77af1652cc44a9cd4c7d843b9467110582bf37 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 16 四月 2026 14:10:57 +0800
Subject: [PATCH] 一楼输送线调试
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index acb589a..0c39aa6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -68,7 +68,7 @@
// 鏉＄爜鎵弿鍣�
public static final ArrayList<Integer> barcodeList1 = new ArrayList<Integer>(){{
- add(1);add(2);
+ add(2);add(1);
}};
public static final ArrayList<Integer> barcodeList2 = new ArrayList<Integer>(){{
add(3);
@@ -77,7 +77,7 @@
add(4);
}};
public static final ArrayList<Integer> barcodeList4 = new ArrayList<Integer>(){{
- add(5);add(6);
+ add(6);add(5);
}};
private ArrayList<Integer> getBarcodeList() {
switch (this.slave.getId()) {
@@ -85,6 +85,31 @@
case 2: return barcodeList2;
case 3: return barcodeList3;
case 4: return barcodeList4;
+ default:
+ }
+ return new ArrayList<>();
+ }
+
+
+ // 澶栧舰妫�娴�
+ public static final ArrayList<Integer> shapeDetectionList1 = new ArrayList<Integer>(){{
+ add(1112);add(1109);
+ }};
+ public static final ArrayList<Integer> shapeDetectionList2 = new ArrayList<Integer>(){{
+ add(1209);
+ }};
+ public static final ArrayList<Integer> shapeDetectionList3 = new ArrayList<Integer>(){{
+ add(1309);
+ }};
+ public static final ArrayList<Integer> shapeDetectionList4 = new ArrayList<Integer>(){{
+ add(1407);add(1402);
+ }};
+ private ArrayList<Integer> getShapeDetectionList() {
+ switch (this.slave.getId()) {
+ case 1: return shapeDetectionList1;
+ case 2: return shapeDetectionList2;
+ case 3: return shapeDetectionList3;
+ case 4: return shapeDetectionList4;
default:
}
return new ArrayList<>();
@@ -209,7 +234,7 @@
private void read() {
// 绔欑偣淇℃伅
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (8*8));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*8));
if (result.IsSuccess) {
for (int i = 0; i < getStaNo().size(); i++) {
Integer siteId = getStaNo().get(i); // 绔欑偣缂栧彿
@@ -246,7 +271,7 @@
}
// 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.400", (short) (getBarcodeList().size() * 10));
+ OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.600", (short) (getBarcodeList().size() * 10));
if (barcodeResult.IsSuccess) {
for (int i = 0; i < getBarcodeList().size(); i++) {
String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*10 + 2,8, "UTF-8");
@@ -258,11 +283,11 @@
}
// 澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.430", (short) (getStaNo().size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.700", (short) (getShapeDetectionList().size() *6));
if (resultErr.IsSuccess){
- for (int i = 0;i<getStaNo().size();i++){
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
- StaProtocol staProtocol = station.get(getStaNo().get(i));
+ for (int i = 0;i<getShapeDetectionList().size();i++){
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*6+2, 1);
+ StaProtocol staProtocol = station.get(getShapeDetectionList().get(i));
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
staProtocol.setHighErr(status[2]);
@@ -271,13 +296,13 @@
staProtocol.setGroupSupportErr(status[5]);
staProtocol.setBarcodeErr(status[6]);
staProtocol.setWeightErr(status[7]);
- short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4 + 2);
+ short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 6 + 4);
staProtocol.setGoodsHeight(goodsHeight);
}
}
// 鏁呴殰淇℃伅鍙嶉
- OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.442", (short) (getStaNo().size() * 4));
+ OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.400", (short) (getStaNo().size() * 4));
if (resultErr2.IsSuccess) {
for (int i = 0; i < getStaNo().size(); i++) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4 + 2, 1);
@@ -331,15 +356,15 @@
return;
}
- int address = getStaNo().indexOf(staProtocol.getSiteId()) * 4;
+ int address = getStaNo().indexOf(staProtocol.getSiteId()) * 6;
OperateResult write;
OperateResult write1;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100." + address, staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
- write1 = siemensS7Net.Write("DB100." + (address + 2), staProtocol.getStaNo()); // 鐩爣绔�
+ write = siemensS7Net.Write("DB100." + (address), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ write1 = siemensS7Net.Write("DB100." + (address + 4), staProtocol.getStaNo()); // 鐩爣绔�
Thread.sleep(200);
if(write.IsSuccess && write1.IsSuccess){
break;
--
Gitblit v1.9.1