From bf46a1c66ff99b3797e6637de6aaaa1b359844c1 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 03 二月 2023 14:45:43 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs
---
src/main/java/com/zy/asrs/service/LocMastService.java | 14 ++++++++++++--
1 files changed, 12 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 e5fb670..7e6e34e 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, List<Integer> rows, 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, Short locType1);
+ List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -37,8 +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