From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index d0d5663..ef436e4 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,36 +13,49 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
+ LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("whsType") Long whsType);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
- List<String> queryGroupEmptyStock(Integer crnNo);
+ List<String> queryGroupEmptyStock(Integer crnNo, @Param("whsType") Long whsType);
@Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
- Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
+ Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo, @Param("whsType") Long whsType);
- List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo);
+ List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo, @Param("whsType") Long whsType);
- List<LocMast> selectLocShuttleMoveUnilateralY(@Param("bay")Integer bay,@Param("lev")Integer lev);
- List<LocMast> selectLocShuttleMoveUnilateralN(@Param("bay")Integer bay,@Param("lev")Integer lev);
+ List<LocMast> selectLocShuttleMoveUnilateralY(@Param("bay") Integer bay, @Param("lev") Integer lev, @Param("whsType") Long whsType);
+
+ List<LocMast> selectLocShuttleMoveUnilateralN(@Param("bay") Integer bay, @Param("lev") Integer lev, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�>娴�
* */
- LocMast selectLocByLocStsPakInF1(@Param("locNos") List<String> locNos);
+// LocMast selectLocByLocStsPakInF1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
+
+ LocMast selectLocByLocStsPakInF1(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
+
+ LocMast selectLocByLocStsPakInShuttleF1(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�<娴�
* */
- LocMast selectLocByLocStsPakInF2(@Param("locNos") List<String> locNos);
+// LocMast selectLocByLocStsPakInF2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
+
+ LocMast selectLocByLocStsPakInF2(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
+
+ LocMast selectLocByLocStsPakInShuttleF2(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�>娴�
* */
- LocMast selectLocByLocStsPakInO1(@Param("locNos") List<String> locNos);
+// LocMast selectLocByLocStsPakInO1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
+
+ LocMast selectLocByLocStsPakInO1(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�<娴�
* */
- LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos);
+// LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
+
+ LocMast selectLocByLocStsPakInO2(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
}
--
Gitblit v1.9.1