From d38b8645dadceda99b1549da7148c6bf67355db9 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 3 Nov 2025 22:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6BOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/service/impl/BomManagementServiceImpl.java        | 2 +-
 src/main/resources/mapper/part/BomManagementMapper.xml     | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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 5e9eaa0d..f946fbac 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
@@ -861,7 +861,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
             component.setAlternativeNo(data.getAlternativeNo());
             component.setComponentPart(entity.getPartNo());
             component.setPrintUnit(entity.getPrintUnit());
-            component.setQtyPerAssembly(data.getQtyPerAssembly());
+            component.setQtyPerAssembly(entity.getQtyPerAssembly() != null ? entity.getQtyPerAssembly() : data.getQtyPerAssembly());
             component.setComponentScrap(data.getComponentScrap());
             component.setShrinkageFactor(data.getShrinkageFactor());
             component.setLineItemNo(++maxLineItemNo);
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 2f02127f..354c9867 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -593,9 +593,12 @@
     <!-- 新增BOM子明细表内容 -->
     <insert id="saveBomComponents">
         insert into plm_bom_component
-        (site, bu_no, part_no, eng_chg_level, bom_type, alternative_no, component_part, line_item_no, print_unit, qty_per_assembly, component_scrap, shrinkage_factor, issue_type, issue_to_loc, operation_id, note_text, create_date, create_by, line_sequence, consumption_item) VALUES
+        (site, bu_no, part_no, eng_chg_level, bom_type, alternative_no, component_part, line_item_no, print_unit,
+         qty_per_assembly, component_scrap, shrinkage_factor, issue_type, issue_to_loc, operation_id, note_text, create_date, create_by, line_sequence, consumption_item) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.site}, #{item.buNo}, #{item.partNo}, #{item.engChgLevel}, #{item.bomType}, #{item.alternativeNo}, #{item.componentPart}, #{item.lineItemNo}, #{item.printUnit}, #{item.qtyPerAssembly}, #{item.componentScrap}, #{item.shrinkageFactor}, #{item.issueType}, #{item.issueToLoc}, #{item.operationId}, #{item.noteText}, getDate(), #{item.createBy}, #{item.lineSequence}, #{item.consumptionItem})
+            (#{item.site}, #{item.buNo}, #{item.partNo}, #{item.engChgLevel}, #{item.bomType},
+             #{item.alternativeNo}, #{item.componentPart}, #{item.lineItemNo}, #{item.printUnit},
+             CAST(#{item.qtyPerAssembly} AS DECIMAL(30,16)), CAST(#{item.componentScrap} AS DECIMAL(20,6)), CAST(#{item.shrinkageFactor} AS DECIMAL(20,6)), #{item.issueType}, #{item.issueToLoc}, #{item.operationId}, #{item.noteText}, getDate(), #{item.createBy}, #{item.lineSequence}, #{item.consumptionItem})
         </foreach>
     </insert>