From 13a7ee010e75bab8030c7c0be736d0ca02d966d7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 08 十二月 2023 10:04:11 +0800
Subject: [PATCH] #避让起始列

---
 src/main/java/com/zy/common/utils/NavigatePositionConvert.java |   49 ++++++++++++-------------------------------------
 1 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 135fc0d..7c5aa60 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -33,8 +33,19 @@
         return node;
     }
 
-    //鐗涚溂鍧愭爣杞琖CS搴撲綅鍙�
+    //璺緞绠楁硶鑺傜偣杞琖CS绯荤粺搴撲綅鍙�
+    public static String nodeToLocNo(NavigateNode node) {
+        return xyzToLocNo(node.getX(), node.getY(), node.getZ());
+    }
+
+    //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;
@@ -56,42 +67,6 @@
         //鐗涚溂Y杞� => WCS绯荤粺X杞村叕寮�
         int x1 = y - 10;
         return new int[]{x1, y1, z};
-    }
-
-    //xyz杞磋浆鍧愭爣缂栧彿
-    public static Short xyToPosition(int x, int y, int z) {
-        StringBuffer sb = new StringBuffer();
-        if (x < 10) {
-            sb.append("0");
-        }
-        sb.append(x);
-
-        if (y < 10) {
-            sb.append("00");
-        }else if (y < 100) {
-            sb.append("0");
-        }
-        sb.append(y);
-
-        if (z < 10) {
-            sb.append("0");
-        }
-        sb.append(z);
-        String position = sb.toString();//搴撲綅鍙�
-
-        //搴撲綅鍙疯浆灏忚溅浜岀淮鐮�
-        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
-        LocMast locMast = locMastService.queryByLoc(position);
-        if (locMast == null) {
-            //褰撳墠搴撲綅鍙锋煡涓嶅埌锛屽彲鑳芥槸绔欑偣搴撲綅鍙�
-            BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-            BasDevp basDevp = basDevpService.queryByLocNo(position);
-            if (basDevp == null) {
-                return null;
-            }
-            return Short.parseShort(basDevp.getQrCodeValue());
-        }
-        return Short.parseShort(locMast.getQrCodeValue());
     }
 
     public static int[] coverPosition(int col,int row) {

--
Gitblit v1.9.1