wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

20241112

java8
qiezi 1 year ago
parent
253351bf40
commit
64cfac83b7
2 changed files with 24 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
  2. 4
      src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml

38
src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailBomServiceImpl.java
View File

@ -31,18 +31,18 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
@Override @Override
public List<QuoteDetailBom> queryQuoteDetailBom(QuoteDetailBom quoteDetailBom) { public List<QuoteDetailBom> queryQuoteDetailBom(QuoteDetailBom quoteDetailBom) {
QuoteDetail detail = quoteDetailService.lambdaQuery().eq(QuoteDetail::getId, quoteDetailBom.getQuoteDetailId()).one(); QuoteDetail detail = quoteDetailService.lambdaQuery().eq(QuoteDetail::getId, quoteDetailBom.getQuoteDetailId()).one();
if (Objects.nonNull(quoteDetailBom.getAllTree()) && quoteDetailBom.getAllTree()){
if (Objects.nonNull(quoteDetailBom.getAllTree()) && quoteDetailBom.getAllTree()) {
return Objects.requireNonNull(queryQuoteDetailBomAll(quoteDetailBom)).stream().map(item -> { return Objects.requireNonNull(queryQuoteDetailBomAll(quoteDetailBom)).stream().map(item -> {
item.setQuoteUnitPrice(calculateQuotePrice(item,detail));// 单位标准成本
item.setActualQuotePrice(calculateActualQuotePrice(item,detail));// 单位实际成本
item.setAllQuotePrice(calculateBOMQuotePrice(item,detail));// 单位实际成本
item.setQuoteUnitPrice(calculateQuotePrice(item, detail));// 单位标准成本
item.setActualQuotePrice(calculateActualQuotePrice(item, detail));// 单位实际成本
item.setAllQuotePrice(calculateBOMQuotePrice(item, detail));// 单位实际成本
return item; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
return baseMapper.queryQuoteDetailBom(quoteDetailBom).stream().map(item -> { return baseMapper.queryQuoteDetailBom(quoteDetailBom).stream().map(item -> {
item.setQuoteUnitPrice(calculateQuotePrice(item,detail));
item.setActualQuotePrice(calculateActualQuotePrice(item,detail));
item.setAllQuotePrice(calculateBOMQuotePrice(item,detail));
item.setQuoteUnitPrice(calculateQuotePrice(item, detail));
item.setActualQuotePrice(calculateActualQuotePrice(item, detail));
item.setAllQuotePrice(calculateBOMQuotePrice(item, detail));
return item; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
@ -71,11 +71,13 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
BigDecimal qty = detail.getQty(); BigDecimal qty = detail.getQty();
// 6 计算所需数量 // 6 计算所需数量
// 调机单位用量 // 调机单位用量
if (qty.compareTo(BigDecimal.ZERO) == 0){
if (qty.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
BigDecimal componentUnitScrap = componentScrap.divide(qty,4, RoundingMode.HALF_UP);
BigDecimal needQty = qtyPerAssembly.divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100),4, RoundingMode.HALF_UP)),4, RoundingMode.HALF_UP)
BigDecimal componentUnitScrap = componentScrap.divide(qty, 4, RoundingMode.HALF_UP);
BigDecimal needQty =
qtyPerAssembly
// .divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)), 4, RoundingMode.HALF_UP)
.add(componentUnitScrap); .add(componentUnitScrap);
return needQty.multiply(unitPrice).setScale(4, RoundingMode.HALF_UP); return needQty.multiply(unitPrice).setScale(4, RoundingMode.HALF_UP);
@ -95,11 +97,13 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
BigDecimal qty = detail.getQty(); BigDecimal qty = detail.getQty();
// 6 计算所需数量 // 6 计算所需数量
// 调机单位用量 // 调机单位用量
if (qty.compareTo(BigDecimal.ZERO) == 0){
if (qty.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
BigDecimal componentUnitScrap = componentScrap.divide(qty,4, RoundingMode.HALF_UP);
BigDecimal needQty = qtyPerAssembly.divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100),4, RoundingMode.HALF_UP)),4, RoundingMode.HALF_UP)
BigDecimal componentUnitScrap = componentScrap.divide(qty, 4, RoundingMode.HALF_UP);
BigDecimal needQty =
qtyPerAssembly
// .divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)), 4, RoundingMode.HALF_UP)
.add(componentUnitScrap); .add(componentUnitScrap);
return needQty.multiply(actualPrice).setScale(4, RoundingMode.HALF_UP); return needQty.multiply(actualPrice).setScale(4, RoundingMode.HALF_UP);
@ -119,11 +123,13 @@ public class QuoteDetailBomServiceImpl extends ServiceImpl<QuoteDetailBomMapper,
BigDecimal qty = detail.getQty(); BigDecimal qty = detail.getQty();
// 6 计算所需数量 // 6 计算所需数量
// 调机单位用量 // 调机单位用量
if (qty.compareTo(BigDecimal.ZERO) == 0){
if (qty.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
BigDecimal componentUnitScrap = componentScrap.divide(qty,4, RoundingMode.HALF_UP);
BigDecimal needQty = qtyPerAssembly.divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100),4, RoundingMode.HALF_UP)),4, RoundingMode.HALF_UP)
BigDecimal componentUnitScrap = componentScrap.divide(qty, 4, RoundingMode.HALF_UP);
BigDecimal needQty =
qtyPerAssembly
// .divide(BigDecimal.ONE.subtract(shrinkageFactor.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP)), 4, RoundingMode.HALF_UP)
.add(componentUnitScrap); .add(componentUnitScrap);
return needQty.multiply(quotePrice).setScale(4, RoundingMode.HALF_UP); return needQty.multiply(quotePrice).setScale(4, RoundingMode.HALF_UP);
} }

4
src/main/resources/mapper/quote/QuoteDetailBomTreeMapper.xml
View File

@ -28,7 +28,6 @@
<select id="queryPartBom" resultType="com.xujie.sys.modules.quote.entity.QuoteDetailBomTree"> <select id="queryPartBom" resultType="com.xujie.sys.modules.quote.entity.QuoteDetailBomTree">
select top 1 bd.site, select top 1 bd.site,
#{buNo} as bu_no, #{buNo} as bu_no,
bd.part_no, bd.part_no,
bd.alternative_no, bd.alternative_no,
bd.bom_type, bd.bom_type,
@ -127,7 +126,6 @@
left join part p on bom.part_no = p.part_no and bom.site = p.site left join part p on bom.part_no = p.part_no and bom.site = p.site
where bom.site = #{site} where bom.site = #{site}
and bom.part_no = #{partNo} and bom.part_no = #{partNo}
and bom.status != 'Tentative' and bom.status != 'Tentative'
<if test="bomType != null and bomType != ''"> <if test="bomType != null and bomType != ''">
and bom.bom_type = #{bomType} and bom.bom_type = #{bomType}
@ -140,7 +138,6 @@
select top 1 select top 1
rd.site, rd.site,
#{buNo} as bu_no, #{buNo} as bu_no,
rd.routing_revision, rd.routing_revision,
rd.routing_type, rd.routing_type,
rd.part_no, rd.part_no,
@ -156,7 +153,6 @@
rd.routing_type = rh.routing_type and rd.routing_type = rh.routing_type and
rd.routing_revision = rh.routing_revision rd.routing_revision = rh.routing_revision
where rd.site = #{site} where rd.site = #{site}
and rd.part_no = #{partNo} and rd.part_no = #{partNo}
<if test="engChgLevel == null"> <if test="engChgLevel == null">
and rh.phase_out_date is null and rh.phase_out_date is null

Write Preview
Loading…
Cancel
Save