Files
klp-oa/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
Joshi ab7af2ade8 feat(wms): 添加配送单详情中的原材料和产品信息字段
- 在 WmsDeliveryWaybillDetailVo 中新增物品名称、规格、材质等属性
- 添加厂家、表面处理描述、镀层等原材料/产品相关信息
- 在 Mapper 中增加原材料和产品的关联查询逻辑
- 实现原材料和产品表的左连接查询支持
- 添加状态描述字段用于显示库存状态信息
- 完善 Excel 导出功能中的新字段映射配置
2026-03-30 11:10:44 +08:00

260 lines
5.0 KiB
Java
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

package com.klp.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
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;
/**
* 发货单明细视图对象 wms_delivery_waybill_detail
*
* @author klp
* @date 2025-11-25
*/
@Data
@ExcelIgnoreUnannotated
public class WmsDeliveryWaybillDetailVo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 明细唯一ID
*/
private Long detailId;
/**
* 关联发货单主表ID
*/
private Long waybillId;
/**
* 关联钢卷表ID钢卷基础信息在钢卷表中
*/
private Long coilId;
/**
* 计划名称
*/
@ExcelProperty(value = "计划名称")
private String planName;
// ==================== 关联的发货单主表信息 ====================
/**
* 发货单号
*/
@ExcelProperty(value = "发货单号")
private String waybillNo;
/**
* 发货单名称
*/
@ExcelProperty(value = "发货单名称")
private String waybillName;
/**
* 车牌号
*/
@ExcelProperty(value = "车牌号")
private String licensePlate;
/**
* 收货单位
*/
@ExcelProperty(value = "收货单位")
private String consigneeUnit;
/**
* 发货单位
*/
@ExcelProperty(value = "发货单位")
private String senderUnit;
/**
* 发货时间
*/
@ExcelProperty(value = "发货时间")
private Date deliveryTime;
/**
* 地磅
*/
@ExcelProperty(value = "地磅")
private String weighbridge;
/**
* 业务员
*/
@ExcelProperty(value = "业务员")
private String salesPerson;
/**
* 负责人
*/
@ExcelProperty(value = "负责人")
private String principal;
/**
* 负责人电话
*/
@ExcelProperty(value = "负责人电话")
private String principalPhone;
/**
* 发货单状态
*/
@ExcelProperty(value = "发货单状态")
private String waybillStatus;
/**
* 发货单备注
*/
@ExcelProperty(value = "发货单备注")
private String waybillRemark;
// ==================== 关联的钢卷信息 ====================
/**
* 入场钢卷号
*/
@ExcelProperty(value = "入场钢卷号")
private String enterCoilNo;
/**
* 当前钢卷号
*/
@ExcelProperty(value = "当前钢卷号")
private String currentCoilNo;
// 实际库区
@ExcelProperty(value = "实际库区")
private String actualWarehouseName;
/**
* 品名(如:冷硬钢卷、冷轧钢卷)
*/
@ExcelProperty(value = "品名")
private String productName;
/**
* 切边(净边/毛边)
*/
@ExcelProperty(value = "切边")
private String edgeType;
/**
* 包装(裸包/简包1/精包2等
*/
@ExcelProperty(value = "包装")
private String packaging;
/**
* 结算方式(卷重/磅重)
*/
@ExcelProperty(value = "结算方式")
private String settlementType;
/**
* 原料厂家
*/
@ExcelProperty(value = "原料厂家")
private String rawMaterialFactory;
/**
* 卷号
*/
@ExcelProperty(value = "卷号")
private String coilNo;
/**
* 规格
*/
@ExcelProperty(value = "规格")
private String specification;
/**
* 材质
*/
@ExcelProperty(value = "材质")
private String material;
/**
* 数量(件)
*/
@ExcelProperty(value = "数量")
private Long quantity;
/**
* 重量kg
*/
@ExcelProperty(value = "重量")
private BigDecimal weight;
/**
* 单价
*/
@ExcelProperty(value = "单价")
private BigDecimal unitPrice;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
// ==================== 关联的发货计划信息 ====================
/**
* 计划ID
*/
private Long planId;
/**
* 计划日期
*/
private Date planDate;
// ==================== 原材料/产品信息 ====================
/**
* 物品名称(原材料/产品)
*/
private String itemName;
/**
* 物品规格(原材料/产品)
*/
private String itemSpecification;
/**
* 物品材质(原材料/产品)
*/
private String itemMaterial;
/**
* 厂家
*/
private String manufacturer;
/**
* 表面处理描述
*/
@ExcelProperty(value = "表面处理")
private String itemSurfaceTreatmentDesc;
/**
* 镀层
*/
@ExcelProperty(value = "镀层")
private String itemZincLayer;
/**
* 状态描述
*/
@ExcelProperty(value = "状态")
private String statusDesc;
}