From 1de44cff79c5e4219e49cd45a5dd044c5dc4c23a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 03 十一月 2023 12:48:03 +0800
Subject: [PATCH] #路径锁定问题(temp)
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..bcbc38e 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;
@@ -184,7 +184,7 @@
public void setBusyStatus(Short status) {
this.busyStatus = status;
- this.busyStatusType = ShuttleStatusType.get(status);
+ this.busyStatusType = ShuttleStatusType.get(status.intValue());
}
public void setBusyStatus(ShuttleStatusType type) {
@@ -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;
@@ -335,7 +337,7 @@
BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(this.statusErrorCode.intValue());
if (basShuttleErr == null) {
- return null;
+ return this.statusErrorCode.toString();
}
return basShuttleErr.getErrName();
}
--
Gitblit v1.9.1