From c688ad2d55d6a5355e0e75402177f3e7989600bc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 08 一月 2025 16:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/LocMastService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 6a9da74..17d7af3 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -25,7 +25,7 @@
* @param locMast
* @return
*/
- Boolean checkEmptyCount(LocMast locMast);
+ Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
/**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -51,4 +51,10 @@
List<LocMast> selectNodeELocByLev(Integer lev);
LocMast selectByLoc(String loc);
+
+ LocMast findNearloc(String locNo);
+
+ List<LocMast> selectAreaEmpty(Short locType1, Integer crnNo);
+
+ boolean checkAllLocEmpty(List<String> groupLoc);
}
--
Gitblit v1.9.1