From c7ee9e7a9a0cb96d1c48bf8a8dff061f16e8a29b Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 14 八月 2023 16:06:23 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/service/LocMastService.java | 19 +++++++++++++++----
1 files changed, 15 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 0db6809..ec6efa3 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -36,6 +36,13 @@
Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
/**
+ * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ * @param locMast
+ * @return
+ */
+ Boolean checkEmptyCount0(LocMast locMast, int quaOfBlank);
+
+ /**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
*/
Boolean checkWhole(List<LocDetl> locDetls);
@@ -56,17 +63,21 @@
void updateLocSts(String locNo, String locSts);
//鎵惧渚х┖搴撲綅
- LocMast findOutMast(Short locType1, List<Integer> crnNos);
+ List<LocMast> findOutMast(Short locType1, List<Integer> crnNos);
//鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣�
- LocMast findInEmptyLocMast(Short locType1, List<Integer> rows);
+ List<LocMast> findInEmptyLocMast(Short locType1, List<Integer> rows, Integer crnNo);
//鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣�
- LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos);
+ List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo);
//鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣�
- LocMast findEmptyLowFrequencyLocMast(Short locType1);
+ List<LocMast> findEmptyLowFrequencyLocMast(Short locType1, Integer crnNo);
+
+ List<LocMast> findEmptyLocMast(Short locType1, Integer crnNo);
//鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
List<LocMast> selectLocByLev(Integer lev);
+
+ List<LocMast> selectByLocNos(List<String> locNos);
}
--
Gitblit v1.9.1