From a6ae5a74d1de3db517526a3ba5db1e4a2a68cf65 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期四, 24 十月 2024 08:49:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtwcs' into ghjtwcs --- src/main/java/com/zy/asrs/service/LocMastService.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index c1e1346..31f4075 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -8,9 +8,19 @@ public interface LocMastService extends IService<LocMast> { /** + * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 + */ + List<Integer> queryDistinctRow(Integer crnNo); + + /** * 妫�绱㈠彲鐢ㄥ簱浣� */ LocMast queryFreeLocMast(Integer row, Short locType1); + + /** + * 妫�绱㈠彲鐢ㄥ簱浣�,涓嶅崰鐢ㄥ璐у尯 + */ + LocMast queryFreeLocMastNotBay(Integer row, Short locType1, Integer bay); /** * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅 @@ -33,5 +43,12 @@ */ LocMast queryDemoLoc(Integer crn); + /** + * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲� + * @param locMast + * @return + */ + Boolean checkEmptyCount(LocMast locMast); + } -- Gitblit v1.9.1