From a9e8a91fd4c8c504d7df9ef921f32d832390e77d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 13:42:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/asrs/service/LocMastService.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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..9b88ca4 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -2,15 +2,21 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocMast;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface LocMastService extends IService<LocMast> {
/**
+ * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎
+ */
+ List<Integer> queryDistinctRow(Integer crnNo);
+
+ /**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast(Integer row);
+ LocMast queryFreeLocMast(Integer row, Short locType1);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
@@ -18,4 +24,34 @@
* @return 鍚岀粍绌哄簱浣嶉泦鍚�
*/
List<String> queryGroupEmptyStock(String sourceLocNo);
+
+ /**
+ * 鍫嗗灈鏈烘紨绀鸿幏鍙栨簮搴撲綅
+ * @param crn
+ * @return
+ */
+ LocMast queryDemoSourceLoc(Integer crn);
+
+ /**
+ * 鍫嗗灈鏈烘紨绀鸿幏鍙栫洰鏍囧簱浣�
+ * @param crn
+ * @return
+ */
+ LocMast queryDemoLoc(Integer crn);
+
+ /**
+ * 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ * @param locMast
+ * @return
+ */
+ Boolean checkEmptyCount(LocMast locMast);
+
+ /**
+ * 鏌ヨ鍦ㄥ簱鍜岄绾﹀嚭搴撶殑娴嬭瘯搴撲綅
+ * @param sts1 F
+ * @param sts2 R
+ * @param count i
+ * @return
+ */
+ LocMast selectztgx(String sts1,String sts2,Integer count);
}
--
Gitblit v1.9.1