From da6ffd9b8d9687f8fb876e194da597c02f25f588 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 18 六月 2024 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
index 3735b74..4710723 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
@@ -99,12 +99,12 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 40 + 2)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 2)); // 宸ヤ綔鍙�
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 4)); // 鐩爣绔�
- staProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 40 + 6) == 2); // 鑷姩
-// staProtocol.setLoading(status[1]); // 鏈夌墿
-// staProtocol.setInEnable(status[2]); // 鍙叆
-// staProtocol.setOutEnable(status[3]);// 鍙嚭
+ staProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 6) == 2); // 鑷姩
+ staProtocol.setLoading(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 32) == 1); // 鏈夌墿
+ staProtocol.setInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 14) == 1); // 鍙叆
+ staProtocol.setOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 14) == 2);// 鍙嚭
// staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
// staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
// staProtocol.setHigh(status[6]); // 楂樺簱浣�
--
Gitblit v1.9.1