diff --git a/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java b/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java index 1bcef4c..1aeccd1 100644 --- a/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java +++ b/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java @@ -83,12 +83,15 @@ public class OrderFieldUtils { return OrderProfitAnalysisFieldVO.builder() .customerPrice(locked) .customerTotalPrice(locked) + .customerCurrency(locked) .exchangeRate(locked) .orderStatus(locked) .packetPrice(locked) .packetTotalPrice(locked) + .packetCurrency(locked) .productionDepartmentPrice(locked) .productionDepartmentTotalPrice(locked) + .productionDepartmentCurrency(locked) .profitRate(locked) .build(); } diff --git a/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java b/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java index 29e29af..25b2c96 100644 --- a/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java +++ b/src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java @@ -31,6 +31,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable { */ private String customerTotalPrice; /** + * 客户价格货币 + */ + private String customerCurrency; + /** * 生成科单价¥ */ private String productionDepartmentPrice; @@ -39,6 +43,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable { */ private String productionDepartmentTotalPrice; /** + * 生成科货币 + */ + private String productionDepartmentCurrency; + /** * 包装费用¥ */ private String packetPrice; @@ -47,6 +55,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable { */ private String packetTotalPrice; /** + * 包装费货币 + */ + private String packetCurrency; + /** * 汇率 */ private String exchangeRate; diff --git a/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java b/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java index 8088f21..46f2c88 100644 --- a/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java +++ b/src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java @@ -349,10 +349,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O .orderId(profitAnalysisVO.getOrderId()) .customerPrice(Objects.nonNull(profitAnalysisVO.getCustomerPrice()) ? profitAnalysisVO.getCustomerPrice().toString() : null) .customerTotalPrice(Objects.nonNull(profitAnalysisVO.getCustomerTotalPrice()) ? profitAnalysisVO.getCustomerTotalPrice().toString() : null) + .customerCurrency(profitAnalysisVO.getCustomerCurrency()) .packetPrice(Objects.nonNull(profitAnalysisVO.getPacketPrice()) ? profitAnalysisVO.getPacketPrice().toString() : null) .packetTotalPrice(Objects.nonNull(profitAnalysisVO.getPacketTotalPrice()) ? profitAnalysisVO.getPacketTotalPrice().toString() : null) + .packetCurrency(profitAnalysisVO.getPacketCurrency()) .productionDepartmentPrice(Objects.nonNull(profitAnalysisVO.getProductionDepartmentPrice()) ? profitAnalysisVO.getProductionDepartmentPrice().toString() : null) .productionDepartmentTotalPrice(Objects.nonNull(profitAnalysisVO.getProductionDepartmentTotalPrice()) ? profitAnalysisVO.getProductionDepartmentTotalPrice().toString() : null) + .productionDepartmentCurrency(profitAnalysisVO.getProductionDepartmentCurrency()) .exchangeRate(Objects.nonNull(profitAnalysisVO.getExchangeRate()) ? profitAnalysisVO.getExchangeRate().toString() : null) .profitRate(Objects.nonNull(profitRate) ? profitRate.toString() : null).build(); }