2022年10月25 17：12

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -199,7 +199,11 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 					stockGoods.setStorageId(storageId);
 					StockGoods stock = stockGoodsClient.getOneStock(stockGoods);
 					if (stock != null) {
-						orderItems.setStorageQuantity(stock.getBalanceQuantity());
+						if (AuthUtil.getTenantId().equals("922648")){//欧记取可用库存
+							orderItems.setStorageQuantity(stock.getSurplusRouteQuantity());
+						}else {
+							orderItems.setStorageQuantity(stock.getBalanceQuantity());
+						}
 						orderItems.setPurchaseAmount(stock.getBalanceAmount().divide(stock.getBalanceQuantity(), 2, RoundingMode.HALF_UP));
 					} else {
 						orderItems.setStorageQuantity(BigDecimal.ZERO);

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

@@ -121,19 +121,13 @@ public class AccController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入acc")
 	public R<IPage<Acc>> list(Acc acc, Query query) {
 		LambdaQueryWrapper<Acc> accLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		if (AuthUtil.getTenantId().equals("577435")){
-			if (acc.getFlag() != null && acc.getFlag() == 1) {
-				accLambdaQueryWrapper.apply(" Amount > Settlement_Amount");
-			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
-				accLambdaQueryWrapper.apply(" Amount > Invoice_Amount");
-			}
-		}else {
-			if (acc.getFlag() != null && acc.getFlag() == 1) {
-				accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
-			} else if (acc.getFlag() != null && acc.getFlag() == 2) {
-				accLambdaQueryWrapper.apply(" Amount >= Invoice_Amount");
-			}
+
+		if (acc.getFlag() != null && acc.getFlag() == 1) {
+			accLambdaQueryWrapper.apply(" Amount > Settlement_Amount");
+		} else if (acc.getFlag() != null && acc.getFlag() == 2) {
+			accLambdaQueryWrapper.apply(" Amount > Invoice_Amount");
 		}
+
 		accLambdaQueryWrapper.between(StringUtils.isNotBlank(acc.getCreateStartDate()) && StringUtils.isNotBlank(acc.getCreateEndDate()), Acc::getCreateTime, acc.getCreateStartDate(), acc.getCreateEndDate())
 			.like(StringUtils.isNotBlank(acc.getBillType()), Acc::getBillType, acc.getBillType())
 			.like(StringUtils.isNotBlank(acc.getAccSysNo()), Acc::getAccSysNo, acc.getAccSysNo())
@@ -509,4 +503,81 @@ public class AccController extends BladeController {
 		ExcelUtil.export(response, "账单明细", "账单明细", list, FeeStatisticsExcelJTMC.class);
 	}
 
+	/**
+	 * 分页 销售账单处理显示
+	 */
+	@GetMapping("/billList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入acc")
+	public R<IPage<Acc>> billList(Acc acc, Query query) {
+		LambdaQueryWrapper<Acc> accLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+		if (acc.getFlag() != null && acc.getFlag() == 1) {
+			accLambdaQueryWrapper.apply(" Amount >= Settlement_Amount");
+		} else if (acc.getFlag() != null && acc.getFlag() == 2) {
+			accLambdaQueryWrapper.apply(" Amount >= Invoice_Amount");
+		}
+
+		accLambdaQueryWrapper.between(StringUtils.isNotBlank(acc.getCreateStartDate()) && StringUtils.isNotBlank(acc.getCreateEndDate()), Acc::getCreateTime, acc.getCreateStartDate(), acc.getCreateEndDate())
+			.like(StringUtils.isNotBlank(acc.getBillType()), Acc::getBillType, acc.getBillType())
+			.like(StringUtils.isNotBlank(acc.getAccSysNo()), Acc::getAccSysNo, acc.getAccSysNo())
+			.like(StringUtils.isNotBlank(acc.getSrcBillNo()), Acc::getSrcBillNo, acc.getSrcBillNo())
+			.eq(acc.getCorpId() != null, Acc::getCorpId, acc.getCorpId())
+			.eq(StringUtils.isNotBlank(acc.getItemType()), Acc::getItemType, acc.getItemType())
+			.eq(StringUtils.isNotBlank(acc.getCostType()), Acc::getCostType, acc.getCostType())
+			.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
+			.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
+			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
+		accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
+			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
+			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getSettlementAmount, 0)
+			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getSettlementAmount, 0)
+			.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getInvoiceAmount, 0)
+			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getInvoiceAmount, 0);
+
+		accLambdaQueryWrapper.eq(Acc::getTenantId, SecureUtil.getTenantId())
+			.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");
+		}
+		if ("673511".equals(AuthUtil.getTenantId())) {
+			accLambdaQueryWrapper.ge(ObjectUtils.isNotNull(acc.getCreateStartDate()), Acc::getSrcDate, acc.getCreateStartDate())
+				.le(ObjectUtils.isNotNull(acc.getCreateEndDate()), Acc::getSrcDate, acc.getCreateEndDate());
+		}
+		accLambdaQueryWrapper.eq(Acc::getStatus, 0);
+		accLambdaQueryWrapper.orderByDesc(Acc::getCreateTime);
+		IPage<Acc> pages = accService.page(Condition.getPage(query), accLambdaQueryWrapper);
+		String corpIds = "";
+		for (Acc accOne : pages.getRecords()) {
+			if (ObjectUtil.isNotEmpty(accOne.getCorpId())) {
+				corpIds = corpIds + accOne.getCorpId() + ",";
+			}
+		}
+		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds);
+		pages.getRecords().forEach(e -> {
+			//录入人
+			e.setCreateUserName(iUserClient.userInfoById(e.getCreateUser()).getData().getRealName());
+			//费用名称
+			if (StringUtils.isNotBlank(e.getCostType())) {
+				R<FeesDesc> detail = iFeesDescClient.detail(Long.valueOf(e.getCostType()));
+				if (detail.isSuccess() && detail.getData() != null) {
+					e.setItemName(detail.getData().getCname());
+				}
+			}
+			//客户名称
+			if (e.getCorpId() != null) {
+				if (ObjectUtil.isNotEmpty(corpsDescList)) {
+					CorpsDesc corpsDesc = corpsDescList.stream().filter(d -> d.getId().equals(e.getCorpId())).findFirst().orElse(null);
+					if (ObjectUtils.isNotNull(corpsDesc)){
+						e.setCorpName(corpsDesc.getCname());
+					}
+				}
+			}
+			e.setOutstandingAmount(e.getAmount().subtract(e.getSettlementAmount()));
+		});
+		return R.data(pages);
+	}
+
 }