From 0eeb358d65a5459e587d04501aafbebae89f3db8 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 13 Nov 2024 11:34:38 +0800
Subject: [PATCH] 20241112

---
 .../xujie/sys/modules/quote/entity/QuoteDetailBomTree.java  | 2 ++
 .../modules/quote/service/impl/QuoteDetailServiceImpl.java  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailBomTree.java b/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailBomTree.java
index c67446a6..a708f0c8 100644
--- a/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailBomTree.java
+++ b/src/main/java/com/xujie/sys/modules/quote/entity/QuoteDetailBomTree.java
@@ -54,6 +54,8 @@ public class QuoteDetailBomTree {
 
     private BigDecimal bomActualYield;
 
+    private BigDecimal bomQtyPerAssembly;
+
     @TableField(exist = false)
     private List<QuoteDetailBomTree> list = new ArrayList<>();
 
diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
index 1991582a..1d8ed7da 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
@@ -338,6 +338,8 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
             // BomUnYield
             BigDecimal bomUnYield = BigDecimal.ZERO;
             BigDecimal bomActualUnYield = BigDecimal.ZERO;
+            // 单位用量
+            BigDecimal bomQtyPerAssembly = BigDecimal.ZERO;
             for (QuoteDetailBom bom : bomList) {
                 // 获取半成品 价格
                 if (Objects.nonNull(root) && root.getPartNo().equals(bom.getComponentPart())){
@@ -346,6 +348,8 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                     BigDecimal qtyPerAssembly = bom.getQtyPerAssembly();
                     bomUnYield = bomUnYield.add(qtyPerAssembly.multiply(bomYield));
                     bomActualUnYield = bomActualUnYield.add(qtyPerAssembly.multiply(bomActualYield));
+
+                    bomQtyPerAssembly = bomQtyPerAssembly.add(qtyPerAssembly);
                 }
                 bomUnYield = bomUnYield.add(bom.getQuoteUnitPrice());
                 bomActualUnYield = bomActualUnYield.add(bom.getActualQuotePrice());
@@ -372,6 +376,7 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
             tree.setBomYield(bomYield);
             tree.setBomActualYield(bomActualYield);
             tree.setBomActualUnYield(bomActualUnYield);
+            tree.setBomQtyPerAssembly(bomQtyPerAssembly);
             quoteDetailBomTreeService.lambdaUpdate()
                     .set(QuoteDetailBomTree::getYield,tree.getYield())
                     .set(QuoteDetailBomTree::getBomUnYield,tree.getBomUnYield())
@@ -379,6 +384,7 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                     .set(QuoteDetailBomTree::getBomActualYield,tree.getBomActualYield())
                     .set(QuoteDetailBomTree::getBomActualUnYield,tree.getBomActualUnYield())
                     .set(QuoteDetailBomTree::getProcessTime, tree.getProcessTime().compareTo(BigDecimal.ZERO) == 0 ? null : tree.getProcessTime())
+                    .set(QuoteDetailBomTree::getBomQtyPerAssembly, tree.getBomQtyPerAssembly().compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : tree.getBomQtyPerAssembly())
                     .eq(QuoteDetailBomTree::getId,tree.getId())
                     .update();
             root = tree;