From 03a70a1bf1f830b30c71b882d3806b4c21838719 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 01 一月 2026 17:05:20 +0800
Subject: [PATCH] 入库增加注释
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 85 +++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index cfc018f..8325394 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -25,10 +25,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -44,21 +41,27 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
private StaError1 staError1;
- public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);
+
+
+
+ public static final ArrayList<Integer> staNos1= new ArrayList<Integer>() {{
+ add(1001);add(1002);add(1003);add(1004);add(1005);add(1006);add(1007);add(1008);add(1009);add(1010);
+ add(1011);add(1012);add(1013);add(1014);add(1015);add(1016);add(1017);add(1018);add(1019);
+ add(1020);add(1021);add(1022);add(1023);add(1024);add(1071);
+ }};
+ public static final ArrayList<Integer> staNos2= new ArrayList<Integer>() {{
+ add(1025);add(1026);add(1027);add(1028);add(1029);add(1030);add(1031);add(1032);add(1033);
+ add(1034);add(1035);add(1036);add(1037);add(1038);add(1039);add(1040);add(1041);add(1042);add(1043);
+ add(1044);add(1045);add(1046);add(1047);add(1048);add(1072);
}};
- public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(1); add(2);
- }};
- public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(104); add(106);
- }};
- /**
- * 鏉＄爜鏁伴噺
- */
- private int barcodeSize = 2;
+ public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
+ add(1002); add(1004);add(1006); add(1008);
+ }};
+ public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
+ add(1041); add(1043);add(1045); add(1047);
+ }};
/**
* 鍏ュ嚭搴撴ā寮�
@@ -75,7 +78,20 @@
}
private ArrayList<Integer> getStaNo() {
- return staNos;
+ if (slave.getId() == 1){
+ return staNos2;
+ }else {
+ return staNos1;
+ }
+
+ }
+ private ArrayList<Integer> getBarcodeList() {
+ if (slave.getId() == 1){
+ return BarcodeList2;
+ }else {
+ return BarcodeList1;
+ }
+
}
@Override
@@ -181,9 +197,9 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() {
-
+ ArrayList<Integer> staNos = getStaNo();
// 绔欑偣淇℃伅
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (8*8));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNos.size()*8));
if (result.IsSuccess) {
for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -218,13 +234,13 @@
News.error("SiemensCrn"+" - 4"+" - 璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
return;
}
-
+ ArrayList<Integer> barcodeList = getBarcodeList();
// 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.400", (short) (BarcodeList.size() * 10));
+ OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.860", (short) (barcodeList.size() * 8));
if (barcodeResult.IsSuccess) {
- for (int i = 0; i < BarcodeList.size(); i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*10 + 2,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, BarcodeList.get(i));
+ for (int i = 0; i < barcodeList.size(); i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*8 ,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeList.get(i));
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
@@ -232,11 +248,13 @@
}
// 澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.430", (short) (staNosErrList.size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (barcodeList.size() *6)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
if (resultErr.IsSuccess){
- for (int i = 0;i<staNosErrList.size();i++){
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
- StaProtocol staProtocol = station.get(staNosErrList.get(i));
+ for (int i = 0;i<barcodeList.size();i++){
+ StaProtocol staProtocol = station.get(barcodeList.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);
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
staProtocol.setHighErr(status[2]);
@@ -245,8 +263,7 @@
staProtocol.setGroupSupportErr(status[5]);
staProtocol.setBarcodeErr(status[6]);
staProtocol.setWeightErr(status[7]);
- short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4 + 2);
- staProtocol.setGoodsHeight(goodsHeight);
+
}
}
@@ -304,16 +321,16 @@
if (null == staProtocol) {
return;
}
-
- int address = staNos.indexOf(staProtocol.getSiteId()) * 4;
+ ArrayList<Integer> staNos = getStaNo();
+ int address = staNos.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