From 9880fb9c0d0a1445d7288d8b0022065cccfff3c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 10:06:19 +0800
Subject: [PATCH] Merge branch 'ynasrs' of http://47.97.1.152:5880/r/zy-asrs into ynasrs
---
src/main/java/com/zy/asrs/service/LocMastService.java | 15 ++++++++++++---
1 files changed, 12 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 e5fb670..792729f 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);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -37,8 +42,12 @@
* @param locNo
* @return
*/
- Boolean isOutMost(String locNo);
+ Boolean isOutMost(String locNo, Boolean pakin);
- LocMast findOutMost(List<String> locNos);
+ // 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢�
+ LocMast findOutMost(String locNo);
+
+ // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
+ void breakUp(String locNo, List<String> excludeLocNos);
}
--
Gitblit v1.9.1