From 288fc7163e68d76da0343bf4ea3ed29b973570e3 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 28 Nov 2025 11:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=89=A9=E6=96=99=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=90=8E=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=B8=BB=E6=95=B0=E6=8D=AE=E7=9A=84FamilyID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/mapper/PartInformationMapper.java  |  2 ++
 .../part/service/impl/BomManagementServiceImpl.java |  5 +++++
 .../sys/modules/part/vo/PartInformationVo.java      |  5 +++++
 .../resources/mapper/part/BomManagementMapper.xml   |  1 +
 .../resources/mapper/part/PartInformationMapper.xml | 13 +++++++++++++
 5 files changed, 26 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/xujie/sys/modules/part/mapper/PartInformationMapper.java
index 703d84ef..52332bd2 100644
--- a/src/main/java/com/xujie/sys/modules/part/mapper/PartInformationMapper.java
+++ b/src/main/java/com/xujie/sys/modules/part/mapper/PartInformationMapper.java
@@ -196,4 +196,6 @@ public interface PartInformationMapper extends BaseMapper<PartInformationEntity>
     PartInformationVo getCopyRowData(PartInformationVo part);
 
     void updateFamilyId(BomComponentEntity component);
+
+    void updatePrintUnit(BomComponentEntity component);
 }
diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
index 9543636b..8cffc32b 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
@@ -439,6 +439,11 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             partInformationMapper.updateFamilyId(data);
         }
 
+        // ✅ 如果包含 printUnit，同时更新物料主数据的umid2（物料单位）
+        if (data.getPrintUnit() != null && !data.getPrintUnit().isEmpty()) {
+            partInformationMapper.updatePrintUnit(data);
+        }
+
         // 查询bom子明细列表
         BomDetailEntity bomDetail = new BomDetailEntity();
         BeanUtils.copyProperties(data,bomDetail);
diff --git a/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java b/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java
index e276ca5f..a22e6a32 100644
--- a/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java
+++ b/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java
@@ -132,4 +132,9 @@ public class PartInformationVo extends PartInformationEntity {
     private String mainPart;
     private String bomFlag;
     private String routingFlag;
+    
+    /**
+     * 批量查询物料编码列表
+     */
+    private List<String> partNos;
 }
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 7e2b8f40..82e0042b 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -426,6 +426,7 @@
             note_text = #{noteText},
             line_sequence = #{lineSequence},
             consumption_item = #{consumptionItem},
+            print_unit = #{printUnit},
             update_date = getDate(),
             update_by = #{updateBy},
             consumption_loss = #{consumptionLoss},
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index 17c8fd9f..5beb3591 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -65,6 +65,12 @@
             <if test="query.endDate != null">
                 AND #{query.endDate} >= a.creation_date
             </if>
+            <if test="query.partNos != null and query.partNos.size() > 0">
+                AND a.part_no IN
+                <foreach collection="query.partNos" item="partNo" open="(" separator="," close=")">
+                    #{partNo}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -1190,4 +1196,11 @@
         FamilyID = #{familyID}
         where site = #{site} and part_no = #{componentPart}
     </update>
+
+    <!-- 更新物料单位 -->
+    <update id="updatePrintUnit" parameterType="com.xujie.sys.modules.part.entity.BomComponentEntity">
+        update part set
+        umid2 = #{printUnit}
+        where site = #{site} and part_no = #{componentPart}
+    </update>
 </mapper>