From 0f478c31b5327ffe4bfdebd72fdf23a6df5d37e6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 11:55:11 +0800
Subject: [PATCH] 随机获取可用且有空库位的堆垛机号,找新巷道时增加判断

---
 src/main/java/com/zy/asrs/service/LocMastService.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 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 e6c33e7..c896f45 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -15,8 +15,11 @@
     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);
-    List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row);
+    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);
 
     /**
      * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -30,7 +33,7 @@
      * @param locMast
      * @return
      */
-    Boolean checkEmptyCount(LocMast locMast);
+    Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
 
     /**
      * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -51,4 +54,23 @@
     void breakUp(String locNo, List<String> excludeLocNos);
 
     void updateLocSts(String locNo, String locSts);
+
+    //鎵惧渚х┖搴撲綅
+    List<LocMast> findOutMast(Short locType1, List<Integer> crnNos);
+
+    //鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣�
+    List<LocMast> findInEmptyLocMast(Short locType1, List<Integer> rows, Integer crnNo);
+
+    //鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣�
+    List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo);
+
+    //鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣�
+    List<LocMast> findEmptyLowFrequencyLocMast(Short locType1, Integer crnNo);
+
+    List<LocMast> findEmptyLocMast(Short locType1, Integer crnNo);
+
+    //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
+    List<LocMast> selectLocByLev(Integer lev);
+
+    List<LocMast> selectByLocNos(List<String> locNos);
 }

--
Gitblit v1.9.1