From 90d9a759ad1e2aa53d041a1f1a4209212907cb00 Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期六, 27 九月 2025 14:20:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 107 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 25 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 9a49e55..cb077fb 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -380,20 +380,51 @@
InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
- boolean res = this.liftProtocol.getProtocolStatus() == LiftProtocolStatusType.IDLE.id
-// && this.liftProtocol.getPlcTaskNo() == 0
- && this.liftProtocol.getTaskNo() == 0
- && this.liftProtocol.getModel() == 2
- && this.liftProtocol.getDeviceStatus() == LiftDeviceStatusType.IDLE.id
- && this.liftProtocol.getErrorCode() == 0
- && !extend.getFrontOverrun()
- && !extend.getBackOverrun()
- && !extend.getLeftOverrun()
- && !extend.getRightOverrun()
- && !extend.getOverHeight()
- && !extend.getOverWeight()
- ;
- return res;
+ if (this.liftProtocol.getProtocolStatus() != LiftProtocolStatusType.IDLE.id) {
+ return false;//浠诲姟涓嶇┖闂�
+ }
+
+ if (this.liftProtocol.getTaskNo() != 0) {
+ return false;//鏈変换鍔″彿
+ }
+
+ if (this.liftProtocol.getModel() != 2) {
+ return false;//闈炶嚜鍔�
+ }
+
+ if (this.liftProtocol.getDeviceStatus() != LiftDeviceStatusType.IDLE.id) {
+ return false;//闈炵┖闂�
+ }
+
+ if (this.liftProtocol.getErrorCode() != 0) {
+ return false;//鏈夋晠闅�
+ }
+
+ if (extend.getFrontOverrun()) {
+ return false;
+ }
+
+ if (extend.getBackOverrun()) {
+ return false;
+ }
+
+ if (extend.getLeftOverrun()) {
+ return false;
+ }
+
+ if (extend.getRightOverrun()) {
+ return false;
+ }
+
+ if (extend.getOverHeight()) {
+ return false;
+ }
+
+ if (extend.getOverWeight()) {
+ return false;
+ }
+
+ return true;
}
@Override
@@ -420,17 +451,43 @@
InnerLiftExtend extend = (InnerLiftExtend) this.liftProtocol.getExtend();
- boolean res = this.liftProtocol.getModel() == 2
- && this.liftProtocol.getDeviceStatus() == LiftDeviceStatusType.IDLE.id
- && this.liftProtocol.getErrorCode() == 0
- && !extend.getFrontOverrun()
- && !extend.getBackOverrun()
- && !extend.getLeftOverrun()
- && !extend.getRightOverrun()
- && !extend.getOverHeight()
- && !extend.getOverWeight()
- ;
- return res;
+ if (this.liftProtocol.getModel() != 2) {
+ return false;//闈炶嚜鍔�
+ }
+
+ if (this.liftProtocol.getDeviceStatus() != LiftDeviceStatusType.IDLE.id) {
+ return false;//闈炵┖闂�
+ }
+
+ if (this.liftProtocol.getErrorCode() != 0) {
+ return false;//鏈夋晠闅�
+ }
+
+ if (extend.getFrontOverrun()) {
+ return false;
+ }
+
+ if (extend.getBackOverrun()) {
+ return false;
+ }
+
+ if (extend.getLeftOverrun()) {
+ return false;
+ }
+
+ if (extend.getRightOverrun()) {
+ return false;
+ }
+
+ if (extend.getOverHeight()) {
+ return false;
+ }
+
+ if (extend.getOverWeight()) {
+ return false;
+ }
+
+ return true;
}
@Override
--
Gitblit v1.9.1