From 01e9c9c7439d5dba32611b216a24dc17c5a791de Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 07 七月 2025 16:24:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/LocMastService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 00b330b..a0677de 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -12,6 +12,7 @@
      * 妫�绱㈠彲鐢ㄥ簱浣�
      */
     LocMast queryFreeLocMast(Integer row, Short locType1);
+    LocMast queryFreeLocMast(Integer row, Short locType1, Long whsType);
 
     /**
      * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -19,6 +20,7 @@
      * @return 鍚岀粍绌哄簱浣嶉泦鍚�
      */
     List<String> queryGroupEmptyStock(String sourceLocNo);
+    List<String> queryGroupEmptyStock(String sourceLocNo, Long whsType);
 
     /**
      * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
@@ -26,15 +28,38 @@
      * @return
      */
     Boolean checkEmptyCount(LocMast locMast);
+    Boolean checkEmptyCount(LocMast locMast, Long whsType);
 
     /**
      * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
      */
     Boolean checkWhole(List<LocDetl> locDetls);
+    Boolean checkWhole(List<LocDetl> locDetls, Long whsType);
 
     /**
      * 鏌ヨ娴呭簱浣嶅湪搴擄紝娣卞簱浣嶄负O鐨勬暟鎹�
      * @return
      */
     List<LocMast> queryShallowLocFMast(Integer crnNo);
+    List<LocMast> queryShallowLocFMast(Integer crnNo, Long whsType);
+
+    List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo);
+    List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo, Long whsType);
+
+    /*
+     * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+     * */
+//    LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);
+//    LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
+    LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);
+
+    /*
+     * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+     * */
+//    LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos);
+//    LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
+    LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locNoo, Long whsType);
+
+    //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
+    List<LocMast> selectLocByLev(Integer lev);
 }

--
Gitblit v1.9.1