diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java index fce21333..c08c3742 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java @@ -100,5 +100,26 @@ public class WmsMaterialCoil extends BaseEntity { //材料类型 private String materialType; + + + /** + * 质量状态(0=正常,1=待检,2=不合格) + */ + private String qualityStatus; + + /** + * 切边要求 + */ + private String trimmingRequirement; + + /** + * 打包状态(0=未打包,1=已打包) + */ + private String packingStatus; + + /** + * 包装要求 + */ + private String packagingRequirement; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index a55fd911..1f1cec1b 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -129,5 +129,26 @@ public class WmsMaterialCoilBo extends BaseEntity { //材料类型 private String materialType; + + /** + * 质量状态(0=正常,1=待检,2=不合格) + */ + private String qualityStatus; + + /** + * 切边要求 + */ + private String trimmingRequirement; + + /** + * 打包状态(0=未打包,1=已打包) + */ + private String packingStatus; + + /** + * 包装要求 + */ + private String packagingRequirement; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java index 32087fcd..2cff6579 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java @@ -189,5 +189,26 @@ public class WmsMaterialCoilVo extends BaseEntity { //材料类型 private String materialType; + + + /** + * 质量状态(0=正常,1=待检,2=不合格) + */ + private String qualityStatus; + + /** + * 切边要求 + */ + private String trimmingRequirement; + + /** + * 打包状态(0=未打包,1=已打包) + */ + private String packingStatus; + + /** + * 包装要求 + */ + private String packagingRequirement; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index 9c106982..4d2dcce4 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -89,6 +89,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.update_time, mc.create_by, mc.update_by, + mc.quality_status, + mc.trimming_requirement, + mc.packaging_reguirement, + mc.packing_status, w.warehouse_name AS warehouseName, aw.actual_warehouse_name AS actualWarehouseName FROM wms_material_coil mc