From 5e99301887e7e7e2a2218dbfa3b395a7847f7a82 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 25 十二月 2024 16:57:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 85093a7..de92dcf 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -459,7 +459,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 +471,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().TransInt32(result.Content, i * 12 + 6)); // 鐩爣绔�
+ if (staProtocol.getSiteId() == 2106){
+ staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, 284,22,"UTF-8")); // 鐩爣绔�
+ }
+// staProtocol.setMatnr(""); // 鐩爣绔�
+
}
}
Thread.sleep(200);
@@ -631,18 +635,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);
- Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 4);
+// 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);
@@ -718,7 +725,7 @@
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);
- Integer matnr = siemensS7Net.getByteTransform().TransInt32(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");
short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 28);
--
Gitblit v1.9.1