Joshi
d809fc489d
- 在WmsDeliveryPlan实体类中新增orderId字段 - 在WmsDeliveryPlanBo业务对象中新增orderId字段 - 在WmsDeliveryPlanVo视图对象中新增orderId字段
92 lines
2.0 KiB
Java
92 lines
2.0 KiB
Java
package com.klp.domain.vo;
|
||
|
||
import java.util.Date;
|
||
import java.util.List;
|
||
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||
import com.alibaba.excel.annotation.ExcelProperty;
|
||
import com.klp.common.annotation.ExcelDictFormat;
|
||
import com.klp.common.convert.ExcelDictConvert;
|
||
import com.klp.common.core.domain.BaseEntity;
|
||
import lombok.Data;
|
||
import org.springframework.format.annotation.DateTimeFormat;
|
||
|
||
|
||
/**
|
||
* 发货计划视图对象 wms_delivery_plan
|
||
*
|
||
* @author klp
|
||
* @date 2025-11-25
|
||
*/
|
||
@Data
|
||
@ExcelIgnoreUnannotated
|
||
public class WmsDeliveryPlanVo extends BaseEntity {
|
||
|
||
private static final long serialVersionUID = 1L;
|
||
|
||
/**
|
||
* 计划唯一ID
|
||
*/
|
||
@ExcelProperty(value = "计划唯一ID")
|
||
private Long planId;
|
||
|
||
/**
|
||
* 发货计划名称（格式：YYYY-MM-DD-序号，如2025-11-25-001）
|
||
*/
|
||
@ExcelProperty(value = "发货计划名称", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "格=式：YYYY-MM-DD-序号，如2025-11-25-001")
|
||
private String planName;
|
||
|
||
/**
|
||
* 计划日期
|
||
*/
|
||
@ExcelProperty(value = "计划日期")
|
||
private Date planDate;
|
||
|
||
/**
|
||
* 计划类型
|
||
*/
|
||
@ExcelProperty(value = "计划类型")
|
||
private Integer planType;
|
||
|
||
/**
|
||
* 备注
|
||
*/
|
||
@ExcelProperty(value = "备注")
|
||
private String remark;
|
||
|
||
/**
|
||
* 关联的发货单列表
|
||
*/
|
||
private List<WmsDeliveryWaybillVo> waybills;
|
||
|
||
|
||
/**
|
||
* 创建人昵称
|
||
*/
|
||
private String createByName;
|
||
|
||
/**
|
||
* 更新人昵称
|
||
*/
|
||
private String updateByName;
|
||
|
||
// 钢卷集合
|
||
private String coil;
|
||
|
||
//-- 1. 新增审核状态字段（核心）
|
||
private Integer auditStatus;
|
||
//-- 2. 新增审核人字段
|
||
private String auditBy;
|
||
//-- 3. 新增审核时间字段
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date auditTime;
|
||
|
||
|
||
//关联订单id
|
||
private Long orderId;
|
||
|
||
}
|