From 4f3b662b72af43252e9d6aa6067543a35aef90e2 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 12 Jan 2026 09:55:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsMaterialCoilExportVo中新增exportTime字段用于临时存储发货时间
- 在数据库查询映射中添加export_time字段映射
- 将库存状态描述从"在途"修改为"已发货"
- 实现导出时根据状态动态设置时间字段的逻辑
- 当状态为已发货时使用发货时间，否则保持创建时间不变
---
 .../com/klp/domain/vo/WmsMaterialCoilExportVo.java   |  5 +++++
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 12 +++++++++++-
 .../resources/mapper/klp/WmsMaterialCoilMapper.xml   |  4 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
index 4b7da43c..a655fd82 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
@@ -156,4 +156,9 @@ public class WmsMaterialCoilExportVo {
      */
     @ExcelProperty(value = "物品ID")
     private Long itemId;
+
+    /**
+     * 发货时间（仅临时存储，不导出）
+     */
+    private Date exportTime;
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index be3957b4..a678ea7e 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -1861,7 +1861,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
     @Override
     public List<WmsMaterialCoilExportVo> queryExportList(WmsMaterialCoilBo bo) {
         QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectExportList(lqw);
+        List<WmsMaterialCoilExportVo> wmsMaterialCoilExportVos = baseMapper.selectExportList(lqw);
+        // 遍历数据，根据状态替换日期字段
+        wmsMaterialCoilExportVos.stream().forEach(vo -> {
+            // 判断查询条件中的status是否为1（已发货）
+            if (bo.getStatus() != null && bo.getStatus() == 1) {
+                // 已发货时，将展示的日期替换为export_time
+                vo.setCreateTime(vo.getExportTime());
+            }
+            // 非1的情况，保持原有create_time不变
+        });
+        return wmsMaterialCoilExportVos;
     }
 
     /**
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index 5e655e61..643ba376 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -361,6 +361,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.current_coil_no AS currentCoilNo,
             -- 日期
             mc.create_time AS createTime,
+            -- 发货时间
+            mc.export_time AS exportTime,
             -- 重量
             mc.net_weight AS netWeight,
             -- 长度
@@ -378,7 +380,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             -- 库存状态（中文显示）
             CASE
                 WHEN mc.status = 0 THEN '在库'
-                WHEN mc.status = 1 THEN '在途'
+                WHEN mc.status = 1 THEN '已发货'
                 ELSE CAST(mc.status AS CHAR)
             END AS statusDesc,
             -- 备注