From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位

---
 src/main/java/com/zy/asrs/service/LocMastService.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index bbedd3e..92f2440 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -12,6 +12,14 @@
      * 妫�绱㈠彲鐢ㄥ簱浣�
      */
     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);
 
     /**
      * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -43,6 +51,24 @@
     LocMast findOutMost(List<String> locNos);
 
     // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
-    void breakUp(String locNo);
+    void breakUp(String locNo, List<String> excludeLocNos);
 
+    void updateLocSts(String locNo, String locSts);
+
+    //鎵惧渚х┖搴撲綅
+    List<LocMast> findOutMast(Short locType1, List<Integer> crnNos);
+
+    //鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣�
+    LocMast findInEmptyLocMast(Short locType1, List<Integer> rows);
+
+    //鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣�
+    List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos);
+
+    //鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣�
+    List<LocMast> findEmptyLowFrequencyLocMast(Short locType1);
+
+    //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
+    List<LocMast> selectLocByLev(Integer lev);
+
+    List<LocMast> selectByLocNos(List<String> locNos);
 }

--
Gitblit v1.9.1