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 c82830e5..2298952b 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 @@ -169,14 +169,16 @@ public class QuoteDetailServiceImpl extends ServiceImpl list = quoteDetailBomService.queryQuoteDetailBom(bom); - for (QuoteDetailBom quoteDetailBom : list) { - unitQuotePrice = unitQuotePrice.add(quoteDetailBom.getQuotePrice()); - actualQuotePrice = actualQuotePrice.add(quoteDetailBom.getActualQuotePrice()); + if (Objects.nonNull(one)){ + QuoteDetailBom bom = new QuoteDetailBom(); + 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()); + actualQuotePrice = actualQuotePrice.add(quoteDetailBom.getActualQuotePrice()); + } } // 传入map map.put("toolCost", toolCost);