From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 346571f..b730745 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,7 +1,6 @@
 package com.zy.asrs.service;
 
 import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.LocMast;
 
 import java.util.List;
@@ -11,13 +10,17 @@
     /**
      * 妫�绱㈠彲鐢ㄥ簱浣�
      */
-    List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1);
     List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
 
     /**
-     * 妫�绱㈠彲鐢ㄥ簱浣�0
+     * 鎼滅储鎸囧畾鍖哄煙鍙敤搴撲綅
      */
-    LocMast queryFreeLocMast0(Integer row, Short locType1);
+    List<LocMast> selectAreaEmpty(Short locType1, Integer locType3);
+
+    /**
+     * 鎼滅储鎸囧畾鍖哄煙鍙敤搴撲綅
+     */
+    List<LocMast> selectAreaEmptyByLev(Short locType1, Integer locType3, Integer lev);
 
     /**
      * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -34,11 +37,6 @@
     Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
 
     /**
-     * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
-     */
-    Boolean checkWhole(List<LocDetl> locDetls);
-
-    /**
      * 鍒ゆ柇鏄惁鏄渶澶栧眰鐨勫簱浣�
      * @param locNo
      * @return
@@ -48,13 +46,12 @@
     // 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢�
     LocMast findOutMost(String locNo);
 
-    // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
-    void breakUp(String locNo, List<String> excludeLocNos);
-
     // 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮�
     Integer getOutCrnNo(LocMast locMast);
 
     LocMast findNearloc(String locNo);
+
+    LocMast findInnerLoc(String locNo);
 
     List<LocMast> selectAllPeakLoc();
 
@@ -65,6 +62,11 @@
 
     List<LocMast> selectEmptyByLocNos(List<String> locNos);
 
+    LocMast selectByLoc(String locNo);
+
     Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev);
 
+    void updateByLocNo(LocMast locMast);
+
+    List<LocMast> selectLocDetlNotExist();
 }

--
Gitblit v1.9.1