From 27ae26c0142589107fc7da1e6aaef14f8be09d53 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 01 八月 2023 16:27:23 +0800
Subject: [PATCH] 检测小车是否要进提升机
---
src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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 7169ca8..6904bbc 100644
--- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java
@@ -5,7 +5,6 @@
import com.zy.asrs.service.BasShuttleService;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.core.News;
-import com.zy.core.enums.ShuttleErrorCodeType;
import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.ShuttleStatusType;
import com.zy.core.model.command.ShuttleAssignCommand;
@@ -55,6 +54,11 @@
* 鐩爣搴撲綅
*/
private String locNo;
+
+ /**
+ * 灏忚溅褰撳墠搴撲綅鍙�
+ */
+ private String currentLocNo;
/**
* 浣滀笟鏍囪
@@ -371,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$() {
@@ -379,6 +383,12 @@
return "";
}
return JSON.toJSONString(this.getCoord());
+ }
+
+ public void setPoint(NyShuttlePointClass point) {
+ String locNo = NavigatePositionConvert.nyXyzToLocNo(point.getX(), point.getY(), point.getZ());
+ this.point = point;
+ this.currentLocNo = locNo;
}
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
@@ -428,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