From ab3a4c17255a09e9725212d704fc3c3d4b5e0e4d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 25 Dec 2025 11:26:27 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-25=20=E5=BA=93=E5=AD=98=E4=BB=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0commGroup3=E3=80=81supplyCode=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/entity/PartInformationEntity.java        | 10 ++++++++++
 .../service/impl/PartInformationServiceImpl.java  |  6 ++++++
 .../spring/modules/part/vo/PartInformationVo.java |  4 ++++
 .../mapper/part/PartInformationMapper.xml         | 15 +++++++++++++++
 .../mapper/part/ProductGroupInformationMapper.xml |  3 ++-
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
index 72e2980c..f058be7b 100644
--- a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
+++ b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java
@@ -108,6 +108,11 @@ public class PartInformationEntity extends QueryPage implements Serializable {
      **/
     @TableField("product_group_id4")
     private String productGroupId4;
+    /**
+     * 商品组3（Comm Group 3）
+     **/
+    @TableField("comm_group3")
+    private String commGroup3;
     /**
      * erp物料编码
      **/
@@ -187,6 +192,11 @@ public class PartInformationEntity extends QueryPage implements Serializable {
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private BigDecimal intrastatConvFactor;
+    /**
+     * 默认物料需求供应（Default Mtr Req Supply）
+     **/
+    @TableField("supply_code")
+    private String supplyCode;
     /**
      * 物料状态编码
      **/
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 7cca702c..8fa10c0a 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -306,6 +306,8 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partIfsInventory.setZeroCostFlag(data.getZeroCostFlag() == null ? "" : data.getZeroCostFlag()); // 零成本
         partIfsInventory.setPartCostGroupId(data.getPartCostGroupId() == null ? "" : data.getPartCostGroupId()); // 零件成本组
         partIfsInventory.setEngAttribute(data.getCodeNo() == null ? "" : data.getCodeNo()); // 模板编码
+        partIfsInventory.setCommGroup3(data.getCommGroup3() == null ? "" : data.getCommGroup3()); // 商品组3
+        partIfsInventory.setSupplyCode(data.getSupplyCode() == null ? "" : data.getSupplyCode()); // 默认物料需求供应
         return partIfsInventory;
     }
 
@@ -1961,6 +1963,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         if (masterPartInformation == null) {
             MasterPartInformationEntity masterPart = masterPartInformationMapper.selectOne(new QueryWrapper<MasterPartInformationEntity>().eq("part_no", fromPart.getPartNo()));
             masterPart.setPartNo(inData.getPartNo());
+            masterPart.setPartDesc(inData.getPartDesc());
             masterPartInformationMapper.insert(masterPart);
         }
         // master part 模板和属性
@@ -2199,6 +2202,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         toPart.setDurabilityDay(fromPart.getDurabilityDay()); // 天数
         toPart.setRegionOfOrigin(fromPart.getRegionOfOrigin()); // 区域代码
         toPart.setIntrastatConvFactor(fromPart.getIntrastatConvFactor()); // 州内转换因子
+        toPart.setSupplyCode(fromPart.getSupplyCode()); // 默认物料需求供应
         toPart.setCustomsStatNo(fromPart.getCustomsStatNo()); // 海关统计序号
         toPart.setRemark(fromPart.getRemark()); // 备注
         toPart.setInventoryValuationMethod(fromPart.getInventoryValuationMethod()); // 库存估价方法
@@ -3575,6 +3579,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         // 同步物料件
         MasterPartInformationEntity masterPartInformation = new MasterPartInformationEntity();
         masterPartInformation.setPartNo(data.getPartNo());
+        masterPartInformation.setPartDesc(data.getPartDesc());
         masterPartInformation.setPlmPartNo(data.getCopyPartNo());
         masterPartInformation.setUpdateBy(data.getUpdateBy());
         toBecomeOfficialMasterPart(masterPartInformation, data.getSite());
@@ -3838,6 +3843,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 task.setIssueType("Reserve And Backflush");
                 task.setMrpControlFlagDb("Y");
                 task.setOverReporting("Allowed");
+                task.setTemporaryPartFlag("Y");
 
                 // 调用新增方法
                 partInformationSave2(task);
diff --git a/src/main/java/com/spring/modules/part/vo/PartInformationVo.java b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
index 2c7410e1..698d4b53 100644
--- a/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
+++ b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java
@@ -70,6 +70,10 @@ public class PartInformationVo extends PartInformationEntity {
      * 商品组4名称
      **/
     private String productGroupName4;
+    /**
+     * 商品组3（Comm Group 3）名称
+     **/
+    private String commGroup3Desc;
     /**
      * 模板名称
      **/
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index e49571c1..a1e726cd 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -32,6 +32,8 @@
             dbo.get_product_group_name(site, product_group_id3, '3') as productGroupName3,
             product_group_id4,
             dbo.get_product_group_name(site, product_group_id4, '4') as productGroupName4,
+            comm_group3,
+            dbo.get_product_group_name(site, comm_group3, '5') as commGroup3Desc,
             erp_part_no,
             code_no,
             dbo.get_code_desc(site, code_no, 'IP') as codeDesc,
@@ -59,6 +61,7 @@
             dbo.get_customs_stat_name(site, customs_stat_no) as customsStatDesc,
             durability_day,
             intrastat_conv_factor,
+            supply_code,
             part_status,
             dbo.get_part_status_name(site, part_status) as partStatusDesc,
             configuration_id,
@@ -740,6 +743,8 @@
         dbo.get_product_group_name(site, product_group_id3, '3') as productGroupName3,
         product_group_id4,
         dbo.get_product_group_name(site, product_group_id4, '4') as productGroupName4,
+        comm_group3,
+        dbo.get_product_group_name(site, comm_group3, '5') as commGroup3Desc,
         erp_part_no,
         code_no,
         dbo.get_code_desc(site, code_no, 'IP') as codeDesc,
@@ -1176,6 +1181,8 @@
         dbo.get_product_group_name(site, product_group_id3, '3') as productGroupName3,
         product_group_id4,
         dbo.get_product_group_name(site, product_group_id4, '4') as productGroupName4,
+        comm_group3,
+        dbo.get_product_group_name(site, comm_group3, '5') as commGroup3Desc,
         erp_part_no,
         code_no,
         dbo.get_code_desc(site, code_no, 'IP') as codeDesc,
@@ -1276,6 +1283,8 @@
             dbo.get_product_group_name(a.site, a.product_group_id3, '3') as productGroupName3,
             a.product_group_id4,
             dbo.get_product_group_name(a.site, a.product_group_id4, '4') as productGroupName4,
+            a.comm_group3,
+            dbo.get_product_group_name(a.site, a.comm_group3, '5') as commGroup3Desc,
             a.erp_part_no,
             a.code_no,
             dbo.get_code_desc(a.site, a.code_no, 'IP') as codeDesc,
@@ -1303,6 +1312,7 @@
             dbo.get_customs_stat_name(a.site, a.customs_stat_no) as customsStatDesc,
             a.durability_day,
             a.intrastat_conv_factor,
+            a.supply_code,
             a.part_status,
             dbo.get_part_status_name(a.site, a.part_status) as partStatusDesc,
             a.configuration_id,
@@ -2428,6 +2438,8 @@
         dbo.get_product_group_name(site, product_group_id3, '3') as productGroupName3,
         product_group_id4,
         dbo.get_product_group_name(site, product_group_id4, '4') as productGroupName4,
+        comm_group3,
+        dbo.get_product_group_name(site, comm_group3, '5') as commGroup3Desc,
         erp_part_no,
         code_no,
         dbo.get_code_desc(site, code_no, 'IP') as codeDesc,
@@ -2539,6 +2551,8 @@
             dbo.get_product_group_name(site, product_group_id3, '3') as productGroupName3,
             product_group_id4,
             dbo.get_product_group_name(site, product_group_id4, '4') as productGroupName4,
+            comm_group3,
+            dbo.get_product_group_name(site, comm_group3, '5') as commGroup3Desc,
             erp_part_no,
             code_no,
             dbo.get_code_desc(site, code_no, 'IP') as codeDesc,
@@ -2566,6 +2580,7 @@
             dbo.get_customs_stat_name(site, customs_stat_no) as customsStatDesc,
             durability_day,
             intrastat_conv_factor,
+            supply_code,
             part_status,
             dbo.get_part_status_name(site, part_status) as partStatusDesc,
             configuration_id,
diff --git a/src/main/resources/mapper/part/ProductGroupInformationMapper.xml b/src/main/resources/mapper/part/ProductGroupInformationMapper.xml
index a556f6db..73e0410c 100644
--- a/src/main/resources/mapper/part/ProductGroupInformationMapper.xml
+++ b/src/main/resources/mapper/part/ProductGroupInformationMapper.xml
@@ -13,7 +13,8 @@
         (CASE WHEN type = '1' THEN '商品组1'
         WHEN type = '2' THEN '商品组2'
         WHEN type = '3' THEN  '会计组'
-        when type = '4' THEN  '计划人'
+        WHEN type = '4' THEN  '计划人'
+        WHEN type = '5' THEN  '商品组3'
         ELSE ''
         END) as typeDesc,
         create_by,