DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(qc): 新增质量检验证书原料卷号、表面处理与调质度字段

Browse Source 
在质量检验证书项（QcCertificateItem）中新增以下字段：
1. 原料卷号（rawCoilNo）
2. 表面处理（surfaceTreatment）
3. 调质度（temperDegree）

调整涉及实体类、业务对象、值对象及映射文件，确保字段在查询条件、导出模板中生效。
This commit is contained in:
Joshi
2026-06-02 11:02:56 +08:00
parent 29328d70e9
commit 8572a60044
5 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
klp-mes/src/main/java/com/klp/mes/qc/domain/QcCertificateItem.java
View File

@@ -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=已删除）
*/

15
klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java
View File

@@ -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;
}

18
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java
View File

@@ -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;
}

3
klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java
View File

@@ -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;
}