From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java
index 13d5fcf..c2e5956 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java
@@ -51,7 +51,7 @@
List<Loc> locs = new ArrayList<>();
List<Map<String, Object>> list = viewTaskDetlMapper.getList(mat.getMatnr(), batch, uniqueFields);
for (Map<String, Object> map : list) {
- Task task = taskService.getById(map.get("task_id").toString());
+ Task task = taskService.getById(map.get("taskId").toString());
if (task == null) {
continue;
}
@@ -73,7 +73,7 @@
List<Loc> locs2 = new ArrayList<>();
List<Map<String, Object>> list2 = viewLocDetlMapper.getList(mat.getMatnr(), batch, uniqueFields, null);
for (Map<String, Object> map : list2) {
- Loc one = locService.getById(map.get("loc_id").toString());
+ Loc one = locService.getById(map.get("locId").toString());
if (one == null) {
continue;
}
@@ -357,4 +357,25 @@
return locs;
}
+ // 閲嶅啓ctu搴撹幏鍙栧簱浣�
+ public Loc getGlobalEmptyLocToCtu(Integer locTypeHeight) {
+ LocTypeHeightType locTypeHeightType = LocTypeHeightType.get(locTypeHeight);
+ if (locTypeHeightType == null) {
+ throw new CoolException("搴撲綅楂樺害绫诲瀷寮傚父");
+ }
+ //鑾峰彇搴撲綅楂樺害
+ LocType locType = locTypeService.getOne(new LambdaQueryWrapper<LocType>().eq(LocType::getFlag, locTypeHeightType.flag));
+ //绗﹀悎搴撲綅楂樺害鐨勫簱浣嶉泦鍚�
+ List<Long> locIdList = locTypeBindService.getLocIdListByType(locType);
+
+ LambdaQueryWrapper<Loc> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(Loc::getId, locIdList);
+ queryWrapper.eq(Loc::getLocStsId, LocStsType.O.val());
+ queryWrapper.le(Loc::getRow1,26);
+ queryWrapper.orderByAsc(Loc::getLev1).orderByDesc(Loc::getBay1).orderByAsc(Loc::getRow1);
+ queryWrapper.last("limit 1");
+
+ return locService.getOne(queryWrapper);
+ }
+
}
--
Gitblit v1.9.1