feat(WmsMaterialCoil): 添加发货时间字段并优化导出功能
- 在WmsMaterialCoilExportVo中新增exportTime字段用于临时存储发货时间 - 在数据库查询映射中添加export_time字段映射 - 将库存状态描述从"在途"修改为"已发货" - 实现导出时根据状态动态设置时间字段的逻辑 - 当状态为已发货时使用发货时间,否则保持创建时间不变
This commit is contained in:
@@ -156,4 +156,9 @@ public class WmsMaterialCoilExportVo {
|
|||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "物品ID")
|
@ExcelProperty(value = "物品ID")
|
||||||
private Long itemId;
|
private Long itemId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发货时间(仅临时存储,不导出)
|
||||||
|
*/
|
||||||
|
private Date exportTime;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1861,7 +1861,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
@Override
|
@Override
|
||||||
public List<WmsMaterialCoilExportVo> queryExportList(WmsMaterialCoilBo bo) {
|
public List<WmsMaterialCoilExportVo> queryExportList(WmsMaterialCoilBo bo) {
|
||||||
QueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapper(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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -361,6 +361,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.current_coil_no AS currentCoilNo,
|
mc.current_coil_no AS currentCoilNo,
|
||||||
-- 日期
|
-- 日期
|
||||||
mc.create_time AS createTime,
|
mc.create_time AS createTime,
|
||||||
|
-- 发货时间
|
||||||
|
mc.export_time AS exportTime,
|
||||||
-- 重量
|
-- 重量
|
||||||
mc.net_weight AS netWeight,
|
mc.net_weight AS netWeight,
|
||||||
-- 长度
|
-- 长度
|
||||||
@@ -378,7 +380,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
-- 库存状态(中文显示)
|
-- 库存状态(中文显示)
|
||||||
CASE
|
CASE
|
||||||
WHEN mc.status = 0 THEN '在库'
|
WHEN mc.status = 0 THEN '在库'
|
||||||
WHEN mc.status = 1 THEN '在途'
|
WHEN mc.status = 1 THEN '已发货'
|
||||||
ELSE CAST(mc.status AS CHAR)
|
ELSE CAST(mc.status AS CHAR)
|
||||||
END AS statusDesc,
|
END AS statusDesc,
|
||||||
-- 备注
|
-- 备注
|
||||||
|
|||||||
Reference in New Issue
Block a user