From 1546b40cfeec48f7d8d7f2a63b1b6e8a9fee1114 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 25 十二月 2024 13:53:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 20 +++++++++++++-------
1 files changed, 13 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 48702f7..24df173 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -418,12 +418,13 @@
StaProtocol staProtocol06 = station.get(3006);
short a11171 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 0);
short a11172 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 2);
- staProtocol11.setStaNoEnd(a11171);
- staProtocol11.setBan(a11172==1);
+
short a11173 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 4);
short a11174 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 6);
- staProtocol06.setStaNoEnd(a11173);
- staProtocol06.setBan(a11174==1);
+ staProtocol11.setStaNoEnd(a11173);
+ staProtocol11.setBan(a11171==1);
+ staProtocol06.setStaNoEnd(a11174);
+ staProtocol06.setBan(a11172==1);
}
}
@@ -470,7 +471,7 @@
}
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)); // 鐩爣绔�
+ staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, i * 12 + 284,22,"UTF-8")); // 鐩爣绔�
}
}
Thread.sleep(200);
@@ -636,12 +637,15 @@
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);
@@ -659,6 +663,8 @@
staProtocol.setTongType(tongType);
staProtocol.setBatch(batch);
staProtocol.setAmount(amount);
+ staProtocol.setAnfme(Double.valueOf(amount));
+ staProtocol.setAnfme2(Double.valueOf(amount));
int i1 = w1 / 100;
staProtocol.setWeight1((double) i1);
// staProtocol.setWeight2(w2);
@@ -715,7 +721,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