From 36c6d6b39e2b76080480c5bc90a412d711b76144 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 19 六月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigatePositionConvert.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigatePositionConvert.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigatePositionConvert.java
index fb6fa67..9b2bdad 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigatePositionConvert.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigatePositionConvert.java
@@ -15,14 +15,15 @@
String locNo = Utils.getLocNo(x, y, z);
//搴撲綅鍙疯浆灏忚溅浜岀淮鐮�
- LocService locMastService = SpringUtils.getBean(LocService.class);
- Loc locMast = locMastService.getOne(new LambdaQueryWrapper<Loc>()
+ LocService locService = SpringUtils.getBean(LocService.class);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getLocNo, locNo)
- .eq(Loc::getHostId, hostId));
- if (locMast == null) {
+ .eq(Loc::getHostId, hostId)
+ .eq(Loc::getStatus, 1));
+ if (loc == null) {
return null;
}
- return locMast.getCode();
+ return loc.getCode();
}
//鍧愭爣缂栧彿杞瑇y杞�
@@ -45,6 +46,19 @@
return node;
}
+ //灏忚溅鏉″舰鐮佽浆璺緞绠楁硶鑺傜偣
+ public static NavigateNode codeToNode(String code, Long hostId) {
+ LocService locService = SpringUtils.getBean(LocService.class);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, code)
+ .eq(Loc::getHostId, hostId)
+ .eq(Loc::getStatus, 1));
+
+ NavigateNode node = new NavigateNode(loc.getRow(), loc.getBay());
+ node.setZ(loc.getLev());
+ return node;
+ }
+
//璺緞绠楁硶鑺傜偣杞琖CS绯荤粺搴撲綅鍙�
public static String nodeToLocNo(NavigateNode node) {
return xyzToLocNo(node.getX(), node.getY(), node.getZ());
--
Gitblit v1.9.1