From b44b85a4d7512615b8c19c95dc21e537a15a0d5b Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期四, 08 五月 2025 09:37:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 107 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 24df173..dab59c9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,6 +42,12 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
+ public Integer isCalled = 0;
+ public Integer isFinish = 0;
+ public ArrayList<Integer> weights = new ArrayList<>();
+ public Integer weight = 0;
+ public ArrayList<Integer> halfs = new ArrayList<>();
+ public Integer isHalf = 0;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
@@ -262,6 +268,18 @@
}
break;
+ case 4:
+ switch (slave.getId()){
+ case 2:
+ writeIsCalled();break;
+ }
+ case 5:
+ switch (slave.getId()){
+ case 2:
+ writeIsFinish();break;
+ }
+
+ break;
default:
break;
}
@@ -459,7 +477,7 @@
private void read10() throws InterruptedException {
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 12));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 12 + 78));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -471,7 +489,11 @@
}
staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12)); // 宸ヤ綔鍙�
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*12 + 4 )); // 鐩爣绔�
- staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, i * 12 + 284,22,"UTF-8")); // 鐩爣绔�
+ if (staProtocol.getSiteId() == 2106){
+ staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, 284,22,"UTF-8")); // 鐩爣绔�
+ }
+// staProtocol.setMatnr(""); // 鐩爣绔�
+
}
}
Thread.sleep(200);
@@ -507,6 +529,30 @@
staProtocol.setBatch(batch);
}
}
+
+ // 绌烘《鍑哄簱淇″彿
+ OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 8);
+ if (readCall.IsSuccess){
+ int isNeed = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 0); // IBC瑕佹《淇″彿
+ int Finish = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 2); // IBC鐏岃瀹屾垚淇″彿
+ int weight1 = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 4); // IBC鐏岃閲嶉噷
+ int isAHalf = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 6); // IBC鍗婃《鏍囪
+ isCalled = isNeed;
+ isFinish = Finish;
+ weight = weight1;
+ isHalf = isAHalf;
+ }
+
+ // 瀹屾垚缃愯淇″彿
+// OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
+// if (finish.IsSuccess){
+// short amount = siemensS7Net.getByteTransform().TransInt16(finish.Content, 0);
+//// isCalled = amount;
+// }
+
+// if (isCalled == 1) {
+// writeIsCalled();
+// }
OperateResultExOne<byte[]> readWeight = siemensS7Net.Read("DB101.260", (short) 2);
if (readWeight.IsSuccess){
@@ -631,7 +677,7 @@
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
- result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*38));
+ result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*82));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -715,17 +761,18 @@
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
- result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*34));
+ result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*78));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
// short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
- String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 2,20, "UTF-8");
short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 6);
- String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+8, 20, "UTF-8");
+ String batch = siemensS7Net.getByteTransform().TransString(result.Content,i * 4+ 8, 20, "UTF-8").trim();
short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 28);
Integer w1 = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 30);
+ String orderNo = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 34,22, "UTF-8");
+ String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 56,22, "UTF-8").trim();
StaProtocol staProtocol = station.get(siteId);
@@ -791,9 +838,23 @@
}
ArrayList<Integer> staNos = getWriteStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
- OperateResult write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
- Thread.sleep(500);
- OperateResult write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo()); // 鐩爣绔�
+ OperateResult write = null;
+ OperateResult write1 = null;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
+ 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 {
+ writeCount++;
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+ }while (writeCount<5);
if (!write.IsSuccess || !write1.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
@@ -817,9 +878,33 @@
}
ArrayList<Integer> staNos = getWriteStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
- OperateResult write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
- OperateResult write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo()); // 鐩爣绔�
- OperateResult write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr()); // 鐩爣绔�
+
+ OperateResult write = null;
+ OperateResult write1 = null;
+ OperateResult write2 = null;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
+ Thread.sleep(100);
+ write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo()); // 鐩爣绔�
+ Thread.sleep(100);
+ write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr()); // 鐩爣绔�
+
+// write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+
+// write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+
+// write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr()); // 鐩爣绔�
+ if(write.IsSuccess && write1.IsSuccess && write2.IsSuccess){
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ break;
+ }
+ else {
+ writeCount++;
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+ }while (writeCount<5);
if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
@@ -833,6 +918,16 @@
log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
}
}
+
+ private void writeIsCalled() throws InterruptedException {
+ OperateResult write = siemensS7Net.Write("DB102.0" , (short) 0); // 宸ヤ綔鍙�
+ }
+
+ private void writeIsFinish() throws InterruptedException {
+ OperateResult finish = siemensS7Net.Write("DB102.2" , (short)0); // 宸ヤ綔鍙�
+ OperateResult half = siemensS7Net.Write("DB102.6" , (short)0); // 宸ヤ綔鍙�
+ }
+
/**
* 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
*/
--
Gitblit v1.9.1