From 09358392b9c559ebbc9503f1cecea3b7ab3e6c2c Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 02 十二月 2025 16:06:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 172 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 138 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 22f833c..87c8c2e 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -28,6 +28,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import java.io.Console;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.*;
@@ -87,8 +88,8 @@
add(2034);add(2035);add(2037);
// add(2041);add(2042);add(2043);add(2044);
// add(2045);add(2046);add(2047);add(2048);
-// add(2101);add(2102);add(2103);add(2104);add(2105);add(2106);add(2107);add(2108);add(2109);add(2110);
-// add(2111);add(2112);add(2113);add(2114);add(2115);add(2116);add(2117);add(2118);add(2119);add(2120);
+ add(2101);add(2102);add(2103);add(2104);add(2105);add(2106);add(2107);add(2108);add(2109);add(2110);
+ add(2111);add(2112);add(2113);add(2114);add(2115);add(2116);add(2117);add(2118);add(2119);add(2120);
add(4001);add(4003);add(4004);add(4006);
}};
@@ -120,6 +121,12 @@
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(2101, 0);put(2102, 92);put(2103, 184);put(2104, 276);put(2105, 368);
+ put(2106, 460);put(2107, 552);put(2108, 644);put(2109, 736);put(2110, 828);
+ put(2111, 920);put(2112, 1012);put(2113, 1104);put(2114, 1196);put(2115, 1288);
+ put(2116, 1380);put(2117, 1472);put(2118, 1564);put(2119, 1656);put(2120, 1748);
+ put(2121, 1840);put(2122, 1932);
put(4001, 0);put(4002, 116);put(4003, 508);put(4004, 392);put(4005, 300);
put(4006, 208);
@@ -167,6 +174,10 @@
put(1036, 512);put(1103, 476);put(1047, 452);put(2037, 270);put(4001,294);
}};
+ public static final Map<Integer, Integer> siteAgvOffsetMap = new HashMap<Integer, Integer>() {{
+ put(1037, 0);put(1039, 2);put(1041, 4);put(2033, 0);put(2034,2);put(4003,4);put(4006,6);
+
+ }};
// 鐗规畩绔欑偣闆嗗悎
private static final Set<Integer> specialSites = new HashSet<>(
@@ -179,6 +190,8 @@
private static final Set<Integer> specialSites3 = new HashSet<>(//鏈烘鑷傜珯鐐�
Arrays.asList(1098,1093,1087,1082,1074,1071,1061,1058));
+ private static final Set<Integer> specialAgvSites = new HashSet<>(//agv鍙栨斁璐х珯鐐�
+ Arrays.asList(1037,1039,1041,2033,2034,4003,4006));
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(0); add(1); add(2);
@@ -283,6 +296,7 @@
read();
} catch (Exception e) {
+ e.printStackTrace();
log.error("Dev鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
initSite();
}
@@ -328,6 +342,9 @@
write((StaProtocol)task.getData());
log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
+// case 3:
+// writeAgv((StaProtocol)task.getData());
+// break;
default:
break;
}
@@ -447,7 +464,15 @@
OperateResultExOne<byte[]> result3 = null;//1042-1053
OperateResultExOne<byte[]> result4 = null;//1054-1079
OperateResultExOne<byte[]> result5 = null;//1080-1110
+ OperateResultExOne<byte[]> result6 = null;//2101-2122
+
OperateResultExOne<byte[]> resultErr = null;
+ OperateResultExOne<byte[]> resultPlc = null;
+ OperateResultExOne<byte[]> resultAgv = null;
+
+ OperateResultExOne<byte[]> resultArm5 = null;//2110
+ OperateResultExOne<byte[]> resultArm6 = null;//2120
+
if(staNoSize == 102){
result1 = siemensS7Net.Read("DB100.0", (short) (2768));//1001-1028
result2 = siemensS7Net.Read("DB101.0", (short) (1268));//1029-1037
@@ -455,12 +480,18 @@
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));
+// resultAgv = siemensS7Net.Read("DB901.0", (short) (5)); //agv鍙栨斁璐ц姹�
+// resultPlc = siemensS7Net.Read("DB902.0", (short) (5)); //杈撻�佺嚎纭
}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
+ result6 = siemensS7Net.Read("DB202.0", (short) (7400));//2101-2122
resultErr = siemensS7Net.Read("DB3.0", (short) (354));
-
+// resultAgv = siemensS7Net.Read("DB901.0", (short) (7)); //agv鍙栨斁璐ц姹�
+// resultPlc = siemensS7Net.Read("DB902.0", (short) (7)); //杈撻�佺嚎纭
+ resultArm5 = siemensS7Net.Read("DB202.4328", (short) (254));//2110
+ resultArm6 = siemensS7Net.Read("DB202.6888", (short) (254));//2120
}
@@ -491,9 +522,35 @@
}else{
if (siteId < 2031) {
result = result1;
- } else if (siteId < 4001) {
+ } else if (siteId < 2040) {
result = result2;
- } else {
+ } else if(siteId<4000){
+ if (siteId == 2110) {
+ if (resultArm5.IsSuccess) {
+ // 杞崲涓哄瓧绗︿覆
+ String resultString = siemensS7Net.getByteTransform().TransString(resultArm5.Content, 2, 252,"UTF-8");
+ // 鍘婚櫎鍙兘鐨勭┖瀛楃
+// resultString = resultString.TrimEnd('\0');
+// System.out.println("2110Barcode:"+resultString);
+ staProtocol.setBarcode(resultString);
+ } else {
+ staProtocol.setBarcode("");
+ }
+ } else if (siteId == 2120){
+ if (resultArm6.IsSuccess) {
+ // 杞崲涓哄瓧绗︿覆
+ String resultString = siemensS7Net.getByteTransform().TransString(resultArm6.Content, 2, 252,"UTF-8");
+ // 鍘婚櫎鍙兘鐨勭┖瀛楃
+// resultString = resultString.TrimEnd('\0');
+// System.out.println("2120Barcode:"+resultString);
+ staProtocol.setBarcode(resultString);
+ } else {
+ staProtocol.setBarcode("");
+ }
+ }
+ result = result6;
+ }
+ else {
result = result3;
}
}
@@ -525,11 +582,14 @@
}
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))); //鏉＄爜
-
+ if (staProtocol.getSiteId()!=2110 && staProtocol.getSiteId()!=2120 ){
+ staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 16))); //鏉＄爜
+ }
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 (staProtocol.getSiteId()!=2110 && staProtocol.getSiteId()!=2120 ){
+ staProtocol.setBarcode(String.valueOf(siemensS7Net.getByteTransform().TransInt32(result.Content, offset + offset2 + 52))); //鏉＄爜
+ }
}
if(staNosErrList.contains(siteId)){
Integer offsetErr = siteErrOffsetMap.get(siteId);
@@ -551,7 +611,8 @@
staProtocol.setAutoing(!status[0]); // 鑷姩
boolean[] status1 = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 4, 3);
boolean[] statusErr = siemensS7Net.getByteTransform().TransBool(result.Content, offset + offset3 - 8, 3);
- boolean[] statusSign = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetSign, 3);
+// boolean[] statusSign = siemensS7Net.getByteTransform().TransBool(resultErr.Content, offsetSign, 3);
+
boolean loading = false;
if(!status1[0])
{
@@ -562,6 +623,25 @@
staProtocol.setInEnable(status1[2]); // 鍙叆
staProtocol.setOutEnable(status1[2]);// 鍙嚭
staProtocol.setErr(status1[6]);
+
+// boolean[] statusAlarm = siemensS7Net.getByteTransform().TransBool(resultAlarm.Content, 2*i, 1);
+// //鎶ヨ
+// staProtocol.setPassTimeOut(statusAlarm[0]);
+// staProtocol.setObjectNoIdError(statusAlarm[1]);
+// staProtocol.setIdNoObjectError(statusAlarm[2]);
+// staProtocol.setLmfrError(statusAlarm[3]);
+// staProtocol.setLiftError(statusAlarm[4]);
+// staProtocol.setDlfrError(statusAlarm[5]);
+// staProtocol.setDmfrError(statusAlarm[6]);
+// staProtocol.setVfdError(statusAlarm[7]);
+// staProtocol.setSrvError(statusAlarm[8]);
+// staProtocol.setRes1(statusAlarm[9]);
+// staProtocol.setRes2(statusAlarm[10]);
+// staProtocol.setRes3(statusAlarm[11]);
+// staProtocol.setCommunicationTimeOut(statusAlarm[12]);
+// staProtocol.setParameterIncompleteError(statusAlarm[13]);
+// staProtocol.setDataNotClear(statusAlarm[14]);
+// staProtocol.setSetParameterError(statusAlarm[15]);
//鎶ヨ
staProtocol.setPassTimeOut(statusErr[0]);
@@ -585,28 +665,52 @@
staProtocol.setDataError(statusErr[18]);
//淇″彿
- staProtocol.setSensorGArrive(statusSign[0]);
- staProtocol.setSensorGDec(statusSign[1]);
- staProtocol.setSensorGArrive2(statusSign[2]);
- staProtocol.setSensorLimit(statusSign[3]);
- staProtocol.setEmergency(statusSign[4]);
- staProtocol.setSensorGLeave(statusSign[5]);
- staProtocol.setSensorGLeave2(statusSign[6]);
- staProtocol.setSensorCUp(statusSign[7]);
- staProtocol.setSensorCDown(statusSign[8]);
- staProtocol.setLiftMotorFr(statusSign[9]);
- staProtocol.setLineMotorFr(statusSign[10]);
- staProtocol.setTranMotorFr(statusSign[11]);
- staProtocol.setRst1(statusSign[12]);
- staProtocol.setRst2(statusSign[13]);
- staProtocol.setRst3(statusSign[14]);
- staProtocol.setRst4(statusSign[15]);
- staProtocol.setSensorArriveD(statusSign[16]);
- staProtocol.setSensorDecD(statusSign[17]);
- staProtocol.setSensorArriveL(statusSign[18]);
- staProtocol.setSensorDecL(statusSign[19]);
- staProtocol.setSensorArriveR(statusSign[20]);
- staProtocol.setSensorDecR(statusSign[21]);
+// staProtocol.setSensorGArrive(statusSign[0]);
+// staProtocol.setSensorGDec(statusSign[1]);
+// staProtocol.setSensorGArrive2(statusSign[2]);
+// staProtocol.setSensorLimit(statusSign[3]);
+// staProtocol.setEmergency(statusSign[4]);
+// staProtocol.setSensorGLeave(statusSign[5]);
+// staProtocol.setSensorGLeave2(statusSign[6]);
+// staProtocol.setSensorCUp(statusSign[7]);
+// staProtocol.setSensorCDown(statusSign[8]);
+// staProtocol.setLiftMotorFr(statusSign[9]);
+// staProtocol.setLineMotorFr(statusSign[10]);
+// staProtocol.setTranMotorFr(statusSign[11]);
+// staProtocol.setRst1(statusSign[12]);
+// staProtocol.setRst2(statusSign[13]);
+// staProtocol.setRst3(statusSign[14]);
+// staProtocol.setRst4(statusSign[15]);
+// staProtocol.setSensorArriveD(statusSign[16]);
+// staProtocol.setSensorDecD(statusSign[17]);
+// staProtocol.setSensorArriveL(statusSign[18]);
+// staProtocol.setSensorDecL(statusSign[19]);
+// staProtocol.setSensorArriveR(statusSign[20]);
+// staProtocol.setSensorDecR(statusSign[21]);
+
+// Integer offsetAgv = siteAgvOffsetMap.get(siteId);
+//
+// boolean[] statusPlc = siemensS7Net.getByteTransform().TransBool(resultPlc.Content, offsetAgv, 1);
+// boolean[] statusAgv = siemensS7Net.getByteTransform().TransBool(resultAgv.Content, offsetAgv, 1);
+//
+// if(specialAgvSites.contains(siteId)){
+// // 蹇冭烦
+// staProtocol.setHeartbeatDevp(statusPlc[0]);
+// staProtocol.setHeartbeatAgv(statusAgv[0]);
+// // 杈撻�佺嚎锛圥LC锛�
+// staProtocol.setConveyorAllowPick(statusPlc[1]);
+// staProtocol.setConveyorAllowPlace(statusPlc[2]);
+// staProtocol.setConveyorPickDone(statusPlc[3]);
+// staProtocol.setConveyorPlaceDone(statusPlc[4]);
+// staProtocol.setSafetyDoorOpen(statusPlc[5]);
+// staProtocol.setExternalEmergencyStop(statusPlc[6]);
+// // AGV
+// staProtocol.setAgvRequestPlace(statusAgv[1]);
+// staProtocol.setAgvRequestPick(statusAgv[2]);
+// staProtocol.setAgvPickDone(statusAgv[3]);
+// staProtocol.setAgvPlaceDone(statusAgv[4]);
+// staProtocol.setAgvForbidden(statusAgv[5]);
+// }
if( (staProtocol.getPassTimeOut() ||
@@ -669,7 +773,7 @@
OperateResultExOne<byte[]> reasultBarcode3 = siemensS7Net.Read("DB102.2780", (short) 4);//1103
OperateResultExOne<byte[]> reasultBarcode4 = siemensS7Net.Read("DB201.344", (short) 4);//2037
OperateResultExOne<byte[]> reasultBarcode5 = siemensS7Net.Read("DB400.112", (short) 4);//4001
- OperateResultExOne<byte[]> reasultBarcode6 = siemensS7Net.Read("DB201.716", (short) 4);//4001
+ OperateResultExOne<byte[]> reasultBarcode6 = siemensS7Net.Read("DB201.716", (short) 4);//2033
if(barcodeList.get(0) == 0){
if(reasultBarcode1.IsSuccess){
@@ -875,8 +979,8 @@
staProtocol.isHighErr()? 1L:0L,
staProtocol.isLeftErr()? 1L:0L,
staProtocol.isRightErr()? 1L:0L,
- staProtocol.isBarcodeErr()? 1L:0L
-
+ staProtocol.isBarcodeErr()? 1L:0L,
+ staProtocol.getErrCode()
);
bean.insert(basDevpOpt);
} catch (Exception ignore) {
--
Gitblit v1.9.1