From cb1f6d4df311494908b6ca50ac9a7e1fbfd5861f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 04 七月 2024 15:53:09 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/service/LocMastService.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 95932ad..2148529 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,6 +1,7 @@
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;
@@ -10,7 +11,7 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast(Integer row);
+ LocMast queryFreeLocMast(Integer row, Short locType1);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -18,4 +19,40 @@
* @return 鍚岀粍绌哄簱浣嶉泦鍚�
*/
List<String> queryGroupEmptyStock(String sourceLocNo);
+
+ /**
+ * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ * @param locMast
+ * @return
+ */
+ Boolean checkEmptyCount(LocMast locMast);
+
+ /**
+ * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
+ */
+ Boolean checkWhole(List<LocDetl> locDetls);
+
+ /**
+ * 鏌ヨ娴呭簱浣嶅湪搴擄紝娣卞簱浣嶄负O鐨勬暟鎹�
+ * @return
+ */
+ List<LocMast> queryShallowLocFMast(Integer crnNo);
+
+ //鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
+ List<LocMast> selectLocByLev(Integer lev);
+
+ /**
+ * 鏌ヨ骞冲簱鎸囧畾搴撳尯鍜屾ゼ灞�
+ * @param area 搴撳尯
+ * @param lev 妤煎眰
+ * @return 搴撲綅淇℃伅
+ */
+ List<LocMast> selectNodeLocByLev(String area, int lev);
+
+ LocMast selectLocStatus(String locno);
+
+
+ List<LocMast> selectByLocNo(List<String> locNo);
+
+
}
--
Gitblit v1.9.1