Joshi
84583bb052
- 在 WmsCoilPackingDetailServiceImpl 中新增 IWmsMaterialCoilService 依赖注入 - 为分页查询和列表查询方法添加钢卷信息丰富逻辑 - 实现 enrichCoilInfo 方法通过钢卷ID批量获取钢卷完整信息 - 重构 WmsCoilPackingRecordServiceImpl 中的详情查询逻辑 - 移除 WmsCoilPackingDetailVo 中冗余的钢卷字段定义 - 使用关联查询替代原有的独立字段存储方式
82 lines
2.1 KiB
Java
82 lines
2.1 KiB
Java
package com.klp.domain.vo;
|
||
|
||
import java.math.BigDecimal;
|
||
import com.klp.domain.vo.WmsMaterialCoilVo;
|
||
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 lombok.Data;
|
||
|
||
|
||
/**
|
||
* 钢卷打包明细（存储每个钢卷的库区/重量信息）视图对象 wms_coil_packing_detail
|
||
*
|
||
* @author klp
|
||
* @date 2026-03-23
|
||
*/
|
||
@Data
|
||
@ExcelIgnoreUnannotated
|
||
public class WmsCoilPackingDetailVo {
|
||
|
||
private static final long serialVersionUID = 1L;
|
||
|
||
/**
|
||
* 明细主键ID
|
||
*/
|
||
@ExcelProperty(value = "明细主键ID")
|
||
private Long detailId;
|
||
|
||
/**
|
||
* 关联打包主表ID
|
||
*/
|
||
@ExcelProperty(value = "关联打包主表ID")
|
||
private Long packingId;
|
||
|
||
/**
|
||
* 关联钢卷ID（wms_material_coil.coil_id）
|
||
*/
|
||
@ExcelProperty(value = "关联钢卷ID", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "w=ms_material_coil.coil_id")
|
||
private Long coilId;
|
||
|
||
/**
|
||
* 该钢卷打包前的库区ID
|
||
*/
|
||
@ExcelProperty(value = "该钢卷打包前的库区ID")
|
||
private Long fromWarehouseId;
|
||
|
||
/**
|
||
* 该钢卷打包后的库区ID（打包待发区）
|
||
*/
|
||
@ExcelProperty(value = "该钢卷打包后的库区ID", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "打=包待发区")
|
||
private Long toWarehouseId;
|
||
|
||
/**
|
||
* 该钢卷的毛重
|
||
*/
|
||
@ExcelProperty(value = "该钢卷的毛重")
|
||
private BigDecimal coilGrossWeight;
|
||
|
||
/**
|
||
* 该钢卷的净重
|
||
*/
|
||
@ExcelProperty(value = "该钢卷的净重")
|
||
private BigDecimal coilNetWeight;
|
||
|
||
/**
|
||
* 该钢卷的打包备注（如：库区A-钢卷1001）
|
||
*/
|
||
@ExcelProperty(value = "该钢卷的打包备注", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "如=：库区A-钢卷1001")
|
||
private String remark;
|
||
|
||
|
||
/**
|
||
* 钢卷完整信息
|
||
*/
|
||
private WmsMaterialCoilVo coil;
|
||
|
||
}
|