From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 13:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/service/LocMastService.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 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 4583f00..c13f719 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,13 +1,64 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
public interface LocMastService extends IService<LocMast> {
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast(Integer row, Integer locType);
+ LocMast queryFreeLocMast(Integer row, Short locType1);
+ LocMast queryFreeLocMast(Integer row, Short locType1, Long whsType);
+ /**
+ * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
+ * @param sourceLocNo 婧愬簱浣�
+ * @return 鍚岀粍绌哄簱浣嶉泦鍚�
+ */
+ List<String> queryGroupEmptyStock(String sourceLocNo);
+ List<String> queryGroupEmptyStock(String sourceLocNo, Long whsType);
+
+ /**
+ * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ * @param locMast
+ * @return
+ */
+ Boolean checkEmptyCount(LocMast locMast);
+ Boolean checkEmptyCount(LocMast locMast, Long whsType);
+
+ /**
+ * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
+ */
+ Boolean checkWhole(List<LocDetl> locDetls);
+ Boolean checkWhole(List<LocDetl> locDetls, Long whsType);
+
+ /**
+ * 鏌ヨ娴呭簱浣嶅湪搴擄紝娣卞簱浣嶄负O鐨勬暟鎹�
+ * @return
+ */
+ List<LocMast> queryShallowLocFMast(Integer crnNo);
+ List<LocMast> queryShallowLocFMast(Integer crnNo, Long whsType);
+
+ List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo);
+ List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo, Long whsType);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ * */
+// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);
+// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
+ LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);
+
+ LocMast selectLocByLocStsPakInShuttleF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ * */
+// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos);
+// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
+ LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locNoo, Long whsType);
}
--
Gitblit v1.9.1