From 17f9f7d74b7f2f3344b335441f9bf1653cff03f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:52 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index 49a869f..30256bf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -21,11 +21,17 @@
* @return
* @time 2025/3/31 08:50
*/
- public static String getTargetLoc() {
+ public static String getTargetLoc(Long areaId) {
//TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
LocService locService = SpringUtils.getBean(LocService.class);
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type), false);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getAreaId, areaId)
+ .orderByAsc(Loc::getLev)
+ .orderByAsc(Loc::getCol)
+ .orderByAsc(Loc::getRow)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type), false
+ );
return !Objects.isNull(loc) ? loc.getCode() : null;
}
--
Gitblit v1.9.1