feat(wms): 添加配卷时间和实际发货时间字段支持
- 在WmsDeliveryWaybillDetailVo中新增exportTime字段用于实际发货时间 - 将deliveryTime字段的Excel导出标签从发货时间改为配卷时间 - 在数据库映射文件中添加exportTime字段的映射关系 - 在查询语句中加入export_time字段以支持实际发货时间数据获取
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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,
|
||||
|
||||
|
||||
Reference in New Issue
Block a user