From e4095c6e60d521f283cf43a84301f7c68b5561d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 24 Sep 2026 19:42:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=AD=A3=E5=BC=8F=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E4=B8=8E=E6=94=B6=E7=A5=A8=E7=99=BB=E8=AE=B0=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E9=87=91=E8=9D=B6=E6=8E=A8=E9=80=81=E6=96=B0=E5=88=86=E5=BD=95?=
 =?UTF-8?q?=E5=8F=A3=E5=BE=84=EF=BC=88=E7=BB=93=E7=AE=97=E5=8D=95=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E4=BC=A0=E5=8F=82=E3=80=81=E6=B1=87=E7=8E=87/?=
 =?UTF-8?q?=E6=B1=87=E7=8E=87=E6=97=A5=E6=9C=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FormalSettlementServiceImpl.java        | 9 ++++-----
 .../service/impl/InvoiceReceiptServiceImpl.java          | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
index 38769d54..9c8d0f86 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
@@ -497,19 +497,18 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 		if ("receivable".equals(settlement.getSettlementType())) {
 			// 应收结算：财务应收单防重键（awrp_src_code）：正式结算单号_结算明细单据号下划线拼接
 			String arBillSrcCode = kingdeeArBillSyncSupport.arBillSrcCode(settlement, details);
-			List<KingdeeApBillSyncSupport.BfiEntryGroup> entryGroups = kingdeeArBillSyncSupport.resolveArEntryGroups(details, context);
+			List<KingdeeApBillSyncSupport.BfiEntryGroup> entryGroups = kingdeeArBillSyncSupport.resolveArEntryGroups(settlement, details, context);
 			KingdeeApBillSyncSupport.BfiApBillPushOutcome outcome = kingdeeArBillSyncSupport.pushArBill(
-				arBillSrcCode, settlement.getContractId(), settlement.getPayerName(), entryGroups,
-				settlement.getFormalSettlementNo(), context);
+				arBillSrcCode, settlement, entryGroups, settlement.getFormalSettlementNo(), context);
 			billNo = outcome.billNo();
 			changeDesc = "同步金蝶财务应收单" + billNo;
 		} else {
 			// 应付结算：财务应付单防重键，付款申请「同步金蝶」（A103-1 应付下推）推送前按该键经 A102-4 预检本单应付单已生成
 			// 付款申请 A103-1 下推前的前置
 			String apBillSrcCode = kingdeeApBillSyncSupport.apBillSrcCode(settlement, details);
-			List<KingdeeApBillSyncSupport.BfiEntryGroup> entryGroups = kingdeeApBillSyncSupport.resolveEntryGroups(details, context);
+			List<KingdeeApBillSyncSupport.BfiEntryGroup> entryGroups = kingdeeApBillSyncSupport.resolveEntryGroups(settlement, details, context);
 			KingdeeApBillSyncSupport.BfiApBillPushOutcome outcome = kingdeeApBillSyncSupport.pushApBill(
-				apBillSrcCode, settlement.getContractId(), entryGroups, settlement.getFormalSettlementNo(), context);
+				apBillSrcCode, settlement, entryGroups, settlement.getFormalSettlementNo(), context);
 			billNo = outcome.billNo();
 			changeDesc = "同步金蝶财务应付单" + billNo;
 		}
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 1476a9f6..a6262440 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
@@ -719,7 +719,7 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 				}
 				log.info("收票登记[{}]开始 A303-2 推送金蝶收票单", receipt.getInvoiceNo());
 				ContractManage contract = kingdeeApBillSyncSupport.requireContract(plan.settlement().getContractId(), context);
-				// 明细分录与应付单 A102-2 同源同口径：复用同一结算明细解析结果，逐结算货物费用行一条
+				// 明细分录与应付单 A102-2 同源同口径：复用同一结算明细解析结果，结算明细行+结算合计费用项各一条
 				List<KingdeeApBillSyncSupport.BfiEntryGroup> entryGroups =
 					kingdeeApBillSyncSupport.resolveEntryGroups(plan.details(), context);
 				billNo = kingdeeReceivedInvoiceSyncSupport.pushReceivedInvoice(receipt, plan.mirror(), contract, entryGroups, context);