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 @@
+
@@ -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,