feat(WmsMaterialCoil): 自定义报表导出完善
- 在 WmsMaterialCoilAllExportVo 中新增理论厚度、排产厚度、理论长度、镀铬卷号、实测长度和实测宽度字段 - 在 WmsMaterialCoilExportVo 中新增实测长度和实测宽度字段 - 在控制器中为导出功能添加实测长度和实测宽度列配置 - 在数据库映射文件中添加 actual_length 和 actual_width 字段查询映射
This commit is contained in:
@@ -201,6 +201,8 @@ public class WmsMaterialCoilController extends BaseController {
|
|||||||
columns.put("isRelatedToOrderText", "是否与订单相关");
|
columns.put("isRelatedToOrderText", "是否与订单相关");
|
||||||
columns.put("saleName", "销售人员");
|
columns.put("saleName", "销售人员");
|
||||||
columns.put("contractNo", "合同编号");
|
columns.put("contractNo", "合同编号");
|
||||||
|
columns.put("actualLength", "实测长度");
|
||||||
|
columns.put("actualWidth", "实测宽度");
|
||||||
columns.put("actualThickness", "实测厚度");
|
columns.put("actualThickness", "实测厚度");
|
||||||
columns.put("transferType", "调拨类型");
|
columns.put("transferType", "调拨类型");
|
||||||
columns.put("team", "班组");
|
columns.put("team", "班组");
|
||||||
|
|||||||
@@ -227,4 +227,22 @@ public class WmsMaterialCoilAllExportVo {
|
|||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "原料厚度")
|
@ExcelProperty(value = "原料厚度")
|
||||||
private String rawMaterialThickness;
|
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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -245,4 +245,16 @@ public class WmsMaterialCoilExportVo {
|
|||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "原料厚度")
|
@ExcelProperty(value = "原料厚度")
|
||||||
private String rawMaterialThickness;
|
private String rawMaterialThickness;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 实测长度
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "实测长度")
|
||||||
|
private BigDecimal actualLength;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 实测宽度
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "实测宽度")
|
||||||
|
private BigDecimal actualWidth;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -487,6 +487,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.net_weight AS netWeight,
|
mc.net_weight AS netWeight,
|
||||||
-- 长度
|
-- 长度
|
||||||
mc.length AS length,
|
mc.length AS length,
|
||||||
|
-- 实测长度
|
||||||
|
mc.actual_length AS actualLength,
|
||||||
|
-- 实测宽度
|
||||||
|
mc.actual_width AS actualWidth,
|
||||||
-- 实测厚度
|
-- 实测厚度
|
||||||
mc.actual_thickness AS actualThickness,
|
mc.actual_thickness AS actualThickness,
|
||||||
-- 镀层种类
|
-- 镀层种类
|
||||||
|
|||||||
Reference in New Issue
Block a user