From c2ead3c7e7f1db81b6fc961e0f037abd0e8a4e2c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 一月 2026 17:19:30 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 cfc5abf..b202115 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
@@ -33,8 +33,27 @@
return getTargetLoc(areaId, null);
}
+ public static String getTargetLoc(Long areaId, Long containerType,List<Integer> rowList) {
+
+ Long locType = containerType;
+ //TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
+ LocService locService = SpringUtils.getBean(LocService.class);
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(!Objects.isNull(locType), Loc::getType, locType)
+ .eq(Loc::getAreaId, areaId)
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .in(Objects.nonNull(rowList) && !rowList.isEmpty(), Loc::getRow, rowList)
+ .orderByAsc(Loc::getLev)
+ .orderByAsc(Loc::getCol)
+ .orderByAsc(Loc::getRow)
+ .last("LIMIT 1")
+ );
+
+ return !Objects.isNull(loc) ? loc.getCode() : null;
+ }
+
public static String getTargetLoc(Long areaId, Long containerType) {
- Long locType = null;
+ Long locType = containerType;
// if (!Objects.isNull(containerType)) {
// LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
// if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {
--
Gitblit v1.9.1