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