From fe7a940201d1a51386a4b6359f0ad719b9a1199d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Tue, 29 Sep 2026 11:25:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20A301-3=20=E6=88=90=E5=8A=9F=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=20number=20=E4=B8=BA=E7=A9=BA=EF=BC=8C=E9=87=91?=
 =?UTF-8?q?=E8=9D=B6=E6=94=B6=E6=AC=BE=E5=8D=95=E5=8F=B7=E5=8F=96=E5=9B=9E?=
 =?UTF-8?q?=E6=89=A7=20keys.awrp=5Fsrc=5Fcode=EF=BC=9BA301-1=20=E5=9B=9E?=
 =?UTF-8?q?=E5=86=99=E5=91=BD=E4=B8=AD=E5=90=8E=E4=BB=A5=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E5=8F=B7=E8=A6=86=E7=9B=96=E5=8D=A0?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ReceiptClaimRecordServiceImpl.java   |  4 +++-
 .../service/impl/ReceiptFlowServiceImpl.java  | 19 ++++++++++++++++---
 ...�构设计（认领本地化-A301-3定时+手动推送-按流水归集）.md |  5 +++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptClaimRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptClaimRecordServiceImpl.java
index 335cea3e..39a1d496 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptClaimRecordServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptClaimRecordServiceImpl.java
@@ -334,7 +334,9 @@ public class ReceiptClaimRecordServiceImpl extends BaseServiceImpl<ReceiptClaimM
 				// 窗口内未查到：金蝶回单延迟/状态未同步，不改状态，由下次回写或人工处置兜底
 				continue;
 			}
-			if (Func.isEmpty(flow.getKingdeeBillNo())) {
+			// 推送成功时金蝶收款单号先以来源编码占位（A301-3 响应 number 为空，取回执 keys.awrp_src_code），
+			// 回写命中后以金蝶真实收款单号覆盖
+			if (Func.isNotEmpty(bill.getBillno())) {
 				flow.setKingdeeBillNo(bill.getBillno());
 			}
 			flow.setKingdeeBillStatus(billStatusOf(bill.getBillstatus()));
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 de09e49f..fb9bc448 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
@@ -856,7 +856,8 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 	}
 
 	/**
-	 * 解析 A301-3 推送结果：全项成功返回金蝶收款单号，否则抛出汇总错误文本（由失败路径落库）
+	 * 解析 A301-3 推送结果：全项成功返回单据号，否则抛出汇总错误文本（由失败路径落库）。
+	 * 成功响应的 number 为空，金蝶收款单号取回执 keys 中的 awrp_src_code（来源编码）。
 	 */
 	private String extractClaimPushBillNo(BfiBillSaveResultVO result) {
 		if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
@@ -872,8 +873,20 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 			throw new ServiceException("金蝶认领结果推送失败"
 				+ (errorText.isEmpty() ? "" : "：" + errorText));
 		}
-		return items.stream().map(BfiBillSaveResultItemVO::getNumber)
-			.filter(Func::isNotEmpty).findFirst().orElse(null);
+		return items.stream()
+			.map(this::claimPushBillNoOf)
+			.filter(Func::isNotEmpty)
+			.findFirst().orElse(null);
+	}
+
+	/**
+	 * 单项推送结果 → 单据号：A301-3 成功响应 number 为空，取回执键值中的 awrp_src_code
+	 */
+	private String claimPushBillNoOf(BfiBillSaveResultItemVO item) {
+		if (Func.isNotEmpty(item.getNumber())) {
+			return item.getNumber();
+		}
+		return item.getKeys() == null ? null : item.getKeys().get("awrp_src_code");
 	}
 
 	/**
diff --git a/doc/docs/业务流程/2026-09-28-收款认领推送金蝶重构设计（认领本地化-A301-3定时+手动推送-按流水归集）.md b/doc/docs/业务流程/2026-09-28-收款认领推送金蝶重构设计（认领本地化-A301-3定时+手动推送-按流水归集）.md
index f0738f76..2ee7bab6 100644
--- a/doc/docs/业务流程/2026-09-28-收款认领推送金蝶重构设计（认领本地化-A301-3定时+手动推送-按流水归集）.md
+++ b/doc/docs/业务流程/2026-09-28-收款认领推送金蝶重构设计（认领本地化-A301-3定时+手动推送-按流水归集）.md
@@ -122,7 +122,8 @@ claimed    累计有效认领 == unclaimed_amount（且 > 0）   ← 「认领
     seq / e_corebillno = 第一张结算单id（分摊按结算单id升序，多张取最小）
 ⑥ 调 pushClaimResult：
    成功 → push_status=pushed、push_fail_reason 清空、pushed_time=now、
-          kingdee_bill_no=响应 number、kingdee_bill_status=pushed；
+          kingdee_bill_no=响应 number（**A301-3 成功响应 number 为空，取回执 keys.awrp_src_code 即来源编码占位**）、
+          kingdee_bill_status=pushed；
           级联刷新该流水名下全部未作废认领主单的 kingdee_bill_no/kingdee_bill_status
    失败 → push_status=failed、push_fail_reason=金蝶错误文本汇总（认领数据不回滚）
 ⑦ 推送动作留痕（blade_receipt_flow_record，operation=push）
@@ -164,7 +165,7 @@ claimed    累计有效认领 == unclaimed_amount（且 > 0）   ← 「认领
 
 - 扫描：`push_status = pushed` 且 `kingdee_bill_status IN (pushed, approved)` 的流水；
 - 匹配：金蝶收款单 `sourcebillnumber == 流水.awrp_src_code`（一流水一码，无歧义）；
-- 回写：`flow.kingdee_bill_no / kingdee_bill_status`（状态映射不变：A/B→pushed、C→approved、D→received、其他→failed），并级联刷新名下未作废认领主单的冗余字段；
+- 回写：`flow.kingdee_bill_status` 按状态映射推进（A/B→pushed、C→approved、D→received、其他→failed）；`kingdee_bill_no` 以金蝶真实收款单号**覆盖**推送时的来源编码占位，并级联刷新名下未作废认领主单的冗余字段；
 - 定时接入复用现有任务风格（`thirdParty.bfi.receiptClaimResult.*`，本期仍可手动触发）。
 
 ### 4.6 作废（不变 + 两点明确）