diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index 361dc3553..985f9e703 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -201,6 +201,8 @@ public class WmsMaterialCoilController extends BaseController { columns.put("isRelatedToOrderText", "是否与订单相关"); columns.put("saleName", "销售人员"); columns.put("contractNo", "合同编号"); + columns.put("actualLength", "实测长度"); + columns.put("actualWidth", "实测宽度"); columns.put("actualThickness", "实测厚度"); columns.put("transferType", "调拨类型"); columns.put("team", "班组"); diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java index 0c0ef5ca3..228f75a0e 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java @@ -227,4 +227,22 @@ public class WmsMaterialCoilAllExportVo { */ @ExcelProperty(value = "原料厚度") private String rawMaterialThickness; + + @ExcelProperty(value = "理论厚度") + private String theoreticalThickness; + + @ExcelProperty(value = "排产厚度") + private String scheduleThickness; + + @ExcelProperty(value = "理论长度") + private String theoreticalLength; + + @ExcelProperty(value = "镀铬卷号") + private String chromePlateCoilNo; + + @ExcelProperty(value = "实测长度") + private String actualLength; + + @ExcelProperty(value = "实测宽度") + private String actualWidth; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java index 41408ad56..a50adcd8c 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java @@ -245,4 +245,16 @@ public class WmsMaterialCoilExportVo { */ @ExcelProperty(value = "原料厚度") private String rawMaterialThickness; + + /** + * 实测长度 + */ + @ExcelProperty(value = "实测长度") + private BigDecimal actualLength; + + /** + * 实测宽度 + */ + @ExcelProperty(value = "实测宽度") + private BigDecimal actualWidth; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index 3316e77f0..daa1b12f6 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -487,6 +487,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.net_weight AS netWeight, -- 长度 mc.length AS length, + -- 实测长度 + mc.actual_length AS actualLength, + -- 实测宽度 + mc.actual_width AS actualWidth, -- 实测厚度 mc.actual_thickness AS actualThickness, -- 镀层种类