From 14dbd633b54fe6f5acf3d64dc55ce16c7f00ecf1 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 2 Jun 2026 09:13:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(qc):=20=E6=96=B0=E5=A2=9E=E5=8C=96?=
 =?UTF-8?q?=E5=AD=A6=E6=88=90=E5=88=86=E4=B8=8E=E7=89=A9=E7=90=86=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E6=A3=80=E9=AA=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在质量检验证书项（QcCertificateItem）中新增以下字段：
1. 化学成分：铝（Al）、钛（Ti）、铬（Cr）、镍（Ni）、铜（Cu）、氮（N）、铁（Fe）、硼（B）
2. 物理性能：规定塑性延伸强度（plasticExtensionStrength）
3. 镀层信息：镀层表面结构（coatingSurfaceStructure）、镀层重量（coatingMass）

调整涉及实体类、业务对象、值对象及映射文件，确保字段在查询条件、导出模板中生效。
---
 .../klp/mes/qc/domain/QcCertificateItem.java  | 44 +++++++++++++
 .../mes/qc/domain/bo/QcCertificateItemBo.java | 55 ++++++++++++++++
 .../mes/qc/domain/vo/QcCertificateItemVo.java | 66 +++++++++++++++++++
 .../impl/QcCertificateItemServiceImpl.java    | 11 ++++
 .../mapper/qc/QcCertificateItemMapper.xml     | 11 ++++
 5 files changed, 187 insertions(+)

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 fd1de914..73e105d4 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
@@ -81,10 +81,46 @@ public class QcCertificateItem extends BaseEntity {
      * Als
      */
     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;
     /**
      * 拉伸试验-屈服强度(MPa)
      */
     private BigDecimal yieldStrength;
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    private BigDecimal plasticExtensionStrength;
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -109,6 +145,14 @@ public class QcCertificateItem 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/QcCertificateItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcCertificateItemBo.java
index 40674592..333662da 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
@@ -93,11 +93,56 @@ public class QcCertificateItemBo 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;
+
     /**
      * 拉伸试验-屈服强度(MPa)
      */
     private BigDecimal yieldStrength;
 
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    private BigDecimal plasticExtensionStrength;
+
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -128,6 +173,16 @@ public class QcCertificateItemBo 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/QcCertificateItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcCertificateItemVo.java
index 8fa91582..df77b86a 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
@@ -109,12 +109,66 @@ public class QcCertificateItemVo {
     @ExcelProperty(value = "Als")
     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;
+
     /**
      * 拉伸试验-屈服强度(MPa)
      */
     @ExcelProperty(value = "拉伸试验-屈服强度(MPa)")
     private BigDecimal yieldStrength;
 
+    /**
+     * 规定塑性延伸强度(MPa)
+     */
+    @ExcelProperty(value = "规定塑性延伸强度(MPa)")
+    private BigDecimal plasticExtensionStrength;
+
     /**
      * 拉伸试验-抗拉强度(MPa)
      */
@@ -151,6 +205,18 @@ public class QcCertificateItemVo {
     @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/QcCertificateItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcCertificateItemServiceImpl.java
index 0c68347f..2ab259e0 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
@@ -75,13 +75,24 @@ public class QcCertificateItemServiceImpl implements IQcCertificateItemService {
         lqw.eq(bo.getP() != null, QcCertificateItem::getP, bo.getP());
         lqw.eq(bo.getS() != null, QcCertificateItem::getS, bo.getS());
         lqw.eq(bo.getAls() != null, QcCertificateItem::getAls, bo.getAls());
+        lqw.eq(bo.getAl() != null, QcCertificateItem::getAl, bo.getAl());
+        lqw.eq(bo.getTi() != null, QcCertificateItem::getTi, bo.getTi());
+        lqw.eq(bo.getCr() != null, QcCertificateItem::getCr, bo.getCr());
+        lqw.eq(bo.getNi() != null, QcCertificateItem::getNi, bo.getNi());
+        lqw.eq(bo.getCu() != null, QcCertificateItem::getCu, bo.getCu());
+        lqw.eq(bo.getN() != null, QcCertificateItem::getN, bo.getN());
+        lqw.eq(bo.getFe() != null, QcCertificateItem::getFe, bo.getFe());
+        lqw.eq(bo.getB() != null, QcCertificateItem::getB, bo.getB());
         lqw.eq(bo.getYieldStrength() != null, QcCertificateItem::getYieldStrength, bo.getYieldStrength());
+        lqw.eq(bo.getPlasticExtensionStrength() != null, QcCertificateItem::getPlasticExtensionStrength, bo.getPlasticExtensionStrength());
         lqw.eq(bo.getTensileStrength() != null, QcCertificateItem::getTensileStrength, bo.getTensileStrength());
         lqw.eq(bo.getElongation() != null, QcCertificateItem::getElongation, bo.getElongation());
         lqw.eq(bo.getHardness() != null, QcCertificateItem::getHardness, bo.getHardness());
         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.getCoatingSurfaceStructure()), QcCertificateItem::getCoatingSurfaceStructure, bo.getCoatingSurfaceStructure());
+        lqw.eq(bo.getCoatingMass() != null, QcCertificateItem::getCoatingMass, bo.getCoatingMass());
         lqw.eq(StringUtils.isNotBlank(bo.getEdgeStatus()), QcCertificateItem::getEdgeStatus, bo.getEdgeStatus());
         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 6974af5a..02f26ecd 100644
--- a/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/QcCertificateItemMapper.xml
@@ -20,13 +20,24 @@
         <result property="p" column="p"/>
         <result property="s" column="s"/>
         <result property="als" column="als"/>
+        <result property="al" column="al"/>
+        <result property="ti" column="ti"/>
+        <result property="cr" column="cr"/>
+        <result property="ni" column="ni"/>
+        <result property="cu" column="cu"/>
+        <result property="n" column="n"/>
+        <result property="fe" column="fe"/>
+        <result property="b" column="b"/>
         <result property="yieldStrength" column="yield_strength"/>
+        <result property="plasticExtensionStrength" column="plastic_extension_strength"/>
         <result property="tensileStrength" column="tensile_strength"/>
         <result property="elongation" column="elongation"/>
         <result property="hardness" column="hardness"/>
         <result property="bendingTest" column="bending_test"/>
         <result property="surfaceQuality" column="surface_quality"/>
         <result property="surfaceStructure" column="surface_structure"/>
+        <result property="coatingSurfaceStructure" column="coating_surface_structure"/>
+        <result property="coatingMass" column="coating_mass"/>
         <result property="edgeStatus" column="edge_status"/>
         <result property="remark" column="remark"/>
         <result property="delFlag" column="del_flag"/>