From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/LocMastService.java | 10 +++++++++-
1 files changed, 9 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 df7e0a5..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);
/**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -49,4 +49,12 @@
List<LocMast> selectByLocNo(List<String> locNo);
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