From a76d5a8eb5be1b13420197d7972aaf31ba858c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Fri, 16 Oct 2026 13:10:57 +0800
Subject: [PATCH] =?UTF-8?q?:feat:=20=E9=87=91=E8=9D=B6=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E9=83=A8=E9=97=A8=E5=8F=8D=E6=9F=A5=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InvoiceApplicationServiceImpl.java   | 14 ++++--
 .../impl/PaymentApplicationServiceImpl.java   |  9 ++--
 .../support/KingdeeApBillSyncSupport.java     | 50 +++++++++++++++----
 .../support/KingdeeArBillSyncSupport.java     |  2 +-
 .../KingdeeReceivedInvoiceSyncSupport.java    |  4 +-
 5 files changed, 56 insertions(+), 23 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 99d8f77a..10b197a8 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
@@ -97,6 +97,7 @@ import org.springblade.transport.pojo.vo.InvoiceApplicationSheetVO;
 import org.springblade.transport.pojo.vo.InvoiceApplicationVO;
 import org.springblade.transport.service.IInvoiceApplicationService;
 import org.springblade.transport.service.IKingdeeBillLockService;
+import org.springblade.transport.service.KingdeeSyncContext;
 import org.springblade.transport.support.KingdeeApBillSyncSupport;
 import org.springblade.transport.support.KingdeeArBillSyncSupport;
 import org.springblade.transport.support.KingdeeSyncLockSupport;
@@ -806,6 +807,8 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		if (dept == null || Func.isBlank(dept.getKingdeeDeptCode())) {
 			throw new ServiceException("推送金蝶开票申请失败：申请部门[" + Func.toStr(entity.getDeptId()) + "]未维护金蝶组织编码，请检查部门数据");
 		}
+		// 金蝶组织编码：项目业务部门反查唯一平台公司 → 平台公司金蝶组织编码
+		String kingdeeOrgNumber = kingdeeApBillSyncSupport.kingdeeOrgNumber(entity.getProjectId(), KingdeeSyncContext.empty());
 		CustomerArchive customer = entity.getReceiverCustomerId() == null ? null : customerArchiveMapper.selectById(entity.getReceiverCustomerId());
 		if (customer == null || Func.isBlank(customer.getCustomerCode())) {
 			throw new ServiceException("推送金蝶开票申请失败：受票方客户未在客商档案中维护客商编码，请补充后重试");
@@ -836,7 +839,7 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 					+ "]无商品行，无法组装分录");
 			}
 			BfiInvoiceApplySaveDTO param = this.buildInvoiceApplyParam(entity, sheetBillNo, seller, salerAddr, salerBank,
-				dept, customer, firstArSrcCode, money(sheet.getInvoiceAmount()), items);
+				dept, kingdeeOrgNumber, customer, firstArSrcCode, money(sheet.getInvoiceAmount()), items);
 			log.info("金蝶开票申请推送：开票申请[{}]发票张[{}]，billno=[{}]，价税合计=[{}]，分录{}条",
 				entity.getApplicationNo(), sheet.getSheetNo(), sheetBillNo, sheet.getInvoiceAmount(), items.size());
 			BfiBillSaveResultVO saveResult = bfiService.saveInvoiceApply(param);
@@ -885,16 +888,17 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 	 * 组装 A303-1 单张开票申请单入参（字段映射见设计文档 6.3/6.4），
 	 * 购销方等主表公共字段随开票申请取数，价税合计与单据体分录取本张发票
 	 *
+	 * @param orgNumber 金蝶组织编码（项目业务部门反查平台公司）
 	 * @param firstArSrcCode 上游来源单据号：首张关联结算单的金蝶应收单防重键 awrp_src_code（多张结算单取第一张）
 	 */
 	private BfiInvoiceApplySaveDTO buildInvoiceApplyParam(InvoiceApplication entity, String billNo,
-		CustomerArchive seller, String salerAddr, String salerBank, Dept dept, CustomerArchive customer,
+		CustomerArchive seller, String salerAddr, String salerBank, Dept dept, String orgNumber, CustomerArchive customer,
 		String firstArSrcCode, BigDecimal sheetAmount, List<BfiInvoiceApplySaveEntryDTO> items) {
 		BfiInvoiceApplySaveDTO param = new BfiInvoiceApplySaveDTO();
 		// ==================== 以下为【必填】字段（BfiInvoiceApplySaveDTO 标注），非必填字段先注释保留 ====================
-		// 【必填】组织.编码：申请部门 deptId → 金蝶组织编码
-		param.setOrgidNumber(dept.getKingdeeDeptCode());
-		// 【必填】申请部门.编码：同上
+		// 【必填】组织.编码：项目业务部门反查唯一平台公司 → 平台公司金蝶组织编码
+		param.setOrgidNumber(orgNumber);
+		// 【必填】申请部门.编码：申请部门 deptId → 金蝶部门编码
 		param.setAwrpOrgfieldNumber(dept.getKingdeeDeptCode());
 		// 【必填】业务单据编号（候选键）：单张发票候选 billno（多张发票时开票申请单号-张次序号）
 		param.setBillno(billNo);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
index eb8e1d83..de3ad4b7 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
@@ -800,9 +800,10 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				String orgNumber = payApply == null ? null : payApply.getPayorgNumber();
 				if (Func.isBlank(orgNumber)) {
 					try {
-						// A103-4 付款人（公司）编码必填：优先取 A103-2 返回付款组织编码，兜底按合同所属组织解析
+						// A103-4 付款人（公司）编码必填：优先取 A103-2 返回付款组织编码，兜底按合同关联项目解析
+						KingdeeSyncContext context = KingdeeSyncContext.empty();
 						orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(
-							kingdeeApBillSyncSupport.requireContract(application.getContractId(), KingdeeSyncContext.empty()));
+							kingdeeApBillSyncSupport.requireContract(application.getContractId(), context), context);
 					} catch (Exception exception) {
 						log.warn("付款申请[{}]付款处理查询跳过，付款组织编码获取失败：{}", application.getPaymentNo(), exception.getMessage());
 						continue;
@@ -1131,7 +1132,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	 */
 	private String pushBfiPayApply(PaymentApplication entity, KingdeeSyncContext context) {
 		ContractManage contract = kingdeeApBillSyncSupport.requireContract(entity.getContractId(), context);
-		String orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(contract);
+		String orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(contract, context);
 		String currency = kingdeeApBillSyncSupport.bfiCurrency(contract);
 		// 申请日期：yyyy-MM-dd HH:mm:ss（与 A102-2/A103-1 统一，金蝶各接口日期格式要求一致）
 		String applyDateText = bfiDateTimeText(entity);
@@ -1237,7 +1238,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	 */
 	private String pushBfiPayApplyPush(PaymentApplication entity, KingdeeSyncContext context) {
 		ContractManage contract = kingdeeApBillSyncSupport.requireContract(entity.getContractId(), context);
-		String orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(contract);
+		String orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(contract, context);
 		// 申请日期：yyyy-MM-dd HH:mm:ss（与 A102-2 单据日期格式统一）
 		String applyDateText = bfiDateTimeText(entity);
 		BfiPayApplyPushDTO param = new BfiPayApplyPushDTO();
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java
index f091b00f..efa36f49 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java
@@ -233,7 +233,7 @@ public class KingdeeApBillSyncSupport {
 		if (Func.isBlank(billtypeNumber)) {
 			throw new ServiceException("推送金蝶财务应付单失败：单据类型[" + KingdeeBfiConstant.BFI_AP_BILL_BILLTYPE_NAME + "]未在映射字典中维护");
 		}
-		String orgNumber = bfiOrgNumber(contract);
+		String orgNumber = bfiOrgNumber(contract, context);
 		// 币种取合同结算币种
 		String currency = bfiCurrency(contract);
 		// 单据日期：yyyy-MM-dd HH:mm:ss（各接口统一格式），流程拆分后以同步当日作为应付单据日期
@@ -925,22 +925,50 @@ public class KingdeeApBillSyncSupport {
 	}
 
 	/**
-	 * 合同所属组织编码
+	 * 合同金蝶组织编码：合同关联项目 → 项目业务部门沿部门树向上反查唯一平台公司 → 平台公司金蝶组织编码
 	 *
 	 * @param contract 合同实体
+	 * @param context  金蝶同步上下文（缓存载体）
 	 * @return 组织编码
 	 */
-	public String bfiOrgNumber(ContractManage contract) {
-		Dept dept = contract.getOrganizationId() == null ? null : SysCache.getDept(contract.getOrganizationId());
-		// dept为空，直接报错
-		if (dept == null) {
-			throw new ServiceException("推送金蝶失败，合同所属组织不存在，请检查合同所属组织配置");
+	public String bfiOrgNumber(ContractManage contract, KingdeeSyncContext context) {
+		if (contract.getProjectId() == null) {
+			throw new ServiceException("推送金蝶失败，合同[" + Func.toStr(contract.getContractNo()) + "]未关联项目，无法确定金蝶组织编码");
 		}
-		// kingdeeDeptCode为空，直接报错
-		if (Func.isBlank(dept.getKingdeeDeptCode())) {
-			throw new ServiceException("推送金蝶失败，合同所属组织编码不能为空，请检查组织[" + dept.getDeptName() + "]是否维护金蝶组织编码");
+		return this.kingdeeOrgNumber(contract.getProjectId(), context);
+	}
+
+	/**
+	 * 金蝶组织编码：项目业务部门沿部门树向上反查唯一平台公司（是否平台公司=是），取该平台公司的金蝶组织编码；
+	 * 项目未关联/未维护业务部门/业务部门未归属平台公司/平台公司未维护金蝶组织编码时拦截
+	 *
+	 * @param projectId 项目id
+	 * @param context   金蝶同步上下文（缓存载体）
+	 * @return 组织编码
+	 */
+	public String kingdeeOrgNumber(Long projectId, KingdeeSyncContext context) {
+		if (projectId == null) {
+			throw new ServiceException("推送金蝶失败，单据未关联项目，无法确定金蝶组织编码");
 		}
-		return dept.getKingdeeDeptCode();
+		ProjectApply project = context.projectCache().computeIfAbsent(projectId, projectApplyMapper::selectById);
+		if (project == null) {
+			throw new ServiceException("推送金蝶失败，项目[" + projectId + "]不存在，无法确定金蝶组织编码");
+		}
+		if (project.getBusinessDeptId() == null) {
+			throw new ServiceException("推送金蝶失败，项目[" + Func.toStr(project.getProjectName()) + "]未维护业务部门，无法确定金蝶组织编码");
+		}
+		// 沿部门树向上反查平台公司，上限 20 级防脏数据成环死循环
+		Dept dept = SysCache.getDept(project.getBusinessDeptId());
+		for (int depth = 0; dept != null && depth < 20; depth++) {
+			if (Objects.equals(dept.getIsPlatformCompany(), 1)) {
+				if (Func.isBlank(dept.getKingdeeDeptCode())) {
+					throw new ServiceException("推送金蝶失败，平台公司[" + dept.getDeptName() + "]未维护金蝶组织编码，请检查部门数据");
+				}
+				return dept.getKingdeeDeptCode();
+			}
+			dept = dept.getParentId() == null ? null : SysCache.getDept(dept.getParentId());
+		}
+		throw new ServiceException("推送金蝶失败，项目业务部门[" + Func.toStr(project.getBusinessDeptName()) + "]未归属平台公司，无法确定金蝶组织编码");
 	}
 
 	/**
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java
index 34bf1de3..4d4bdf72 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java
@@ -170,7 +170,7 @@ public class KingdeeArBillSyncSupport {
 		if (Func.isBlank(billtypeNumber)) {
 			throw new ServiceException("推送金蝶财务应收单失败：单据类型[" + KingdeeBfiConstant.BFI_AR_BILL_BILLTYPE_NAME + "]未在映射字典中维护");
 		}
-		String orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(contract);
+		String orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(contract, context);
 		// 币种取合同结算币种
 		String currency = kingdeeApBillSyncSupport.bfiCurrency(contract);
 		// 单据日期：yyyy-MM-dd HH:mm:ss（各接口统一格式），以同步当日作为应收单据日期
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java
index cd80fd69..d17385ae 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java
@@ -185,8 +185,8 @@ public class KingdeeReceivedInvoiceSyncSupport {
 		param.setPaymenttype(BfiConstant.PAY_MODE_CASH);
 		// 【必填】往来类型：进项收票固定供应商
 		param.setAsstacttype(BfiConstant.ASSTACT_TYPE_SUPPLIER);
-		// 【必填】结算组织.编码：合同所属组织（与应付单同源）
-		param.setOrgNumber(kingdeeApBillSyncSupport.bfiOrgNumber(contract));
+		// 【必填】结算组织.编码：合同关联项目业务部门反查平台公司（与应付单同源）
+		param.setOrgNumber(kingdeeApBillSyncSupport.bfiOrgNumber(contract, context));
 		// 【必填】结算币别：合同结算币种
 		param.setCurrencyNumber(kingdeeApBillSyncSupport.bfiCurrency(contract));
 		// 【必填】往来户.编码：合同乙方（开票供应商）客商编码