diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java index 20c7cca6..1c48dcc7 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificate.java @@ -70,6 +70,10 @@ public class QcCertificate extends BaseEntity { * 质保证明说明(注释) */ private String note; + /** + * 证书类型(如:出厂合格证、检测报告、质保书等) + */ + private String certificateType; /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java index 17a25b5e..66e0508c 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateBo.java @@ -82,6 +82,11 @@ public class QcCertificateBo extends BaseEntity { */ private String note; + /** + * 证书类型(如:出厂合格证、检测报告、质保书等) + */ + private String certificateType; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java index e1ca5b1e..36d9bbb6 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateVo.java @@ -100,5 +100,11 @@ public class QcCertificateVo { @ExcelProperty(value = "备注") private String remark; + /** + * 证书类型(如:出厂合格证、检测报告、质保书等) + */ + @ExcelProperty(value = "证书类型") + private String certificateType; + } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java index 6277b674..e68d9291 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateServiceImpl.java @@ -75,6 +75,7 @@ public class QcCertificateServiceImpl implements IQcCertificateService { lqw.le(bo.getApproveTimeEnd() != null, QcCertificate::getApproveTime, bo.getApproveTimeEnd()); lqw.eq(StringUtils.isNotBlank(bo.getNote()), QcCertificate::getNote, bo.getNote()); + lqw.eq(StringUtils.isNotBlank(bo.getCertificateType()), QcCertificate::getCertificateType, bo.getCertificateType()); return lqw; } diff --git a/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml index 181e1b25..818dc0dd 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateMapper.xml @@ -18,6 +18,7 @@ +