From 26e01b3be27f13ee189c491e8d9ef333980a0c57 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 16 三月 2025 12:42:08 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 132 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 121 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 960da5e..f15b955 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -58,6 +58,8 @@
add(144);add(145);add(146);add(147);
add(148);add(149);add(150);add(151);
add(152);add(153);
+ add(170);
+ add(171);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
add(200);add(201);add(202);add(203);
@@ -68,10 +70,19 @@
add(220);add(221);add(222);add(2000);
}};
+ public static final ArrayList<Integer> staNos1Super = new ArrayList<Integer>() {{
+ add(118);add(119);add(120);add(121);add(122);add(123);add(131);add(135);add(147);
+ }};
+
+ public static final ArrayList<Integer> staNos2Super = new ArrayList<Integer>() {{
+ add(213);
+ }};
+
+
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 3;
+ private int barcodeSize = 5;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -101,6 +112,17 @@
}
}
+ private ArrayList<Integer> getStaNoSuper() {
+ switch (slave.getId()) {
+ case 1:
+ return staNos1Super;
+ case 2:
+ return staNos2Super;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
+ }
+
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
@@ -119,6 +141,10 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
+// write3((StaProtocol)task.getData());
+// Thread.sleep(400);
+// write4((StaProtocol)task.getData());
+// Thread.sleep(400);
write((StaProtocol)task.getData());
break;
// 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴�
@@ -128,6 +154,13 @@
// 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚 缁欒緭閫佺嚎鍐欎换鍔″畬鎴愬浣�
case 4:
write4((StaProtocol)task.getData());
+ break;
+ case 5:
+ write3((StaProtocol)task.getData());
+ Thread.sleep(400);
+ write4((StaProtocol)task.getData());
+ Thread.sleep(400);
+ write((StaProtocol)task.getData());
break;
default:
break;
@@ -168,11 +201,35 @@
// // 鏇存柊鍏ュ嚭搴撴ā寮�
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
+ ArrayList<Integer> staNoSuper = getStaNoSuper();
int staNoSize = staNos.size();
+ int staNoSuperSize = staNoSuper.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ if (siteId==119){
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo(0); // 宸ヤ綔鍙�
+
+ staProtocol.setStaNo(0); // 鐩爣绔�
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
+ staProtocol.setAutoing(false); // 鑷姩
+ 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]); // 浣庡簱浣�
+ continue;
+ }
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
@@ -192,10 +249,32 @@
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
staProtocol.setHigh(status[6]); // 楂樺簱浣�
staProtocol.setLow(status[7]); // 浣庡簱浣�
-
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
+ }
+ }
+
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> resultError = siemensS7Net.Read("DB101.800", (short) (8));
+ if (resultError.IsSuccess && staNoSize==staNos2.size()) {
+ ArrayList<Integer> staNoError = new ArrayList<Integer>() {{ add(217);add(221); }};
+ for (int i = 0; i < staNoError.size(); i++) {
+ Integer siteId = staNoError.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i*4 + 2, 1);
+ 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]);// 鎵爜澶辫触
}
}
// Thread.sleep(200);
@@ -236,10 +315,10 @@
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.288",(short)(barcodeSize*10));
- if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10,6, "UTF-8");
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));
+ if (result2.IsSuccess && staNoSize==staNos2.size()) {
+ for (int i = 0; i < barcodeSize; i++) { //1:217 2:221 3:null 4:215 5:219
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
@@ -250,8 +329,8 @@
//RGV灏忚溅
Thread.sleep(200);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
- if (result3.IsSuccess) {
- Integer siteId = 16;
+ if (result3.IsSuccess && staNoSize==staNos2.size()) {
+ Integer siteId = 2000;
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
@@ -261,6 +340,22 @@
staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
}
+ //绔欑偣瓒呯骇鏈夌墿淇″彿
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> resultStaSuper = siemensS7Net.Read("DB101.1320",(short)(staNoSuperSize*2));
+ if (resultStaSuper.IsSuccess) {
+ for (int i = 0; i < staNoSuperSize; i++) {
+ Integer siteId = staNoSuper.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ short loadingSuper = siemensS7Net.getByteTransform().TransInt16(resultStaSuper.Content, i * 2);
+ staProtocol.setLoadingSuper(loadingSuper==0); // 鐩爣绔�
+ }
+ }
if (result.IsSuccess) {
@@ -348,7 +443,7 @@
case 118:
index=0;
break;
- case 119:
+ case 171:
index=1;
break;
case 120:
@@ -363,6 +458,9 @@
case 135:
index=5;
break;
+ case 147:
+ index=6;
+ break;
default:
return;
}
@@ -373,7 +471,16 @@
do {
write = siemensS7Net.Write("DB100.600." + index, true); // 浠诲姟瀹屾垚
if(write.IsSuccess){
- writeCount=6;
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.600." + index, (short) 1);
+ if(readResult.IsSuccess){
+ boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readResult.Content, 0, 1);
+ if (booleans[0]){
+ writeCount=6;
+ }else {
+ writeCount++;
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+ }
}else {
writeCount++;
log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -403,7 +510,7 @@
case 118:
index=0;
break;
- case 119:
+ case 171:
index=1;
break;
case 120:
@@ -418,6 +525,9 @@
case 135:
index=5;
break;
+ case 147:
+ index=6;
+ break;
default:
return;
}
--
Gitblit v1.9.1