From a2f28fb1c32aeefbe549f48c4ed07929ef851b1b Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期六, 04 三月 2023 09:39:16 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/LocMastService.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index f39fff9..bc285d2 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -11,7 +11,12 @@ /** * 妫�绱㈠彲鐢ㄥ簱浣� */ - LocMast queryFreeLocMast(Integer row, List<Integer> rows, Short locType1); + List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1); + + /** + * 妫�绱㈠彲鐢ㄥ簱浣�0 + */ + LocMast queryFreeLocMast0(Integer row, Short locType1); /** * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅 @@ -25,7 +30,7 @@ * @param locMast * @return */ - Boolean checkEmptyCount(LocMast locMast); + Boolean checkEmptyCount(LocMast locMast, int quaOfBlank); /** * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵� @@ -39,10 +44,13 @@ */ Boolean isOutMost(String locNo, Boolean pakin); - // 鍚岀粍绌洪棽搴撲綅 - LocMast findOutMost(List<String> locNos); + // 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢� + LocMast findOutMost(String locNo); // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣� - void breakUp(String locNo); + void breakUp(String locNo, List<String> excludeLocNos); + + // 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮� + Integer getOutCrnNo(LocMast locMast); } -- Gitblit v1.9.1