From 4f7488aa49ab6420d25a6f7883ffebccbec9b73a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 15:04:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 5c690f8..208fff4 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -7,11 +7,19 @@
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- @Select("select top 1 * from asr_loc_mast where row1=#{row} and loc_type='O' order by loc_type desc ,lev1 asc,bay1 asc")
- LocMast queryFreeLocMast(@Param("row") Integer row);
+ LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
+ @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
+ List<String> queryGroupEmptyStock(Integer crnNo);
+
+ @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);
+
+ List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo);
}
--
Gitblit v1.9.1