From 58e4c139c07bec6ec087b786e1615f51f439327a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 03 三月 2025 15:21:58 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 ee538ea..711fc01 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
@@ -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,4);
+ queryWrapper.orderByAsc(Loc::getLev1,Loc::getBay1);
+ queryWrapper.last("limit 1");
+
+ return locService.getOne(queryWrapper);
+ }
+
}
--
Gitblit v1.9.1