From 858a889b79cc9b49808cb01913fd577303402fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Wed, 4 Nov 2026 01:29:15 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8E=A8=E9=80=81=E6=9C=AA=E5=9B=9E=E5=A1=AB?=
 =?UTF-8?q?=E6=98=9F=E7=80=9A=E5=86=85=E7=A0=81=E5=AF=BC=E8=87=B4=E9=87=91?=
 =?UTF-8?q?=E8=9D=B6=E9=99=84=E4=BB=B6=E5=A7=8B=E7=BB=88=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InvoiceApplicationServiceImpl.java      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
index 2438e690..7eef829a 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
@@ -43,6 +43,7 @@ import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplyQueryDTO;
 import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplySaveDTO;
 import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplySaveEntryDTO;
 import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplySaveFreightDTO;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultItemVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiInvoiceApplyOpenApiBillVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiInvoiceApplyOpenApiInvoiceVO;
@@ -733,9 +734,11 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 	public String doSyncKingdee(Long id) {
 		InvoiceApplication entity = lockedExisting(id);
 		if (!TransportBusiConstant.APPROVED.equals(entity.getApprovalStatus())) throw new ServiceException("仅审批通过的开票申请允许同步金蝶");
-		// 已同步/已开票幂等返回（开票完成为终态）；星瀚内码由附件补传分支经 A303-4 反查回填
-		if (KingdeeBfiConstant.KINGDEE_STATUS_SYNCED.equals(entity.getKingdeeStatus())
-			|| KingdeeBfiConstant.KINGDEE_STATUS_INVOICED.equals(entity.getKingdeeStatus())) {
+		// 已开票为终态幂等返回；已同步且星瀚内码齐备幂等返回——
+		// 已同步但内码缺失（历史推送未落内码）放行，走下方 A303-4 勾稽反查补内码，供 A902 附件上传定位金蝶单据
+		if (KingdeeBfiConstant.KINGDEE_STATUS_INVOICED.equals(entity.getKingdeeStatus())
+			|| (KingdeeBfiConstant.KINGDEE_STATUS_SYNCED.equals(entity.getKingdeeStatus())
+				&& Func.isNotBlank(entity.getKingdeeBillId()))) {
 			return entity.getKingdeeBillNo();
 		}
 		if (Func.isBlank(entity.getApplicationNo())) throw new ServiceException("推送金蝶开票申请失败：开票申请单号为空");
@@ -882,7 +885,12 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 			BfiBillSaveResultVO saveResult = bfiService.saveInvoiceApply(param);
 			kingdeeApBillSyncSupport.requireBfiSaveSuccess(saveResult,
 				"推送金蝶开票申请发票张[" + Func.toStr(sheet.getSheetNo()) + "]");
-			String kingdeeNo = saveResult.getResult().get(0).getNumber();
+			BfiBillSaveResultItemVO saveItem = saveResult.getResult().get(0);
+			String kingdeeNo = saveItem.getNumber();
+			// 星瀚内码随 A303-1 保存结果回填（A902 附件上传定位金蝶单据用），缺失时由 A303-4 勾稽反查兜底
+			if (Func.isBlank(entity.getKingdeeBillId()) && saveItem.getId() != null) {
+				entity.setKingdeeBillId(String.valueOf(saveItem.getId()));
+			}
 			sheet.setKingdeeBillNo(kingdeeNo);
 			savedBillNos.add(kingdeeNo);
 			pushedNew = true;