diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java index 73e105d4..4c60e36c 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java @@ -37,6 +37,10 @@ public class QcCertificateItem extends BaseEntity { * 钢卷号 */ private String coilNo; + /** + * 原料卷号 + */ + private String rawCoilNo; /** * 炉号 */ @@ -145,6 +149,10 @@ public class QcCertificateItem extends BaseEntity { * 表面结构 */ private String surfaceStructure; + /** + * 表面处理 + */ + private String surfaceTreatment; /** * 镀层表面结构 */ @@ -161,6 +169,10 @@ public class QcCertificateItem extends BaseEntity { * 备注 */ private String remark; + /** + * 调质度 + */ + private String temperDegree; /** * 删除标志(0=正常,1=已删除) */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java index 333662da..ef8f320a 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java @@ -38,6 +38,11 @@ public class QcCertificateItemBo extends BaseEntity { */ private String coilNo; + /** + * 原料卷号 + */ + private String rawCoilNo; + /** * 炉号 */ @@ -173,6 +178,11 @@ public class QcCertificateItemBo extends BaseEntity { */ private String surfaceStructure; + /** + * 表面处理 + */ + private String surfaceTreatment; + /** * 镀层表面结构 */ @@ -193,5 +203,10 @@ public class QcCertificateItemBo extends BaseEntity { */ private String remark; + /** + * 调质度 + */ + private String temperDegree; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java index df77b86a..563419a9 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java @@ -43,6 +43,12 @@ public class QcCertificateItemVo { @ExcelProperty(value = "钢卷号") private String coilNo; + /** + * 原料卷号 + */ + @ExcelProperty(value = "原料卷号") + private String rawCoilNo; + /** * 炉号 */ @@ -205,6 +211,12 @@ public class QcCertificateItemVo { @ExcelProperty(value = "表面结构") private String surfaceStructure; + /** + * 表面处理 + */ + @ExcelProperty(value = "表面处理") + private String surfaceTreatment; + /** * 镀层表面结构 */ @@ -229,5 +241,11 @@ public class QcCertificateItemVo { @ExcelProperty(value = "备注") private String remark; + /** + * 调质度 + */ + @ExcelProperty(value = "调质度") + private String temperDegree; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java index 2ab259e0..9ea67432 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java @@ -64,6 +64,7 @@ public class QcCertificateItemServiceImpl implements IQcCertificateItemService { lqw.eq(bo.getCertificateId() != null, QcCertificateItem::getCertificateId, bo.getCertificateId()); lqw.eq(bo.getCoilId() != null, QcCertificateItem::getCoilId, bo.getCoilId()); lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcCertificateItem::getCoilNo, bo.getCoilNo()); + lqw.eq(StringUtils.isNotBlank(bo.getRawCoilNo()), QcCertificateItem::getRawCoilNo, bo.getRawCoilNo()); lqw.eq(StringUtils.isNotBlank(bo.getHeatNo()), QcCertificateItem::getHeatNo, bo.getHeatNo()); lqw.eq(StringUtils.isNotBlank(bo.getMaterialType()), QcCertificateItem::getMaterialType, bo.getMaterialType()); lqw.eq(StringUtils.isNotBlank(bo.getSize()), QcCertificateItem::getSize, bo.getSize()); @@ -91,9 +92,11 @@ public class QcCertificateItemServiceImpl implements IQcCertificateItemService { lqw.eq(StringUtils.isNotBlank(bo.getBendingTest()), QcCertificateItem::getBendingTest, bo.getBendingTest()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcCertificateItem::getSurfaceQuality, bo.getSurfaceQuality()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcCertificateItem::getSurfaceStructure, bo.getSurfaceStructure()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatment()), QcCertificateItem::getSurfaceTreatment, bo.getSurfaceTreatment()); lqw.eq(StringUtils.isNotBlank(bo.getCoatingSurfaceStructure()), QcCertificateItem::getCoatingSurfaceStructure, bo.getCoatingSurfaceStructure()); lqw.eq(bo.getCoatingMass() != null, QcCertificateItem::getCoatingMass, bo.getCoatingMass()); lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcCertificateItem::getEdgeStatus, bo.getEdgeStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getTemperDegree()), QcCertificateItem::getTemperDegree, bo.getTemperDegree()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml index 02f26ecd..e5cc3eee 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml @@ -9,6 +9,7 @@ + @@ -36,10 +37,12 @@ + +