From 307ba2fc4f1b7c09111f6ff8fd7fa13a0b9b4a46 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 09 九月 2023 13:45:21 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/LocMastService.java | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index 868a7e8..caf4dc8 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -11,7 +11,13 @@ /** * 妫�绱㈠彲鐢ㄥ簱浣� */ - LocMast queryFreeLocMast(Integer row, Short locType1); + List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1); + List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd); + + /** + * 妫�绱㈠彲鐢ㄥ簱浣�0 + */ + LocMast queryFreeLocMast0(Integer row, Short locType1); /** * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅 @@ -25,7 +31,7 @@ * @param locMast * @return */ - Boolean checkEmptyCount(LocMast locMast); + Boolean checkEmptyCount(LocMast locMast, int quaOfBlank); /** * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵� @@ -37,8 +43,25 @@ * @param locNo * @return */ - Boolean isOutMost(String locNo); + Boolean isOutMost(String locNo, Boolean pakin); - LocMast findOutMost(List<String> locNos); + // 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢� + LocMast findOutMost(String locNo); + + // 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮� + Integer getOutCrnNo(LocMast locMast); + + LocMast findNearloc(String locNo); + + List<LocMast> selectAllPeakLoc(); + + Boolean checkAllLocEmpty(List<String> groupOuterLoc); + + //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹� + List<LocMast> selectLocByLev(Integer lev); + + List<LocMast> selectEmptyByLocNos(List<String> locNos); + + Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev); } -- Gitblit v1.9.1