From dd37f7a757d46b6b2c43c60d292918ee8cb8634d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 15 三月 2022 15:37:14 +0800
Subject: [PATCH] Merge branch 'bfwcs' of http://47.97.1.152:5880/r/zy-wcs into bfwcs
---
src/main/java/com/zy/core/thread/SteThread.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 2d45b85..c7af558 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -72,7 +72,7 @@
break;
}
// 蹇冭烦
- heartbeat();
+// heartbeat();
Thread.sleep(500);
} catch (Exception e) {
e.printStackTrace();
@@ -133,44 +133,44 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensS7Net.Read("V20", (short) 70);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB4", (short) 70);
if (result.IsSuccess) {
if (null == steProtocol) {
steProtocol = new SteProtocol();
}
-// steProtocol.setSteNo();
-// steProtocol.setMode();
-// steProtocol.setStatus();
+ steProtocol.setSteNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 0));
+ steProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, 2));
+ steProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 4));
// steProtocol.setExecute();
// steProtocol.setWaiting();
-// steProtocol.setAlarm();
-// steProtocol.setAlarm0();
-// steProtocol.setCharge();
+ steProtocol.setAlarm(siemensS7Net.getByteTransform().TransInt32(result.Content, 6));
+ steProtocol.setAlarm0(siemensS7Net.getByteTransform().TransInt32(result.Content, 10));
+ steProtocol.setCharge(siemensS7Net.getByteTransform().TransInt16(result.Content, 14));
// steProtocol.setFullCharge();
// steProtocol.setLowCharge();
-// steProtocol.setFeed();
-// steProtocol.setLoca();
+ steProtocol.setFeed(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));
+ steProtocol.setLoca(siemensS7Net.getByteTransform().TransInt16(result.Content, 18));
// steProtocol.setCloser();
// steProtocol.setSpeed();
-// steProtocol.setPos();
-// steProtocol.setLoad();
-// steProtocol.setTrack();
-// steProtocol.setTaskNo();
-// steProtocol.setTaskType();
-// steProtocol.setRow();
-// steProtocol.setBay();
-// steProtocol.setLev();
-//
-// steProtocol.setHisTaskNo();
-// steProtocol.setHisTaskStatus();
-// steProtocol.setCheckQty();
-// steProtocol.setReady();
-// steProtocol.setChargeNo();
-//
-// steProtocol.setHeart();
-// steProtocol.setCrnStopRun();
-// steProtocol.setCrnStopFork();
-// steProtocol.setCrnAllowRun();
+ steProtocol.setPos(siemensS7Net.getByteTransform().TransInt16(result.Content, 28));
+ steProtocol.setLoad(siemensS7Net.getByteTransform().TransInt16(result.Content, 30));
+ steProtocol.setTrack(siemensS7Net.getByteTransform().TransInt16(result.Content, 32));
+ steProtocol.setTaskNo(siemensS7Net.getByteTransform().TransInt32(result.Content, 38));
+ steProtocol.setTaskType(siemensS7Net.getByteTransform().TransInt16(result.Content, 42));
+ steProtocol.setRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 44));
+ steProtocol.setBay(siemensS7Net.getByteTransform().TransInt16(result.Content, 46));
+ steProtocol.setLev(siemensS7Net.getByteTransform().TransInt16(result.Content, 48));
+
+ steProtocol.setHisTaskNo(siemensS7Net.getByteTransform().TransInt32(result.Content, 58));
+ steProtocol.setHisTaskStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 62));
+ steProtocol.setCheckQty(siemensS7Net.getByteTransform().TransInt16(result.Content, 64));
+ steProtocol.setReady(siemensS7Net.getByteTransform().TransInt16(result.Content, 66));
+ steProtocol.setChargeNo(siemensS7Net.getByteTransform().TransInt16(result.Content, 68));
+
+ steProtocol.setHeart(siemensS7Net.getByteTransform().TransInt16(result.Content, 72));
+ steProtocol.setCrnStopRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 74));
+ steProtocol.setCrnStopFork(siemensS7Net.getByteTransform().TransInt16(result.Content, 76));
+ steProtocol.setCrnAllowRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 78));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1