From 98b1835a279fd8c9ed2a21fae3501f24c470c39b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 09 十一月 2023 09:37:36 +0800
Subject: [PATCH] 修复权限无法修改bug 组托时检测料箱码是否存在库存中
---
src/main/java/com/zy/asrs/service/LocMastService.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 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 f39fff9..4b8f371 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 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast(Integer row, List<Integer> rows, 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);
/**
* 鍒ゆ柇鏄惁鏄渶澶栧眰鐨勫簱浣�
@@ -39,10 +38,28 @@
*/
Boolean isOutMost(String locNo, Boolean pakin);
- // 鍚岀粍绌洪棽搴撲綅
- LocMast findOutMost(List<String> locNos);
+ // 鍚岀粍绌洪棽搴撲綅 鍏ュ簱鐢�
+ LocMast findOutMost(String locNo);
- // 瀵瑰悓缁勮揣鐗╄繘琛岀Щ搴撴搷浣�
- void breakUp(String locNo);
+ // 鑾峰彇瀵瑰簲鍑哄簱鍫嗗灈鏈哄彿鐮�
+ Integer getOutCrnNo(LocMast locMast);
+ LocMast findNearloc(String locNo);
+
+ LocMast findInnerLoc(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