From 1983e747ee2368186cef348fd31e9e5163f56634 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 13:53:29 +0800
Subject: [PATCH] liftUpdate
---
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