From d62951d7c0947303fc6eed23a664c162f2ea0010 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 05 十二月 2025 09:07:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 88 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 25712d2..11c8aa7 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,9 @@
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(2121);add(2122);
add(4001);add(4003);add(4004);add(4006);
}};
@@ -120,6 +122,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);
@@ -158,17 +166,27 @@
put(2031, 120);put(2032, 124);put(2033, 128);put(2034, 132);put(2035, 136);
put(2037, 144);
- put(4001, 240);put(4002, 244);put(4003, 248);put(4004, 252);put(4005, 256);
- put(4006, 260);
+ put(2101, 160);put(2102, 164);put(2103, 168);put(2104, 172);put(2105, 176);
+ put(2106, 180);put(2107, 184);put(2108, 188);put(2109, 192);put(2110, 196);
+ put(2111, 200);put(2112, 204);put(2113, 208);put(2114, 212);put(2115, 216);
+ put(2116, 220);put(2117, 224);put(2118, 228);put(2119, 232);put(2120, 236);
+ put(2121, 240);put(2122, 244);
+ put(4001, 248);put(4002, 252);put(4003, 256);put(4004, 260);put(4005, 264);
+ put(4006, 268);
// 鍏朵粬绔欑偣鍚岀悊缁х画鍔�
}};
public static final Map<Integer, Integer> siteErrOffsetMap = new HashMap<Integer, Integer>() {{
- put(1036, 512);put(1103, 476);put(1047, 452);put(2037, 270);put(4001,294);
+ put(1036, 512);put(1103, 476);put(1047, 452);put(2037, 278);put(4001,302);
}};
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);
+
+ }};
+
+ public static final Map<Integer, Integer> site2lBarcodeOffsetMap = new HashMap<Integer, Integer>() {{//2妤紁da鍐欏叆鏉＄爜
+ put(2102, 2280);put(2105, 3048);put(2112, 4840);put(2115, 5608);
}};
@@ -457,9 +475,14 @@
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
@@ -474,9 +497,12 @@
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
- resultErr = siemensS7Net.Read("DB3.0", (short) (354));
+ result6 = siemensS7Net.Read("DB202.0", (short) (2024));//2101-2122
+ resultErr = siemensS7Net.Read("DB3.0", (short) (386));
// resultAgv = siemensS7Net.Read("DB901.0", (short) (7)); //agv鍙栨斁璐ц姹�
// resultPlc = siemensS7Net.Read("DB902.0", (short) (7)); //杈撻�佺嚎纭
+ resultArm5 = siemensS7Net.Read("DB202.4328", (short) (256));//2110
+ resultArm6 = siemensS7Net.Read("DB202.6888", (short) (256));//2120
}
@@ -507,9 +533,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, 254,"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, 254,"UTF-8");
+ // 鍘婚櫎鍙兘鐨勭┖瀛楃
+// resultString = resultString.TrimEnd('\0');
+// System.out.println("2120Barcode:"+resultString);
+ staProtocol.setBarcode(resultString);
+ } else {
+ staProtocol.setBarcode("");
+ }
+ }
+ result = result6;
+ }
+ else {
result = result3;
}
}
@@ -541,11 +593,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);
@@ -568,6 +623,7 @@
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 loading = false;
if(!status1[0])
{
@@ -798,6 +854,9 @@
for (Integer siteId : staNos) {
StaProtocol staProtocol = station.get(siteId);
basDevps.add(staProtocol.toSqlModel());
+ if(siteId == 2110){
+ basDevps.add(staProtocol.toSqlModel());
+ }
if(staProtocol.isWriteMk() && staProtocol.isErrorMk()){
try {
// 鏃ュ織璁板綍寮傚父鎯呭喌
@@ -892,7 +951,7 @@
}else{
write1 = siemensS7Net.Write("DB200." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
}
- }else if(siteId < 4000){
+ }else if(siteId < 2121){
write = siemensS7Net.Write("DB201." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
if(specialSites2.contains(siteId)){
@@ -900,6 +959,11 @@
}else{
write1 = siemensS7Net.Write("DB201." + (offset + offset2 + 12), staProtocol.getStaNo().intValue()); // 鐩爣绔�
}
+ } else if(siteId < 4000){
+ Integer offsetBarcode = site2lBarcodeOffsetMap.get(siteId);
+ write = siemensS7Net.Write("DB202." + offsetBarcode, staProtocol.getBarcode()); // 鏉＄爜
+ write1 = siemensS7Net.Write("DB202." + offsetBarcode, staProtocol.getBarcode());
+ Thread.sleep(200);
}else{
write = siemensS7Net.Write("DB400." + (offset + offset2), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
--
Gitblit v1.9.1