From 05f0933514523b8752b09bbde5affe3c800fa687 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 15 Apr 2026 15:21:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E5=8D=B7=E6=97=B6=E9=97=B4=E5=92=8C=E5=AE=9E=E9=99=85=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsDeliveryWaybillDetailVo中新增exportTime字段用于实际发货时间
- 将deliveryTime字段的Excel导出标签从发货时间改为配卷时间
- 在数据库映射文件中添加exportTime字段的映射关系
- 在查询语句中加入export_time字段以支持实际发货时间数据获取
---
 .../com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java     | 8 ++++++--
 .../mapper/klp/WmsDeliveryWaybillDetailMapper.xml         | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
index 2098a579..238fe18a 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
@@ -76,9 +76,9 @@ public class WmsDeliveryWaybillDetailVo extends BaseEntity {
     private String senderUnit;
 
     /**
-     * 发货时间
+     * 配卷时间
      */
-    @ExcelProperty(value = "发货时间")
+    @ExcelProperty(value = "配卷时间")
     private Date deliveryTime;
 
     /**
@@ -129,6 +129,10 @@ public class WmsDeliveryWaybillDetailVo extends BaseEntity {
     @ExcelProperty(value = "当前钢卷号")
     private String currentCoilNo;
 
+    // 实际发货时间
+    @ExcelProperty(value = "实际发货时间")
+    private Date exportTime;
+
     // 实际库区
     @ExcelProperty(value = "实际库区")
     private String actualWarehouseName;
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
index 5bda81e9..13a92829 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml
@@ -155,6 +155,7 @@
         <result property="enterCoilNo" column="enter_coil_no"/>
         <result property="currentCoilNo" column="current_coil_no"/>
         <result property="actualWarehouseName" column="actual_warehouse_name"/>
+        <result property="exportTime" column="export_time"/>
 
         <!-- 发货单信息 -->
         <result property="waybillNo" column="waybill_no"/>
@@ -190,6 +191,7 @@
 
             c.enter_coil_no,
             c.current_coil_no,
+            c.export_time,
             aw.actual_warehouse_name,
             (CASE c.status WHEN 0 THEN '在库' WHEN 1 THEN '在途' WHEN 2 THEN '已出库' ELSE CAST(c.status AS CHAR) END) AS status_desc,