From 9ff1f1f221aeafc99653c846b2c2442f9c033ee5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 11 十月 2022 08:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

---
 src/main/java/com/zy/asrs/service/LocMastService.java |   14 +++++++++++++-
 1 files changed, 13 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 29dff9a..bc45966 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -8,9 +8,14 @@
 public interface LocMastService extends IService<LocMast> {
 
     /**
+     * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎
+     */
+    List<Integer> queryDistinctRow(Integer crnNo);
+
+    /**
      * 妫�绱㈠彲鐢ㄥ簱浣�
      */
-    LocMast queryFreeLocMast(Integer row);
+    LocMast queryFreeLocMast(Integer row, Short locType1);
 
     /**
      * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -33,5 +38,12 @@
      */
     LocMast queryDemoLoc(Integer crn);
 
+    /**
+     * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+     * @param locMast
+     * @return
+     */
+    Boolean checkEmptyCount(LocMast locMast);
+
 
 }

--
Gitblit v1.9.1