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 queryExportList(WmsMaterialCoilBo bo) { QueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectExportList(lqw); + List 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, -- 备注