From 13833aab4ddedd8c30a098d7f24aaff09d939054 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 6 Feb 2026 13:20:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E5=BA=93=E5=8C=BA=E5=90=8D=E7=A7=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsMaterialCoilVo 中新增 nextWarehouseName 字段
- 更新 WmsMaterialCoilMapper.xml 查询语句，关联下一库区表获取库区名称
- 为 nextWarehouseName 字段添加 Excel 导出注解配置
- 完善实体类注释文档
---
 .../src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java   | 5 +++++
 .../src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
index 459e1bb6..a468c784 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
@@ -164,6 +164,11 @@ public class WmsMaterialCoilVo extends BaseEntity {
     @ExcelProperty(value = "库区名称")
     private String warehouseName;
 
+    /**
+     * 下一库区名称
+     */
+    private String nextWarehouseName;
+
     /**
      * 钢卷数量（用于统计查询）
      */
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index 108c34ee..bbdf3ea7 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.exclusive_status,
             su.nick_name AS saleName,
             w.warehouse_name AS warehouseName,
+            nw.warehouse_name AS nextWarehouseName,
             aw.actual_warehouse_name AS actualWarehouseName,
             CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
                  WHEN mc.item_type = 'product' THEN p.specification
@@ -136,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COALESCE(ca.abnormal_count, 0) AS abnormalCount
         FROM wms_material_coil mc
         LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
+        LEFT JOIN wms_warehouse nw ON mc.next_warehouse_id = nw.warehouse_id
         LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
         LEFT JOIN sys_user su ON mc.sale_id = su.user_id
         LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id