fix:1.业务研发净利润表的利润率改为采用美元计算,保证与订单页面的利润率求值一致。

chenhang4442024
1 parent 5bf511c6
Showing 1 changed file with 5 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
@@ -978,11 +978,12 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         .subtract(BigDecimal.valueOf(businessProfitInfoVO.getProductionDepartmentTotalPrice()))
                         .subtract(BigDecimal.valueOf(businessProfitInfoVO.getPacketRmbTotalPrice())));
             }
-            if (Objects.nonNull(businessProfitInfoVO.getProfit())
-                    && Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())) {
+            if (Objects.nonNull(businessProfitInfoVO.getCustomerTotalPrice())
+                    && Objects.nonNull(businessProfitInfoVO.getPacketTotalPrice())) {
                 //毛利润率
-                businessProfitInfoVO.setProfitRate(businessProfitInfoVO.getProfit()
-                        .divide(BigDecimal.valueOf(businessProfitInfoVO.getCustomerRmbTotalPrice()), 4, RoundingMode.HALF_UP));
+                businessProfitInfoVO.setProfitRate((BigDecimal.valueOf(businessProfitInfoVO.getCustomerTotalPrice())
+                        .subtract(BigDecimal.valueOf(businessProfitInfoVO.getProductionDepartmentTotalPrice()).divide(exchangeRate,4, RoundingMode.HALF_UP))
+                        .subtract(BigDecimal.valueOf(businessProfitInfoVO.getPacketTotalPrice()))).divide(BigDecimal.valueOf(businessProfitInfoVO.getCustomerTotalPrice()), 4, RoundingMode.HALF_UP));
             }
             if (Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())
                     && Objects.nonNull(businessProfitInfoVO.getRmbTotalExpense())) {