From bf33cef785bfd09fc123637ef5dff02737c801e4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 26 五月 2023 08:57:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/LocMastService.java |   15 ++++++++++++++-
 1 files changed, 14 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 b52942e..f3fb095 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -17,6 +17,7 @@
                                     , 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);
 
@@ -32,7 +33,7 @@
      * @param locMast
      * @return
      */
-    Boolean checkEmptyCount(LocMast locMast);
+    Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
 
     /**
      * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -53,4 +54,16 @@
     void breakUp(String locNo, List<String> excludeLocNos);
 
     void updateLocSts(String locNo, String locSts);
+
+    //鎵惧渚х┖搴撲綅
+    LocMast findOutMast(Short locType1, List<Integer> crnNos);
+
+    //鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣�
+    LocMast findInEmptyLocMast(Short locType1, List<Integer> rows);
+
+    //鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣�
+    LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos);
+
+    //鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣�
+    LocMast findEmptyLowFrequencyLocMast(Short locType1);
 }

--
Gitblit v1.9.1