From 6fe9d166be361dd8a3c0075149aa0464c783867b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 01 八月 2023 16:13:09 +0800
Subject: [PATCH] 小车进提升机检测方案
---
src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 f6cd422..6904bbc 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -375,7 +375,7 @@
if (this.getPoint() == null) {
return "";
}
- return NavigatePositionConvert.xyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
+ return NavigatePositionConvert.nyXyzToLocNo(this.getPoint().getX(), this.getPoint().getY(), this.getPoint().getZ());
}
public String getCoord$() {
@@ -386,7 +386,7 @@
}
public void setPoint(NyShuttlePointClass point) {
- String locNo = NavigatePositionConvert.xyzToLocNo(point.getX(), point.getY(), point.getZ());
+ String locNo = NavigatePositionConvert.nyXyzToLocNo(point.getX(), point.getY(), point.getZ());
this.point = point;
this.currentLocNo = locNo;
}
@@ -438,4 +438,14 @@
}
}
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+ public Boolean isIdleNoCharge() {
+ boolean res = this.free == ShuttleStatusType.IDLE.id
+ && this.pakMk.equals(true)
+ && this.errState == 0
+ && this.taskNo == 0
+ && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
+ ;
+ return res;
+ }
}
--
Gitblit v1.9.1