From 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/LocMastService.java | 16 ++++++++++++++--
1 files changed, 14 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 1620090..e6c33e7 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -11,7 +11,12 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast(Integer row, Short locType1);
+ 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);
+ List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -37,6 +42,13 @@
* @param locNo
* @return
*/
- Boolean isOutMost(String locNo);
+ Boolean isOutMost(String locNo, Boolean pakin);
+ // 鍚岀粍绌洪棽搴撲綅
+ LocMast findOutMost(List<String> locNos);
+
+ // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
+ void breakUp(String locNo, List<String> excludeLocNos);
+
+ void updateLocSts(String locNo, String locSts);
}
--
Gitblit v1.9.1