From b5b400a615743a74e9d127261bd3785554aa06aa Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 10 一月 2026 13:34:40 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 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 63879dd..974c0b7 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
@@ -8,7 +8,6 @@
import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
import com.vincent.rsf.server.manager.controller.params.WaveToLocParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.ContainerType;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.enums.WaveRuleType;
import com.vincent.rsf.server.manager.service.*;
@@ -34,26 +33,45 @@
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;
- if (!Objects.isNull(containerType)) {
- LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
- if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {
- LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
- .eq(LocType::getCode, "L"));
- if (Objects.isNull(low)) {
- throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
- }
- locType = low.getId();
- } else {
- LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
- .eq(LocType::getCode, "H"));
- if (Objects.isNull(low)) {
- throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
- }
- locType = low.getId();
- }
- }
+// if (!Objects.isNull(containerType)) {
+// LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
+// if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {
+// LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
+// .eq(LocType::getCode, "L"));
+// if (Objects.isNull(low)) {
+// throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
+// }
+// locType = low.getId();
+// } else {
+// LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
+// .eq(LocType::getCode, "H"));
+// if (Objects.isNull(low)) {
+// throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
+// }
+// locType = low.getId();
+// }
+// }
//TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
LocService locService = SpringUtils.getBean(LocService.class);
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
--
Gitblit v1.9.1