From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml
index ff45cb3..24e6248 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/GoodsShelvesMapper.xml
@@ -22,4 +22,20 @@
         LEFT JOIN tms_warehouse p on t.warehouse_id = p.id
         ${ew.customSqlSegment}
     </select>
+    <select id="queryGoodsShelvesDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
+        SELECT DISTINCT
+            shelf_number value,
+            ISNULL(shelf_number, '') + '/' + ISNULL(shelf_name, '') label,
+            ISNULL(shelf_number, '') + '/' + ISNULL(shelf_name, '') title
+        FROM tms_goods_shelves
+        where warehouse_id = #{warehouseId}
+    </select>
+    <select id="queryGoodsShelvesStoreyDictList" resultType="org.jeecg.modules.tms.entity.vo.DictVo">
+        SELECT DISTINCT
+            storey value,
+            storey label,
+            storey title
+        FROM tms_goods_shelves
+        WHERE warehouse_id = #{warehouseId} AND shelf_number = #{shelfNumber}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3