Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -184,7 +184,7 @@ public class OrderController 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));//销售金额
-					item.setPurchaseAmount(list.stream().map(OrderItems::getPurchaseAmount).reduce(BigDecimal.ZERO, BigDecimal::add));//采购金额
+					item.setPurchaseAmount(list.stream().filter(e ->e.getPurchaseAmount() != null).map(OrderItems::getPurchaseAmount).reduce(BigDecimal.ZERO, BigDecimal::add));//采购金额
 					item.setActualQuantity(list.stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));//发货数量
 					item.setActualWeight(list.stream().map(OrderItems::getActualWeight).reduce(BigDecimal.ZERO, BigDecimal::add));//已发重量(吨)
 				}

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -130,8 +130,13 @@ public class AccController extends BladeController {
 			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getInvoiceAmount, 0)
 			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getInvoiceAmount, 0)
 			.eq(Acc::getTenantId, SecureUtil.getTenantId())
-			.eq(Acc::getIsDeleted, 0)
-			.orderByDesc(Acc::getCreateTime);
+			.eq(Acc::getIsDeleted, 0);
+		if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 1){
+			accLambdaQueryWrapper.apply("Amount = Settlement_Amount");
+		}else if (acc.getSettlementStatus() != null && acc.getSettlementStatus() == 2){
+			accLambdaQueryWrapper.apply("Amount != Settlement_Amount");
+		}
+		accLambdaQueryWrapper.orderByDesc(Acc::getCreateTime);
 		IPage<Acc> pages = accService.page(Condition.getPage(query), accLambdaQueryWrapper);
 		pages.getRecords().forEach(e -> {
 			//录入人