From 12f4a6839c831411be43819e4d6487af6933bbbb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 八月 2024 17:49:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f0435a5..eb078f2 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -22,6 +22,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
+import com.zy.core.model.protocol.StaError1;
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
+ private StaError1 staError1;
// public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
//
// }};
@@ -71,6 +73,9 @@
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(0); add(1); add(2);
+ }};
+ public static final ArrayList<Integer> BarcodeListMat = new ArrayList<Integer>() {{
+ add(3); add(4);
}};
public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
add(106); add(107); add(159);
@@ -135,7 +140,7 @@
}
// 蹇冭烦
// heartbeat();
- Thread.sleep(300);
+ Thread.sleep(100);
} catch (Exception e) {
e.printStackTrace();
}
@@ -232,7 +237,7 @@
}
BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
//RGV灏忚溅1
- Thread.sleep(100);
+// 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));
@@ -249,7 +254,7 @@
}
}
//RGV灏忚溅2
- Thread.sleep(100);
+// 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));
@@ -267,7 +272,7 @@
}
//RGV灏忚溅3
- Thread.sleep(100);
+// 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));
@@ -291,6 +296,19 @@
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);
@@ -332,6 +350,33 @@
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]);
+
}
@@ -382,6 +427,7 @@
Thread.sleep(200);
write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
if(write.IsSuccess && write1.IsSuccess){
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
break;
}
else {
--
Gitblit v1.9.1