From f1b97dcec8e07a5c72d240114b3908b8df5b1e44 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 13 十月 2023 10:25:12 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/LocMastService.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 772bd98..9dbfeae 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,7 +10,12 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- 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);
+
+ /**
+ * 鎼滅储鎸囧畾鍖哄煙鍙敤搴撲綅
+ */
+ List<LocMast> selectAreaEmpty(Short locType1, Integer locType3);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -25,12 +29,7 @@
* @param locMast
* @return
*/
- Boolean checkEmptyCount(LocMast locMast);
-
- /**
- * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
- */
- Boolean checkWhole(List<LocDetl> locDetls);
+ Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
/**
* 鍒ゆ柇鏄惁鏄渶澶栧眰鐨勫簱浣�
@@ -42,7 +41,23 @@
// 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢�
LocMast findOutMost(String locNo);
- // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
- void breakUp(String locNo, List<String> excludeLocNos);
+ // 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮�
+ Integer getOutCrnNo(LocMast locMast);
+ LocMast findNearloc(String locNo);
+
+ List<LocMast> selectAllPeakLoc();
+
+ Boolean checkAllLocEmpty(List<String> groupOuterLoc);
+
+ //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
+ List<LocMast> selectLocByLev(Integer lev);
+
+ 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);
}
--
Gitblit v1.9.1