From 9f05696822f8feee385a34a92dd9aa16009e84a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 18 六月 2023 12:38:00 +0800
Subject: [PATCH] 寻路算法，地图节点优化，剔除原入出库模式获取地图节点方案，改为根据库位状态实时获取节点信息或直接获取无过滤的完整节点信息
---
src/main/java/com/zy/common/utils/NavigatePositionConvert.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
index 28a2324..be0be98 100644
--- a/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
+++ b/src/main/java/com/zy/common/utils/NavigatePositionConvert.java
@@ -1,7 +1,9 @@
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;
/**
@@ -35,14 +37,14 @@
//xyz杞磋浆鍧愭爣缂栧彿
public static Short xyToPosition(int x, int y, int z) {
StringBuffer sb = new StringBuffer();
- sb.append(x);
if (x < 10) {
- sb.append("00");
- } else if (x < 100) {
sb.append("0");
}
+ sb.append(x);
if (y < 10) {
+ sb.append("00");
+ }else if (y < 100) {
sb.append("0");
}
sb.append(y);
@@ -51,9 +53,20 @@
sb.append("0");
}
sb.append(z);
- String position = sb.toString();
+ 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());
}
--
Gitblit v1.9.1