生成账单规则以及付费申请报表数据问题修改

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -369,8 +369,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							BigDecimal currentStlAmountUsdC = finStlBillsItems.stream()
 								.filter(e -> e.getMblno().equals(item.getMblno()) && MagicValues.C.equals(e.getDc()) && MagicValues.USD.equals(e.getCurCode()))
 								.map(FinStlBillsItems::getCurrentStlAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-							finStlBillsItemsReports.setAmount(currentStlAmountC.subtract(currentStlAmountD).abs());
-							finStlBillsItemsReports.setAmountUsd(currentStlAmountUsdC.subtract(currentStlAmountUsdD).abs());
+							finStlBillsItemsReports.setAmount(currentStlAmountC.subtract(currentStlAmountD));
+							finStlBillsItemsReports.setAmountUsd(currentStlAmountUsdC.subtract(currentStlAmountUsdD));
 							if (!billsList.isEmpty()) {
 								billsList.stream().filter(e -> e.getMblno().equals(item.getMblno())).findFirst()
 									.ifPresent(bills -> finStlBillsItemsReports.setAmountProfit(bills.getAmountDrLoc().subtract(bills.getAmountCrLoc())));

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -166,7 +166,7 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			} else {
 				if (ObjectUtils.isNotNull(item.getPid()) && ObjectUtils.isNotNull(item.getCorpId()) &&
 					ObjectUtils.isNotNull(item.getDc()) && ObjectUtils.isNotNull(item.getFeeId()) && ObjectUtils.isNotNull(item.getCurCode())) {
-					item.setBillKey(item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + item.getFeeCode() + "-" + item.getCurCode() + "-" + amountStatus);
+					item.setBillKey(item.getPid() + "-" + item.getCorpId() + "-" + item.getDc() + "-" + item.getFeeCode() + "-" + item.getCurCode() + "-" + item.getId());
 				} else {
 					throw new RuntimeException("单据号、单位、费用类型、费用名称不能为空");
 				}