福达修改

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/PurchaseEnquiry.java

@@ -151,9 +151,9 @@ public class PurchaseEnquiry  extends BladeController {
 				if (CollectionUtils.isNotEmpty(list)){
 					item.setOrderQuantity(list.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO,BigDecimal::add));//数量合计
 					item.setAmount(list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add).multiply(item.getExchangeRate()));//销售金额
-					item.setPurchaseAmount(list.stream().filter(e -> e.getPurchaseAmount() != null).reduce(BigDecimal.ZERO,(x,y) ->{
+				/*	item.setPurchaseAmount(list.stream().filter(e -> e.getPurchaseAmount() != null).reduce(BigDecimal.ZERO,(x,y) ->{
 						return x.add((y.getPurchaseAmount().add(y.getPartsPrice())).multiply(y.getOrderQuantity()));
-					},BigDecimal::add));//采购金额
+					},BigDecimal::add));//采购金额*/
 					item.setActualQuantity(list.stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO,BigDecimal::add));//发货数量
 				}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -146,9 +146,9 @@ public class ShippingEnquiry extends BladeController {
 				if (CollectionUtils.isNotEmpty(list)){
 					item.setOrderQuantity(list.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO,BigDecimal::add));//数量合计
 					item.setAmount(list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add).multiply(item.getExchangeRate()));//销售金额
-					item.setPurchaseAmount(list.stream().filter(e -> e.getPurchaseAmount() != null).reduce(BigDecimal.ZERO,(x,y) ->{
+				/*	item.setPurchaseAmount(list.stream().filter(e -> e.getPurchaseAmount() != null).reduce(BigDecimal.ZERO,(x,y) ->{
 						return x.add((y.getPurchaseAmount().add(y.getPartsPrice())).multiply(y.getOrderQuantity()));
-					},BigDecimal::add));//采购金额
+					},BigDecimal::add));//采购金额*/
 					item.setActualQuantity(list.stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO,BigDecimal::add));//发货数量
 				}