From bdae054b0bb0cfbe95775655020e692a8c6002cf 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, 28 Sep 2026 18:40:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=90=8C=E6=AD=A5=E4=B8=8E=E8=AE=A4=E9=A2=86?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/KingdeeBfiConstant.java          |  7 ++---
 .../service/impl/ReceiptFlowServiceImpl.java  | 29 +++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
index 97f46893..3285c404 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
@@ -141,7 +141,7 @@ public final class KingdeeBfiConstant {
 	public static final String BFI_AR_BILL_SRC_BT = "ar_finarbill";
 
 	/** A301-3 认领推送核心单据类型：其他应付（e_corebilltype）。 */
-	public static final String BFI_CLAIM_CORE_BILL_TYPE = "ApFin_other_BT_S";
+	public static final String BFI_CLAIM_CORE_BILL_TYPE = "ar_finarbill";
 
 	/** A303-1 发票种类：数电发票（普通发票）。 */
 	public static final String BFI_INVOICE_TYPE_DIGITAL_GENERAL = "10xdp";
@@ -213,10 +213,7 @@ public final class KingdeeBfiConstant {
 	public static final String BFI_CLAIM_REC_PAY_TYPE = "999";
 
 	/** A301-3 认领推送：付款人类型（默认客户 bd_customer，待金蝶确认后如有调整直接改此常量）。 */
-	public static final String BFI_CLAIM_PAYMENT_TYPE = "999";
-
-	/** A301-3 认领推送来源单据编码前缀：SKCL + yyyyMMddHHmmss + 认领id尾号，作 A301-1 回写匹配键。 */
-	public static final String BFI_CLAIM_SRC_CODE_PREFIX = "SKCL";
+	public static final String BFI_CLAIM_PAYMENT_TYPE = "bd_customer";
 
 	/** 金蝶同步状态：认领结果已推送（A301-3 成功，等待金蝶收款单审核/收款，可继续回写）。 */
 	public static final String KINGDEE_STATUS_PUSHED = "pushed";
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 354ac6d3..3ae967f3 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
@@ -637,7 +637,10 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		if (flow.getBillId() == null) {
 			throw new ServiceException("认领公告id缺失，请先手动同步金蝶收款流水");
 		}
-		String awrpSrcCode = buildClaimSrcCode(claim.getId());
+		// 来源单据编码：多个结算单号用_拼接
+		String awrpSrcCode = settlements.stream()
+			.map(FormalSettlement::getFormalSettlementNo)
+			.collect(Collectors.joining("_"));
 		claim.setAwrpSrcCode(awrpSrcCode);
 
 		BfiClaimPushDTO param = new BfiClaimPushDTO();
@@ -666,9 +669,9 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 			if (Func.isNotEmpty(settlement.getKingdeeBillNo())) {
 				// 结算单已同步金蝶应收单时携带核心单据引用，金蝶按应收单号核销认领金额
 				// 核心单据类型
-				entry.setECorebilltype(KingdeeBfiConstant.BFI_CLAIM_CORE_BILL_TYPE);
+				// entry.setECorebilltype(KingdeeBfiConstant.BFI_CLAIM_CORE_BILL_TYPE);
 				// 核心单据编号
-				entry.setECorebillno(settlement.getKingdeeBillNo());
+				entry.setECorebillno(String.valueOf(settlement.getId()));
 			}
 			allocatedTotal = allocatedTotal.add(money(allocationMap.get(settlement.getId())));
 			entries.add(entry);
@@ -713,18 +716,6 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 			claim.getId(), Func.isEmpty(kingdeeBillNo) ? "响应未返回" : kingdeeBillNo);
 	}
 
-	/**
-	 * 生成 A301-3 认领推送来源单据编码：SKCL + yyyyMMddHHmmss + 认领id尾号
-	 *
-	 * @param claimId 认领记录id
-	 * @return 来源单据编码
-	 */
-	private String buildClaimSrcCode(Long claimId) {
-		String time = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now());
-		String suffix = String.valueOf(claimId);
-		return KingdeeBfiConstant.BFI_CLAIM_SRC_CODE_PREFIX + time + suffix.substring(Math.max(0, suffix.length() - 6));
-	}
-
 	/**
 	 * A301-2 认领公告 → 收款流水表字段拷贝（仅覆盖金蝶侧来源字段，不覆盖本地认领金额与状态）
 	 */
@@ -734,10 +725,10 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		target.setBillId(source.getId());
 		// 收款通知单号
 		target.setReceiptNoticeNo(trimToEmpty(source.getBillno()));
-		// 付款人名称
-		target.setPayerName(trimToEmpty(source.getRecviewpayer()));
-		// 付款人id
-		target.setPayerId(trimToEmpty(source.getRecpayer()));
+		// 付款人名称（取自对方户名）
+		target.setPayerName(trimToEmpty(source.getOppunit()));
+		// 付款人id（取自对方账号）
+		target.setPayerId(trimToEmpty(source.getOppbanknumber()));
 		// 收款人
 		target.setPayeeName(trimToNull(source.getRecpayee()));
 		// 收款金额