From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/java/com/zy/asrs/service/LocMastService.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 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..ec6efa3 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,14 @@
* @param locMast
* @return
*/
- Boolean checkEmptyCount(LocMast locMast);
+ Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
+
+ /**
+ * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ * @param locMast
+ * @return
+ */
+ Boolean checkEmptyCount0(LocMast locMast, int quaOfBlank);
/**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -53,4 +61,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