From 69e6f6676387b30a31b8186f55b3e8d921533c18 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 23 九月 2025 09:05:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index b495438..d531239 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -194,12 +194,19 @@
//************琛ュ厖鎵╁睍瀛楁*************
InnerLiftExtend liftExtend = (InnerLiftExtend) liftProtocol.getExtend();
liftProtocol.setExtend(liftExtend);
- liftExtend.setFrontOverrun(data.getBoolean("frontOverrun"));
- liftExtend.setBackOverrun(data.getBoolean("backOverrun"));
- liftExtend.setLeftOverrun(data.getBoolean("leftOverrun"));
- liftExtend.setRightOverrun(data.getBoolean("rightOverrun"));
- liftExtend.setOverHeight(data.getBoolean("overHeight"));
- liftExtend.setOverWeight(data.getBoolean("overWeight"));
+ JSONObject extend = data.getJSONObject("extend");
+ liftExtend.setFrontOverrun(extend.getInteger("frontOverrun") == 1);
+ liftExtend.setBackOverrun(extend.getInteger("backOverrun") == 1);
+ liftExtend.setLeftOverrun(extend.getInteger("leftOverrun") == 1);
+ liftExtend.setRightOverrun(extend.getInteger("rightOverrun") == 1);
+ liftExtend.setOverHeight(extend.getInteger("overHeight") == 1);
+ liftExtend.setOverWeight(extend.getInteger("overWeight") == 1);
+ liftExtend.setPlcTaskNoComplete(extend.getInteger("plcTaskNoComplete"));
+
+ if (!liftExtend.getPlcTaskNoComplete().equals(liftProtocol.getPlcTaskNo())) {
+ //璁惧鐘舵��
+ liftProtocol.setDeviceStatus(LiftDeviceStatusType.BUSY.id);
+ }
//璇诲彇绔欑偣
JSONArray stationList = data.getJSONArray("stationList");
@@ -672,8 +679,8 @@
*/
private Boolean overWeight;
- //鎻愬崌鏈虹珯鐐�
- private List<LiftStaProtocol> liftStaProtocols;
+ //PLC宸插畬鎴愪换鍔″彿
+ private Integer plcTaskNoComplete;
}
}
--
Gitblit v1.9.1