Merge branch 'technology/rakor-w3' into technology-init-lhj1119
This commit is contained in:
commit
4a495d8fa9
|
|
@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
|
|||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.time.Duration;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
|
@ -300,7 +301,8 @@ public class BomCostCalculateService {
|
|||
wastage = Optional.ofNullable(steelsCostConfigEntity.getWastage()).orElse(BigDecimal.ZERO);
|
||||
}
|
||||
}
|
||||
return price.multiply(BigDecimal.ONE.add(wastage).multiply(unitWeight));
|
||||
return price.multiply(BigDecimal.ONE.add(wastage.divide(BigDecimal.valueOf(100), 4, RoundingMode.HALF_UP))
|
||||
.multiply(unitWeight));
|
||||
}
|
||||
|
||||
private String buildKey(EBomDTO dto) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue