rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'technology/rakor-w3' into technology-init-lhj1119

This commit is contained in:
曹鹏飞 2025-01-06 12:42:11 +08:00
parent cf293ab289 7f4f2b4ea5
commit 4a495d8fa9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/BomCostCalculateService.java
View File

@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.Duration; import java.time.Duration;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -300,7 +301,8 @@ public class BomCostCalculateService {
wastage = Optional.ofNullable(steelsCostConfigEntity.getWastage()).orElse(BigDecimal.ZERO); 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) { private String buildKey(EBomDTO dto) {