From e6e6238b421ee2ddbdb8f43eef767fca5a7b185c Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 16 七月 2024 19:55:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 80 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index b0a2fd5..fc94483 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -68,6 +68,15 @@
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);
+ }};
+
+
/**
* 鏉＄爜鏁伴噺
*/
@@ -96,6 +105,17 @@
return staNos1;
case 2:
return staNos2;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
+ }
+
+ private ArrayList<Integer> getStaNoSuper() {
+ switch (slave.getId()) {
+ case 1:
+ return staNos1Super;
+ case 2:
+ return staNos2Super;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -179,7 +199,9 @@
// // 鏇存柊鍏ュ嚭搴撴ā寮�
// 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++) {
@@ -207,6 +229,29 @@
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);
@@ -262,7 +307,7 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
if (result3.IsSuccess && staNoSize==staNos2.size()) {
- Integer siteId = 16;
+ Integer siteId = 2000;
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
@@ -272,6 +317,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) {
@@ -374,6 +435,9 @@
case 135:
index=5;
break;
+ case 147:
+ index=6;
+ break;
default:
return;
}
@@ -384,7 +448,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);
@@ -429,6 +502,9 @@
case 135:
index=5;
break;
+ case 147:
+ index=6;
+ break;
default:
return;
}
--
Gitblit v1.9.1