canrd-outside / order-erp · Commits

Commit a7d0e78cd55fce5057edc35e630502f22280d4c9

Authored by qdlgxiemaosheng
1 parent 59b8a1e2
build: skipped

fixbug

Inline Side-by-side
Showing 3 changed files with 18 additions and 0 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
  View file @a7d0e78
@@ -83,12 +83,15 @@ public class OrderFieldUtils { @@ -83,12 +83,15 @@ public class OrderFieldUtils {
83 return OrderProfitAnalysisFieldVO.builder() 83 return OrderProfitAnalysisFieldVO.builder()
84 .customerPrice(locked) 84 .customerPrice(locked)
85 .customerTotalPrice(locked) 85 .customerTotalPrice(locked)
  86 + .customerCurrency(locked)
86 .exchangeRate(locked) 87 .exchangeRate(locked)
87 .orderStatus(locked) 88 .orderStatus(locked)
88 .packetPrice(locked) 89 .packetPrice(locked)
89 .packetTotalPrice(locked) 90 .packetTotalPrice(locked)
  91 + .packetCurrency(locked)
90 .productionDepartmentPrice(locked) 92 .productionDepartmentPrice(locked)
91 .productionDepartmentTotalPrice(locked) 93 .productionDepartmentTotalPrice(locked)
  94 + .productionDepartmentCurrency(locked)
92 .profitRate(locked) 95 .profitRate(locked)
93 .build(); 96 .build();
94 } 97 }
src/main/java/com/order/erp/domain/vo/order/OrderProfitAnalysisFieldVO.java
  View file @a7d0e78
@@ -31,6 +31,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable { @@ -31,6 +31,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable {
31 */ 31 */
32 private String customerTotalPrice; 32 private String customerTotalPrice;
33 /** 33 /**
  34 + * 客户价格货币
  35 + */
  36 + private String customerCurrency;
  37 + /**
34 * 生成科单价￥ 38 * 生成科单价￥
35 */ 39 */
36 private String productionDepartmentPrice; 40 private String productionDepartmentPrice;
@@ -39,6 +43,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable { @@ -39,6 +43,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable {
39 */ 43 */
40 private String productionDepartmentTotalPrice; 44 private String productionDepartmentTotalPrice;
41 /** 45 /**
  46 + * 生成科货币
  47 + */
  48 + private String productionDepartmentCurrency;
  49 + /**
42 * 包装费用￥ 50 * 包装费用￥
43 */ 51 */
44 private String packetPrice; 52 private String packetPrice;
@@ -47,6 +55,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable { @@ -47,6 +55,10 @@ public class OrderProfitAnalysisFieldVO implements Serializable {
47 */ 55 */
48 private String packetTotalPrice; 56 private String packetTotalPrice;
49 /** 57 /**
  58 + * 包装费货币
  59 + */
  60 + private String packetCurrency;
  61 + /**
50 * 汇率 62 * 汇率
51 */ 63 */
52 private String exchangeRate; 64 private String exchangeRate;
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @a7d0e78
@@ -349,10 +349,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -349,10 +349,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
349 .orderId(profitAnalysisVO.getOrderId()) 349 .orderId(profitAnalysisVO.getOrderId())
350 .customerPrice(Objects.nonNull(profitAnalysisVO.getCustomerPrice()) ? profitAnalysisVO.getCustomerPrice().toString() : null) 350 .customerPrice(Objects.nonNull(profitAnalysisVO.getCustomerPrice()) ? profitAnalysisVO.getCustomerPrice().toString() : null)
351 .customerTotalPrice(Objects.nonNull(profitAnalysisVO.getCustomerTotalPrice()) ? profitAnalysisVO.getCustomerTotalPrice().toString() : null) 351 .customerTotalPrice(Objects.nonNull(profitAnalysisVO.getCustomerTotalPrice()) ? profitAnalysisVO.getCustomerTotalPrice().toString() : null)
  352 + .customerCurrency(profitAnalysisVO.getCustomerCurrency())
352 .packetPrice(Objects.nonNull(profitAnalysisVO.getPacketPrice()) ? profitAnalysisVO.getPacketPrice().toString() : null) 353 .packetPrice(Objects.nonNull(profitAnalysisVO.getPacketPrice()) ? profitAnalysisVO.getPacketPrice().toString() : null)
353 .packetTotalPrice(Objects.nonNull(profitAnalysisVO.getPacketTotalPrice()) ? profitAnalysisVO.getPacketTotalPrice().toString() : null) 354 .packetTotalPrice(Objects.nonNull(profitAnalysisVO.getPacketTotalPrice()) ? profitAnalysisVO.getPacketTotalPrice().toString() : null)
  355 + .packetCurrency(profitAnalysisVO.getPacketCurrency())
354 .productionDepartmentPrice(Objects.nonNull(profitAnalysisVO.getProductionDepartmentPrice()) ? profitAnalysisVO.getProductionDepartmentPrice().toString() : null) 356 .productionDepartmentPrice(Objects.nonNull(profitAnalysisVO.getProductionDepartmentPrice()) ? profitAnalysisVO.getProductionDepartmentPrice().toString() : null)
355 .productionDepartmentTotalPrice(Objects.nonNull(profitAnalysisVO.getProductionDepartmentTotalPrice()) ? profitAnalysisVO.getProductionDepartmentTotalPrice().toString() : null) 357 .productionDepartmentTotalPrice(Objects.nonNull(profitAnalysisVO.getProductionDepartmentTotalPrice()) ? profitAnalysisVO.getProductionDepartmentTotalPrice().toString() : null)
  358 + .productionDepartmentCurrency(profitAnalysisVO.getProductionDepartmentCurrency())
356 .exchangeRate(Objects.nonNull(profitAnalysisVO.getExchangeRate()) ? profitAnalysisVO.getExchangeRate().toString() : null) 359 .exchangeRate(Objects.nonNull(profitAnalysisVO.getExchangeRate()) ? profitAnalysisVO.getExchangeRate().toString() : null)
357 .profitRate(Objects.nonNull(profitRate) ? profitRate.toString() : null).build(); 360 .profitRate(Objects.nonNull(profitRate) ? profitRate.toString() : null).build();
358 } 361 }