From ff2b6e2329ae2c5d3fede2f9413170fd6e87c46c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 08 十二月 2023 09:27:52 +0800
Subject: [PATCH] #输送线读取
---
src/main/java/com/zy/common/utils/NavigatePositionConvert.java | 41 +++++------------------------------------
1 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index c3a8435..7c5aa60 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -33,6 +33,11 @@
return node;
}
+ //璺緞绠楁硶鑺傜偣杞琖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);
@@ -62,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