From d2756e02d9a9644ee20ced7d8d7ef7bf109126af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 26 十月 2023 16:29:01 +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 | 19 +++++++------------
1 files changed, 7 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 8d27adf..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,13 +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);
/**
- * 妫�绱㈠彲鐢ㄥ簱浣�0
+ * 鎼滅储鎸囧畾鍖哄煙鍙敤搴撲綅
*/
- LocMast queryFreeLocMast0(Integer row, Short locType1);
+ List<LocMast> selectAreaEmpty(Short locType1, Integer locType3);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -34,11 +32,6 @@
Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
/**
- * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
- */
- Boolean checkWhole(List<LocDetl> locDetls);
-
- /**
* 鍒ゆ柇鏄惁鏄渶澶栧眰鐨勫簱浣�
* @param locNo
* @return
@@ -47,9 +40,6 @@
// 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢�
LocMast findOutMost(String locNo);
-
- // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
- void breakUp(String locNo, List<String> excludeLocNos);
// 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮�
Integer getOutCrnNo(LocMast locMast);
@@ -65,4 +55,9 @@
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