From ab64d282515f90f5d0a60a3dae3e13ed0aa79b59 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, 1 Oct 2026 20:09:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20A301-3=20=E8=AE=A4=E9=A2=86=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E6=A0=B8=E5=BF=83=E5=8D=95=E6=8D=AE=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=94=B9=E4=BC=A0=E7=BB=93=E7=AE=97=E5=8D=95=E9=87=91=E8=9D=B6?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AEid=EF=BC=88=E6=98=9F=E7=80=9A=E5=86=85?=
 =?UTF-8?q?=E7=A0=81=EF=BC=89=EF=BC=8C=E6=9C=AC=E5=9C=B0=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95id=E9=87=91=E8=9D=B6=E6=97=A0=E6=B3=95=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=EF=BC=9B=E7=BC=BAid=E6=97=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ReceiptFlowServiceImpl.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
index c5f1bee1..eb62bb5a 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
@@ -848,6 +848,12 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		if (allocations.isEmpty()) {
 			return ReceiptClaimPushResult.fail("该流水无有效认领分摊，无法推送");
 		}
+		// 核心单据编号取第一张结算单同步金蝶回写的星瀚内码（应收/应付单金蝶id），TMS本地id金蝶无法识别
+		FormalSettlement firstSettlement = formalSettlementMapper.selectById(allocations.get(0).getFormalSettlementId());
+		if (firstSettlement == null || Func.isBlank(firstSettlement.getKingdeeBillId())) {
+			return ReceiptClaimPushResult.fail("结算单" + allocations.get(0).getFormalSettlementNo()
+				+ "未同步金蝶（缺少金蝶单据id），不满足推送条件");
+		}
 		// 推送来源编码：分摊结算单号下划线拼接（A301-3 契约口径；分摊不变则重试编码不变，
 		// 金蝶按 awrp_src_sys + awrp_src_code 幂等防重试双单）
 		String awrpSrcCode = allocations.stream()
@@ -857,7 +863,7 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 			.collect(Collectors.joining("_"));
 		flow.setAwrpSrcCode(awrpSrcCode);
 
-		BfiClaimPushDTO param = buildClaimPushDTO(flow, claimedTotal, allocations);
+		BfiClaimPushDTO param = buildClaimPushDTO(flow, claimedTotal, allocations, firstSettlement.getKingdeeBillId());
 		log.info("调用BFI接口 收款认领结果推送开始 flowId：{}，billId：{}，awrpSrcCode：{}，分摊明细 {} 行，认领金额 {}",
 			flow.getId(), flow.getBillId(), flow.getAwrpSrcCode(), allocations.size(), claimedTotal);
 		try {
@@ -869,10 +875,11 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 	}
 
 	/**
-	 * A301-3 推送报文组装：billid=公告id，单条分录、金额=全部未推送金额（一笔流水一张金蝶收款单）
+	 * A301-3 推送报文组装：billid=公告id，单条分录、金额=全部未推送金额（一笔流水一张金蝶收款单），
+	 * 核心单据编号=第一张结算单的金蝶单据id（星瀚内码）
 	 */
 	private BfiClaimPushDTO buildClaimPushDTO(KingdeeReceiptFlow flow, BigDecimal claimedTotal,
-		List<ReceiptClaimSettlement> allocations) {
+		List<ReceiptClaimSettlement> allocations, String coreBillId) {
 		BfiClaimPushDTO param = new BfiClaimPushDTO();
 		// 【必填】认领公告id
 		param.setBillid(flow.getBillId());
@@ -896,8 +903,8 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		entry.setSeq(allocations.get(0).getFormalSettlementId());
 		// 核心单据类型
 		// entry.setECorebilltype(KingdeeBfiConstant.BFI_CLAIM_CORE_BILL_TYPE);
-		// 核心单据编号（第一张结算单id）
-		entry.setECorebillno(String.valueOf(allocations.get(0).getFormalSettlementId()));
+		// 核心单据编号（第一张结算单的金蝶单据id，星瀚内码）
+		entry.setECorebillno(coreBillId);
 		param.setEntryentity(List.of(entry));
 		return param;
 	}