From a60e21cf1453e1e9cee27fb97f4a9df38acf3047 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 20 二月 2023 18:35:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/LocMastService.java |   21 ++++++++++++++++++---
 1 files changed, 18 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 1620090..1356a23 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -11,7 +11,15 @@
     /**
      * 妫�绱㈠彲鐢ㄥ簱浣�
      */
-    LocMast queryFreeLocMast(Integer row, Short locType1);
+    List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1);
+    List<LocMast> queryFreeLocMast0(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday);
+    List<LocMast> queryFreeLocMast1(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday
+                                    , Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
+    List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1);
+    List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1);
+    List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday);
+
+    List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
 
     /**
      * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -25,7 +33,7 @@
      * @param locMast
      * @return
      */
-    Boolean checkEmptyCount(LocMast locMast);
+    Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
 
     /**
      * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -37,6 +45,13 @@
      * @param locNo
      * @return
      */
-    Boolean isOutMost(String locNo);
+    Boolean isOutMost(String locNo, Boolean pakin);
 
+    // 鍚岀粍绌洪棽搴撲綅
+    LocMast findOutMost(List<String> locNos);
+
+    // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
+    void breakUp(String locNo, List<String> excludeLocNos);
+
+    void updateLocSts(String locNo, String locSts);
 }

--
Gitblit v1.9.1