From ba38dff86b97bd0270423634bbecc8db3fd38445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Fri, 9 Jan 2026 15:55:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=8F=98=E6=9B=B4=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ChangeRequestDetailEntity.java       | 16 ++++++++++++++++
 .../change/entity/ChangeRequestEntity.java      | 12 ++++++++++++
 .../change/mapper/ChangeManagementMapper.java   |  2 ++
 .../impl/ChangeManagementServiceImpl.java       |  2 ++
 .../mapper/change/ChangeManagementMapper.xml    | 17 ++++++++++++++++-
 5 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java b/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
index 48bac871..3e92a312 100644
--- a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
+++ b/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
@@ -95,4 +95,20 @@ public class ChangeRequestDetailEntity extends QueryPage implements Serializable
 
     @TableField(exist = false)
     private String testPartNo;
+
+    // 制造成本是否变更
+    @TableField(exist = false)
+    private String manuFacturingFlag;
+    // 制造成本 变更类型
+    @TableField(exist = false)
+    private String manuFacturingType;
+    // 制造成本 变更备注
+    @TableField(exist = false)
+    private String manuFacturingCostRemark1;
+    //是否需要重新报价
+    @TableField(exist = false)
+    private String quotationFlag;
+    //是否需要重新报价 备注
+    @TableField(exist = false)
+    private String manuFacturingCostRemark2;
 }
diff --git a/src/main/java/com/spring/modules/change/entity/ChangeRequestEntity.java b/src/main/java/com/spring/modules/change/entity/ChangeRequestEntity.java
index c22ab5b3..4c50e528 100644
--- a/src/main/java/com/spring/modules/change/entity/ChangeRequestEntity.java
+++ b/src/main/java/com/spring/modules/change/entity/ChangeRequestEntity.java
@@ -164,4 +164,16 @@ public class ChangeRequestEntity extends QueryPage implements Serializable {
      * 是否可见
      */
     private String showInQueryFlag;
+
+    // 制造成本是否变更
+    private String manuFacturingFlag;
+    // 制造成本 变更类型
+    private String manuFacturingType;
+    // 制造成本 变更备注
+    private String manuFacturingCostRemark1;
+    //是否需要重新报价
+    private String quotationFlag;
+    //是否需要重新报价 备注
+    private String manuFacturingCostRemark2;
+
 }
diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
index 9061c756..0c223aeb 100644
--- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
+++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
@@ -220,4 +220,6 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     void updateChangeItemForReject(@Param("site") String site, @Param("changeNo") String docNo);
 
     void updateChangeCountersignatureItemForReject(@Param("site") String site, @Param("changeNo") String docNo);
+
+    void udpateChangeRequestManuFacturingCost(ChangeRequestVo data);
 }
diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index 70934dee..d91c5e2b 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -699,6 +699,8 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
 
         // 修改变更申请
         changeManagementMapper.update(data, new QueryWrapper<ChangeRequestEntity>().eq("site", data.getSite()).eq("change_no", data.getChangeNo()));
+        // 修改 制造成本相关数据
+        changeManagementMapper.udpateChangeRequestManuFacturingCost(data);
 
         // 添加delegateAccess人员
         // 先删除
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index cb708677..41b5620e 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -642,7 +642,12 @@
             a.update_date,
             a.update_by,
             b.plm_part_no as testPartNo,
-            b.ifs_part_no
+            b.ifs_part_no,
+            c.manu_facturing_flag,
+            c.manu_facturing_type,
+            c.manu_facturing_cost_remark1,
+            c.quotation_flag,
+            c.manu_facturing_cost_remark2
         FROM plm_change_request_detail as a
         left join plm_change_request as c on a.site = c.site and a.change_no = c.change_no
         left join part as b on a.site = b.site and a.part_no = b.ifs_part_no and b.show_in_query_flag ='Y'
@@ -1672,4 +1677,14 @@
             item_execution_date = null
         where site = #{site} and change_no = #{changeNo}
     </update>
+    <update id="udpateChangeRequestManuFacturingCost">
+        update plm_change_request
+        set
+            manu_facturing_flag = #{manuFacturingFlag},
+            manu_facturing_type = #{manuFacturingType},
+            manu_facturing_cost_remark1 = #{manuFacturingCostRemark1},
+            quotation_flag = #{quotationFlag},
+            manu_facturing_cost_remark2 = #{manuFacturingCostRemark2}
+        where site = #{site} and  change_no = #{changeNo}
+    </update>
 </mapper>