🔀 合并主干 master 到 dev

blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java

@@ -65,6 +65,7 @@ public class SysCache {
 	private static final String ROLE_NAMES_ID = "roleNames:id:";
 	private static final String ROLE_ALIAS_ID = "roleAlias:id:";
 	private static final String ROLE_ALIASES_ID = "roleAliases:id:";
+	private static final String BUSINESS_DEPT_CONFIG = "businessDeptConfig:platformDept:";
 	public static final String TENANT_ID = "tenant:id:";
 	public static final String TENANT_TENANT_ID = "tenant:tenantId:";
 	public static final String TENANT_PACKAGE_ID = "tenant:packageId:";
@@ -381,4 +382,21 @@ public class SysCache {
 		}, Boolean.FALSE);
 	}
 
+	/**
+	 * 按平台公司 + 业务部门获取业务部门配置
+	 *
+	 * @param platformCompanyId 平台公司ID
+	 * @param businessDeptId    业务部门ID
+	 * @return 业务部门配置
+	 */
+	public static BusinessDeptConfig getBusinessDeptConfig(Long platformCompanyId, Long businessDeptId) {
+		if (platformCompanyId == null || businessDeptId == null) {
+			return null;
+		}
+		return CacheUtil.get(SYS_CACHE, BUSINESS_DEPT_CONFIG, platformCompanyId + StringPool.DASH + businessDeptId, () -> {
+			R<BusinessDeptConfig> result = getSysClient().getBusinessDeptConfig(platformCompanyId, businessDeptId);
+			return result.getData();
+		});
+	}
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -76,6 +76,7 @@ public interface ISysClient {
 	String MEASUREMENT_UNITS = API_PREFIX + "/measurement-units";
 	String PERMISSIONS = API_PREFIX + "/permissions";
 	String INVOICE_ITEMS = API_PREFIX + "/invoice-items";
+	String BUSINESS_DEPT_CONFIG = API_PREFIX + "/business-dept-config";
 
 	/**
 	 * 获取菜单
@@ -345,4 +346,15 @@ public interface ISysClient {
 	@GetMapping(INVOICE_ITEMS)
 	R<List<InvoiceItem>> getInvoiceItems();
 
+	/**
+	 * 按平台公司 + 业务部门获取业务部门配置
+	 *
+	 * @param platformCompanyId 平台公司ID
+	 * @param businessDeptId    业务部门ID
+	 * @return 业务部门配置
+	 */
+	@GetMapping(BUSINESS_DEPT_CONFIG)
+	R<BusinessDeptConfig> getBusinessDeptConfig(@RequestParam("platformCompanyId") Long platformCompanyId,
+												@RequestParam("businessDeptId") Long businessDeptId);
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -189,4 +189,9 @@ public class ISysClientFallback implements ISysClient {
 		return R.fail("获取数据失败");
 	}
 
+	@Override
+	public R<BusinessDeptConfig> getBusinessDeptConfig(Long platformCompanyId, Long businessDeptId) {
+		return R.fail("获取数据失败");
+	}
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/BusinessDeptConfig.java

@@ -0,0 +1,87 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 业务部门配置实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_business_dept_config")
+@Schema(description = "业务部门配置")
+public class BusinessDeptConfig extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "平台公司ID")
+	private Long platformCompanyId;
+
+	@Schema(description = "平台公司名称")
+	private String platformCompanyName;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "业务部门ID")
+	private Long businessDeptId;
+
+	@Schema(description = "业务部门名称")
+	private String businessDeptName;
+
+	@Schema(description = "合同编码前缀")
+	private String contractCodePrefix;
+
+	@Schema(description = "初始流水号")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private Integer initialSerial;
+
+	@Schema(description = "金蝶公司代码")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private String kingdeeCompanyCode;
+
+	@Schema(description = "金蝶部门代码")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private String kingdeeDeptCode;
+
+	@Schema(description = "备注")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private String remark;
+
+}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java

@@ -203,14 +203,18 @@ public class Dept extends TenantEntity {
 
 	/**
 	 * 是否平台公司：0否，1是
+	 * ALWAYS：保证「否(0)」也能更新落库，避免被字段策略跳过
 	 */
 	@Schema(description = "是否平台公司：0否，1是")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private Integer isPlatformCompany;
 
 	/**
 	 * 是否业务部门：0否，1是
+	 * ALWAYS：保证「否(0)」也能更新落库，避免被字段策略跳过
 	 */
 	@Schema(description = "是否业务部门：0否，1是")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private Integer isBusinessDept;
 
 	/**

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/BusinessDeptConfigVO.java

@@ -0,0 +1,57 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.system.pojo.entity.BusinessDeptConfig;
+
+import java.io.Serial;
+
+/**
+ * 业务部门配置视图实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "业务部门配置")
+public class BusinessDeptConfigVO extends BusinessDeptConfig {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@TableField(exist = false)
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
+	@TableField(exist = false)
+	@Schema(description = "更新人姓名")
+	private String updateUserName;
+
+}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RoleDataScopeVO.java

@@ -67,6 +67,18 @@ public class RoleDataScopeVO implements Serializable {
 		return scope;
 	}
 
+	/**
+	 * 无组织可见（未配置数据权限时的默认结果）
+	 */
+	public static RoleDataScopeVO none() {
+		RoleDataScopeVO scope = new RoleDataScopeVO();
+		scope.setScopeType(RoleDataScopeType.CUSTOM.getCode());
+		scope.setAllDept(false);
+		scope.setOwnCreate(false);
+		scope.setDeptIds(Collections.emptyList());
+		return scope;
+	}
+
 	public static RoleDataScopeVO ownCreate() {
 		RoleDataScopeVO scope = new RoleDataScopeVO();
 		scope.setScopeType(RoleDataScopeType.OWN_CREATE.getCode());

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java

@@ -103,6 +103,18 @@ public class ContractChange extends TenantEntity {
 	@Schema(description = "乙方")
 	private String partyB;
 
+	@Schema(description = "甲方客商明细JSON")
+	private String partyAJson;
+
+	@Schema(description = "乙方客商明细JSON")
+	private String partyBJson;
+
+	@Schema(description = "丙方客商明细JSON")
+	private String partyCJson;
+
+	@Schema(description = "丙方")
+	private String partyC;
+
 	@Schema(description = "开始日期")
 	private LocalDate startDate;
 
@@ -204,12 +216,6 @@ public class ContractChange extends TenantEntity {
 	@Schema(description = "其他事项说明")
 	private String remark;
 
-	@Schema(description = "合规客商风险等级（展示用）")
-	private String hcsRiskLevel;
-
-	@Schema(description = "合规客商黑名单状态（展示用）")
-	private String hcsBlackStatus;
-
 	@Schema(description = "审批状态")
 	private String approvalStatus;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java

@@ -67,6 +67,12 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "合同负责部门")
 	private String organizationName;
 
+	@Schema(description = "平台公司ID")
+	private Long platformCompanyId;
+
+	@Schema(description = "平台公司")
+	private String platformCompanyName;
+
 	@Schema(description = "合同类别")
 	private String contractCategory;
 
@@ -79,6 +85,18 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "乙方")
 	private String partyB;
 
+	@Schema(description = "甲方客商明细JSON")
+	private String partyAJson;
+
+	@Schema(description = "乙方客商明细JSON")
+	private String partyBJson;
+
+	@Schema(description = "丙方客商明细JSON")
+	private String partyCJson;
+
+	@Schema(description = "丙方")
+	private String partyC;
+
 	@Schema(description = "开始日期")
 	private LocalDate startDate;
 
@@ -240,15 +258,6 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "合规履约计划ID（C103-9 返回 fdExeplanId）")
 	private String hcsExeplanId;
 
-	@Schema(description = "合规客商风险等级（C101-1，甲方/乙方取高）")
-	private String hcsRiskLevel;
-
-	@Schema(description = "合规客商黑名单状态（C101-1，甲方/乙方取是）")
-	private String hcsBlackStatus;
-
-	@Schema(description = "合规风险校验时间")
-	private LocalDateTime hcsRiskTime;
-
 	@Schema(description = "合规特批流程ID（C103-8 返回）")
 	private String hcsSpecFdId;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CustomerArchive.java

@@ -52,6 +52,9 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "客商编号")
 	private String customerCode;
 
+	@Schema(description = "供应商编码（金蝶A901-1供应商查询返回number，建档/同步时落库）")
+	private String supplierCode;
+
 	@Schema(description = "客商简称")
 	private String shortName;
 
@@ -182,4 +185,19 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "金蝶推送时间")
 	private LocalDateTime kingdeeSyncTime;
 
+	@Schema(description = "合规客商风险等级（C101-1，每日定时刷新）：0=低风险，1=中风险，2=高风险")
+	private String hcsRiskLevel;
+
+	@Schema(description = "合规客商黑名单状态（C101-1，每日定时刷新）：yes=是，no=否，handing=处理中")
+	private String kingdeeBlackStatus;
+
+	@Schema(description = "合规客商风险最近查询时间（C101-1）")
+	private LocalDateTime hcsRiskTime;
+
+	@Schema(description = "金蝶黑名单失信类别（A801-5 awrp_combofield_title，缺失兜底 awrp_combofield）")
+	private String kingdeeBlackCategory;
+
+	@Schema(description = "金蝶黑名单列入事由（A801-5 awrp_textareafield）")
+	private String kingdeeBlackReason;
+
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlement.java

@@ -160,6 +160,18 @@ public class FormalSettlement extends TenantEntity {
 	 * 金蝶同步状态：unsynced-未同步 synced-已同步 failed-同步失败
 	 */
 	private String kingdeeSyncStatus;
+	/**
+	 * 金蝶推送失败原因（仅 failed 态展示；重推成功转 synced 后残留原因不再回显）
+	 */
+	private String kingdeeFailReason;
+	/**
+	 * 金蝶冲销状态：unwrittenoff-未冲销 writtenoff-已冲销（null=未推送金蝶或未校验）
+	 */
+	private String kingdeeWriteOffStatus;
+	/**
+	 * 金蝶冲销状态确认时间（定时回写/预检回写时间）
+	 */
+	private LocalDateTime kingdeeWriteOffTime;
 	/**
 	 * 附件JSON
 	 */

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceApplication.java

@@ -167,6 +167,10 @@ public class InvoiceApplication extends TenantEntity {
 	 * 金蝶同步状态：unsynced-未同步 synced-已同步 failed-同步失败 invoiced-开票完成（终态）
 	 */
 	private String kingdeeStatus;
+	/**
+	 * 金蝶推送失败原因（仅 failed 态展示；重推成功转 synced 后残留原因不再回显）
+	 */
+	private String kingdeeFailReason;
 	/**
 	 * 同步金蝶时间
 	 */

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceApplicationInvoice.java

@@ -77,4 +77,11 @@ public class InvoiceApplicationInvoice extends TenantEntity {
 	@Schema(description = "A303-5 返回原文JSON留档")
 	private String rawJson;
 
+	/** 履约开票记录ID（C108-1 返回；非空即已推送，扫描据此幂等跳过） */
+	private String hcsPerfFdId;
+	/** 履约开票记录推送失败重试次数 */
+	private Integer hcsPerfRetryCount;
+	/** 履约开票记录最近推送失败原因（成功后清空） */
+	private String hcsPerfSyncMsg;
+
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceReceiptSettlement.java

@@ -55,4 +55,10 @@ public class InvoiceReceiptSettlement extends TenantEntity {
 	private BigDecimal settlementAmount;
 	private BigDecimal receivedInvoiceAmount;
 	private BigDecimal allocatedInvoiceAmount;
+	/** 履约收票记录ID（C108-1 返回；非空即已推送，扫描据此幂等跳过） */
+	private String hcsPerfFdId;
+	/** 履约收票记录推送失败重试次数 */
+	private Integer hcsPerfRetryCount;
+	/** 履约收票记录最近推送失败原因（成功后清空） */
+	private String hcsPerfSyncMsg;
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java

@@ -52,68 +52,96 @@ public class KingdeeReceiptFlow extends TenantEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 金蝶认领公告id（A301-2 返回 id，认领推送 A301-3 必填）
+	 * 金蝶认领公告id（历史 A301-2 同步遗留，A301-1 口径不再使用，恒为空）
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	private Long billId;
 	/**
-	 * 金蝶付款人id（A301-2 公告对应往来单位 id，认领推送 A301-3 用）
+	 * 金蝶付款人id（历史 A301-2 同步遗留，A301-1 口径不再使用，恒为空）
 	 */
 	private String payerId;
 	/**
-	 * 公告认领状态（A301-2 claimstatus：0未认领/1已认领）
+	 * 公告认领状态（历史 A301-2 同步遗留，A301-1 口径不再使用，恒为空）
 	 */
 	private String kingdeeClaimStatus;
 	/**
-	 * 我已认领（A301-2 claimme）
+	 * 我已认领（历史 A301-2 同步遗留，A301-1 口径不再使用，恒为空）
 	 */
 	private Boolean claimMe;
 	/**
-	 * 未认领金额（A301-2 unclaimamount）
+	 * 未匹配收款金额（A301-1 unmatchamountrec，金蝶参考展示，不参与认领额度）
 	 */
-	private BigDecimal unclaimedAmount;
+	private BigDecimal unmatchAmountRec;
 	/**
-	 * 手续费（A301-2 fee）
+	 * 已匹配收款金额（A301-1 matchamountrec）
+	 */
+	private BigDecimal matchAmountRec;
+	/**
+	 * 已匹配付款金额（A301-1 matchamountpay）
+	 */
+	private BigDecimal matchAmountPay;
+	/**
+	 * 未匹配付款金额（A301-1 unmatchamountpay）
+	 */
+	private BigDecimal unmatchAmountPay;
+	/**
+	 * 已结算金额（A301-1 settleamount）
+	 */
+	private BigDecimal settleAmount;
+	/**
+	 * 未结算金额（A301-1 unsettleamount）
+	 */
+	private BigDecimal unsettleAmount;
+	/**
+	 * 手续费（A301-1 fee）
 	 */
 	private BigDecimal fee;
 	/**
-	 * 收款人（A301-2 recpayee）
+	 * 收款人（A301-1 收款公司名称 org_name）
 	 */
 	private String payeeName;
 	/**
-	 * 收款通知单号（A301-2 billno）
+	 * 收款人（公司）.编码（A301-1 org_number）
+	 */
+	private String orgNumber;
+	/**
+	 * 核算组织.编码（A301-1 openorg_number）
+	 */
+	private String openOrgNumber;
+	/**
+	 * 金蝶收款单号（A301-1 billno）
 	 */
 	private String receiptNoticeNo;
 	/**
-	 * 付款人名称（A301-2 recviewpayer）
+	 * 付款人名称（A301-1 payername）
 	 */
 	private String payerName;
 	/**
-	 * 收款金额（A301-2 reamount）
+	 * 收款金额（A301-1 actrecamt）
 	 */
 	private BigDecimal receiptAmount;
 	/**
-	 * 对方单位名称（A301-2 oppunit）
+	 * 对方单位名称（A301-1 付款人名称）
 	 */
 	private String counterpartyName;
 	/**
-	 * 对方银行账号（A301-2 oppbanknumber）
+	 * 对方银行账号（A301-1 付款账户 payeracctbanknum）
 	 */
 	private String counterpartyAccount;
 	/**
-	 * 对方开户行（A301-2 oppbank）
+	 * 对方开户行（A301-1 付款银行 payerbankname）
 	 */
 	private String counterpartyBank;
 	/**
-	 * 摘要（A301-2 description）
+	 * 摘要（A301-1 txt_description）
 	 */
 	private String summary;
 	/**
-	 * 交易日期（A301-2 tradetime）
+	 * 交易日期（A301-1 业务日期 bizdate）
 	 */
 	private LocalDateTime transactionTime;
 	/**
-	 * 明细流水号（A301-2 detailid，回退 tradedetailno / bankdetailno，幂等键）
+	 * 明细流水号（收款单号 billno，幂等键；C104-2 按此定位合规侧收款流水）
 	 */
 	private String detailSerialNo;
 	/**
@@ -125,27 +153,27 @@ public class KingdeeReceiptFlow extends TenantEntity {
 	 */
 	private String claimStatus;
 	/**
-	 * 推送状态（none未推送/pushed已推送/failed推送失败；已推送为终态闸门，不允许二次推送）
+	 * 推送状态（none未推送/pushed已推送/failed推送失败；历史 A301-3 推送遗留，A301-1 口径下恒为 none，仅存量的已推送数据保留展示）
 	 */
 	private String pushStatus;
 	/**
-	 * 最近一次推送失败原因（成功后清空）
+	 * 最近一次推送失败原因（历史 A301-3 推送遗留）
 	 */
 	private String pushFailReason;
 	/**
-	 * 首次推送金蝶成功时间
+	 * 首次推送金蝶成功时间（历史 A301-3 推送遗留）
 	 */
 	private LocalDateTime pushedTime;
 	/**
-	 * 金蝶推送来源单据编码（分摊结算单号下划线拼接，推送时生成落库；分摊不变则重试编码不变，A301-1 回写匹配键）
+	 * 金蝶推送来源单据编码（历史 A301-3 推送遗留，A301-1 口径不再生成）
 	 */
 	private String awrpSrcCode;
 	/**
-	 * 金蝶收款单号（推送响应回填 / A301-1 回写推进）
+	 * 金蝶收款单号（A301-1 同步落库 billno）
 	 */
 	private String kingdeeBillNo;
 	/**
-	 * 金蝶回写状态（none未推送/pushed已推送/approved审核通过/received已收款/failed失败）
+	 * 金蝶单据状态（A301-1 billstatus 映射：none未推送/pushed已推送/approved审核通过/received已收款/failed失败，同步时随单据刷新）
 	 */
 	private String kingdeeBillStatus;
 	/**

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/LoadingManage.java

@@ -86,6 +86,12 @@ public class LoadingManage extends TenantEntity {
 	@Schema(description = "承运商合同ID")
 	private Long carrierContractId;
 
+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
 	@Schema(description = "发货地址")
 	private String departureAddress;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/PaymentApplication.java

@@ -117,6 +117,8 @@ public class PaymentApplication extends TenantEntity {
 	private String kingdeeBillId;
 	/** 金蝶同步状态：unsynced 未生成 / synced 已生成 / paying 付款中 / paid 已付款 / closed 已关闭 / failed 生成失败 */
 	private String kingdeeStatus;
+	/** 金蝶推送失败原因（仅 failed 态展示；重推成功转 synced 后残留原因不再回显） */
+	private String kingdeeFailReason;
 	/** 附件信息JSON */
 	private String attachmentsJson;
 	/** 备注 */
@@ -141,6 +143,8 @@ public class PaymentApplication extends TenantEntity {
 	private String hcsSpecFdId;
 	/** 特批状态：none/need/pushing/processing/approved/rejected */
 	private String hcsSpecStatus;
+	/** 合规付款特批结果附件ID（paymentLegal/result 回调 fileUrl，C103-5 下载入参、金蝶附件联带用） */
+	private String hcsSpecAttachFdId;
 	/** 履约记录ID（C108-1 返回，C108-2 更新必传） */
 	private String hcsPerfFdId;
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ReceiptClaimHcsRecord.java

@@ -0,0 +1,96 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 收款认领合规推送记录实体类
+ * <p>
+ * C107-1 认领记录推送结果落库（认领主单 × 合同一条）：成功持久化合规侧 fdId 供 C107-3 作废引用，
+ * 失败落推送标记与原因（仅记标记，不做定时重试）。
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_receipt_claim_hcs_record")
+@Schema(description = "收款认领合规推送记录")
+public class ReceiptClaimHcsRecord extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 认领主单id
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long receiptClaimId;
+	/**
+	 * 收款流水id
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long receiptFlowId;
+	/**
+	 * 合同id
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long contractId;
+	/**
+	 * 合同编号
+	 */
+	private String contractNo;
+	/**
+	 * 该认领主单分摊到本合同的认领金额
+	 */
+	private BigDecimal claimAmount;
+	/**
+	 * 合规侧认领记录fdId（C107-1 返回，C107-3 作废必填引用）
+	 */
+	private String hcsClaimRecordFdId;
+	/**
+	 * 推送状态（success推送成功/failed推送失败/voided已作废）
+	 */
+	private String pushStatus;
+	/**
+	 * 推送失败原因（成功后清空）
+	 */
+	private String failReason;
+	/**
+	 * 推送成功时间
+	 */
+	private LocalDateTime pushedTime;
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/SettlementAdjustment.java

@@ -30,6 +30,8 @@ public class SettlementAdjustment extends TenantEntity {
 	private String currentNode;
 	private String currentProcessor;
 	private String kingdeeSyncStatus;
+	/** 金蝶推送失败原因（随结算单推送失败落库，仅 failed 态展示） */
+	private String kingdeeFailReason;
 	/**
 	 * 金蝶单据号（未推送场景回填原结算单金蝶单号；重推场景回填新单金蝶单号）
 	 */

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/Waybill.java

@@ -136,6 +136,12 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "承运商合同ID")
 	private Long carrierContractId;
 
+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
 	@Schema(description = "司机ID")
 	private Long driverId;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/BusinessLicenseOcrVO.java

@@ -0,0 +1,54 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 营业执照 OCR 识别结果。
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "营业执照OCR识别结果")
+public class BusinessLicenseOcrVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 按第三方返回 key 聚合的字段，例如 uscc、company_name、legal_name。
+	 */
+	@Schema(description = "识别字段，键为第三方 OCR 的 key")
+	private Map<String, String> fields = new LinkedHashMap<>();
+
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractChangeVO.java

@@ -67,4 +67,12 @@ public class ContractChangeVO extends ContractChange {
 	@Schema(description = "同步状态名称")
 	private String syncStatusName;
 
+	@TableField(exist = false)
+	@Schema(description = "客商风险等级（甲乙双方关联客商档案实时组装，等级取高）：0=低风险，1=中风险，2=高风险")
+	private String hcsRiskLevel;
+
+	@TableField(exist = false)
+	@Schema(description = "客商黑名单状态（甲乙双方关联客商档案实时组装，任一方金蝶黑名单命中记是）：yes/no")
+	private String kingdeeBlackStatus;
+
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java

@@ -64,7 +64,7 @@ public class ContractManageVO extends ContractManage {
 	private Boolean hcsSynced;
 
 	@TableField(exist = false)
-	@Schema(description = "生效类型筛选")
+	@Schema(description = "合同状态筛选")
 	private String effectiveType;
 
 	@TableField(exist = false)
@@ -87,4 +87,16 @@ public class ContractManageVO extends ContractManage {
 	@Schema(description = "审核状态名称")
 	private String approvalStatusName;
 
+	@TableField(exist = false)
+	@Schema(description = "客商风险等级（甲乙双方关联客商档案实时组装，等级取高）：0=低风险，1=中风险，2=高风险")
+	private String hcsRiskLevel;
+
+	@TableField(exist = false)
+	@Schema(description = "客商黑名单状态（甲乙双方关联客商档案实时组装，任一方金蝶黑名单命中记是）：yes/no")
+	private String kingdeeBlackStatus;
+
+	@TableField(exist = false)
+	@Schema(description = "客商风险明细文案（甲乙双方风险信息合并，列表悬浮展示，与客商列表/表单实时提示同口径）")
+	private String hcsRiskDetail;
+
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerArchiveVO.java

@@ -106,4 +106,12 @@ public class CustomerArchiveVO extends CustomerArchive {
 	@Schema(description = "已付金额合计（元）")
 	private BigDecimal usedFundLimit;
 
+	@TableField(exist = false)
+	@Schema(description = "客商风险筛选值：blacklist黑名单/high高风险/middle中风险/low低风险")
+	private String customerRisk;
+
+	@TableField(exist = false)
+	@Schema(description = "客商风险明细（后台组装：合同系统风险等级+金蝶黑名单失信类别/列入事由）")
+	private String hcsRiskDetail;
+
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CustomerRiskVO.java

@@ -63,6 +63,9 @@ public class CustomerRiskVO implements Serializable {
 	@Schema(description = "风险等级名称（服务端转义：黑名单/高风险/中风险/低风险，黑名单优先；无等级为空）")
 	private String riskLevelName;
 
+	@Schema(description = "是否命中金蝶黑名单（A801-5，黑名单展示口径；红字细分由前端按等级+本标记翻译）")
+	private Boolean kingdeeBlackHit;
+
 	@Schema(description = "是否高风险/黑名单客商（外部客商专用，内部组织恒为 false）")
 	private Boolean risky;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InvoiceApplicationSheetVO.java

@@ -26,6 +26,7 @@
 package org.springblade.transport.pojo.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.transport.pojo.entity.InvoiceApplicationLine;
@@ -44,4 +45,8 @@ import java.util.List;
 public class InvoiceApplicationSheetVO extends InvoiceApplicationSheet {
 	@Serial private static final long serialVersionUID = 1L;
 	@TableField(exist = false) private List<InvoiceApplicationLine> lines;
+	@Schema(description = "开票状态名称（按金蝶回写的发票结果实时推导：已开票/未开票）")
+	@TableField(exist = false) private String invoiceStatusName;
+	@Schema(description = "金蝶开票结果备注（本张发票经 A303-5 回写的发票号、开票日期、价税合计汇总）")
+	@TableField(exist = false) private String kingdeeResultRemark;
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/LoadingCarrierContractVO.java

@@ -55,4 +55,17 @@ public class LoadingCarrierContractVO implements Serializable {
 	@Schema(description = "承运商名称")
 	private String carrierName;
 
+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
+	@Schema(description = "统一信用代码")
+	private String creditCode;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "客商档案ID")
+	private Long customerId;
+
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MasterOrderCarrierVO.java

@@ -34,4 +34,17 @@ public class MasterOrderCarrierVO implements Serializable {
 	@Schema(description = "承运商名称")
 	private String carrierName;
 
+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
+	@Schema(description = "统一信用代码")
+	private String creditCode;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "客商档案ID")
+	private Long customerId;
+
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/cache/UserCache.java

@@ -35,6 +35,9 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.system.feign.IUserClient;
 
+import java.util.Collections;
+import java.util.List;
+
 import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;
 
@@ -47,6 +50,7 @@ import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;
 public class UserCache {
 	private static final String USER_CACHE_ID = "user:id:";
 	private static final String USER_CACHE_ACCOUNT = "user:account:";
+	private static final String USER_CACHE_MANAGE_DEPT = "user:manage-dept:";
 
 	private static IUserClient userClient;
 
@@ -89,6 +93,26 @@ public class UserCache {
 		}
 	}
 
+	/**
+	 * 获取用户「数据管理权限」组织（含下级展开）
+	 *
+	 * @param userId 用户主键
+	 * @return 可管理组织 ID 集合
+	 */
+	@SuppressWarnings("unchecked")
+	public static List<Long> getManageDeptIds(Long userId) {
+		if (userId == null || userId <= 0) {
+			return Collections.emptyList();
+		}
+		try {
+			List<Long> deptIdList = CacheUtil.get(USER_CACHE, USER_CACHE_MANAGE_DEPT, userId, () -> loadManageDeptIds(userId));
+			return deptIdList == null ? Collections.emptyList() : deptIdList;
+		} catch (RuntimeException exception) {
+			log.warn("用户数据管理组织缓存读取失败，改为直连查询, userId={}", userId, exception);
+			return loadManageDeptIds(userId);
+		}
+	}
+
 	/**
 	 * 获取用户姓名
 	 *
@@ -153,6 +177,14 @@ public class UserCache {
 		return result.getData();
 	}
 
+	private static List<Long> loadManageDeptIds(Long userId) {
+		R<List<Long>> result = getUserClient().manageDeptIds(userId);
+		if (result == null || !result.isSuccess() || result.getData() == null) {
+			return Collections.emptyList();
+		}
+		return result.getData();
+	}
+
 	private static void clearBrokenUserCache() {
 		CacheUtil.clear(USER_CACHE);
 		CacheUtil.clear(USER_CACHE, Boolean.FALSE);

blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java

@@ -37,6 +37,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * User Feign接口类
  *
@@ -62,6 +64,7 @@ public interface IUserClient {
 	String REGISTER_USER = API_PREFIX + "/register-user";
 	String REMOVE_USER = API_PREFIX + "/remove-user";
 	String BIND_WX_MINI_OPENID = API_PREFIX + "/bind-wx-mini-openid";
+	String MANAGE_DEPT_IDS = API_PREFIX + "/manage-dept-ids";
 
 	/**
 	 * 获取用户信息
@@ -72,6 +75,15 @@ public interface IUserClient {
 	@GetMapping(USER_BY_ID)
 	R<User> userInfoById(@RequestParam("userId") Long userId);
 
+	/**
+	 * 解析用户「数据管理权限」组织（含下级）
+	 *
+	 * @param userId 用户主键
+	 * @return 可管理组织 ID 集合
+	 */
+	@GetMapping(MANAGE_DEPT_IDS)
+	R<List<Long>> manageDeptIds(@RequestParam("userId") Long userId);
+
 
 	/**
 	 * 根据账号获取用户信息

blade-service/blade-system/src/main/java/org/springblade/system/controller/BusinessDeptConfigController.java

@@ -0,0 +1,133 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.system.pojo.entity.BusinessDeptConfig;
+import org.springblade.system.pojo.vo.BusinessDeptConfigVO;
+import org.springblade.system.service.IBusinessDeptConfigService;
+import org.springblade.system.wrapper.BusinessDeptConfigWrapper;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 业务部门配置控制器
+ *
+ * @author Chill
+ */
+@NonDS
+@RestController
+@AllArgsConstructor
+@PreAuth(menu = "business_dept_config")
+@RequestMapping("/business-dept-config")
+@Tag(name = "业务部门配置", description = "业务部门配置")
+public class BusinessDeptConfigController extends BladeController {
+
+	private final IBusinessDeptConfigService businessDeptConfigService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "详情", description = "传入businessDeptConfig")
+	public R<BusinessDeptConfigVO> detail(BusinessDeptConfig businessDeptConfig) {
+		if (Func.isEmpty(businessDeptConfig.getId())) {
+			return R.fail("主键不能为空");
+		}
+		BusinessDeptConfig detail = businessDeptConfigService.getById(businessDeptConfig.getId());
+		if (Func.isEmpty(detail)) {
+			return R.fail("业务部门配置不存在");
+		}
+		return R.data(BusinessDeptConfigWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "分页", description = "传入businessDeptConfig")
+	public R<IPage<BusinessDeptConfigVO>> list(BusinessDeptConfigVO businessDeptConfig, Query query) {
+		IPage<BusinessDeptConfigVO> pages = businessDeptConfigService.selectBusinessDeptConfigPage(
+			Condition.getPage(query), businessDeptConfig);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "新增或修改", description = "传入businessDeptConfig")
+	public R submit(@Valid @RequestBody BusinessDeptConfig businessDeptConfig) {
+		return R.status(businessDeptConfigService.submit(businessDeptConfig));
+	}
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 4)
+	@Operation(summary = "逻辑删除", description = "传入ids")
+	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(businessDeptConfigService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	/**
+	 * 按平台公司 + 业务部门查询
+	 */
+	@GetMapping("/by-platform-dept")
+	@ApiOperationSupport(order = 5)
+	@Operation(summary = "按平台公司与业务部门查询", description = "传入platformCompanyId、businessDeptId")
+	public R<BusinessDeptConfigVO> byPlatformDept(
+		@Parameter(description = "平台公司ID", required = true) @RequestParam Long platformCompanyId,
+		@Parameter(description = "业务部门ID", required = true) @RequestParam Long businessDeptId) {
+		BusinessDeptConfig detail = businessDeptConfigService.getByPlatformAndDept(platformCompanyId, businessDeptId);
+		if (detail == null) {
+			return R.data(null);
+		}
+		return R.data(BusinessDeptConfigWrapper.build().entityVO(detail));
+	}
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -95,7 +95,9 @@ public class DeptController extends BladeController {
 	@Parameters({
 		@Parameter(name = "deptName", description = "组织名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 		@Parameter(name = "shortName", description = "组织简称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
-		@Parameter(name = "fullName", description = "部门全称", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
+		@Parameter(name = "fullName", description = "部门全称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+		@Parameter(name = "isPlatformCompany", description = "是否平台公司", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+		@Parameter(name = "isBusinessDept", description = "是否业务部门", in = ParameterIn.QUERY, schema = @Schema(type = "integer"))
 	})
 	@ApiOperationSupport(order = 2)
 	@Operation(summary = "列表", description = "传入dept")
@@ -111,7 +113,9 @@ public class DeptController extends BladeController {
 	@Parameters({
 		@Parameter(name = "deptName", description = "组织名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 		@Parameter(name = "shortName", description = "组织简称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
-		@Parameter(name = "fullName", description = "部门全称", in = ParameterIn.QUERY, schema = @Schema(type = "string"))
+		@Parameter(name = "fullName", description = "部门全称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+		@Parameter(name = "isPlatformCompany", description = "是否平台公司", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+		@Parameter(name = "isBusinessDept", description = "是否业务部门", in = ParameterIn.QUERY, schema = @Schema(type = "integer"))
 	})
 	@ApiOperationSupport(order = 3)
 	@Operation(summary = "懒加载列表", description = "传入dept")
@@ -122,8 +126,11 @@ public class DeptController extends BladeController {
 
 	/**
 	 * 获取部门树形结构
+	 * <p>
+	 * 登录即可调用；数据范围由角色「数据权限」中 {@code dept_tree}（树形结构）单独配置，
+	 * 未配置时返回空树（默认不展示）。
 	 */
-	@PreAuth(menu = "dept")
+	@PreAuth(AuthConstant.PERMIT_ALL)
 	@GetMapping("/tree")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "树形结构", description = "树形结构")
@@ -135,8 +142,9 @@ public class DeptController extends BladeController {
 	 * 懒加载获取部门树形结构
 	 * <p>
 	 * tenantId 由 Service 层完整决策：超管入参为空表示查全部，非超管强制覆盖为会话租户。
+	 * 数据范围与 {@link #tree} 相同，由 {@code dept_tree} 单独配置，未配置时返回空树。
 	 */
-	@PreAuth(menu = "dept")
+	@PreAuth(AuthConstant.PERMIT_ALL)
 	@GetMapping("/lazy-tree")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "懒加载树形结构", description = "树形结构")

blade-service/blade-system/src/main/java/org/springblade/system/convert/UserConvert.java

@@ -70,14 +70,14 @@ public interface UserConvert {
     @Mapping(source = "lastname", target = "realName")
     @Mapping(source = "mobile", target = "phone")
     @Mapping(source = "email", target = "email")
-    @Mapping(source = "loginid", target = "oaLoginId")
+    @Mapping(target = "oaLoginId", ignore = true)
     @Mapping(source = "modified", target = "oaModified")
     User baseConvert(OAPersonResponse person);
 
     @Mapping(source = "subcompanyname", target = "companyName")
     @Mapping(source = "departmentname", target = "deptName")
     @Mapping(source = "id", target = "oaId")
-    @Mapping(source = "loginid", target = "oaLoginId")
+    @Mapping(target = "oaLoginId", ignore = true)
     UserDept userDeptConvert(OAPersonResponse person);
 
     /**
@@ -88,6 +88,7 @@ public interface UserConvert {
      */
     default User person2user(OAPersonResponse person, String defaultPassword) {
         User user = baseConvert(person);
+        user.setOaLoginId(resolveOaLoginId(person));
         user.setAccount(resolveAccount(person));
         // OA 可能返回多号（如 133.../137...），只保留首个号码再入库加密
         user.setPhone(normalizeMobile(user.getPhone()));
@@ -106,6 +107,22 @@ public interface UserConvert {
         return user;
     }
 
+    /**
+     * 解析 OA 登录名：优先工号 workcode，其次 loginid
+     */
+    default String resolveOaLoginId(OAPersonResponse person) {
+        if (person == null) {
+            return null;
+        }
+        if (StringUtils.isNotBlank(person.getWorkcode())) {
+            return person.getWorkcode().trim();
+        }
+        if (StringUtils.isNotBlank(person.getLoginid())) {
+            return person.getLoginid().trim();
+        }
+        return null;
+    }
+
     /**
      * 规范化手机号：去空白，多号时取第一个
      */
@@ -124,7 +141,7 @@ public interface UserConvert {
     }
 
     /**
-     * 解析本系统登录账号：优先 OA loginid，其次工号，最后手机号
+     * 解析本系统登录账号：优先工号 workcode，其次 OA loginid，最后手机号
      *
      * @param person OA人员
      * @return 账号，无法识别时返回 null
@@ -133,12 +150,12 @@ public interface UserConvert {
         if (person == null) {
             return null;
         }
-        if (StringUtils.isNotBlank(person.getLoginid())) {
-            return person.getLoginid().trim();
-        }
         if (StringUtils.isNotBlank(person.getWorkcode())) {
             return person.getWorkcode().trim();
         }
+        if (StringUtils.isNotBlank(person.getLoginid())) {
+            return person.getLoginid().trim();
+        }
         if (StringUtils.isNotBlank(person.getMobile())) {
             return person.getMobile().trim();
         }
@@ -148,7 +165,7 @@ public interface UserConvert {
     /**
      *  oa人员转本系统用户部门
      * @param person
-     * @param userMap OA登录名与用户id
+     * @param userMap 同步键（W:工号）与用户id
      * @return
      */
     default UserDept person2userDept(OAPersonResponse person, Map<String, Long> userMap) {
@@ -162,9 +179,11 @@ public interface UserConvert {
         userDept.setStatus(status);
         // 排序
         userDept.setSort(OAUtils.parseInt(person.getDsporder()));
-        // 用户id，按 OA 登录名关联本批已新增或更新的用户
+        // 用户id，按工号同步键关联本批已新增或更新的用户
-        String oaLoginId = person == null ? null : StringUtils.trimToNull(person.getLoginid());
+        String oaLoginId = resolveOaLoginId(person);
-        userDept.setUserId(oaLoginId == null ? null : userMap.get(oaLoginId));
+        userDept.setOaLoginId(oaLoginId);
+        String workcode = person == null ? null : StringUtils.trimToNull(person.getWorkcode());
+        userDept.setUserId(workcode == null ? null : userMap.get("W:" + workcode));
         userDept.setSyncTime(new Date());
         return userDept;
     }

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -69,6 +69,7 @@ public class SysClient implements ISysClient {
 	private final ICargoTypeService cargoTypeService;
 	private final IMeasurementUnitService measurementUnitService;
 	private final IInvoiceItemService invoiceItemService;
+	private final IBusinessDeptConfigService businessDeptConfigService;
 
 	@Override
 	@GetMapping(MENU)
@@ -257,4 +258,10 @@ public class SysClient implements ISysClient {
 			.orderByAsc(InvoiceItem::getCategoryName, InvoiceItem::getShortName)));
 	}
 
+	@Override
+	@GetMapping(BUSINESS_DEPT_CONFIG)
+	public R<BusinessDeptConfig> getBusinessDeptConfig(Long platformCompanyId, Long businessDeptId) {
+		return R.data(businessDeptConfigService.getByPlatformAndDept(platformCompanyId, businessDeptId));
+	}
+
 }

blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java

@@ -38,9 +38,12 @@ import org.springblade.system.service.IUserService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.Hidden;
 
+import java.util.List;
+
 /**
  * 用户服务Feign实现类
  *
@@ -60,6 +63,12 @@ public class UserClient implements IUserClient {
 		return R.data(service.getById(userId));
 	}
 
+	@Override
+	@GetMapping(MANAGE_DEPT_IDS)
+	public R<List<Long>> manageDeptIds(@RequestParam("userId") Long userId) {
+		return R.data(service.resolveManageDeptIds(userId));
+	}
+
 	@Override
 	@GetMapping(USER_BY_ACCOUNT)
 	public R<User> userByAccount(String tenantId, String account) {

blade-service/blade-system/src/main/java/org/springblade/system/mapper/BusinessDeptConfigMapper.java

@@ -0,0 +1,53 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.system.pojo.entity.BusinessDeptConfig;
+import org.springblade.system.pojo.vo.BusinessDeptConfigVO;
+
+import java.util.List;
+
+/**
+ * 业务部门配置 Mapper 接口
+ *
+ * @author Chill
+ */
+public interface BusinessDeptConfigMapper extends BaseMapper<BusinessDeptConfig> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page               分页
+	 * @param businessDeptConfig 查询条件
+	 * @return 分页数据
+	 */
+	List<BusinessDeptConfigVO> selectBusinessDeptConfigPage(IPage<BusinessDeptConfigVO> page,
+															@Param("businessDeptConfig") BusinessDeptConfigVO businessDeptConfig);
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/mapper/BusinessDeptConfigMapper.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.system.mapper.BusinessDeptConfigMapper">
+
+    <resultMap id="businessDeptConfigResultMap" type="org.springblade.system.pojo.vo.BusinessDeptConfigVO">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="platform_company_id" property="platformCompanyId"/>
+        <result column="platform_company_name" property="platformCompanyName"/>
+        <result column="business_dept_id" property="businessDeptId"/>
+        <result column="business_dept_name" property="businessDeptName"/>
+        <result column="contract_code_prefix" property="contractCodePrefix"/>
+        <result column="initial_serial" property="initialSerial"/>
+        <result column="kingdee_company_code" property="kingdeeCompanyCode"/>
+        <result column="kingdee_dept_code" property="kingdeeDeptCode"/>
+        <result column="remark" property="remark"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_user_name" property="createUserName"/>
+        <result column="update_user_name" property="updateUserName"/>
+    </resultMap>
+
+    <select id="selectBusinessDeptConfigPage" resultMap="businessDeptConfigResultMap">
+        SELECT
+            bbc.*,
+            cu.real_name AS create_user_name,
+            uu.real_name AS update_user_name
+        FROM blade_business_dept_config bbc
+        LEFT JOIN blade_user cu ON cu.id = bbc.create_user
+        LEFT JOIN blade_user uu ON uu.id = bbc.update_user
+        WHERE bbc.is_deleted = 0
+        <if test="businessDeptConfig.platformCompanyId != null">
+            AND bbc.platform_company_id = #{businessDeptConfig.platformCompanyId}
+        </if>
+        <if test="businessDeptConfig.businessDeptId != null">
+            AND bbc.business_dept_id = #{businessDeptConfig.businessDeptId}
+        </if>
+        <if test="businessDeptConfig.platformCompanyName != null and businessDeptConfig.platformCompanyName != ''">
+            <bind name="platformCompanyNameLike" value="'%' + businessDeptConfig.platformCompanyName + '%'"/>
+            AND bbc.platform_company_name LIKE #{platformCompanyNameLike}
+        </if>
+        <if test="businessDeptConfig.businessDeptName != null and businessDeptConfig.businessDeptName != ''">
+            <bind name="businessDeptNameLike" value="'%' + businessDeptConfig.businessDeptName + '%'"/>
+            AND bbc.business_dept_name LIKE #{businessDeptNameLike}
+        </if>
+        ORDER BY bbc.create_time DESC
+    </select>
+
+</mapper>

blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml

@@ -90,6 +90,12 @@
         <if test="param3.fullName!=null and param3.fullName!=''">
             and dept.full_name like concat(concat('%', #{param3.fullName}),'%')
         </if>
+        <if test="param3.isPlatformCompany!=null and param3.isPlatformCompany!=''">
+            and dept.is_platform_company = #{param3.isPlatformCompany}
+        </if>
+        <if test="param3.isBusinessDept!=null and param3.isBusinessDept!=''">
+            and dept.is_business_dept = #{param3.isBusinessDept}
+        </if>
         ORDER BY dept.sort
     </select>
 

blade-service/blade-system/src/main/java/org/springblade/system/service/IBusinessDeptConfigService.java

@@ -0,0 +1,66 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.system.pojo.entity.BusinessDeptConfig;
+import org.springblade.system.pojo.vo.BusinessDeptConfigVO;
+
+/**
+ * 业务部门配置服务类
+ *
+ * @author Chill
+ */
+public interface IBusinessDeptConfigService extends BaseService<BusinessDeptConfig> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page               分页
+	 * @param businessDeptConfig 查询条件
+	 * @return 分页数据
+	 */
+	IPage<BusinessDeptConfigVO> selectBusinessDeptConfigPage(IPage<BusinessDeptConfigVO> page, BusinessDeptConfigVO businessDeptConfig);
+
+	/**
+	 * 新增或修改
+	 *
+	 * @param businessDeptConfig 配置
+	 * @return 是否成功
+	 */
+	boolean submit(BusinessDeptConfig businessDeptConfig);
+
+	/**
+	 * 按平台公司 + 业务部门查询配置
+	 *
+	 * @param platformCompanyId 平台公司ID
+	 * @param businessDeptId    业务部门ID
+	 * @return 配置，不存在返回 null
+	 */
+	BusinessDeptConfig getByPlatformAndDept(Long platformCompanyId, Long businessDeptId);
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleMenuDataScopeService.java

@@ -66,6 +66,16 @@ public interface IRoleMenuDataScopeService extends BaseService<RoleMenuDataScope
 	 */
 	RoleDataScopeVO resolveByMenuCode(List<Long> roleIds, String menuCode, List<Long> userDeptIds);
 
+	/**
+	 * 按菜单编码解析角色数据权限；菜单不存在或未配置时返回空权限（不回落为全部组织）
+	 *
+	 * @param roleIds     角色ID集合
+	 * @param menuCode    菜单编码
+	 * @param userDeptIds 用户所属组织
+	 * @return 解析结果
+	 */
+	RoleDataScopeVO resolveByMenuCodeOrEmpty(List<Long> roleIds, String menuCode, List<Long> userDeptIds);
+
 	/**
 	 * 合并用户全部角色菜单配置为最宽数据权限
 	 *

blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java

@@ -257,6 +257,14 @@ public interface IUserService extends BaseService<User> {
 	 */
 	boolean removeUser(String userIds);
 
+	/**
+	 * 解析用户「数据管理权限」组织（含下级展开）
+	 *
+	 * @param userId 用户主键
+	 * @return 可管理组织 ID 集合；无配置时返回空列表
+	 */
+	List<Long> resolveManageDeptIds(Long userId);
+
 	/**
 	 * 导入用户数据（仅超管 + Excel 显式指定时允许跨租户，否则归属当前会话租户）
 	 *

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/BusinessDeptConfigServiceImpl.java

@@ -0,0 +1,208 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.system.mapper.BusinessDeptConfigMapper;
+import org.springblade.system.pojo.entity.BusinessDeptConfig;
+import org.springblade.system.pojo.entity.Dept;
+import org.springblade.system.pojo.vo.BusinessDeptConfigVO;
+import org.springblade.system.service.IBusinessDeptConfigService;
+import org.springblade.system.service.IDeptService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import lombok.RequiredArgsConstructor;
+
+import java.util.Objects;
+
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
+
+/**
+ * 业务部门配置服务实现类
+ *
+ * @author Chill
+ */
+@Service
+@RequiredArgsConstructor
+public class BusinessDeptConfigServiceImpl extends BaseServiceImpl<BusinessDeptConfigMapper, BusinessDeptConfig>
+	implements IBusinessDeptConfigService {
+
+	private static final int PREFIX_MAX_LENGTH = 64;
+	private static final int CODE_MAX_LENGTH = 64;
+	private static final int NAME_MAX_LENGTH = 100;
+	private static final int REMARK_MAX_LENGTH = 200;
+	private static final int SERIAL_MAX = 999;
+
+	private final IDeptService deptService;
+
+	@Override
+	public IPage<BusinessDeptConfigVO> selectBusinessDeptConfigPage(IPage<BusinessDeptConfigVO> page,
+																	BusinessDeptConfigVO businessDeptConfig) {
+		return page.setRecords(baseMapper.selectBusinessDeptConfigPage(page, businessDeptConfig));
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean submit(BusinessDeptConfig businessDeptConfig) {
+		prepare(businessDeptConfig);
+		validate(businessDeptConfig);
+		boolean success = saveOrUpdate(businessDeptConfig);
+		if (success) {
+			CacheUtil.clear(SYS_CACHE);
+			CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
+		}
+		return success;
+	}
+
+	@Override
+	public BusinessDeptConfig getByPlatformAndDept(Long platformCompanyId, Long businessDeptId) {
+		if (Func.isEmpty(platformCompanyId) || Func.isEmpty(businessDeptId)) {
+			return null;
+		}
+		return getOne(Wrappers.<BusinessDeptConfig>lambdaQuery()
+			.eq(BusinessDeptConfig::getPlatformCompanyId, platformCompanyId)
+			.eq(BusinessDeptConfig::getBusinessDeptId, businessDeptId)
+			.eq(BusinessDeptConfig::getIsDeleted, 0)
+			.last("LIMIT 1"), false);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean deleteLogic(java.util.List<Long> ids) {
+		boolean success = super.deleteLogic(ids);
+		if (success) {
+			CacheUtil.clear(SYS_CACHE);
+			CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
+		}
+		return success;
+	}
+
+	private void prepare(BusinessDeptConfig businessDeptConfig) {
+		Dept platformCompany = requirePlatformCompany(businessDeptConfig.getPlatformCompanyId());
+		Dept businessDept = requireBusinessDept(businessDeptConfig.getBusinessDeptId());
+		businessDeptConfig.setPlatformCompanyName(platformCompany.getDeptName());
+		businessDeptConfig.setBusinessDeptName(businessDept.getDeptName());
+		businessDeptConfig.setContractCodePrefix(trimToEmpty(businessDeptConfig.getContractCodePrefix()));
+		businessDeptConfig.setKingdeeDeptCode(trimToNull(businessDeptConfig.getKingdeeDeptCode()));
+		businessDeptConfig.setRemark(trimToNull(businessDeptConfig.getRemark()));
+		// 金蝶公司代码始终关联平台公司组织中配置的金蝶代码
+		businessDeptConfig.setKingdeeCompanyCode(trimToNull(platformCompany.getKingdeeDeptCode()));
+		if (Func.isEmpty(businessDeptConfig.getStatus())) {
+			businessDeptConfig.setStatus(1);
+		}
+	}
+
+	private void validate(BusinessDeptConfig businessDeptConfig) {
+		if (Func.isEmpty(businessDeptConfig.getPlatformCompanyId())) {
+			throw new ServiceException("请选择平台公司");
+		}
+		if (Func.isEmpty(businessDeptConfig.getBusinessDeptId())) {
+			throw new ServiceException("请选择业务部门");
+		}
+		if (Func.isEmpty(businessDeptConfig.getContractCodePrefix())) {
+			throw new ServiceException("请输入合同编码前缀");
+		}
+		if (businessDeptConfig.getContractCodePrefix().length() > PREFIX_MAX_LENGTH) {
+			throw new ServiceException("合同编码前缀不能超过64字");
+		}
+		if (Func.isNotEmpty(businessDeptConfig.getPlatformCompanyName())
+			&& businessDeptConfig.getPlatformCompanyName().length() > NAME_MAX_LENGTH) {
+			throw new ServiceException("平台公司名称不能超过100字");
+		}
+		if (Func.isNotEmpty(businessDeptConfig.getBusinessDeptName())
+			&& businessDeptConfig.getBusinessDeptName().length() > NAME_MAX_LENGTH) {
+			throw new ServiceException("业务部门名称不能超过100字");
+		}
+		if (Func.isNotEmpty(businessDeptConfig.getKingdeeCompanyCode())
+			&& businessDeptConfig.getKingdeeCompanyCode().length() > CODE_MAX_LENGTH) {
+			throw new ServiceException("金蝶公司代码不能超过64字");
+		}
+		if (Func.isNotEmpty(businessDeptConfig.getKingdeeDeptCode())
+			&& businessDeptConfig.getKingdeeDeptCode().length() > CODE_MAX_LENGTH) {
+			throw new ServiceException("金蝶部门代码不能超过64字");
+		}
+		if (Func.isNotEmpty(businessDeptConfig.getRemark())
+			&& businessDeptConfig.getRemark().length() > REMARK_MAX_LENGTH) {
+			throw new ServiceException("备注不能超过200字");
+		}
+		Integer initialSerial = businessDeptConfig.getInitialSerial();
+		if (initialSerial != null && (initialSerial < 1 || initialSerial > SERIAL_MAX)) {
+			throw new ServiceException("初始流水号必须在1到999之间");
+		}
+		boolean duplicated = count(Wrappers.<BusinessDeptConfig>lambdaQuery()
+			.eq(BusinessDeptConfig::getPlatformCompanyId, businessDeptConfig.getPlatformCompanyId())
+			.eq(BusinessDeptConfig::getBusinessDeptId, businessDeptConfig.getBusinessDeptId())
+			.eq(BusinessDeptConfig::getIsDeleted, 0)
+			.ne(Func.isNotEmpty(businessDeptConfig.getId()), BusinessDeptConfig::getId, businessDeptConfig.getId())) > 0;
+		if (duplicated) {
+			throw new ServiceException("该平台公司与业务部门的配置已存在，不能重复添加");
+		}
+	}
+
+	private Dept requirePlatformCompany(Long platformCompanyId) {
+		if (Func.isEmpty(platformCompanyId)) {
+			throw new ServiceException("请选择平台公司");
+		}
+		Dept dept = deptService.getById(platformCompanyId);
+		if (dept == null || Objects.equals(dept.getIsDeleted(), 1)) {
+			throw new ServiceException("平台公司不存在");
+		}
+		if (!Objects.equals(dept.getIsPlatformCompany(), 1)) {
+			throw new ServiceException("所选组织不是平台公司");
+		}
+		return dept;
+	}
+
+	private Dept requireBusinessDept(Long businessDeptId) {
+		if (Func.isEmpty(businessDeptId)) {
+			throw new ServiceException("请选择业务部门");
+		}
+		Dept dept = deptService.getById(businessDeptId);
+		if (dept == null || Objects.equals(dept.getIsDeleted(), 1)) {
+			throw new ServiceException("业务部门不存在");
+		}
+		if (!Objects.equals(dept.getIsBusinessDept(), 1)) {
+			throw new ServiceException("所选组织不是业务部门");
+		}
+		return dept;
+	}
+
+	private String trimToEmpty(String value) {
+		return value == null ? "" : value.trim();
+	}
+
+	private String trimToNull(String value) {
+		String text = trimToEmpty(value);
+		return text.isEmpty() ? null : text;
+	}
+
+}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -224,13 +224,18 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 			.toList();
 	}
 
+	/**
+	 * 组织树专用数据权限菜单编码（角色「数据权限」中单独配置；未配置时组织树默认不展示）。
+	 */
+	public static final String MENU_DEPT_TREE = "dept_tree";
+
 	/**
 	 * 解析当前登录用户的组织树数据权限。
 	 * <p>
-	 * 超管或角色菜单数据权限最宽合并为「全部组织」时不过滤；
+	 * 仅读取 {@link #MENU_DEPT_TREE}「树形结构」菜单的数据权限配置，不再合并其他业务菜单；
-	 * 其余按角色配置的组织并集过滤。仅「本人创建」时按用户所属组织及下级展示组织树。
+	 * 超管不过滤；未配置该菜单数据权限时返回空树（默认不显示）。
 	 *
-	 * @return 过滤上下文；无法识别用户时按空权限处理
+	 * @return 过滤上下文；无法识别用户或未配置时按空权限处理
 	 */
 	private DeptDataScopeFilter resolveDeptDataScopeFilter() {
 		if (AuthUtil.isAdministrator()) {
@@ -246,8 +251,11 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		if (Func.isNotEmpty(user) && Func.isNotEmpty(user.getDeptId())) {
 			userDeptIds = Func.toLongList(user.getDeptId());
 		}
-		RoleDataScopeVO scope = roleMenuDataScopeService.resolveWidest(roleIds, userDeptIds);
+		RoleDataScopeVO scope = roleMenuDataScopeService.resolveByMenuCodeOrEmpty(roleIds, MENU_DEPT_TREE, userDeptIds);
-		if (scope == null || scope.isAllDept()) {
+		if (scope == null) {
+			return DeptDataScopeFilter.empty();
+		}
+		if (scope.isAllDept()) {
 			return DeptDataScopeFilter.all();
 		}
 		LinkedHashSet<Long> allowedDeptIds = new LinkedHashSet<>();
@@ -665,12 +673,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 			dept.setAncestors(parent.getAncestors() + StringPool.COMMA + dept.getParentId());
 		}
 		dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
-		if (dept.getIsPlatformCompany() == null) {
+		// 统一规范为 0/1，避免前端传空串、布尔或其它类型导致更新未生效
-			dept.setIsPlatformCompany(0);
+		dept.setIsPlatformCompany(normalizeYesNoFlag(dept.getIsPlatformCompany()));
-		}
+		dept.setIsBusinessDept(normalizeYesNoFlag(dept.getIsBusinessDept()));
-		if (dept.getIsBusinessDept() == null) {
-			dept.setIsBusinessDept(0);
-		}
 		// 排序未填时默认 1
 		if (dept.getSort() == null) {
 			dept.setSort(1);
@@ -679,9 +684,24 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 			throw new ServiceException("租户ID不能为空");
 		}
 		validateDeptCategory(dept);
-		validateDeptCode(dept, parent);
+		validateDeptCode(dept);
 		validateContractInitialSerial(dept);
-		return saveOrUpdate(dept);
+		boolean saved = saveOrUpdate(dept);
+		if (saved && Func.isNotEmpty(dept.getId())) {
+			// 显式回写两个业务标志，避免部分更新路径漏改
+			this.update(Wrappers.<Dept>lambdaUpdate()
+				.set(Dept::getIsPlatformCompany, dept.getIsPlatformCompany())
+				.set(Dept::getIsBusinessDept, dept.getIsBusinessDept())
+				.eq(Dept::getId, dept.getId()));
+		}
+		return saved;
+	}
+
+	/**
+	 * 将是否类标志规范为 0/1；空值按 0 处理。
+	 */
+	private Integer normalizeYesNoFlag(Integer flag) {
+		return Integer.valueOf(1).equals(flag) ? 1 : 0;
 	}
 
 	@Override
@@ -881,9 +901,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		}
 	}
 
-	private void validateDeptCode(Dept dept, Dept parent) {
+	private void validateDeptCode(Dept dept) {
 		String deptCode = dept.getDeptCode();
-		// 组织编码非必填，为空时存 null，避免唯一索引冲突
+		// 组织编码非必填，为空时存 null，避免唯一索引冲突；不再校验 GWWL/上级编码+三位数字格式
 		if (StringUtil.isBlank(deptCode)) {
 			dept.setDeptCode(null);
 			return;
@@ -892,26 +912,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		if (deptCode.length() > 30) {
 			throw new ServiceException("组织编码不能超过30个字符");
 		}
-		// 顶级组织不依赖上级编码
-		if (parent == null) {
-			this.ensureDeptCodeUnique(dept, deptCode);
-			dept.setDeptCode(deptCode);
-			return;
-		}
-		if (StringUtil.isBlank(parent.getDeptCode())) {
-			throw new ServiceException("请选择已配置组织编码的上级组织");
-		}
-		// 公司：GWWL+三位数字；部门：所属公司编码+三位数字；其他：上级编码+三位数字
-		String expectedParentCode = parent.getDeptCode();
-		if (DeptCategory.COMPANY.getCode().equals(dept.getDeptCategory())) {
-			expectedParentCode = OAConvertConstant.OA_SYNC_ROOT_DEPT_CODE;
-		} else if (DeptCategory.DEPT.getCode().equals(dept.getDeptCategory())
-			&& StringUtil.isNotBlank(dept.getBelongCompanyCode())) {
-			expectedParentCode = dept.getBelongCompanyCode();
-		}
-		if (!org.springblade.system.util.DeptCodeUtil.matchesChildCode(expectedParentCode, deptCode)) {
-			throw new ServiceException("组织编码格式应为：" + expectedParentCode + "三位数字（不足补零，中间不加-）");
-		}
 		this.ensureDeptCodeUnique(dept, deptCode);
 		dept.setDeptCode(deptCode);
 	}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java

@@ -278,9 +278,7 @@ public class OASyncServiceImpl implements IOASyncService {
         OaUserListSyncHelper.OaOrgIndex orgIndex = oaUserListSyncHelper.syncOrgsFromPersons(oaPersons);
         OaUserListSyncHelper.PersonSyncCount personSyncCount = oaUserListSyncHelper.handlePerson(oaPersons, orgIndex);
         if (startTime == null) {
-            oaUserListSyncHelper.removeOaUsersAbsentFrom(
+            oaUserListSyncHelper.removeOaUsersAbsentFrom(oaUserListSyncHelper.extractWorkcodes(oaPersons));
-                    oaUserListSyncHelper.extractOaLoginIds(oaPersons),
-                    oaUserListSyncHelper.extractWorkcodes(oaPersons));
         }
         CacheUtil.clear(USER_CACHE);
         CacheUtil.clear(SYS_CACHE);
@@ -300,7 +298,7 @@ public class OASyncServiceImpl implements IOASyncService {
     private OaPersonSyncPageVO syncPersonFromOaPage(int current, int size, boolean incremental, String modifiedSince) {
         int pageNo = current < 1 ? 1 : current;
         int pageSize = size < 1 ? 20 : Math.min(size, 200);
-        // 全量同步首页开启原始数据收集，并开始累积登录名，最后一页再删除本地多余人员
+        // 全量同步首页开启原始数据收集，并开始累积工号，最后一页再删除本地多余人员
         if (!incremental && pageNo == 1) {
             oaSyncRawDumpHelper.beginFullDump();
             oaUserListSyncHelper.beginFullSyncReconcile();

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OaUserListSyncHelper.java

@@ -87,10 +87,8 @@ public class OaUserListSyncHelper {
 	private static final String OA_PERSON_STATUS_RESIGNED = "5";
 
 	/**
-	 * 全量同步跨页累积的 OA 登录名。分页接口每页独立事务，删除必须等最后一页再执行。
+	 * 全量同步跨页累积的 OA 工号。分页接口每页独立事务，删除必须等最后一页再执行。
 	 */
-	private final Set<String> fullSyncLoginIds = ConcurrentHashMap.newKeySet();
-
 	private final Set<String> fullSyncWorkcodes = ConcurrentHashMap.newKeySet();
 
 	private volatile boolean fullSyncCollecting;
@@ -409,16 +407,15 @@ public class OaUserListSyncHelper {
 	}
 
 	/**
-	 * 全量同步从第一页开始收集 OA 登录名，最后一页再删除本地多余的 is_oa=2 人员。
+	 * 全量同步从第一页开始收集 OA 工号，最后一页再删除本地多余的 is_oa=2 人员。
 	 */
 	public synchronized void beginFullSyncReconcile() {
-		this.fullSyncLoginIds.clear();
 		this.fullSyncWorkcodes.clear();
 		this.fullSyncCollecting = true;
 	}
 
 	/**
-	 * 累积本页 OA 人员登录名，供全量同步结束后比对删除。
+	 * 累积本页 OA 人员工号，供全量同步结束后比对删除。
 	 *
 	 * @param oaPersons 本页 OA 人员
 	 */
@@ -426,49 +423,26 @@ public class OaUserListSyncHelper {
 		if (!this.fullSyncCollecting || CollectionUtil.isEmpty(oaPersons)) {
 			return;
 		}
-		this.fullSyncLoginIds.addAll(this.extractOaLoginIds(oaPersons));
 		this.fullSyncWorkcodes.addAll(this.extractWorkcodes(oaPersons));
 	}
 
 	/**
-	 * 全量同步结束后，删除登录名不在本次 OA 数据中的 is_oa=2 人员。
+	 * 全量同步结束后，删除工号不在本次 OA 数据中的 is_oa=2 人员。
 	 *
-	 * @return 删除人数；未开始收集或登录名集合为空时返回 0，避免误删全部 OA 人员
+	 * @return 删除人数；未开始收集或工号集合为空时返回 0，避免误删全部 OA 人员
 	 */
 	public synchronized int finishFullSyncReconcile() {
 		if (!this.fullSyncCollecting) {
 			return 0;
 		}
 		this.fullSyncCollecting = false;
-		Set<String> oaLoginIds = new LinkedHashSet<>(this.fullSyncLoginIds);
 		Set<String> workcodes = new LinkedHashSet<>(this.fullSyncWorkcodes);
-		this.fullSyncLoginIds.clear();
 		this.fullSyncWorkcodes.clear();
-		return this.removeOaUsersAbsentFrom(oaLoginIds, workcodes);
+		return this.removeOaUsersAbsentFrom(workcodes);
 	}
 
 	/**
-	 * 提取仍在职的 OA 人员登录名。离职人员不计入，全量同步结束时会删掉对应本地账号。
+	 * 提取仍在职人员的工号。离职人员不计入，全量同步结束时会删掉对应本地账号。
-	 *
-	 * @param oaPersons OA人员
-	 * @return 去重后的登录名
-	 */
-	public Set<String> extractOaLoginIds(List<OAPersonResponse> oaPersons) {
-		Set<String> oaLoginIds = new LinkedHashSet<>();
-		if (CollectionUtil.isEmpty(oaPersons)) {
-			return oaLoginIds;
-		}
-		for (OAPersonResponse oaPerson : oaPersons) {
-			String oaLoginId = this.resolveOaLoginId(oaPerson);
-			if (oaLoginId != null && !this.isOaResigned(oaPerson)) {
-				oaLoginIds.add(oaLoginId);
-			}
-		}
-		return oaLoginIds;
-	}
-
-	/**
-	 * 提取仍在职人员的工号。没有登录名时靠工号保留本地账号。
 	 *
 	 * @param oaPersons OA人员
 	 * @return 去重后的工号
@@ -488,25 +462,21 @@ public class OaUserListSyncHelper {
 	}
 
 	/**
-	 * 删除当前租户中 is_oa=2、且既不在本次登录名里、也不是无登录名工号人员的账号。
+	 * 删除当前租户中 is_oa=2、且工号不在本次同步工号集合中的账号。
-	 * 登录名和工号都没收集到时不删除。当前登录账号即使不在同步数据中也保留。
+	 * 未收集到工号时不删除。当前登录账号即使不在同步数据中也保留。
 	 *
-	 * @param oaLoginIds 本次全量同步出现过的 OA 登录名
 	 * @param workcodes 本次全量同步出现过的工号
 	 * @return 删除人数
 	 */
-	public int removeOaUsersAbsentFrom(Set<String> oaLoginIds, Set<String> workcodes) {
+	public int removeOaUsersAbsentFrom(Set<String> workcodes) {
-		boolean noLoginIds = CollectionUtil.isEmpty(oaLoginIds);
+		if (CollectionUtil.isEmpty(workcodes)) {
-		boolean noWorkcodes = CollectionUtil.isEmpty(workcodes);
+			ComposeLogUtil.getLastLog().warn("全量同步未收集到OA工号，跳过删除本地 is_oa=2 人员");
-		if (noLoginIds && noWorkcodes) {
-			ComposeLogUtil.getLastLog().warn("全量同步未收集到OA登录名和工号，跳过删除本地 is_oa=2 人员");
 			return 0;
 		}
-		Set<String> loginIdSet = noLoginIds ? Set.of() : oaLoginIds;
+		Set<String> workcodeSet = workcodes;
-		Set<String> workcodeSet = noWorkcodes ? Set.of() : workcodes;
 		String tenantId = this.resolveTenantId();
 		List<User> oaUsers = this.userService.list(Wrappers.<User>lambdaQuery()
-			.select(User::getId, User::getOaLoginId, User::getCode)
+			.select(User::getId, User::getCode)
 			.eq(User::getTenantId, tenantId)
 			.eq(User::getIsOa, CommonConstant.YES));
 		Long currentUserId = AuthUtil.getUserId();
@@ -519,11 +489,8 @@ public class OaUserListSyncHelper {
 				ComposeLogUtil.getLastLog().warn("全量同步跳过删除当前登录账号 userId={}", oaUser.getId());
 				continue;
 			}
-			String oaLoginId = StringUtils.trimToNull(oaUser.getOaLoginId());
 			String workcode = StringUtils.trimToNull(oaUser.getCode());
-			boolean keptByLoginId = oaLoginId != null && loginIdSet.contains(oaLoginId);
+			if (workcode == null || !workcodeSet.contains(workcode)) {
-			boolean keptByWorkcode = oaLoginId == null && workcode != null && workcodeSet.contains(workcode);
-			if (!keptByLoginId && !keptByWorkcode) {
 				removeIds.add(oaUser.getId());
 			}
 		}
@@ -535,54 +502,13 @@ public class OaUserListSyncHelper {
 	}
 
 	/**
-	 * 按 OA 登录名删除已有 is_oa=2 人员。用于离职人员，全量和增量同步都会执行。
+	 * 按工号删除已有 is_oa=2 人员。用于离职人员，全量和增量同步都会执行。
-	 *
-	 * @param tenantId 租户
-	 * @param oaLoginIds 离职人员登录名
-	 * @return 删除人数
-	 */
-	private int removeOaUsersByLoginIds(String tenantId, Collection<String> oaLoginIds) {
-		if (CollectionUtil.isEmpty(oaLoginIds)) {
-			return 0;
-		}
-		List<String> oaLoginIdList = oaLoginIds.stream()
-			.filter(StringUtils::isNotBlank)
-			.distinct()
-			.toList();
-		if (oaLoginIdList.isEmpty()) {
-			return 0;
-		}
-		Long currentUserId = AuthUtil.getUserId();
-		List<Long> removeIds = new ArrayList<>();
-		for (int fromIndex = 0; fromIndex < oaLoginIdList.size(); fromIndex += OA_LOGIN_ID_BATCH_SIZE) {
-			List<String> oaLoginIdBatch = oaLoginIdList.subList(fromIndex, Math.min(fromIndex + OA_LOGIN_ID_BATCH_SIZE, oaLoginIdList.size()));
-			this.userService.list(Wrappers.<User>lambdaQuery()
-					.select(User::getId, User::getOaLoginId)
-					.eq(User::getTenantId, tenantId)
-					.eq(User::getIsOa, CommonConstant.YES)
-					.in(User::getOaLoginId, oaLoginIdBatch))
-				.forEach(oaUser -> {
-					if (oaUser.getId() == null) {
-						return;
-					}
-					if (currentUserId != null && currentUserId > 0 && currentUserId.equals(oaUser.getId())) {
-						ComposeLogUtil.getLastLog().warn("同步跳过删除当前登录账号 userId={}", oaUser.getId());
-						return;
-					}
-					removeIds.add(oaUser.getId());
-				});
-		}
-		return this.deleteOaUsers(removeIds, "同步删除OA离职人员");
-	}
-
-	/**
-	 * 删除没有登录名、且工号属于离职人员的 is_oa=2 账号。
 	 *
 	 * @param tenantId 租户
 	 * @param workcodes 离职人员工号
 	 * @return 删除人数
 	 */
-	private int removeOaUsersByBlankLoginWorkcodes(String tenantId, Collection<String> workcodes) {
+	private int removeOaUsersByWorkcodes(String tenantId, Collection<String> workcodes) {
 		if (CollectionUtil.isEmpty(workcodes)) {
 			return 0;
 		}
@@ -598,11 +524,10 @@ public class OaUserListSyncHelper {
 		for (int fromIndex = 0; fromIndex < workcodeList.size(); fromIndex += OA_LOGIN_ID_BATCH_SIZE) {
 			List<String> workcodeBatch = workcodeList.subList(fromIndex, Math.min(fromIndex + OA_LOGIN_ID_BATCH_SIZE, workcodeList.size()));
 			this.userService.list(Wrappers.<User>lambdaQuery()
-					.select(User::getId, User::getOaLoginId, User::getCode)
+					.select(User::getId, User::getCode)
 					.eq(User::getTenantId, tenantId)
 					.eq(User::getIsOa, CommonConstant.YES)
-					.in(User::getCode, workcodeBatch)
+					.in(User::getCode, workcodeBatch))
-					.and(wrapper -> wrapper.isNull(User::getOaLoginId).or().eq(User::getOaLoginId, "")))
 				.forEach(oaUser -> {
 					if (oaUser.getId() == null) {
 						return;
@@ -614,7 +539,7 @@ public class OaUserListSyncHelper {
 					removeIds.add(oaUser.getId());
 				});
 		}
-		return this.deleteOaUsers(removeIds, "同步删除无登录名的OA离职人员");
+		return this.deleteOaUsers(removeIds, "同步删除OA离职人员");
 	}
 
 	/**
@@ -645,7 +570,8 @@ public class OaUserListSyncHelper {
 	}
 
 	/**
-	 * 同步人员并绑定到三级部门。有登录名按登录名更新，没有登录名但有工号则按工号更新且不回填登录名。离职人员直接删除。
+	 * 同步人员并绑定到三级部门。按工号 workcode（对应本地 code）匹配已有用户；
+	 * OA登录名仍优先填 workcode，其次 loginid。无工号则跳过。离职人员按工号删除。
 	 *
 	 * @param oaPersons OA人员
 	 * @param orgIndex 组织索引
@@ -656,7 +582,6 @@ public class OaUserListSyncHelper {
 			return new PersonSyncCount(0, 0, 0);
 		}
 		Map<String, OAPersonResponse> uniquePersonMap = new LinkedHashMap<>();
-		Set<String> resignedLoginIds = new LinkedHashSet<>();
 		Set<String> resignedWorkcodes = new LinkedHashSet<>();
 		int skippedCount = 0;
 		for (OAPersonResponse oaPerson : oaPersons) {
@@ -665,49 +590,36 @@ public class OaUserListSyncHelper {
 				skippedCount++;
 				continue;
 			}
-			String oaLoginId = this.resolveOaLoginId(oaPerson);
 			String workcode = this.resolveWorkcode(oaPerson);
 			if (this.isOaResigned(oaPerson)) {
 				uniquePersonMap.remove(syncKey);
-				if (oaLoginId != null) {
+				if (workcode != null) {
-					resignedLoginIds.add(oaLoginId);
-				} else if (workcode != null) {
 					resignedWorkcodes.add(workcode);
 				}
 				continue;
 			}
-			if (oaLoginId != null) {
+			if (workcode != null) {
-				resignedLoginIds.remove(oaLoginId);
-			} else if (workcode != null) {
 				resignedWorkcodes.remove(workcode);
 			}
 			uniquePersonMap.put(syncKey, oaPerson);
 		}
 		String tenantId = resolveTenantId();
-		int removedCount = this.removeOaUsersByLoginIds(tenantId, resignedLoginIds)
+		int removedCount = this.removeOaUsersByWorkcodes(tenantId, resignedWorkcodes);
-			+ this.removeOaUsersByBlankLoginWorkcodes(tenantId, resignedWorkcodes);
 		if (uniquePersonMap.isEmpty()) {
-			if (resignedLoginIds.isEmpty() && resignedWorkcodes.isEmpty()) {
+			if (resignedWorkcodes.isEmpty()) {
-				ComposeLogUtil.getLastLog().warn("OA人员均缺少登录名和工号，跳过人员同步");
+				ComposeLogUtil.getLastLog().warn("OA人员均缺少工号，跳过人员同步");
 			}
 			return new PersonSyncCount(0, skippedCount, removedCount);
 		}
 		String defaultPassword = DigestUtil.encrypt(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
-		Set<String> oaLoginIds = new LinkedHashSet<>();
 		Set<String> workcodes = new LinkedHashSet<>();
 		for (OAPersonResponse oaPerson : uniquePersonMap.values()) {
-			String oaLoginId = this.resolveOaLoginId(oaPerson);
-			if (oaLoginId != null) {
-				oaLoginIds.add(oaLoginId);
-				continue;
-			}
 			String workcode = this.resolveWorkcode(oaPerson);
 			if (workcode != null) {
 				workcodes.add(workcode);
 			}
 		}
-		Map<String, User> existingByOaLoginId = this.loadUsersByOaLoginId(tenantId, oaLoginIds);
+		Map<String, User> existingByWorkcode = this.loadUsersByWorkcode(tenantId, workcodes);
-		Map<String, User> existingByWorkcode = this.loadUsersByBlankLoginWorkcode(tenantId, workcodes);
 		List<User> users = new ArrayList<>();
 		Map<String, Long> userMap = new HashMap<>();
 		Set<Long> existsUserIds = new HashSet<>();
@@ -717,7 +629,7 @@ public class OaUserListSyncHelper {
 			String workcode = this.resolveWorkcode(oaPerson);
 			User user = this.userConvert.person2user(oaPerson, defaultPassword);
 			user.setTenantId(tenantId);
-			User existingUser = oaLoginId != null ? existingByOaLoginId.get(oaLoginId) : existingByWorkcode.get(workcode);
+			User existingUser = workcode == null ? null : existingByWorkcode.get(workcode);
 			if (oaLoginId != null) {
 				user.setOaLoginId(oaLoginId);
 				user.setAccount(oaLoginId);
@@ -757,7 +669,7 @@ public class OaUserListSyncHelper {
 			ComposeLogUtil.getLastLog().info("批量修改用户：{}", updateUsers.size());
 			userService.updateBatchById(updateUsers);
 		}
-		ComposeLogUtil.getLastLog().info("缺少登录名和工号已跳过的人员：{}", skippedCount);
+		ComposeLogUtil.getLastLog().info("缺少工号已跳过的人员：{}", skippedCount);
 		int syncedCount = addUsers.size() + updateUsers.size();
 		if (userMap.isEmpty()) {
 			return new PersonSyncCount(0, skippedCount, removedCount);
@@ -882,50 +794,9 @@ public class OaUserListSyncHelper {
 	}
 
 	/**
-	 * 按 OA 登录名加载已有 is_oa=2 用户。同一登录名有多条时保留较早的一条，后续同步都更新这一条。
+	 * 按工号（User.code）加载已有 is_oa=2 用户。同一工号有多条时保留较早的一条，后续同步都更新这一条。
 	 */
-	private Map<String, User> loadUsersByOaLoginId(String tenantId, Collection<String> oaLoginIds) {
+	private Map<String, User> loadUsersByWorkcode(String tenantId, Collection<String> workcodes) {
-		Map<String, User> existingByOaLoginId = new HashMap<>();
-		if (CollectionUtil.isEmpty(oaLoginIds)) {
-			return existingByOaLoginId;
-		}
-		List<String> oaLoginIdList = oaLoginIds.stream()
-			.filter(StringUtils::isNotBlank)
-			.distinct()
-			.toList();
-		for (int fromIndex = 0; fromIndex < oaLoginIdList.size(); fromIndex += OA_LOGIN_ID_BATCH_SIZE) {
-			List<String> oaLoginIdBatch = oaLoginIdList.subList(fromIndex, Math.min(fromIndex + OA_LOGIN_ID_BATCH_SIZE, oaLoginIdList.size()));
-			userService.list(Wrappers.<User>lambdaQuery()
-					.eq(User::getTenantId, tenantId)
-					.eq(User::getIsOa, CommonConstant.YES)
-					.in(User::getOaLoginId, oaLoginIdBatch))
-				.forEach(user -> {
-					String oaLoginId = StringUtils.trimToNull(user.getOaLoginId());
-					if (oaLoginId == null) {
-						return;
-					}
-					User previous = existingByOaLoginId.get(oaLoginId);
-					if (previous == null) {
-						existingByOaLoginId.put(oaLoginId, user);
-						return;
-					}
-					if (user.getId() != null && previous.getId() != null && user.getId() < previous.getId()) {
-						ComposeLogUtil.getLastLog().warn("OA登录名重复，保留较早用户 oaLoginId={} keepUserId={} dropUserId={}",
-							oaLoginId, user.getId(), previous.getId());
-						existingByOaLoginId.put(oaLoginId, user);
-						return;
-					}
-					ComposeLogUtil.getLastLog().warn("OA登录名重复，保留较早用户 oaLoginId={} keepUserId={} dropUserId={}",
-						oaLoginId, previous.getId(), user.getId());
-				});
-		}
-		return existingByOaLoginId;
-	}
-
-	/**
-	 * 按工号加载没有登录名的 is_oa=2 用户。同一工号有多条时保留较早的一条。
-	 */
-	private Map<String, User> loadUsersByBlankLoginWorkcode(String tenantId, Collection<String> workcodes) {
 		Map<String, User> existingByWorkcode = new HashMap<>();
 		if (CollectionUtil.isEmpty(workcodes)) {
 			return existingByWorkcode;
@@ -939,26 +810,41 @@ public class OaUserListSyncHelper {
 			this.userService.list(Wrappers.<User>lambdaQuery()
 					.eq(User::getTenantId, tenantId)
 					.eq(User::getIsOa, CommonConstant.YES)
-					.in(User::getCode, workcodeBatch)
+					.in(User::getCode, workcodeBatch))
-					.and(wrapper -> wrapper.isNull(User::getOaLoginId).or().eq(User::getOaLoginId, "")))
 				.forEach(user -> {
 					String workcode = StringUtils.trimToNull(user.getCode());
 					if (workcode == null) {
 						return;
 					}
 					User previous = existingByWorkcode.get(workcode);
-					if (previous == null || (user.getId() != null && previous.getId() != null && user.getId() < previous.getId())) {
+					if (previous == null) {
 						existingByWorkcode.put(workcode, user);
+						return;
 					}
+					if (user.getId() != null && previous.getId() != null && user.getId() < previous.getId()) {
+						ComposeLogUtil.getLastLog().warn("OA工号重复，保留较早用户 workcode={} keepUserId={} dropUserId={}",
+							workcode, user.getId(), previous.getId());
+						existingByWorkcode.put(workcode, user);
+						return;
+					}
+					ComposeLogUtil.getLastLog().warn("OA工号重复，保留较早用户 workcode={} keepUserId={} dropUserId={}",
+						workcode, previous.getId(), user.getId());
 				});
 		}
 		return existingByWorkcode;
 	}
 
+	/**
+	 * OA登录名：优先 workcode，其次 loginid。仅用于填充 oaLoginId/account，不参与匹配。
+	 */
 	private String resolveOaLoginId(OAPersonResponse oaPerson) {
 		if (oaPerson == null) {
 			return null;
 		}
+		String workcode = StringUtils.trimToNull(oaPerson.getWorkcode());
+		if (workcode != null) {
+			return workcode;
+		}
 		return StringUtils.trimToNull(oaPerson.getLoginid());
 	}
 
@@ -970,13 +856,9 @@ public class OaUserListSyncHelper {
 	}
 
 	/**
-	 * 有登录名用登录名，没有登录名但有工号用工号。两者都没有则不同步。
+	 * 同步去重与匹配键：仅使用工号。无工号则不同步。
 	 */
 	private String resolveSyncKey(OAPersonResponse oaPerson) {
-		String oaLoginId = this.resolveOaLoginId(oaPerson);
-		if (oaLoginId != null) {
-			return "L:" + oaLoginId;
-		}
 		String workcode = this.resolveWorkcode(oaPerson);
 		if (workcode != null) {
 			return "W:" + workcode;

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleMenuDataScopeServiceImpl.java

@@ -184,20 +184,44 @@ public class RoleMenuDataScopeServiceImpl extends BaseServiceImpl<RoleMenuDataSc
 		if (Func.isEmpty(roleIds) || Func.isBlank(menuCode)) {
 			return RoleDataScopeVO.all();
 		}
-		Menu menu = menuMapper.selectOne(Wrappers.<Menu>lambdaQuery()
+		Menu menu = findMenuByCode(menuCode);
-			.eq(Menu::getCode, menuCode)
-			.eq(Menu::getIsDeleted, 0)
-			.last("limit 1"));
 		if (Func.isEmpty(menu)) {
 			return RoleDataScopeVO.all();
 		}
-		List<RoleMenuDataScope> scopeList = list(Wrappers.<RoleMenuDataScope>lambdaQuery()
+		List<RoleMenuDataScope> scopeList = listScopes(roleIds, menu.getId());
-			.in(RoleMenuDataScope::getRoleId, roleIds)
-			.eq(RoleMenuDataScope::getMenuId, menu.getId())
-			.eq(RoleMenuDataScope::getIsDeleted, 0));
 		return mergeScopes(scopeList, userDeptIds);
 	}
 
+	@Override
+	public RoleDataScopeVO resolveByMenuCodeOrEmpty(List<Long> roleIds, String menuCode, List<Long> userDeptIds) {
+		if (Func.isEmpty(roleIds) || Func.isBlank(menuCode)) {
+			return RoleDataScopeVO.none();
+		}
+		Menu menu = findMenuByCode(menuCode);
+		if (Func.isEmpty(menu)) {
+			return RoleDataScopeVO.none();
+		}
+		List<RoleMenuDataScope> scopeList = listScopes(roleIds, menu.getId());
+		if (Func.isEmpty(scopeList)) {
+			return RoleDataScopeVO.none();
+		}
+		return mergeScopes(scopeList, userDeptIds);
+	}
+
+	private Menu findMenuByCode(String menuCode) {
+		return menuMapper.selectOne(Wrappers.<Menu>lambdaQuery()
+			.eq(Menu::getCode, menuCode)
+			.eq(Menu::getIsDeleted, 0)
+			.last("limit 1"));
+	}
+
+	private List<RoleMenuDataScope> listScopes(List<Long> roleIds, Long menuId) {
+		return list(Wrappers.<RoleMenuDataScope>lambdaQuery()
+			.in(RoleMenuDataScope::getRoleId, roleIds)
+			.eq(RoleMenuDataScope::getMenuId, menuId)
+			.eq(RoleMenuDataScope::getIsDeleted, 0));
+	}
+
 	@Override
 	public RoleDataScopeVO resolveWidest(List<Long> roleIds, List<Long> userDeptIds) {
 		if (Func.isEmpty(roleIds)) {

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java

@@ -86,6 +86,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -663,6 +664,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		boolean tempUser = this.deleteLogic(Func.toLongList(userIds));
 		boolean tempUserDept = userDeptService.remove(Wrappers.<UserDept>lambdaQuery().in(UserDept::getUserId, Func.toLongList(userIds)));
 		if (tempUser && tempUserDept) {
+			userDataScopeMapper.delete(Wrappers.<UserDataScope>lambdaQuery().in(UserDataScope::getUserId, idList));
 			UserOauth userOauth = new UserOauth();
 			userOauth.delete(Wrappers.<UserOauth>lambdaQuery().in(UserOauth::getUserId, Func.toLongList(userIds)));
 			UserWeb userWeb = new UserWeb();
@@ -672,6 +674,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 			UserOther userOther = new UserOther();
 			userOther.delete(Wrappers.<UserOther>lambdaQuery().in(UserOther::getUserId, Func.toLongList(userIds)));
 			CacheUtil.clear(USER_CACHE);
+			CacheUtil.clear(USER_CACHE, Boolean.FALSE);
 			return true;
 		} else {
 			throw new ServiceException("删除用户失败!");
@@ -1119,8 +1122,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		if (user.getPersonCategory() == null) {
 			user.setPersonCategory(1);
 		}
-		// 组织/客商数据权限已迁移至角色菜单配置，用户侧字段仅保留兼容默认值，不再参与过滤。
+		// 有「数据管理权限」组织时标记为自定义；否则仅补兼容默认值（业务过滤以角色权限 ∪ 用户管理组织为准）
-		if (user.getDataScopeRange() == null) {
+		if (Func.isNotEmpty(user.getDataScopeDeptIds())) {
+			user.setDataScopeRange(3);
+		} else if (user.getDataScopeRange() == null) {
 			user.setDataScopeRange(2);
 		}
 		if (user.getDataLevelRange() == null) {
@@ -1141,8 +1146,33 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		return null;
 	}
 
+	/**
+	 * 保存用户「数据管理权限」组织；dataScopeDeptIds 为 null 时保留原配置（兼容 IAM/同步等未传该字段的调用）。
+	 */
 	private boolean submitUserScopes(User user) {
-		// 用户级组织/客商数据权限已停用，改由角色菜单数据权限配置。
+		if (user == null || user.getId() == null) {
+			return true;
+		}
+		if (user.getDataScopeDeptIds() == null) {
+			return true;
+		}
+		userDataScopeMapper.delete(Wrappers.<UserDataScope>lambdaQuery().eq(UserDataScope::getUserId, user.getId()));
+		List<Long> deptIdList = user.getDataScopeDeptIds().stream()
+			.filter(Objects::nonNull)
+			.filter(deptId -> deptId > 0)
+			.distinct()
+			.toList();
+		for (Long deptId : deptIdList) {
+			UserDataScope scope = new UserDataScope();
+			scope.setUserId(user.getId());
+			scope.setDeptId(deptId);
+			userDataScopeMapper.insert(scope);
+		}
+		this.update(Wrappers.<User>lambdaUpdate()
+			.set(User::getDataScopeRange, deptIdList.isEmpty() ? 2 : 3)
+			.eq(User::getId, user.getId()));
+		CacheUtil.clear(USER_CACHE);
+		CacheUtil.clear(USER_CACHE, Boolean.FALSE);
 		return true;
 	}
 
@@ -1150,11 +1180,46 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		if (user == null || user.getId() == null) {
 			return user;
 		}
-		user.setDataScopeDeptIds(Collections.emptyList());
+		List<Long> deptIdList = userDataScopeMapper.selectList(Wrappers.<UserDataScope>lambdaQuery()
+				.eq(UserDataScope::getUserId, user.getId()))
+			.stream()
+			.map(UserDataScope::getDeptId)
+			.filter(Objects::nonNull)
+			.distinct()
+			.toList();
+		user.setDataScopeDeptIds(deptIdList);
 		user.setCustomerIds(Collections.emptyList());
 		return user;
 	}
 
+	@Override
+	public List<Long> resolveManageDeptIds(Long userId) {
+		if (Func.isEmpty(userId) || userId <= 0) {
+			return Collections.emptyList();
+		}
+		List<Long> baseDeptIds = userDataScopeMapper.selectList(Wrappers.<UserDataScope>lambdaQuery()
+				.eq(UserDataScope::getUserId, userId))
+			.stream()
+			.map(UserDataScope::getDeptId)
+			.filter(Objects::nonNull)
+			.filter(deptId -> deptId > 0)
+			.distinct()
+			.toList();
+		if (Func.isEmpty(baseDeptIds)) {
+			return Collections.emptyList();
+		}
+		LinkedHashSet<Long> allowedDeptIds = new LinkedHashSet<>();
+		for (Long deptId : baseDeptIds) {
+			List<Long> childIds = SysCache.getDeptChildIds(deptId);
+			if (Func.isNotEmpty(childIds)) {
+				allowedDeptIds.addAll(childIds);
+			} else {
+				allowedDeptIds.add(deptId);
+			}
+		}
+		return List.copyOf(allowedDeptIds);
+	}
+
 	/**
 	 * 统一的租户范围过滤：超管放行，其他用户强制限定为当前会话租户。
 	 */

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/BusinessDeptConfigWrapper.java

@@ -0,0 +1,56 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.system.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.cache.UserCache;
+import org.springblade.system.pojo.entity.BusinessDeptConfig;
+import org.springblade.system.pojo.vo.BusinessDeptConfigVO;
+
+import java.util.Objects;
+
+/**
+ * 业务部门配置包装类
+ *
+ * @author Chill
+ */
+public class BusinessDeptConfigWrapper extends BaseEntityWrapper<BusinessDeptConfig, BusinessDeptConfigVO> {
+
+	public static BusinessDeptConfigWrapper build() {
+		return new BusinessDeptConfigWrapper();
+	}
+
+	@Override
+	public BusinessDeptConfigVO entityVO(BusinessDeptConfig businessDeptConfig) {
+		BusinessDeptConfigVO businessDeptConfigVO = Objects.requireNonNull(
+			BeanUtil.copyProperties(businessDeptConfig, BusinessDeptConfigVO.class));
+		businessDeptConfigVO.setCreateUserName(UserCache.getUserRealName(businessDeptConfig.getCreateUser()));
+		businessDeptConfigVO.setUpdateUserName(UserCache.getUserRealName(businessDeptConfig.getUpdateUser()));
+		return businessDeptConfigVO;
+	}
+
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/config/BfiProperties.java

@@ -71,9 +71,9 @@ public class BfiProperties {
 	private ReceivedInvoice receivedInvoice = new ReceivedInvoice();
 
 	/**
-	 * 收款认领公告查询配置（A301-2）
+	 * 收款流水同步配置（A301-1 收款单查询）
 	 */
-	private ClaimAnnounce claimAnnounce = new ClaimAnnounce();
+	private RecBillSync recBillSync = new RecBillSync();
 
 	/**
 	 * 付款结果定时回写配置（A103-2/A103-4，总开关同时控制应收勾稽、开票结果回写）
@@ -85,11 +85,6 @@ public class BfiProperties {
 	 */
 	private ReceivedInvoiceResult receivedInvoiceResult = new ReceivedInvoiceResult();
 
-	/**
-	 * 收款认领推送配置（A301-3）
-	 */
-	private ReceiptClaimPush receiptClaimPush = new ReceiptClaimPush();
-
 	/**
 	 * 全票池发票定时同步配置（A801-1）
 	 */
@@ -115,6 +110,11 @@ public class BfiProperties {
 	 */
 	private ArResult arResult = new ArResult();
 
+	/**
+	 * 金蝶冲销状态回写配置（A102-4/A302-4）
+	 */
+	private WriteOffResult writeOffResult = new WriteOffResult();
+
 	/**
 	 * 金蝶单据锁定补偿配置
 	 */
@@ -197,20 +197,15 @@ public class BfiProperties {
 	}
 
 	/**
-	 * 收款认领公告查询配置项（A301-2）
+	 * 收款流水同步配置项（A301-1 收款单查询）
 	 */
 	@Data
-	public static class ClaimAnnounce {
+	public static class RecBillSync {
 
 		/**
-		 * 查询时间窗口（月数），默认 6（近半年）
+		 * 同步业务日期窗口天数，默认 60
 		 */
-		private int months = 6;
+		private int days = 60;
-
-		/**
-		 * 认领人（claimusers）：配置后公告查询固定使用该值，不再按当前登录用户姓名查询
-		 */
-		private String claimusers;
 	}
 
 	/**
@@ -257,6 +252,11 @@ public class BfiProperties {
 		 * 回写 single-flight 锁租约秒数，须大于最坏一轮耗时（分批远程查询 + 逐单回写）
 		 */
 		private long lockLeaseSeconds = 1800;
+
+		/**
+		 * A103-4 付款处理查询业务日期窗口天数，默认 60
+		 */
+		private int queryWindowDays = 60;
 	}
 
 	/**
@@ -271,23 +271,6 @@ public class BfiProperties {
 		private boolean syncEnabled = false;
 	}
 
-	/**
-	 * 收款认领推送配置项（A301-3）
-	 */
-	@Data
-	public static class ReceiptClaimPush {
-
-		/**
-		 * 推送任务开关，默认关闭（联调稳定后开启）
-		 */
-		private boolean syncEnabled = false;
-
-		/**
-		 * 推送 single-flight 锁租约秒数，须大于最坏一轮耗时（逐认领人远程查公告 + 逐条推送）
-		 */
-		private long lockLeaseSeconds = 1800;
-	}
-
 	/**
 	 * 全票池发票同步配置项（A801-1）
 	 */
@@ -374,6 +357,24 @@ public class BfiProperties {
 		private long lockLeaseSeconds = 1800;
 	}
 
+	/**
+	 * 金蝶冲销状态回写配置项（A102-4/A302-4）：定时回写开关、防重键批量查询与结算单批量更新的分批大小，
+	 * 防止单批过大超出金蝶查询接口与批量落库承载能力
+	 */
+	@Data
+	public static class WriteOffResult {
+
+		/**
+		 * 冲销状态回写任务开关，默认关闭（安全兜底），由 Nacos 按环境显式开启
+		 */
+		private boolean syncEnabled = false;
+
+		/**
+		 * 冲销状态批量查询/批量更新分批大小，默认 1000
+		 */
+		private int queryBatchSize = 1000;
+	}
+
 	/**
 	 * 金蝶单据锁定补偿配置项
 	 */

blade-service/blade-transport/src/main/java/org/springblade/transport/constant/HcsContractFieldConstant.java

@@ -52,6 +52,22 @@ public final class HcsContractFieldConstant {
 	 */
 	public static final String FIELD_CONTRACT_NO = "CONTRACT_NO";
 
+	/**
+	 * 业务合同号（fd 模板字段，值同合同编号 contractNo）
+	 */
+	public static final String FIELD_FD_BUS_CONTRACT_NUMBER = "fdBusContractNumber";
+
+	/**
+	 * 归档状态（fd 模板字段）：toarchive=待归档; archiving=归档中; archived=已归档; archiveerror=归档异常；
+	 * TMS 侧仅在双章归档文件上传（归档状态=已归档）后传 toarchive，其余状态由合规侧自行流转，未归档不传
+	 */
+	public static final String FIELD_FD_ARCHIVE_STATUS = "fdArchiveStatus";
+
+	/**
+	 * 归档状态取值：待归档（fdArchiveStatus，双章归档文件上传后 TMS 固定传此值）
+	 */
+	public static final String ARCHIVE_STATUS_TO_ARCHIVE = "toarchive";
+
 	/**
 	 * 合同标题（fd 模板字段）
 	 */

blade-service/blade-transport/src/main/java/org/springblade/transport/constant/HcsSyncConstant.java

@@ -25,6 +25,8 @@
  */
 package org.springblade.transport.constant;
 
+import java.util.List;
+
 /**
  * HCS（合同合规系统）同步常量（TMS 业务侧）
  * <p>
@@ -175,6 +177,36 @@ public final class HcsSyncConstant {
 	 */
 	public static final String CUSTOMER_KIND_INTERNAL = "internal";
 
+	/**
+	 * C101-1 黑名单状态：是（客商档案/合同客商风险展示与组装用）
+	 */
+	public static final String BLACK_STATUS_YES = "yes";
+
+	/**
+	 * C101-1 黑名单状态：否
+	 */
+	public static final String BLACK_STATUS_NO = "no";
+
+	/**
+	 * 合同审核通过状态集合（首推/变更通过，客商风险定时刷新扫描口径与 HcsPushTask 一致）
+	 */
+	public static final List<String> CONTRACT_APPROVED_STATUSES = List.of("approved", "change_approved");
+
+	/**
+	 * 合同已终止当前节点展示名（客商风险定时刷新排除已终止合同）
+	 */
+	public static final String CONTRACT_TERMINATED_NODE = "已终止";
+
+	/**
+	 * 客商风险等级业务字典编码（dictKey=C101-1 风险等级 0/1/2，dictValue=低风险/中风险/高风险）
+	 */
+	public static final String RISK_LEVEL_DICT_CODE = "risk_level";
+
+	/**
+	 * 客商风险定时刷新批量（200 客商/批：批内黑名单一次查询 + C101-1 逐个查询，查完立即提交数据库，批间互不影响）
+	 */
+	public static final int CUSTOMER_RISK_REFRESH_BATCH = 200;
+
 	/**
 	 * 合同附件类型字段名（与前端附件元数据 fileType 字段对齐，值取业务字典 contract_attachment_type）
 	 */
@@ -190,6 +222,16 @@ public final class HcsSyncConstant {
 	 */
 	public static final String PAYMENT_ATTACH_TYPE_SPECIAL = "special_approval";
 
+	/**
+	 * 付款申请附件类型值：合规特批结果附件（paymentLegal/result 回传展示行标记，详情展示用，不参与特批附件提交校验）
+	 */
+	public static final String PAYMENT_ATTACH_TYPE_SPEC_RESULT = "付款特批流程附件";
+
+	/**
+	 * 合规特批结果附件统一业务名（金蝶上送与前端展示用，上传时按 C103-5 响应头补扩展名）
+	 */
+	public static final String PAYMENT_SPEC_ATTACH_NAME = "付款特批流程附件";
+
 	/**
 	 * 附件类型：用印附件（双章归档文件，取值沿用 ContractManageServiceImpl#FILE_TYPE_SEAL_ARCHIVE）
 	 */
@@ -212,6 +254,12 @@ public final class HcsSyncConstant {
 	 */
 	public static final String CONTRACT_ATTACH_KEY_OTHER = "eopCdraftOther";
 
+	/**
+	 * TMS 合同归档状态取值：已归档（ContractManage#archiveStatus，双章归档文件上传后由审核通过逻辑维护；
+	 * 与合规 fdArchiveStatus 的 archived 不是同一含义，TMS 已归档对应合规 toarchive 待归档）
+	 */
+	public static final String TMS_ARCHIVE_STATUS_ARCHIVED = "已归档";
+
 	/**
 	 * 特批审核挂起节点展示名（currentNode，特批发起后挂起展示，结果回传后恢复）
 	 */
@@ -240,15 +288,37 @@ public final class HcsSyncConstant {
 	public static final String ROW_OP_DELETE = "delete";
 
 	/**
-	 * 履约类型：付款
+	 * 履约类型：付款（C103-9 履约计划行）
 	 */
 	public static final String PERFORM_TYPE_PAYMENT = "payment";
 
 	/**
-	 * 履约类型：收款
+	 * 履约类型：收款（C103-9 履约计划行）
 	 */
 	public static final String PERFORM_TYPE_COLLECTION = "collection";
 
+	// ==================== 履约记录类型（C108 fd_paln_type，按四场景传中文） ====================
+
+	/**
+	 * 履约记录类型：付款
+	 */
+	public static final String PERF_TYPE_PAYMENT = "付款";
+
+	/**
+	 * 履约记录类型：收款
+	 */
+	public static final String PERF_TYPE_COLLECTION = "收款";
+
+	/**
+	 * 履约记录类型：开票
+	 */
+	public static final String PERF_TYPE_INVOICE = "开票";
+
+	/**
+	 * 履约记录类型：收票
+	 */
+	public static final String PERF_TYPE_INVOICE_RECEIPT = "收票";
+
 	/**
 	 * 款项性质：进度款
 	 */

blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java

@@ -171,6 +171,12 @@ public final class KingdeeBfiConstant {
 	/** 金蝶同步状态：生成失败（推送异常/金蝶返回失败，可重推）。 */
 	public static final String KINGDEE_STATUS_FAILED = "failed";
 
+	/** 金蝶冲销状态：未冲销（旧应付/应收单在金蝶尚未冲销）。 */
+	public static final String KINGDEE_WRITEOFF_UNWRITTEN = "unwrittenoff";
+
+	/** 金蝶冲销状态：已冲销（旧应付/应收单已在金蝶冲销，部分冲销视同已冲销）。 */
+	public static final String KINGDEE_WRITEOFF_WRITTEN = "writtenoff";
+
 	/** 收票单推送状态：未推送（新建单据默认，票池绑定层的 kingdee_status 与此无关）。 */
 	public static final String RECEIVED_PUSH_UNSYNCED = "unsynced";
 

blade-service/blade-transport/src/main/java/org/springblade/transport/constant/TransportBusiConstant.java

@@ -61,6 +61,9 @@ public final class TransportBusiConstant {
 	/** 审批状态：已作废（终态）。 */
 	public static final String VOIDED = "voided";
 
+	/** 正式结算单调整标识：已调整（结算调整重推后的归档原单，金额已作废，不可再用于下游业务）。 */
+	public static final String SETTLEMENT_ADJUST_STATUS_ADJUSTED = "adjusted";
+
 	/**
 	 * 「未分配组织」筛选项的哨兵值，不是真实组织名。
 	 * <p>

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/BaiduOcrController.java

@@ -36,7 +36,9 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
 import org.springblade.transport.ocr.constant.BaiduOcrType;
 import org.springblade.transport.ocr.service.IBaiduOcrService;
+import org.springblade.transport.ocr.service.IBusinessLicenseOcrService;
 import org.springblade.transport.pojo.vo.BaiduOcrResultVO;
+import org.springblade.transport.pojo.vo.BusinessLicenseOcrVO;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,6 +62,7 @@ import java.io.IOException;
 public class BaiduOcrController extends BladeController {
 
 	private final IBaiduOcrService baiduOcrService;
+	private final IBusinessLicenseOcrService businessLicenseOcrService;
 
 	/**
 	 * 识别上传的图片。
@@ -109,6 +112,20 @@ public class BaiduOcrController extends BladeController {
 		return R.data(baiduOcrService.recognizeUrl(resolveType(type), side, imageUrl));
 	}
 
+	/**
+	 * 营业执照图片地址识别（第三方 /businessLicense）。
+	 *
+	 * @param imageUrl 图片地址
+	 * @return 识别结果
+	 */
+	@PostMapping("/business-license")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "营业执照OCR识别", description = "按图片地址调用第三方营业执照识别接口")
+	public R<BusinessLicenseOcrVO> recognizeBusinessLicense(
+		@Parameter(description = "图片地址", required = true) @RequestParam String imageUrl) {
+		return R.data(businessLicenseOcrService.recognizeUrl(imageUrl));
+	}
+
 	private BaiduOcrType resolveType(String type) {
 		try {
 			return BaiduOcrType.from(type);

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractChangeController.java

@@ -33,6 +33,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
+import org.springblade.transport.constant.HcsSyncConstant;
 import org.springblade.transport.pojo.entity.ContractChange;
 import org.springblade.transport.pojo.vo.ContractChangeVO;
 import org.springblade.transport.service.IContractChangeService;
@@ -110,17 +111,12 @@ public class ContractChangeController extends BladeController {
 		hcsImmediatePushSupport.pushContractAndWait(contractId);
 		String syncFailure = HcsImmediatePushSupport.pollSyncFailure();
 		if (syncFailure != null) {
-			ContractChange contractChange = contractChangeService.getById(id);
+			contractChangeService.writeBackSyncStatus(contractId, HcsSyncConstant.HCS_STATUS_FAILED);
-			if (contractChange != null) {
-				contractChange.setSyncStatus("failed");
-				contractChangeService.updateById(contractChange);
-			}
 			return R.data(Boolean.FALSE, "审批通过，但合规推送失败：" + syncFailure);
 		}
-		ContractChange contractChange = contractChangeService.getById(id);
+		// 即时推送未开启时（开关关闭不触发推送）不标记已推送，待推送状态由定时扫描任务推送后闭环
-		if (contractChange != null) {
+		if (hcsImmediatePushSupport.isImmediateEnabled()) {
-			contractChange.setSyncStatus("synced");
+			contractChangeService.writeBackSyncStatus(contractId, HcsSyncConstant.HCS_STATUS_SYNCED);
-			contractChangeService.updateById(contractChange);
 		}
 		return R.success("审批通过");
 	}

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractManageController.java

@@ -188,10 +188,11 @@ public class ContractManageController extends BladeController {
 
 	@GetMapping("/next-contract-no")
 	@ApiOperationSupport(order = 16)
-	@Operation(summary = "预览下一合同编号", description = "按合同负责部门编码前缀+年份+三位流水预览")
+	@Operation(summary = "预览下一合同编号", description = "按平台公司+业务部门配置的前缀+年份+三位流水预览")
 	public R<String> nextContractNo(
-		@Parameter(description = "合同负责部门ID", required = true) @RequestParam Long organizationId) {
+		@Parameter(description = "合同负责部门ID", required = true) @RequestParam Long organizationId,
-		return R.data(contractManageService.nextContractNo(organizationId));
+		@Parameter(description = "平台公司ID", required = true) @RequestParam Long platformCompanyId) {
+		return R.data(contractManageService.nextContractNo(organizationId, platformCompanyId));
 	}
 
 	@GetMapping("/export-contract-manage")

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CustomerArchiveController.java

@@ -38,6 +38,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiBankVO;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -198,6 +199,36 @@ public class CustomerArchiveController extends BladeController {
 		return R.data(customerArchiveService.syncKingdee(id));
 	}
 
+	/**
+	 * 金蝶供应商编码查询（A901-1，新增客商填写信用代码后即时回显用）
+	 */
+	@GetMapping("/query-supplier-code")
+	@ApiOperationSupport(order = 12)
+	@Operation(summary = "金蝶供应商编码查询", description = "A901-1 按统一社会信用代码查询金蝶供应商档案取编码，查不到返回空")
+	public R<String> querySupplierCode(@Parameter(description = "统一社会信用代码", required = true) @RequestParam String creditCode) {
+		return R.data(customerArchiveService.querySupplierCode(creditCode));
+	}
+
+	/**
+	 * 金蝶开户行查询（A905-3，收款信息填写开户行失焦精确匹配联行号用）
+	 */
+	@GetMapping("/query-bank")
+	@ApiOperationSupport(order = 12)
+	@Operation(summary = "金蝶开户行查询", description = "A905-3 按行名精确匹配金蝶行名行号档案，返回行名与联行号，查不到返回空")
+	public R<BfiBankVO> queryBank(@Parameter(description = "开户行名称", required = true) @RequestParam String bankName) {
+		return R.data(customerArchiveService.queryKingdeeBank(bankName));
+	}
+
+	/**
+	 * 金蝶联行号校验（A905-3，收款信息保存前校验联行号真实存在用）
+	 */
+	@GetMapping("/query-bank-by-number")
+	@ApiOperationSupport(order = 12)
+	@Operation(summary = "金蝶联行号校验", description = "A905-3 按行号精确匹配金蝶行名行号档案，查不到返回空，接口异常返回错误")
+	public R<BfiBankVO> queryBankByNumber(@Parameter(description = "联行号", required = true) @RequestParam String cnapsCode) {
+		return R.data(customerArchiveService.queryKingdeeBankByNumber(cnapsCode));
+	}
+
 	/**
 	 * 评分明细模板
 	 */

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/HcsSyncController.java

@@ -38,6 +38,7 @@ import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.hcs.config.HcsProperties;
 import org.springblade.hcs.dto.HcsContractLegalResultDTO;
 import org.springblade.hcs.dto.HcsCurrencyVO;
 import org.springblade.hcs.dto.HcsLegalResultDTO;
@@ -70,7 +71,9 @@ import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * HCS 合规推送端点（设计文档 §5.0 手动入口）
@@ -99,6 +102,20 @@ public class HcsSyncController {
 	private final HcsInvoiceRegSyncSupport hcsInvoiceRegSyncSupport;
 	private final HcsReceiptBillSyncSupport hcsReceiptBillSyncSupport;
 	private final HcsMasterDataSupport hcsMasterDataSupport;
+	private final HcsProperties hcsProperties;
+
+	/**
+	 * 推送开关配置（供项目管理/合同管理列表控制「推送合规」「批量推送合规」显隐）
+	 */
+	@GetMapping("/push-config")
+	@ApiOperationSupport(order = 0)
+	@Operation(summary = "查询HCS推送开关", description = "返回 thirdParty.hcs.push.immediate-enabled，前端据此隐藏即时推送入口")
+	public R<Map<String, Object>> pushConfig() {
+		boolean immediateEnabled = hcsProperties.getPush() != null && hcsProperties.getPush().isImmediateEnabled();
+		Map<String, Object> config = new HashMap<>(2);
+		config.put("immediateEnabled", immediateEnabled);
+		return R.data(config);
+	}
 
 	/**
 	 * 单条重推（bizType：project=项目立项 / contract=合同 / payment=付款申请 / invoice-application=开票申请 / invoice-receipt=收票单）
@@ -130,8 +147,9 @@ public class HcsSyncController {
 			case HcsSyncConstant.BIZ_TYPE_PROJECT -> hcsPushTask.pushUnsyncedProjects();
 			case HcsSyncConstant.BIZ_TYPE_CONTRACT -> hcsPushTask.pushUnsyncedContracts();
 			case HcsSyncConstant.BIZ_TYPE_PAYMENT -> hcsPushTask.pushUnsyncedPayments();
-			case HcsSyncConstant.BIZ_TYPE_INVOICE_APPLICATION -> hcsPushTask.pushUnsyncedInvoiceApplications();
+			// 开票/收票走组合动作（C111/C109 + 履约记录 C108-1），与定时任务行为一致
-			case HcsSyncConstant.BIZ_TYPE_INVOICE_RECEIPT -> hcsPushTask.pushUnsyncedInvoiceReceipts();
+			case HcsSyncConstant.BIZ_TYPE_INVOICE_APPLICATION -> hcsPushTask.syncHcsInvoiceApplications();
+			case HcsSyncConstant.BIZ_TYPE_INVOICE_RECEIPT -> hcsPushTask.syncHcsInvoiceReceipts();
 			default -> throw new IllegalArgumentException("不支持的HCS推送业务类型：" + bizType);
 		};
 		return R.data(result);
@@ -215,13 +233,16 @@ public class HcsSyncController {
 
 	/**
 	 * 客商风险等级查询（C101-1，展示用，前端接入设计 §3.3；强制校验仍在推送/付款链路）：
-	 * 内部组织类型客商默认无风险不调合规，外部客商高风险/黑名单返回提示文案
+	 * 内部组织类型客商默认无风险不调合规，外部客商高风险/黑名单返回提示文案；
+	 * creditCode/customerName 供新增客商（档案未落库）查金蝶黑名单、拼装提示名称兜底，档案存在时以档案为准
 	 */
 	@GetMapping("/risk")
 	@ApiOperationSupport(order = 10)
-	@Operation(summary = "客商风险等级查询", description = "C101-1 按客商编号查询风险等级与黑名单状态（展示用），内部客商默认无风险，高风险/黑名单返回风险提示文案，结果留痕")
+	@Operation(summary = "客商风险等级查询", description = "C101-1 按客商编号查询风险等级与黑名单状态（展示用），内部客商默认无风险，高风险/黑名单返回风险提示文案，结果留痕；creditCode/customerName 为新增客商场景兜底入参")
-	public R<CustomerRiskVO> risk(@Parameter(description = "客商编号", required = true) @RequestParam String customerCode) {
+	public R<CustomerRiskVO> risk(@Parameter(description = "客商编号", required = true) @RequestParam String customerCode,
-		return R.data(hcsCreditCheckSupport.queryCustomerRisk(customerCode));
+		@Parameter(description = "统一社会信用代码（新增客商档案未落库时兜底查金蝶黑名单）") @RequestParam(required = false) String creditCode,
+		@Parameter(description = "客商名称（新增客商档案未落库时提示文案名称兜底）") @RequestParam(required = false) String customerName) {
+		return R.data(hcsCreditCheckSupport.queryCustomerRisk(customerCode, creditCode, customerName));
 	}
 
 	/**
@@ -261,13 +282,14 @@ public class HcsSyncController {
 	 */
 	@GetMapping("/attachment/download")
 	@ApiOperationSupport(order = 12)
-	@Operation(summary = "合规附件下载", description = "C103-5 代理：按合规附件ID 下载文件流，name 参数可选用于指定下载文件名")
+	@Operation(summary = "合规附件下载", description = "C103-5 代理：按合规附件ID 下载文件流，name 参数可选用于指定下载文件名，inline=true 时内嵌预览（pdf 浏览器直接打开）")
 	public void downloadAttachment(@Parameter(description = "合规附件ID", required = true) @RequestParam String fdId,
 								   @Parameter(description = "下载文件名（可选）") @RequestParam(required = false) String name,
 								   HttpServletResponse response) throws Exception {
 		String fileName = StringUtil.isBlank(name) ? "hcs-attachment-" + fdId : name;
 		response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-		response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"));
+		response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''"
+			+ URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"));
 		try (Response hcsResponse = hcsAttachmentSupport.downloadRaw(fdId);
 			 InputStream inputStream = hcsResponse.body().asInputStream();
 			 OutputStream outputStream = response.getOutputStream()) {
@@ -276,6 +298,19 @@ public class HcsSyncController {
 		}
 	}
 
+	/**
+	 * 合同附件下载（路径式文件名，url 以 .pdf 等后缀结尾）：前端附件组件按 url 路径后缀识别附件类型，
+	 * query 传 fdId；行为与 /attachment/download 完全一致，强制下载不做内嵌预览
+	 */
+	@GetMapping("/attachment/download/{name}")
+	@ApiOperationSupport(order = 12)
+	@Operation(summary = "合规附件下载（路径式文件名）", description = "C103-5 代理：路径携带文件名（含后缀，前端附件类型识别用），fdId 必传，文件流 attachment 下载")
+	public void downloadAttachmentWithPath(@Parameter(description = "下载文件名（含后缀）", required = true) @PathVariable String name,
+										   @Parameter(description = "合规附件ID", required = true) @RequestParam String fdId,
+										   HttpServletResponse response) throws Exception {
+		this.downloadAttachment(fdId, name, response);
+	}
+
 	/**
 	 * 合同特批结果人工确认（§6-U1 过渡方案：与合规推送等效）
 	 */
@@ -307,7 +342,7 @@ public class HcsSyncController {
 	 * <p>
 	 * 免登免授权同合同接口（blade.secure 放行）；
 	 * iPaaS 网关注册映射：/gwzh/HTHG/paymentLegal/result → /hcs/paymentLegal/result；
-	 * 报文 {sourceSystem, requestId=TMS付款申请ID, status=APPROVED/REJECTED, reason}，
+	 * 报文 {sourceSystem, requestId=合规特批流程ID(hcs_spec_fd_id), status=APPROVED/REJECTED, reason}，
 	 * approved 恢复"审批通过"放行，rejected 联动付款审批驳回走重新提交闭环。
 	 */
 	@PostMapping("/paymentLegal/result")

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProjectChangeController.java

@@ -33,6 +33,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
+import org.springblade.transport.constant.HcsSyncConstant;
 import org.springblade.transport.pojo.entity.ProjectChange;
 import org.springblade.transport.pojo.vo.ProjectChangeVO;
 import org.springblade.transport.service.IProjectChangeService;
@@ -110,17 +111,12 @@ public class ProjectChangeController extends BladeController {
 		hcsImmediatePushSupport.pushProjectAndWait(projectId);
 		String syncFailure = HcsImmediatePushSupport.pollSyncFailure();
 		if (syncFailure != null) {
-			ProjectChange projectChange = projectChangeService.getById(id);
+			projectChangeService.writeBackSyncStatus(projectId, HcsSyncConstant.HCS_STATUS_FAILED);
-			if (projectChange != null) {
-				projectChange.setSyncStatus("failed");
-				projectChangeService.updateById(projectChange);
-			}
 			return R.data(Boolean.FALSE, "审批通过，但合规推送失败：" + syncFailure);
 		}
-		ProjectChange projectChange = projectChangeService.getById(id);
+		// 即时推送未开启时（开关关闭不触发推送）不标记已推送，待推送状态由定时扫描任务推送后闭环
-		if (projectChange != null) {
+		if (hcsImmediatePushSupport.isImmediateEnabled()) {
-			projectChange.setSyncStatus("synced");
+			projectChangeService.writeBackSyncStatus(projectId, HcsSyncConstant.HCS_STATUS_SYNCED);
-			projectChangeService.updateById(projectChange);
 		}
 		return R.success("审批通过");
 	}

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ReceiptClaimRecordController.java

@@ -83,16 +83,9 @@ public class ReceiptClaimRecordController extends BladeController {
 
 	@PostMapping("/void")
 	@ApiOperationSupport(order = 4)
-	@Operation(summary = "作废认领记录并生成金蝶认领冲单")
+	@Operation(summary = "作废认领记录（作废后同步合同合规系统）")
 	public R<Void> voidClaim(@RequestParam Long id) {
 		receiptClaimRecordService.voidClaim(id);
 		return R.success("作废成功");
 	}
-
-	@PostMapping("/query-kingdee-result")
-	@ApiOperationSupport(order = 5)
-	@Operation(summary = "查询金蝶认领结果（A301-1 收款单查询回写）")
-	public R<Integer> queryKingdeeResult() {
-		return R.data(receiptClaimRecordService.refreshKingdeeResult());
-	}
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ReceiptFlowController.java

@@ -35,7 +35,6 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
-import org.springblade.transport.pojo.dto.ReceiptClaimPushResult;
 import org.springblade.transport.pojo.dto.ReceiptClaimRequest;
 import org.springblade.transport.pojo.vo.ReceiptFlowVO;
 import org.springblade.transport.service.IReceiptFlowService;
@@ -95,16 +94,8 @@ public class ReceiptFlowController extends BladeController {
 
 	@PostMapping("/sync")
 	@ApiOperationSupport(order = 5)
-	@Operation(summary = "手动同步金蝶收款流水（A301-2 收款认领公告查询）")
+	@Operation(summary = "手动同步金蝶收款流水（A301-1 收款单查询）")
 	public R<Integer> sync() {
 		return R.data(receiptFlowService.sync());
 	}
-
-	@PostMapping("/push-kingdee")
-	@ApiOperationSupport(order = 6)
-	@Operation(summary = "推送金蝶收款认领（A301-3 收款认领结果推送，仅认领完成流水可推送）")
-	public R<ReceiptClaimPushResult> pushKingdee(@RequestParam Long flowId) {
-		ReceiptClaimPushResult result = receiptFlowService.pushClaimToKingdee(flowId);
-		return result.isSuccess() ? R.data(result) : R.fail(result.getMessage());
-	}
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java

@@ -66,6 +66,8 @@ public class ContractManageExcel implements Serializable {
 	private String partyA;
 	@ExcelProperty("乙方")
 	private String partyB;
+	@ExcelProperty("丙方")
+	private String partyC;
 	@ExcelProperty("开始日期")
 	private LocalDate startDate;
 	@ExcelProperty("结束日期")

blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CustomerArchiveExcel.java

@@ -51,6 +51,9 @@ public class CustomerArchiveExcel implements Serializable {
 	@ExcelProperty("客商编号")
 	private String customerCode;
 
+	@ExcelProperty("供应商编码")
+	private String supplierCode;
+
 	@ExcelProperty("客商简称")
 	private String shortName;
 

blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/CustomerArchiveMapper.xml

@@ -54,6 +54,11 @@
         <result column="kingdee_status" property="kingdeeStatus"/>
         <result column="kingdee_fail_reason" property="kingdeeFailReason"/>
         <result column="kingdee_sync_time" property="kingdeeSyncTime"/>
+        <result column="hcs_risk_level" property="hcsRiskLevel"/>
+        <result column="kingdee_black_status" property="kingdeeBlackStatus"/>
+        <result column="hcs_risk_time" property="hcsRiskTime"/>
+        <result column="kingdee_black_category" property="kingdeeBlackCategory"/>
+        <result column="kingdee_black_reason" property="kingdeeBlackReason"/>
     </resultMap>
 
     <select id="selectCustomerArchivePage" resultMap="customerArchiveResultMap">
@@ -108,6 +113,11 @@
             kingdee_status,
             kingdee_fail_reason,
             kingdee_sync_time,
+            hcs_risk_level,
+            kingdee_black_status,
+            hcs_risk_time,
+            kingdee_black_category,
+            kingdee_black_reason,
             (
                 SELECT s.review_status
                 FROM blade_customer_credit_score s
@@ -171,6 +181,23 @@
         <if test="customer.createTimeEnd != null">
             AND create_time &lt;= #{customer.createTimeEnd}
         </if>
+        <!-- 客商风险筛选：blacklist 仅按金蝶黑名单（A801-5）命中过滤；等级筛选独立 -->
+        <if test="customer.customerRisk != null and customer.customerRisk != ''">
+            <choose>
+                <when test="customer.customerRisk == 'blacklist'">
+                    AND (kingdee_black_category IS NOT NULL OR kingdee_black_reason IS NOT NULL)
+                </when>
+                <when test="customer.customerRisk == 'high'">
+                    AND hcs_risk_level = '2'
+                </when>
+                <when test="customer.customerRisk == 'middle'">
+                    AND hcs_risk_level = '1'
+                </when>
+                <otherwise>
+                    AND hcs_risk_level = '0'
+                </otherwise>
+            </choose>
+        </if>
         ORDER BY create_time DESC
     </select>
 

blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/KingdeeReceiptFlowMapper.java

@@ -27,8 +27,11 @@ package org.springblade.transport.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.KingdeeReceiptFlow;
 
+import java.util.List;
+
 /**
  * 金蝶收款流水镜像 Mapper 接口
  *
@@ -36,4 +39,13 @@ import org.springblade.transport.pojo.entity.KingdeeReceiptFlow;
  */
 @Mapper
 public interface KingdeeReceiptFlowMapper extends BaseMapper<KingdeeReceiptFlow> {
+
+	/**
+	 * 组织管理（blade_dept）中的平台公司金蝶组织编码列表（是否平台公司=是 且 已维护金蝶编码）
+	 *
+	 * @return 平台公司金蝶组织编码
+	 */
+	@Select("SELECT kingdee_dept_code FROM blade_dept WHERE is_platform_company = 1 "
+		+ "AND kingdee_dept_code IS NOT NULL AND kingdee_dept_code != '' AND is_deleted = 0")
+	List<String> selectPlatformOrgNumbers();
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/ReceiptClaimHcsRecordMapper.java

@@ -0,0 +1,39 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.transport.pojo.entity.ReceiptClaimHcsRecord;
+
+/**
+ * 收款认领合规推送记录 Mapper 接口
+ *
+ * @author Chill
+ */
+@Mapper
+public interface ReceiptClaimHcsRecordMapper extends BaseMapper<ReceiptClaimHcsRecord> {
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/ocr/service/IBusinessLicenseOcrService.java

@@ -0,0 +1,45 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.ocr.service;
+
+import org.springblade.transport.pojo.vo.BusinessLicenseOcrVO;
+
+/**
+ * 营业执照 OCR 服务。
+ *
+ * @author Chill
+ */
+public interface IBusinessLicenseOcrService {
+
+	/**
+	 * 根据图片地址识别营业执照。
+	 *
+	 * @param imageUrl 图片地址
+	 * @return 识别结果
+	 */
+	BusinessLicenseOcrVO recognizeUrl(String imageUrl);
+
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/ocr/service/impl/BusinessLicenseOcrServiceImpl.java

@@ -0,0 +1,189 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.ocr.service.impl;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.transport.ocr.service.IBusinessLicenseOcrService;
+import org.springblade.transport.pojo.vo.BusinessLicenseOcrVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 营业执照 OCR 服务实现，调用第三方 /businessLicense 接口。
+ *
+ * @author Chill
+ */
+@Slf4j
+@Service
+public class BusinessLicenseOcrServiceImpl implements IBusinessLicenseOcrService {
+
+	private static final String PATH = "/businessLicense";
+	private static final String DATA_TYPE_URL = "url";
+	private static final int SUCCESS_CODE = 0;
+
+	private final ObjectMapper objectMapper;
+	private final HttpClient httpClient;
+
+	/**
+	 * 营业执照 OCR 服务地址，Nacos：thirdParty.ocr.businessLicenseBaseUrl
+	 */
+	@Value("${thirdParty.ocr.businessLicenseBaseUrl:http://124.71.22.123:8888}")
+	private String businessLicenseBaseUrl;
+
+	public BusinessLicenseOcrServiceImpl(ObjectMapper objectMapper,
+										 @Qualifier("baiduOcrHttpClient") HttpClient httpClient) {
+		this.objectMapper = objectMapper;
+		this.httpClient = httpClient;
+	}
+
+	@Override
+	public BusinessLicenseOcrVO recognizeUrl(String imageUrl) {
+		if (StringUtil.isBlank(imageUrl)) {
+			throw new ServiceException("OCR图片地址不能为空");
+		}
+		String normalizedUrl = imageUrl.trim();
+		validateImageUrl(normalizedUrl);
+		if (StringUtil.isBlank(businessLicenseBaseUrl)) {
+			throw new ServiceException("营业执照OCR服务地址未配置（thirdParty.ocr.businessLicenseBaseUrl）");
+		}
+		String requestUrl = businessLicenseBaseUrl.replaceAll("/+$", "") + PATH;
+		Map<String, String> body = new LinkedHashMap<>();
+		body.put("img_path", normalizedUrl);
+		body.put("data_type", DATA_TYPE_URL);
+		JsonNode response = sendRequest(requestUrl, body);
+		int code = response.path("code").asInt(Integer.MIN_VALUE);
+		if (code != SUCCESS_CODE) {
+			String message = firstNonBlank(response.path("msg").asText(null), response.path("message").asText(null), "未知错误");
+			log.warn("营业执照OCR识别失败，code={}，msg={}，imageUrl={}", code, message, normalizedUrl);
+			throw new ServiceException("营业执照OCR识别失败：" + message);
+		}
+		BusinessLicenseOcrVO result = new BusinessLicenseOcrVO();
+		result.setFields(extractFields(response.path("data")));
+		return result;
+	}
+
+	private JsonNode sendRequest(String requestUrl, Map<String, String> body) {
+		try {
+			String jsonBody = objectMapper.writeValueAsString(body);
+			HttpRequest request = HttpRequest.newBuilder(URI.create(requestUrl))
+				.timeout(Duration.ofSeconds(60))
+				.header("Content-Type", "application/json")
+				.header("Accept", "application/json")
+				.POST(HttpRequest.BodyPublishers.ofString(jsonBody, StandardCharsets.UTF_8))
+				.build();
+			HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
+			if (response.statusCode() < 200 || response.statusCode() >= 300) {
+				log.error("营业执照OCR接口响应异常，status={}，url={}", response.statusCode(), requestUrl);
+				throw new ServiceException("营业执照OCR接口调用失败，HTTP状态码：" + response.statusCode());
+			}
+			JsonNode result = objectMapper.readTree(response.body());
+			if (result == null || !result.isObject()) {
+				throw new ServiceException("营业执照OCR响应格式异常");
+			}
+			return result;
+		} catch (ServiceException exception) {
+			throw exception;
+		} catch (InterruptedException exception) {
+			Thread.currentThread().interrupt();
+			log.error("调用营业执照OCR接口被中断，url={}", requestUrl, exception);
+			throw new ServiceException("营业执照OCR接口调用被中断");
+		} catch (IllegalArgumentException exception) {
+			log.error("营业执照OCR接口地址配置不正确，url={}", requestUrl);
+			throw new ServiceException("营业执照OCR接口地址配置不正确");
+		} catch (IOException exception) {
+			log.error("调用营业执照OCR接口失败，url={}", requestUrl, exception);
+			throw new ServiceException("营业执照OCR接口调用失败");
+		}
+	}
+
+	private Map<String, String> extractFields(JsonNode dataNode) {
+		Map<String, String> fields = new LinkedHashMap<>();
+		if (dataNode == null || !dataNode.isArray()) {
+			return fields;
+		}
+		for (JsonNode item : dataNode) {
+			if (item == null || !item.isObject()) {
+				continue;
+			}
+			String key = item.path("key").asText(null);
+			String value = item.path("value").asText(null);
+			if (StringUtil.isBlank(key) || value == null) {
+				continue;
+			}
+			String trimmed = value.trim();
+			if (StringUtil.isBlank(trimmed)) {
+				continue;
+			}
+			fields.put(key.trim(), trimmed);
+		}
+		return fields;
+	}
+
+	private void validateImageUrl(String imageUrl) {
+		if (imageUrl.getBytes(StandardCharsets.UTF_8).length > 1024) {
+			throw new ServiceException("OCR图片地址长度不能超过1024字节");
+		}
+		try {
+			URI imageUri = URI.create(imageUrl);
+			String scheme = imageUri.getScheme();
+			if (StringUtil.isBlank(scheme) || StringUtil.isBlank(imageUri.getHost())
+				|| imageUri.getUserInfo() != null
+				|| !("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme))) {
+				throw new ServiceException("OCR图片地址必须是有效的HTTP或HTTPS地址");
+			}
+		} catch (IllegalArgumentException exception) {
+			throw new ServiceException("OCR图片地址格式不正确");
+		}
+	}
+
+	private String firstNonBlank(String... values) {
+		if (values == null) {
+			return null;
+		}
+		for (String value : values) {
+			if (StringUtil.isNotBlank(value)) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractChangeService.java

@@ -72,4 +72,13 @@ public interface IContractChangeService extends BaseService<ContractChange> {
 	 */
 	boolean markSyncStatus(String ids, String syncStatus);
 
+	/**
+	 * 按原合同回写最近一条待同步变更单的同步状态（审批即时推送/定时任务推送后调用）
+	 *
+	 * @param contractId 原合同ID
+	 * @param syncStatus 同步状态（synced/failed）
+	 * @return 是否回写成功（无待同步变更单时返回 false）
+	 */
+	boolean writeBackSyncStatus(Long contractId, String syncStatus);
+
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractManageService.java

@@ -75,12 +75,13 @@ public interface IContractManageService extends BaseService<ContractManage> {
 	List<ContractManageExcel> exportContractManage(ContractManageVO contractManage, String ids);
 
 	/**
-	 * 预览下一合同编号（按合同负责部门前缀 + 年份 + 三位流水）
+	 * 预览下一合同编号（按平台公司 + 业务部门配置的前缀 + 年份 + 三位流水）
 	 *
-	 * @param organizationId 合同负责部门ID
+	 * @param organizationId    合同负责部门（业务部门）ID
+	 * @param platformCompanyId 平台公司ID
 	 * @return 预览编号
 	 */
-	String nextContractNo(Long organizationId);
+	String nextContractNo(Long organizationId, Long platformCompanyId);
 
 	/**
 	 * 合同是否可用于生成结算单：已审批、未终止，且临时合同仍在临时效力期内。

blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICustomerArchiveService.java

@@ -25,6 +25,7 @@ package org.springblade.transport.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiBankVO;
 import org.springblade.transport.excel.CustomerArchiveExcel;
 import org.springblade.transport.pojo.entity.CustomerArchive;
 import org.springblade.transport.pojo.vo.CustomerArchiveVO;
@@ -196,6 +197,30 @@ public interface ICustomerArchiveService extends BaseService<CustomerArchive> {
 	 */
 	CustomerArchive syncKingdee(Long id);
 
+	/**
+	 * A901-1 按统一社会信用代码查询金蝶供应商编码（新增客商填写信用代码后即时回显用），查不到返回 null
+	 *
+	 * @param unifiedCreditCode 统一社会信用代码
+	 * @return 金蝶供应商编码
+	 */
+	String querySupplierCode(String unifiedCreditCode);
+
+	/**
+	 * A905-3 按行名精确匹配金蝶行名行号档案（收款信息填写开户行后失焦回显联行号用），查不到返回 null
+	 *
+	 * @param bankName 开户行名称（行名全称）
+	 * @return 匹配到的行名行号档案，含联行号
+	 */
+	BfiBankVO queryKingdeeBank(String bankName);
+
+	/**
+	 * A905-3 按行号精确匹配金蝶行名行号档案（收款信息保存前校验联行号真实存在用），查不到返回 null，接口异常上抛由全局异常处理返回
+	 *
+	 * @param cnapsCode 联行号（行号）
+	 * @return 匹配到的行名行号档案
+	 */
+	BfiBankVO queryKingdeeBankByNumber(String cnapsCode);
+
 	/**
 	 * 推送失败状态落库（独立事务）：推送主事务已回滚，失败状态与原因单独落库供页面展示与手动重推
 	 *

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IFormalSettlementService.java

@@ -80,6 +80,23 @@ public interface IFormalSettlementService extends BaseService<FormalSettlement>
 	String retryKingdeeFailed();
 
 	String syncKingdeeArResult();
+
+	/**
+	 * 金蝶冲销状态定时回写：扫描已同步金蝶的结算单，按防重键批量查询 A102-4/A302-4 的
+	 * hadwrittenoff（部分冲销视同已冲销），回写冲销状态供结算单列表展示
+	 *
+	 * @return 执行摘要
+	 */
+	String syncKingdeeWriteOffResult();
+
+	/**
+	 * 单笔刷新金蝶冲销状态（选单预检/重推闸门实时查询后回写，状态未变化不落库）
+	 *
+	 * @param settlementId 正式结算单id
+	 * @param writtenOff   金蝶侧应付/应收单是否已冲销
+	 */
+	void refreshKingdeeWriteOff(Long settlementId, boolean writtenOff);
+
 	List<FormalSettlementDetailFee> detailFees(Long detailId);
 	void adjustDetail(PreSettlementDetailAdjustRequest request);
 	void refreshPaymentSummary(Long settlementId);

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IPaymentApplicationService.java

@@ -72,12 +72,13 @@ public interface IPaymentApplicationService extends BaseService<PaymentApplicati
 	String doSyncKingdee(Long id, KingdeeSyncContext context);
 
 	/**
-	 * 独立事务落"生成失败"状态（在推送事务回滚、行锁释放后执行）；
+	 * 独立事务落"生成失败"状态与失败原因（在推送事务回滚、行锁释放后执行）；
 	 * 仅更新审批通过的单据，未审批/已删除单据自动跳过，保持原状态
 	 *
-	 * @param id 付款申请id
+	 * @param id     付款申请id
+	 * @param reason 失败原因（异常信息，展示在列表状态悬浮提示）
 	 */
-	void markKingdeeSyncFailed(Long id);
+	void markKingdeeSyncFailed(Long id, String reason);
 
 	/**
 	 * 重推金蝶生成失败（kingdeeStatus=failed 且审批通过）的付款申请：逐单独立成败，失败不中断。

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProjectChangeService.java

@@ -67,4 +67,13 @@ public interface IProjectChangeService extends BaseService<ProjectChange> {
 
 	boolean removeDraft(String ids);
 
+	/**
+	 * 按原项目回写最近一条待同步变更单的同步状态（审批即时推送/定时任务推送后调用）
+	 *
+	 * @param projectId 原项目ID
+	 * @param syncStatus 同步状态（synced/failed）
+	 * @return 是否回写成功（无待同步变更单时返回 false）
+	 */
+	boolean writeBackSyncStatus(Long projectId, String syncStatus);
+
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IReceiptClaimRecordService.java

@@ -46,11 +46,4 @@ public interface IReceiptClaimRecordService extends BaseService<ReceiptClaim> {
 	void updateAttachments(ReceiptClaimAttachmentsRequest request);
 
 	void voidClaim(Long id);
-
-	/**
-	 * A301-1 收款单查询回写认领结果：按来源单据编码匹配金蝶收款单，推进金蝶单据状态
-	 *
-	 * @return 回写条数
-	 */
-	int refreshKingdeeResult();
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IReceiptFlowService.java

@@ -27,7 +27,6 @@ package org.springblade.transport.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
-import org.springblade.transport.pojo.dto.ReceiptClaimPushResult;
 import org.springblade.transport.pojo.dto.ReceiptClaimRequest;
 import org.springblade.transport.pojo.entity.KingdeeReceiptFlow;
 import org.springblade.transport.pojo.vo.ReceiptFlowVO;
@@ -53,25 +52,9 @@ public interface IReceiptFlowService extends BaseService<KingdeeReceiptFlow> {
 	Long claim(ReceiptClaimRequest request);
 
 	/**
-	 * 手动同步金蝶收款流水：直连 A301-2 收款认领公告查询，按明细流水号幂等 upsert 收款流水表
+	 * 手动同步金蝶收款流水：直连 A301-1 收款单查询（收款处理查询），按流水分录明细流水号幂等 upsert 收款流水表
 	 *
 	 * @return 本次同步条数
 	 */
 	int sync();
-
-	/**
-	 * 手动推送金蝶（A301-3 收款认领结果推送）：认领完成且未推送过的流水才可推送，
-	 * 推送前以当前用户姓名重查 A301-2 最新公告对账。与定时任务共用同一推送实现。
-	 *
-	 * @param flowId 收款流水id
-	 * @return 推送结果（失败不抛异常，原因随结果返回）
-	 */
-	ReceiptClaimPushResult pushClaimToKingdee(Long flowId);
-
-	/**
-	 * 定时推送金蝶：扫描认领完成且未推送过的流水，按认领人姓名分组重查 A301-2 最新公告后逐条推送。
-	 *
-	 * @return 执行摘要
-	 */
-	String pushClaimByTask();
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java

@@ -310,7 +310,7 @@ public class CommonAddressServiceImpl extends BaseServiceImpl<CommonAddressMappe
 
 	private void fillDisplay(CommonAddressVO address) {
 		address.setSiteCodeDisplay(TYPE_NORMAL.equals(address.getAddressType()) ? NORMAL_SITE_CODE : address.getSiteCode());
-		address.setReadonly(!TransportBusinessSupport.isAdministrator() && !Objects.equals(address.getDeptId(), currentDeptId()));
+		address.setReadonly(TransportBusinessSupport.isDeptReadonly(address.getDeptId(), TransportBusinessSupport.MENU_COMMON_ADDRESS));
 		address.setCreateUserName(UserCache.getUserRealName(address.getCreateUser()));
 		address.setUpdateUserName(UserCache.getUserRealName(address.getUpdateUser()));
 	}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java

@@ -36,12 +36,15 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.transport.constant.HcsSyncConstant;
 import org.springblade.transport.mapper.ContractChangeMapper;
+import org.springblade.transport.support.hcs.HcsCreditCheckSupport;
 import org.springblade.transport.pojo.entity.ContractChange;
+import org.springblade.transport.pojo.entity.CustomerArchive;
 import org.springblade.transport.pojo.entity.ContractManage;
 import org.springblade.transport.pojo.vo.ContractChangeVO;
 import org.springblade.transport.pojo.vo.ContractManageVO;
 import org.springblade.transport.service.IContractChangeService;
 import org.springblade.transport.service.IContractManageService;
+import org.springblade.transport.support.ContractPartySupport;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.wrapper.ContractChangeWrapper;
 import org.springframework.stereotype.Service;
@@ -77,12 +80,14 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 	private static final DateTimeFormatter CODE_DATE = DateTimeFormatter.ofPattern("yyyyMMdd");
 
 	private final IContractManageService contractManageService;
+	private final HcsCreditCheckSupport hcsCreditCheckSupport;
 
 	@Override
 	public IPage<ContractChangeVO> selectContractChangePage(IPage<ContractChange> page, ContractChangeVO contractChange) {
 		IPage<ContractChange> entityPage = page(page, buildQuery(contractChange).orderByDesc(ContractChange::getCreateTime));
 		IPage<ContractChangeVO> voPage = ContractChangeWrapper.build().pageVO(entityPage);
 		voPage.getRecords().forEach(this::fillReadonly);
+		this.fillContractRisk(voPage.getRecords());
 		return voPage;
 	}
 
@@ -90,6 +95,7 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 	public ContractChangeVO detail(Long id) {
 		ContractChangeVO contractChangeVO = ContractChangeWrapper.build().entityVO(loadExists(id));
 		fillReadonly(contractChangeVO);
+		this.fillContractRisk(java.util.Collections.singletonList(contractChangeVO));
 		return contractChangeVO;
 	}
 
@@ -97,10 +103,40 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 	@TenantIgnore
 	public ContractChangeVO publicDetail(Long id) {
 		ContractChangeVO contractChangeVO = ContractChangeWrapper.build().entityVO(loadExists(id));
+		this.fillContractRisk(java.util.Collections.singletonList(contractChangeVO));
 		contractChangeVO.setReadonly(Boolean.TRUE);
 		return contractChangeVO;
 	}
 
+	/**
+	 * 组装客商风险展示数据（变更列表/详情共用，复用 HcsCreditCheckSupport 公共查询）：
+	 * 等级取甲乙双方较高值、黑名单任一方金蝶命中记是；名称关联不到或内部组织客商按无数据处理
+	 */
+	private void fillContractRisk(java.util.List<ContractChangeVO> records) {
+		if (Func.isEmpty(records)) {
+			return;
+		}
+		java.util.Set<String> partyNames = new java.util.HashSet<>();
+		records.forEach(change -> {
+			if (Func.isNotEmpty(change.getPartyA())) {
+				partyNames.add(change.getPartyA().trim());
+			}
+			if (Func.isNotEmpty(change.getPartyB())) {
+				partyNames.add(change.getPartyB().trim());
+			}
+		});
+		java.util.Map<String, CustomerArchive> riskMap = this.hcsCreditCheckSupport.queryArchiveRiskMap(partyNames);
+		for (ContractChangeVO change : records) {
+			CustomerArchive partyARisk = Func.isEmpty(change.getPartyA()) ? null : riskMap.get(change.getPartyA().trim());
+			CustomerArchive partyBRisk = Func.isEmpty(change.getPartyB()) ? null : riskMap.get(change.getPartyB().trim());
+			change.setHcsRiskLevel(HcsCreditCheckSupport.higherRiskLevel(
+				partyARisk == null ? null : partyARisk.getHcsRiskLevel(),
+				partyBRisk == null ? null : partyBRisk.getHcsRiskLevel()));
+			change.setKingdeeBlackStatus(
+				HcsCreditCheckSupport.isKingdeeBlackHit(partyARisk) || HcsCreditCheckSupport.isKingdeeBlackHit(partyBRisk)
+					? HcsSyncConstant.BLACK_STATUS_YES : HcsSyncConstant.BLACK_STATUS_NO);
+		}
+	}
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public ContractChangeVO createFromContract(Long contractId, String changeType) {
@@ -190,7 +226,11 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 		String processor = TransportBusinessSupport.trimToNull(AuthUtil.getUserName());
 		contractChange.setCurrentProcessor(processor == null ? "系统" : processor);
 		contractChange.setApprovedTime(LocalDateTime.now());
-		contractChange.setSyncStatus(HcsSyncConstant.HCS_STATUS_UNSYNCED);
+		// 仅原合同已推送合规（有合规单据ID标识 hcs_fd_id）的变更单参与合规推送（C103-11），存量未推送合同不置同步状态
+		ContractManage contractManage = contractManageService.getById(contractChange.getContractId());
+		if (contractManage != null && Func.isNotBlank(contractManage.getHcsFdId())) {
+			contractChange.setSyncStatus(HcsSyncConstant.HCS_STATUS_UNSYNCED);
+		}
 		updateById(contractChange);
 		contractManageService.applyChangeFromRecord(contractChange);
 		return contractChange.getContractId();
@@ -253,6 +293,20 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 		return true;
 	}
 
+	@Override
+	public boolean writeBackSyncStatus(Long contractId, String syncStatus) {
+		if (contractId == null) {
+			return false;
+		}
+		// 仅回写该合同最近一条审批通过且未同步/失败的变更单，历史已闭环单据不翻动
+		return update(Wrappers.<ContractChange>lambdaUpdate()
+			.eq(ContractChange::getContractId, contractId)
+			.eq(ContractChange::getApprovalStatus, STATUS_APPROVED)
+			.in(ContractChange::getSyncStatus, List.of(HcsSyncConstant.HCS_STATUS_UNSYNCED, HcsSyncConstant.HCS_STATUS_FAILED))
+			.set(ContractChange::getSyncStatus, syncStatus)
+			.last("order by approved_time desc limit 1"));
+	}
+
 	private LambdaQueryWrapper<ContractChange> buildQuery(ContractChangeVO contractChange) {
 		TransportBusinessSupport.validateAllDept(contractChange.getAllDept(), "合同变更");
 		LambdaQueryWrapper<ContractChange> queryWrapper = Wrappers.<ContractChange>lambdaQuery().eq(ContractChange::getIsDeleted, 0);
@@ -263,9 +317,12 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 		} else if (!Objects.equals(contractChange.getAllDept(), 1)) {
 			Long currentDeptId = TransportBusinessSupport.currentDeptId("合同变更");
 			Long currentUserId = AuthUtil.getUserId();
-			queryWrapper.and(wrapper -> wrapper.eq(ContractChange::getOrganizationId, currentDeptId)
+			queryWrapper.and(wrapper -> {
-				.or().eq(ContractChange::getCreateUser, currentUserId)
+				wrapper.eq(ContractChange::getOrganizationId, currentDeptId)
-				.or().eq(ContractChange::getHandlerUserId, currentUserId));
+					.or().eq(ContractChange::getCreateUser, currentUserId)
+					.or().eq(ContractChange::getHandlerUserId, currentUserId);
+				TransportBusinessSupport.orProjectVisibleByBusinessDept(wrapper, List.of(currentDeptId));
+			});
 		} else if (Func.isNotEmpty(contractChange.getOrganizationId())) {
 			queryWrapper.eq(ContractChange::getOrganizationId, contractChange.getOrganizationId());
 		}
@@ -305,7 +362,20 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 		target.setSignType(source.getSignType());
 		target.setContractNo(source.getContractNo());
 		target.setContractName(source.getContractName());
-		target.setPartyB(source.getPartyB());
+		target.setPartyAJson(source.getPartyAJson());
+		target.setPartyBJson(source.getPartyBJson());
+		target.setPartyCJson(source.getPartyCJson());
+		ContractManage partyHolder = new ContractManage();
+		partyHolder.setPartyAJson(target.getPartyAJson());
+		partyHolder.setPartyBJson(target.getPartyBJson());
+		partyHolder.setPartyCJson(target.getPartyCJson());
+		ContractPartySupport.normalizeAndFillSummary(partyHolder);
+		target.setPartyAJson(partyHolder.getPartyAJson());
+		target.setPartyBJson(partyHolder.getPartyBJson());
+		target.setPartyCJson(partyHolder.getPartyCJson());
+		target.setPartyA(partyHolder.getPartyA());
+		target.setPartyB(partyHolder.getPartyB());
+		target.setPartyC(partyHolder.getPartyC());
 		target.setStartDate(source.getStartDate());
 		target.setEndDate(source.getEndDate());
 		target.setContractFormat(source.getContractFormat());
@@ -338,7 +408,12 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 		data.put("contractNo", contractManage.getContractNo());
 		data.put("contractName", contractManage.getContractName());
 		data.put("signType", contractManage.getSignType());
+		data.put("partyA", contractManage.getPartyA());
 		data.put("partyB", contractManage.getPartyB());
+		data.put("partyC", contractManage.getPartyC());
+		data.put("partyAJson", contractManage.getPartyAJson());
+		data.put("partyBJson", contractManage.getPartyBJson());
+		data.put("partyCJson", contractManage.getPartyCJson());
 		data.put("startDate", contractManage.getStartDate());
 		data.put("endDate", contractManage.getEndDate());
 		data.put("contractFormat", contractManage.getContractFormat());
@@ -451,7 +526,8 @@ public class ContractChangeServiceImpl extends BaseServiceImpl<ContractChangeMap
 			return true;
 		}
 		Long currentDeptId = TransportBusinessSupport.currentDeptId("合同变更");
-		return currentDeptId != null && Objects.equals(contractChange.getOrganizationId(), currentDeptId);
+		return currentDeptId != null && (Objects.equals(contractChange.getOrganizationId(), currentDeptId)
+			|| TransportBusinessSupport.isProjectOwnedByBusinessDept(contractChange.getProjectId(), currentDeptId));
 	}
 
 	private void fillReadonly(ContractChangeVO contractChangeVO) {

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java

@@ -36,6 +36,7 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.SysCache;
 import org.springblade.system.cache.UserCache;
+import org.springblade.system.pojo.entity.BusinessDeptConfig;
 import org.springblade.system.pojo.entity.Dept;
 import org.springblade.transport.constant.HcsSyncConstant;
 import org.springblade.transport.excel.ContractManageExcel;
@@ -43,12 +44,15 @@ import org.springblade.transport.mapper.ContractManageMapper;
 import org.springblade.transport.mapper.HcsContractExeStageMapper;
 import org.springblade.transport.pojo.entity.ContractChange;
 import org.springblade.transport.pojo.entity.ContractManage;
+import org.springblade.transport.pojo.entity.CustomerArchive;
 import org.springblade.transport.pojo.entity.HcsContractExeStage;
 import org.springblade.transport.pojo.vo.ContractManageVO;
 import org.springblade.transport.service.IContractExeStageService;
 import org.springblade.transport.service.IContractManageService;
+import org.springblade.transport.support.ContractPartySupport;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.support.hcs.HcsCreditCheckSupport;
+import org.springblade.transport.support.hcs.HcsImmediatePushSupport;
 import org.springblade.transport.wrapper.ContractManageWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,7 +62,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -67,6 +70,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 合同管理 服务实现类
@@ -80,6 +85,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 
 	private final HcsContractExeStageMapper hcsContractExeStageMapper;
 	private final HcsCreditCheckSupport hcsCreditCheckSupport;
+	private final HcsImmediatePushSupport hcsImmediatePushSupport;
 	private final IContractExeStageService contractExeStageService;
 
 	private static final String STAGE_DRAFT = "draft";
@@ -108,6 +114,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		IPage<ContractManage> entityPage = page(page, buildQuery(contractManage));
 		IPage<ContractManageVO> voPage = ContractManageWrapper.build().pageVO(entityPage);
 		voPage.getRecords().forEach(this::fillReadonly);
+		this.fillContractRisk(voPage.getRecords());
 		return voPage;
 	}
 
@@ -115,6 +122,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 	public ContractManageVO detail(Long id) {
 		ContractManageVO contractManageVO = ContractManageWrapper.build().entityVO(loadExists(id));
 		fillReadonly(contractManageVO);
+		this.fillContractRisk(java.util.Collections.singletonList(contractManageVO));
 		return contractManageVO;
 	}
 
@@ -127,6 +135,45 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		return contractManageVO;
 	}
 
+	/**
+	 * 组装客商风险展示数据（列表/详情共用，复用 HcsCreditCheckSupport 公共查询）：
+	 * 等级取甲乙双方较高值、黑名单任一方金蝶命中记是；名称关联不到或内部组织客商按无数据处理，前端展示"-"
+	 */
+	private void fillContractRisk(List<ContractManageVO> records) {
+		if (Func.isEmpty(records)) {
+			return;
+		}
+		Set<String> partyNames = new HashSet<>();
+		records.forEach(contract -> {
+			if (Func.isNotEmpty(contract.getPartyA())) {
+				partyNames.add(contract.getPartyA().trim());
+			}
+			if (Func.isNotEmpty(contract.getPartyB())) {
+				partyNames.add(contract.getPartyB().trim());
+			}
+		});
+		Map<String, CustomerArchive> riskMap = this.hcsCreditCheckSupport.queryArchiveRiskMap(partyNames);
+		for (ContractManageVO contract : records) {
+			CustomerArchive partyARisk = Func.isEmpty(contract.getPartyA()) ? null : riskMap.get(contract.getPartyA().trim());
+			CustomerArchive partyBRisk = Func.isEmpty(contract.getPartyB()) ? null : riskMap.get(contract.getPartyB().trim());
+			contract.setHcsRiskLevel(HcsCreditCheckSupport.higherRiskLevel(
+				partyARisk == null ? null : partyARisk.getHcsRiskLevel(),
+				partyBRisk == null ? null : partyBRisk.getHcsRiskLevel()));
+			contract.setKingdeeBlackStatus(
+				HcsCreditCheckSupport.isKingdeeBlackHit(partyARisk) || HcsCreditCheckSupport.isKingdeeBlackHit(partyBRisk)
+					? HcsSyncConstant.BLACK_STATUS_YES : HcsSyncConstant.BLACK_STATUS_NO);
+			// 悬浮明细与客商列表/表单实时提示同口径（buildRiskDetail 统一组装），有风险信息的甲乙方段拼接展示
+			String partyADetail = partyARisk == null ? ""
+				: HcsCreditCheckSupport.buildRiskDetail(contract.getPartyA().trim(), partyARisk.getHcsRiskLevel(),
+					partyARisk.getKingdeeBlackCategory(), partyARisk.getKingdeeBlackReason());
+			String partyBDetail = partyBRisk == null ? ""
+				: HcsCreditCheckSupport.buildRiskDetail(contract.getPartyB().trim(), partyBRisk.getHcsRiskLevel(),
+					partyBRisk.getKingdeeBlackCategory(), partyBRisk.getKingdeeBlackReason());
+			contract.setHcsRiskDetail(Stream.of(partyADetail, partyBDetail)
+				.filter(Func::isNotEmpty).collect(Collectors.joining("；")));
+		}
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean saveDraft(ContractManage contractManage) {
@@ -403,7 +450,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		request.setSignType(change.getSignType());
 		request.setContractNo(change.getContractNo());
 		request.setContractName(change.getContractName());
-		request.setPartyB(change.getPartyB());
+		request.setPartyAJson(change.getPartyAJson());
+		request.setPartyBJson(change.getPartyBJson());
+		request.setPartyCJson(change.getPartyCJson());
+		ContractPartySupport.normalizeAndFillSummary(request);
 		request.setStartDate(change.getStartDate());
 		request.setEndDate(change.getEndDate());
 		request.setContractFormat(change.getContractFormat());
@@ -464,13 +514,23 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		TransportBusinessSupport.validateRequired(request.getSettlementCurrency(), "请选择结算币种");
 		ContractManage candidate = new ContractManage();
 		BeanUtil.copyProperties(source, candidate);
-		candidate.setPartyB(TransportBusinessSupport.trimToNull(request.getPartyB()));
+		candidate.setPartyAJson(request.getPartyAJson());
+		candidate.setPartyBJson(request.getPartyBJson());
+		candidate.setPartyCJson(request.getPartyCJson());
+		ContractPartySupport.normalizeAndFillSummary(candidate);
+		ContractPartySupport.validateRequiredParties(candidate, true);
+		ContractPartySupport.validateBillingPlanBindings(candidate);
 		validateContractPartyCombinationUnique(candidate);
 		validatePaymentRatios(request.getPaymentRatioJson());
 		applyContractNo(source, request.getContractNo(), false);
 		source.setContractName(request.getContractName());
 		source.setSignType(request.getSignType());
-		source.setPartyB(request.getPartyB());
+		source.setPartyAJson(candidate.getPartyAJson());
+		source.setPartyBJson(candidate.getPartyBJson());
+		source.setPartyCJson(candidate.getPartyCJson());
+		source.setPartyA(candidate.getPartyA());
+		source.setPartyB(candidate.getPartyB());
+		source.setPartyC(candidate.getPartyC());
 		source.setStartDate(request.getStartDate());
 		source.setEndDate(request.getEndDate());
 		source.setContractFormat(request.getContractFormat());
@@ -510,11 +570,20 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 			|| !List.of(STATUS_APPROVED, STATUS_CHANGE_APPROVED).contains(source.getApprovalStatus())) {
 			throw new ServiceException("仅审批通过的正式合同允许上传附件");
 		}
-		String nextContractFileJson = mergeApprovedContractFiles(source.getContractFileJson(), contractManage.getContractFileJson());
+		String originalContractFileJson = source.getContractFileJson();
+		String nextContractFileJson = mergeApprovedContractFiles(originalContractFileJson, contractManage.getContractFileJson());
 		source.setContractFileJson(nextContractFileJson);
 		source.setAttachmentsJson(TransportBusinessSupport.trimToNull(contractManage.getAttachmentsJson()));
 		refreshArchiveStatusOnApprove(source);
-		return updateById(source);
+		boolean saved = updateById(source);
+		// 本次新增双章归档文件：事务提交后即时推送合规归档状态（C103-11 带 fdArchiveStatus=toarchive + 归档附件挂其他附件面板）；
+		// 合同尚未发起合规（无 hcs_fd_id）时首次推送报文自带归档状态，无需单独推送
+		String newSealFilesJson = extractNewSealFilesJson(originalContractFileJson, contractManage.getContractFileJson());
+		if (saved && newSealFilesJson != null && Func.isNotEmpty(source.getHcsFdId())) {
+			log.info("合同上传双章归档文件触发合规归档推送：contractNo={}，hcsFdId={}", source.getContractNo(), source.getHcsFdId());
+			hcsImmediatePushSupport.pushContractArchiveAfterCommit(source.getId(), newSealFilesJson);
+		}
+		return saved;
 	}
 
 	@Override
@@ -610,9 +679,12 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		} else if (!Objects.equals(contractManage.getAllDept(), 1)) {
 			Long currentDeptId = TransportBusinessSupport.currentDeptId("合同管理");
 			Long currentUserId = AuthUtil.getUserId();
-			queryWrapper.and(wrapper -> wrapper.eq(ContractManage::getOrganizationId, currentDeptId)
+			queryWrapper.and(wrapper -> {
-				.or().eq(ContractManage::getCreateUser, currentUserId)
+				wrapper.eq(ContractManage::getOrganizationId, currentDeptId)
-				.or().eq(ContractManage::getHandlerUserId, currentUserId));
+					.or().eq(ContractManage::getCreateUser, currentUserId)
+					.or().eq(ContractManage::getHandlerUserId, currentUserId);
+				TransportBusinessSupport.orProjectVisibleByBusinessDept(wrapper, List.of(currentDeptId));
+			});
 		} else if (Func.isNotEmpty(contractManage.getOrganizationId())) {
 			queryWrapper.eq(ContractManage::getOrganizationId, contractManage.getOrganizationId());
 		}
@@ -632,6 +704,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 			.eq(Func.isNotEmpty(contractManage.getArchiveStatus()), ContractManage::getArchiveStatus, contractManage.getArchiveStatus())
 			.eq(Func.isNotEmpty(contractManage.getContractStage()), ContractManage::getContractStage, contractManage.getContractStage())
 			.orderByDesc(ContractManage::getCreateTime);
+		applyPartyName(queryWrapper, contractManage.getPartyName());
 		applyEffectiveType(queryWrapper, contractManage.getEffectiveType());
 		applyExpireScope(queryWrapper, contractManage.getExpireScope());
 		// 是否同步金蝶（kingdee_id 是否已回填）/ 是否同步合规（hcs_sync_status 是否 synced）
@@ -657,6 +730,18 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		}
 	}
 
+	/**
+	 * 客商筛选：匹配合同甲/乙/丙方名称（模糊）
+	 */
+	private void applyPartyName(LambdaQueryWrapper<ContractManage> queryWrapper, String partyName) {
+		if (Func.isEmpty(partyName)) {
+			return;
+		}
+		queryWrapper.and(wrapper -> wrapper.like(ContractManage::getPartyA, partyName)
+			.or().like(ContractManage::getPartyB, partyName)
+			.or().like(ContractManage::getPartyC, partyName));
+	}
+
 	private void applyEffectiveType(LambdaQueryWrapper<ContractManage> queryWrapper, String effectiveType) {
 		if (Func.isEmpty(effectiveType)) {
 			return;
@@ -686,7 +771,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 					.lt(ContractManage::getTemporaryEndDate, today)
 					.or(wrapper2 -> wrapper2.ne(ContractManage::getContractStage, STAGE_TEMPORARY)
 						.lt(ContractManage::getEndDate, today)));
-			default -> throw new ServiceException("无效的生效类型筛选条件");
+			default -> throw new ServiceException("无效的合同状态筛选条件");
 		}
 	}
 
@@ -723,6 +808,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 				contractManage.setOrganizationId(oldRecord.getOrganizationId());
 				contractManage.setOrganizationName(oldRecord.getOrganizationName());
 			}
+			if (Func.isEmpty(contractManage.getPlatformCompanyId())) {
+				contractManage.setPlatformCompanyId(oldRecord.getPlatformCompanyId());
+				contractManage.setPlatformCompanyName(oldRecord.getPlatformCompanyName());
+			}
 			contractManage.setHandlerUserId(oldRecord.getHandlerUserId());
 			contractManage.setHandlerUserName(oldRecord.getHandlerUserName());
 			// 归档状态仅由审核通过逻辑自动维护，保存时保留库中已有值。
@@ -747,7 +836,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 			if (!generateWhenEmpty) {
 				throw new ServiceException("请输入合同编号");
 			}
-			normalizedContractNo = nextContractNo(contractManage.getOrganizationId());
+			normalizedContractNo = nextContractNo(contractManage.getOrganizationId(), contractManage.getPlatformCompanyId());
 		}
 		TransportBusinessSupport.validateLength(normalizedContractNo, 100, "合同编号不能超过100字");
 		String currentContractNo = TransportBusinessSupport.trimToNull(contractManage.getContractNo());
@@ -806,30 +895,39 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 	}
 
 	@Override
-	public synchronized String nextContractNo(Long organizationId) {
+	public synchronized String nextContractNo(Long organizationId, Long platformCompanyId) {
 		if (Func.isEmpty(organizationId)) {
 			throw new ServiceException("请选择合同负责部门");
 		}
+		if (Func.isEmpty(platformCompanyId)) {
+			throw new ServiceException("请选择平台公司");
+		}
 		Dept dept = SysCache.getDept(organizationId);
 		if (dept == null) {
 			throw new ServiceException("合同负责部门不存在");
 		}
-		String prefix = TransportBusinessSupport.trimToNull(dept.getContractCodePrefix());
+		Dept platformCompany = SysCache.getDept(platformCompanyId);
+		if (platformCompany == null) {
+			throw new ServiceException("平台公司不存在");
+		}
+		BusinessDeptConfig config = SysCache.getBusinessDeptConfig(platformCompanyId, organizationId);
+		String prefix = config == null ? null : TransportBusinessSupport.trimToNull(config.getContractCodePrefix());
 		if (Func.isEmpty(prefix)) {
-			throw new ServiceException("请先在组织机构中配置该部门的合同编码前缀");
+			throw new ServiceException("部门合同前缀未配置，无法自动生成，请手动输入合同编号");
 		}
 		int year = LocalDate.now().getYear();
 		String head = prefix + "（" + year + "）";
+		// 按前缀+年份扫描已占用流水号；系统已有相同流水号则跳过
 		List<ContractManage> latestList = list(Wrappers.<ContractManage>lambdaQuery()
 			.select(ContractManage::getContractNo)
 			.eq(ContractManage::getIsDeleted, 0)
-			.eq(ContractManage::getOrganizationId, organizationId)
 			.likeRight(ContractManage::getContractNo, head)
 			.orderByDesc(ContractManage::getContractNo)
-			.last("LIMIT 50"));
+			.last("LIMIT 200"));
 		Pattern pattern = Pattern.compile("^" + Pattern.quote(prefix) + "（" + year + "）(\\d{3})号$");
-		// 当年尚无匹配编号时，从组织配置的初始流水号起编；否则在已有最大流水号上加1
+		int initialSerial = resolveContractInitialSerial(config);
-		int next = resolveContractInitialSerial(dept);
+		int maxUsed = 0;
+		boolean hasMatched = false;
 		for (ContractManage item : latestList) {
 			String contractNo = TransportBusinessSupport.trimToNull(item.getContractNo());
 			if (Func.isEmpty(contractNo)) {
@@ -839,22 +937,24 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 			if (!matcher.matches()) {
 				continue;
 			}
-			next = Integer.parseInt(matcher.group(1)) + 1;
+			hasMatched = true;
-			break;
+			maxUsed = Math.max(maxUsed, Integer.parseInt(matcher.group(1)));
 		}
+		// 从初始流水号起编；若系统已有相同或更大流水号则跳到 maxUsed+1
+		int next = hasMatched ? Math.max(initialSerial, maxUsed + 1) : initialSerial;
 		if (next > 999) {
 			throw new ServiceException("当前部门本年合同流水号已达上限999");
 		}
 		return head + String.format("%03d", next) + "号";
 	}
 
-	private int resolveContractInitialSerial(Dept dept) {
+	private int resolveContractInitialSerial(BusinessDeptConfig config) {
-		Integer serial = dept.getContractInitialSerial();
+		Integer serial = config == null ? null : config.getInitialSerial();
 		if (serial == null || serial < 1) {
 			return 1;
 		}
 		if (serial > 999) {
-			throw new ServiceException("组织机构中配置的合同初始流水号不能超过999");
+			throw new ServiceException("业务部门配置的合同初始流水号不能超过999");
 		}
 		return serial;
 	}
@@ -877,6 +977,29 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		});
 	}
 
+	/**
+	 * 提取本次新增的双章归档文件 JSON（按附件键排除原有行），供合规归档推送挂载其他附件面板；无新增返回 null
+	 */
+	private String extractNewSealFilesJson(String originalJson, String requestJson) {
+		Set<String> originalKeys = new HashSet<>();
+		for (Object item : parseJsonArray(originalJson)) {
+			originalKeys.add(attachmentKey(item));
+		}
+		List<Object> newSealFiles = new ArrayList<>();
+		for (Object item : parseJsonArray(requestJson)) {
+			if (originalKeys.contains(attachmentKey(item))) {
+				continue;
+			}
+			if (item instanceof Map<?, ?> map) {
+				Object fileType = map.get("fileType");
+				if (fileType != null && FILE_TYPE_SEAL_ARCHIVE.equals(String.valueOf(fileType).trim())) {
+					newSealFiles.add(item);
+				}
+			}
+		}
+		return newSealFiles.isEmpty() ? null : JsonUtil.toJson(newSealFiles);
+	}
+
 	@SuppressWarnings("unchecked")
 	private String markContractFilesApproved(String contractFileJson) {
 		List<Object> files = parseJsonArray(contractFileJson);
@@ -948,8 +1071,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		contractManage.setOrganizationName(TransportBusinessSupport.trimToNull(contractManage.getOrganizationName()));
 		contractManage.setContractCategory(TransportBusinessSupport.trimToNull(contractManage.getContractCategory()));
 		contractManage.setSignType(TransportBusinessSupport.trimToNull(contractManage.getSignType()));
-		contractManage.setPartyA(TransportBusinessSupport.trimToNull(contractManage.getPartyA()));
+		contractManage.setPartyAJson(TransportBusinessSupport.trimToNull(contractManage.getPartyAJson()));
-		contractManage.setPartyB(TransportBusinessSupport.trimToNull(contractManage.getPartyB()));
+		contractManage.setPartyBJson(TransportBusinessSupport.trimToNull(contractManage.getPartyBJson()));
+		contractManage.setPartyCJson(TransportBusinessSupport.trimToNull(contractManage.getPartyCJson()));
+		ContractPartySupport.normalizeAndFillSummary(contractManage);
 		contractManage.setSettlementMode(TransportBusinessSupport.trimToNull(contractManage.getSettlementMode()));
 		contractManage.setContractFormat(TransportBusinessSupport.trimToNull(contractManage.getContractFormat()));
 		contractManage.setRemark(TransportBusinessSupport.trimToNull(contractManage.getRemark()));
@@ -1006,6 +1131,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		// 合同名称允许重复，唯一性由合同编号保证。
 		TransportBusinessSupport.validateLength(contractManage.getMainContent(), 1000, "合同主要内容不能超过1000字");
 		TransportBusinessSupport.validateLength(contractManage.getRemark(), 2000, "其他事项说明不能超过2000字");
+		// 草稿不强制甲/乙客商与计费绑定，提交临时/正式时再完整校验
 	}
 
 	private void validateBillingPlans(String billingPlanJson) {
@@ -1017,18 +1143,11 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 			if (!(parsed instanceof List<?> plans)) {
 				throw new ServiceException("计费方案设置格式不正确");
 			}
-			Map<String, Integer> defaultPlanCount = new HashMap<>();
 			for (Object value : plans) {
 				if (!(value instanceof Map<?, ?> plan)) {
 					throw new ServiceException("计费方案设置格式不正确");
 				}
-				String transportMode = trimValue(plan.get("transportMode"));
+				// 一个客商对应一个方案，不再校验「默认方案」
-				if (isDefaultBillingPlan(plan)) {
-					int count = defaultPlanCount.merge(transportMode, 1, Integer::sum);
-					if (count > 1) {
-						throw new ServiceException("同一运输方式仅支持配置一个默认计费方案");
-					}
-				}
 				validateBillingMatchConditions(plan);
 				validateBillingRuleTaxRates(plan);
 			}
@@ -1090,15 +1209,6 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		return value != null && !String.valueOf(value).trim().isEmpty();
 	}
 
-	private boolean isDefaultBillingPlan(Map<?, ?> plan) {
-		Object value = plan.get("defaultPlan");
-		return Boolean.TRUE.equals(value) || "true".equalsIgnoreCase(String.valueOf(value)) || "1".equals(String.valueOf(value));
-	}
-
-	private String trimValue(Object value) {
-		return value == null ? null : TransportBusinessSupport.trimToNull(String.valueOf(value));
-	}
-
 	private void validatePaymentRatios(String paymentRatioJson) {
 		if (Func.isEmpty(paymentRatioJson)) return;
 		try {
@@ -1147,8 +1257,9 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		TransportBusinessSupport.validateRequired(contractManage.getContractCategory(), "请选择合同类型");
 		TransportBusinessSupport.validateRequired(contractManage.getProjectName(), "请选择所属项目");
 		TransportBusinessSupport.validateRequired(contractManage.getOrganizationName(), "请选择合同负责部门");
-		TransportBusinessSupport.validateRequired(contractManage.getPartyA(), "请选择甲方");
+		TransportBusinessSupport.validateRequired(contractManage.getPlatformCompanyName(), "请选择平台公司");
-		TransportBusinessSupport.validateRequired(contractManage.getPartyB(), "请选择乙方");
+		ContractPartySupport.validateRequiredParties(contractManage, true);
+		ContractPartySupport.validateBillingPlanBindings(contractManage);
 		validateContractAmountRequired(contractManage);
 	}
 
@@ -1181,6 +1292,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		TransportBusinessSupport.validateRequired(contractManage.getContractCategory(), "请选择合同类型");
 		TransportBusinessSupport.validateRequired(contractManage.getProjectName(), "请选择所属项目");
 		TransportBusinessSupport.validateRequired(contractManage.getOrganizationName(), "请选择合同负责部门");
+		TransportBusinessSupport.validateRequired(contractManage.getPlatformCompanyName(), "请选择平台公司");
 		TransportBusinessSupport.validateRequired(contractManage.getSettlementCurrency(), "请选择结算币种");
 		TransportBusinessSupport.validateRequired(contractManage.getPartyA(), "请输入甲方");
 		TransportBusinessSupport.validateRequired(contractManage.getPartyB(), "请输入乙方");
@@ -1283,11 +1395,12 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		record.put("handlerUserId", AuthUtil.getUserId());
 		record.put("handlerUserName", AuthUtil.getUserName());
 		record.put("changeType", changeType);
-		record.put("changeContent", TransportBusinessSupport.trimToNull(contractManage.getChangeContent()));
+		record.put("changeContent", resolveChangeRecordContent(contractManage, beforeData, afterData));
 		record.put("changeReason", TransportBusinessSupport.trimToNull(changeReason));
 		record.put("status", status);
 		record.put("statusName", statusName);
 		if (beforeData != null && afterData != null) {
+			record.put("changedFields", new ArrayList<>(beforeData.keySet()));
 			record.put("beforeData", beforeData);
 			record.put("afterData", afterData);
 		}
@@ -1295,11 +1408,64 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		contractManage.setChangeRecordJson(JsonUtil.toJson(records));
 	}
 
+	/**
+	 * 变更记录内容：有前后快照时生成「将【字段】由【旧值】变更为【新值】」对比文本（与项目变更记录一致），
+	 * 无快照（创建/回调等）时沿用填写的变更内容
+	 */
+	private String resolveChangeRecordContent(ContractManage contractManage, Map<String, Object> beforeData,
+											  Map<String, Object> afterData) {
+		if (beforeData == null || afterData == null || beforeData.isEmpty()) {
+			return TransportBusinessSupport.trimToNull(contractManage.getChangeContent());
+		}
+		return beforeData.entrySet().stream()
+			.map(entry -> "将【" + contractChangeFieldLabel(entry.getKey()) + "】由【" + formatChangeRecordValue(entry.getValue())
+				+ "】变更为【" + formatChangeRecordValue(afterData.get(entry.getKey())) + "】")
+			.collect(Collectors.joining("、"));
+	}
+
+	/**
+	 * 合同变更快照字段中文名（change_record_json 展示用，与前端变更字段标签一致）
+	 */
+	private static final Map<String, String> CONTRACT_CHANGE_FIELD_LABELS = Map.ofEntries(
+		Map.entry("contractNo", "合同编号"), Map.entry("contractName", "合同名称"),
+		Map.entry("partyB", "乙方"), Map.entry("startDate", "开始日期"),
+		Map.entry("endDate", "结束日期"), Map.entry("contractFormat", "合同格式"),
+		Map.entry("settlementMode", "结算方式"), Map.entry("legalSealFlag", "是否需要加盖法人章"),
+		Map.entry("copyCount", "一式份数"), Map.entry("settlementCurrency", "结算币种"),
+		Map.entry("invoiceCycle", "开票周期(天)"), Map.entry("paymentDays", "回款账期(天)"),
+		Map.entry("contractAmount", "合同金额"), Map.entry("templateFlag", "是否范本"),
+		Map.entry("originalContractNo", "原件合同编号"), Map.entry("electronicSealFlag", "是否电子章"),
+		Map.entry("mainContent", "合同主要内容"), Map.entry("remark", "其他事项说明"),
+		Map.entry("feeGenerationMode", "费用生成模式"), Map.entry("billingPlanJson", "计费方案"),
+		Map.entry("settlementRuleJson", "结算生成规则"), Map.entry("preSettlementConfigJson", "预结算配置"),
+		Map.entry("formalSettlementConfigJson", "正式结算配置"), Map.entry("paymentRatioJson", "付款比例设置"),
+		Map.entry("contractFileJson", "合同主文件"), Map.entry("attachmentsJson", "其它附件"),
+		Map.entry("changeAttachmentsJson", "变更附件")
+	);
+
+	private String contractChangeFieldLabel(String field) {
+		return CONTRACT_CHANGE_FIELD_LABELS.getOrDefault(field, field);
+	}
+
+	private String formatChangeRecordValue(Object value) {
+		if (value == null || (value instanceof String text && text.isBlank())) {
+			return "空";
+		}
+		String text = String.valueOf(value);
+		// 计费方案/附件等长 JSON 文本截断，保证变更内容可读
+		return text.length() > 100 ? text.substring(0, 100) + "…" : text;
+	}
+
 	private Map<String, Object> buildContractChangeSnapshot(ContractManage contractManage) {
 		Map<String, Object> data = new LinkedHashMap<>();
 		data.put("contractNo", contractManage.getContractNo());
 		data.put("contractName", contractManage.getContractName());
+		data.put("partyA", contractManage.getPartyA());
 		data.put("partyB", contractManage.getPartyB());
+		data.put("partyC", contractManage.getPartyC());
+		data.put("partyAJson", contractManage.getPartyAJson());
+		data.put("partyBJson", contractManage.getPartyBJson());
+		data.put("partyCJson", contractManage.getPartyCJson());
 		data.put("startDate", contractManage.getStartDate());
 		data.put("endDate", contractManage.getEndDate());
 		data.put("contractFormat", contractManage.getContractFormat());
@@ -1321,9 +1487,10 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		data.put("preSettlementConfigJson", contractManage.getPreSettlementConfigJson());
 		data.put("formalSettlementConfigJson", contractManage.getFormalSettlementConfigJson());
 		data.put("paymentRatioJson", contractManage.getPaymentRatioJson());
-		data.put("contractFileJson", contractManage.getContractFileJson());
+		// 附件（合同主文件/其它附件/变更附件）先不记录到变更记录，仅保留业务字段对比，需要时放开以下注释
-		data.put("attachmentsJson", contractManage.getAttachmentsJson());
+//		data.put("contractFileJson", contractManage.getContractFileJson());
-		data.put("changeAttachmentsJson", contractManage.getChangeAttachmentsJson());
+//		data.put("attachmentsJson", contractManage.getAttachmentsJson());
+//		data.put("changeAttachmentsJson", contractManage.getChangeAttachmentsJson());
 		return data;
 	}
 
@@ -1477,7 +1644,8 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		Long currentUserId = AuthUtil.getUserId();
 		return Objects.equals(contractManage.getOrganizationId(), currentDeptId)
 			|| Objects.equals(contractManage.getCreateUser(), currentUserId)
-			|| Objects.equals(contractManage.getHandlerUserId(), currentUserId);
+			|| Objects.equals(contractManage.getHandlerUserId(), currentUserId)
+			|| TransportBusinessSupport.isProjectOwnedByBusinessDept(contractManage.getProjectId(), currentDeptId);
 	}
 
 }

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java

@@ -41,14 +41,22 @@ import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.cache.SysCache;
+import org.springblade.system.cache.UserCache;
+import org.springblade.transport.constant.HcsSyncConstant;
+import org.springblade.transport.excel.CustomerArchiveExcel;
 import org.springblade.thirdparty.bfi.constant.BfiConstant;
+import org.springblade.thirdparty.bfi.pojo.dto.BfiBankQueryDTO;
 import org.springblade.thirdparty.bfi.pojo.dto.BfiCustomerQueryDTO;
+import org.springblade.thirdparty.bfi.pojo.dto.BfiSupplierQueryDTO;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiBankVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultErrorVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultItemVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiBlacklistVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiCustomerVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiPageVO;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiSupplierVO;
 import org.springblade.thirdparty.bfi.service.IBfiService;
 import org.springblade.thirdparty.bfi.util.BfiUtil;
 import org.springblade.system.cache.SysCache;
@@ -92,6 +100,7 @@ import org.springblade.transport.pojo.vo.CustomerCreditScoreVO;
 import org.springblade.transport.pojo.vo.CustomerInvoiceContactVO;
 import org.springblade.transport.pojo.vo.CustomerInvoiceInfoVO;
 import org.springblade.transport.pojo.vo.CustomerReceiptAccountVO;
+import org.springblade.transport.support.hcs.HcsCreditCheckSupport;
 import org.springblade.transport.service.ICustomerArchiveService;
 import org.springblade.transport.support.KingdeeSyncLockSupport;
 import org.springframework.stereotype.Service;
@@ -232,6 +241,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		List<CustomerArchiveVO> records = baseMapper.selectCustomerArchivePage(page, customer, currentScopeUserId());
 		records.forEach(record -> record.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())));
 		fillFundUseRisk(records);
+		this.fillRiskDetail(records);
 		return page.setRecords(records);
 	}
 
@@ -276,6 +286,12 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		if (created) {
 			// 新增时金蝶已有客商，前端回填金蝶客商编码，建档直接沿用；未回填则自动生成
 			customer.setCustomerCode(Func.isEmpty(customer.getCustomerCode()) ? this.nextCustomerCode() : customer.getCustomerCode());
+			// 供应商编码：A901-1 按统一社会信用代码查金蝶供应商档案落库（金蝶单据推送直接复用，不再实时查接口），查不到留空待同步补
+			String supplierCode = this.queryKingdeeSupplierNumber(customer.getUnifiedCreditCode());
+			if (Func.isNotEmpty(supplierCode)) {
+				customer.setSupplierCode(supplierCode);
+			}
+			log.info("新增客商A901-1供应商查询取供应商编码，unifiedCreditCode={}，supplierCode={}", customer.getUnifiedCreditCode(), supplierCode);
 		}
 		CustomerArchive entity = Objects.requireNonNull(BeanUtil.copyProperties(customer, CustomerArchive.class));
 		// 曾审核通过后的评分替换：保存/再提交时仍沿用原生效等级与额度，待再次审核通过后再切换
@@ -517,9 +533,10 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		after.setKingdeeSyncTime(LocalDateTime.now());
 		BfiCustomerVO kingdeeCustomer = queryKingdeeCustomer(customer.getUnifiedCreditCode());
 		if (kingdeeCustomer != null && BfiConstant.BILL_STATUS_AUDITED.equals(kingdeeCustomer.getStatus())) {
-			// 金蝶已有已审核档案：跳过推送，客商编号采纳金蝶客商编码
+			// 金蝶已有已审核档案：跳过推送，客商编号采纳金蝶客商编码；供应商编码按 A901-1 供应商查询落库
 			after.setKingdeeStatus(KINGDEE_STATUS_EXIST);
 			after.setKingdeeFailReason(null);
+			this.fillSupplierCode(customer, after);
 			addChangeRecord(id, "金蝶已存在该客商档案，跳过推送" + this.adoptKingdeeCode(customer, after, kingdeeCustomer.getNumber()), customer, after);
 			updateById(after);
 			return after;
@@ -619,6 +636,105 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		return rows == null || rows.isEmpty() ? null : rows.get(0);
 	}
 
+	/**
+	 * A901-1 按统一社会信用代码查询金蝶供应商档案取金蝶客商编码（返回值 number），新增/同步建档时落库客商表，
+	 * 后续金蝶推送直接复用客商表编号不再实时查接口；接口异常返回 null 不阻断建档，金蝶无档案同样返回 null 由调用方兜底
+	 */
+	private String queryKingdeeSupplierNumber(String unifiedCreditCode) {
+		if (Func.isEmpty(unifiedCreditCode)) {
+			return null;
+		}
+		try {
+			BfiSupplierQueryDTO param = new BfiSupplierQueryDTO();
+			param.setPageNo(1);
+			param.setPageSize(1);
+			param.setEnable(BfiConstant.ENABLE_ENABLED);
+			param.setSocietycreditcode(List.of(unifiedCreditCode.trim()));
+			BfiPageVO<BfiSupplierVO> page = bfiService.querySupplier(param);
+			List<BfiSupplierVO> rows = page == null ? null : page.getRows();
+			return rows == null || rows.isEmpty() ? null : rows.get(0).getNumber();
+		} catch (Exception exception) {
+			log.warn("A901-1供应商查询金蝶客商编码失败，unifiedCreditCode={}", unifiedCreditCode, exception);
+			return null;
+		}
+	}
+
+	/**
+	 * 供应商编码落库：A901-1 按统一社会信用代码查金蝶供应商档案取 number，查到才覆盖（查不到/接口异常保留原值，不影响同步主流程）
+	 */
+	private void fillSupplierCode(CustomerArchive customer, CustomerArchive after) {
+		String supplierCode = this.queryKingdeeSupplierNumber(customer.getUnifiedCreditCode());
+		if (Func.isNotEmpty(supplierCode)) {
+			after.setSupplierCode(supplierCode);
+		}
+	}
+
+	@Override
+	public String querySupplierCode(String unifiedCreditCode) {
+		return this.queryKingdeeSupplierNumber(unifiedCreditCode);
+	}
+
+	/**
+	 * A905-3 按行名查询金蝶行名行号档案：收款信息填写开户行失焦时实时精确匹配取联行号，
+	 * 接口异常返回 null 不阻断录入，由前端提示未查询到
+	 */
+	@Override
+	public BfiBankVO queryKingdeeBank(String bankName) {
+		if (Func.isEmpty(bankName)) {
+			return null;
+		}
+		try {
+			BfiBankQueryDTO param = new BfiBankQueryDTO();
+			param.setPageNo(1);
+			param.setPageSize(10);
+			param.setStatus(BfiConstant.BILL_STATUS_AUDITED);
+			param.setEnable(BfiConstant.ENABLE_ENABLED);
+			param.setName(List.of(bankName.trim()));
+			BfiPageVO<BfiBankVO> page = bfiService.queryBank(param);
+			List<BfiBankVO> rows = page == null ? null : page.getRows();
+			if (rows == null || rows.isEmpty()) {
+				return null;
+			}
+			// 金蝶侧按行名过滤若为模糊匹配，本地再按全称精确比对取第一条
+			String trimmedName = bankName.trim();
+			return rows.stream()
+				.filter(bank -> trimmedName.equals(bank.getName()))
+				.findFirst()
+				.orElse(null);
+		} catch (Exception exception) {
+			log.warn("A905-3行名行号查询失败，bankName={}", bankName, exception);
+			return null;
+		}
+	}
+
+	/**
+	 * A905-3 按行号查询金蝶行名行号档案：收款信息保存前校验联行号真实存在，查不到返回 null 由前端拦截保存；
+	 * 与 {@link #queryKingdeeBank(String)} 不同，接口异常不上抛吞掉而是直接抛出，便于前端区分「查不到」与「校验失败」
+	 */
+	@Override
+	public BfiBankVO queryKingdeeBankByNumber(String cnapsCode) {
+		if (Func.isEmpty(cnapsCode)) {
+			return null;
+		}
+		BfiBankQueryDTO param = new BfiBankQueryDTO();
+		param.setPageNo(1);
+		param.setPageSize(10);
+		param.setStatus(BfiConstant.BILL_STATUS_AUDITED);
+		param.setEnable(BfiConstant.ENABLE_ENABLED);
+		param.setNumber(List.of(cnapsCode.trim()));
+		BfiPageVO<BfiBankVO> page = bfiService.queryBank(param);
+		List<BfiBankVO> rows = page == null ? null : page.getRows();
+		if (rows == null || rows.isEmpty()) {
+			return null;
+		}
+		// 金蝶侧按行号过滤若为模糊匹配，本地再按编码精确比对取第一条
+		String trimmedCode = cnapsCode.trim();
+		return rows.stream()
+			.filter(bank -> trimmedCode.equals(bank.getNumber()))
+			.findFirst()
+			.orElse(null);
+	}
+
 	/**
 	 * 金蝶已存在档案时，客商编号（customer_code）采纳金蝶客商编码，后续业务接口沿用客商编号即拿到金蝶编码；
 	 * 金蝶编码为空或与当前编号一致时无需处理；同租户下已被其他客商占用时跳过回填，避免违反 uk_customer_archive_code 唯一约束
@@ -766,10 +882,11 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 			CustomerArchive after = copyCustomer(customer);
 			after.setKingdeeSyncTime(LocalDateTime.now());
 			if (BfiConstant.BILL_STATUS_AUDITED.equals(kingdeeCustomer.getStatus())) {
-				// 金蝶已存在已审核档案：跳过推送直接建档，客商编号采纳金蝶客商编码
+				// 金蝶已存在已审核档案：跳过推送直接建档，客商编号采纳金蝶客商编码；供应商编码按 A901-1 供应商查询落库
 				after.setKingdeeStatus(KINGDEE_STATUS_EXIST);
 				after.setKingdeeFailReason(null);
 				existed++;
+				this.fillSupplierCode(customer, after);
 				collectChangeRecord(changeRecords, customer.getId(), "金蝶已存在该客商档案，跳过推送" + this.adoptKingdeeCode(customer, after, kingdeeCustomer.getNumber()), customer, after);
 			} else {
 				// 金蝶侧暂存/已提交：审核中，置失败待重推
@@ -2144,6 +2261,19 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		return snapshot;
 	}
 
+	/**
+	 * 组装客商风险明细（列表悬浮展示用）：等级名称（黑名单优先 + risk_level 字典翻译）与金蝶黑名单原始字段
+	 * 交由 {@link HcsCreditCheckSupport#buildRiskDetail} 统一组装，与表单实时提示（riskTip）同口径
+	 */
+	private void fillRiskDetail(List<CustomerArchiveVO> records) {
+		for (CustomerArchiveVO record : records) {
+			String customerName = Func.isEmpty(record.getFullName()) ? record.getCustomerCode() : record.getFullName();
+			record.setHcsRiskDetail(HcsCreditCheckSupport.buildRiskDetail(customerName,
+				record.getHcsRiskLevel(),
+				record.getKingdeeBlackCategory(), record.getKingdeeBlackReason()));
+		}
+	}
+
 	/**
 	 * 资金使用情况 = 付款申请中「付款方=当前客商」且审核通过的已付金额合计；
 	 * 资金使用额度风险 = 合计已付金额 / 客商最大资金使用额度。
@@ -2152,6 +2282,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 		if (records == null || records.isEmpty()) {
 			return;
 		}
+
 		Set<String> payerNames = new HashSet<>();
 		records.forEach(customer -> {
 			if (Func.isNotEmpty(customer.getFullName())) {
@@ -2206,6 +2337,7 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl<CustomerArchiveM
 	private CustomerArchiveExcel buildExcel(CustomerArchive customer) {
 		CustomerArchiveExcel excel = new CustomerArchiveExcel();
 		excel.setCustomerCode(customer.getCustomerCode());
+		excel.setSupplierCode(customer.getSupplierCode());
 		excel.setShortName(customer.getShortName());
 		excel.setFullName(customer.getFullName());
 		excel.setCustomerKind(customerKindName(customer.getCustomerKind()));

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverServiceImpl.java

@@ -418,6 +418,9 @@ public class DriverServiceImpl extends BaseServiceImpl<DriverMapper, Driver> imp
 		driver.setDrivingLicenseBack(trimToNull(driver.getDrivingLicenseBack()));
 		driver.setQualificationFront(trimToNull(driver.getQualificationFront()));
 		driver.setQualificationBack(trimToNull(driver.getQualificationBack()));
+		if (driver.getIdCardLongTerm() == null) {
+			driver.setIdCardLongTerm(DEFAULT_FALSE);
+		}
 		if (driver.getDrivingLicenseLongTerm() == null) {
 			driver.setDrivingLicenseLongTerm(DEFAULT_FALSE);
 		}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java

@@ -155,6 +155,9 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 	/** 金蝶应收单勾稽结算明细分批查询单次条数上限（in 条件分批，避免单次过滤条件过长） */
 	private static final int AR_RESULT_DETAIL_QUERY_BATCH = 500;
 
+	/** 金蝶冲销状态回写 single-flight 锁键前缀（多副本定时任务与手动触发共用） */
+	private static final String WRITEOFF_SYNC_LOCK_PREFIX = "transport:formal-settlement:kingdee-writeoff-sync:";
+
 	private final FormalSettlementSourceMapper sourceMapper;
 	private final FormalSettlementSummaryFeeMapper summaryFeeMapper;
 	private final FormalSettlementPaymentMapper paymentMapper;
@@ -791,7 +794,7 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 		// 原单只加标记，业务字段不动
 		update(Wrappers.<FormalSettlement>lambdaUpdate()
 			.eq(FormalSettlement::getId, settlementId)
-			.set(FormalSettlement::getAdjustStatus, "adjusted"));
+			.set(FormalSettlement::getAdjustStatus, TransportBusiConstant.SETTLEMENT_ADJUST_STATUS_ADJUSTED));
 		kingdeeBillLockService.unlockByAdjustRepush(KingdeeLockConstant.SOURCE_SETTLEMENT, settlementId, AuthUtil.getUserName());
 		saveChange(settlementId, "结算单基本信息", null, "调整",
 			"结算调整单" + Func.toStr(adjustmentNo) + "重推生成新单" + Func.toStr(newSettlementNo) + "，原单标记已调整", null);
@@ -866,20 +869,24 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 	@Transactional(rollbackFor = Exception.class)
 	public void markKingdeeSyncFailed(Long id, String reason) {
 		if (id == null) return;
-		// 条件更新：仅审批通过且未同步的单据落"生成失败"状态，未审批/已同步/已删除单据自动跳过保持原状态
+		// 失败原因截断留档，与列长 varchar(500) 对齐
+		String failReason = Func.toStrWithEmpty(reason, "未知异常");
+		String columnReason = failReason.length() > 500 ? failReason.substring(0, 500) : failReason;
+		// 条件更新：仅审批通过且未同步的单据落"生成失败"状态与失败原因，未审批/已同步/已删除单据自动跳过保持原状态
 		int updated = baseMapper.update(null, Wrappers.<FormalSettlement>lambdaUpdate()
 			.eq(FormalSettlement::getId, id)
 			.eq(FormalSettlement::getApprovalStatus, TransportBusiConstant.APPROVED)
 			.ne(FormalSettlement::getKingdeeSyncStatus, KingdeeBfiConstant.KINGDEE_STATUS_SYNCED)
-			.set(FormalSettlement::getKingdeeSyncStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED));
+			.set(FormalSettlement::getKingdeeSyncStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED)
+			.set(FormalSettlement::getKingdeeFailReason, columnReason));
 		if (updated > 0) {
-			// 结算调整单回填：未推送场景审批通过后自动推送失败，调整单置 failed 供「推送金蝶」重试
+			// 结算调整单回填：未推送场景审批通过后自动推送失败，调整单置 failed + 失败原因供「推送金蝶」重试
 			settlementAdjustmentMapper.update(null, Wrappers.<SettlementAdjustment>lambdaUpdate()
 				.eq(SettlementAdjustment::getFormalSettlementId, id)
 				.eq(SettlementAdjustment::getApprovalStatus, TransportBusiConstant.APPROVED)
-				.set(SettlementAdjustment::getKingdeeSyncStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED));
+				.set(SettlementAdjustment::getKingdeeSyncStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED)
+				.set(SettlementAdjustment::getKingdeeFailReason, columnReason));
 			// 失败原因写变更记录留档（推送事务已回滚，此处独立事务）；原因过长截断留档，不抛错
-			String failReason = Func.toStrWithEmpty(reason, "未知异常");
 			saveChange(id, "结算单基本信息", null, "调整",
 				"同步金蝶失败：" + (failReason.length() > 200 ? failReason.substring(0, 200) : failReason), null);
 		}
@@ -1134,6 +1141,113 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 		return summary;
 	}
 
+	@Override
+	public String syncKingdeeWriteOffResult() {
+		return kingdeeSyncLockSupport.runSingleFlight(WRITEOFF_SYNC_LOCK_PREFIX, bfiProperties.getArResult().getLockLeaseSeconds(),
+			"金蝶冲销状态回写", this::executeWriteOffSync);
+	}
+
+	@Override
+	public void refreshKingdeeWriteOff(Long settlementId, boolean writtenOff) {
+		String status = writtenOff ? KingdeeBfiConstant.KINGDEE_WRITEOFF_WRITTEN : KingdeeBfiConstant.KINGDEE_WRITEOFF_UNWRITTEN;
+		FormalSettlement settlement = getById(settlementId);
+		// 状态未变化不落库，避免预检反复点击重复更新
+		if (settlement == null || status.equals(settlement.getKingdeeWriteOffStatus())) {
+			return;
+		}
+		FormalSettlement patch = new FormalSettlement();
+		patch.setId(settlementId);
+		patch.setKingdeeWriteOffStatus(status);
+		patch.setKingdeeWriteOffTime(LocalDateTime.now());
+		updateById(patch);
+		log.info("正式结算单[{}]金蝶冲销状态回写：{}", settlement.getFormalSettlementNo(), status);
+	}
+
+	/**
+	 * 金蝶冲销状态回写主体：A102-4/A302-4 批量查询已同步结算单的 hadwrittenoff（部分冲销视同已冲销）
+	 * 并回写冲销状态，由 {@link #syncKingdeeWriteOffResult()} 在分布式锁保护下调用。
+	 * <p>分批与事务口径同 {@link #executeArResultSync()}：结算明细分批 in 查询、远程整批查询消除逐单 N+1，
+	 * 仅回写状态有变化的结算单并 updateBatchById 批量落库；整轮任务不包外层事务，按防重键幂等可重跑。
+	 *
+	 * @return 执行摘要
+	 */
+	private String executeWriteOffSync() {
+		long startMillis = System.currentTimeMillis();
+		// 已同步金蝶的结算单才在金蝶存在旧应付/应收单，未同步/生成失败不查询（前端展示 '-'）；
+		// 已冲销为终态不再复查，仅扫未冲销单据（存量 NULL 由 06 脚本回填默认未冲销）
+		List<FormalSettlement> settlements = list(Wrappers.<FormalSettlement>lambdaQuery()
+			.eq(FormalSettlement::getKingdeeSyncStatus, KingdeeBfiConstant.KINGDEE_STATUS_SYNCED)
+			.eq(FormalSettlement::getKingdeeWriteOffStatus, KingdeeBfiConstant.KINGDEE_WRITEOFF_UNWRITTEN)
+			.orderByAsc(FormalSettlement::getId));
+		if (Func.isEmpty(settlements)) {
+			log.info("金蝶冲销状态回写：无待查未冲销结算单");
+			return "金蝶冲销状态回写：无待查未冲销结算单";
+		}
+		log.info("金蝶冲销状态回写：本轮扫描待查未冲销结算单{}笔", settlements.size());
+		// 结算明细分批一次查全（消除逐单查询 N+1），按结算单 id 分组后按结算类型组装防重键
+		List<Long> settlementIds = settlements.stream().map(FormalSettlement::getId).toList();
+		Map<Long, List<FormalSettlementDetail>> detailsBySettlement = new HashMap<>();
+		kingdeeApBillSyncSupport.batchForeach(settlementIds, AR_RESULT_DETAIL_QUERY_BATCH, batch ->
+			detailsBySettlement.putAll(detailMapper.selectList(Wrappers.<FormalSettlementDetail>lambdaQuery()
+					.in(FormalSettlementDetail::getFormalSettlementId, batch)
+					.eq(FormalSettlementDetail::getIsDeleted, 0)
+					.orderByAsc(FormalSettlementDetail::getLineNo)).stream()
+				.collect(Collectors.groupingBy(FormalSettlementDetail::getFormalSettlementId))));
+		Map<String, FormalSettlement> apSettlementBySrcCode = new LinkedHashMap<>();
+		Map<String, FormalSettlement> arSettlementBySrcCode = new LinkedHashMap<>();
+		for (FormalSettlement settlement : settlements) {
+			List<FormalSettlementDetail> details = detailsBySettlement.getOrDefault(settlement.getId(), List.of());
+			if (Func.isEmpty(details)) {
+				continue;
+			}
+			if ("receivable".equals(settlement.getSettlementType())) {
+				String srcCode = kingdeeArBillSyncSupport.arBillSrcCode(settlement, details);
+				if (Func.isNotBlank(srcCode)) {
+					arSettlementBySrcCode.putIfAbsent(srcCode, settlement);
+				}
+			} else {
+				String srcCode = kingdeeApBillSyncSupport.apBillSrcCode(settlement, details);
+				if (Func.isNotBlank(srcCode)) {
+					apSettlementBySrcCode.putIfAbsent(srcCode, settlement);
+				}
+			}
+		}
+		// A102-4/A302-4 整批一次查询，冲销状态有变化的才落库（updateBatchById 批量更新，避免逐单 update）
+		log.info("金蝶冲销状态回写：防重键组装完成，应付{}个、应收{}个，按批次大小{}分批查询",
+			apSettlementBySrcCode.size(), arSettlementBySrcCode.size(), bfiProperties.getWriteOffResult().getQueryBatchSize());
+		Map<String, Boolean> apWriteOffFlags = kingdeeApBillSyncSupport.queryApBillWriteOffFlags(new ArrayList<>(apSettlementBySrcCode.keySet()));
+		Map<String, Boolean> arWriteOffFlags = kingdeeArBillSyncSupport.queryArBillWriteOffFlags(new ArrayList<>(arSettlementBySrcCode.keySet()));
+		// 金蝶未返回的键按未冲销处理，返回数与组装数差异即金蝶侧查不到单据的规模，留痕便于对账
+		log.info("金蝶冲销状态批量查询完成：应付键返回{}个、应收键返回{}个，未返回键按未冲销处理",
+			apWriteOffFlags.size(), arWriteOffFlags.size());
+		List<FormalSettlement> toUpdateSettlements = new ArrayList<>();
+		apSettlementBySrcCode.forEach((srcCode, settlement) ->
+			this.applyWriteOffFlag(settlement, apWriteOffFlags.get(srcCode), toUpdateSettlements));
+		arSettlementBySrcCode.forEach((srcCode, settlement) ->
+			this.applyWriteOffFlag(settlement, arWriteOffFlags.get(srcCode), toUpdateSettlements));
+		if (Func.isNotEmpty(toUpdateSettlements)) {
+			// 批量落库按同一分批大小拆分，避免单批过大
+			updateBatchById(toUpdateSettlements, bfiProperties.getWriteOffResult().getQueryBatchSize());
+			log.info("金蝶冲销状态回写：批量落库完成，本批更新{}笔", toUpdateSettlements.size());
+		}
+		String summary = "金蝶冲销状态回写完成：待查未冲销结算单" + (apSettlementBySrcCode.size() + arSettlementBySrcCode.size())
+			+ "笔，回写" + toUpdateSettlements.size() + "笔";
+		log.info("{}，耗时{}ms", summary, System.currentTimeMillis() - startMillis);
+		return summary;
+	}
+
+	/** 应用单笔冲销查询结果：与本地冲销状态不一致时标记更新（查不到金蝶单据按未冲销处理），一致跳过 */
+	private void applyWriteOffFlag(FormalSettlement settlement, Boolean writtenOff, List<FormalSettlement> toUpdateSettlements) {
+		String status = Boolean.TRUE.equals(writtenOff) ? KingdeeBfiConstant.KINGDEE_WRITEOFF_WRITTEN : KingdeeBfiConstant.KINGDEE_WRITEOFF_UNWRITTEN;
+		if (status.equals(settlement.getKingdeeWriteOffStatus())) {
+			return;
+		}
+		settlement.setKingdeeWriteOffStatus(status);
+		settlement.setKingdeeWriteOffTime(LocalDateTime.now());
+		toUpdateSettlements.add(settlement);
+		log.info("金蝶冲销状态回写：正式结算单[{}]，{}", settlement.getFormalSettlementNo(), status);
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public String applyPayment(FormalSettlementPaymentRequest request) {
@@ -1248,6 +1362,8 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 	private String createPayment(FormalSettlement settlement, BigDecimal appliedAmount, String remark) {
 		if (!TransportBusiConstant.APPROVED.equals(settlement.getApprovalStatus())) throw new ServiceException("仅审批通过的正式结算单允许发起付款申请");
 		if (!"payable".equals(settlement.getSettlementType())) throw new ServiceException("仅应付正式结算单允许发起付款申请");
+		if (TransportBusiConstant.SETTLEMENT_ADJUST_STATUS_ADJUSTED.equals(settlement.getAdjustStatus()))
+			throw new ServiceException("结算单[" + Func.toStr(settlement.getFormalSettlementNo()) + "]已因结算调整作废，不可再发起付款，请使用调整后的新单");
 		long activePaymentCount = paymentMapper.selectCount(Wrappers.<FormalSettlementPayment>lambdaQuery()
 			.eq(FormalSettlementPayment::getFormalSettlementId, settlement.getId())
 			.eq(FormalSettlementPayment::getIsDeleted, 0)

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java

@@ -138,6 +138,9 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 	implements IInvoiceApplicationService {
 	/** A303-5 开票结果批量查询单批单据编号上限（接口限制 50） */
 	private static final int INVOICE_RESULT_QUERY_BATCH = 50;
+	/** 张次开票状态展示文案（按金蝶回写的发票结果实时推导） */
+	private static final String INVOICE_STATUS_INVOICED = "已开票";
+	private static final String INVOICE_STATUS_UNINVOICED = "未开票";
 	/** 金蝶开票结果回写 single-flight 锁键前缀（多副本定时任务与手动触发共用） */
 	private static final String INVOICE_RESULT_SYNC_LOCK_PREFIX = "transport:invoice-application:kingdee-invoice-result-sync:";
 	private final InvoiceApplicationSettlementMapper settlementRelationMapper;
@@ -251,10 +254,23 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		vo.setSettlements(relations);
 		List<InvoiceApplicationSheet> sheets = sheetMapper.selectList(Wrappers.<InvoiceApplicationSheet>lambdaQuery()
 			.eq(InvoiceApplicationSheet::getInvoiceApplicationId, id).orderByAsc(InvoiceApplicationSheet::getSheetNo));
+		List<InvoiceApplicationInvoice> invoices = invoiceApplicationInvoiceMapper.selectList(
+			Wrappers.<InvoiceApplicationInvoice>lambdaQuery()
+				.eq(InvoiceApplicationInvoice::getInvoiceApplicationId, id)
+				.orderByAsc(InvoiceApplicationInvoice::getCreateTime));
+		vo.setInvoices(invoices);
+		// 每张发票的金蝶开票结果：按张次金蝶单号归集，查看页展示开票状态与结果备注
+		Map<String, List<InvoiceApplicationInvoice>> invoicesBySerialNo = invoices.stream()
+			.filter(invoice -> Func.isNotBlank(invoice.getSerialNo()))
+			.collect(Collectors.groupingBy(invoice -> Func.toStr(invoice.getSerialNo()).trim()));
 		vo.setSheets(sheets.stream().map(sheet -> {
 			InvoiceApplicationSheetVO sheetVO = Objects.requireNonNull(BeanUtil.copyProperties(sheet, InvoiceApplicationSheetVO.class));
 			sheetVO.setLines(lineMapper.selectList(Wrappers.<InvoiceApplicationLine>lambdaQuery()
 				.eq(InvoiceApplicationLine::getInvoiceSheetId, sheet.getId()).orderByAsc(InvoiceApplicationLine::getLineNo)));
+			List<InvoiceApplicationInvoice> sheetInvoices =
+				invoicesBySerialNo.get(Func.toStr(sheet.getKingdeeBillNo()).trim());
+			sheetVO.setInvoiceStatusName(Func.isEmpty(sheetInvoices) ? INVOICE_STATUS_UNINVOICED : INVOICE_STATUS_INVOICED);
+			sheetVO.setKingdeeResultRemark(Func.isEmpty(sheetInvoices) ? "" : kingdeeResultRemark(sheetInvoices));
 			return sheetVO;
 		}).toList());
 		vo.setDetails(applicationDetailMapper.selectList(Wrappers.<InvoiceApplicationDetail>lambdaQuery()
@@ -262,9 +278,6 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		vo.setRecords(recordMapper.selectList(Wrappers.<InvoiceApplicationRecord>lambdaQuery()
 			.eq(InvoiceApplicationRecord::getInvoiceApplicationId, id)
 			.orderByAsc(InvoiceApplicationRecord::getCreateTime)));
-		vo.setInvoices(invoiceApplicationInvoiceMapper.selectList(Wrappers.<InvoiceApplicationInvoice>lambdaQuery()
-			.eq(InvoiceApplicationInvoice::getInvoiceApplicationId, id)
-			.orderByAsc(InvoiceApplicationInvoice::getCreateTime)));
 		return vo;
 	}
 
@@ -639,17 +652,19 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 	@Transactional(rollbackFor = Exception.class)
 	public void markKingdeeSyncFailed(Long id, String reason) {
 		if (id == null) return;
-		// 条件更新：仅审批通过且未同步/未开票的单据落"生成失败"状态，其余自动跳过保持原状态
+		String failReason = truncateReason(reason);
+		// 条件更新：仅审批通过且未同步/未开票的单据落"生成失败"状态与失败原因，其余自动跳过保持原状态
 		int updated = baseMapper.update(null, Wrappers.<InvoiceApplication>lambdaUpdate()
 			.eq(InvoiceApplication::getId, id)
 			.eq(InvoiceApplication::getApprovalStatus, TransportBusiConstant.APPROVED)
 			.notIn(InvoiceApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_SYNCED,
 				KingdeeBfiConstant.KINGDEE_STATUS_INVOICED)
-			.set(InvoiceApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED));
+			.set(InvoiceApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED)
+			.set(InvoiceApplication::getKingdeeFailReason, failReason));
 		if (updated > 0) {
 			// 失败原因写操作流水留档（推送事务已回滚，此处独立事务）
 			record(id, "sync", "同步金蝶失败", TransportBusiConstant.APPROVED, TransportBusiConstant.APPROVED,
-				truncateReason(reason), null);
+				failReason, null);
 		}
 	}
 
@@ -818,13 +833,19 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		}
 		if (Func.isBlank(entity.getDepartmentEmails())) throw new ServiceException("推送金蝶开票申请失败：部门邮箱（发票推送邮箱）不能为空");
 		if (Func.isBlank(entity.getTaxpayerNo())) throw new ServiceException("推送金蝶开票申请失败：购方纳税人识别号不能为空");
-		// 金蝶组织编码：项目业务部门反查唯一平台公司 → 平台公司金蝶组织编码；申请部门编码：项目业务部门自身金蝶编码（与付款申请单部门.编码同源，共用上下文缓存）
+		// 金蝶组织/申请部门：按首张关联结算单合同的平台公司 + 业务部门配置取数
 		KingdeeSyncContext kingdeeContext = KingdeeSyncContext.empty();
-		String kingdeeOrgNumber = kingdeeApBillSyncSupport.kingdeeOrgNumber(entity.getProjectId(), kingdeeContext);
+		FormalSettlement firstSettlement = formalSettlementMapper.selectById(relations.get(0).getFormalSettlementId());
-		String kingdeeDeptNumber = kingdeeApBillSyncSupport.kingdeeDeptNumber(entity.getProjectId(), kingdeeContext);
+		if (firstSettlement == null || Objects.equals(firstSettlement.getIsDeleted(), 1)) {
+			throw new ServiceException("推送金蝶开票申请失败：正式结算单["
+				+ Func.toStr(relations.get(0).getFormalSettlementNo()) + "]不存在");
+		}
+		ContractManage contract = kingdeeApBillSyncSupport.requireContract(firstSettlement.getContractId(), kingdeeContext);
+		String kingdeeOrgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(contract, kingdeeContext);
+		String kingdeeDeptNumber = kingdeeApBillSyncSupport.kingdeeDeptNumber(contract, entity.getProjectId(), kingdeeContext);
 		CustomerArchive customer = entity.getReceiverCustomerId() == null ? null : customerArchiveMapper.selectById(entity.getReceiverCustomerId());
-		if (customer == null || Func.isBlank(customer.getCustomerCode())) {
+		if (customer == null || (Func.isBlank(customer.getSupplierCode()) && Func.isBlank(customer.getCustomerCode()))) {
-			throw new ServiceException("推送金蝶开票申请失败：受票方客户未在客商档案中维护客商编码，请补充后重试");
+			throw new ServiceException("推送金蝶开票申请失败：受票方客户未在客商档案中维护供应商编码或客商编码，请补充后重试");
 		}
 		// 逐张发票推送金蝶开票申请单：每张发票张次一张（价税合计=本张金额，分录=本张商品行），已存在的张次幂等跳过
 		List<String> savedBillNos = new ArrayList<>();
@@ -909,9 +930,9 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		String firstArSrcCode, BigDecimal sheetAmount, List<BfiInvoiceApplySaveEntryDTO> items) {
 		BfiInvoiceApplySaveDTO param = new BfiInvoiceApplySaveDTO();
 		// ==================== 以下为【必填】字段（BfiInvoiceApplySaveDTO 标注），非必填字段先注释保留 ====================
-		// 【必填】组织.编码：项目业务部门反查唯一平台公司 → 平台公司金蝶组织编码
+		// 【必填】组织.编码：合同平台公司金蝶组织编码
 		param.setOrgidNumber(orgNumber);
-		// 【必填】申请部门.编码：项目业务部门金蝶编码（与付款申请单 awrp_department_number 同源）
+		// 【必填】申请部门.编码：合同平台公司下业务部门配置的金蝶部门代码
 		param.setAwrpOrgfieldNumber(deptNumber);
 		// 【必填】业务单据编号（候选键）：单张发票候选 billno（多张发票时开票申请单号-张次序号）
 		param.setBillno(billNo);
@@ -965,8 +986,8 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 					entity.getApplicationNo());
 			}
 		}
-		// 【必填】客户.编码：受票方客商档案客商编码
+		// 【必填】客户.编码：受票方客商档案供应商编码（A901-1 金蝶编码），未维护时兜底客商编号
-		param.setCustomnameidNumber(customer.getCustomerCode());
+		param.setCustomnameidNumber(Func.isBlank(customer.getSupplierCode()) ? customer.getCustomerCode() : customer.getSupplierCode());
 		// 【必填】项目.项目编码（联调期临时传金蝶测试档案值 999）
 		param.setAwrpProjectNumber(KingdeeBfiConstant.BFI_PROJECT_NUMBER_NONE);
 		// ==================== 以下为非必填字段，先注释保留，联调确认后按需放开 ====================
@@ -1151,7 +1172,8 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 	}
 
 	/**
-	 * 金蝶开票结果回写主体：A303-5 分批查询开票申请发票结果落库并推进开票完成，
+	 * 金蝶开票结果回写主体：A303-5 分批查询开票申请发票结果落库，
+	 * 多张发票全部张次均有开票结果才推进开票完成（终态），部分回写保持已同步继续轮询剩余张次，
 	 * 由 {@link #syncKingdeeInvoiceResult()} 在分布式锁保护下调用
 	 *
 	 * @return 执行摘要
@@ -1170,16 +1192,20 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		log.info("金蝶开票结果回写开始：待回写开票申请{}笔", applications.size());
 		// 按 serialNo（金蝶开票申请单编号）分批（≤50/批）调 A303-5，销方税号与 A303-1 同源（开票单位→客商档案），按税号分组查询
 		Map<String, InvoiceApplication> applicationBySerialNo = new LinkedHashMap<>();
+		Map<Long, List<String>> serialNosByApplicationId = new LinkedHashMap<>();
 		applications.forEach(application -> {
 			if (Func.isNotBlank(application.getKingdeeBillNo())) {
 				// 多张发票时申请单金蝶单号逗号拼接存储，拆分为逐张单号分别归集回写
 				for (String serialNo : application.getKingdeeBillNo().split(",")) {
 					if (Func.isNotBlank(serialNo)) {
 						applicationBySerialNo.putIfAbsent(serialNo.trim(), application);
+						serialNosByApplicationId.computeIfAbsent(application.getId(), key -> new ArrayList<>()).add(serialNo.trim());
 					}
 				}
 			}
 		});
+		// 已有开票结果的单号归集（含历史已落库），全部张次齐备才推进开票完成
+		Set<String> serialNosWithResult = new LinkedHashSet<>();
 		Map<String, CustomerArchive> sellerCache = new LinkedHashMap<>();
 		Map<String, List<String>> serialNosBySellerTaxNo = new LinkedHashMap<>();
 		int unresolved = 0;
@@ -1204,7 +1230,6 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		log.info("金蝶开票结果回写：按销方税号分组完成，共{}组，销方税号无法解析跳过{}笔", serialNosBySellerTaxNo.size(), unresolved);
 		int invoiceWritten = 0;
 		int failed = 0;
-		int invoicedCount = 0;
 		for (Map.Entry<String, List<String>> group : serialNosBySellerTaxNo.entrySet()) {
 			List<String> groupSerialNos = group.getValue();
 			for (int from = 0; from < groupSerialNos.size(); from += INVOICE_RESULT_QUERY_BATCH) {
@@ -1225,10 +1250,11 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 					// 批量查询当前批次已落库的发票记录（按发票号索引，用于幂等去重与缺文件地址补齐）
 					Map<String, InvoiceApplicationInvoice> existingInvoiceMap = batchQueryExistingInvoices(batch);
 					log.debug("金蝶开票结果回写：批次已存在发票记录数={}", existingInvoiceMap.size());
-					// 收集待插入的发票记录、待补文件地址的已有发票记录和待更新的开票申请
+					// 已落库记录对应的单号视为已有开票结果（跨批次幂等归集）
+					existingInvoiceMap.values().forEach(record -> serialNosWithResult.add(Func.toStr(record.getSerialNo()).trim()));
+					// 收集待插入的发票记录和待补文件地址的已有发票记录
 					List<InvoiceApplicationInvoice> toInsertInvoices = new ArrayList<>();
 					List<InvoiceApplicationInvoice> toPatchInvoices = new ArrayList<>();
-					List<InvoiceApplication> toUpdateApplications = new ArrayList<>();
 					for (BfiInvoiceApplyOpenApiBillVO bill : result.getData()) {
 						String billNo = bill.getBillNo();
 						InvoiceApplication application = applicationBySerialNo.get(billNo);
@@ -1270,13 +1296,8 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 						}
 						if (inserted > 0) {
 							invoiceWritten += inserted;
-							// 查到发票：开票申请单推进开票完成（终态）
+							serialNosWithResult.add(billNo);
-							application.setKingdeeStatus(KingdeeBfiConstant.KINGDEE_STATUS_INVOICED);
+							log.info("金蝶开票结果回写：单据编号[{}]写入发票{}张", billNo, inserted);
-							// HCS 开票登记待更新：扫描任务凭 hcs_fd_id 走 C111-3 回填票据日期（D12）
-							application.setHcsSyncStatus(HcsSyncConstant.HCS_STATUS_UNSYNCED);
-							toUpdateApplications.add(application);
-							invoicedCount++;
-							log.info("金蝶开票结果回写：开票申请[{}]状态推进为invoiced，本次写入发票{}张", application.getApplicationNo(), inserted);
 						}
 					}
 					// 批量插入发票记录
@@ -1289,17 +1310,29 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 						Db.updateBatchById(toPatchInvoices);
 						log.info("金蝶开票结果回写：批量补齐发票文件地址{}条", toPatchInvoices.size());
 					}
-					// 批量更新开票申请状态
-					if (!toUpdateApplications.isEmpty()) {
-						updateBatchById(toUpdateApplications);
-						log.info("金蝶开票结果回写：批量更新开票申请状态{}笔", toUpdateApplications.size());
-					}
 				} catch (Exception exception) {
 					failed++;
 					log.error("金蝶开票结果回写批次异常：serialNo=[{}]", batchSerialNos, exception);
 				}
 			}
 		}
+		// 全部张次均有开票结果才推进开票完成（终态），部分回写保持已同步继续轮询剩余张次
+		List<InvoiceApplication> toCompleteApplications = new ArrayList<>();
+		for (InvoiceApplication application : applications) {
+			List<String> applicationSerialNos = serialNosByApplicationId.get(application.getId());
+			if (Func.isEmpty(applicationSerialNos) || !serialNosWithResult.containsAll(applicationSerialNos)) {
+				continue;
+			}
+			application.setKingdeeStatus(KingdeeBfiConstant.KINGDEE_STATUS_INVOICED);
+			// HCS 开票登记待更新：扫描任务凭 hcs_fd_id 走 C111-3 回填票据日期（D12）
+			application.setHcsSyncStatus(HcsSyncConstant.HCS_STATUS_UNSYNCED);
+			toCompleteApplications.add(application);
+		}
+		int invoicedCount = toCompleteApplications.size();
+		if (!toCompleteApplications.isEmpty()) {
+			updateBatchById(toCompleteApplications);
+			log.info("金蝶开票结果回写：批量推进开票完成{}笔", invoicedCount);
+		}
 		log.info("金蝶开票结果回写完成：待查开票申请{}笔（销方税号无法解析跳过{}笔），回写发票{}张（开票完成{}笔，失败批次{}个）",
 			applications.size(), unresolved, invoiceWritten, invoicedCount, failed);
 		return "金蝶开票结果回写完成：待查开票申请" + applications.size() + "笔（销方税号无法解析跳过" + unresolved
@@ -1321,6 +1354,27 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 			.collect(Collectors.toMap(InvoiceApplicationInvoice::getInvoiceNo, Function.identity(), (left, right) -> left));
 	}
 
+	/**
+	 * 汇总本张发票经 A303-5 回写的金蝶开票结果备注（发票号、开票日期、价税合计）
+	 *
+	 * @param sheetInvoices 本张发票的金蝶发票结果
+	 * @return 结果备注
+	 */
+	private String kingdeeResultRemark(List<InvoiceApplicationInvoice> sheetInvoices) {
+		return sheetInvoices.stream()
+			.map(invoice -> {
+				StringBuilder remark = new StringBuilder("发票号").append(Func.toStr(invoice.getInvoiceNo()));
+				if (invoice.getInvoiceDate() != null) {
+					remark.append("，开票日期").append(invoice.getInvoiceDate().toLocalDate());
+				}
+				if (invoice.getInvoiceAmount() != null) {
+					remark.append("，价税合计").append(invoice.getInvoiceAmount());
+				}
+				return remark.toString();
+			})
+			.collect(Collectors.joining("；"));
+	}
+
 	/**
 	 * 将 A303-5 返回的发票文件地址补齐到已落库记录（仅补空字段，不覆盖已有值）
 	 *

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java

@@ -50,6 +50,7 @@ import org.springblade.thirdparty.bfi.pojo.vo.BfiInvoicePoolVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiPageVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiReceivedInvoiceVO;
 import org.springblade.thirdparty.bfi.service.IBfiService;
+import org.springblade.thirdparty.bfi.util.BfiUtil;
 import org.springblade.transport.constant.HcsSyncConstant;
 import org.springblade.transport.constant.KingdeeAttachmentConstant;
 import org.springblade.transport.config.BfiProperties;
@@ -1304,11 +1305,11 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 			invoiceTypes.isEmpty() ? "不限制" : invoiceTypes, customerTaxNos != null ? "开启" : "关闭",
 			POOL_PAGE_SIZE, MAX_POOL_PAGES);
 		if (invoiceTypes.isEmpty()) {
-			this.syncWindowSlice(windowStart, windowEnd, null, customerTaxNos, stats);
+			this.syncPoolWindow(windowStart, windowEnd, null, customerTaxNos, stats);
 		} else {
 			// 单值参数拆轮：每个票种编码独立完整切片续扫，互不挤占翻页额度
 			for (String invoiceType : invoiceTypes) {
-				this.syncWindowSlice(windowStart, windowEnd, invoiceType, customerTaxNos, stats);
+				this.syncPoolWindow(windowStart, windowEnd, invoiceType, customerTaxNos, stats);
 			}
 		}
 		String summary = "金蝶全票池同步：翻页" + stats.pageCount + "页切片" + stats.sliceCount + "片拉取"
@@ -1358,72 +1359,51 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 	}
 
 	/**
-	 * 同步单个时间片 [sliceStart, sliceEnd)：独立翻页拉取（最多 MAX_POOL_PAGES 页），
+	 * 同步单个票种的时间窗口：翻页与触顶二分续扫统一交给 {@link BfiUtil#forEachWindowSlice}，
-	 * 触顶说明该时间片数据 >2.5 万，从中点二分为两片递归续扫（递归深度受时间粒度自然收敛，
+	 * 页级客商单位过滤、镜像批量 upsert、已登记票跟随补绑在页回调中完成
-	 * 单片 500 条以内 1 页即短页终止）
 	 *
-	 * @param sliceStart      切片起点（含）
+	 * @param windowStart    窗口起点（含）
-	 * @param sliceEnd        切片终点（不含，避免与下一片边界重复拉取）
+	 * @param windowEnd      窗口终点（含）
-	 * @param customerTaxNos  客商发票信息税号集，null 表示客商单位过滤关闭（整轮共享）
+	 * @param invoiceType    发票种类编码，null 不限
-	 * @param stats           整轮统计累加器
+	 * @param customerTaxNos 客商发票信息税号集，null 表示客商单位过滤关闭（整轮共享）
+	 * @param stats          整轮统计累加器
 	 */
-	private void syncWindowSlice(LocalDateTime sliceStart, LocalDateTime sliceEnd, String invoiceType,
+	private void syncPoolWindow(LocalDateTime windowStart, LocalDateTime windowEnd, String invoiceType,
 		Set<String> customerTaxNos, SyncStats stats) {
-		// 二分收敛保护：切片粒度细到 1 秒仍触顶说明远端异常（同秒 >2.5 万条不可能），不再二分直接记漏
+		stats.sliceCount += BfiUtil.forEachWindowSlice("金蝶全票池同步", windowStart, windowEnd,
-		if (!sliceStart.isBefore(sliceEnd)) {
+			POOL_PAGE_SIZE, MAX_POOL_PAGES,
-			log.error("金蝶全票池同步切片区间为空（{} ~ {}），远端 updateTime 粒度异常，放弃该切片", sliceStart, sliceEnd);
+			(sliceStart, sliceEnd, pageNo) -> this.pullPoolWindowPage(sliceStart, sliceEnd, invoiceType, pageNo),
-			return;
+			rows -> this.handlePoolPage(rows, customerTaxNos, stats));
-		}
+	}
-		boolean truncated = false;
+
-		for (int pageNo = 1; pageNo <= MAX_POOL_PAGES; pageNo++) {
+	/**
-			List<BfiInvoicePoolVO> rows = this.pullPoolWindowPage(sliceStart, sliceEnd, invoiceType, pageNo);
+	 * 票池同步单页处理：客商单位过滤 + 镜像批量 upsert + 已登记票跟随补绑。
-			if (rows.isEmpty()) {
+	 * 客商过滤只影响入镜像行数，翻页节奏由 BfiUtil 按原始行数判断，不受过滤影响
-				break;
+	 *
-			}
+	 * @param rows           本页拉取的票池发票（原始行）
-			stats.pageCount++;
+	 * @param customerTaxNos 客商发票信息税号集，null 表示客商单位过滤关闭
-			stats.pulledCount += rows.size();
+	 * @param stats          整轮统计累加器
-			// 客商单位过滤：销/购方税号未同时登记在客商发票信息中的发票不入镜像；
+	 */
-			// 短页判定用原始条数，过滤后的空页不能提前终止翻页
+	private void handlePoolPage(List<BfiInvoicePoolVO> rows, Set<String> customerTaxNos, SyncStats stats) {
+		stats.pageCount++;
+		stats.pulledCount += rows.size();
+		// 客商单位过滤：销/购方税号未同时登记在客商发票信息中的发票不入镜像
+		if (customerTaxNos != null) {
 			int rawPageSize = rows.size();
-			if (customerTaxNos != null) {
+			rows = rows.stream().filter(row -> this.bothUnitsRegistered(row, customerTaxNos)).toList();
-				rows = rows.stream().filter(row -> this.bothUnitsRegistered(row, customerTaxNos)).toList();
+			stats.customerFiltered += rawPageSize - rows.size();
-				stats.customerFiltered += rawPageSize - rows.size();
-			}
-			BatchUpsertResult upsertResult = this.batchUpsertInvoicePool(rows);
-			stats.created += upsertResult.created();
-			stats.updated += upsertResult.updated();
-			stats.mirrorUnchanged += upsertResult.unchanged();
-			// 已登记票跟随补绑：同页发票号码批量定位登记，绑定关系变更页级事务批量落库
-			if (!upsertResult.mirrors().isEmpty()) {
-				RefreshResult refreshResult = this.refreshBoundReceipts(stats.pageCount, upsertResult.mirrors());
-				stats.bound += refreshResult.bound();
-				stats.unchanged += refreshResult.unchanged();
-				stats.failed += refreshResult.failed();
-			}
-			// 远程短页：该片到底，正常终止（按原始拉取条数判断，客商过滤不改变翻页节奏）
-			if (rawPageSize < POOL_PAGE_SIZE) {
-				stats.sliceCount++;
-				return;
-			}
-			truncated = true;
 		}
-		// 触顶：该切片数据超过单查询窗口上限，从中点二分续扫（updateTime 落在中点的行归左片 [start, mid)，
+		BatchUpsertResult upsertResult = this.batchUpsertInvoicePool(rows);
-		// 右片 [mid, end) 不含 mid，同 updateTime 行整体归左片，不重不漏）
+		stats.created += upsertResult.created();
-		if (truncated) {
+		stats.updated += upsertResult.updated();
-			LocalDateTime mid = sliceStart.plus(java.time.Duration.between(sliceStart, sliceEnd).dividedBy(2));
+		stats.mirrorUnchanged += upsertResult.unchanged();
-			if (!mid.isAfter(sliceStart)) {
+		// 已登记票跟随补绑：同页发票号码批量定位登记，绑定关系变更页级事务批量落库
-				// 切片已细到不足 1 秒仍满页：理论不可能，防御死递归
+		if (!upsertResult.mirrors().isEmpty()) {
-				log.error("金蝶全票池同步切片 {} ~ {} 已达最小粒度仍满页（>{} 条），该时间片数据异常，跳过",
+			RefreshResult refreshResult = this.refreshBoundReceipts(stats.pageCount, upsertResult.mirrors());
-					sliceStart, sliceEnd, MAX_POOL_PAGES * POOL_PAGE_SIZE);
+			stats.bound += refreshResult.bound();
-				return;
+			stats.unchanged += refreshResult.unchanged();
-			}
+			stats.failed += refreshResult.failed();
-			log.warn("金蝶全票池同步切片 {} ~ {} 触达翻页保护 {} 页（{} 条），二分续扫 [{} ~ {}) + [{} ~ {})",
-				sliceStart, sliceEnd, MAX_POOL_PAGES, MAX_POOL_PAGES * POOL_PAGE_SIZE, sliceStart, mid, mid, sliceEnd);
-			this.syncWindowSlice(sliceStart, mid, invoiceType, customerTaxNos, stats);
-			this.syncWindowSlice(mid, sliceEnd, invoiceType, customerTaxNos, stats);
-			return;
 		}
-		stats.sliceCount++;
 	}
 
 	/**
@@ -1523,7 +1503,7 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 	}
 
 	/** A801-1 按票池更新时间窗口分页拉取（只认正常票，不推单据使用状态；invoiceType 单值下推，null 不限） */
-	private List<BfiInvoicePoolVO> pullPoolWindowPage(LocalDateTime windowStart, LocalDateTime windowEnd,
+	private BfiPageVO<BfiInvoicePoolVO> pullPoolWindowPage(LocalDateTime windowStart, LocalDateTime windowEnd,
 		String invoiceType, int pageNo) {
 		BfiInvoicePoolQueryDataDTO data = new BfiInvoicePoolQueryDataDTO();
 		data.setPageNo(pageNo);
@@ -1536,7 +1516,7 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 		param.setQueryParam(data);
 		BfiPageVO<BfiInvoicePoolVO> poolPage = bfiService.queryInvoicePool(param);
 		log.info("金蝶全票池同步 第{}页拉取 {} 条", pageNo, poolPage.getRows() == null ? 0 : poolPage.getRows().size());
-		return poolPage.getRows() == null ? List.of() : poolPage.getRows();
+		return poolPage;
 	}
 
 	/**

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java

@@ -35,6 +35,7 @@ import org.springblade.transport.service.IDriverService;
 import org.springblade.transport.service.ILoadingManageService;
 import org.springblade.transport.service.IProcessConfigService;
 import org.springblade.transport.service.IReceivablePayableDetailService;
+import org.springblade.transport.support.ContractPartySupport;
 import org.springblade.transport.support.LiveProcessConfigSupport;
 import org.springblade.transport.support.LoadableAdmissionSupport;
 import org.springblade.transport.support.TransportBusinessSupport;
@@ -118,23 +119,27 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 			return List.of();
 		}
 		List<ContractManage> contracts = availableCarrierContracts(projectIds);
+		Set<String> allowedCarrierNames = null;
 		if (Func.isNotEmpty(waybillIds)) {
 			List<Waybill> waybills = loadWaybills(waybillIds);
-			Set<String> allowedPartyBs = intersectCarrierPartyBs(waybills, contracts);
+			allowedCarrierNames = intersectCarrierPartyBs(waybills, contracts);
-			if (allowedPartyBs.isEmpty()) {
+			if (allowedCarrierNames.isEmpty()) {
 				return List.of();
 			}
+			Set<String> allowedNames = allowedCarrierNames;
 			contracts = contracts.stream()
-				.filter(contract -> allowedPartyBs.contains(normalizePartyName(contract.getPartyB())))
+				.filter(contract -> ContractPartySupport.carrierPartyNames(contract).stream()
+					.anyMatch(allowedNames::contains))
 				.toList();
 		}
-		return contracts.stream().map(contract -> {
+		List<LoadingCarrierContractVO> options = ContractPartySupport.expandCarrierOptions(contracts);
-			LoadingCarrierContractVO option = new LoadingCarrierContractVO();
+		if (allowedCarrierNames == null) {
-			option.setId(contract.getId());
+			return options;
-			option.setContractName(contract.getContractName());
+		}
-			option.setCarrierName(contract.getPartyB());
+		Set<String> allowedNames = allowedCarrierNames;
-			return option;
+		return options.stream()
-		}).toList();
+			.filter(option -> allowedNames.contains(normalizePartyName(option.getCarrierName())))
+			.toList();
 	}
 
 	@Override
@@ -674,7 +679,11 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 		TransportBusinessSupport.validateAllDept(loadingManage.getAllDept(), "配载管理");
 		LambdaQueryWrapper<LoadingManage> queryWrapper = Wrappers.<LoadingManage>lambdaQuery().eq(LoadingManage::getIsDeleted, 0);
 		if (!Objects.equals(loadingManage.getAllDept(), 1)) {
-			queryWrapper.eq(LoadingManage::getDeptId, TransportBusinessSupport.currentDeptId("配载管理"));
+			Long currentDeptId = TransportBusinessSupport.currentDeptId("配载管理");
+			queryWrapper.and(wrapper -> {
+				wrapper.eq(LoadingManage::getDeptId, currentDeptId);
+				TransportBusinessSupport.orProjectVisibleByBusinessDept(wrapper, List.of(currentDeptId));
+			});
 		} else if (Func.isNotEmpty(loadingManage.getDeptId())) {
 			queryWrapper.eq(LoadingManage::getDeptId, loadingManage.getDeptId());
 		}
@@ -969,6 +978,8 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 	private void validateCarrierContract(LoadingManage loadingManage, boolean required, List<Waybill> waybills) {
 		if (!Objects.equals(loadingManage.getCarrierType(), "承运商")) {
 			loadingManage.setCarrierContractId(null);
+			loadingManage.setCarrierPartyId(null);
+			loadingManage.setCarrierPartyRole(null);
 			if (!Objects.equals(loadingManage.getCarrierType(), CARRIER_SELF)) {
 				loadingManage.setCarrierName(null);
 			}
@@ -979,6 +990,8 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 				throw new ServiceException("请选择承运商合同");
 			}
 			loadingManage.setCarrierName(null);
+			loadingManage.setCarrierPartyId(null);
+			loadingManage.setCarrierPartyRole(null);
 			return;
 		}
 		ContractManage carrierContract = availableCarrierContractById(loadingManage.getCarrierContractId());
@@ -999,19 +1012,35 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 				? "所选承运商合同不属于本项目"
 				: "所选承运商合同不属于运单" + waybillNos + "的项目");
 		}
+		Map<String, Object> selectedParty = ContractPartySupport.findCarrierParty(
+			carrierContract, loadingManage.getCarrierPartyId(), loadingManage.getCarrierName());
+		if (selectedParty == null && Func.isNotEmpty(loadingManage.getCarrierName())
+			&& !ContractPartySupport.matchesCarrier(carrierContract, loadingManage.getCarrierName(), loadingManage.getCarrierPartyId())) {
+			throw new ServiceException("所选承运商不属于该承运商合同的乙方或丙方客商");
+		}
+		if (selectedParty != null) {
+			Object customerName = selectedParty.get("customerName");
+			Object partyId = selectedParty.get("id");
+			Object partyRole = selectedParty.get("partyRole");
+			loadingManage.setCarrierName(customerName == null ? null : normalizePartyName(String.valueOf(customerName)));
+			loadingManage.setCarrierPartyId(partyId == null ? null : normalizePartyName(String.valueOf(partyId)));
+			loadingManage.setCarrierPartyRole(partyRole == null ? null : ContractPartySupport.normalizeRole(String.valueOf(partyRole)));
+		} else if (Func.isEmpty(loadingManage.getCarrierName())) {
+			loadingManage.setCarrierName(ContractPartySupport.firstPartyName(carrierContract.getPartyBJson(), carrierContract.getPartyB()));
+			loadingManage.setCarrierPartyRole(ContractPartySupport.ROLE_B);
+		}
 		if (Func.isNotEmpty(childWaybills)) {
 			List<ContractManage> projectContracts = availableCarrierContracts(projectIdsOf(childWaybills));
 			Set<String> allowedPartyBs = intersectCarrierPartyBs(childWaybills, projectContracts);
-			String partyB = normalizePartyName(carrierContract.getPartyB());
+			String carrierName = normalizePartyName(loadingManage.getCarrierName());
-			if (Func.isNotEmpty(allowedPartyBs) && !allowedPartyBs.contains(partyB)) {
+			if (Func.isNotEmpty(allowedPartyBs) && !allowedPartyBs.contains(carrierName)) {
-				throw new ServiceException("所选承运商合同乙方与子运单可共同承运的乙方不一致，可选："
+				throw new ServiceException("所选承运客商与子运单可共同承运的客商不一致，可选："
 					+ String.join("、", allowedPartyBs));
 			}
 			if (allowedPartyBs.isEmpty()) {
-				throw new ServiceException("所选运单在同一项目下没有共同的承运商合同乙方，不能配载到同一配载单");
+				throw new ServiceException("所选运单在同一项目下没有共同的承运商合同客商，不能配载到同一配载单");
 			}
 		}
-		loadingManage.setCarrierName(carrierContract.getPartyB());
 	}
 
 	private void validateCompletedCarrierContract(LoadingManage loadingManage) {
@@ -1050,12 +1079,11 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 	}
 
 	/**
-	 * 各子运单按「客户合同乙方 = 承运商合同甲方」匹配可用承运商合同，再对乙方名称取交集。
+	 * 各子运单按「客户合同乙方 ≈ 承运商合同甲方」匹配可用承运商合同，再对乙/丙方客商名称取交集。
-	 * 例：客户合同 盛达(甲)-捷联(乙)，承运商合同 捷联(甲)-驰远(乙)；子单1可选 A/B/C，子单2可选 B，则交集为 B。
 	 */
 	private Set<String> intersectCarrierPartyBs(List<Waybill> waybills, List<ContractManage> projectContracts) {
 		Set<String> intersection = null;
-		Map<Long, String> customerPartyBMap = loadCustomerContractPartyBMap(waybills);
+		Map<Long, Set<String>> customerPartyBMap = loadCustomerContractPartyBMap(waybills);
 		for (Waybill waybill : waybills) {
 			Set<String> available = availableCarrierPartyBs(waybill, projectContracts, customerPartyBMap);
 			if (intersection == null) {
@@ -1071,23 +1099,23 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 	}
 
 	private Set<String> availableCarrierPartyBs(Waybill waybill, List<ContractManage> projectContracts,
-												Map<Long, String> customerPartyBMap) {
+												Map<Long, Set<String>> customerPartyBMap) {
 		if (waybill == null || Func.isEmpty(projectContracts)) {
 			return Set.of();
 		}
 		Long contractId = waybill.getContractId();
-		// 运单没有客户合同时不按乙方过滤；客户合同乙方即我方，应等于承运商合同甲方
+		Set<String> customerPartyBs = contractId == null
-		String partyB = contractId == null ? "" : normalizePartyName(customerPartyBMap.get(contractId));
+			? Set.of()
+			: customerPartyBMap.getOrDefault(contractId, Set.of());
 		return projectContracts.stream()
 			.filter(contract -> Objects.equals(contract.getProjectId(), waybill.getProjectId()))
-			.filter(contract -> Func.isEmpty(partyB) || Objects.equals(normalizePartyName(contract.getPartyA()), partyB))
+			.filter(contract -> customerPartyBs.isEmpty() || partyNamesOverlap(partyANames(contract), customerPartyBs))
-			.map(ContractManage::getPartyB)
+			.flatMap(contract -> ContractPartySupport.carrierPartyNames(contract).stream())
-			.map(this::normalizePartyName)
 			.filter(Func::isNotEmpty)
 			.collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
-	private Map<Long, String> loadCustomerContractPartyBMap(List<Waybill> waybills) {
+	private Map<Long, Set<String>> loadCustomerContractPartyBMap(List<Waybill> waybills) {
 		List<Long> contractIds = waybills.stream()
 			.map(Waybill::getContractId)
 			.filter(Objects::nonNull)
@@ -1101,11 +1129,55 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 				.in(ContractManage::getId, contractIds))
 			.stream()
 			.collect(Collectors.toMap(ContractManage::getId,
-				contract -> normalizePartyName(contract.getPartyB()),
+				this::partyBNames,
 				(left, right) -> left,
 				LinkedHashMap::new));
 	}
 
+	private Set<String> partyANames(ContractManage contract) {
+		Set<String> names = ContractPartySupport.parsePartyRows(contract.getPartyAJson()).stream()
+			.map(row -> normalizePartyName(String.valueOf(row.get("customerName"))))
+			.filter(Func::isNotEmpty)
+			.collect(Collectors.toCollection(LinkedHashSet::new));
+		if (names.isEmpty() && Func.isNotEmpty(contract.getPartyA())) {
+			for (String part : contract.getPartyA().split("[、,]")) {
+				String name = normalizePartyName(part);
+				if (Func.isNotEmpty(name)) {
+					names.add(name);
+				}
+			}
+		}
+		return names;
+	}
+
+	private Set<String> partyBNames(ContractManage contract) {
+		Set<String> names = ContractPartySupport.parsePartyRows(contract.getPartyBJson()).stream()
+			.map(row -> normalizePartyName(String.valueOf(row.get("customerName"))))
+			.filter(Func::isNotEmpty)
+			.collect(Collectors.toCollection(LinkedHashSet::new));
+		if (names.isEmpty() && Func.isNotEmpty(contract.getPartyB())) {
+			for (String part : contract.getPartyB().split("[、,]")) {
+				String name = normalizePartyName(part);
+				if (Func.isNotEmpty(name)) {
+					names.add(name);
+				}
+			}
+		}
+		return names;
+	}
+
+	private boolean partyNamesOverlap(Set<String> left, Set<String> right) {
+		if (Func.isEmpty(left) || Func.isEmpty(right)) {
+			return false;
+		}
+		for (String name : left) {
+			if (right.contains(name)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	private String normalizePartyName(String value) {
 		return value == null ? "" : value.trim();
 	}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java

@@ -30,6 +30,7 @@ import org.springblade.transport.service.IDriverService;
 import org.springblade.transport.service.IProjectApplyService;
 import org.springblade.transport.service.ITransportPlanService;
 import org.springblade.transport.service.IWaybillService;
+import org.springblade.transport.support.ContractPartySupport;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.support.WaybillProcessSupport;
 import org.springblade.transport.wrapper.WaybillWrapper;
@@ -87,11 +88,15 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
 
 	@Override
 	public List<MasterOrderCarrierVO> carriers(Long id) {
-		return availableCarrierContracts(getRequired(id)).stream().map(contract -> {
+		return ContractPartySupport.expandCarrierOptions(availableCarrierContracts(getRequired(id))).stream().map(option -> {
 			MasterOrderCarrierVO carrier = new MasterOrderCarrierVO();
-			carrier.setContractId(contract.getId());
+			carrier.setContractId(option.getId());
-			carrier.setContractName(contract.getContractName());
+			carrier.setContractName(option.getContractName());
-			carrier.setCarrierName(contract.getPartyB());
+			carrier.setCarrierName(option.getCarrierName());
+			carrier.setCarrierPartyId(option.getCarrierPartyId());
+			carrier.setCarrierPartyRole(option.getCarrierPartyRole());
+			carrier.setCreditCode(option.getCreditCode());
+			carrier.setCustomerId(option.getCustomerId());
 			return carrier;
 		}).toList();
 	}
@@ -267,7 +272,11 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
 		waybill.setContractId(masterOrder.getContractId()); waybill.setContractName(masterOrder.getContractName());
 		waybill.setCustomerName(masterOrder.getCustomerName()); waybill.setMasterNo(masterOrder.getMasterNo());
 		waybill.setTransportType(string(dispatch, "transportType")); waybill.setCarrierType(string(dispatch, "carrierType"));
-		waybill.setCarrierContractId(longValue(dispatch, "carrierContractId")); waybill.setCarrierName(string(dispatch, "carrierName")); waybill.setDriverName(string(dispatch, "driverName"));
+		waybill.setCarrierContractId(longValue(dispatch, "carrierContractId"));
+		waybill.setCarrierName(string(dispatch, "carrierName"));
+		waybill.setCarrierPartyId(string(dispatch, "carrierPartyId"));
+		waybill.setCarrierPartyRole(string(dispatch, "carrierPartyRole"));
+		waybill.setDriverName(string(dispatch, "driverName"));
 		waybill.setDriverPhone(string(dispatch, "driverPhone")); waybill.setVehicleNo(string(dispatch, "vehicleNo")); waybill.setTrailerVehicleNo(string(dispatch, "trailerVehicleNo"));
 		// 归属主键是档案 ID：调度带了就用它，否则按手机号解析；解析入口只返回 null 或唯一命中的
 		// 档案 ID，承运商司机解析为空也照常派单，落空时留 WARN
@@ -603,7 +612,7 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
 			.and(wrapper -> wrapper.isNull(ContractManage::getContractStage)
 				.or().ne(ContractManage::getContractStage, "terminated"))
 			.orderByDesc(ContractManage::getCreateTime))
-			.stream().filter(contract -> Func.isNotEmpty(contract.getPartyB())).toList();
+			.stream().filter(contract -> Func.isNotEmpty(ContractPartySupport.carrierPartyNames(contract))).toList();
 	}
 
 	private void validateCarrier(Map<String, Object> dispatch, Map<Long, ContractManage> availableCarrierContracts) {
@@ -615,11 +624,29 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
 			}
 		}
 		String carrierName = string(dispatch, "carrierName");
+		String carrierPartyId = string(dispatch, "carrierPartyId");
 		Long carrierContractId = longValue(dispatch, "carrierContractId");
 		ContractManage carrierContract = carrierContractId == null ? null : availableCarrierContracts.get(carrierContractId);
 		if ("承运商".equals(carrierType) && (carrierContract == null
-			|| !Objects.equals(carrierContract.getPartyB(), carrierName))) {
+			|| !ContractPartySupport.matchesCarrier(carrierContract, carrierName, carrierPartyId))) {
-			throw new ServiceException("所选承运商不属于总单客户合同对应项目的有效承运商合同乙方");
+			throw new ServiceException("所选承运商不属于总单客户合同对应项目的有效承运商合同乙/丙方客商");
+		}
+		if ("承运商".equals(carrierType) && carrierContract != null) {
+			Map<String, Object> selectedParty = ContractPartySupport.findCarrierParty(carrierContract, carrierPartyId, carrierName);
+			if (selectedParty != null) {
+				Object selectedName = selectedParty.get("customerName");
+				Object selectedPartyId = selectedParty.get("id");
+				Object selectedPartyRole = selectedParty.get("partyRole");
+				if (selectedName != null) {
+					dispatch.put("carrierName", String.valueOf(selectedName).trim());
+				}
+				if (selectedPartyId != null) {
+					dispatch.put("carrierPartyId", String.valueOf(selectedPartyId).trim());
+				}
+				if (selectedPartyRole != null) {
+					dispatch.put("carrierPartyRole", ContractPartySupport.normalizeRole(String.valueOf(selectedPartyRole)));
+				}
+			}
 		}
 		String transportType = string(dispatch, "transportType", "");
 		boolean road = transportType.toLowerCase().contains("road") || transportType.contains("公路");

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java

@@ -116,6 +116,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -261,6 +263,8 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	public PaymentApplicationVO detail(Long id) {
 		PaymentApplication entity = existing(id);
 		PaymentApplicationVO vo = PaymentApplicationWrapper.build().entityVO(entity);
+		// 合规特批结果附件动态追加展示（不落 attachmentsJson 原文，下载经 C103-5 代理透传）
+		this.appendSpecAttachDisplay(vo);
 		fillKingdeeLockStatus(List.of(vo));
 		vo.setInvoices(invoiceMapper.selectList(Wrappers.<PaymentApplicationInvoice>lambdaQuery()
 			.eq(PaymentApplicationInvoice::getPaymentApplicationId, id).orderByAsc(PaymentApplicationInvoice::getLineNo)));
@@ -295,6 +299,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				if (!TransportBusiConstant.APPROVED.equals(formalSettlement.getApprovalStatus())) {
 					throw new ServiceException("只能选择审批通过、未作废的正式结算单");
 				}
+				assertFormalSettlementPayable(formalSettlement);
 				settlementAmount = money(formalSettlement.getSettlementAmount());
 			} else {
 				// 尾款付款也允许关联预结算单
@@ -547,12 +552,12 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			kingdeeBillId = self().doSyncKingdee(id, context);
 		} catch (ServiceException exception) {
 			log.error("付款申请[{}]推送金蝶付款申请单异常", id, exception);
-			// 推送事务已回滚、行锁已释放，此处独立事务落"生成失败"状态
+			// 推送事务已回滚、行锁已释放，此处独立事务落"生成失败"状态与失败原因
-			self().markKingdeeSyncFailed(id);
+			self().markKingdeeSyncFailed(id, exception.getMessage());
 			throw exception;
 		} catch (Exception exception) {
 			log.error("付款申请[{}]推送金蝶付款申请单异常", id, exception);
-			self().markKingdeeSyncFailed(id);
+			self().markKingdeeSyncFailed(id, exception.getMessage());
 			throw new ServiceException("推送金蝶付款申请失败：" + exception.getMessage());
 		}
 		// 主单事务提交后锁定金蝶付款申请单（lockBusiData）：一张付款申请对一张金蝶付款申请单，接口1对1；
@@ -585,6 +590,38 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		}
 	}
 
+	/**
+	 * 详情附件追加合规特批结果附件展示行（不落 attachmentsJson 原文）：
+	 * 前端通用附件列表直接渲染，下载经 /hcs/attachment/download（C103-5 代理）透传；
+	 * 先剔除前端随单保存的历史展示行，避免重批后重复
+	 *
+	 * @param vo 付款申请详情 VO
+	 */
+	private void appendSpecAttachDisplay(PaymentApplicationVO vo) {
+		if (Func.isBlank(vo.getHcsSpecAttachFdId())) {
+			return;
+		}
+		try {
+			List<Object> rows = Func.isBlank(vo.getAttachmentsJson())
+				? new ArrayList<>() : new ArrayList<>(JsonUtil.parse(vo.getAttachmentsJson(), List.class));
+			// 剔除历史展示行（含改版前 spec_result 旧值），避免前端随单保存后重复追加
+			rows.removeIf(row -> row instanceof Map<?, ?> map
+				&& (HcsSyncConstant.PAYMENT_ATTACH_TYPE_SPEC_RESULT.equals(map.get("attachmentType"))
+					|| "spec_result".equals(map.get("attachmentType"))));
+			Map<String, Object> specRow = new LinkedHashMap<>();
+			specRow.put("name", HcsSyncConstant.PAYMENT_SPEC_ATTACH_NAME + ".pdf");
+			specRow.put("attachmentType", HcsSyncConstant.PAYMENT_ATTACH_TYPE_SPEC_RESULT);
+			// 前端代理前缀 /api（网关服务名路由）；url 路径以 .pdf 结尾供前端附件组件识别类型，文件流 attachment 强制下载
+			specRow.put("url", "/api/blade-transport/hcs/attachment/download/"
+				+ URLEncoder.encode(HcsSyncConstant.PAYMENT_SPEC_ATTACH_NAME + ".pdf", StandardCharsets.UTF_8)
+				+ "?fdId=" + vo.getHcsSpecAttachFdId());
+			rows.add(specRow);
+			vo.setAttachmentsJson(JsonUtil.toJson(rows));
+		} catch (Exception exception) {
+			log.warn("付款申请[{}]特批结果附件展示行追加失败", vo.getId(), exception);
+		}
+	}
+
 	/**
 	 * 附件联带上传（A902）：主单推送成功（含幂等预检命中）后调用，
 	 * 以本地 kingdeeBillId（星瀚单据内码）定位金蝶单据；本地缺失（存量数据）跳过待重推补传；
@@ -599,8 +636,15 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				log.warn("付款申请[{}]金蝶附件联带上传跳过：星瀚单据内码未落库，待重推补传", id);
 				return;
 			}
-			kingdeeAttachmentSyncSupport.syncUserAttachments(KingdeeAttachmentConstant.BIZ_PAY_APPLICATION,
+			List<KingdeeAttachmentSyncSupport.KingdeeAttachmentItem> items = new ArrayList<>(
-				id, entity.getKingdeeBillId(), entity.getAttachmentsJson());
+				kingdeeAttachmentSyncSupport.parseUserAttachments(entity.getAttachmentsJson()));
+			// 合规付款特批结果附件（paymentLegal/result 回传）：C103-5 按合规附件ID 下载后联带上传金蝶
+			if (Func.isNotBlank(entity.getHcsSpecAttachFdId())) {
+				items.add(KingdeeAttachmentSyncSupport.KingdeeAttachmentItem.hcsAttachment(
+					HcsSyncConstant.PAYMENT_SPEC_ATTACH_NAME, entity.getHcsSpecAttachFdId()));
+			}
+			kingdeeAttachmentSyncSupport.syncAttachments(KingdeeAttachmentConstant.BIZ_PAY_APPLICATION,
+				id, entity.getKingdeeBillId(), items);
 		} catch (Exception exception) {
 			log.error("付款申请[{}]金蝶附件联带上传异常（不影响主单同步状态，重推自动补传）", id, exception);
 		}
@@ -692,13 +736,17 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void markKingdeeSyncFailed(Long id) {
+	public void markKingdeeSyncFailed(Long id, String reason) {
 		if (id == null) return;
+		// 失败原因截断留档，与列长 varchar(500) 对齐，不抛错
+		String failReason = Func.toStrWithEmpty(reason, "未知异常");
 		// 条件更新：仅审批通过的单据落"生成失败"状态，未审批/已删除单据自动跳过保持原状态
 		baseMapper.update(null, Wrappers.<PaymentApplication>lambdaUpdate()
 			.eq(PaymentApplication::getId, id)
 			.eq(PaymentApplication::getApprovalStatus, TransportBusiConstant.APPROVED)
-			.set(PaymentApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED));
+			.set(PaymentApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED)
+			.set(PaymentApplication::getKingdeeFailReason,
+				failReason.length() > 500 ? failReason.substring(0, 500) : failReason));
 	}
 
 	@Override
@@ -750,6 +798,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			.eq(PaymentApplication::getId, id)
 			.in(PaymentApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_SYNCED, KingdeeBfiConstant.KINGDEE_STATUS_PAYING)
 			.set(PaymentApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_FAILED)
+			.set(PaymentApplication::getKingdeeFailReason, "金蝶侧单据已删除解锁（" + source + "），等待重新推送")
 			.set(PaymentApplication::getKingdeeBillId, null)
 			.set(PaymentApplication::getKingdeeBillNo, null));
 		// 金蝶单据已删除/解锁重推：联动作废提前建档的预付记录，重推生成新单后重新建档
@@ -964,6 +1013,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		String kingdeeStatus = kingdeeResultStatus(payApply);
 		entity.setKingdeeStatus(kingdeeStatus);
 		// 已付金额：A103-2 分录 e_paidamt 汇总；分录缺失且已付款时兜底取申请金额
+		BigDecimal previousPaid = entity.getPaidAmount();
 		if (Func.isNotEmpty(payApply.getEntry())) {
 			BigDecimal paidAmount = payApply.getEntry().stream()
 				.map(BfiPayApplyEntryVO::getEPaidamt).filter(Objects::nonNull)
@@ -972,8 +1022,12 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		} else if (KingdeeBfiConstant.KINGDEE_STATUS_PAID.equals(kingdeeStatus)) {
 			entity.setPaidAmount(money(entity.getAppliedAmount()).setScale(2, RoundingMode.HALF_UP));
 		}
-		// HCS 履约记录推进：实际付款变化后置待同步，扫描任务凭 hcs_perf_fd_id 走 C108-2 更新（D11）
+		// HCS 履约付款记录推进：金蝶实际付款推进（首次付款或金额变化）后置待同步，扫描任务凭
-		if (entity.getHcsPerfFdId() != null) {
+		// hcs_perf_fd_id 判定走向——未建过履约记录走 C108-1 新建，已建走 C108-2 更新实际金额
+		BigDecimal currentPaid = entity.getPaidAmount();
+		boolean paidAdvanced = currentPaid != null && currentPaid.signum() > 0
+			&& (previousPaid == null || previousPaid.signum() <= 0 || previousPaid.compareTo(currentPaid) != 0);
+		if (paidAdvanced) {
 			entity.setHcsSyncStatus(HcsSyncConstant.HCS_STATUS_UNSYNCED);
 		}
 		updateById(entity);
@@ -1131,15 +1185,17 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	}
 
 	/**
-	 * A103-4 分页查询：按付款人（公司）编码 + 最近1个月业务日期窗口（接口限制不超过1个月），自动翻页
+	 * A103-4 分页查询：按付款人（公司）编码 + 业务日期窗口，自动翻页
+	 * <p>
+	 * 窗口天数取 Nacos thirdParty.bfi.payResult.queryWindowDays（默认 60）
 	 *
 	 * @param orgNumber 付款人（公司）编码
 	 * @return 付款处理单列表
 	 */
 	private List<BfiPayBillVO> queryPayBillPages(String orgNumber) {
 		LocalDate endDate = LocalDate.now();
-		// 业务日期窗口控制在不超过1个月
+		int windowDays = Math.max(bfiProperties.getPayResult().getQueryWindowDays(), 1);
-		LocalDate beginDate = endDate.minusMonths(1).plusDays(1);
+		LocalDate beginDate = endDate.minusDays(windowDays);
 		BfiPayBillQueryDTO param = new BfiPayBillQueryDTO();
 		param.setOrgNumber(List.of(orgNumber));
 		param.setBeginBizdate(beginDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
@@ -1254,8 +1310,8 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		param.setAwrpSrcSys(bfiProperties.getSrcSys());
 		// 结算组织.编码
 		param.setSettleorgNumber(orgNumber);
-		// 部门.编码：项目业务部门自身的金蝶编码（结算/申请/付款组织仍传上溯平台公司编码）
+		// 部门.编码：合同平台公司下业务部门配置的金蝶部门代码
-		param.setAwrpDepartmentNumber(kingdeeApBillSyncSupport.kingdeeDeptNumber(contract.getProjectId(), context));
+		param.setAwrpDepartmentNumber(kingdeeApBillSyncSupport.kingdeeDeptNumber(contract, contract.getProjectId(), context));
 		// 【必填】单据类型.编码
 		param.setBilltypeNumber(bfiProperties.getPayApply().getBilltype());
 		// 【必填】申请日期：yyyy-MM-dd HH:mm:ss（各接口统一格式）
@@ -2092,6 +2148,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				}
 			} else {
 				if (!TransportBusiConstant.APPROVED.equals(source.getApprovalStatus())) throw new ServiceException("只能选择审批通过、未作废的正式结算单");
+				assertFormalSettlementPayable(source);
 				entity.setSettlementId(source.getId()); entity.setSettlementNo(source.getFormalSettlementNo()); entity.setPreSettlementId(null); entity.setPreSettlementNo(null);
 				entity.setProjectId(source.getProjectId()); entity.setProjectName(source.getProjectName()); entity.setDeptId(source.getDeptId()); entity.setDeptName(source.getDeptName()); entity.setContractId(source.getContractId()); entity.setContractNo(source.getContractNo()); entity.setContractName(source.getContractName()); entity.setPayerName(source.getPayerName()); entity.setPayeeName(source.getPayeeName()); entity.setSettlementAmount(source.getSettlementAmount()); entity.setPayableAmount(payableOfFormalSettlement(source.getId(), source.getSettlementAmount(), entity.getId())); entity.setBillType("正式结算单");
 			}
@@ -2146,6 +2203,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			|| !TransportBusiConstant.APPROVED.equals(item.getApprovalStatus()) || !"payable".equals(item.getSettlementType()))) {
 			throw new ServiceException("只能选择审批通过的应付正式结算单");
 		}
+		settlements.forEach(this::assertFormalSettlementPayable);
 		Long contractId = settlements.get(0).getContractId();
 		if (contractId == null || settlements.stream().anyMatch(item -> !Objects.equals(contractId, item.getContractId()))) {
 			throw new ServiceException("多选正式结算单必须属于同一合同");
@@ -2153,6 +2211,19 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		return settlements;
 	}
 
+	/**
+	 * 付款链路闸门：结算调整重推会把原单标记为已调整并冲销金蝶旧单，
+	 * 原单仅作存档，剩余应付口径归新单，此处拦截避免对已作废金额重复付款
+	 *
+	 * @param settlement 待付款的正式结算单
+	 */
+	private void assertFormalSettlementPayable(FormalSettlement settlement) {
+		if (TransportBusiConstant.SETTLEMENT_ADJUST_STATUS_ADJUSTED.equals(settlement.getAdjustStatus())) {
+			throw new ServiceException("结算单[" + Func.toStr(settlement.getFormalSettlementNo())
+				+ "]已因结算调整作废，不可再发起付款，请使用调整后的新单");
+		}
+	}
+
 	private boolean hasMultipleFormalReferences(PaymentApplicationSaveRequest request) {
 		return TransportBusiConstant.PAYMENT_TYPE_SETTLEMENT.equals(request.getPaymentType()) && request.getSettlementIds() != null
 			&& request.getSettlementIds().stream().filter(Objects::nonNull).distinct().count() > 1;
@@ -2293,10 +2364,18 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			.reduce(BigDecimal.ZERO, BigDecimal::add);
 		BigDecimal remainingApplied = money(entity.getAppliedAmount());
 		if (customAmounts) {
+			BigDecimal lineTotal = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
 			for (PreSettlement settlement : targetSettlements) {
 				BigDecimal payable = payableOfPreSettlement(settlement.getId(), settlement.getSettlementAmount(), entity.getId());
 				BigDecimal applied = this.specifiedAppliedAmount(lines, null, settlement.getId());
 				this.assertAppliedWithinPayable(settlement.getPreSettlementNo(), applied, payable);
+				lineTotal = lineTotal.add(applied);
+			}
+			// 推金蝶按付款基本信息中的申请付款金额，明细行金额合计不等时会导致预付建档分摊与金蝶金额不一致
+			BigDecimal appliedTotal = money(entity.getAppliedAmount()).setScale(2, RoundingMode.HALF_UP);
+			if (lineTotal.compareTo(appliedTotal) != 0) {
+				throw new ServiceException("预结算单付款明细金额合计[" + lineTotal.toPlainString()
+					+ "]必须等于申请付款金额[" + appliedTotal.toPlainString() + "]");
 			}
 		}
 		for (int index = 0; index < targetSettlements.size(); index++) {
@@ -2348,7 +2427,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		}
 	}
 
-	/** 前端传入结算行付款金额时，按行落库，不再要求合计等于申请付款金额。 */
+	/** 前端传入结算行付款金额时，按行落库（行金额合计须与申请付款金额一致，由调用方校验）。 */
 	private boolean useSpecifiedLineAmounts(List<PaymentApplicationSettlementLineRequest> lines) {
 		return lines != null && !lines.isEmpty();
 	}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PreSettlementServiceImpl.java

@@ -44,6 +44,7 @@ import org.springblade.transport.mapper.PreSettlementDetailMapper;
 import org.springblade.transport.mapper.PreSettlementMapper;
 import org.springblade.transport.mapper.PreSettlementSummaryFeeMapper;
 import org.springblade.transport.mapper.PaymentApplicationMapper;
+import org.springblade.transport.mapper.PaymentApplicationSettlementMapper;
 import org.springblade.transport.mapper.ReceivablePayableCargoFeeMapper;
 import org.springblade.transport.mapper.ReceivablePayableDetailMapper;
 import org.springblade.transport.pojo.dto.PreSettlementAdvanceRequest;
@@ -59,6 +60,7 @@ import org.springblade.transport.pojo.entity.PreSettlementDetail;
 import org.springblade.transport.pojo.entity.PreSettlementDetailFee;
 import org.springblade.transport.pojo.entity.PreSettlementSummaryFee;
 import org.springblade.transport.pojo.entity.PaymentApplication;
+import org.springblade.transport.pojo.entity.PaymentApplicationSettlement;
 import org.springblade.transport.pojo.entity.ProjectApply;
 import org.springblade.transport.pojo.entity.ReceivablePayableCargoFee;
 import org.springblade.transport.pojo.entity.ReceivablePayableDetail;
@@ -95,6 +97,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 预结算单服务实现类
@@ -118,6 +121,7 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 	private final PreSettlementSummaryFeeMapper summaryFeeMapper;
 	private final PreSettlementAdvanceMapper advanceMapper;
 	private final PaymentApplicationMapper paymentApplicationMapper;
+	private final PaymentApplicationSettlementMapper settlementRelationMapper;
 	private final PreSettlementChangeRecordMapper changeRecordMapper;
 	private final ReceivablePayableDetailMapper sourceDetailMapper;
 	private final ReceivablePayableCargoFeeMapper sourceFeeMapper;
@@ -140,21 +144,54 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 		Set<Long> preSettlementIds = records.stream().map(PreSettlementVO::getId)
 			.filter(Objects::nonNull).collect(Collectors.toSet());
 		if (preSettlementIds.isEmpty()) return;
-		List<PaymentApplication> applications = paymentApplicationMapper.selectList(
-			Wrappers.<PaymentApplication>lambdaQuery()
-				.select(PaymentApplication::getPreSettlementId, PaymentApplication::getAppliedAmount,
-					PaymentApplication::getPaidAmount)
-				.eq(PaymentApplication::getPaymentType, "progress_advance")
-				.in(PaymentApplication::getPreSettlementId, preSettlementIds)
-				.eq(PaymentApplication::getApprovalStatus, STATUS_APPROVED)
-				.eq(PaymentApplication::getIsDeleted, 0));
 		Map<Long, BigDecimal> appliedAmounts = new HashMap<>();
 		Map<Long, BigDecimal> paidAmounts = new HashMap<>();
-		applications.forEach(application -> {
+		// 多选预结算单时付款申请主表只存第一张，按关联行逐单归集；已付金额按关联行顺序分摊实付金额，
-			Long preSettlementId = application.getPreSettlementId();
+		// 与同步金蝶预付建档（syncPreSettlementAdvance）同一口径，避免第二张及之后的单据金额恒为0
-			appliedAmounts.merge(preSettlementId, money(application.getAppliedAmount()), BigDecimal::add);
+		List<PaymentApplicationSettlement> relations = settlementRelationMapper.selectList(
-			paidAmounts.merge(preSettlementId, money(application.getPaidAmount()), BigDecimal::add);
+			Wrappers.<PaymentApplicationSettlement>lambdaQuery()
-		});
+				.in(PaymentApplicationSettlement::getPreSettlementId, preSettlementIds)
+				.eq(PaymentApplicationSettlement::getIsDeleted, 0)
+				.orderByAsc(PaymentApplicationSettlement::getId));
+		Set<Long> relationPaymentIds = relations.stream()
+			.map(PaymentApplicationSettlement::getPaymentApplicationId).filter(Objects::nonNull)
+			.collect(Collectors.toSet());
+		Map<Long, PaymentApplication> relationPayments = relationPaymentIds.isEmpty() ? new HashMap<>()
+			: paymentApplicationMapper.selectBatchIds(relationPaymentIds).stream()
+			.filter(application -> !Objects.equals(application.getIsDeleted(), 1))
+			.filter(application -> TransportBusiConstant.APPROVED.equals(application.getApprovalStatus()))
+			.filter(application -> "progress_advance".equals(application.getPaymentType()))
+			.collect(Collectors.toMap(PaymentApplication::getId, Function.identity(), (left, right) -> left));
+		relations.stream()
+			.filter(relation -> relationPayments.containsKey(relation.getPaymentApplicationId()))
+			.collect(Collectors.groupingBy(PaymentApplicationSettlement::getPaymentApplicationId,
+				LinkedHashMap::new, Collectors.toList()))
+			.forEach((paymentId, paymentRelations) -> {
+				BigDecimal remainingPaid = money(relationPayments.get(paymentId).getPaidAmount());
+				for (int index = 0; index < paymentRelations.size(); index++) {
+					PaymentApplicationSettlement relation = paymentRelations.get(index);
+					BigDecimal applied = money(relation.getAppliedAmount());
+					BigDecimal paid = index == paymentRelations.size() - 1 ? remainingPaid
+						: applied.min(remainingPaid);
+					remainingPaid = remainingPaid.subtract(paid);
+					appliedAmounts.merge(relation.getPreSettlementId(), applied, BigDecimal::add);
+					paidAmounts.merge(relation.getPreSettlementId(), paid, BigDecimal::add);
+				}
+			});
+		// 历史仅写主表、无关联行的付款申请按主表兜底
+		paymentApplicationMapper.selectList(
+			Wrappers.<PaymentApplication>lambdaQuery()
+				.select(PaymentApplication::getId, PaymentApplication::getPreSettlementId,
+					PaymentApplication::getAppliedAmount, PaymentApplication::getPaidAmount)
+				.in(PaymentApplication::getPreSettlementId, preSettlementIds)
+				.eq(PaymentApplication::getPaymentType, "progress_advance")
+				.eq(PaymentApplication::getApprovalStatus, STATUS_APPROVED)
+				.eq(PaymentApplication::getIsDeleted, 0)
+				.notIn(!relationPaymentIds.isEmpty(), PaymentApplication::getId, relationPaymentIds))
+			.forEach(application -> {
+				appliedAmounts.merge(application.getPreSettlementId(), money(application.getAppliedAmount()), BigDecimal::add);
+				paidAmounts.merge(application.getPreSettlementId(), money(application.getPaidAmount()), BigDecimal::add);
+			});
 		records.forEach(record -> {
 			record.setAdvanceAppliedAmount(money(appliedAmounts.get(record.getId())));
 			record.setAdvancePaidAmount(money(paidAmounts.get(record.getId())));
@@ -233,13 +270,34 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 				.or().like(ContractManage::getContractNo, keyword))
 			.orderByDesc(ContractManage::getCreateTime);
 		List<ContractManage> contracts = contractManageService.list(wrapper).stream()
-			.filter(this::isAvailableContract).toList();
+			.filter(contract -> contract.getProjectId() != null
+				&& List.of("客户合同", "承运商合同").contains(contract.getContractCategory())
+				&& contractManageService.isUsableForSettlement(contract))
+			.toList();
+		if (contracts.isEmpty()) return List.of();
+		// 项目与客户均批量查询，避免逐条 N+1 查询导致接口超时
 		Set<Long> projectIds = contracts.stream().map(ContractManage::getProjectId)
-			.filter(Objects::nonNull).collect(Collectors.toSet());
+			.collect(Collectors.toSet());
-		Map<Long, ProjectApply> projectById = Func.isEmpty(projectIds) ? Map.of()
+		Map<Long, ProjectApply> projectById = projectApplyService.listByIds(projectIds).stream()
-			: projectApplyService.listByIds(projectIds).stream()
 			.collect(Collectors.toMap(ProjectApply::getId, Function.identity()));
-		return contracts.stream().map(contract -> {
+		Set<String> partyNames = contracts.stream()
+			.flatMap(contract -> Stream.of(contract.getPartyA(), contract.getPartyB()))
+			.filter(Func::isNotEmpty).collect(Collectors.toSet());
+		Set<String> approvedCustomers = customerArchiveService.list(Wrappers.<CustomerArchive>lambdaQuery()
+				.eq(CustomerArchive::getIsDeleted, 0)
+				.eq(CustomerArchive::getStatus, 1)
+				.eq(CustomerArchive::getApprovalStatus, "approved")
+				.in(CustomerArchive::getFullName, partyNames))
+			.stream().map(CustomerArchive::getFullName).collect(Collectors.toSet());
+		return contracts.stream()
+			.filter(contract -> {
+				ProjectApply project = projectById.get(contract.getProjectId());
+				return project != null && !Objects.equals(project.getIsDeleted(), 1)
+					&& List.of("approved", "change_approved").contains(project.getApprovalStatus())
+					&& approvedCustomers.contains(contract.getPartyA())
+					&& approvedCustomers.contains(contract.getPartyB());
+			})
+			.map(contract -> {
 			ProjectApply project = projectById.get(contract.getProjectId());
 			Map<String, Object> result = new LinkedHashMap<>();
 			result.put("id", contract.getId());
@@ -1347,19 +1405,6 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 		return contract;
 	}
 
-	private boolean isAvailableContract(ContractManage contract) {
-		if (!contractManageService.isUsableForSettlement(contract) || contract.getProjectId() == null
-			|| !List.of("客户合同", "承运商合同").contains(contract.getContractCategory())) {
-			return false;
-		}
-		org.springblade.transport.pojo.entity.ProjectApply project = projectApplyService.getById(contract.getProjectId());
-		if (project == null || Objects.equals(project.getIsDeleted(), 1)
-			|| !List.of("approved", "change_approved").contains(project.getApprovalStatus())) {
-			return false;
-		}
-		return isApprovedCustomer(contract.getPartyA()) && isApprovedCustomer(contract.getPartyB());
-	}
-
 	private Map<String, String> contractFeeTypeMap(Long contractId) {
 		ContractManage contract = contractId == null ? null : contractManageService.getById(contractId);
 		Map<String, String> result = new LinkedHashMap<>();

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java

@@ -195,7 +195,17 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl<ProjectApplyMapper,
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean submitApproval(Long id) {
-		ProjectApply projectApply = loadEditable(id, true);
+		ProjectApply projectApply = loadExists(id);
+		if (!canCurrentUserOperate(projectApply)) {
+			throw new ServiceException("无权操作其他组织项目立项");
+		}
+		// 已在审批中则幂等成功，避免「先 MK 后本地」时 sync 已写成 reviewing 再被编辑校验拦住
+		if (List.of(STATUS_REVIEWING, STATUS_CHANGE_REVIEWING).contains(projectApply.getApprovalStatus())) {
+			return true;
+		}
+		if (!List.of(STATUS_DRAFT, STATUS_WITHDRAWN, STATUS_REJECTED, "change_rejected").contains(projectApply.getApprovalStatus())) {
+			throw new ServiceException("当前状态不允许提交");
+		}
 		validateSubmit(projectApply);
 		projectApply.setApprovalStatus(STATUS_REVIEWING);
 		projectApply.setCurrentNode(resolveApprovalNode(projectApply));

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java

@@ -170,7 +170,17 @@ public class ProjectChangeServiceImpl extends BaseServiceImpl<ProjectChangeMappe
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean submitApproval(Long id) {
-		ProjectChange projectChange = loadEditable(id);
+		ProjectChange projectChange = loadExists(id);
+		if (!canCurrentUserOperate(projectChange)) {
+			throw new ServiceException("无权操作其他组织项目变更");
+		}
+		// 已在审批中则幂等成功，避免 MK 回写 reviewing 后再提交被编辑校验拦住
+		if (Objects.equals(projectChange.getApprovalStatus(), STATUS_REVIEWING)) {
+			return true;
+		}
+		if (!List.of(STATUS_DRAFT, STATUS_WITHDRAWN, STATUS_REJECTED).contains(projectChange.getApprovalStatus())) {
+			throw new ServiceException("当前状态不允许提交");
+		}
 		validateSubmit(projectChange);
 		projectChange.setApprovalStatus(STATUS_REVIEWING);
 		projectChange.setCurrentNode(resolveApprovalNode(projectChange));
@@ -188,7 +198,11 @@ public class ProjectChangeServiceImpl extends BaseServiceImpl<ProjectChangeMappe
 		String processor = TransportBusinessSupport.trimToNull(AuthUtil.getUserName());
 		projectChange.setCurrentProcessor(processor == null ? "系统" : processor);
 		projectChange.setApprovedTime(LocalDateTime.now());
-		projectChange.setSyncStatus(HcsSyncConstant.HCS_STATUS_UNSYNCED);
+		// 仅原项目已推送合规（有合规单据ID标识 hcs_fd_id）的变更单参与合规推送（C102-2），存量未推送项目不置同步状态
+		ProjectApply projectApply = projectApplyService.getById(projectChange.getProjectId());
+		if (projectApply != null && Func.isNotBlank(projectApply.getHcsFdId())) {
+			projectChange.setSyncStatus(HcsSyncConstant.HCS_STATUS_UNSYNCED);
+		}
 		updateById(projectChange);
 		projectApplyService.applyChangeFromRecord(projectChange);
 		return projectChange.getProjectId();
@@ -230,6 +244,20 @@ public class ProjectChangeServiceImpl extends BaseServiceImpl<ProjectChangeMappe
 		return deleteLogic(idList);
 	}
 
+	@Override
+	public boolean writeBackSyncStatus(Long projectId, String syncStatus) {
+		if (projectId == null) {
+			return false;
+		}
+		// 仅回写该项目最近一条审批通过且未同步/失败的变更单，历史已闭环单据不翻动
+		return update(Wrappers.<ProjectChange>lambdaUpdate()
+			.eq(ProjectChange::getProjectId, projectId)
+			.eq(ProjectChange::getApprovalStatus, STATUS_APPROVED)
+			.in(ProjectChange::getSyncStatus, List.of(HcsSyncConstant.HCS_STATUS_UNSYNCED, HcsSyncConstant.HCS_STATUS_FAILED))
+			.set(ProjectChange::getSyncStatus, syncStatus)
+			.last("order by approved_time desc limit 1"));
+	}
+
 	private LambdaQueryWrapper<ProjectChange> buildQuery(ProjectChangeVO projectChange) {
 		TransportBusinessSupport.validateAllDept(projectChange.getAllDept(), "项目变更");
 		LambdaQueryWrapper<ProjectChange> queryWrapper = Wrappers.<ProjectChange>lambdaQuery().eq(ProjectChange::getIsDeleted, 0);

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptClaimRecordServiceImpl.java

@@ -33,12 +33,6 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.thirdparty.bfi.constant.BfiConstant;
-import org.springblade.thirdparty.bfi.pojo.dto.BfiRecBillQueryDTO;
-import org.springblade.thirdparty.bfi.pojo.vo.BfiRecBillVO;
-import org.springblade.thirdparty.bfi.service.IBfiService;
-import org.springblade.thirdparty.bfi.util.BfiUtil;
-import org.springblade.transport.constant.KingdeeBfiConstant;
 import org.springblade.transport.mapper.FormalSettlementMapper;
 import org.springblade.transport.mapper.KingdeeReceiptFlowMapper;
 import org.springblade.transport.mapper.ReceiptClaimMapper;
@@ -53,20 +47,21 @@ import org.springblade.transport.pojo.entity.ReceiptFlowRecord;
 import org.springblade.transport.pojo.vo.ReceiptClaimRecordVO;
 import org.springblade.transport.service.IReceiptClaimRecordService;
 import org.springblade.transport.service.IFormalSettlementService;
+import org.springblade.transport.support.hcs.HcsClaimSyncSupport;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -84,21 +79,13 @@ public class ReceiptClaimRecordServiceImpl extends BaseServiceImpl<ReceiptClaimM
 	private static final String CLAIMED = "claimed";
 	private static final String VOIDED = "voided";
 	private static final String APPROVED = "approved";
-	/**
-	 * A301-1 收款单查询回看窗口天数（金蝶约束业务日期范围不可超过1个月）
-	 */
-	private static final int RESULT_WINDOW_DAYS = 30;
-	/**
-	 * A301-1 收款单查询分页大小
-	 */
-	private static final int RESULT_PAGE_SIZE = 200;
 
 	private final ReceiptClaimSettlementMapper claimSettlementMapper;
 	private final IFormalSettlementService formalSettlementService;
 	private final KingdeeReceiptFlowMapper receiptFlowMapper;
 	private final FormalSettlementMapper formalSettlementMapper;
 	private final ReceiptFlowRecordMapper recordMapper;
-	private final IBfiService bfiService;
+	private final HcsClaimSyncSupport hcsClaimSyncSupport;
 
 	@Override
 	public IPage<ReceiptClaimRecordVO> selectPage(IPage<ReceiptClaimRecordVO> page,
@@ -203,10 +190,6 @@ public class ReceiptClaimRecordServiceImpl extends BaseServiceImpl<ReceiptClaimM
 		if (flow == null || Objects.equals(flow.getIsDeleted(), 1)) {
 			throw new ServiceException("关联收款流水不存在");
 		}
-		// 已推送金蝶的认领不允许作废：金蝶收款单已生成，冲销/调整由人工在金蝶处置
-		if (KingdeeBfiConstant.RECEIPT_CLAIM_PUSH_PUSHED.equals(flow.getPushStatus())) {
-			throw new ServiceException("该认领已推送金蝶，不允许作废，请在金蝶侧人工处置");
-		}
 
 		List<ReceiptClaimSettlement> relations = claimSettlementMapper.selectList(
 			Wrappers.<ReceiptClaimSettlement>lambdaQuery()
@@ -256,9 +239,8 @@ public class ReceiptClaimRecordServiceImpl extends BaseServiceImpl<ReceiptClaimM
 		flow.setClaimStatus(amountClaimStatus(flowClaimedAfter, claimCeiling(flow)));
 		receiptFlowMapper.updateById(flow);
 
-		// 作废不生成金蝶认领冲单：金蝶单号/状态保留原值（未推送为空，已推送为真实收款单信息），
+		// 作废不生成金蝶认领冲单：金蝶单号/状态保留原值（金蝶收款单已在 A301-1 同步落库），
-		// 金蝶侧冲销/红冲由人工处置；冲单逻辑后续迭代如需恢复，放开下行调用即可
+		// 金蝶侧冲销/红冲由人工处置
-		// String kingdeeBillNo = buildKingdeeBillNo(claim.getId());
 		claim.setClaimStatus(VOIDED);
 		claim.setVoidedBy(AuthUtil.getUserId());
 		claim.setVoidedByName(Func.isEmpty(AuthUtil.getUserName()) ? claim.getClaimerName()
@@ -278,108 +260,14 @@ public class ReceiptClaimRecordServiceImpl extends BaseServiceImpl<ReceiptClaimM
 			: AuthUtil.getUserName());
 		operationRecord.setContent("作废认领，回退认领金额 " + money(claim.getClaimAmount()));
 		recordMapper.insert(operationRecord);
-	}
 
-	/**
+		// 作废事务提交后同步合规 C107-3（fdStatus=1 已作废，失败仅记日志不回滚作废）
-	 * A301-1 收款单查询回写认领结果：按来源单据编码匹配金蝶收款单，推进流水金蝶回写状态
+		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-	 * <p>
+			@Override
-	 * 回写口径：A301-1 契约本身不支持按来源单号过滤，故按近 30 天业务日期窗口全量翻页后，
+			public void afterCommit() {
-	 * 以金蝶收款单 sourcebillnumber == 流水 awrp_src_code（A301-3 推送时按流水生成、重试复用）在本地匹配；
+				hcsClaimSyncSupport.voidClaimToHcs(claim.getId());
-	 * 仅推进金蝶回写状态与补登收款单号，不改本地认领金额/分摊；名下未作废认领主单冗余展示字段级联刷新。
+			}
-	 *
-	 * @return 回写条数
-	 */
-	@Override
-	public int refreshKingdeeResult() {
-		List<KingdeeReceiptFlow> pending = receiptFlowMapper.selectList(
-			Wrappers.<KingdeeReceiptFlow>lambdaQuery()
-				.eq(KingdeeReceiptFlow::getPushStatus, KingdeeBfiConstant.RECEIPT_CLAIM_PUSH_PUSHED)
-				.in(KingdeeReceiptFlow::getKingdeeBillStatus,
-					List.of(KingdeeBfiConstant.KINGDEE_STATUS_PUSHED, APPROVED))
-				.eq(KingdeeReceiptFlow::getStatus, 1)
-				.orderByAsc(KingdeeReceiptFlow::getId));
-		if (pending.isEmpty()) {
-			log.info("金蝶认领结果回写：无待回写流水（已推送/已审核且未终态）");
-			return 0;
-		}
-		Set<String> srcCodes = pending.stream()
-			.map(KingdeeReceiptFlow::getAwrpSrcCode)
-			.filter(Func::isNotEmpty)
-			.collect(Collectors.toSet());
-		if (srcCodes.isEmpty()) {
-			return 0;
-		}
-		log.info("金蝶认领结果回写：待回写流水 {} 条", pending.size());
-
-		LocalDate end = LocalDate.now();
-		LocalDate begin = end.minusDays(RESULT_WINDOW_DAYS);
-		long start = System.currentTimeMillis();
-		log.info("调用BFI接口 收款单查询开始，业务日期窗口 {} ~ {}", begin, end);
-		List<BfiRecBillVO> rows = BfiUtil.queryAllPages(pageNo -> {
-			BfiRecBillQueryDTO dto = new BfiRecBillQueryDTO();
-			dto.setPageNo(pageNo);
-			dto.setPageSize(RESULT_PAGE_SIZE);
-			dto.setBeginBizdate(begin.format(DateTimeFormatter.ISO_LOCAL_DATE));
-			dto.setEndBizdate(end.format(DateTimeFormatter.ISO_LOCAL_DATE));
-			return bfiService.queryRecBill(dto);
 		});
-		log.info("调用BFI接口 收款单查询结束 耗时：{}ms，拉取 {} 条", System.currentTimeMillis() - start, rows.size());
-
-		// 窗口内收款单按 sourcebillnumber 匹配待回写来源编码，同键多单取首条
-		Map<String, BfiRecBillVO> matched = rows.stream()
-			.filter(row -> Func.isNotEmpty(row.getSourcebillnumber()))
-			.filter(row -> srcCodes.contains(row.getSourcebillnumber()))
-			.collect(Collectors.toMap(BfiRecBillVO::getSourcebillnumber, Function.identity(),
-				(first, second) -> first, HashMap::new));
-		int updated = 0;
-		for (KingdeeReceiptFlow flow : pending) {
-			BfiRecBillVO bill = matched.get(flow.getAwrpSrcCode());
-			if (bill == null) {
-				// 窗口内未查到：金蝶回单延迟/状态未同步，不改状态，由下次回写或人工处置兜底
-				continue;
-			}
-			// 推送成功时金蝶收款单号先以来源编码占位（A301-3 响应 number 为空，取回执 keys.awrp_src_code），
-			// 回写命中后以金蝶真实收款单号覆盖
-			if (Func.isNotEmpty(bill.getBillno())) {
-				flow.setKingdeeBillNo(bill.getBillno());
-			}
-			flow.setKingdeeBillStatus(billStatusOf(bill.getBillstatus()));
-			receiptFlowMapper.updateById(flow);
-			// 级联刷新名下未作废认领主单的冗余展示字段
-			baseMapper.update(null, Wrappers.<ReceiptClaim>lambdaUpdate()
-				.eq(ReceiptClaim::getReceiptFlowId, flow.getId())
-				.eq(ReceiptClaim::getClaimStatus, CLAIMED)
-				.set(ReceiptClaim::getKingdeeBillNo, flow.getKingdeeBillNo())
-				.set(ReceiptClaim::getKingdeeBillStatus, flow.getKingdeeBillStatus()));
-			updated++;
-			log.info("金蝶认领结果回写 flowId：{}，awrpSrcCode：{}，金蝶收款单号：{}，状态：{} → {}",
-				flow.getId(), flow.getAwrpSrcCode(), bill.getBillno(), bill.getBillstatus(),
-				flow.getKingdeeBillStatus());
-		}
-		log.info("金蝶认领结果回写完成：匹配 {} 条，更新 {} 条", matched.size(), updated);
-		return updated;
-	}
-
-	/**
-	 * 金蝶收款单单据状态 → 本地认领金蝶状态
-	 *
-	 * @param billStatus 金蝶 billstatus（A暂存/B已提交/C已审核/D已收款/G已退单）
-	 * @return 本地状态
-	 */
-	private String billStatusOf(String billStatus) {
-		if (BfiConstant.BILL_STATUS_RECEIVED.equals(billStatus)) {
-			return KingdeeBfiConstant.KINGDEE_STATUS_RECEIVED;
-		}
-		if (BfiConstant.BILL_STATUS_AUDITED.equals(billStatus)) {
-			return APPROVED;
-		}
-		if (BfiConstant.BILL_STATUS_DRAFT.equals(billStatus)
-			|| BfiConstant.BILL_STATUS_SUBMITTED.equals(billStatus)) {
-			return KingdeeBfiConstant.KINGDEE_STATUS_PUSHED;
-		}
-		// 其余状态（含 G 已退单）按处理失败回收，提示人工在金蝶核查
-		log.warn("金蝶收款单状态[{}]未匹配映射，认领回写按 failed 处理", billStatus);
-		return KingdeeBfiConstant.KINGDEE_STATUS_FAILED;
 	}
 
 	private void fillStatusNames(ReceiptClaimRecordVO record) {
@@ -399,17 +287,6 @@ public class ReceiptClaimRecordServiceImpl extends BaseServiceImpl<ReceiptClaimM
 		return VOIDED.equals(claimStatus) ? VOIDED : CLAIMED;
 	}
 
-	/**
-	 * 生成本地金蝶认领冲单号（KDCX + 时间戳 + 认领id尾号6位）。
-	 * 当前作废流程不生成冲单（调用点已注释保留），后续迭代接金蝶冲销时放开即可。
-	 */
-	@SuppressWarnings("unused")
-	private String buildKingdeeBillNo(Long claimId) {
-		String time = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now());
-		String suffix = String.valueOf(claimId);
-		return "KDCX" + time + suffix.substring(Math.max(0, suffix.length() - 6));
-	}
-
 	/**
 	 * 累计认领金额 → 流水认领状态：对照可认领上限判定（与收款流水侧口径一致）
 	 */
@@ -421,18 +298,11 @@ public class ReceiptClaimRecordServiceImpl extends BaseServiceImpl<ReceiptClaimM
 	}
 
 	/**
-	 * 可认领上限：公告未认领金额与收款金额取较小正值（与收款流水侧口径一致）
+	 * 可认领上限：收款金额（A301-1 actrecamt，与收款流水侧口径一致）。
+	 * 认领只登记本地，额度由本地累计认领控制，金蝶未匹配金额不参与。
 	 */
 	private BigDecimal claimCeiling(KingdeeReceiptFlow flow) {
-		BigDecimal unclaimed = money(flow.getUnclaimedAmount());
+		return money(flow.getReceiptAmount());
-		BigDecimal receipt = money(flow.getReceiptAmount());
-		if (receipt.compareTo(BigDecimal.ZERO) <= 0) {
-			return unclaimed;
-		}
-		if (unclaimed.compareTo(BigDecimal.ZERO) <= 0) {
-			return unclaimed;
-		}
-		return unclaimed.min(receipt);
 	}
 
 	private String amountStatus(BigDecimal paidAmount, BigDecimal settlementAmount) {

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java

@@ -38,12 +38,9 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.SysCache;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.pojo.entity.Dept;
-import org.springblade.thirdparty.bfi.pojo.dto.BfiClaimAnnounceQueryDTO;
+import org.springblade.thirdparty.bfi.pojo.dto.BfiRecBillQueryDTO;
-import org.springblade.thirdparty.bfi.pojo.dto.BfiClaimPushDTO;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiPageVO;
-import org.springblade.thirdparty.bfi.pojo.dto.BfiClaimPushEntryDTO;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiRecBillVO;
-import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultItemVO;
-import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultVO;
-import org.springblade.thirdparty.bfi.pojo.vo.BfiClaimAnnounceVO;
 import org.springblade.thirdparty.bfi.service.IBfiService;
 import org.springblade.thirdparty.bfi.util.BfiUtil;
 import org.springblade.transport.config.BfiProperties;
@@ -53,7 +50,6 @@ import org.springblade.transport.mapper.KingdeeReceiptFlowMapper;
 import org.springblade.transport.mapper.ReceiptClaimMapper;
 import org.springblade.transport.mapper.ReceiptClaimSettlementMapper;
 import org.springblade.transport.mapper.ReceiptFlowRecordMapper;
-import org.springblade.transport.pojo.dto.ReceiptClaimPushResult;
 import org.springblade.transport.pojo.dto.ReceiptClaimRequest;
 import org.springblade.transport.pojo.entity.FormalSettlement;
 import org.springblade.transport.pojo.entity.KingdeeReceiptFlow;
@@ -63,12 +59,13 @@ import org.springblade.transport.pojo.entity.ReceiptFlowRecord;
 import org.springblade.transport.pojo.vo.ReceiptFlowVO;
 import org.springblade.transport.service.IFormalSettlementService;
 import org.springblade.transport.service.IReceiptFlowService;
-import org.springblade.transport.support.KingdeeSyncLockSupport;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.support.hcs.HcsClaimSyncSupport;
 import org.springblade.transport.wrapper.ReceiptFlowWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import java.math.BigDecimal;
@@ -77,7 +74,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -109,18 +105,23 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 	// 应收款
 	private static final String RECEIVABLE = "receivable";
 	/**
-	 * A301-2 认领公告同步分页大小
+	 * A301-1 收款单查询分页大小
 	 */
 	private static final int SYNC_PAGE_SIZE = 200;
 	/**
-	 * A301-2 交易时间格式
+	 * 同步分批入库批次大小：累计满一批即独立事务入库，避免全量驻留内存
+	 */
+	private static final int SYNC_BATCH_SIZE = 5000;
+	/**
+	 * A301-1 单片翻页最大页数保护（200条/页 × 500页）：触顶说明该时间片数据超过单查询窗口上限，
+	 * 由 BfiUtil 二分切片续扫保证尾部不漏
+	 */
+	private static final int SYNC_MAX_PAGES = 500;
+	/**
+	 * A301-1 业务日期时间格式（请求参数与返回 bizdate 均为 yyyy-MM-dd HH:mm:ss）
 	 */
 	private static final DateTimeFormatter BFI_DATE_TIME_FORMATTER =
 		DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-	/**
-	 * 定时推送收款认领 single-flight 锁键前缀（多副本定时任务共用）
-	 */
-	private static final String RECEIPT_CLAIM_PUSH_LOCK_PREFIX = "transport:receipt-flow:kingdee-claim-push:";
 
 	private final ReceiptClaimMapper claimMapper;
 	private final ReceiptClaimSettlementMapper claimSettlementMapper;
@@ -130,7 +131,6 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 	private final IBfiService bfiService;
 	private final BfiProperties bfiProperties;
 	private final TransactionTemplate transactionTemplate;
-	private final KingdeeSyncLockSupport kingdeeSyncLockSupport;
 	private final HcsClaimSyncSupport hcsClaimSyncSupport;
 
 	@Override
@@ -316,9 +316,6 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 
 		// 收款流水
 		KingdeeReceiptFlow flow = lockedFlow(request.getFlowId());
-		if (flow.getBillId() == null) {
-			throw new ServiceException("认领公告id缺失，请先手动同步金蝶收款流水");
-		}
 		// 结算单id → 分摊金额
 		Map<Long, BigDecimal> allocationMap = allocationMap(request.getSettlements());
 		// 结算单id列表（升序）
@@ -347,10 +344,7 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 			allocatedTotal = allocatedTotal.add(allocated);
 		}
 
-		// 认领上限：公告未认领金额与收款金额取较小值（避免未认领金额异常偏大导致无法认领完成）
+		// 认领上限：收款金额（认领只登记本地，额度由本地累计认领控制，金蝶侧匹配状态不参与）
-		if (flow.getUnclaimedAmount() == null) {
-			throw new ServiceException("公告未认领金额缺失，请先手动同步金蝶收款流水");
-		}
 		BigDecimal claimCeiling = claimCeiling(flow);
 		if (claimCeiling.compareTo(BigDecimal.ZERO) <= 0) {
 			throw new ServiceException("该流水可认领金额为0，无需认领");
@@ -386,8 +380,9 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		claim.setRemark(trimToNull(request.getRemark()));
 		// 认领状态
 		claim.setClaimStatus(CLAIMED);
-		// 金蝶回写状态（待推送）
+		// 金蝶收款单号/状态（冗余展示：A301-1 同步落库的单据信息）
-		claim.setKingdeeBillStatus(KingdeeBfiConstant.RECEIPT_CLAIM_BILL_NONE);
+		claim.setKingdeeBillNo(flow.getKingdeeBillNo());
+		claim.setKingdeeBillStatus(flow.getKingdeeBillStatus());
 		claimMapper.insert(claim);
 
 		for (FormalSettlement settlement : settlements) {
@@ -436,149 +431,241 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		record(flow.getId(), claim.getId(), "claim", "认领收款流水", fromStatus, toStatus,
 			allocatedTotal, "关联" + settlements.size() + "张应收正式结算单");
 
-		// 认领只登记本地，不推送金蝶；推送由定时任务/手动按钮在认领完成后触发
+		// 认领只登记本地，不推送金蝶；事务提交后按认领主单推送合同合规（C103-9/C107-1/C108-1，失败仅落标记）
+		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+			@Override
+			public void afterCommit() {
+				hcsClaimSyncSupport.pushClaimToHcs(claim.getId());
+			}
+		});
 		return claim.getId();
 	}
 
+	/**
+	 * 手动同步金蝶收款流水：直连 A301-1 收款单查询，收款单主单粒度、以金蝶收款单号为幂等键 upsert；
+	 * 数据量大，时间窗口二分切片续扫（BfiUtil.forEachWindowSlice）：单片触顶自动二分续扫，
+	 * 总覆盖不受单查询窗口上限约束，尾部不漏；累计满一批（5000 条流水行）即独立事务入库一批，
+	 * 不全量驻留内存
+	 *
+	 * @return 本次同步条数（新增+更新）
+	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public int sync() {
-		String claimusers = UserCache.getUserRealName(AuthUtil.getUserId());
+		int days = bfiProperties.getRecBillSync().getDays();
-		if (Func.isEmpty(claimusers)) {
+		LocalDate endDate = LocalDate.now();
-			throw new ServiceException("当前用户无姓名，无法同步金蝶认领公告");
+		LocalDate startDate = endDate.minusDays(days);
+		// 金蝶 A301-1 仅接受带时分秒的日期参数，传纯日期会报 bos.filterSqlBuilder 时区时间格式错误
+		LocalDateTime windowStart = startDate.atStartOfDay();
+		LocalDateTime windowEnd = endDate.atTime(23, 59, 59);
+		log.info("收款流水同步开始，业务日期窗口：{} ~ {}（近{}天）",
+			windowStart.format(BFI_DATE_TIME_FORMATTER), windowEnd.format(BFI_DATE_TIME_FORMATTER), days);
+		long start = System.currentTimeMillis();
+		// 同步口径：按业务日期窗口拉取金蝶收款单（收款处理），以金蝶明细流水号为幂等键 upsert 收款流水表；
+		// 本地已认领金额/状态（claimedAmount/claimStatus）由认领、作废驱动，不被同步顺带覆盖，
+		// 未匹配收款金额单独存 unmatch_amount_rec，仅作金蝶参考展示，不参与认领额度。
+		// 按组织过滤：组织管理（blade_dept）中平台公司（是否平台公司=是）且已维护金蝶编码的组织
+		List<String> orgNumbers = baseMapper.selectPlatformOrgNumbers();
+		if (Func.isEmpty(orgNumbers)) {
+			throw new ServiceException("组织管理中未维护平台公司金蝶编码，无法同步金蝶收款流水，请先检查组织数据");
 		}
-		List<BfiClaimAnnounceVO> announces = queryClaimAnnounces(claimusers);
+		log.info("收款流水同步按组织过滤，组织编码：{}", orgNumbers);
-
+		RecBillSyncState state = new RecBillSyncState();
-		if (announces.isEmpty()) {
+		state.sliceCount += BfiUtil.forEachWindowSlice("收款流水同步", windowStart, windowEnd,
-			record(null, null, "sync", "手动同步流水", null, null, BigDecimal.ZERO,
+			SYNC_PAGE_SIZE, SYNC_MAX_PAGES,
-				"金蝶认领公告未查询到数据");
+			(sliceStart, sliceEnd, pageNo) -> this.pullRecBillPage(sliceStart, sliceEnd, orgNumbers, pageNo),
-			return 0;
+			rows -> this.handleRecBillPage(rows, state));
+		// 尾批不足 SYNC_BATCH_SIZE 的剩余入库
+		if (!state.pending.isEmpty()) {
+			state.batchNo++;
+			state.totalCount += this.syncBatch(state.batchNo, state.pending);
+			state.pending.clear();
+			state.batchSerials.clear();
 		}
+		if (state.pullCount == 0) {
+			this.record(null, null, "sync", "手动同步流水", null, null, BigDecimal.ZERO,
+				"金蝶收款单未查询到数据");
+		} else if (state.totalCount == 0) {
+			this.record(null, null, "sync", "手动同步流水", null, null, BigDecimal.ZERO,
+				"金蝶收款单无有效数据");
+		}
+		log.info("金蝶收款流水同步完成，翻页{}页切片{}片，拉取收款单 {} 张，新增/更新 {} 条，跳过 {} 条，"
+				+ "分 {} 批入库，耗时 {}ms",
+			state.pageCount, state.sliceCount, state.pullCount, state.totalCount, state.skippedCount,
+			state.batchNo, System.currentTimeMillis() - start);
+		return state.totalCount;
+	}
 
-		// 同步口径：A301-2 按参与认领用户（当前登录用户真实姓名）拉取全量认领公告，
+	/**
-		// 以金蝶明细流水号为幂等键 upsert 收款流水表；本地已认领金额/状态（claimedAmount/claimStatus）
+	 * A301-1 按业务日期时间片分页拉取（组织编码过滤整轮共享，切片起止由 BfiUtil 二分传入）
-		// 由认领、作废驱动，不被公告顺带覆盖，公告侧状态单独存 kingdee_claim_status/unclaimed_amount。
+	 *
+	 * @param sliceStart 切片起点（含）
+	 * @param sliceEnd   切片终点（含）
+	 * @param orgNumbers 平台公司组织编码集
+	 * @param pageNo     页码，从 1 开始
+	 * @return 分页结果
+	 */
+	private BfiPageVO<BfiRecBillVO> pullRecBillPage(LocalDateTime sliceStart, LocalDateTime sliceEnd,
+		List<String> orgNumbers, int pageNo) {
+		BfiRecBillQueryDTO queryDTO = new BfiRecBillQueryDTO();
+		queryDTO.setPageNo(pageNo);
+		queryDTO.setPageSize(SYNC_PAGE_SIZE);
+		queryDTO.setBeginBizdate(sliceStart.format(BFI_DATE_TIME_FORMATTER));
+		queryDTO.setEndBizdate(sliceEnd.format(BFI_DATE_TIME_FORMATTER));
+		queryDTO.setOrgNumber(orgNumbers);
+		return bfiService.queryRecBill(queryDTO);
+	}
 
-		// 第一遍：数据校验与过滤，收集有效的 detailSerialNo
+	/**
-		log.info("收款流水同步开始数据校验，共 {} 条认领公告", announces.size());
+	 * A301-1 单页数据处理：收款单主单粒度逐行校验入缓冲，累计满一批即独立事务入库。
-		Map<String, BfiClaimAnnounceVO> validAnnounces = new LinkedHashMap<>();
+	 * 切片边界同秒的收款单可能在相邻两片各拉一次，按批内收款单号去重幂等跳过，不重不漏
-		int skippedCount = 0;
+	 *
-		for (BfiClaimAnnounceVO announce : announces) {
+	 * @param rows  本页拉取的收款单
-			// 明细流水号优先级：detailid > tradedetailno > bankdetailno
+	 * @param state 整轮同步状态（待入库缓冲与统计累加）
-			String detailSerialNo = firstNonBlank(announce.getDetailid(),
+	 */
-				announce.getTradedetailno(), announce.getBankdetailno());
+	private void handleRecBillPage(List<BfiRecBillVO> rows, RecBillSyncState state) {
+		state.pageCount++;
+		state.pullCount += rows.size();
+		for (BfiRecBillVO recBill : rows) {
+			// 主单粒度：一张收款单一条流水，不展开流水分录；明细流水号取收款单号（幂等键，C104-2 按此定位合规流水）
+			String detailSerialNo = trimToEmpty(recBill.getBillno());
 			if (Func.isEmpty(detailSerialNo)) {
-				log.warn("收款流水同步跳过：认领公告[{}]缺少明细流水号", announce.getBillno());
+				log.warn("收款流水同步跳过：收款单缺少单号");
-				skippedCount++;
+				state.skippedCount++;
 				continue;
 			}
-			detailSerialNo = detailSerialNo.trim();
+			if (!state.batchSerials.add(detailSerialNo)) {
-			if (validAnnounces.containsKey(detailSerialNo)) {
+				// 切片边界重复拉取或同批脏数据重复单号，幂等跳过（upsert 本就按单号幂等）
-				throw new ServiceException("明细流水号" + detailSerialNo + "重复");
+				log.warn("收款流水同步跳过：收款单[{}]本批已拉取，跳过重复处理", detailSerialNo);
+				state.skippedCount++;
+				continue;
 			}
-			BigDecimal receiptAmount = money(announce.getReamount());
+			// 收款金额取主单 actrecamt（金蝶收款金额口径）
+			BigDecimal receiptAmount = money(recBill.getActrecamt());
 			if (receiptAmount.compareTo(BigDecimal.ZERO) <= 0) {
-				log.warn("收款流水同步跳过：认领公告[{}]收款金额为空或小于0", announce.getBillno());
+				// log.warn("收款流水同步跳过：收款单[{}]收款金额（actrecamt）为空或小于0", recBill.getBillno());
-				skippedCount++;
+				state.skippedCount++;
 				continue;
 			}
-			validAnnounces.put(detailSerialNo, announce);
+			state.pending.add(new BfiRecBillRow(recBill, detailSerialNo, receiptAmount));
-		}
+			if (state.pending.size() >= SYNC_BATCH_SIZE) {
-		log.info("收款流水数据校验完成：有效 {} 条，跳过 {} 条", validAnnounces.size(), skippedCount);
+				state.batchNo++;
-
+				state.totalCount += this.syncBatch(state.batchNo, state.pending);
-		if (validAnnounces.isEmpty()) {
+				state.pending.clear();
-			log.info("收款流水同步无有效数据，记录操作日志后返回");
+				state.batchSerials.clear();
-			record(null, null, "sync", "手动同步流水", null, null, BigDecimal.ZERO,
-				"金蝶认领公告无有效数据");
-			return 0;
-		}
-
-		// 批量查询已存在的记录（FOR UPDATE 防并发）
-		log.info("收款流水同步开始批量查询已存在记录，查询条件：detailSerialNo IN {} 条", validAnnounces.size());
-		List<KingdeeReceiptFlow> existingEntities = baseMapper.selectList(
-			Wrappers.<KingdeeReceiptFlow>lambdaQuery()
-				.in(KingdeeReceiptFlow::getDetailSerialNo, validAnnounces.keySet())
-				.last("FOR UPDATE")
-		);
-		Map<String, KingdeeReceiptFlow> existingMap = existingEntities.stream()
-			.collect(Collectors.toMap(KingdeeReceiptFlow::getDetailSerialNo, e -> e));
-		log.info("收款流水批量查询完成：已存在 {} 条，待新增 {} 条",
-			existingEntities.size(), validAnnounces.size() - existingEntities.size());
-
-		// 第二遍：构建新增和更新列表
-		log.info("收款流水同步开始构建新增/更新列表");
-		List<KingdeeReceiptFlow> toInsert = new ArrayList<>();
-		List<KingdeeReceiptFlow> toUpdate = new ArrayList<>();
-		int createdCount = 0;
-		int updatedCount = 0;
-
-		for (Map.Entry<String, BfiClaimAnnounceVO> entry : validAnnounces.entrySet()) {
-			String detailSerialNo = entry.getKey();
-			BfiClaimAnnounceVO announce = entry.getValue();
-			BigDecimal receiptAmount = money(announce.getReamount());
-
-			// 判断是新增还是更新
-			KingdeeReceiptFlow existing = existingMap.get(detailSerialNo);
-			boolean created = (existing == null);
-
-			KingdeeReceiptFlow entity;
-			if (created) {
-				// 新增：初始化本地认领金额和状态
-				entity = new KingdeeReceiptFlow();
-				entity.setClaimedAmount(BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
-				entity.setClaimStatus(UNCLAIMED);
-			} else {
-				// 更新：保留本地已认领金额和状态
-				entity = existing;
-			}
-
-			// 复制公告数据到实体（不覆盖本地认领字段）
-			copyAnnounceRow(entity, announce, detailSerialNo, receiptAmount);
-			// 根据本地累计认领金额与可认领上限重新计算认领状态
-			entity.setClaimStatus(amountClaimStatus(money(entity.getClaimedAmount()),
-				claimCeiling(entity)));
-
-			if (created) {
-				toInsert.add(entity);
-				createdCount++;
-			} else {
-				toUpdate.add(entity);
-				updatedCount++;
 			}
 		}
-		log.info("收款流水列表构建完成：待新增 {} 条，待更新 {} 条", createdCount, updatedCount);
+	}
 
-		// 批量插入和更新
+	/**
-		if (!toInsert.isEmpty()) {
+	 * 单批入库（独立事务）：批内 FOR UPDATE 防并发，按明细流水号 upsert，操作日志批量落库
-			log.info("收款流水同步开始批量插入 {} 条", toInsert.size());
+	 *
-			saveBatch(toInsert);
+	 * @param batchNo 批次号（日志用）
-			log.info("收款流水批量插入完成");
+	 * @param rows    本批流水行
-		}
+	 * @return 本批新增+更新条数
-		if (!toUpdate.isEmpty()) {
+	 */
-			log.info("收款流水同步开始批量更新 {} 条", toUpdate.size());
+	private int syncBatch(int batchNo, List<BfiRecBillRow> rows) {
-			updateBatchById(toUpdate);
+		Integer count = transactionTemplate.execute(status -> {
-			log.info("收款流水批量更新完成");
+			// 批量查询已存在的记录（FOR UPDATE 防并发）
-		}
+			Map<String, KingdeeReceiptFlow> existingMap = baseMapper.selectList(
+					Wrappers.<KingdeeReceiptFlow>lambdaQuery()
+						.in(KingdeeReceiptFlow::getDetailSerialNo,
+							rows.stream().map(BfiRecBillRow::detailSerialNo).toList())
+						.last("FOR UPDATE"))
+				.stream().collect(Collectors.toMap(KingdeeReceiptFlow::getDetailSerialNo, e -> e));
+			List<KingdeeReceiptFlow> toInsert = new ArrayList<>();
+			List<KingdeeReceiptFlow> toUpdate = new ArrayList<>();
+			for (BfiRecBillRow row : rows) {
+				KingdeeReceiptFlow existing = existingMap.get(row.detailSerialNo());
+				boolean created = (existing == null);
+				KingdeeReceiptFlow entity;
+				if (created) {
+					// 新增：初始化本地认领金额和状态
+					entity = new KingdeeReceiptFlow();
+					entity.setClaimedAmount(BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
+					entity.setClaimStatus(UNCLAIMED);
+				} else {
+					// 更新：保留本地已认领金额和状态
+					entity = existing;
+				}
+				// 复制收款单数据到实体（不覆盖本地认领字段）
+				copyRecBillRow(entity, row);
+				// 根据本地累计认领金额与可认领上限重新计算认领状态
+				entity.setClaimStatus(amountClaimStatus(money(entity.getClaimedAmount()),
+					claimCeiling(entity)));
+				if (created) {
+					toInsert.add(entity);
+				} else {
+					toUpdate.add(entity);
+				}
+			}
+			if (!toInsert.isEmpty()) {
+				saveBatch(toInsert);
+			}
+			if (!toUpdate.isEmpty()) {
+				updateBatchById(toUpdate);
+			}
+			// 记录操作日志（批量插入，避免逐行 N+1）
+			List<ReceiptFlowRecord> records = new ArrayList<>(toInsert.size() + toUpdate.size());
+			for (KingdeeReceiptFlow entity : toInsert) {
+				records.add(buildRecord(entity.getId(), null, "sync", "新增金蝶收款流水",
+					entity.getClaimStatus(), entity.getClaimStatus(), BigDecimal.ZERO, entity.getDetailSerialNo()));
+			}
+			for (KingdeeReceiptFlow entity : toUpdate) {
+				records.add(buildRecord(entity.getId(), null, "sync", "更新金蝶收款流水",
+					entity.getClaimStatus(), entity.getClaimStatus(), BigDecimal.ZERO, entity.getDetailSerialNo()));
+			}
+			if (!records.isEmpty()) {
+				Db.saveBatch(records);
+			}
+			return toInsert.size() + toUpdate.size();
+		});
+		log.info("收款流水同步第 {} 批入库完成，本批 {} 条", batchNo, count == null ? 0 : count);
+		return count == null ? 0 : count;
+	}
 
-		// 记录操作日志（批量插入，避免逐行 N+1）
+	/**
-		log.info("收款流水同步开始记录操作日志，共 {} 条", toInsert.size() + toUpdate.size());
+	 * A301-1 收款单查询返回的收款单 + 流水分录展开行（同步过程传递用）
-		List<ReceiptFlowRecord> records = new ArrayList<>(toInsert.size() + toUpdate.size());
+	 */
-		for (KingdeeReceiptFlow entity : toInsert) {
+	private record BfiRecBillRow(BfiRecBillVO recBill,
-			records.add(buildRecord(entity.getId(), null, "sync", "新增金蝶收款流水",
+								 String detailSerialNo, BigDecimal receiptAmount) {
-				entity.getClaimStatus(), entity.getClaimStatus(), BigDecimal.ZERO, entity.getDetailSerialNo()));
+	}
-		}
-		for (KingdeeReceiptFlow entity : toUpdate) {
-			records.add(buildRecord(entity.getId(), null, "sync", "更新金蝶收款流水",
-				entity.getClaimStatus(), entity.getClaimStatus(), BigDecimal.ZERO, entity.getDetailSerialNo()));
-		}
-		if (!records.isEmpty()) {
-			Db.saveBatch(records);
-		}
-		log.info("收款流水操作日志记录完成");
 
-		log.info("金蝶收款流水同步完成 claimusers：{}，拉取 {} 条，新增 {} 条，更新 {} 条",
+	/**
-			claimusers, announces.size(), createdCount, updatedCount);
+	 * 收款流水整轮同步状态：待入库缓冲与统计累加（各切片共享，结束进日志摘要）
-		return createdCount + updatedCount;
+	 */
+	private static final class RecBillSyncState {
+		/**
+		 * 待入库缓冲：累计满 SYNC_BATCH_SIZE 即入库一批并清空
+		 */
+		final List<BfiRecBillRow> pending = new ArrayList<>();
+		/**
+		 * 批内收款单号去重（含切片边界重复拉取）
+		 */
+		final Set<String> batchSerials = new HashSet<>();
+		/**
+		 * A301-1 原始拉取收款单张数
+		 */
+		int pullCount;
+		/**
+		 * 跳过条数（缺单号/金额异常/重复拉取）
+		 */
+		int skippedCount;
+		/**
+		 * 新增+更新条数
+		 */
+		int totalCount;
+		/**
+		 * 已入库批次数
+		 */
+		int batchNo;
+		/**
+		 * 实际处理的翻页总页数
+		 */
+		int pageCount;
+		/**
+		 * 实际处理的切片数
+		 */
+		int sliceCount;
 	}
 
 	private Map<String, Object> candidateRow(FormalSettlement settlement, BigDecimal claimedAmount) {
@@ -724,19 +811,12 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 	}
 
 	/**
-	 * 可认领上限：公告未认领金额与收款金额取较小正值。
+	 * 可认领上限：收款金额（A301-1 actrecamt）。
-	 * 主口径仍为 A301-2 公告未认领金额；与收款金额取 min，避免未认领金额异常偏大导致无法进入「认领完成」。
+	 * 认领只登记本地并推合同合规，与金蝶侧收款单匹配（核销）状态无关；
+	 * 金蝶未匹配收款金额（unmatchamountrec）仅作参考展示，不参与额度控制。
 	 */
 	private BigDecimal claimCeiling(KingdeeReceiptFlow flow) {
-		BigDecimal unclaimed = money(flow.getUnclaimedAmount());
+		return money(flow.getReceiptAmount());
-		BigDecimal receipt = money(flow.getReceiptAmount());
-		if (receipt.compareTo(BigDecimal.ZERO) <= 0) {
-			return unclaimed;
-		}
-		if (unclaimed.compareTo(BigDecimal.ZERO) <= 0) {
-			return unclaimed;
-		}
-		return unclaimed.min(receipt);
 	}
 
 	private Long toLong(Object value) {
@@ -774,405 +854,72 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 	}
 
 	/**
-	 * 手动推送金蝶（A301-3 收款认领结果推送）
+	 * A301-1 收款单 → 收款流水表字段拷贝（仅覆盖金蝶侧来源字段，不覆盖本地认领金额与状态）。
-	 * <p>
+	 * 金蝶匹配/结算金额原样落库仅作参考，不参与认领额度控制。
-	 * 仅认领完成且未推送过的流水可推送；推送前以当前用户姓名重查 A301-2 最新公告对账。
-	 * 推送失败不抛异常跨事务边界（保证失败状态落库），原因随结果对象返回。
 	 */
-	@Override
+	private void copyRecBillRow(KingdeeReceiptFlow target, BfiRecBillRow row) {
-	public ReceiptClaimPushResult pushClaimToKingdee(Long flowId) {
+		BfiRecBillVO source = row.recBill();
-		if (flowId == null) {
+		// 金蝶收款单号（既是收款通知单号也是金蝶单据号）
-			throw new ServiceException("收款流水ID不能为空");
-		}
-		KingdeeReceiptFlow flow = existing(flowId);
-		if (flow.getBillId() == null) {
-			return ReceiptClaimPushResult.fail("认领公告id缺失，请先手动同步金蝶收款流水");
-		}
-		String claimusers = UserCache.getUserRealName(AuthUtil.getUserId());
-		if (Func.isEmpty(claimusers)) {
-			throw new ServiceException("当前用户无姓名，无法推送金蝶收款认领");
-		}
-		// 推送前对账：以当前用户身份重查 A301-2 拿最新公告（手动推送者须在公告认领范围内）
-		BfiClaimAnnounceVO announce = queryClaimAnnounces(claimusers).stream()
-			.filter(item -> flow.getBillId().equals(item.getId()))
-			.findFirst().orElse(null);
-		if (announce == null) {
-			return ReceiptClaimPushResult.fail("金蝶侧未查询到该认领公告，当前用户可能不在公告认领范围内，请重新同步后重试");
-		}
-		return pushClaimLocked(flow.getId(), announce);
-	}
-
-	/**
-	 * 定时推送金蝶：扫描认领完成且未推送过的流水，按认领人姓名分组重查 A301-2 最新公告后逐条推送。
-	 * 多副本部署下由 single-flight 分布式锁保证同一轮全局最多一份在跑，已有轮次进行中则本轮跳过。
-	 *
-	 * @return 执行摘要
-	 */
-	@Override
-	public String pushClaimByTask() {
-		return kingdeeSyncLockSupport.runSingleFlight(RECEIPT_CLAIM_PUSH_LOCK_PREFIX, bfiProperties.getReceiptClaimPush().getLockLeaseSeconds(),
-			"定时推送收款认领", this::executeReceiptClaimPush);
-	}
-
-	/**
-	 * 定时推送收款认领主体：按认领人姓名串行处理——
-	 * 先重查该认领人的 A301-2 最新公告并推完其名下全部流水，再到下一个认领人。
-	 * A301-2 的 claimusers 必填且为单个用户姓名，定时任务无登录人上下文，
-	 * 故按认领人逐人查询公告，按公告id（bill_id）匹配流水。
-	 * 单条流水推送失败独立消化，不影响同批其他流水。
-	 *
-	 * @return 执行摘要
-	 */
-	private String executeReceiptClaimPush() {
-		List<KingdeeReceiptFlow> candidates = list(Wrappers.<KingdeeReceiptFlow>lambdaQuery()
-			.isNotNull(KingdeeReceiptFlow::getBillId)
-			.in(KingdeeReceiptFlow::getPushStatus, List.of(
-				KingdeeBfiConstant.RECEIPT_CLAIM_PUSH_NONE, KingdeeBfiConstant.RECEIPT_CLAIM_PUSH_FAILED))
-			.eq(KingdeeReceiptFlow::getClaimStatus, CLAIMED)
-			.eq(KingdeeReceiptFlow::getStatus, 1)
-			.orderByAsc(KingdeeReceiptFlow::getId));
-		if (candidates.isEmpty()) {
-			return "无待推送流水";
-		}
-		Map<Long, KingdeeReceiptFlow> candidateById = candidates.stream()
-			.collect(Collectors.toMap(KingdeeReceiptFlow::getId, Function.identity(),
-				(first, second) -> first, LinkedHashMap::new));
-		// 认领人 → 其有效认领的流水id
-		Map<String, Set<Long>> claimedFlowIdsByClaimer = claimMapper.selectList(
-				Wrappers.<ReceiptClaim>lambdaQuery()
-					.in(ReceiptClaim::getReceiptFlowId, candidateById.keySet())
-					.eq(ReceiptClaim::getClaimStatus, CLAIMED)).stream()
-			.filter(claim -> Func.isNotEmpty(claim.getClaimerName()) && claim.getReceiptFlowId() != null)
-			.collect(Collectors.groupingBy(ReceiptClaim::getClaimerName,
-				Collectors.mapping(ReceiptClaim::getReceiptFlowId, Collectors.toSet())));
-		if (claimedFlowIdsByClaimer.isEmpty()) {
-			return "待推送流水 " + candidates.size() + " 条，但无有效认领人，跳过";
-		}
-		int successCount = 0;
-		int failedCount = 0;
-		int skippedCount = 0;
-		// 本轮已推送成功的流水：同一流水被多个认领人认领时，只在首个覆盖它的认领人处推送一次
-		Set<Long> pushedFlowIds = new HashSet<>();
-		// 按认领人逐人串行：查该认领人公告 → 推完其名下流水 → 下一个认领人
-		for (String claimerName : claimedFlowIdsByClaimer.keySet().stream().sorted().toList()) {
-			Set<Long> claimerFlowIds = claimedFlowIdsByClaimer.get(claimerName);
-			List<KingdeeReceiptFlow> claimerFlows = candidateById.values().stream()
-				.filter(flow -> claimerFlowIds.contains(flow.getId()))
-				.filter(flow -> !pushedFlowIds.contains(flow.getId()))
-				.toList();
-			if (claimerFlows.isEmpty()) {
-				continue;
-			}
-			// 该认领人的公告一次查询，按公告id归集
-			Map<Long, BfiClaimAnnounceVO> announceByBillId = new HashMap<>();
-			try {
-				for (BfiClaimAnnounceVO announce : queryClaimAnnounces(claimerName)) {
-					if (announce.getId() != null) {
-						announceByBillId.putIfAbsent(announce.getId(), announce);
-					}
-				}
-			} catch (Exception exception) {
-				log.error("定时推送收款认领：认领人[{}]公告查询失败，其名下流水全部跳过", claimerName, exception);
-				skippedCount += claimerFlows.size();
-				continue;
-			}
-			for (KingdeeReceiptFlow flow : claimerFlows) {
-				BfiClaimAnnounceVO announce = announceByBillId.get(flow.getBillId());
-				if (announce == null) {
-					skippedCount++;
-					log.info("定时推送收款认领：认领人[{}]流水[{}]未在公告查询结果中命中，跳过",
-						claimerName, flow.getId());
-					continue;
-				}
-				try {
-					ReceiptClaimPushResult result = pushClaimLocked(flow.getId(), announce);
-					if (result.isSuccess()) {
-						successCount++;
-						pushedFlowIds.add(flow.getId());
-					} else {
-						failedCount++;
-					}
-				} catch (Exception exception) {
-					failedCount++;
-					log.error("定时推送收款认领：认领人[{}]流水[{}]推送异常", claimerName, flow.getId(), exception);
-				}
-			}
-		}
-		String summary = "扫描 " + candidates.size() + " 条，推送成功 " + successCount
-			+ " 条，推送失败 " + failedCount + " 条，公告未命中跳过 " + skippedCount + " 条";
-		log.info("定时推送收款认领完成：{}", summary);
-		return summary;
-	}
-
-	/**
-	 * 事务内推送：流水行锁覆盖闸门校验、对账、推送与状态落库全过程，
-	 * 防定时任务与手动按钮并发对同一流水双推；
-	 * 推送成功后触发合同合规认领链推送（C103-9/C107-1/C108-1，事务提交后执行，失败不影响金蝶推送结果）
-	 */
-	private ReceiptClaimPushResult pushClaimLocked(Long flowId, BfiClaimAnnounceVO announce) {
-		ReceiptClaimPushResult result = transactionTemplate.execute(status -> doPushClaimToKingdee(flowId, announce));
-		if (result != null && result.isSuccess()) {
-			hcsClaimSyncSupport.pushClaimToHcs(flowId);
-		}
-		return result;
-	}
-
-	/**
-	 * 推送单条流水：静态闸门 → 最新公告对账 → 按流水归集分摊行推送 → 成败状态落库
-	 */
-	private ReceiptClaimPushResult doPushClaimToKingdee(Long flowId, BfiClaimAnnounceVO announce) {
-		KingdeeReceiptFlow flow = lockedFlow(flowId);
-		if (flow.getBillId() == null) {
-			return ReceiptClaimPushResult.fail("认领公告id缺失，请先手动同步金蝶收款流水");
-		}
-		// 终态闸门：已推送流水不允许二次推送（作废重认领使等式再满足也不推，金蝶侧人工处置）
-		if (KingdeeBfiConstant.RECEIPT_CLAIM_PUSH_PUSHED.equals(flow.getPushStatus())) {
-			return ReceiptClaimPushResult.fail("该流水已推送金蝶，不允许重复推送");
-		}
-		// 推送前对账：以最新公告刷新公告侧未认领金额并重算认领状态（快照落库，页面口径同步修正）
-		flow.setUnclaimedAmount(money(announce.getUnclaimamount()));
-		flow.setKingdeeClaimStatus(trimToNull(announce.getClaimstatus()));
-		flow.setClaimMe(announce.getClaimme());
-		BigDecimal claimedTotal = flowClaimedAmount(flow.getId());
-		flow.setClaimedAmount(claimedTotal);
-		BigDecimal claimCeiling = claimCeiling(flow);
-		String claimStatus = amountClaimStatus(claimedTotal, claimCeiling);
-		flow.setClaimStatus(claimStatus);
-		updateById(flow);
-		if (!CLAIMED.equals(claimStatus)) {
-			return ReceiptClaimPushResult.fail("累计认领金额（" + claimedTotal + "）与可认领上限（"
-				+ claimCeiling + "）不一致，不满足推送条件");
-		}
-		// 分录取该流水全部有效分摊行（结算单id升序，跨认领主单归集）
-		List<ReceiptClaimSettlement> allocations = claimSettlementMapper.selectList(
-			Wrappers.<ReceiptClaimSettlement>lambdaQuery()
-				.eq(ReceiptClaimSettlement::getReceiptFlowId, flow.getId())
-				.eq(ReceiptClaimSettlement::getStatus, 1)
-				.eq(ReceiptClaimSettlement::getIsDeleted, 0)
-				.orderByAsc(ReceiptClaimSettlement::getFormalSettlementId));
-		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()
-			.map(ReceiptClaimSettlement::getFormalSettlementNo)
-			.filter(Func::isNotEmpty)
-			.distinct()
-			.collect(Collectors.joining("_"));
-		flow.setAwrpSrcCode(awrpSrcCode);
-
-		BfiClaimPushDTO param = buildClaimPushDTO(flow, claimedTotal, allocations, firstSettlement.getKingdeeBillId());
-		log.info("调用BFI接口 收款认领结果推送开始 flowId：{}，billId：{}，awrpSrcCode：{}，分摊明细 {} 行，认领金额 {}",
-			flow.getId(), flow.getBillId(), flow.getAwrpSrcCode(), allocations.size(), claimedTotal);
-		try {
-			BfiBillSaveResultVO result = bfiService.pushClaimResult(param);
-			return applyClaimPushSuccess(flow, extractClaimPushBillNo(result));
-		} catch (Exception exception) {
-			return applyClaimPushFailure(flow, exception);
-		}
-	}
-
-	/**
-	 * A301-3 推送报文组装：billid=公告id，单条分录、金额=全部未推送金额（一笔流水一张金蝶收款单），
-	 * 核心单据编号=第一张结算单的金蝶单据id（星瀚内码）
-	 */
-	private BfiClaimPushDTO buildClaimPushDTO(KingdeeReceiptFlow flow, BigDecimal claimedTotal,
-		List<ReceiptClaimSettlement> allocations, String coreBillId) {
-		BfiClaimPushDTO param = new BfiClaimPushDTO();
-		// 【必填】认领公告id
-		param.setBillid(flow.getBillId());
-		// 【必填】来源系统编码
-		param.setAwrpSrcSys(bfiProperties.getSrcSys());
-		// 【必填】来源系统单据编码（分摊结算单号下划线拼接）
-		param.setAwrpSrcCode(flow.getAwrpSrcCode());
-		// 【必填】收款类型.编码
-		param.setRecpaytypeNumber(KingdeeBfiConstant.BFI_CLAIM_REC_PAY_TYPE);
-		// 【必填】付款人类型
-		param.setPaymenttype(KingdeeBfiConstant.BFI_CLAIM_PAYMENT_TYPE);
-		// 【必填】付款人名称
-		param.setRecviewpayer(flow.getPayerName());
-		// 【必填】付款人id
-		param.setRecpayer(flow.getPayerId());
-		// 【必填】单据体分录：仅一条，应收金额=全部未推送金额（累计有效认领）
-		BfiClaimPushEntryDTO entry = new BfiClaimPushEntryDTO();
-		// 【必填】应收金额（全部未推送金额）
-		entry.setEReceivableamt(claimedTotal);
-		// 分录行序号（第一张结算单id，分摊已按结算单id升序，多张取最小）
-		entry.setSeq(allocations.get(0).getFormalSettlementId());
-		// 核心单据类型
-		// entry.setECorebilltype(KingdeeBfiConstant.BFI_CLAIM_CORE_BILL_TYPE);
-		// 核心单据编号（第一张结算单的金蝶单据id，星瀚内码）
-		entry.setECorebillno(coreBillId);
-		param.setEntryentity(List.of(entry));
-		return param;
-	}
-
-	/**
-	 * 解析 A301-3 推送结果：全项成功返回单据号，否则抛出汇总错误文本（由失败路径落库）。
-	 * 成功响应的 number 为空，金蝶收款单号取回执 keys 中的 awrp_src_code（来源编码）。
-	 */
-	private String extractClaimPushBillNo(BfiBillSaveResultVO result) {
-		if (result == null || result.getResult() == null || result.getResult().isEmpty()) {
-			throw new ServiceException("金蝶认领结果推送失败，返回结果为空");
-		}
-		List<BfiBillSaveResultItemVO> items = result.getResult();
-		boolean allSuccess = items.stream().allMatch(item -> Boolean.TRUE.equals(item.getBillStatus()));
-		if (!allSuccess) {
-			String errorText = items.stream()
-				.map(BfiBillSaveResultItemVO::getErrorText)
-				.filter(text -> !text.isEmpty())
-				.collect(Collectors.joining("；"));
-			throw new ServiceException("金蝶认领结果推送失败"
-				+ (errorText.isEmpty() ? "" : "：" + errorText));
-		}
-		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");
-	}
-
-	/**
-	 * 推送成功：流水置已推送并回填金蝶收款单号，级联刷新名下未作废认领主单的冗余展示字段
-	 */
-	private ReceiptClaimPushResult applyClaimPushSuccess(KingdeeReceiptFlow flow, String kingdeeBillNo) {
-		log.info("调用BFI接口 收款认领结果推送成功 flowId：{}，金蝶收款单号：{}",
-			flow.getId(), Func.isEmpty(kingdeeBillNo) ? "响应未返回" : kingdeeBillNo);
-		flow.setPushStatus(KingdeeBfiConstant.RECEIPT_CLAIM_PUSH_PUSHED);
-		flow.setPushedTime(LocalDateTime.now());
-		flow.setKingdeeBillNo(kingdeeBillNo);
-		flow.setKingdeeBillStatus(KingdeeBfiConstant.KINGDEE_STATUS_PUSHED);
-		// 失败原因需显式置空（实体 update 忽略 null 字段，走 lambdaUpdate）
-		this.update(Wrappers.<KingdeeReceiptFlow>lambdaUpdate()
-			.eq(KingdeeReceiptFlow::getId, flow.getId())
-			.set(KingdeeReceiptFlow::getPushStatus, flow.getPushStatus())
-			.set(KingdeeReceiptFlow::getPushFailReason, null)
-			.set(KingdeeReceiptFlow::getPushedTime, flow.getPushedTime())
-			.set(KingdeeReceiptFlow::getAwrpSrcCode, flow.getAwrpSrcCode())
-			.set(KingdeeReceiptFlow::getKingdeeBillNo, kingdeeBillNo)
-			.set(KingdeeReceiptFlow::getKingdeeBillStatus, flow.getKingdeeBillStatus()));
-		// 级联刷新名下未作废认领主单的冗余展示字段
-		claimMapper.update(null, Wrappers.<ReceiptClaim>lambdaUpdate()
-			.eq(ReceiptClaim::getReceiptFlowId, flow.getId())
-			.eq(ReceiptClaim::getClaimStatus, CLAIMED)
-			.set(ReceiptClaim::getKingdeeBillNo, kingdeeBillNo)
-			.set(ReceiptClaim::getKingdeeBillStatus, KingdeeBfiConstant.KINGDEE_STATUS_PUSHED));
-		record(flow.getId(), null, "push", "推送金蝶收款认领", CLAIMED, CLAIMED, flow.getClaimedAmount(),
-			"金蝶收款单号：" + (Func.isEmpty(kingdeeBillNo) ? "响应未返回" : kingdeeBillNo));
-		return ReceiptClaimPushResult.success(kingdeeBillNo);
-	}
-
-	/**
-	 * 推送失败：流水置推送失败并记录原因，本地认领数据保留，可重新推送（重试复用同一来源编码）
-	 */
-	private ReceiptClaimPushResult applyClaimPushFailure(KingdeeReceiptFlow flow, Exception exception) {
-		String reason = Func.isEmpty(exception.getMessage())
-			? exception.getClass().getSimpleName() : exception.getMessage();
-		reason = truncateText(reason, 1000);
-		log.error("调用BFI接口 收款认领结果推送失败 flowId：{}，billId：{}，awrpSrcCode：{}",
-			flow.getId(), flow.getBillId(), flow.getAwrpSrcCode(), exception);
-		this.update(Wrappers.<KingdeeReceiptFlow>lambdaUpdate()
-			.eq(KingdeeReceiptFlow::getId, flow.getId())
-			.set(KingdeeReceiptFlow::getPushStatus, KingdeeBfiConstant.RECEIPT_CLAIM_PUSH_FAILED)
-			.set(KingdeeReceiptFlow::getPushFailReason, reason)
-			.set(KingdeeReceiptFlow::getAwrpSrcCode, flow.getAwrpSrcCode()));
-		record(flow.getId(), null, "push", "推送金蝶收款认领", CLAIMED, CLAIMED, flow.getClaimedAmount(),
-			"推送失败：" + truncateText(reason, 200));
-		return ReceiptClaimPushResult.fail("金蝶认领结果推送失败：" + reason);
-	}
-
-	/**
-	 * A301-2 收款认领公告查询：按认领人姓名全量翻页，时间窗口取 Nacos 配置（默认近半年）。
-	 * 认领公告同步、手动推送对账与定时任务对账共用。
-	 */
-	private List<BfiClaimAnnounceVO> queryClaimAnnounces(String claimusers) {
-		int months = bfiProperties.getClaimAnnounce().getMonths();
-		// 认领人直接取 Nacos 配置值
-		String effectiveClaimusers = bfiProperties.getClaimAnnounce().getClaimusers();
-		LocalDateTime endDate = LocalDateTime.now();
-		LocalDateTime startDate = endDate.minusMonths(months);
-		long start = System.currentTimeMillis();
-		log.info("调用BFI接口 收款认领公告查询开始 claimusers：{}，时间窗口：{} ~ {}（近{}个月）",
-			effectiveClaimusers, startDate.format(BFI_DATE_TIME_FORMATTER), endDate.format(BFI_DATE_TIME_FORMATTER), months);
-		BfiClaimAnnounceQueryDTO queryDTO = new BfiClaimAnnounceQueryDTO();
-		queryDTO.setClaimusers(effectiveClaimusers);
-		queryDTO.setModifytimeS(startDate.format(BFI_DATE_TIME_FORMATTER));
-		queryDTO.setModifytimeE(endDate.format(BFI_DATE_TIME_FORMATTER));
-		queryDTO.setPageSize(SYNC_PAGE_SIZE);
-		List<BfiClaimAnnounceVO> announces = BfiUtil.queryAllPages(pageNo -> {
-			queryDTO.setPageNo(pageNo);
-			return bfiService.queryClaimAnnounce(queryDTO);
-		});
-		log.info("调用BFI接口 收款认领公告查询结束 claimusers：{}，耗时：{}ms，拉取 {} 条",
-			effectiveClaimusers, System.currentTimeMillis() - start, announces.size());
-		return announces;
-	}
-
-	/**
-	 * A301-2 认领公告 → 收款流水表字段拷贝（仅覆盖金蝶侧来源字段，不覆盖本地认领金额与状态）
-	 */
-	private void copyAnnounceRow(KingdeeReceiptFlow target, BfiClaimAnnounceVO source,
-		String detailSerialNo, BigDecimal receiptAmount) {
-		// 金蝶认领公告id
-		target.setBillId(source.getId());
-		// 收款通知单号
 		target.setReceiptNoticeNo(trimToEmpty(source.getBillno()));
-		// 付款人名称（取自对方户名）
+		target.setKingdeeBillNo(trimToNull(source.getBillno()));
-		target.setPayerName(trimToEmpty(source.getOppunit()));
+		// 金蝶回写状态随单据状态同步刷新
-		// 付款人id（取自对方账号）
+		target.setKingdeeBillStatus(billStatusOf(source.getBillstatus()));
-		target.setPayerId(trimToEmpty(source.getOppbanknumber()));
+		// 付款人名称
-		// 收款人
+		target.setPayerName(trimToEmpty(source.getPayername()));
-		target.setPayeeName(trimToNull(source.getRecpayee()));
+		// 收款人（收款公司名称）
-		// 收款金额
+		target.setPayeeName(trimToNull(source.getOrgName()));
-		target.setReceiptAmount(receiptAmount);
+		// 收款人（公司）.编码
-		// 对方单位名称
+		target.setOrgNumber(trimToNull(source.getOrgNumber()));
-		target.setCounterpartyName(trimToEmpty(source.getOppunit()));
+		// 核算组织.编码
-		// 对方银行账号
+		target.setOpenOrgNumber(trimToNull(source.getOpenorgNumber()));
-		target.setCounterpartyAccount(trimToEmpty(source.getOppbanknumber()));
+		// 收款金额（主单 actrecamt）
-		// 对方开户行
+		target.setReceiptAmount(row.receiptAmount());
-		target.setCounterpartyBank(trimToEmpty(source.getOppbank()));
+		// 对方单位名称（取付款人名称）
+		target.setCounterpartyName(trimToEmpty(source.getPayername()));
+		// 对方银行账号（付款账户）
+		target.setCounterpartyAccount(trimToEmpty(source.getPayeracctbanknum()));
+		// 对方开户行（付款银行）
+		target.setCounterpartyBank(trimToEmpty(source.getPayerbankname()));
 		// 摘要
-		target.setSummary(trimToNull(source.getDescription()));
+		target.setSummary(trimToNull(source.getTxtDescription()));
-		// 交易日期
+		// 交易日期（业务日期）
-		target.setTransactionTime(parseDateTime(source.getTradetime()));
+		target.setTransactionTime(parseDateTime(source.getBizdate()));
 		// 明细流水号
-		target.setDetailSerialNo(detailSerialNo);
+		target.setDetailSerialNo(row.detailSerialNo());
-		// 未认领金额
+		// 未匹配收款金额（金蝶参考展示，不参与认领额度）
-		target.setUnclaimedAmount(money(source.getUnclaimamount()));
+		target.setUnmatchAmountRec(money(source.getUnmatchamountrec()));
+		// 已匹配收款金额 / 已匹配付款金额 / 未匹配付款金额
+		target.setMatchAmountRec(money(source.getMatchamountrec()));
+		target.setMatchAmountPay(money(source.getMatchamountpay()));
+		target.setUnmatchAmountPay(money(source.getUnmatchamountpay()));
+		// 已结算金额 / 未结算金额
+		target.setSettleAmount(money(source.getSettleamount()));
+		target.setUnsettleAmount(money(source.getUnsettleamount()));
 		// 手续费
 		target.setFee(source.getFee() == null ? null : source.getFee().setScale(2, RoundingMode.HALF_UP));
-		// 公告认领状态
-		target.setKingdeeClaimStatus(trimToNull(source.getClaimstatus()));
-		// 我已认领
-		target.setClaimMe(source.getClaimme());
 		// 来源更新时间
-		target.setSourceUpdatedTime(target.getTransactionTime() == null
+		target.setSourceUpdatedTime(LocalDateTime.now());
-			? LocalDateTime.now() : target.getTransactionTime());
 	}
 
-	private String firstNonBlank(String... values) {
+	/**
-		for (String value : values) {
+	 * A301-1 单据状态 → 本地金蝶回写状态（同步时随单据刷新）
-			if (Func.isNotEmpty(value)) {
+	 *
-				return value.trim();
+	 * @param billStatus 金蝶 billstatus（A暂存/B已提交/C已审核/D已收款/G已退单）
-			}
+	 * @return 本地状态
+	 */
+	private String billStatusOf(String billStatus) {
+		if ("D".equals(billStatus)) {
+			return KingdeeBfiConstant.KINGDEE_STATUS_RECEIVED;
 		}
-		return null;
+		if ("C".equals(billStatus)) {
+			return APPROVED;
+		}
+		if ("A".equals(billStatus) || "B".equals(billStatus)) {
+			return KingdeeBfiConstant.KINGDEE_STATUS_PUSHED;
+		}
+		// 其余状态（含 G 已退单/E 变更中）按处理失败记录，提示人工在金蝶核查
+		log.warn("金蝶收款单单据状态[{}]未匹配映射，同步按 failed 处理", billStatus);
+		return KingdeeBfiConstant.KINGDEE_STATUS_FAILED;
 	}
 
 	private LocalDateTime parseDateTime(String value) {
@@ -1237,13 +984,6 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
 		}
 	}
 
-	private String truncateText(String value, int maxLength) {
-		if (value == null || value.length() <= maxLength) {
-			return value;
-		}
-		return value.substring(0, maxLength);
-	}
-
 	private void record(Long flowId, Long claimId, String actionType, String actionName,
 		String fromStatus, String toStatus, BigDecimal operationAmount, String content) {
 		recordMapper.insert(buildRecord(flowId, claimId, actionType, actionName,

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java

@@ -61,6 +61,7 @@ import org.springblade.transport.service.IFormalSettlementService;
 import org.springblade.transport.service.IPreSettlementService;
 import org.springblade.transport.service.IReceivablePayableDetailService;
 import org.springblade.transport.service.IWaybillService;
+import org.springblade.transport.support.ContractPartySupport;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.support.WaybillProcessSupport;
 import org.springblade.transport.wrapper.ReceivablePayableDetailWrapper;
@@ -566,6 +567,12 @@ public class ReceivablePayableDetailServiceImpl
 			item.put("id", contract.getId());
 			item.put("contractNo", contract.getContractNo());
 			item.put("contractName", contract.getContractName());
+			item.put("partyA", contract.getPartyA());
+			item.put("partyB", contract.getPartyB());
+			item.put("partyC", contract.getPartyC());
+			item.put("partyAJson", contract.getPartyAJson());
+			item.put("partyBJson", contract.getPartyBJson());
+			item.put("partyCJson", contract.getPartyCJson());
 			item.put("billingPlanJson", contract.getBillingPlanJson());
 			return item;
 		}).toList();
@@ -1258,9 +1265,7 @@ public class ReceivablePayableDetailServiceImpl
 			&& !Objects.equals(waybill.getProjectId(), contract.getProjectId())) {
 			return false;
 		}
-		String carrierName = trimToNull(waybill.getCarrierName());
+		return ContractPartySupport.matchesCarrier(contract, waybill.getCarrierName(), waybill.getCarrierPartyId());
-		String partyB = trimToNull(contract.getPartyB());
-		return carrierName != null && carrierName.equals(partyB);
 	}
 
 	private ContractManage findCarrierContract(Waybill waybill) {
@@ -1268,20 +1273,50 @@ public class ReceivablePayableDetailServiceImpl
 		if (waybill.getProjectId() == null || Func.isEmpty(waybill.getContractId()) || carrierName == null) {
 			return null;
 		}
-		// 承运商合同甲方应与运单绑定的客户合同乙方（我方）一致，乙方必须是运单选择的承运商。
+		// 承运商合同甲方应与运单绑定的客户合同乙方（我方）一致，乙/丙方必须包含运单选择的承运商。
 		ContractManage customerContract = contractManageService.getById(waybill.getContractId());
 		if (customerContract == null || Func.isEmpty(customerContract.getPartyB())) {
 			return null;
 		}
-		return contractManageService.getOne(Wrappers.<ContractManage>lambdaQuery()
+		List<ContractManage> contracts = contractManageService.list(Wrappers.<ContractManage>lambdaQuery()
 			.eq(ContractManage::getIsDeleted, 0)
 			.eq(ContractManage::getProjectId, waybill.getProjectId())
-			.eq(ContractManage::getPartyA, customerContract.getPartyB())
-			.eq(ContractManage::getPartyB, carrierName)
 			.eq(ContractManage::getContractCategory, "承运商合同")
 			.and(wrapper -> wrapper.isNull(ContractManage::getContractStage)
 				.or().ne(ContractManage::getContractStage, "terminated"))
-			.orderByDesc(ContractManage::getCreateTime), false);
+			.orderByDesc(ContractManage::getCreateTime));
+		Set<String> customerPartyBs = splitPartyNames(customerContract.getPartyBJson(), customerContract.getPartyB());
+		for (ContractManage contract : contracts) {
+			Set<String> partyANames = splitPartyNames(contract.getPartyAJson(), contract.getPartyA());
+			boolean partyAMatched = partyANames.isEmpty() || partyANames.stream().anyMatch(customerPartyBs::contains)
+				|| customerPartyBs.contains(trimToNull(contract.getPartyA()));
+			if (!partyAMatched) {
+				continue;
+			}
+			if (ContractPartySupport.matchesCarrier(contract, carrierName, waybill.getCarrierPartyId())) {
+				return contract;
+			}
+		}
+		return null;
+	}
+
+	private Set<String> splitPartyNames(String partyJson, String fallback) {
+		Set<String> names = new LinkedHashSet<>();
+		for (Map<String, Object> row : ContractPartySupport.parsePartyRows(partyJson)) {
+			Object customerName = row.get("customerName");
+			if (customerName != null && Func.isNotEmpty(String.valueOf(customerName).trim())) {
+				names.add(String.valueOf(customerName).trim());
+			}
+		}
+		if (names.isEmpty() && Func.isNotEmpty(fallback)) {
+			for (String part : fallback.split("[、,]")) {
+				String name = trimToNull(part);
+				if (name != null) {
+					names.add(name);
+				}
+			}
+		}
+		return names;
 	}
 
 	private String trimToNull(String value) {
@@ -2058,13 +2093,31 @@ public class ReceivablePayableDetailServiceImpl
 	 */
 	private List<ReceivablePayableCargoFee> calculatedFees(Waybill waybill, ContractManage contract, String planId,
 																				 boolean matchOnly, boolean strictPlan) {
-		List<Map<String, Object>> plans = parseList(contract == null ? null : contract.getBillingPlanJson());
+		List<Map<String, Object>> plans = billingPlansForWaybill(contract, waybill);
 		Map<String, Object> plan = "__matched__".equals(planId)
 			? resolveDefaultBillingPlan(plans, waybill.getTransportType())
 			: resolveBillingPlan(plans, planId);
 		return calculatedFees(waybill, plan, matchOnly, strictPlan);
 	}
 
+	/**
+	 * 按运单客商过滤合同计费方案：承运商合同用承运客商，客户合同用客户名称。
+	 */
+	private List<Map<String, Object>> billingPlansForWaybill(ContractManage contract, Waybill waybill) {
+		if (contract == null) {
+			return List.of();
+		}
+		if (waybill == null) {
+			return parseList(contract.getBillingPlanJson());
+		}
+		if ("承运商合同".equals(contract.getContractCategory())) {
+			return ContractPartySupport.filterBillingPlans(
+				contract.getBillingPlanJson(), null, waybill.getCarrierName(), waybill.getCarrierPartyId());
+		}
+		return ContractPartySupport.filterBillingPlans(
+			contract.getBillingPlanJson(), null, waybill.getCustomerName(), null);
+	}
+
 	private List<ReceivablePayableCargoFee> calculatedFees(Waybill waybill, Map<String, Object> plan,
 																				 boolean matchOnly) {
 		return calculatedFees(waybill, plan, matchOnly, false);

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/SettlementAdjustmentServiceImpl.java

@@ -242,10 +242,15 @@ public class SettlementAdjustmentServiceImpl extends BaseServiceImpl<SettlementA
 				+ "]尚未推送金蝶，请先执行「推送金蝶」");
 		}
 		// 冲销硬闸门：仅当金蝶侧原应付/应收单已被冲销（部分冲销放行）才允许以新单号重推，避免重复生成财务单据
-		if (!this.kingdeeWrittenOff(original)) {
+		boolean writtenOff = this.kingdeeWrittenOff(original);
+		// 闸门查询即金蝶实时冲销状态，回写供结算单列表展示（查到未冲销同样回写，拦截提示后列表即同步）
+		formalSettlementService.refreshKingdeeWriteOff(original.getId(), writtenOff);
+		if (!writtenOff) {
 			throw new ServiceException("结算单[" + Func.toStr(original.getFormalSettlementNo())
 				+ "]的原应付/应收单尚未在金蝶冲销，禁止重推");
 		}
+		// 闸门查询即金蝶实时冲销状态，回写供结算单列表展示
+		formalSettlementService.refreshKingdeeWriteOff(original.getId(), true);
 		// 幂等：同一原单已克隆过新单则复用（重试从推送步骤续上），避免重复建单
 		FormalSettlement clone = existingClone(original.getFormalSettlementNo());
 		if (clone == null) {
@@ -302,6 +307,8 @@ public class SettlementAdjustmentServiceImpl extends BaseServiceImpl<SettlementA
 		result.put("syncStatus", KingdeeBfiConstant.KINGDEE_STATUS_SYNCED);
 		try {
 			boolean writtenOff = this.kingdeeWrittenOff(settlement);
+			// 预检查询即金蝶实时冲销状态，顺带回写供结算单列表展示
+			formalSettlementService.refreshKingdeeWriteOff(settlement.getId(), writtenOff);
 			result.put("writtenOff", writtenOff);
 			result.put("message", writtenOff
 				? "该结算单已推送金蝶且旧单已冲销，审批后可直接重新推送新单"

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ShippingTemplateServiceImpl.java

@@ -195,7 +195,11 @@ public class ShippingTemplateServiceImpl extends BaseServiceImpl<ShippingTemplat
 		TransportBusinessSupport.validateAllDept(shippingTemplate.getAllDept(), "发货模板");
 		LambdaQueryWrapper<ShippingTemplate> queryWrapper = Wrappers.<ShippingTemplate>lambdaQuery().eq(ShippingTemplate::getIsDeleted, 0);
 		if (!Objects.equals(shippingTemplate.getAllDept(), 1)) {
-			queryWrapper.eq(ShippingTemplate::getDeptId, TransportBusinessSupport.currentDeptId("发货模板"));
+			Long currentDeptId = TransportBusinessSupport.currentDeptId("发货模板");
+			queryWrapper.and(wrapper -> {
+				wrapper.eq(ShippingTemplate::getDeptId, currentDeptId);
+				TransportBusinessSupport.orProjectVisibleByBusinessDept(wrapper, List.of(currentDeptId));
+			});
 		} else if (Func.isNotEmpty(shippingTemplate.getDeptId())) {
 			queryWrapper.eq(ShippingTemplate::getDeptId, shippingTemplate.getDeptId());
 		}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TemporaryCreditLimitServiceImpl.java

@@ -190,7 +190,11 @@ public class TemporaryCreditLimitServiceImpl extends BaseServiceImpl<TemporaryCr
 				queryWrapper.eq(TemporaryCreditLimit::getApplyDeptId, temporaryCreditLimit.getApplyDeptId());
 			}
 		} else if (!Objects.equals(temporaryCreditLimit.getAllDept(), 1)) {
-			queryWrapper.eq(TemporaryCreditLimit::getApplyDeptId, TransportBusinessSupport.currentDeptId("临时额度管理"));
+			Long currentDeptId = TransportBusinessSupport.currentDeptId("临时额度管理");
+			queryWrapper.and(wrapper -> {
+				wrapper.eq(TemporaryCreditLimit::getApplyDeptId, currentDeptId);
+				TransportBusinessSupport.orProjectVisibleByBusinessDept(wrapper, List.of(currentDeptId));
+			});
 		} else if (Func.isNotEmpty(temporaryCreditLimit.getApplyDeptId())) {
 			queryWrapper.eq(TemporaryCreditLimit::getApplyDeptId, temporaryCreditLimit.getApplyDeptId());
 		}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java

@@ -701,9 +701,12 @@ public class TransportPlanServiceImpl extends BaseServiceImpl<TransportPlanMappe
 		LambdaQueryWrapper<TransportPlan> queryWrapper = Wrappers.<TransportPlan>lambdaQuery().eq(TransportPlan::getIsDeleted, 0);
 		if (!Objects.equals(transportPlan.getAllDept(), 1)) {
 			Long currentDeptId = TransportBusinessSupport.currentDeptId("运输计划");
-			// dept_id 为空的历史数据按创建组织归入当前组织
+			// dept_id 为空的历史数据按创建组织归入当前组织；业务部门可见其项目下的计划
-			queryWrapper.and(wrapper -> wrapper.eq(TransportPlan::getDeptId, currentDeptId)
+			queryWrapper.and(wrapper -> {
-				.or(item -> item.isNull(TransportPlan::getDeptId).eq(TransportPlan::getCreateDept, currentDeptId)));
+				wrapper.eq(TransportPlan::getDeptId, currentDeptId)
+					.or(item -> item.isNull(TransportPlan::getDeptId).eq(TransportPlan::getCreateDept, currentDeptId));
+				TransportBusinessSupport.orProjectVisibleByBusinessDept(wrapper, List.of(currentDeptId));
+			});
 		} else if (Func.isNotEmpty(transportPlan.getDeptId())) {
 			queryWrapper.eq(TransportPlan::getDeptId, transportPlan.getDeptId());
 		}

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java

@@ -69,6 +69,7 @@ import org.springblade.transport.service.IProjectApplyService;
 import org.springblade.transport.service.IReceivablePayableDetailService;
 import org.springblade.transport.service.IContractManageService;
 import org.springblade.transport.service.IWaybillService;
+import org.springblade.transport.support.ContractPartySupport;
 import org.springblade.transport.support.LiveProcessConfigSupport;
 import org.springblade.transport.support.LoadableAdmissionSupport;
 import org.springblade.transport.support.TransportBusinessSupport;
@@ -152,7 +153,8 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 
 	@Override
 	public WaybillVO detail(Long id) {
-		WaybillVO result = WaybillWrapper.build().entityVO(syncDriverAcceptState(loadEditable(id, false)));
+		Waybill loaded = syncDriverAcceptState(loadEditable(id, false));
+		WaybillVO result = WaybillWrapper.build().entityVO(loaded);
 		fillCustomerNameFromContract(result);
 		fillCarrierContractName(List.of(result));
 		fillMileageMaintainable(List.of(result));
@@ -1328,18 +1330,7 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 		LambdaQueryWrapper<Waybill> queryWrapper;
 		if (Func.isNotEmpty(idList)) {
 			queryWrapper = Wrappers.<Waybill>lambdaQuery().eq(Waybill::getIsDeleted, 0);
-			List<Long> deptIdList = TransportBusinessSupport.resolveDeptFilterIds(
+			applyAccountScope(queryWrapper, waybill.getAllDept(), waybill.getDeptId());
-				waybill.getAllDept(), waybill.getDeptId(), "运单管理", TransportBusinessSupport.MENU_WAYBILL_MANAGE);
-			if (Func.isNotEmpty(deptIdList)) {
-				if (deptIdList.size() == 1) {
-					queryWrapper.eq(Waybill::getDeptId, deptIdList.get(0));
-				} else {
-					queryWrapper.in(Waybill::getDeptId, deptIdList);
-				}
-			}
-			if (TransportBusinessSupport.isOwnCreateScope(TransportBusinessSupport.MENU_WAYBILL_MANAGE)) {
-				queryWrapper.eq(Waybill::getCreateUser, AuthUtil.getUserId());
-			}
 			queryWrapper.in(Waybill::getId, idList).orderByDesc(Waybill::getCreateTime);
 		} else {
 			queryWrapper = buildQuery(waybill);
@@ -1397,7 +1388,7 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public WaybillVO copy(Long id) {
-		Waybill source = loadEditable(id, true);
+		Waybill source = loadEditable(id, false);
 		Waybill target = new Waybill();
 		target.setProjectId(source.getProjectId());
 		target.setProjectName(source.getProjectName());
@@ -1817,21 +1808,57 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 		return loadingManageService.detail(loadingManage.getId());
 	}
 
-	private LambdaQueryWrapper<Waybill> buildQuery(WaybillVO waybill) {
+	/**
-		LambdaQueryWrapper<Waybill> queryWrapper = Wrappers.<Waybill>lambdaQuery().eq(Waybill::getIsDeleted, 0);
+	 * 运单可见范围：超管不限制；普通账号仅本组织运单，以及归属本账号项目的运单。
-		// 与常用线路等模块一致：超管默认不按组织过滤；普通用户 allDept!=1 时强制当前组织
+	 * 本人创建权限仍只看自己创建的运单。
-		List<Long> deptIdList = TransportBusinessSupport.resolveDeptFilterIds(
+	 */
-			waybill.getAllDept(), waybill.getDeptId(), "运单管理", TransportBusinessSupport.MENU_WAYBILL_MANAGE);
+	private void applyAccountScope(LambdaQueryWrapper<Waybill> queryWrapper, Integer allDept, Long deptId) {
-		if (Func.isNotEmpty(deptIdList)) {
-			if (deptIdList.size() == 1) {
-				queryWrapper.eq(Waybill::getDeptId, deptIdList.get(0));
-			} else {
-				queryWrapper.in(Waybill::getDeptId, deptIdList);
-			}
-		}
 		if (TransportBusinessSupport.isOwnCreateScope(TransportBusinessSupport.MENU_WAYBILL_MANAGE)) {
 			queryWrapper.eq(Waybill::getCreateUser, AuthUtil.getUserId());
+			return;
 		}
+		List<Long> deptIdList = TransportBusinessSupport.resolveScopedDeptFilterIds(
+			allDept, deptId, "运单管理", TransportBusinessSupport.MENU_WAYBILL_MANAGE);
+		if (Func.isEmpty(deptIdList)) {
+			return;
+		}
+		Long currentUserId = AuthUtil.getUserId();
+		queryWrapper.and(wrapper -> {
+			if (deptIdList.size() == 1) {
+				wrapper.eq(Waybill::getDeptId, deptIdList.get(0));
+			} else {
+				wrapper.in(Waybill::getDeptId, deptIdList);
+			}
+			TransportBusinessSupport.orProjectVisibleByBusinessDept(wrapper, deptIdList);
+			TransportBusinessSupport.orProjectVisibleByAccount(wrapper, deptIdList, currentUserId);
+			if (Func.isNotEmpty(currentUserId) && currentUserId > 0) {
+				wrapper.or().eq(Waybill::getCreateUser, currentUserId);
+			}
+		});
+	}
+
+	/**
+	 * 详情、复制等按主键访问时复用列表可见范围，避免越权读取其他账号运单。
+	 */
+	private void assertWaybillVisible(Waybill waybill) {
+		if (waybill == null || Func.isEmpty(waybill.getId())) {
+			throw new ServiceException("运单管理不存在");
+		}
+		if (TransportBusinessSupport.isAdministrator()) {
+			return;
+		}
+		WaybillVO probe = new WaybillVO();
+		probe.setAllDept(0);
+		LambdaQueryWrapper<Waybill> wrapper = buildQuery(probe);
+		wrapper.eq(Waybill::getId, waybill.getId());
+		if (count(wrapper) <= 0) {
+			throw new ServiceException("无权查看该运单");
+		}
+	}
+
+	private LambdaQueryWrapper<Waybill> buildQuery(WaybillVO waybill) {
+		LambdaQueryWrapper<Waybill> queryWrapper = Wrappers.<Waybill>lambdaQuery().eq(Waybill::getIsDeleted, 0);
+		applyAccountScope(queryWrapper, waybill.getAllDept(), waybill.getDeptId());
 		if (Func.isNotEmpty(waybill.getWaybillNo())) {
 			queryWrapper.eq(Waybill::getWaybillNo, waybill.getWaybillNo());
 		}
@@ -2227,6 +2254,8 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 	private void validateCarrierContract(Waybill waybill) {
 		if ("自运".equals(waybill.getCarrierType())) {
 			waybill.setCarrierContractId(null);
+			waybill.setCarrierPartyId(null);
+			waybill.setCarrierPartyRole(null);
 			return;
 		}
 		if (Func.isEmpty(waybill.getCarrierContractId())) {
@@ -2236,8 +2265,24 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 		if (carrierContract == null || Objects.equals(carrierContract.getIsDeleted(), 1)
 			|| !"承运商合同".equals(carrierContract.getContractCategory())
 			|| !Objects.equals(carrierContract.getProjectId(), waybill.getProjectId())
-			|| !Objects.equals(carrierContract.getPartyB(), waybill.getCarrierName())) {
+			|| !ContractPartySupport.matchesCarrier(carrierContract, waybill.getCarrierName(), waybill.getCarrierPartyId())) {
-			throw new ServiceException("承运商合同必须属于所选项目，且合同乙方须与承运商一致");
+			throw new ServiceException("承运商合同必须属于所选项目，且承运商须为合同乙方或丙方客商");
+		}
+		Map<String, Object> selectedParty = ContractPartySupport.findCarrierParty(
+			carrierContract, waybill.getCarrierPartyId(), waybill.getCarrierName());
+		if (selectedParty != null) {
+			Object customerName = selectedParty.get("customerName");
+			Object partyId = selectedParty.get("id");
+			Object partyRole = selectedParty.get("partyRole");
+			if (customerName != null) {
+				waybill.setCarrierName(String.valueOf(customerName).trim());
+			}
+			if (partyId != null) {
+				waybill.setCarrierPartyId(String.valueOf(partyId).trim());
+			}
+			if (partyRole != null) {
+				waybill.setCarrierPartyRole(ContractPartySupport.normalizeRole(String.valueOf(partyRole)));
+			}
 		}
 	}
 
@@ -2252,6 +2297,7 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 		if (checkDept) {
 			TransportBusinessSupport.assertCurrentDept(waybill.getDeptId(), "运单管理", TransportBusinessSupport.MENU_WAYBILL_MANAGE);
 		}
+		assertWaybillVisible(waybill);
 		return waybill;
 	}
 

blade-service/blade-transport/src/main/java/org/springblade/transport/support/ContractPartySupport.java

@@ -0,0 +1,539 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.support;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.transport.pojo.entity.ContractManage;
+import org.springblade.transport.pojo.vo.LoadingCarrierContractVO;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 合同甲/乙/丙多方客商明细支持
+ *
+ * @author Chill
+ */
+public final class ContractPartySupport {
+
+	public static final String ROLE_A = "A";
+	public static final String ROLE_B = "B";
+	public static final String ROLE_C = "C";
+
+	private ContractPartySupport() {
+	}
+
+	/**
+	 * 规范化三方客商明细并回写名称汇总
+	 */
+	public static void normalizeAndFillSummary(ContractManage contractManage) {
+		List<Map<String, Object>> partyARows = normalizePartyRows(contractManage.getPartyAJson(), true);
+		List<Map<String, Object>> partyBRows = normalizePartyRows(contractManage.getPartyBJson(), true);
+		List<Map<String, Object>> partyCRows = normalizePartyRows(contractManage.getPartyCJson(), false);
+		contractManage.setPartyAJson(toJsonOrNull(partyARows));
+		contractManage.setPartyBJson(toJsonOrNull(partyBRows));
+		contractManage.setPartyCJson(toJsonOrNull(partyCRows));
+		contractManage.setPartyA(joinCustomerNames(partyARows));
+		contractManage.setPartyB(joinCustomerNames(partyBRows));
+		contractManage.setPartyC(joinCustomerNames(partyCRows));
+	}
+
+	/**
+	 * 提交级校验：甲/乙至少一行，计费方案必须绑定明细客商
+	 */
+	public static void validateRequiredParties(ContractManage contractManage, boolean requireCustomerId) {
+		List<Map<String, Object>> partyARows = parsePartyRows(contractManage.getPartyAJson());
+		List<Map<String, Object>> partyBRows = parsePartyRows(contractManage.getPartyBJson());
+		List<Map<String, Object>> partyCRows = parsePartyRows(contractManage.getPartyCJson());
+		if (partyARows.isEmpty()) {
+			throw new ServiceException("请至少添加一个甲方客商");
+		}
+		if (partyBRows.isEmpty()) {
+			throw new ServiceException("请至少添加一个乙方客商");
+		}
+		validatePartyRows("甲方", partyARows, requireCustomerId);
+		validatePartyRows("乙方", partyBRows, requireCustomerId);
+		if (!partyCRows.isEmpty()) {
+			validatePartyRows("丙方", partyCRows, requireCustomerId);
+		}
+	}
+
+	/**
+	 * 校验计费方案均已绑定合同明细中的客商。
+	 * 客户合同仅允许绑定甲方；承运商合同仅允许绑定乙方/丙方。
+	 */
+	public static void validateBillingPlanBindings(ContractManage contractManage) {
+		String billingPlanJson = contractManage.getBillingPlanJson();
+		if (Func.isEmpty(billingPlanJson)) {
+			return;
+		}
+		Object parsed = JsonUtil.parse(billingPlanJson, List.class);
+		if (!(parsed instanceof List<?> plans) || plans.isEmpty()) {
+			return;
+		}
+		Set<String> allowedRoles = allowedBillingPartyRoles(contractManage.getContractCategory());
+		Map<String, Map<String, Object>> partyByRowId = indexPartyRows(contractManage).entrySet().stream()
+			.filter(entry -> allowedRoles.contains(normalizeRole(String.valueOf(entry.getValue().get("partyRole")))))
+			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (left, right) -> left, LinkedHashMap::new));
+		Set<String> customerKeys = partyByRowId.values().stream()
+			.map(ContractPartySupport::customerMatchKey)
+			.filter(Func::isNotEmpty)
+			.collect(Collectors.toSet());
+		for (int index = 0; index < plans.size(); index++) {
+			Object value = plans.get(index);
+			if (!(value instanceof Map<?, ?> plan)) {
+				throw new ServiceException("计费方案设置格式不正确");
+			}
+			String partyRowId = trimToNull(plan.get("partyRowId"));
+			String customerId = trimToNull(plan.get("customerId"));
+			String customerName = trimToNull(plan.get("customerName"));
+			String partyRole = normalizeRole(trimToNull(plan.get("partyRole")));
+			if (Func.isEmpty(partyRowId) && Func.isEmpty(customerId) && Func.isEmpty(customerName)) {
+				throw new ServiceException("计费方案第" + (index + 1) + "个必须选择适用客商");
+			}
+			if (Func.isNotEmpty(partyRole) && !allowedRoles.contains(partyRole)) {
+				throw new ServiceException(billingPartyRoleMessage(contractManage.getContractCategory(), index + 1));
+			}
+			boolean matched = false;
+			if (Func.isNotEmpty(partyRowId) && partyByRowId.containsKey(partyRowId)) {
+				matched = true;
+			} else {
+				String key = customerMatchKey(customerId, customerName, partyRole);
+				matched = Func.isNotEmpty(key) && customerKeys.contains(key);
+				if (!matched && Func.isNotEmpty(customerName)) {
+					matched = partyByRowId.values().stream()
+						.anyMatch(row -> Objects.equals(trimToNull(row.get("customerName")), customerName)
+							&& (Func.isEmpty(partyRole) || Objects.equals(normalizeRole(String.valueOf(row.get("partyRole"))), partyRole)));
+				}
+			}
+			if (!matched) {
+				throw new ServiceException(billingPartyRoleMessage(contractManage.getContractCategory(), index + 1));
+			}
+		}
+	}
+
+	/**
+	 * 计费方案可选客商角色：客户合同=甲方；承运商合同=乙方/丙方
+	 */
+	public static Set<String> allowedBillingPartyRoles(String contractCategory) {
+		String category = Func.toStr(contractCategory).trim();
+		if ("承运商合同".equals(category)) {
+			return Set.of(ROLE_B, ROLE_C);
+		}
+		if ("客户合同".equals(category)) {
+			return Set.of(ROLE_A);
+		}
+		return Set.of(ROLE_A, ROLE_B, ROLE_C);
+	}
+
+	private static String billingPartyRoleMessage(String contractCategory, int planIndex) {
+		String category = Func.toStr(contractCategory).trim();
+		if ("承运商合同".equals(category)) {
+			return "计费方案第" + planIndex + "个适用客商只能选择乙方或丙方";
+		}
+		if ("客户合同".equals(category)) {
+			return "计费方案第" + planIndex + "个适用客商只能选择甲方";
+		}
+		return "计费方案第" + planIndex + "个适用客商不在合同甲/乙/丙明细中";
+	}
+
+	public static List<Map<String, Object>> parsePartyRows(String partyJson) {
+		if (Func.isEmpty(partyJson)) {
+			return List.of();
+		}
+		try {
+			Object parsed = JsonUtil.parse(partyJson, List.class);
+			if (!(parsed instanceof List<?> rows) || rows.isEmpty()) {
+				return List.of();
+			}
+			List<Map<String, Object>> result = new ArrayList<>();
+			for (Object row : rows) {
+				if (row instanceof Map<?, ?> map) {
+					Map<String, Object> values = new LinkedHashMap<>();
+					map.forEach((key, value) -> values.put(String.valueOf(key), value));
+					result.add(values);
+				}
+			}
+			return result;
+		} catch (Exception exception) {
+			return List.of();
+		}
+	}
+
+	public static List<Map<String, Object>> carrierPartyRows(ContractManage contractManage) {
+		List<Map<String, Object>> rows = new ArrayList<>();
+		parsePartyRows(contractManage == null ? null : contractManage.getPartyBJson()).forEach(row -> {
+			row.put("partyRole", ROLE_B);
+			rows.add(row);
+		});
+		parsePartyRows(contractManage == null ? null : contractManage.getPartyCJson()).forEach(row -> {
+			row.put("partyRole", ROLE_C);
+			rows.add(row);
+		});
+		return rows;
+	}
+
+	public static Set<String> carrierPartyNames(ContractManage contractManage) {
+		Set<String> names = new LinkedHashSet<>();
+		for (Map<String, Object> row : carrierPartyRows(contractManage)) {
+			String name = normalizePartyName(trimToNull(row.get("customerName")));
+			if (Func.isNotEmpty(name)) {
+				names.add(name);
+			}
+		}
+		// 兼容历史仅有汇总字段的合同
+		if (names.isEmpty() && contractManage != null) {
+			String partyB = normalizePartyName(contractManage.getPartyB());
+			if (Func.isNotEmpty(partyB)) {
+				names.add(partyB);
+			}
+			String partyC = normalizePartyName(contractManage.getPartyC());
+			if (Func.isNotEmpty(partyC)) {
+				names.add(partyC);
+			}
+		}
+		return names;
+	}
+
+	public static boolean matchesCarrier(ContractManage contractManage, String carrierName, String carrierPartyId) {
+		if (contractManage == null) {
+			return false;
+		}
+		List<Map<String, Object>> rows = carrierPartyRows(contractManage);
+		if (Func.isNotEmpty(carrierPartyId)) {
+			for (Map<String, Object> row : rows) {
+				if (Objects.equals(trimToNull(row.get("id")), trimToNull(carrierPartyId))) {
+					return true;
+				}
+			}
+		}
+		String normalizedName = normalizePartyName(carrierName);
+		if (Func.isEmpty(normalizedName)) {
+			return false;
+		}
+		if (rows.isEmpty()) {
+			return Objects.equals(normalizePartyName(contractManage.getPartyB()), normalizedName)
+				|| Objects.equals(normalizePartyName(contractManage.getPartyC()), normalizedName);
+		}
+		return rows.stream()
+			.anyMatch(row -> Objects.equals(normalizePartyName(trimToNull(row.get("customerName"))), normalizedName));
+	}
+
+	public static Map<String, Object> findCarrierParty(ContractManage contractManage, String carrierPartyId, String carrierName) {
+		List<Map<String, Object>> rows = carrierPartyRows(contractManage);
+		if (Func.isNotEmpty(carrierPartyId)) {
+			for (Map<String, Object> row : rows) {
+				if (Objects.equals(trimToNull(row.get("id")), trimToNull(carrierPartyId))) {
+					return row;
+				}
+			}
+		}
+		String normalizedName = normalizePartyName(carrierName);
+		if (Func.isEmpty(normalizedName)) {
+			return null;
+		}
+		for (Map<String, Object> row : rows) {
+			if (Objects.equals(normalizePartyName(trimToNull(row.get("customerName"))), normalizedName)) {
+				return row;
+			}
+		}
+		return null;
+	}
+
+	public static List<Map<String, Object>> filterBillingPlans(String billingPlanJson, Long customerId, String customerName, String partyRowId) {
+		List<Map<String, Object>> plans = parseObjectList(billingPlanJson);
+		if (plans.isEmpty()) {
+			return plans;
+		}
+		String normalizedName = normalizePartyName(customerName);
+		String normalizedPartyRowId = trimToNull(partyRowId);
+		String customerIdText = customerId == null ? null : String.valueOf(customerId);
+		List<Map<String, Object>> matched = plans.stream()
+			.filter(plan -> {
+				if (Func.isNotEmpty(normalizedPartyRowId)
+					&& Objects.equals(trimToNull(plan.get("partyRowId")), normalizedPartyRowId)) {
+					return true;
+				}
+				if (Func.isNotEmpty(customerIdText)
+					&& Objects.equals(trimToNull(plan.get("customerId")), customerIdText)) {
+					return true;
+				}
+				return Func.isNotEmpty(normalizedName)
+					&& Objects.equals(normalizePartyName(trimToNull(plan.get("customerName"))), normalizedName);
+			})
+			.collect(Collectors.toCollection(ArrayList::new));
+		// 历史方案未绑定客商时，不强制过滤，避免老数据无法计费
+		if (matched.isEmpty() && plans.stream().noneMatch(ContractPartySupport::hasCustomerBinding)) {
+			return plans;
+		}
+		return matched;
+	}
+
+	public static List<LoadingCarrierContractVO> expandCarrierOptions(Collection<ContractManage> contracts) {
+		if (Func.isEmpty(contracts)) {
+			return List.of();
+		}
+		List<LoadingCarrierContractVO> options = new ArrayList<>();
+		for (ContractManage contract : contracts) {
+			if (contract == null) {
+				continue;
+			}
+			List<Map<String, Object>> rows = carrierPartyRows(contract);
+			if (rows.isEmpty()) {
+				LoadingCarrierContractVO option = new LoadingCarrierContractVO();
+				option.setId(contract.getId());
+				option.setContractName(contract.getContractName());
+				option.setCarrierName(contract.getPartyB());
+				option.setCarrierPartyRole(ROLE_B);
+				options.add(option);
+				continue;
+			}
+			for (Map<String, Object> row : rows) {
+				LoadingCarrierContractVO option = new LoadingCarrierContractVO();
+				option.setId(contract.getId());
+				option.setContractName(contract.getContractName());
+				option.setCarrierName(trimToNull(row.get("customerName")));
+				option.setCarrierPartyId(trimToNull(row.get("id")));
+				option.setCarrierPartyRole(normalizeRole(String.valueOf(row.get("partyRole"))));
+				option.setCreditCode(trimToNull(row.get("creditCode")));
+				option.setCustomerId(toLong(row.get("customerId")));
+				options.add(option);
+			}
+		}
+		return options;
+	}
+
+	public static String normalizePartyName(String value) {
+		return Func.isEmpty(value) ? "" : value.trim();
+	}
+
+	public static String normalizeRole(String role) {
+		if (Func.isEmpty(role)) {
+			return null;
+		}
+		String text = role.trim().toUpperCase();
+		if ("A".equals(text) || "甲方".equals(role) || "甲".equals(role)) {
+			return ROLE_A;
+		}
+		if ("B".equals(text) || "乙方".equals(role) || "乙".equals(role)) {
+			return ROLE_B;
+		}
+		if ("C".equals(text) || "丙方".equals(role) || "丙".equals(role)) {
+			return ROLE_C;
+		}
+		return text;
+	}
+
+	public static String firstPartyName(String partyJson, String fallback) {
+		List<Map<String, Object>> rows = parsePartyRows(partyJson);
+		if (!rows.isEmpty()) {
+			String name = trimToNull(rows.get(0).get("customerName"));
+			if (Func.isNotEmpty(name)) {
+				return name;
+			}
+		}
+		return TransportBusinessSupport.trimToNull(fallback);
+	}
+
+	private static List<Map<String, Object>> normalizePartyRows(String partyJson, boolean keepEmptyPlaceholder) {
+		List<Map<String, Object>> source = parsePartyRows(partyJson);
+		List<Map<String, Object>> result = new ArrayList<>();
+		for (Map<String, Object> sourceRow : source) {
+			Map<String, Object> row = new LinkedHashMap<>();
+			String id = trimToNull(sourceRow.get("id"));
+			if (Func.isEmpty(id)) {
+				id = String.valueOf(IdWorker.getId());
+			}
+			row.put("id", id);
+			Long customerId = toLong(sourceRow.get("customerId"));
+			if (customerId != null) {
+				row.put("customerId", customerId);
+			}
+			String customerName = trimToNull(sourceRow.get("customerName"));
+			if (Func.isNotEmpty(customerName)) {
+				row.put("customerName", customerName);
+			}
+			String creditCode = trimToNull(sourceRow.get("creditCode"));
+			if (Func.isNotEmpty(creditCode)) {
+				row.put("creditCode", creditCode);
+			}
+			Long contactId = toLong(sourceRow.get("contactId"));
+			if (contactId != null) {
+				row.put("contactId", contactId);
+			}
+			String contactName = trimToNull(sourceRow.get("contactName"));
+			if (Func.isNotEmpty(contactName)) {
+				row.put("contactName", contactName);
+			}
+			String contactPhone = trimToNull(sourceRow.get("contactPhone"));
+			if (Func.isNotEmpty(contactPhone)) {
+				row.put("contactPhone", contactPhone);
+			}
+			if (Func.isEmpty(customerName) && customerId == null && !keepEmptyPlaceholder) {
+				continue;
+			}
+			result.add(row);
+		}
+		return result;
+	}
+
+	private static void validatePartyRows(String roleLabel, List<Map<String, Object>> rows, boolean requireCustomerId) {
+		Set<String> customerKeys = new LinkedHashSet<>();
+		for (int index = 0; index < rows.size(); index++) {
+			Map<String, Object> row = rows.get(index);
+			String customerName = trimToNull(row.get("customerName"));
+			Long customerId = toLong(row.get("customerId"));
+			if (Func.isEmpty(customerName)) {
+				throw new ServiceException(roleLabel + "第" + (index + 1) + "行请选择客商");
+			}
+			if (requireCustomerId && customerId == null) {
+				throw new ServiceException(roleLabel + "第" + (index + 1) + "行请选择有效客商");
+			}
+			String contactName = trimToNull(row.get("contactName"));
+			String contactPhone = trimToNull(row.get("contactPhone"));
+			if (Func.isNotEmpty(contactName) && Func.isEmpty(contactPhone)) {
+				throw new ServiceException(roleLabel + "第" + (index + 1) + "行联系人需带出联系电话");
+			}
+			String key = customerId == null ? customerName : String.valueOf(customerId);
+			if (!customerKeys.add(key)) {
+				throw new ServiceException(roleLabel + "存在重复客商：" + customerName);
+			}
+		}
+	}
+
+	private static Map<String, Map<String, Object>> indexPartyRows(ContractManage contractManage) {
+		Map<String, Map<String, Object>> indexed = new LinkedHashMap<>();
+		putIndexedRows(indexed, parsePartyRows(contractManage.getPartyAJson()), ROLE_A);
+		putIndexedRows(indexed, parsePartyRows(contractManage.getPartyBJson()), ROLE_B);
+		putIndexedRows(indexed, parsePartyRows(contractManage.getPartyCJson()), ROLE_C);
+		return indexed;
+	}
+
+	private static void putIndexedRows(Map<String, Map<String, Object>> indexed, List<Map<String, Object>> rows, String role) {
+		for (Map<String, Object> row : rows) {
+			Map<String, Object> copy = new LinkedHashMap<>(row);
+			copy.put("partyRole", role);
+			String id = trimToNull(copy.get("id"));
+			if (Func.isNotEmpty(id)) {
+				indexed.put(id, copy);
+			}
+		}
+	}
+
+	private static String customerMatchKey(Map<String, Object> row) {
+		return customerMatchKey(trimToNull(row.get("customerId")), trimToNull(row.get("customerName")),
+			normalizeRole(String.valueOf(row.get("partyRole"))));
+	}
+
+	private static String customerMatchKey(String customerId, String customerName, String partyRole) {
+		if (Func.isNotEmpty(customerId)) {
+			return normalizeRole(partyRole) + ":" + customerId;
+		}
+		if (Func.isNotEmpty(customerName)) {
+			return normalizeRole(partyRole) + ":" + customerName;
+		}
+		return null;
+	}
+
+	private static boolean hasCustomerBinding(Map<String, Object> plan) {
+		return Func.isNotEmpty(trimToNull(plan.get("partyRowId")))
+			|| Func.isNotEmpty(trimToNull(plan.get("customerId")))
+			|| Func.isNotEmpty(trimToNull(plan.get("customerName")));
+	}
+
+	private static List<Map<String, Object>> parseObjectList(String json) {
+		if (Func.isEmpty(json)) {
+			return List.of();
+		}
+		try {
+			Object parsed = JsonUtil.parse(json, List.class);
+			if (!(parsed instanceof List<?> list) || list.isEmpty()) {
+				return List.of();
+			}
+			List<Map<String, Object>> result = new ArrayList<>();
+			for (Object item : list) {
+				if (item instanceof Map<?, ?> map) {
+					Map<String, Object> values = new LinkedHashMap<>();
+					map.forEach((key, value) -> values.put(String.valueOf(key), value));
+					result.add(values);
+				}
+			}
+			return result;
+		} catch (Exception exception) {
+			return Collections.emptyList();
+		}
+	}
+
+	private static String joinCustomerNames(List<Map<String, Object>> rows) {
+		List<String> names = rows.stream()
+			.map(row -> trimToNull(row.get("customerName")))
+			.filter(Func::isNotEmpty)
+			.distinct()
+			.toList();
+		return names.isEmpty() ? null : String.join("、", names);
+	}
+
+	private static String toJsonOrNull(List<Map<String, Object>> rows) {
+		return rows == null || rows.isEmpty() ? null : JsonUtil.toJson(rows);
+	}
+
+	private static String trimToNull(Object value) {
+		if (value == null) {
+			return null;
+		}
+		String text = String.valueOf(value).trim();
+		return text.isEmpty() || "null".equalsIgnoreCase(text) ? null : text;
+	}
+
+	private static Long toLong(Object value) {
+		if (value == null) {
+			return null;
+		}
+		if (value instanceof Number number) {
+			return number.longValue();
+		}
+		String text = trimToNull(value);
+		if (Func.isEmpty(text)) {
+			return null;
+		}
+		try {
+			return Long.valueOf(text);
+		} catch (NumberFormatException exception) {
+			return null;
+		}
+	}
+}

blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java

@@ -212,19 +212,34 @@ public class KingdeeApBillSyncSupport {
 		if (Func.isBlank(awrpSrcCode)) {
 			return false;
 		}
-		BfiApBillQueryDTO param = new BfiApBillQueryDTO();
+		return queryApBillWriteOffFlags(List.of(awrpSrcCode)).getOrDefault(awrpSrcCode, Boolean.FALSE);
-		param.setAwrpSrcCode(List.of(awrpSrcCode));
+	}
-		param.setAwrpSrcSys(bfiProperties.getSrcSys());
+
-		for (BfiApBillVO apBill : BfiUtil.queryAllPages(pageNo -> {
+	/**
-			param.setPageNo(pageNo);
+	 * A102-4 冲销状态批量查询：防重键批量分批查询财务应付单，返回 防重键 -> 是否已冲销
-			param.setPageSize(PAY_RESULT_PAGE_SIZE);
+	 * （hadwrittenoff=true，部分冲销同样视为已冲销；同键多单取或，查不到的键不在结果中即视为未冲销）。
-			return bfiService.queryApBill(param);
+	 * 定时回写结算单金蝶冲销状态用，整批一次查询消除逐单远程查询 N+1
-		})) {
+	 *
-			if (awrpSrcCode.equals(apBill.getAwrpSrcCode()) && Boolean.TRUE.equals(apBill.getHadwrittenoff())) {
+	 * @param awrpSrcCodes 财务应付单防重键列表
-				return true;
+	 * @return 防重键 -> 是否已冲销
+	 */
+	public Map<String, Boolean> queryApBillWriteOffFlags(List<String> awrpSrcCodes) {
+		Map<String, Boolean> writeOffFlags = new LinkedHashMap<>();
+		batchForeach(awrpSrcCodes, bfiProperties.getWriteOffResult().getQueryBatchSize(), batch -> {
+			BfiApBillQueryDTO param = new BfiApBillQueryDTO();
+			param.setAwrpSrcCode(batch);
+			param.setAwrpSrcSys(bfiProperties.getSrcSys());
+			for (BfiApBillVO apBill : BfiUtil.queryAllPages(pageNo -> {
+				param.setPageNo(pageNo);
+				param.setPageSize(PAY_RESULT_PAGE_SIZE);
+				return bfiService.queryApBill(param);
+			})) {
+				if (Func.isNotEmpty(apBill.getAwrpSrcCode())) {
+					writeOffFlags.merge(apBill.getAwrpSrcCode(), Boolean.TRUE.equals(apBill.getHadwrittenoff()), Boolean::logicalOr);
+				}
 			}
-		}
+		});
-		return false;
+		return writeOffFlags;
 	}
 
 	// ==================== A102-2 财务应付单保存 ====================
@@ -282,8 +297,8 @@ public class KingdeeApBillSyncSupport {
 		param.setCurrencyNumber(currency);
 		// 【必填】付款组织.编码
 		param.setPayorgNumber(orgNumber);
-		// 部门.编码：项目业务部门自身的金蝶编码（结算/付款组织仍传上溯平台公司编码，口径与付款申请 A103-3 一致）
+		// 部门.编码：合同平台公司下业务部门配置的金蝶部门代码
-		param.setDepartmentNumber(this.kingdeeDeptNumber(contract.getProjectId(), context));
+		param.setDepartmentNumber(this.kingdeeDeptNumber(contract, contract.getProjectId(), context));
 		// 采购组织.编码（非必传）
 		// param.setPurorgNumber(orgNumber);
 		// 【必填】款项性质.编码
@@ -962,6 +977,20 @@ public class KingdeeApBillSyncSupport {
 	 * @return 组织编码
 	 */
 	public String bfiOrgNumber(ContractManage contract, KingdeeSyncContext context) {
+		if (contract == null) {
+			throw new ServiceException("推送金蝶失败，合同不存在，无法确定金蝶组织编码");
+		}
+		// 优先取合同平台公司金蝶代码；未维护时回退项目业务部门上溯
+		if (contract.getPlatformCompanyId() != null) {
+			Dept platformCompany = SysCache.getDept(contract.getPlatformCompanyId());
+			if (platformCompany == null) {
+				throw new ServiceException("推送金蝶失败，合同平台公司不存在，无法确定金蝶组织编码");
+			}
+			if (Func.isBlank(platformCompany.getKingdeeDeptCode())) {
+				throw new ServiceException("推送金蝶失败，平台公司[" + platformCompany.getDeptName() + "]未维护金蝶组织编码，请检查部门数据");
+			}
+			return platformCompany.getKingdeeDeptCode();
+		}
 		if (contract.getProjectId() == null) {
 			throw new ServiceException("推送金蝶失败，合同[" + Func.toStr(contract.getContractNo()) + "]未关联项目，无法确定金蝶组织编码");
 		}
@@ -993,20 +1022,41 @@ public class KingdeeApBillSyncSupport {
 	}
 
 	/**
-	 * 金蝶部门编码：项目业务部门自身的金蝶编码（blade_dept.kingdee_dept_code，不上溯平台公司），
+	 * 金蝶部门编码：必须取「业务部门配置」中合同平台公司 + 业务部门的金蝶部门代码；
-	 * 用于付款申请单 awrp_department_number（部门.编码）；项目未关联/未维护业务部门/业务部门未维护金蝶编码时拦截
+	 * 未配置时拦截推送
 	 *
 	 * @param projectId 项目id
 	 * @param context   金蝶同步上下文（缓存载体）
 	 * @return 部门编码
 	 */
 	public String kingdeeDeptNumber(Long projectId, KingdeeSyncContext context) {
-		ProjectApply project = this.requireOrgProject(projectId, context);
+		return kingdeeDeptNumber(null, projectId, context);
-		Dept dept = SysCache.getDept(project.getBusinessDeptId());
+	}
-		if (dept == null || Func.isBlank(dept.getKingdeeDeptCode())) {
+
-			throw new ServiceException("推送金蝶失败，项目业务部门[" + Func.toStr(project.getBusinessDeptName()) + "]未维护金蝶编码，请检查部门数据");
+	/**
+	 * 金蝶部门编码：按合同平台公司下业务部门配置的金蝶部门代码推送
+	 *
+	 * @param contract  合同（优先取其平台公司、合同负责部门）
+	 * @param projectId 项目id（合同未带业务部门时回退项目业务部门）
+	 * @param context   金蝶同步上下文（缓存载体）
+	 * @return 部门编码
+	 */
+	public String kingdeeDeptNumber(ContractManage contract, Long projectId, KingdeeSyncContext context) {
+		Long platformCompanyId = contract == null ? null : contract.getPlatformCompanyId();
+		Long businessDeptId = contract == null ? null : contract.getOrganizationId();
+		if (businessDeptId == null && projectId != null) {
+			ProjectApply project = this.requireOrgProject(projectId, context);
+			businessDeptId = project.getBusinessDeptId();
 		}
-		return dept.getKingdeeDeptCode();
+		if (platformCompanyId == null || businessDeptId == null) {
+			throw new ServiceException("业务部门对应的金蝶组织代码未配置，单据无法推送，请联系管理员处理。");
+		}
+		org.springblade.system.pojo.entity.BusinessDeptConfig config =
+			SysCache.getBusinessDeptConfig(platformCompanyId, businessDeptId);
+		if (config == null || Func.isBlank(config.getKingdeeDeptCode())) {
+			throw new ServiceException("业务部门对应的金蝶组织代码未配置，单据无法推送，请联系管理员处理。");
+		}
+		return config.getKingdeeDeptCode().trim();
 	}
 
 	/** 金蝶组织/部门编码共用校验：项目存在且已维护业务部门 */
@@ -1043,7 +1093,7 @@ public class KingdeeApBillSyncSupport {
 			? KingdeeBfiConstant.BFI_CUSTOMER_ASSTACT_TYPE : KingdeeBfiConstant.BFI_SUPPLIER_ASSTACT_TYPE;*/
 	}
 
-	/** 财务应付单往来户.编码：合同乙方关联客商档案取客商编码，未维护时拦截 */
+	/** 财务应付单往来户.编码：合同乙方关联客商档案取供应商编码/客商编码，均未维护时拦截 */
 	public String bfiAsstactNumber(ContractManage contract, KingdeeSyncContext context) {
 		if (Func.isBlank(contract.getPartyB())) {
 			throw new ServiceException("推送金蝶财务应付单失败，合同乙方不能为空，请检查合同[" + Func.toStr(contract.getContractNo()) + "]乙方信息");
@@ -1051,17 +1101,23 @@ public class KingdeeApBillSyncSupport {
 		// 批量同步时按乙方名称缓存客商编码（同批同一乙方只查一次），单笔同步退化为直接查询
 		String customerCode = context.customerCodeCache().computeIfAbsent(contract.getPartyB(), this::queryCustomerCode);
 		if (Func.isBlank(customerCode)) {
-			throw new ServiceException("推送金蝶财务应付单失败，合同乙方[" + contract.getPartyB() + "]未在客商档案中维护客商编码，请补充后重试");
+			throw new ServiceException("推送金蝶财务应付单失败，合同乙方[" + contract.getPartyB() + "]未在客商档案中维护供应商编码或客商编码，请补充后重试");
 		}
 		return customerCode;
 	}
 
-	/** 按乙方名称（全称或简称）查询客商编码，未维护返回 null（应收单同步组件复用：按结算单付款方查询） */
+	/**
+	 * 按乙方名称（全称或简称）查询金蝶往来户编码：优先供应商编码（A901-1 金蝶编码建档/同步时落库），
+	 * 未维护时兜底客商编号（A902-2 推送创建的金蝶档案编码即客商编号），均未维护返回 null（应收单同步组件复用：按结算单付款方查询）
+	 */
 	public String queryCustomerCode(String partyB) {
 		CustomerArchive customer = customerArchiveMapper.selectOne(Wrappers.<CustomerArchive>lambdaQuery()
 			.and(wrapper -> wrapper.eq(CustomerArchive::getFullName, partyB).or().eq(CustomerArchive::getShortName, partyB))
 			.eq(CustomerArchive::getIsDeleted, 0).last("limit 1"));
-		return customer == null ? null : customer.getCustomerCode();
+		if (customer == null) {
+			return null;
+		}
+		return Func.isBlank(customer.getSupplierCode()) ? customer.getCustomerCode() : customer.getSupplierCode();
 	}
 
 	/**