From 586605cbe95aaca03844763b74392ba70644fecc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 03 七月 2023 16:39:14 +0800
Subject: [PATCH] map_1.json
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index eb577c1..7c57f24 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -128,7 +128,7 @@
private Short statusErrorCode;
/**
- * PLC杈撳叆鐘舵��
+ * PLC杈撳叆鐘舵�侊紝鐩墠鍙湁涓�涓姸鎬佹湁鏁堟灉锛屾墭鐩橀浄杈�1鏈夎揣锛�0鏃犺揣
*/
private Short plcInputStatus;
@@ -240,6 +240,7 @@
&& this.pakMk.equals(true)
&& this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
&& this.taskNo == 0
+ && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
;
if (!res) {
return res;
@@ -250,7 +251,7 @@
if (chargeLine == null) {
return false;
}
- return this.getBatteryPower$() > chargeLine;
+ return this.getBatteryPower$() >= chargeLine;
} catch (Exception e) {
News.error("fail", e);
return false;
@@ -263,7 +264,8 @@
boolean res = this.busyStatusType.equals(ShuttleStatusType.IDLE)
&& this.pakMk.equals(true)
&& this.errorCodeType.equals(ShuttleErrorCodeType.NORMAL)
- && (this.taskNo == 0 || this.taskNo == taskNo)
+ && (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
+ && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
;
if (!res) {
return res;
--
Gitblit v1.9.1