From fffbf0c777f1189c7eed623b15660dbcbe50d2a1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 13:29:03 +0800
Subject: [PATCH] 库位移转
---
src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
index cabfb2d..6162da1 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -65,7 +65,7 @@
/**
* 浣滀笟鏍囪
*/
- private Boolean pakMk = true;
+ private Boolean pakMk = false;
/**
* 鎵嬪姩鐘舵��/鑷姩鐘舵��
@@ -396,7 +396,7 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
boolean res = this.free == ShuttleStatusType.IDLE.id
- && this.pakMk.equals(true)
+ && !this.pakMk
&& this.errState == 0
&& this.taskNo == 0
&& this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
@@ -421,7 +421,7 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵�侊紝浼犲叆鐨則askNo鍜屽綋鍓峵askNo鐩稿悓鏃跺厑璁告斁琛�
public Boolean isIdle(int taskNo) {
boolean res = this.free == ShuttleStatusType.IDLE.id
- && this.pakMk.equals(true)
+ && !this.pakMk
&& this.errState == 0
&& (this.taskNo == 0 || this.taskNo == taskNo)
&& this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
@@ -443,7 +443,7 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdleNoCharge() {
boolean res = this.free == ShuttleStatusType.IDLE.id
- && this.pakMk.equals(true)
+ && !this.pakMk
&& this.errState == 0
&& this.taskNo == 0
&& this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
@@ -458,7 +458,7 @@
}
boolean res = this.free == ShuttleStatusType.IDLE.id
- && this.pakMk
+ && !this.pakMk
&& this.errState == 0
&& this.taskNo == 0
&& this.protocolStatusType.id == ShuttleProtocolStatusType.IDLE.id
--
Gitblit v1.9.1