From d148bdbf92baea1c312ac6168cd51ab07ebf9c4a Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Fri, 1 Aug 2025 17:04:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E8=81=94=E6=9F=A5=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java  | 5 +++++
 klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java
index fd5d4473..4a6f7abb 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsStockVo.java
@@ -80,5 +80,10 @@ public class WmsStockVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 仓库/库区名称
+     */
+    @ExcelProperty(value = "仓库/库区名称")
+    private String warehouseName;
 
 }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
index 9609c64c..18065e71 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsStockMapper.xml
@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsStockVo">
         SELECT
             s.*,
+            w.warehouse_name,
             CASE
                 WHEN s.item_type = 'product' THEN p.product_name
                 WHEN s.item_type = 'raw_material' THEN r.raw_material_name
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM wms_stock s
         LEFT JOIN wms_product p ON s.item_type = 'product' AND s.item_id = p.product_id
         LEFT JOIN wms_raw_material r ON s.item_type = 'raw_material' AND s.item_id = r.raw_material_id
+        left join wms_warehouse w on s.warehouse_id = w.warehouse_id
         ${ew.customSqlSegment}
     </select>