From 5f685f89bf6501325b6129ecf709b988369eeedd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 10:16:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LiftThread.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 8f3f046..4a7d3c0 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -125,9 +125,9 @@
try {
readStatus();
- //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓簍rue
+ //鎻愬崌鏈哄浜庤繍琛岀姸鎬侊紝灏嗘爣璁扮疆涓篺alse
if (liftProtocol.getBusy()) {
- liftProtocol.setPakMk(true);
+ liftProtocol.setPakMk(false);
}
//鎻愬崌鏈哄浜庢湭杩愯銆佸氨缁�佹爣璁皌rue銆佹湁浠诲姟鍙�
@@ -185,10 +185,10 @@
liftProtocol.setCompleteTaskNo(siemensS7Net.getByteTransform().TransInt16(result1.Content, 6));
//褰撳墠妤煎眰
short lev = siemensS7Net.getByteTransform().TransInt16(result1.Content, 8);
- if (lev >=5 && lev <= 7) {
- lev += 2;
- } else if (lev >= 8 && lev <= 10) {
- lev += 4;
+ if (lev >= 7 && lev <= 9) {
+ lev -= 2;
+ } else if (lev >= 12 && lev <= 14) {
+ lev -= 4;
}
liftProtocol.setLev(lev);
@@ -361,9 +361,10 @@
return false;
}
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);
News.info("鎻愬崌鏈哄懡浠や笅鍙戞垚鍔燂紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
- //灏嗘爣璁扮疆涓篺alse(闃叉閲嶅彂)
+ //灏嗘爣璁扮疆涓簍rue(闃叉閲嶅彂)
liftProtocol.setPakMk(true);
//淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
@@ -380,6 +381,7 @@
JSON.toJSONString(command),
JSON.toJSONString(liftProtocol)
);
+ opt.setDeviceWrk(command.getTaskNo().toString());//璁惧宸ヤ綔鍙�
liftOptService.insert(opt);
}
--
Gitblit v1.9.1