From 6dea42fd8f806807982866c1821a66da725eabca Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 20 四月 2025 14:48:59 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index 6ada967..d1ddd93 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -147,13 +147,11 @@
if (null == staProtocol) {
staProtocol = new StaProtocol();
staProtocol.setSiteId(siteId);
-
if (siteId == 1015) {
staProtocol.setLocNo("1200301");
} else if (siteId == 1026) {
staProtocol.setLocNo("1200305");
}
-
station.put(siteId, staProtocol);
}
Thread.sleep(300);
@@ -167,16 +165,18 @@
staProtocol.setBackErr(status[5]);
staProtocol.setLeftErr(status[6]);
staProtocol.setRightErr(status[7]);
- staProtocol.setHighErr(status[8]);
- staProtocol.setWeightErr(status[9]);
- staProtocol.setLow(status[10]);
- staProtocol.setHigh(status[11]);
+
+ boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, i * 26 + 1, 2);
+ staProtocol.setHighErr(status2[0]);
+ staProtocol.setWeightErr(status2[1]);
+ staProtocol.setLow(status2[2]);
+ staProtocol.setHigh(status2[3]);
// staProtocol.setInEnable(status[13]); // 鍙叆
// staProtocol.setOutEnable(status[14]);// 鍙嚭
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 2)); // 宸ヤ綔鍙�
- staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 4)); // 鐩爣绔�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 4)); // 鐩爣绔�
staProtocol.setFinishWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 6)); //宸插畬鎴愬伐浣滃彿
staProtocol.setBarcode(siemensS7Net.getByteTransform().TransString(result.Content, i * 26 + 10, 12, "UTF-8").trim()); //鏉＄爜
staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 26 + 22)); //閲嶉噺
--
Gitblit v1.9.1