From 059afe3fed57443e94141b2e5ce0b87a044ffa4a Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Wed, 18 Sep 2024 15:18:44 +0800 Subject: [PATCH] 20240918 --- .../service/impl/QuoteDetailServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 427d2f96..c82830e5 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 @@ -221,15 +221,16 @@ public class QuoteDetailServiceImpl extends ServiceImpl list = quoteDetailBomService.queryQuoteDetailBom(bom); - for (QuoteDetailBom quoteDetailBom : list) { - unitQuotePrice = unitQuotePrice.add(quoteDetailBom.getQuotePrice()); - bomUnYield = bomUnYield.add(quoteDetailBom.getActualQuotePrice()); + if (Objects.nonNull(one)){ + bom.setQuoteDetailId(quoteDetail.getId()); + bom.setAllTree(true); + bom.setTreeId(one.getId()); + List list = quoteDetailBomService.queryQuoteDetailBom(bom); + for (QuoteDetailBom quoteDetailBom : list) { + unitQuotePrice = unitQuotePrice.add(quoteDetailBom.getQuotePrice()); + bomUnYield = bomUnYield.add(quoteDetailBom.getActualQuotePrice()); + } } - // 4、计算 BOM Yield BigDecimal bomYield = BigDecimal.ZERO; if (bomUnYield.compareTo(BigDecimal.ZERO) > 0 && BigDecimal.ZERO.compareTo(detail.getYield()) > 0){