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 |    8 +++++---
 1 files changed, 5 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 92f2440..c896f45 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -59,13 +59,15 @@
     List<LocMast> findOutMast(Short locType1, List<Integer> crnNos);
 
     //鎵惧崟鍝佺被鍨嬶紝鏈�鍐呬晶绌哄簱浣�
-    LocMast findInEmptyLocMast(Short locType1, List<Integer> rows);
+    List<LocMast> findInEmptyLocMast(Short locType1, List<Integer> rows, Integer crnNo);
 
     //鍦ㄥ簱浣嶇粍涓悳绱㈠彲鍏ョ殑绌哄簱浣�
-    List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos);
+    List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo);
 
     //鎼滅储浣庨(娣锋斁鍖哄煙)绌哄簱浣�
-    List<LocMast> findEmptyLowFrequencyLocMast(Short locType1);
+    List<LocMast> findEmptyLowFrequencyLocMast(Short locType1, Integer crnNo);
+
+    List<LocMast> findEmptyLocMast(Short locType1, Integer crnNo);
 
     //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
     List<LocMast> selectLocByLev(Integer lev);

--
Gitblit v1.9.1