From 3c8b4f87fa61885f3c28d00eb6b9c9abde9bd462 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 01 八月 2023 16:25:02 +0800
Subject: [PATCH] 检测穿梭车是否在提升机内
---
src/main/java/com/zy/common/utils/NavigatePositionConvert.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 3bd0ac9..c3a8435 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -6,6 +6,7 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
+import com.zy.common.model.NavigateNode;
/**
* 搴撲綅缂栧彿鍜孉*绠楁硶鐨剎y杞磋浆鎹㈠伐鍏风被
@@ -22,8 +23,24 @@
return newPosition;
}
- //鐗涚溂鍧愭爣杞琖CS搴撲綅鍙�
+ //WCS绯荤粺搴撲綅鍙疯浆璺緞绠楁硶鑺傜偣
+ public static NavigateNode locNoToNode(String locNo) {
+ int col = Integer.parseInt(locNo.substring(0, 2));
+ int row = Integer.parseInt(locNo.substring(2, 5));
+ int[] newPosition = coverPosition(col,row);
+ NavigateNode node = new NavigateNode(col, row);
+ node.setZ(Utils.getLev(locNo));
+ return node;
+ }
+
+ //WCS鍧愭爣杞琖CS搴撲綅鍙�
public static String xyzToLocNo(int x, int y, int z) {
+ String locNo = Utils.getLocNo(x, y, z);
+ return locNo;
+ }
+
+ //鐗涚溂鍧愭爣杞琖CS搴撲綅鍙�
+ public static String nyXyzToLocNo(int x, int y, int z) {
int[] ints = NyXyzToWCSXyz(x, y, z);
String locNo = Utils.getLocNo(ints[0],ints[1],ints[2]);
return locNo;
--
Gitblit v1.9.1