diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java index 227293c3..95d681fe 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java @@ -25,97 +25,79 @@ public class WmsProductVo { /** * 主键ID */ - @ExcelProperty(value = "主键ID") private Long productId; /** * 产品编号 */ - @ExcelProperty(value = "产品编号") private String productCode; /** * 产品名称 */ - @ExcelProperty(value = "产品名称") + @ExcelProperty(value = "名称") private String productName; /** * 负责人 */ - @ExcelProperty(value = "负责人") private String owner; /** * 基础材质分类ID */ - @ExcelProperty(value = "基础材质分类ID") private Long baseMaterialId; /** * 表面处理分类ID */ - @ExcelProperty(value = "表面处理分类ID") private Long surfaceTreatmentId; /** * 客户需求分类ID */ - @ExcelProperty(value = "客户需求分类ID") private Long customerReqId; /** * 包装分类ID */ - @ExcelProperty(value = "包装分类ID") private Long packagingId; /** * 厚度(mm) */ - @ExcelProperty(value = "厚度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") + private BigDecimal thickness; /** * 宽度(mm) */ - @ExcelProperty(value = "宽度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal width; /** * 内径(mm) */ - @ExcelProperty(value = "内径", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal innerDiameter; /** * 单位 */ - @ExcelProperty(value = "单位") private String unit; /** * 是否启用(0=否,1=是) */ - @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0==否,1=是") private Integer isEnabled; /** * 备注 */ - @ExcelProperty(value = "备注") private String remark; /** * BOM 表头ID */ - @ExcelProperty(value = "BOM 表头ID") private Long bomId; - @ExcelProperty(value = "类型") private String type; /** @@ -125,27 +107,32 @@ public class WmsProductVo { //规格 + @ExcelProperty(value = "规格") private String specification; /** * 材质 */ + @ExcelProperty(value = "材质") private String material; /** * 厂家 */ + @ExcelProperty(value = "厂家") private String manufacturer; /** * 表面处理详情 */ + @ExcelProperty(value = "表面处理") private String surfaceTreatmentDesc; /** * 锌层厚度 */ + @ExcelProperty(value = "锌层") private String zincLayer; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java index 1931f127..6bb16664 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java @@ -25,192 +25,147 @@ public class WmsRawMaterialVo { /** * 主键ID */ - @ExcelProperty(value = "主键ID") private Long rawMaterialId; /** * 原材料编号 */ - @ExcelProperty(value = "原材料编号") private String rawMaterialCode; /** * 原材料名称 */ - @ExcelProperty(value = "原材料名称") + @ExcelProperty(value = "名称") private String rawMaterialName; /** * 钢种/牌号(如SPHC、SPHE、S350GD等) */ - @ExcelProperty(value = "钢种/牌号", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "如=SPHC、SPHE、S350GD等") private String steelGrade; /** * 目标冷轧牌号(如SPCC、DC06、SGCC等) */ - @ExcelProperty(value = "目标冷轧牌号", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "如=SPCC、DC06、SGCC等") private String targetColdGrade; /** * 基础材质分类ID */ - @ExcelProperty(value = "基础材质分类ID") private Long baseMaterialId; /** * 表面处理分类ID */ - @ExcelProperty(value = "表面处理分类ID") private Long surfaceTreatmentId; /** * 厚度(mm) */ - @ExcelProperty(value = "厚度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal thickness; /** * 厚度偏差(mm) */ - @ExcelProperty(value = "厚度偏差", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal thicknessDeviation; /** * 宽度(mm) */ - @ExcelProperty(value = "宽度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal width; /** * 目标冷轧宽度(mm) */ - @ExcelProperty(value = "目标冷轧宽度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal targetColdWidth; /** * 目标冷轧厚度(mm) */ - @ExcelProperty(value = "目标冷轧厚度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal targetColdThickness; /** * 凸度(mm) */ - @ExcelProperty(value = "凸度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "m=m") private BigDecimal crown; /** * 卷重(kg) */ - @ExcelProperty(value = "卷重", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "k=g") private BigDecimal coilWeight; /** * 表面质量 */ - @ExcelProperty(value = "表面质量") private String surfaceQuality; /** * 硬度(HV5) */ - @ExcelProperty(value = "硬度", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "H=V5") private BigDecimal hardnessHv5; /** * 硬度差值(HV5差值≤15为合格) */ - @ExcelProperty(value = "硬度差值", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "H=V5差值≤15为合格") private BigDecimal hardnessDiff; /** * 锰含量Mn(%) */ - @ExcelProperty(value = "锰含量Mn", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "%=") private BigDecimal compositionMn; /** * 磷含量P(%) */ - @ExcelProperty(value = "磷含量P", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "%=") private BigDecimal compositionP; /** * 晶粒级别(如ASTM 6-8级,仅电工钢) */ - @ExcelProperty(value = "晶粒级别", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "如=ASTM,6=-8级,仅电工钢") private String grainSize; /** * 头尾切除标记(0=否,1=是,汽车板专用) */ - @ExcelProperty(value = "头尾切除标记", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0==否,1=是,汽车板专用") private Integer headTailCutFlag; /** * 检测结论(如合格/条纹/微裂纹/成分偏析等) */ - @ExcelProperty(value = "检测结论", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "如=合格/条纹/微裂纹/成分偏析等") private String inspectionResult; /** * 是否启用(0=否,1=是) */ - @ExcelProperty(value = "是否启用", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0==否,1=是") private Integer isEnabled; /** * 备注 */ - @ExcelProperty(value = "备注") private String remark; /** * 单位 */ - @ExcelProperty(value = "单位") private String unit; /** * BOM 表头ID */ - @ExcelProperty(value = "BOM 表头ID") private Long bomId; /** * 需求量 */ - @ExcelProperty(value = "需求量") private BigDecimal demand; /** * 库存量 */ - @ExcelProperty(value = "库存量") private BigDecimal inventory; /** * 在途量 */ - @ExcelProperty(value = "在途量") private BigDecimal onTheWay; @@ -220,26 +175,31 @@ public class WmsRawMaterialVo { private List bomItems; //规格 + @ExcelProperty(value = "规格") private String specification; /** * 材质 */ + @ExcelProperty(value = "材质") private String material; /** * 厂家 */ + @ExcelProperty(value = "厂家") private String manufacturer; /** * 表面处理详情 */ + @ExcelProperty(value = "表面处理") private String surfaceTreatmentDesc; /** * 锌层厚度 */ + @ExcelProperty(value = "锌层") private String zincLayer; }