From 49ccb435ea57b40da0312ebd03be229a7880f4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Mon, 2 Nov 2026 18:38:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=93=E7=AE=97=E5=8D=95=E8=AE=A4?=
 =?UTF-8?q?=E9=A2=86=E5=88=86=E6=91=8A=E9=87=91=E9=A2=9D=E6=94=B9=E5=8F=96?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=8C=B9=E9=85=8D=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InvoiceReceiptServiceImpl.java | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
index ab22b0d4..ee20b4fd 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
@@ -75,6 +75,7 @@ import org.springblade.transport.pojo.entity.CustomerContact;
 import org.springblade.transport.pojo.entity.CustomerInvoiceInfo;
 import org.springblade.transport.pojo.entity.FormalSettlement;
 import org.springblade.transport.pojo.entity.FormalSettlementDetail;
+import org.springblade.transport.pojo.entity.FormalSettlementInvoice;
 import org.springblade.transport.pojo.entity.InvoiceReceipt;
 import org.springblade.transport.pojo.entity.InvoiceReceiptRecord;
 import org.springblade.transport.pojo.entity.InvoiceReceiptSettlement;
@@ -981,7 +982,14 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 				.eq(InvoiceReceipt::getApprovalStatus, TransportBusiConstant.APPROVED)
 				.last("FOR UPDATE"));
 		this.checkSingleSettlementClaim(settlement, matchedReceipts);
-		// 重建本结算单认领关系（删旧建新，认领金额=发票金额全额认领）
+		// 重建本结算单认领关系（删旧建新）：分摊金额取发票行的匹配结算单金额（支持手动修改），未匹配到的回退发票全额
+		Map<String, BigDecimal> matchedByInvoiceNo = formalSettlementInvoiceMapper.selectList(
+				Wrappers.<FormalSettlementInvoice>lambdaQuery()
+					.eq(FormalSettlementInvoice::getFormalSettlementId, settlementId))
+			.stream()
+			.filter(row -> Func.isNotBlank(row.getInvoiceNo()))
+			.collect(Collectors.toMap(FormalSettlementInvoice::getInvoiceNo,
+				row -> money(row.getMatchedAmount()), (left, right) -> left));
 		settlementRelationMapper.delete(Wrappers.<InvoiceReceiptSettlement>lambdaQuery()
 			.eq(InvoiceReceiptSettlement::getFormalSettlementId, settlementId));
 		for (InvoiceReceipt receipt : matchedReceipts) {
@@ -991,9 +999,10 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 			relation.setFormalSettlementNo(settlement.getFormalSettlementNo());
 			relation.setSettlementAmount(money(settlement.getSettlementAmount()));
 			relation.setReceivedInvoiceAmount(receivedAmount(settlementId, receipt.getId()));
-			relation.setAllocatedInvoiceAmount(money(receipt.getInvoiceAmount()));
+			relation.setAllocatedInvoiceAmount(
+				matchedByInvoiceNo.getOrDefault(receipt.getInvoiceNo(), money(receipt.getInvoiceAmount())));
 			settlementRelationMapper.insert(relation);
-			log.info("结算单[{}]认领收票登记[{}]：全额认领 {}", settlement.getFormalSettlementNo(),
+			log.info("结算单[{}]认领收票登记[{}]：分摊金额 {}", settlement.getFormalSettlementNo(),
 				receipt.getInvoiceNo(), relation.getAllocatedInvoiceAmount());
 		}
 		refreshSettlementInvoiceStatus(settlementId);
@@ -2105,7 +2114,7 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 		FormalSettlement settlement = formalSettlementMapper.selectById(settlementId);
 		if (settlement == null) return;
 		BigDecimal invoiceAmount = receivedAmount(settlementId, null);
-		// 先票后款全额认领：匹配金额=发票全额，可超过结算金额，覆盖即视为已完成收票
+		// 匹配结算单金额支持手动修改：匹配合计（分摊金额之和）可超过结算金额，覆盖即视为已完成收票
 		String invoiceStatus = invoiceAmount.compareTo(BigDecimal.ZERO) <= 0 ? "unreceived"
 			: invoiceAmount.compareTo(money(settlement.getSettlementAmount())) >= 0 ? "completed" : "partial";
 		settlement.setInvoiceAmount(invoiceAmount);