|
|
@ -58,7 +58,7 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote |
|
|
quoteDetail.setProcessTime(BigDecimal.ZERO); |
|
|
quoteDetail.setProcessTime(BigDecimal.ZERO); |
|
|
|
|
|
|
|
|
BigDecimal value = baseMapper.getPartYield(quoteDetail); |
|
|
BigDecimal value = baseMapper.getPartYield(quoteDetail); |
|
|
quoteDetail.setYield(value);// todo 根据Site + Part No来获取 |
|
|
|
|
|
|
|
|
quoteDetail.setYield(value); |
|
|
|
|
|
|
|
|
quoteDetail.setBomUnYield(BigDecimal.ZERO); |
|
|
quoteDetail.setBomUnYield(BigDecimal.ZERO); |
|
|
quoteDetail.setAdjustBomUnYield(BigDecimal.ZERO); |
|
|
quoteDetail.setAdjustBomUnYield(BigDecimal.ZERO); |
|
|
@ -233,14 +233,11 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote |
|
|
bomUnYield = bomUnYield.add(bom.getQtyPerAssembly()); |
|
|
bomUnYield = bomUnYield.add(bom.getQtyPerAssembly()); |
|
|
} |
|
|
} |
|
|
// BomUnYield |
|
|
// BomUnYield |
|
|
// List<QuoteDetailBomTree> treeList = quoteDetailBomTreeService.lambdaQuery().eq(QuoteDetailBomTree::getParentId, tree.getId()).list(); |
|
|
|
|
|
|
|
|
|
|
|
// tree.setBomUnYield(bomUnYield); |
|
|
|
|
|
// tree.setYield(yieldRate); |
|
|
|
|
|
BigDecimal bomYield = null; |
|
|
BigDecimal bomYield = null; |
|
|
if (bomUnYield.compareTo(BigDecimal.ZERO) != 0 && Objects.nonNull(yieldRate) && yieldRate.compareTo(BigDecimal.ZERO) != 0) { |
|
|
if (bomUnYield.compareTo(BigDecimal.ZERO) != 0 && Objects.nonNull(yieldRate) && yieldRate.compareTo(BigDecimal.ZERO) != 0) { |
|
|
bomYield = bomUnYield.divide(yieldRate, 6, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); |
|
|
bomYield = bomUnYield.divide(yieldRate, 6, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); |
|
|
} |
|
|
} |
|
|
|
|
|
// ProcessTime |
|
|
BigDecimal processTime = new BigDecimal(0); |
|
|
BigDecimal processTime = new BigDecimal(0); |
|
|
List<QuoteDetailRouting> routingList = quoteDetailRoutingService.lambdaQuery().eq(QuoteDetailRouting::getTreeId, tree.getId()).list(); |
|
|
List<QuoteDetailRouting> routingList = quoteDetailRoutingService.lambdaQuery().eq(QuoteDetailRouting::getTreeId, tree.getId()).list(); |
|
|
for (QuoteDetailRouting quoteDetailRouting : routingList) { |
|
|
for (QuoteDetailRouting quoteDetailRouting : routingList) { |
|
|
|