From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 40e26a1..f81f389 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 + 6,20,"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,31 @@
staProtocol.setBatch(batch);
}
}
+
+ // 绌烘《鍑哄簱淇″彿
+ OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102", (short) 4);
+ if (readCall.IsSuccess){
+ Integer isNeed = siemensS7Net.getByteTransform().TransInt32(result.Content, 0); // IBC瑕佹《淇″彿
+ Integer isFinish = siemensS7Net.getByteTransform().TransInt32(result.Content, 2); // IBC鐏岃瀹屾垚淇″彿
+ Integer weight = siemensS7Net.getByteTransform().TransInt32(result.Content, 4); // IBC鐏岃閲嶉噷
+ Integer isAHalf = siemensS7Net.getByteTransform().TransInt32(result.Content, 6); // IBC鍗婃《鏍囪
+
+ isCalled = isNeed;
+ isFinish = isFinish;
+ weight = weight;
+ isHalf = isAHalf;
+ }
+
+ // 瀹屾垚缃愯淇″彿
+ OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
+ if (finish.IsSuccess){
+ short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, 0);
+// isCalled = amount;
+ }
+
+// if (isCalled == 1) {
+// writeIsCalled();
+// }
OperateResultExOne<byte[]> readWeight = siemensS7Net.Read("DB101.260", (short) 2);
if (readWeight.IsSuccess){
@@ -631,18 +678,21 @@
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); // 绔欑偣缂栧彿
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 + 4,20, "UTF-8");
+// String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 4,20, "UTF-8");
+
short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 8);
String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+10, 20, "UTF-8");
short staEnd = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 30);
short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 32);
Integer w1 = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 34);
+ String orderNo = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 38,22, "UTF-8");
+ String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 60,22, "UTF-8");
StaProtocol staProtocol = station.get(siteId);
@@ -712,17 +762,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");
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");
StaProtocol staProtocol = station.get(siteId);
@@ -830,6 +881,16 @@
log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
}
}
+
+ private void writeIsCalled() throws InterruptedException {
+ OperateResult write = siemensS7Net.Write("DB102.0" , 0); // 宸ヤ綔鍙�
+ }
+
+ private void writeIsFinish() throws InterruptedException {
+ OperateResult finish = siemensS7Net.Write("DB102.2" , 0); // 宸ヤ綔鍙�
+ OperateResult half = siemensS7Net.Write("DB102.6" , 0); // 宸ヤ綔鍙�
+ }
+
/**
* 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
*/
--
Gitblit v1.9.1