From 020863d1ef8cdeadbdf8846ef87898f7fd7d3d96 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 30 May 2026 11:04:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=B7=BB=E5=8A=A0=E5=8C=96?= =?UTF-8?q?=E5=AD=A6=E6=88=90=E5=88=86=E5=92=8C=E7=89=A9=E7=90=86=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E6=A3=80=E6=B5=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QcChemicalItem实体类中新增铝、钛、铬、镍、铜、氮、铁、硼等化学成分字段 - 在QcChemicalItemBo业务对象中同步添加对应的化学成分属性 - 更新QcChemicalItemMapper.xml映射文件以支持新字段的数据映射 - 在QcChemicalItemServiceImpl服务实现中添加新字段的查询条件支持 - 在QcChemicalItemVo视图对象中添加化学成分字段并配置Excel导出 - 在QcPhysicalItem实体类中新增规定塑性延伸强度、镀层表面结构、镀层重量等物理性能字段 - 在QcPhysicalItemBo业务对象中添加对应的物理性能属性 - 更新QcPhysicalItemMapper.xml映射文件以支持新的物理性能字段映射 - 在QcPhysicalItemServiceImpl服务实现中添加新物理性能字段的查询条件支持 - 在QcPhysicalItemVo视图对象中添加物理性能字段并配置Excel导出功能 --- .../com/klp/mes/qc/domain/QcChemicalItem.java | 32 +++++++++++++ .../com/klp/mes/qc/domain/QcPhysicalItem.java | 12 +++++ .../mes/qc/domain/bo/QcChemicalItemBo.java | 40 ++++++++++++++++ .../mes/qc/domain/bo/QcPhysicalItemBo.java | 15 ++++++ .../mes/qc/domain/vo/QcChemicalItemVo.java | 48 +++++++++++++++++++ .../mes/qc/domain/vo/QcPhysicalItemVo.java | 18 +++++++ .../impl/QcChemicalItemServiceImpl.java | 8 ++++ .../impl/QcPhysicalItemServiceImpl.java | 3 ++ .../mapper/qc/QcChemicalItemMapper.xml | 8 ++++ .../mapper/qc/QcPhysicalItemMapper.xml | 3 ++ 10 files changed, 187 insertions(+) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java index f47e50f2..760e45ad 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcChemicalItem.java @@ -65,6 +65,38 @@ public class QcChemicalItem extends BaseEntity { * 酸溶铝(%) */ private BigDecimal als; + /** + * 铝(%) + */ + private BigDecimal al; + /** + * 钛(%) + */ + private BigDecimal ti; + /** + * 铬(%) + */ + private BigDecimal cr; + /** + * 镍(%) + */ + private BigDecimal ni; + /** + * 铜(%) + */ + private BigDecimal cu; + /** + * 氮(%) + */ + private BigDecimal n; + /** + * 铁(%) + */ + private BigDecimal fe; + /** + * 硼(%) + */ + private BigDecimal b; /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java index 8cb93679..e44a5b51 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcPhysicalItem.java @@ -41,6 +41,10 @@ public class QcPhysicalItem extends BaseEntity { * 拉伸试验-屈服强度(MPa) */ private BigDecimal yieldStrength; + /** + * 规定塑性延伸强度(MPa) + */ + private BigDecimal plasticExtensionStrength; /** * 拉伸试验-抗拉强度(MPa) */ @@ -65,6 +69,14 @@ public class QcPhysicalItem extends BaseEntity { * 表面结构 */ private String surfaceStructure; + /** + * 镀层表面结构 + */ + private String coatingSurfaceStructure; + /** + * 镀层重量 COATING MASS(g/m²) + */ + private BigDecimal coatingMass; /** * 边缘状态 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java index 48a310da..33ddcb25 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcChemicalItemBo.java @@ -73,6 +73,46 @@ public class QcChemicalItemBo extends BaseEntity { */ private BigDecimal als; + /** + * 铝(%) + */ + private BigDecimal al; + + /** + * 钛(%) + */ + private BigDecimal ti; + + /** + * 铬(%) + */ + private BigDecimal cr; + + /** + * 镍(%) + */ + private BigDecimal ni; + + /** + * 铜(%) + */ + private BigDecimal cu; + + /** + * 氮(%) + */ + private BigDecimal n; + + /** + * 铁(%) + */ + private BigDecimal fe; + + /** + * 硼(%) + */ + private BigDecimal b; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java index e0e2e945..2e12e995 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcPhysicalItemBo.java @@ -43,6 +43,11 @@ public class QcPhysicalItemBo extends BaseEntity { */ private BigDecimal yieldStrength; + /** + * 规定塑性延伸强度(MPa) + */ + private BigDecimal plasticExtensionStrength; + /** * 拉伸试验-抗拉强度(MPa) */ @@ -73,6 +78,16 @@ public class QcPhysicalItemBo extends BaseEntity { */ private String surfaceStructure; + /** + * 镀层表面结构 + */ + private String coatingSurfaceStructure; + + /** + * 镀层重量 COATING MASS(g/m²) + */ + private BigDecimal coatingMass; + /** * 边缘状态 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java index db3ef9cb..378414eb 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcChemicalItemVo.java @@ -86,6 +86,54 @@ public class QcChemicalItemVo { @ExcelProperty(value = "酸溶铝(%)") private BigDecimal als; + /** + * 铝(%) + */ + @ExcelProperty(value = "铝(%)") + private BigDecimal al; + + /** + * 钛(%) + */ + @ExcelProperty(value = "钛(%)") + private BigDecimal ti; + + /** + * 铬(%) + */ + @ExcelProperty(value = "铬(%)") + private BigDecimal cr; + + /** + * 镍(%) + */ + @ExcelProperty(value = "镍(%)") + private BigDecimal ni; + + /** + * 铜(%) + */ + @ExcelProperty(value = "铜(%)") + private BigDecimal cu; + + /** + * 氮(%) + */ + @ExcelProperty(value = "氮(%)") + private BigDecimal n; + + /** + * 铁(%) + */ + @ExcelProperty(value = "铁(%)") + private BigDecimal fe; + + /** + * 硼(%) + */ + @ExcelProperty(value = "硼(%)") + private BigDecimal b; + /** * 备注 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java index 29853843..d79d5264 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcPhysicalItemVo.java @@ -51,6 +51,12 @@ public class QcPhysicalItemVo { @ExcelProperty(value = "拉伸试验-屈服强度(MPa)") private BigDecimal yieldStrength; + /** + * 规定塑性延伸强度(MPa) + */ + @ExcelProperty(value = "规定塑性延伸强度(MPa)") + private BigDecimal plasticExtensionStrength; + /** * 拉伸试验-抗拉强度(MPa) */ @@ -87,6 +93,18 @@ public class QcPhysicalItemVo { @ExcelProperty(value = "表面结构") private String surfaceStructure; + /** + * 镀层表面结构 + */ + @ExcelProperty(value = "镀层表面结构") + private String coatingSurfaceStructure; + + /** + * 镀层重量 COATING MASS(g/m²) + */ + @ExcelProperty(value = "镀层重量 COATING MASS(g/m²)") + private BigDecimal coatingMass; + /** * 边缘状态 */ diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java index fbb2e8a3..fb48378f 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcChemicalItemServiceImpl.java @@ -79,6 +79,14 @@ public class QcChemicalItemServiceImpl implements IQcChemicalItemService { lqw.eq(bo.getP() != null, QcChemicalItem::getP, bo.getP()); lqw.eq(bo.getS() != null, QcChemicalItem::getS, bo.getS()); lqw.eq(bo.getAls() != null, QcChemicalItem::getAls, bo.getAls()); + lqw.eq(bo.getAl() != null, QcChemicalItem::getAl, bo.getAl()); + lqw.eq(bo.getTi() != null, QcChemicalItem::getTi, bo.getTi()); + lqw.eq(bo.getCr() != null, QcChemicalItem::getCr, bo.getCr()); + lqw.eq(bo.getNi() != null, QcChemicalItem::getNi, bo.getNi()); + lqw.eq(bo.getCu() != null, QcChemicalItem::getCu, bo.getCu()); + lqw.eq(bo.getN() != null, QcChemicalItem::getN, bo.getN()); + lqw.eq(bo.getFe() != null, QcChemicalItem::getFe, bo.getFe()); + lqw.eq(bo.getB() != null, QcChemicalItem::getB, bo.getB()); // 根据创建时间倒叙 lqw.orderByDesc(QcChemicalItem::getCreateTime); return lqw; diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java index 44f12e69..c18ee318 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcPhysicalItemServiceImpl.java @@ -73,12 +73,15 @@ public class QcPhysicalItemServiceImpl implements IQcPhysicalItemService { lqw.eq(bo.getCoilId() != null, QcPhysicalItem::getCoilId, bo.getCoilId()); lqw.eq(StringUtils.isNotBlank(bo.getCoilNo()), QcPhysicalItem::getCoilNo, bo.getCoilNo()); lqw.eq(bo.getYieldStrength() != null, QcPhysicalItem::getYieldStrength, bo.getYieldStrength()); + lqw.eq(bo.getPlasticExtensionStrength() != null, QcPhysicalItem::getPlasticExtensionStrength, bo.getPlasticExtensionStrength()); lqw.eq(bo.getTensileStrength() != null, QcPhysicalItem::getTensileStrength, bo.getTensileStrength()); lqw.eq(bo.getElongation() != null, QcPhysicalItem::getElongation, bo.getElongation()); lqw.eq(bo.getHardness() != null, QcPhysicalItem::getHardness, bo.getHardness()); lqw.eq(StringUtils.isNotBlank(bo.getBendingTest()), QcPhysicalItem::getBendingTest, bo.getBendingTest()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceQuality()), QcPhysicalItem::getSurfaceQuality, bo.getSurfaceQuality()); lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStructure()), QcPhysicalItem::getSurfaceStructure, bo.getSurfaceStructure()); + lqw.eq(StringUtils.isNotBlank(bo.getCoatingSurfaceStructure()), QcPhysicalItem::getCoatingSurfaceStructure, bo.getCoatingSurfaceStructure()); + lqw.eq(bo.getCoatingMass() != null, QcPhysicalItem::getCoatingMass, bo.getCoatingMass()); lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcPhysicalItem::getEdgeStatus, bo.getEdgeStatus()); // 根据创建时间倒叙 lqw.orderByDesc(QcPhysicalItem::getCreateTime); diff --git a/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml index efed952b..283985aa 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcChemicalItemMapper.xml @@ -16,6 +16,14 @@ + + + + + + + + diff --git a/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml index 5f6b932e..6122459b 100644 --- a/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/QcPhysicalItemMapper.xml @@ -10,12 +10,15 @@ + + +