From aed93f604e42ad77d686182107e271c690c5de27 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 25 三月 2025 10:54:51 +0800
Subject: [PATCH] #库位数量回调
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 171 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 124 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index edb31c2..eb078f2 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -10,7 +10,9 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgvMap;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvMapService;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -20,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;
@@ -43,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>() {{
//
// }};
@@ -63,11 +67,15 @@
add(152);add(153);add(154);add(155);
add(156);add(157);add(158);add(159);
add(160);add(161);
- add(200);add(201);add(202);
+ add(1);
+// add(200);add(201);add(202);
}};
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);
@@ -125,13 +133,14 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
+ log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
default:
break;
}
// 蹇冭烦
// heartbeat();
- Thread.sleep(300);
+ Thread.sleep(100);
} catch (Exception e) {
e.printStackTrace();
}
@@ -226,51 +235,59 @@
}
}
}
-// OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
-//// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
-// if (result.IsSuccess) {
-// for (int i = 0; i < staNoSize; i++) {
-// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 宸ヤ綔鍙�
-//
-// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2)); // 鐩爣绔�
-// }
-// }
-//
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize * 4));
-// if (result1.IsSuccess) {
-// for (int i = 0; i < staNoSize; i++) {
-// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
-// StaProtocol staProtocol = station.get(siteId);
-// staProtocol.setAutoing(status[0]); // 鑷姩
-// staProtocol.setLoading(status[1]); // 鏈夌墿
-// staProtocol.setInEnable(status[2]); // 鍙叆
-// staProtocol.setOutEnable(status[3]);// 鍙嚭
-// staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
-// staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
-// staProtocol.setHigh(status[6]); // 楂樺簱浣�
-// staProtocol.setLow(status[7]); // 浣庡簱浣�
-//
-// if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-// staProtocol.setPakMk(true);
-// }
-//
-// if (staProtocol.getStamp()>=2 && !staProtocol.isLoading()){
-// staProtocol.setStamp(0);
-// }else if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
-// //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
-// staProtocol.setStamp(staProtocol.getStamp()+1);
-// }
-// }
-// }
+ 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;
@@ -279,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);
@@ -303,6 +333,52 @@
staProtocol.setBarcodeErr(status[6]);
}
}
+
+ 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 (result.IsSuccess) {
@@ -351,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