From 5dc6353742e48a90d8721f93ad993811bc5b96b2 Mon Sep 17 00:00:00 2001
From: Aoi_Tori <2547614904@qq.com>
Date: Tue, 8 Jul 2025 16:37:01 +0800
Subject: [PATCH] 2025/7/8

---
 .../modules/part/entity/RecipeHeaderEntity.java     |  2 ++
 .../resources/mapper/part/BomManagementMapper.xml   |  3 ++-
 .../mapper/part/RecipeManagementMapper.xml          | 13 ++++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/entity/RecipeHeaderEntity.java b/src/main/java/com/spring/modules/part/entity/RecipeHeaderEntity.java
index 3d59c73d..dbc6b2c6 100644
--- a/src/main/java/com/spring/modules/part/entity/RecipeHeaderEntity.java
+++ b/src/main/java/com/spring/modules/part/entity/RecipeHeaderEntity.java
@@ -97,4 +97,6 @@ public class RecipeHeaderEntity extends QueryPage implements Serializable {
      * 是否为正式物料
      */
     private String officialFlag;
+
+    private String productGroupId4;
 }
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 717a3798..bc94fa7d 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -409,7 +409,8 @@
             type_flag,
             net_weight,
             note_text,
-            official_flag
+            official_flag,
+            product_group_id4
         FROM plm_bom_header
         where site = #{site} and part_no = #{partNo} and bom_type = #{bomType} and eng_chg_level = #{engChgLevel}
     </select>
diff --git a/src/main/resources/mapper/part/RecipeManagementMapper.xml b/src/main/resources/mapper/part/RecipeManagementMapper.xml
index b860430e..0c490bad 100644
--- a/src/main/resources/mapper/part/RecipeManagementMapper.xml
+++ b/src/main/resources/mapper/part/RecipeManagementMapper.xml
@@ -24,7 +24,8 @@
         c.um_name as printUnitName,
         a.official_flag,
         b.ifs_part_no,
-        b.plm_part_no
+        b.plm_part_no,
+        a.product_group_id4
         FROM plm_recipe_header as a
         left join part as b on a.site = b.site and a.part_no = b.part_no
         left join um as c on b.um_id = c.um_id
@@ -183,9 +184,9 @@
     <!-- 新增Recipe主表内容 -->
     <insert id="saveRecipeHeader" parameterType="RecipeHeaderEntity">
         INSERT INTO plm_recipe_header
-        (site, part_no, eng_chg_level, bom_type, note_text, eff_phase_in_date, eff_phase_out_date, eng_revision, type_flag, net_weight, official_flag, create_date, create_by)
+        (site, part_no, eng_chg_level, bom_type, note_text, eff_phase_in_date, eff_phase_out_date, eng_revision, type_flag, net_weight, official_flag, create_date, create_by, product_group_id4)
         VALUES
-            (#{site}, #{partNo}, #{engChgLevel}, #{bomType}, #{noteText}, #{effPhaseInDate}, #{effPhaseOutDate}, #{engRevision}, #{typeFlag}, #{netWeight}, #{officialFlag}, getDate(), #{createBy})
+            (#{site}, #{partNo}, #{engChgLevel}, #{bomType}, #{noteText}, #{effPhaseInDate}, #{effPhaseOutDate}, #{engRevision}, #{typeFlag}, #{netWeight}, #{officialFlag}, getDate(), #{createBy}, #{productGroupId4})
     </insert>
 
     <!-- recipe明细新增 -->
@@ -409,7 +410,8 @@
             net_weight = #{netWeight},
             note_text = #{noteText},
             update_date = getDate(),
-            update_by = #{updateBy}
+            update_by = #{updateBy},
+            product_group_id4 = #{productGroupId4}
         where site = #{site} and part_no = #{partNo} and eng_chg_level = #{engChgLevel} and bom_type = #{bomType}
     </update>
 
@@ -453,7 +455,8 @@
             type_flag,
             net_weight,
             note_text,
-            official_flag
+            official_flag,
+            product_group_id4
         FROM plm_recipe_header
         where site = #{site} and part_no = #{partNo} and bom_type = #{bomType} and eng_chg_level = #{engChgLevel}
     </select>