From d08e5f29d4aea9f160b45c86e0004efbf34c76bd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 31 七月 2023 13:54:37 +0800
Subject: [PATCH] 提升机
---
src/main/java/com/zy/common/utils/NavigatePositionConvert.java | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 84ba529..3bd0ac9 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -1,5 +1,12 @@
package com.zy.common.utils;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
+
/**
* 搴撲綅缂栧彿鍜孉*绠楁硶鐨剎y杞磋浆鎹㈠伐鍏风被
*/
@@ -15,30 +22,69 @@
return newPosition;
}
- //xy杞磋浆鍧愭爣缂栧彿
- public static Short xyToPosition(int x, int y) {
+ //鐗涚溂鍧愭爣杞琖CS搴撲綅鍙�
+ public static String xyzToLocNo(int x, int y, int z) {
+ int[] ints = NyXyzToWCSXyz(x, y, z);
+ String locNo = Utils.getLocNo(ints[0],ints[1],ints[2]);
+ return locNo;
+ }
+
+ //WCS绯荤粺鍧愭爣杞墰鐪煎潗鏍�
+ public static int[] WCSXyzToNyXyz(int x, int y, int z) {
+ //WCS绯荤粺Y杞� => 鐗涚溂X杞磋浆鎹㈠叕寮�
+ int x1 = Math.abs(y - 61) + 11;
+ //WCS绯荤粺X杞� => 鐗涚溂Y杞磋浆鎹㈠叕寮�
+ int y1 = x + 10;
+ return new int[]{x1, y1, z};
+ }
+
+ //鐗涚溂鍧愭爣杞琖CS绯荤粺鍧愭爣
+ public static int[] NyXyzToWCSXyz(int x, int y, int z) {
+ //鐗涚溂X杞� => WCS绯荤粺Y杞村叕寮�
+ int y1 = Math.abs(x - 11 - 61);
+ //鐗涚溂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();
- sb.append(y);
if (x < 10) {
- sb.append("00");
- } else if (x < 100) {
sb.append("0");
}
sb.append(x);
- return Short.parseShort(sb.toString());
- }
- //杞崲琛屽彿锛屽疄闄呬腑鏈�搴曞眰鍙兘鏄涓�琛岋紝鍦ㄦ暟缁勪腑鏈�搴曞眰鏄渶鍚庝竴琛岋紝鍥犳闇�瑕佽繘琛岃浆鎹㈡墠鍙互鍖归厤鏁版嵁
- public static int covertRow(int row) {
- NavigateMapData mapData = new NavigateMapData();
- int[][] data = mapData.getData();
- //瀹為檯琛屾暟
- int realRow = data.length - 1;
- return realRow - row;
+ 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) {
- return new int[]{row, col};
+ return new int[]{col, row};
}
}
--
Gitblit v1.9.1