From 2ea1c479596a2b5417319de0d230d79040491c0a Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期六, 10 一月 2026 19:21:30 +0800
Subject: [PATCH] 修复bug-深库位出库，浅库位有货时卡住并且锁表的情况
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 108 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index fffae0f..3ca8cfc 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -41,32 +41,34 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
private StaError1 staError1;
- public static final ArrayList<Integer> staNos;
- static {
- ArrayList<Integer> list = new ArrayList<>();
- for (int i = 1; i <= 48; i++) {
- list.add(1000 + i);
- }
- for (int i = 9; i <= 40; i++) {
- list.add(1100 + i);
- }
- list.add(1701);
- list.add(1702);
- staNos = list; // 涓嶅彲淇敼锛屽畨鍏�
- }
- public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
- add(1); add(2);add(3); add(4);add(5); add(6);add(7); add(8);
+
+ 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(1701);
}};
- public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(104); add(106);
+ 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(1702);
}};
- /**
- * 鏉＄爜鏁伴噺
- */
- private int barcodeSize = 2;
+
+ public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
+ 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);
+ }};
/**
* 鍏ュ嚭搴撴ā寮�
@@ -83,7 +85,29 @@
}
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;
+ }
+
+ }
+
+ private ArrayList<Integer> getErrList() {
+ if (slave.getId() == 1){
+ return ErrList2;
+ }else {
+ return ErrList1;
+ }
+
}
@Override
@@ -178,7 +202,7 @@
News.info("SiemensDevp"+" - 1"+" - 杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- News.error("SiemensDevp"+" - 2"+" - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// News.error("SiemensDevp"+" - 2"+" - 杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
siemensS7Net.ConnectClose();
initSite();
@@ -189,9 +213,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); // 绔欑偣缂栧彿
@@ -223,28 +247,31 @@
} else {
initSite();
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- News.error("SiemensCrn"+" - 4"+" - 璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+// 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);
}
}
}
+ ArrayList<Integer> errList = getErrList();
// 澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.430", (short) (staNosErrList.size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (errList.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<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);
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
staProtocol.setHighErr(status[2]);
@@ -253,8 +280,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);
+
}
}
@@ -312,16 +338,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