From fb74f60f1d8397acf5251ae289e80ab8a056857f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 09 十月 2025 09:08:05 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 409 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 235 insertions(+), 174 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b203b7b..8a804a7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -27,6 +27,7 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -59,12 +60,12 @@
add(1029);add(1031);
add(1032);add(1033);add(1035);
add(1036);add(1037);add(1038);
- add(1039);add(1041);
-// add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);add(1048);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);add(1056);add(1057);
-// add(1058);add(1059);add(1060);add(1061);add(1062);add(1063);add(1064);add(1065);add(1066);add(1067);add(1068);add(1069);add(1070);add(1071);add(1072);
-// add(1073);add(1074);add(1075);add(1076);add(1077);add(1078);add(1079);add(1080);add(1081);add(1082);add(1083);add(1084);add(1085);add(1086);add(1087);
-// add(1088);add(1089);add(1090);add(1091);add(1092);add(1093);add(1094);add(1095);add(1096);add(1097);add(1098);add(1099);add(1100);add(1101);add(1102);
-// add(1103);add(1104);add(1105);add(1106);add(1107);add(1108);add(1109);
+ add(1039);add(1040);add(1041);
+ add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);add(1048);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);add(1056);add(1057);
+ add(1058);add(1059);add(1060);add(1061);add(1062);add(1063);add(1064);add(1065);add(1066);add(1067);add(1068);add(1069);add(1070);add(1071);add(1072);
+ add(1073);add(1074);add(1075);add(1076);add(1077);add(1078);add(1079);add(1080);add(1081);add(1082);add(1083);add(1084);add(1085);add(1086);add(1087);
+ add(1088);add(1089);add(1090);add(1091);add(1092);add(1093);add(1094);add(1095);add(1096);add(1097);add(1098);add(1099);add(1100);add(1101);add(1102);
+ add(1103);add(1104);add(1105);add(1106);add(1107);add(1108);add(1109);add(1110);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
@@ -94,12 +95,47 @@
put(1022, 2076);put(1023, 2192);put(1024, 2284);put(1025, 2376);put(1026, 2492);put(1027, 2584);put(1028, 2676);
put(1029, 0);put(1030, 116);put(1031, 208);put(1032, 300);put(1033, 416);put(1034, 508);put(1035, 600);
put(1036, 692);put(1037, 784);put(1038, 876);put(1039, 968);put(1040, 1084);put(1041, 1176);
+ put(1042, 0);put(1043, 92);put(1044, 184);put(1045, 276);put(1046, 368);put(1047, 460);
+ put(1048, 552);put(1049, 644);put(1050, 736);put(1051, 828);put(1052, 992);put(1053, 1084);
+ put(1054, 0);put(1055, 92);put(1056, 256);put(1057, 348);put(1058, 512);put(1059, 604);put(1060, 600);
+ put(1061, 788);put(1062, 880);put(1063, 972);put(1064, 1064);put(1065, 1156);put(1066, 1320);put(1067, 1412);
+ put(1068, 1576);put(1069, 1668);put(1070, 1832);put(1071, 1924);put(1072, 2016);put(1073, 2108);put(1074, 2200);
+ put(1075, 2292);put(1076, 2384);put(1077, 2476);put(1078, 2640);put(1079, 2732);
+ put(1080, 0);put(1081, 92);put(1082, 256);put(1083, 348);put(1084, 512);put(1085, 604);put(1086, 696);
+ put(1087, 860);put(1088, 952);put(1089, 1044);put(1090, 1208);put(1091, 1300);put(1092, 1392);put(1093, 1556);
+ put(1094, 1648);put(1095, 1740);put(1096, 1904);put(1097, 1996);put(1098, 2160);put(1099, 2252);put(1100, 2344);
+ put(1101, 2508);put(1102, 2600);put(1103, 2692);put(1104, 2784);put(1105, 2876);
+ put(1106, 2968);put(1107, 3060);put(1108, 3152);put(1109, 3244);put(1110, 3336);
+
+ put(2001, 392);put(2002, 116);put(2003, 208);put(2004, 0);put(2005, 300);
+ put(2006, 508);put(2007, 692);put(2008, 600);put(2009, 808);put(2010, 992);
+ put(2011, 900);put(2012, 1108);put(2013, 1500);put(2014, 1292);put(2015, 1200);
+ put(2016, 1384);put(2017, 1616);put(2018, 1708);put(2019, 1800);put(2020, 1916);
+ put(2021, 2008);put(2022, 2100);put(2023, 2216);put(2024, 2308);put(2025, 2400);
+ put(2026, 2516);put(2027, 2608);put(2028, 2792);put(2029, 2700);put(2030, 2908);
+ put(2031, 464);put(2032, 348);put(2033, 556);put(2034, 92);put(2035, 0);
+ put(2037, 256);
+
+ put(4001, 0);put(4002, 116);put(4003, 508);put(4004, 392);put(4005, 300);
+ put(4006, 208);
// 鍏朵粬绔欑偣鍚岀悊缁х画鍔�
+ }};
+
+ public static final Map<Integer, Integer> siteErrOffsetMap = new HashMap<Integer, Integer>() {{
+ put(1036, 512);put(1103, 476);put(1047, 452);
+
}};
// 鐗规畩绔欑偣闆嗗悎
private static final Set<Integer> specialSites = new HashSet<>(
- Arrays.asList(1001,1005,1008,1011,1015,1019,1022,1025,1029, 1032,1039));
+ Arrays.asList(1001,1005,1008,1011,1015,1019,1022,1025,1029, 1032,1039,2004,2001,2007,2010,2016,2013,2019,2022,2025,2030,4001,4004));
+
+ // 鐗规畩绔欑偣闆嗗悎
+ private static final Set<Integer> specialSites2 = new HashSet<>(
+ Arrays.asList(1051,1055,1057,1065,1067,1069,1077,1081,1083,1086,1089,1092,1095,1097,1100,2034));
+
+ private static final Set<Integer> specialSites3 = new HashSet<>(//鏈烘鑷傜珯鐐�
+ Arrays.asList(1098,1093,1087,1082,1074,1071,1061,1058));
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
@@ -109,7 +145,7 @@
add(3); add(4);
}};
public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(1036);
+ add(1103);add(1036);add(1047);
}};
private Integer count=0;
@@ -224,7 +260,7 @@
staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
staProtocol.setStaNo((short) 0); // 鐩爣绔�
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ if (!staProtocol.isPakMk() && staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
}
@@ -261,8 +297,27 @@
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = null;
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.0", (short) (2764));
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0", (short) (1264));
+ OperateResultExOne<byte[]> result1 = null;
+ OperateResultExOne<byte[]> result2 = null;//1029-1037
+ OperateResultExOne<byte[]> result3 = null;//1042-1053
+ OperateResultExOne<byte[]> result4 = null;//1054-1079
+ OperateResultExOne<byte[]> result5 = null;//1080-1110
+ OperateResultExOne<byte[]> resultErr = null;//1080-1110
+ if(staNoSize == 99){
+ result1 = siemensS7Net.Read("DB100.0", (short) (2768));//1001-1028
+ result2 = siemensS7Net.Read("DB101.0", (short) (1268));//1029-1037
+ result3 = siemensS7Net.Read("DB104.0", (short) (1268));//1042-1053
+ result4 = siemensS7Net.Read("DB103.0", (short) (2824));//1054-1079
+ result5 = siemensS7Net.Read("DB102.0", (short) (3428));//1080-1110
+ resultErr = siemensS7Net.Read("DB3.0", (short) (536));//1080-1110
+ }else{
+ result1 = siemensS7Net.Read("DB200.0", (short) (3000));//2001-2030
+ result2 = siemensS7Net.Read("DB201.0", (short) (720));//2031-2037
+ result3 = siemensS7Net.Read("DB400.0", (short) (600));//4001-4006
+ }
+
+
+
if (result1.IsSuccess && result2.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
@@ -273,10 +328,26 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- if(siteId < 1029){
- result = result1;
+ if (staNoSize == 99) {
+ if (siteId < 1029) {
+ result = result1;
+ } else if (siteId < 1042) {
+ result = result2;
+ } else if (siteId < 1054) {
+ result = result3;
+ } else if (siteId < 1080) {
+ result = result4;
+ } else if (siteId < 1111) {
+ result = result5;
+ }
}else{
- result = result2;
+ if (siteId < 2031) {
+ result = result1;
+ } else if (siteId < 4001) {
+ result = result2;
+ } else {
+ result = result3;
+ }
}
// 鑾峰彇璇ョ珯鐐瑰搴旂殑鍋忕Щ閲�
Integer offset = siteOffsetMap.get(siteId);
@@ -285,22 +356,43 @@
}
Integer offset2 = getOffsetBySiteId(siteId);
Integer offset3 = getOffsetBySiteId2(siteId);
+ if(siteId == 1040){
+ boolean[] full = siemensS7Net.getByteTransform().TransBool(result.Content, offset, 2);
+ staProtocol.setFull(full[0]);
+ }
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2)); // 宸ヤ綔鍙�
+ staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 12)); // 鐩爣绔�
+ staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 16))); //鏉＄爜
- staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 12)); // 鐩爣绔�
+ if(specialSites2.contains(siteId)){
+ staProtocol.setStaNo((short)siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 48)); // 鐩爣绔�
+ staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 52))); //鏉＄爜
+ }
+ if(staNosErrList.contains(siteId)){
+ Integer offsetErr = siteErrOffsetMap.get(siteId);
+ boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetErr, 2);
+ staProtocol.setFrontErr(statusErr[2]);
+ staProtocol.setBackErr(statusErr[3]);
+ staProtocol.setHighErr(statusErr[5]);
+ staProtocol.setLeftErr(statusErr[11]);
+ staProtocol.setRightErr(statusErr[12]);
+// 鍙栧嚭454~458浣嶇疆鐨�5涓瓧鑺�
+ byte[] bytes = Arrays.copyOfRange(resultErr.Content, (offsetErr + 14), (offsetErr + 19));
+// 杞崲鎴愬瓧绗︿覆锛圫7閲孋HAR鏄崟瀛楄妭缂栫爜锛岀洿鎺SCII鍗冲彲锛�
+ String plcStr = new String(bytes, StandardCharsets.US_ASCII).trim();
+// 鍒ゆ柇鏄惁绛変簬 "error"
+ staProtocol.setBarcodeErr("error".equalsIgnoreCase(plcStr));
+ }
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3, 2);
- staProtocol.setAutoing(status[0]); // 鑷姩
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3, 1);
+ staProtocol.setAutoing(!status[0]); // 鑷姩
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
- staProtocol.setLoading(status1[0]); // 鏈夌墿
- if(staProtocol.isLoading()){
- staProtocol.setInEnable(false); // 鍙叆
- staProtocol.setOutEnable(false);// 鍙嚭
- }else{
- staProtocol.setInEnable(true); // 鍙叆
- staProtocol.setOutEnable(true);// 鍙嚭
- }
+ staProtocol.setLoading(!status1[0]); // 鏈夌墿
+
+ staProtocol.setInEnable(status1[2]); // 鍙叆
+ staProtocol.setOutEnable(status1[2]);// 鍙嚭
+ staProtocol.setErr(status1[6]);
// staProtocol.setInEnable(status1[1]); // 鍙叆
// staProtocol.setOutEnable(status1[3]);// 鍙嚭
// staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
@@ -308,154 +400,47 @@
// staProtocol.setHigh(status[6]); // 楂樺簱浣�
// staProtocol.setLow(status[7]); // 浣庡簱浣�
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ if (!staProtocol.isPakMk() && (!staProtocol.isLoading() || staProtocol.getWorkNo()==0)) {
staProtocol.setPakMk(true);
}
}
}
-// BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
- //RGV灏忚溅1
-// Thread.sleep(100);
-// OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10);
-// if (result3.IsSuccess) {
-// BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
-// if (!Cools.isEmpty(basRgvMap)){
-// Integer siteId = 1;
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setAutoing(true);
-// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)));
-// }
-// }
- //RGV灏忚溅2
-// Thread.sleep(100);
-// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB50.212",(short)10);
-// if (result4.IsSuccess) {
-// BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result4.Content, 0));
-// if (!Cools.isEmpty(basRgvMap)){
-// Integer siteId = 2;
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setAutoing(true);
-// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result4.Content, 8)));
-// }
-// }
-
-// //RGV灏忚溅3
-//// Thread.sleep(100);
-// OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB50.224",(short)10);
-// if (result5.IsSuccess) {
-// BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result5.Content, 0));
-// if (!Cools.isEmpty(basRgvMap)){
-// Integer siteId = 3;
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setAutoing(true);
-// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result5.Content, 8)));
-// }
-// }
-
-// //鏉＄爜鎵弿鍣�
-// ArrayList<Integer> barcodeList = BarcodeList;
-// OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
-// if (result2.IsSuccess) {
-// for (int i = 0; i < barcodeList.size(); i++) {
-// Integer barcodeId = barcodeList.get(i);
-// String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
-// if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-// barcodeThread.setBarcode(barcode);
-// }
-// }
-// }
//鏉＄爜鎵弿鍣�
-// ArrayList<Integer> barcodeListMat = BarcodeListMat;
-// OperateResultExOne<byte[]> result2Mat = siemensS7Net.Read("DB103.0", (short) (barcodeListMat.size() * 30));
-// if (result2Mat.IsSuccess) {
-// for (int i = 0; i < barcodeListMat.size(); i++) {
-// Integer barcodeId = barcodeListMat.get(i);
-// String barcode = siemensS7Net.getByteTransform().TransString(result2Mat.Content,i*30,30, "UTF-8");
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
-// if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-// barcodeThread.setBarcode(barcode);
-// }
-// }
-// }
- //澶栧舰妫�娴�
-// ArrayList<Integer> staNoErrs = staNosErrList;
-// int staNoErrsSize = staNoErrs.size();
-// OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (staNoErrsSize*8));
-// if (resultErr.IsSuccess){
-// for (int i = 0;i<3;i++){
-// Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
-// StaProtocol staProtocol = station.get(siteId);
-// staProtocol.setFrontErr(status[0]);
-// staProtocol.setBackErr(status[1]);
-// staProtocol.setHighErr(status[2]);
-// staProtocol.setLeftErr(status[3]);
-// staProtocol.setRightErr(status[4]);
-// staProtocol.setWeightErr(status[5]);
-// staProtocol.setBarcodeErr(status[6]);
-// }
-// }
+ ArrayList<Integer> barcodeList = BarcodeList;
+ OperateResultExOne<byte[]> reasultBarcode1 = siemensS7Net.Read("DB101.780", (short) 8);//1036
+ OperateResultExOne<byte[]> reasultBarcode2 = siemensS7Net.Read("DB104.548", (short) 8);//1047
+ OperateResultExOne<byte[]> reasultBarcode3 = siemensS7Net.Read("DB102.2780", (short) 8);//1103
+// OperateResultExOne<byte[]> reasultBarcode4 = siemensS7Net.Read("DB104.180", (short) 184);
+ if(reasultBarcode1.IsSuccess){
+ Integer barcodeId = barcodeList.get(0);
+ String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode1.Content, 0));
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+// News.error(JSON.toJSONString(barcode+"绾跨▼"+barcodeId));
-// OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
-// if (resultErr2.IsSuccess) {
-// for (int i = 0; i < staNoSize; i++) {
-// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4, 1);
-// StaProtocol staProtocol = station.get(siteId);
-// staProtocol.setBreakerErr(status[0]);
-// staProtocol.setInfraredErr(status[1]);
-// staProtocol.setOutTimeErr(status[2]);
-// staProtocol.setSeizeSeatErr(status[3]);
-// staProtocol.setWrkYgoodsN(status[4]);
-// staProtocol.setInverterErr(status[5]);
-// staProtocol.setContactErr(status[6]);
-// staProtocol.setUpcontactErr(status[7]);
-//
-// }
-// }
-// OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
-// if (resultErr3.IsSuccess) {
-// if (staError1 == null){
-// staError1 = new StaError1();
-// }
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
-// staError1.setEMERGENCY_Stop_Core(status[0]);
-// staError1.setEMERGENCY_STOP1(status[1]);
-// staError1.setEMERGENCY_STOP2(status[2]);
-// staError1.setEMERGENCY_STOP3(status[3]);
-// staError1.setEMERGENCY_STOP4(status[4]);
-//
-// staError1.setDoor_EMERGENCY_STOP1(status[5]);
-// staError1.setDoor_EMERGENCY_STOP2(status[6]);
-// staError1.setDoor_EMERGENCY_STOP3(status[7]);
-// staError1.setDoor_EMERGENCY_STOP4(status[8]);
-// staError1.setDoor_EMERGENCY_STOP5(status[9]);
-// staError1.setDoor_EMERGENCY_STOP6(status[10]);
-//
-// staError1.setDoor_Open_Err1(status[11]);
-// staError1.setDoor_Open_Err1(status[12]);
-// staError1.setDoor_Open_Err1(status[13]);
-// staError1.setDoor_Open_Err1(status[14]);
-// staError1.setDoor_Open_Err1(status[15]);
-// staError1.setDoor_Open_Err1(status[16]);
-//
-// }
+ }
+ if(reasultBarcode2.IsSuccess){
+ Integer barcodeId = barcodeList.get(1);
+ String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode2.Content, 0));
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+// News.error(JSON.toJSONString(barcode+"绾跨▼"+barcodeId));
+
+ }
+ if(reasultBarcode3.IsSuccess){
+ Integer barcodeId = barcodeList.get(2);
+ String barcode = String.valueOf(siemensS7Net.getByteTransform().TransInt32(reasultBarcode3.Content, 0));
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+// News.error(JSON.toJSONString(barcode+"绾跨▼"+barcodeId));
+
+ }
if (result1.IsSuccess && result2.IsSuccess) {
@@ -506,14 +491,63 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- if(siteId > 1028){
- write = siemensS7Net.Write("DB101." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
- write1 = siemensS7Net.Write("DB101." + (offset + offset2 + 12), staProtocol.getStaNo()); // 鐩爣绔�
- }else{
+
+ if(siteId < 1029){
write = siemensS7Net.Write("DB100." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (offset + offset2 + 12), staProtocol.getStaNo()); // 鐩爣绔�
+ write1 = siemensS7Net.Write("DB100." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else if(siteId < 1042){
+ write = siemensS7Net.Write("DB101." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ write1 = siemensS7Net.Write("DB101." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else if(siteId < 1054){
+ write = siemensS7Net.Write("DB104." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ if(specialSites2.contains(siteId)){
+ write1 = siemensS7Net.Write("DB104." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else{
+ write1 = siemensS7Net.Write("DB104." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }
+ }else if(siteId < 1080){
+ write = siemensS7Net.Write("DB103." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ if(specialSites2.contains(siteId)){
+ write1 = siemensS7Net.Write("DB103." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else{
+ write1 = siemensS7Net.Write("DB103." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }
+ }else if(siteId < 1111){
+ write = siemensS7Net.Write("DB102." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ if(specialSites2.contains(siteId)){
+ write1 = siemensS7Net.Write("DB102." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else{
+ write1 = siemensS7Net.Write("DB102." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }
+ }else if(siteId < 2031){
+ write = siemensS7Net.Write("DB200." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ if(specialSites2.contains(siteId)){
+ write1 = siemensS7Net.Write("DB200." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else{
+ write1 = siemensS7Net.Write("DB200." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }
+ }else if(siteId < 4000){
+ write = siemensS7Net.Write("DB201." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ if(specialSites2.contains(siteId)){
+ write1 = siemensS7Net.Write("DB201." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else{
+ write1 = siemensS7Net.Write("DB201." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }
+ }else{
+ write = siemensS7Net.Write("DB400." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ if(specialSites2.contains(siteId)){
+ write1 = siemensS7Net.Write("DB400." + (offset + offset2 + 48), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }else{
+ write1 = siemensS7Net.Write("DB400." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
+ }
}
if(write.IsSuccess && write1.IsSuccess){
log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -527,7 +561,7 @@
if (!write.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
+ if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0 && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
@@ -547,6 +581,33 @@
}
}
}
+ public Integer getRgvPosI(Integer pos) {
+ if (pos == null) return 0;
+
+ // key: 绔欑偣鍙� value: 鍩哄噯鐗╃悊浣嶇疆
+ Map<Integer, Integer> posMap = new HashMap<>();
+ posMap.put(1004, 6534);
+ posMap.put(1007, 33634);
+ posMap.put(1010, 75174);
+ posMap.put(1014, 102124);
+ posMap.put(1018, 138224);
+ posMap.put(1021, 178034);
+ posMap.put(1024, 219684);
+ posMap.put(1028, 246724);
+ posMap.put(1031, 288194);
+ posMap.put(1035, 315204);
+ int tolerance = 50; // 鍏佽璇樊鑼冨洿
+
+ for (Map.Entry<Integer, Integer> entry : posMap.entrySet()) {
+ int site = entry.getKey();
+ int basePos = entry.getValue();
+ if (Math.abs(pos - basePos) <= tolerance) {
+ return site;
+ }
+ }
+
+ return 0; // 娌″尮閰嶅埌绔欑偣
+ }
/**
* 蹇冭烦
--
Gitblit v1.9.1