diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java
index 75ce8ed9..70d5d881 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java
+++ b/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();
+		});
+	}
+
 }
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
index b55af34f..06c2f08a 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java
+++ b/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);
+
 }
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
index bfb7d123..1579cab4 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java
+++ b/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("获取数据失败");
+	}
+
 }
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/BusinessDeptConfig.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/BusinessDeptConfig.java
new file mode 100644
index 00000000..18d08659
--- /dev/null
+++ b/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;
+
+}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java
index 0446ece9..a024a6f8 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java
+++ b/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;
 
 	/**
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/BusinessDeptConfigVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/BusinessDeptConfigVO.java
new file mode 100644
index 00000000..a81cbdea
--- /dev/null
+++ b/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;
+
+}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RoleDataScopeVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RoleDataScopeVO.java
index 1656f7ae..78eb5307 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/vo/RoleDataScopeVO.java
+++ b/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());
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/CertAuditRequest.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/CertAuditRequest.java
new file mode 100644
index 00000000..00a69ce8
--- /dev/null
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/CertAuditRequest.java
@@ -0,0 +1,62 @@
+/**
+ * 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.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 管理端认证审核请求
+ * <p>
+ * 同一字段 body 与 query 都可传，两处都给时以 body 为准。
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "管理端认证审核请求")
+public class CertAuditRequest implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "认证记录主键")
+	private Long id;
+	@Schema(description = "true 通过，false 驳回")
+	private Boolean pass;
+	@Schema(description = "驳回原因；驳回时必填，≤200 字")
+	private String rejectReason;
+	/**
+	 * 审核员修订后的全量认证内容（JSON）；空或空白表示不修订
+	 * <p>
+	 * 通过时才生效：它既是写回档案的依据，也会原样留痕到认证记录上。
+	 */
+	@Schema(description = "审核员修订后的全量认证内容JSON；空表示不修订")
+	private String auditedSnapshotJson;
+
+}
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/ExceptionMaintenanceRecordRequest.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/ExceptionMaintenanceRecordRequest.java
new file mode 100644
index 00000000..bae3f139
--- /dev/null
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/ExceptionMaintenanceRecordRequest.java
@@ -0,0 +1,90 @@
+/**
+ * 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.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 异常处置 → 录入维修记录请求
+ * <p>
+ * 车牌号与车船类型不接收前端传值：车牌取自异常处置，车船类型固定「车辆」，
+ * 避免维修记录挂到与异常无关的车上。
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "异常处置录入维修记录请求")
+public class ExceptionMaintenanceRecordRequest implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "异常处置ID")
+	private Long id;
+
+	@Schema(description = "维修时间")
+	private LocalDateTime maintenanceTime;
+
+	@Schema(description = "维修位置")
+	private String location;
+
+	@Schema(description = "维修人")
+	private String maintainer;
+
+	@Schema(description = "维修单位")
+	private String company;
+
+	@Schema(description = "联系方式")
+	private String contact;
+
+	@Schema(description = "更换零件")
+	private String replacedPart;
+
+	@Schema(description = "费用")
+	private BigDecimal cost;
+
+	@Schema(description = "里程数（公里）")
+	private BigDecimal mileage;
+
+	@Schema(description = "出厂时间")
+	private LocalDateTime factoryTime;
+
+	@Schema(description = "详细地址")
+	private String address;
+
+	@Schema(description = "备注说明")
+	private String remark;
+
+	@Schema(description = "附件JSON，[{\"name\":\"...\",\"url\":\"...\"}]")
+	private String attachments;
+
+}
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java
index dacae817..f87dd1c3 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractChange.java
+++ b/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;
 
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java
index ec4d89f9..fb35ad1f 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ContractManage.java
+++ b/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;
 
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlement.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlement.java
index 66fbf13d..2a2b36ca 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlement.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlement.java
@@ -164,6 +164,14 @@ public class FormalSettlement extends TenantEntity {
 	 * 金蝶推送失败原因（仅 failed 态展示；重推成功转 synced 后残留原因不再回显）
 	 */
 	private String kingdeeFailReason;
+	/**
+	 * 金蝶冲销状态：unwrittenoff-未冲销 writtenoff-已冲销（null=未推送金蝶或未校验）
+	 */
+	private String kingdeeWriteOffStatus;
+	/**
+	 * 金蝶冲销状态确认时间（定时回写/预检回写时间）
+	 */
+	private LocalDateTime kingdeeWriteOffTime;
 	/**
 	 * 附件JSON
 	 */
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/LoadingManage.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/LoadingManage.java
index e037a882..90129764 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/LoadingManage.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/LoadingManage.java
@@ -68,6 +68,9 @@ public class LoadingManage extends TenantEntity {
 	@Schema(description = "联系电话")
 	private String driverPhone;
 
+	@Schema(description = "司机ID")
+	private Long driverId;
+
 	@Schema(description = "押运人")
 	private String escortName;
 
@@ -83,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;
 
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/MaintenanceRecord.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/MaintenanceRecord.java
index 34d88f10..2d0a6219 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/MaintenanceRecord.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/MaintenanceRecord.java
@@ -61,6 +61,12 @@ public class MaintenanceRecord extends TenantEntity {
 	 */
 	@Schema(description = "车牌号/船号")
 	private String vehicleNo;
+	/**
+	 * 关联异常处置ID（小程序录入时写入）
+	 */
+	@Schema(description = "关联异常处置ID（小程序录入时写入）")
+	@TableField(updateStrategy = FieldStrategy.NEVER)
+	private Long exceptionId;
 	/**
 	 * 维修人
 	 */
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportCertRecord.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportCertRecord.java
index 4f1346f4..bfed3f33 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportCertRecord.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportCertRecord.java
@@ -28,6 +28,7 @@ package org.springblade.transport.pojo.entity;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -125,6 +126,19 @@ public class TransportCertRecord extends TenantEntity {
 	@TableField(updateStrategy = FieldStrategy.NEVER)
 	@Schema(description = "该次提交的全量认证内容JSON")
 	private String snapshotJson;
+	/**
+	 * 审核通过时确定的修订版内容（JSON）
+	 * <p>
+	 * 审核员可以在通过时直接改内容：司机提交的是 {@code snapshotJson}（永不可改），
+	 * 最终写回档案、司机端读到的「当前生效内容」以本字段优先，为 null 才回退到
+	 * {@code snapshotJson}。为 null 即「审核员没有修订」。
+	 * <p>
+	 * {@code @JsonIgnore}：司机端的 {@code TransportCertRecordVO} 继承本实体，
+	 * 修订版是审核过程的留痕，不该下发给司机。
+	 */
+	@JsonIgnore
+	@Schema(description = "审核通过时确定的修订版内容JSON；null 表示未修订")
+	private String auditedSnapshotJson;
 	/**
 	 * 驳回原因，仅当审核状态为已驳回时有值
 	 */
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/Waybill.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/Waybill.java
index a3157095..bd85768e 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/Waybill.java
+++ b/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;
 
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java
index bb6081fb..8b8bf43a 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/AdminHomeBadgesVO.java
@@ -38,7 +38,7 @@ public class AdminHomeBadgesVO implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	@Schema(description = "异常处置待办数（disposalStatus≠completed）")
+	@Schema(description = "异常处置待办数（disposalStatus=pending）")
 	private long exception;
 
 	@Schema(description = "风险记录待办数（disposalStatus=pending）")
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ArchiveManageStatsVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ArchiveManageStatsVO.java
new file mode 100644
index 00000000..085673f4
--- /dev/null
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ArchiveManageStatsVO.java
@@ -0,0 +1,47 @@
+/**
+ * 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>
+ * 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;
+
+/**
+ * 调度端档案统计（司机 + 车辆证件有效期）
+ */
+@Data
+@Schema(description = "调度端档案统计")
+public class ArchiveManageStatsVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "司机证件有效期统计")
+	private DriverExpiryStatVO driver = new DriverExpiryStatVO();
+
+	@Schema(description = "车辆证件有效期统计")
+	private TransportVehicleExpiryStatVO vehicle = new TransportVehicleExpiryStatVO();
+
+}
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/BusinessLicenseOcrVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/BusinessLicenseOcrVO.java
new file mode 100644
index 00000000..2b7452e8
--- /dev/null
+++ b/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<>();
+
+}
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CertAuditDetailVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CertAuditDetailVO.java
index 212eb072..672a7826 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CertAuditDetailVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/CertAuditDetailVO.java
@@ -81,6 +81,13 @@ public class CertAuditDetailVO implements Serializable {
 
 	@Schema(description = "待审快照：本次提交的全量内容")
 	private String pendingSnapshotJson;
+	/**
+	 * 审核员在本次审核中填写的修订版内容；未修订时为 null
+	 * <p>
+	 * 只在「通过」时才会落库，驳回不产生生效内容。审核页据此回显审核员改了什么。
+	 */
+	@Schema(description = "本次审核提交的修订版内容；未修订时为 null")
+	private String auditedSnapshotJson;
 	@Schema(description = "生效快照：该对象当前生效的全量内容；从未认证通过时为 null")
 	private String effectiveSnapshotJson;
 	@Schema(description = "生效快照记录ID；null 表示该对象从未认证通过")
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java
index 783fd123..7b1e215b 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ContractManageVO.java
@@ -64,9 +64,13 @@ public class ContractManageVO extends ContractManage {
 	private Boolean hcsSynced;
 
 	@TableField(exist = false)
-	@Schema(description = "生效类型筛选")
+	@Schema(description = "合同状态筛选")
 	private String effectiveType;
 
+	@TableField(exist = false)
+	@Schema(description = "客商（匹配甲/乙/丙方）")
+	private String partyName;
+
 	@TableField(exist = false)
 	@Schema(description = "创建人姓名")
 	private String createUserName;
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java
index 5b22c7ac..1072b4be 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/DriverVO.java
@@ -48,6 +48,12 @@ public class DriverVO extends Driver {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 搜索关键字：同时模糊匹配姓名与手机号（小程序列表用，管理端不传）
+	 */
+	@TableField(exist = false)
+	@Schema(description = "搜索关键字（姓名 / 手机号）")
+	private String keyword;
 	/**
 	 * 证件有效期状态：within30-30天内到期，expired-已到期
 	 */
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ExceptionDisposalVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ExceptionDisposalVO.java
index d120aa54..b53e854b 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ExceptionDisposalVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ExceptionDisposalVO.java
@@ -106,6 +106,10 @@ public class ExceptionDisposalVO extends ExceptionDisposal {
 	@Schema(description = "可调整的路线站点，少于两个站时为空")
 	private List<RouteNode> routeNodes;
 
+	@TableField(exist = false)
+	@Schema(description = "关联的维修记录（车辆故障维修异常录入，未录入时为空对象，判定须看 id）")
+	private MaintenanceRecordVO maintenanceRecord;
+
 	/**
 	 * 一个可调整的站点：站序声明、地址、该站的装卸标记与项目名
 	 */
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/LoadingCarrierContractVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/LoadingCarrierContractVO.java
index 22a40b87..76417029 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/LoadingCarrierContractVO.java
+++ b/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;
+
 }
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java
index bfacf9f3..27d8923c 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MaintenanceRecordVO.java
@@ -76,4 +76,25 @@ public class MaintenanceRecordVO extends MaintenanceRecord {
 	@Schema(description = "更新人姓名")
 	private String updateUserName;
 
+	/**
+	 * 关联运单号（由 exception_id 关联异常处置带出）
+	 */
+	@TableField(exist = false)
+	@Schema(description = "关联运单号")
+	private String waybillNo;
+
+	/**
+	 * 关联异常类型（一级）
+	 */
+	@TableField(exist = false)
+	@Schema(description = "关联异常类型")
+	private String exceptionType;
+
+	/**
+	 * 关联异常原因（二级）
+	 */
+	@TableField(exist = false)
+	@Schema(description = "关联异常原因")
+	private String exceptionReason;
+
 }
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MasterOrderCarrierVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MasterOrderCarrierVO.java
index 1ce202dd..f040a9ae 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/MasterOrderCarrierVO.java
+++ b/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;
+
 }
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportCertRecordVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportCertRecordVO.java
index c4bf8a40..0983df03 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportCertRecordVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportCertRecordVO.java
@@ -96,5 +96,13 @@ public class TransportCertRecordVO extends TransportCertRecord {
 	@TableField(exist = false)
 	@Schema(description = "司机手机号")
 	private String driverMobile;
+	/**
+	 * 该条记录是否经过审核员修订
+	 * <p>
+	 * 由服务层按 {@code auditedSnapshotJson} 是否有内容算出，前端据此打「已修订」标记。
+	 */
+	@TableField(exist = false)
+	@Schema(description = "是否经过审核员修订")
+	private Boolean revised;
 
 }
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java
index bd4ab362..97106813 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TransportVehicleVO.java
@@ -48,6 +48,12 @@ public class TransportVehicleVO extends TransportVehicle {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 搜索关键字：同时模糊匹配车牌、VIN 与所有人（小程序列表用，管理端不传）
+	 */
+	@TableField(exist = false)
+	@Schema(description = "搜索关键字（车牌 / VIN / 所有人）")
+	private String keyword;
 	/**
 	 * 证件有效期状态：within30-30天内到期，expired-已到期
 	 */
diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TripQueryVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TripQueryVO.java
index 750dd6d0..912b2b17 100644
--- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TripQueryVO.java
+++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/TripQueryVO.java
@@ -34,8 +34,10 @@ import java.util.Set;
 /**
  * 运次查询条件
  * <p>
- * 司机端用 {@link #forDriver(String)} 按司机手机号收口；管理端用 {@link #forAdmin()} 不按司机收口。
- * 两者都不给时收口为空集——收口一旦缺省就等于把别人的运次发出去，故缺省不放行。
+ * 司机端用 {@link #forDriver(Long)} 按司机档案 ID 收口；管理端用 {@link #forAdmin()} 不按司机收口。
+ * 两者都不给时收口为空集。
+ * <p>
+ * 归属判据只有司机档案 ID；driver_phone 是派单时的号码快照，不参与判定。
  */
 @Data
 @Schema(description = "运次查询条件")
@@ -47,8 +49,8 @@ public class TripQueryVO implements Serializable {
 	@Schema(description = "运次主键（详情按它取单个运次）")
 	private String tripId;
 
-	@Schema(description = "司机手机号")
-	private String driverPhone;
+	@Schema(description = "司机档案 ID（司机端收口判据，空或非正数一律不放行）")
+	private Long driverId;
 
 	@Schema(description = "是否不按司机收口（管理端）")
 	private boolean allDrivers;
@@ -92,9 +94,9 @@ public class TripQueryVO implements Serializable {
 	@Schema(description = "每页条数（按运次，不是运单）")
 	private Integer size;
 
-	public static TripQueryVO forDriver(String driverPhone) {
+	public static TripQueryVO forDriver(Long driverId) {
 		TripQueryVO query = new TripQueryVO();
-		query.setDriverPhone(driverPhone);
+		query.setDriverId(driverId);
 		return query;
 	}
 
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/cache/UserCache.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/cache/UserCache.java
index b181e1f5..aeb72901 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/cache/UserCache.java
+++ b/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);
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java
index 50be69e0..534d7437 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/feign/IUserClient.java
+++ b/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);
+
 
 	/**
 	 * 根据账号获取用户信息
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/BusinessDeptConfigController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/BusinessDeptConfigController.java
new file mode 100644
index 00000000..d351b7e6
--- /dev/null
+++ b/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));
+	}
+
+}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index eafb7b30..0c4a3256 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/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 = "树形结构")
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/convert/UserConvert.java b/blade-service/blade-system/src/main/java/org/springblade/system/convert/UserConvert.java
index 2dabbf04..e1167b0e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/convert/UserConvert.java
+++ b/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 登录名关联本批已新增或更新的用户
-        String oaLoginId = person == null ? null : StringUtils.trimToNull(person.getLoginid());
-        userDept.setUserId(oaLoginId == null ? null : userMap.get(oaLoginId));
+        // 用户id，按工号同步键关联本批已新增或更新的用户
+        String oaLoginId = resolveOaLoginId(person);
+        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;
     }
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
index a4cf9718..40900821 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java
+++ b/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));
+	}
+
 }
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java
index f25da255..1a0cfc9b 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java
+++ b/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) {
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/BusinessDeptConfigMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/BusinessDeptConfigMapper.java
new file mode 100644
index 00000000..5c66af76
--- /dev/null
+++ b/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);
+
+}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/BusinessDeptConfigMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/BusinessDeptConfigMapper.xml
new file mode 100644
index 00000000..a954b418
--- /dev/null
+++ b/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>
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
index 1f38b0fd..c1242385 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
+++ b/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>
 
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IBusinessDeptConfigService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IBusinessDeptConfigService.java
new file mode 100644
index 00000000..2d305adf
--- /dev/null
+++ b/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);
+
+}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleMenuDataScopeService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleMenuDataScopeService.java
index 93cb33d2..17349a22 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleMenuDataScopeService.java
+++ b/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);
+
 	/**
 	 * 合并用户全部角色菜单配置为最宽数据权限
 	 *
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java
index fedecc77..e4160480 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java
+++ b/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 显式指定时允许跨租户，否则归属当前会话租户）
 	 *
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/BusinessDeptConfigServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/BusinessDeptConfigServiceImpl.java
new file mode 100644
index 00000000..6c520b2e
--- /dev/null
+++ b/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;
+	}
+
+}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
index a211a169..2b2f485e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
+++ b/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);
-		if (scope == null || scope.isAllDept()) {
+		RoleDataScopeVO scope = roleMenuDataScopeService.resolveByMenuCodeOrEmpty(roleIds, MENU_DEPT_TREE, userDeptIds);
+		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) {
-			dept.setIsPlatformCompany(0);
-		}
-		if (dept.getIsBusinessDept() == null) {
-			dept.setIsBusinessDept(0);
-		}
+		// 统一规范为 0/1，避免前端传空串、布尔或其它类型导致更新未生效
+		dept.setIsPlatformCompany(normalizeYesNoFlag(dept.getIsPlatformCompany()));
+		dept.setIsBusinessDept(normalizeYesNoFlag(dept.getIsBusinessDept()));
 		// 排序未填时默认 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);
 	}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java
index 21d62c4a..3d40bc8e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java
+++ b/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.extractOaLoginIds(oaPersons),
-                    oaUserListSyncHelper.extractWorkcodes(oaPersons));
+            oaUserListSyncHelper.removeOaUsersAbsentFrom(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();
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OaUserListSyncHelper.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OaUserListSyncHelper.java
index d4c89dc2..a99147a6 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OaUserListSyncHelper.java
+++ b/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) {
-		boolean noLoginIds = CollectionUtil.isEmpty(oaLoginIds);
-		boolean noWorkcodes = CollectionUtil.isEmpty(workcodes);
-		if (noLoginIds && noWorkcodes) {
-			ComposeLogUtil.getLastLog().warn("全量同步未收集到OA登录名和工号，跳过删除本地 is_oa=2 人员");
+	public int removeOaUsersAbsentFrom(Set<String> workcodes) {
+		if (CollectionUtil.isEmpty(workcodes)) {
+			ComposeLogUtil.getLastLog().warn("全量同步未收集到OA工号，跳过删除本地 is_oa=2 人员");
 			return 0;
 		}
-		Set<String> loginIdSet = noLoginIds ? Set.of() : oaLoginIds;
-		Set<String> workcodeSet = noWorkcodes ? Set.of() : workcodes;
+		Set<String> workcodeSet = 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);
-			boolean keptByWorkcode = oaLoginId == null && workcode != null && workcodeSet.contains(workcode);
-			if (!keptByLoginId && !keptByWorkcode) {
+			if (workcode == null || !workcodeSet.contains(workcode)) {
 				removeIds.add(oaUser.getId());
 			}
 		}
@@ -535,54 +502,13 @@ public class OaUserListSyncHelper {
 	}
 
 	/**
-	 * 按 OA 登录名删除已有 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 账号。
+	 * 按工号删除已有 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)
-					.and(wrapper -> wrapper.isNull(User::getOaLoginId).or().eq(User::getOaLoginId, "")))
+					.in(User::getCode, workcodeBatch))
 				.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) {
-					resignedLoginIds.add(oaLoginId);
-				} else if (workcode != null) {
+				if (workcode != null) {
 					resignedWorkcodes.add(workcode);
 				}
 				continue;
 			}
-			if (oaLoginId != null) {
-				resignedLoginIds.remove(oaLoginId);
-			} else if (workcode != null) {
+			if (workcode != null) {
 				resignedWorkcodes.remove(workcode);
 			}
 			uniquePersonMap.put(syncKey, oaPerson);
 		}
 		String tenantId = resolveTenantId();
-		int removedCount = this.removeOaUsersByLoginIds(tenantId, resignedLoginIds)
-			+ this.removeOaUsersByBlankLoginWorkcodes(tenantId, resignedWorkcodes);
+		int removedCount = this.removeOaUsersByWorkcodes(tenantId, resignedWorkcodes);
 		if (uniquePersonMap.isEmpty()) {
-			if (resignedLoginIds.isEmpty() && resignedWorkcodes.isEmpty()) {
-				ComposeLogUtil.getLastLog().warn("OA人员均缺少登录名和工号，跳过人员同步");
+			if (resignedWorkcodes.isEmpty()) {
+				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.loadUsersByBlankLoginWorkcode(tenantId, workcodes);
+		Map<String, User> existingByWorkcode = this.loadUsersByWorkcode(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) {
-		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) {
+	private Map<String, User> loadUsersByWorkcode(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)
-					.and(wrapper -> wrapper.isNull(User::getOaLoginId).or().eq(User::getOaLoginId, "")))
+					.in(User::getCode, workcodeBatch))
 				.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;
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleMenuDataScopeServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleMenuDataScopeServiceImpl.java
index 0314afc9..04d62d5b 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleMenuDataScopeServiceImpl.java
+++ b/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()
-			.eq(Menu::getCode, menuCode)
-			.eq(Menu::getIsDeleted, 0)
-			.last("limit 1"));
+		Menu menu = findMenuByCode(menuCode);
 		if (Func.isEmpty(menu)) {
 			return RoleDataScopeVO.all();
 		}
-		List<RoleMenuDataScope> scopeList = list(Wrappers.<RoleMenuDataScope>lambdaQuery()
-			.in(RoleMenuDataScope::getRoleId, roleIds)
-			.eq(RoleMenuDataScope::getMenuId, menu.getId())
-			.eq(RoleMenuDataScope::getIsDeleted, 0));
+		List<RoleMenuDataScope> scopeList = listScopes(roleIds, menu.getId());
 		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)) {
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java
index 67ef69fb..67122919 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java
+++ b/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);
+	}
+
 	/**
 	 * 统一的租户范围过滤：超管放行，其他用户强制限定为当前会话租户。
 	 */
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/BusinessDeptConfigWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/BusinessDeptConfigWrapper.java
new file mode 100644
index 00000000..e2f8e077
--- /dev/null
+++ b/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;
+	}
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/config/BfiProperties.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/config/BfiProperties.java
index e61d785d..19174df4 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/config/BfiProperties.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/config/BfiProperties.java
@@ -110,6 +110,11 @@ public class BfiProperties {
 	 */
 	private ArResult arResult = new ArResult();
 
+	/**
+	 * 金蝶冲销状态回写配置（A102-4/A302-4）
+	 */
+	private WriteOffResult writeOffResult = new WriteOffResult();
+
 	/**
 	 * 金蝶单据锁定补偿配置
 	 */
@@ -254,7 +259,7 @@ public class BfiProperties {
 		private long lockLeaseSeconds = 1800;
 
 		/**
-		 * A103-4 付款处理查询业务日期窗口天数，默认 60
+		 * A103-4 付款处理查询业务日期窗口天数（接口必填参数，按 awrp_sourcebillno 精确过滤单据），默认 60
 		 */
 		private int queryWindowDays = 60;
 	}
@@ -364,6 +369,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;
+	}
+
 	/**
 	 * 金蝶单据锁定补偿配置项
 	 */
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
index 055be3f3..353583f7 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/KingdeeBfiConstant.java
@@ -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";
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/BaiduOcrController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/BaiduOcrController.java
index c94cc068..56c682b0 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/BaiduOcrController.java
+++ b/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);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java
index 6e6a024f..77c50af3 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CertificationAuditController.java
@@ -36,6 +36,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.pojo.dto.CertAuditRequest;
 import org.springblade.transport.pojo.vo.CertAuditCapabilityVO;
 import org.springblade.transport.pojo.vo.CertAuditDetailVO;
 import org.springblade.transport.pojo.vo.TransportCertRecordVO;
@@ -43,10 +44,13 @@ import org.springblade.transport.service.ICertAuditService;
 import org.springblade.transport.support.CertAuditPermissions;
 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;
 
+import java.util.function.Function;
+
 /**
  * 认证审核（管理端）
  * <p>
@@ -92,13 +96,26 @@ public class CertificationAuditController extends BladeController {
 
 	@PostMapping("/audit")
 	@ApiOperationSupport(order = 3)
-	@Operation(summary = "审核认证记录", description = "通过使该记录成为生效快照；驳回只终结该记录，生效快照不变")
+	@Operation(summary = "审核认证记录", description = "通过使该记录成为生效快照；驳回只终结该记录，生效快照不变。通过时可携带修订后的全量认证内容，它将成为新的生效内容并原样留痕")
 	@PreAuth(CertAuditPermissions.AUDIT_ACTION)
 	public R<Boolean> audit(
-		@Parameter(description = "认证记录主键", required = true) @RequestParam Long id,
-		@Parameter(description = "是否通过", required = true) @RequestParam Boolean pass,
+		@Parameter(description = "审核请求体（推荐）：id、pass、rejectReason、auditedSnapshotJson")
+		@RequestBody(required = false) CertAuditRequest body,
+		@Parameter(description = "认证记录主键（兼容老调用）") @RequestParam(required = false) Long id,
+		@Parameter(description = "是否通过（兼容老调用）") @RequestParam(required = false) Boolean pass,
 		@Parameter(description = "驳回原因，驳回时必填") @RequestParam(required = false) String rejectReason) {
-		return R.status(certAuditService.audit(id, Boolean.TRUE.equals(pass), rejectReason));
+		// 同一字段 body 与 query 都可传，两处都给时以 body 为准。
+		Long recordId = preferBody(body, CertAuditRequest::getId, id);
+		Boolean approved = preferBody(body, CertAuditRequest::getPass, pass);
+		String reason = preferBody(body, CertAuditRequest::getRejectReason, rejectReason);
+		String revision = preferBody(body, CertAuditRequest::getAuditedSnapshotJson, null);
+		if (recordId == null) {
+			return R.fail("缺少认证记录ID");
+		}
+		if (approved == null) {
+			return R.fail("缺少审核结果");
+		}
+		return R.status(certAuditService.audit(recordId, Boolean.TRUE.equals(approved), reason, revision));
 	}
 
 	// 本接口不挂 @PreAuth；无权限时返回 false。
@@ -109,4 +126,21 @@ public class CertificationAuditController extends BladeController {
 		return R.data(certAuditService.capability());
 	}
 
+	/**
+	 * 取一个审核参数：body 里给了就用 body 的，否则用 query 的
+	 *
+	 * @param body       审核请求体，可为 null
+	 * @param getter     从请求体取该字段
+	 * @param queryValue 该字段的 query 参数值
+	 * @param <T>        字段类型
+	 * @return body 字段值；body 为 null 或该字段为 null 时返回 query 参数值
+	 */
+	private static <T> T preferBody(CertAuditRequest body, Function<CertAuditRequest, T> getter, T queryValue) {
+		if (body == null) {
+			return queryValue;
+		}
+		T bodyValue = getter.apply(body);
+		return bodyValue == null ? queryValue : bodyValue;
+	}
+
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractManageController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractManageController.java
index 364dbcc9..eb0584db 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ContractManageController.java
+++ b/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) {
-		return R.data(contractManageService.nextContractNo(organizationId));
+		@Parameter(description = "合同负责部门ID", required = true) @RequestParam Long organizationId,
+		@Parameter(description = "平台公司ID", required = true) @RequestParam Long platformCompanyId) {
+		return R.data(contractManageService.nextContractNo(organizationId, platformCompanyId));
 	}
 
 	@GetMapping("/export-contract-manage")
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverAppController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverAppController.java
index 6040145d..e43b197f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverAppController.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverAppController.java
@@ -54,9 +54,10 @@ public class DriverAppController extends BladeController {
 
 	@GetMapping("/mine")
 	@ApiOperationSupport(order = 1)
-	@Operation(summary = "当前登录司机档案", description = "按手机号匹配 blade_transport_driver.mobile；可传 mobile，未传则从登录态解析")
+	@Operation(summary = "当前登录司机档案", description = "按登录用户的 user_id 匹配 blade_transport_driver.user_id")
+	// mobile：旧版小程序仍会带这个参数，已不参与解析，保留只为不让老客户端报错
 	public R<DriverVO> mine(@RequestParam(required = false) String mobile) {
-		return R.data(driverAppService.currentByPhone(mobile));
+		return R.data(driverAppService.current());
 	}
 
 	@GetMapping("/vehicles")
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverWaybillController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverWaybillController.java
index 06eaf200..96a6e25d 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverWaybillController.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/DriverWaybillController.java
@@ -65,14 +65,14 @@ public class DriverWaybillController extends BladeController {
 
 	@GetMapping("/current-task")
 	@ApiOperationSupport(order = 1)
-	@Operation(summary = "首页：当前运输中任务", description = "当前用户手机号匹配运单 driverPhone 且 businessStatus=running 的最新一条运单")
+	@Operation(summary = "首页：当前运输中任务", description = "当前司机档案（按登录用户解析）名下、businessStatus=running 的最新一条运单；归属判据是运单 driver_id")
 	public R<DriverWaybillCardVO> currentTask() {
 		return R.data(driverWaybillService.currentTask());
 	}
 
 	@GetMapping("/pending-preview")
 	@ApiOperationSupport(order = 2)
-	@Operation(summary = "首页：待接运单预览", description = "当前用户手机号匹配运单 driverPhone 且 businessStatus=pending 的预览列表与总数")
+	@Operation(summary = "首页：待接运单预览", description = "当前司机档案名下、businessStatus=pending 的预览列表与总数；归属判据是运单 driver_id")
 	public R<DriverWaybillPreviewVO> pendingPreview(
 		@Parameter(description = "预览条数，默认 2") @RequestParam(required = false) Integer size) {
 		return R.data(driverWaybillService.pendingPreview(size));
@@ -80,14 +80,14 @@ public class DriverWaybillController extends BladeController {
 
 	@GetMapping("/counts")
 	@ApiOperationSupport(order = 3)
-	@Operation(summary = "运单 Tab 统计", description = "仅统计当前用户手机号匹配运单 driverPhone 的运单：全部 / 待接单 / 进行中 / 已完成")
+	@Operation(summary = "运单 Tab 统计", description = "仅统计当前司机档案名下（运单 driver_id）的运单：全部 / 待接单 / 进行中 / 已完成")
 	public R<DriverWaybillTabCountsVO> counts() {
 		return R.data(driverWaybillService.tabCounts());
 	}
 
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 4)
-	@Operation(summary = "运单分页列表", description = "仅返回运单 driverPhone 等于当前用户手机号的数据；status：空=全部，0待接单，1运输中，2已完成")
+	@Operation(summary = "运单分页列表", description = "仅返回运单 driver_id 等于当前司机档案的数据；status：空=全部，0待接单，1运输中，2已完成")
 	public R<IPage<DriverWaybillCardVO>> page(
 		@Parameter(description = "当前页") @RequestParam(required = false) Integer current,
 		@Parameter(description = "每页条数") @RequestParam(required = false) Integer size,
@@ -107,14 +107,14 @@ public class DriverWaybillController extends BladeController {
 
 	@GetMapping("/task/current")
 	@ApiOperationSupport(order = 21)
-	@Operation(summary = "首页：当前运输中运次", description = "当前用户手机号可见的运输中或待确认（待回单确认）运次（有配载单的一趟车算一个）最新一条")
+	@Operation(summary = "首页：当前运输中运次", description = "当前司机档案可见的运输中或待确认（待回单确认）运次（有配载单的一趟车算一个）最新一条；配载段按配载单 driver_id，未配载段按运单 driver_id")
 	public R<DriverWaybillCardVO> tripCurrentTask() {
 		return R.data(driverWaybillService.tripCurrentTask());
 	}
 
 	@GetMapping("/task/pending-preview")
 	@ApiOperationSupport(order = 22)
-	@Operation(summary = "首页：待接运次预览", description = "当前用户手机号可见的待接运次预览与总数（按运次计）")
+	@Operation(summary = "首页：待接运次预览", description = "当前司机档案可见的待接运次预览与总数（按运次计）")
 	public R<DriverWaybillPreviewVO> tripPendingPreview(
 		@Parameter(description = "预览条数，默认 2") @RequestParam(required = false) Integer size) {
 		return R.data(driverWaybillService.tripPendingPreview(size));
@@ -166,7 +166,7 @@ public class DriverWaybillController extends BladeController {
 
 	@PostMapping("/track")
 	@ApiOperationSupport(order = 11)
-	@Operation(summary = "司机端行驶轨迹", description = "按当前用户手机号校验归属后，根据打卡记录/计划时间自动推导起止日期并查询 LBS 轨迹（WGS-84）")
+	@Operation(summary = "司机端行驶轨迹", description = "按当前司机档案校验归属后，根据打卡记录/计划时间自动推导起止日期并查询 LBS 轨迹（WGS-84）")
 	public R<WaybillTrackVO> track(@Parameter(description = "运单ID", required = true) @RequestParam Long id) {
 		return R.data(driverWaybillService.track(id));
 	}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ExceptionDisposalController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ExceptionDisposalController.java
index 2b42643a..d9151be7 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ExceptionDisposalController.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ExceptionDisposalController.java
@@ -36,6 +36,7 @@ import org.springblade.transport.pojo.dto.ExceptionDisposalFollowRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalRejectRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalRouteAdjustRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalUpdateRequest;
+import org.springblade.transport.pojo.dto.ExceptionMaintenanceRecordRequest;
 import org.springblade.transport.pojo.entity.ExceptionDisposal;
 import org.springblade.transport.pojo.vo.ExceptionDisposalVO;
 import org.springblade.transport.service.IExceptionDisposalService;
@@ -140,4 +141,12 @@ public class ExceptionDisposalController extends BladeController {
 		return R.success("已调整路线");
 	}
 
+	@PostMapping("/maintenance-record")
+	@ApiOperationSupport(order = 11)
+	@Operation(summary = "录入维修记录", description = "车辆故障维修类异常的子流程：写一条关联维修记录并追加跟进记录，不结案；一条异常至多一条；仅需登录态")
+	public R submitMaintenanceRecord(@RequestBody ExceptionMaintenanceRecordRequest request) {
+		exceptionDisposalService.submitMaintenanceRecord(request);
+		return R.success("已保存维修记录");
+	}
+
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/HcsSyncController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/HcsSyncController.java
index 0a721310..0a6722c1 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/HcsSyncController.java
+++ b/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=收票单）
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java
index 320c8b22..c3b1e790 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/LoadingManageController.java
@@ -56,7 +56,7 @@ public class LoadingManageController extends BladeController {
 
 	@GetMapping("/carrier-contracts")
 	@ApiOperationSupport(order = 13)
-	@Operation(summary = "可选承运商合同", description = "查询已审核生效的承运商合同；传入 waybillIds 时按子运单客户合同甲方匹配后对乙方取交集")
+	@Operation(summary = "可选承运商合同", description = "查询已审核生效的承运商合同；传入 waybillIds 时按子运单客户合同乙方=承运商合同甲方匹配后对乙方取交集")
 	public R<List<LoadingCarrierContractVO>> carrierContracts(
 		@RequestParam List<Long> projectIds,
 		@RequestParam(required = false) List<Long> waybillIds) {
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveController.java
new file mode 100644
index 00000000..ac6a36bc
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveController.java
@@ -0,0 +1,94 @@
+/**
+ * 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>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springblade.transport.pojo.vo.ArchiveManageStatsVO;
+import org.springblade.transport.pojo.vo.DeptTreeNodeVO;
+import org.springblade.transport.service.IManageArchiveService;
+import org.springblade.transport.support.MpUserDataScopeSupport;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 调度端档案（小程序管理端）
+ * <p>
+ * 对外完整路径：{@code /api/blade-transport/archive/manage/**}
+ * （网关 StripPrefix 去掉 {@code blade-transport} 后落入 {@code /archive/manage/**}）。
+ * 同时兼容未去前缀直连（{@code /blade-transport/archive/manage/**}）。
+ * 仅需登录态，不挂管理端菜单鉴权。
+ * <p>
+ * 为什么单独一个接口：管理端 {@code /driver/expiry-stat}、{@code /transport-vehicle/expiry-stat}
+ * 挂在 {@code @PreAuth(menu = "driver")} / {@code @PreAuth(menu = "transport_vehicle")} 下，
+ * 小程序登录的令牌 roleId 是占位值 "0"、查不到 blade_role_menu，必然被拒（401 请求未授权）。
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping({"/archive/manage", "/blade-transport/archive/manage"})
+@Tag(name = "调度端档案", description = "小程序调度端资料页档案统计")
+public class ManageArchiveController extends BladeController {
+
+	/**
+	 * 权限不足的业务码。小程序请求层把 401 当会话失效，接口一律不得回 401。
+	 */
+	private static final int FORBIDDEN_CODE = 403;
+
+	private static final String FORBIDDEN_MSG = "仅调度端管理员可选择组织";
+
+	private final IManageArchiveService manageArchiveService;
+	private final MpUserDataScopeSupport mpUserDataScopeSupport;
+
+	@GetMapping("/stats")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "档案统计", description = "司机档案与车辆档案的总数、30 天内到期数、已到期数；不按组织收口")
+	public R<ArchiveManageStatsVO> stats() {
+		return R.data(manageArchiveService.stats());
+	}
+
+	// 本接口不挂 @PreAuth；无权限返回 false，不抛 403，供小程序决定空态。
+	@GetMapping("/capability")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "档案管理能力判定", description = "当前登录是否为调度端管理员；false 时小程序显示无权限空态，不踢登录")
+	public R<Boolean> capability() {
+		return R.data(mpUserDataScopeSupport.isMpDispatcher());
+	}
+
+	@GetMapping("/dept/tree")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "组织树", description = "小程序组织选择器用：启用中的部门树，已剔除「外部组织」整支；非管理员回业务 403")
+	public R<List<DeptTreeNodeVO>> deptTree() {
+		if (!mpUserDataScopeSupport.isMpDispatcher()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		return R.data(manageArchiveService.deptTree());
+	}
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveDriverController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveDriverController.java
new file mode 100644
index 00000000..e5e25fcb
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveDriverController.java
@@ -0,0 +1,180 @@
+/**
+ * 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>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.transport.pojo.entity.Driver;
+import org.springblade.transport.pojo.vo.DriverVO;
+import org.springblade.transport.service.IDriverService;
+import org.springblade.transport.support.MpUserDataScopeSupport;
+import org.springblade.transport.wrapper.DriverWrapper;
+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;
+
+import java.time.LocalDate;
+
+/**
+ * 调度端司机档案管理（小程序）
+ * <p>
+ * 对外完整路径：{@code /api/blade-transport/archive/manage/driver/**}
+ * （网关 StripPrefix 去掉 {@code blade-transport} 后落入 {@code /archive/manage/driver/**}），
+ * 同时兼容未去前缀直连。
+ * <p>
+ * 为什么不复用管理端的 {@code /driver/**}：那些接口挂在 {@code @PreAuth(menu = "driver")} 下，
+ * 小程序令牌的 roleId 是占位值 "0"、查不到 blade_role_menu，对任何小程序账号都必然被拒。
+ * 这里不挂 {@code @PreAuth}，改成方法内显式判定管理员身份，且**权限不足必须回业务 403**：
+ * 小程序请求层把 401 一律当会话失效（清令牌 + 回登录页），回 401 会把越权访问变成被踢下线。
+ *
+ * @author Chill
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping({"/archive/manage/driver", "/blade-transport/archive/manage/driver"})
+@Tag(name = "调度端司机档案", description = "小程序调度端司机管理")
+public class ManageArchiveDriverController extends BladeController {
+
+	private static final int DEFAULT_CURRENT = 1;
+	private static final int DEFAULT_SIZE = 10;
+	private static final int MAX_SIZE = 100;
+
+	/**
+	 * 权限不足的业务码。小程序请求层把 401 当会话失效，接口一律不得回 401。
+	 */
+	private static final int FORBIDDEN_CODE = 403;
+
+	private static final String FORBIDDEN_MSG = "仅调度端管理员可管理司机档案";
+
+	private final IDriverService driverService;
+	private final MpUserDataScopeSupport mpUserDataScopeSupport;
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "司机档案分页", description = "keyword 同时模糊匹配姓名与手机号；status 不传为启用停用全量；expireStatus 取 within30 / expired")
+	public R<IPage<DriverVO>> page(DriverVO driver, Query query) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		fillExpiryDate(driver);
+		return R.data(driverService.selectDriverPage(Condition.getPage(normalizeQuery(query)), driver));
+	}
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "司机档案详情")
+	public R<DriverVO> detail(@Parameter(description = "司机主键", required = true) @RequestParam Long id) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		Driver query = new Driver();
+		query.setId(id);
+		return R.data(DriverWrapper.build().entityVO(driverService.getOne(Condition.getQueryWrapper(query))));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "新增或修改司机档案", description = "直接写档案、立即生效，不生成待审快照")
+	public R submit(@Valid @RequestBody Driver driver) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		// 生效指针只由认证审核流水写（通过才建立生效快照），不接受管理端写入
+		driver.setEffectiveCertRecordId(null);
+		boolean saved = driverService.submit(driver);
+		// submit 内部把空串 trimToNull，update-strategy=not_null 会跳过该字段，导致删不掉大头照；这里显式清空
+		if (saved && driver.getId() != null && Func.isBlank(driver.getHeadPhoto())) {
+			driverService.update(Wrappers.<Driver>lambdaUpdate()
+				.eq(Driver::getId, driver.getId())
+				.set(Driver::getHeadPhoto, null));
+		}
+		return R.status(saved);
+	}
+
+	/**
+	 * 启停用
+	 */
+	@PostMapping("/status")
+	@ApiOperationSupport(order = 4)
+	@Operation(summary = "启用 / 停用司机", description = "status：1 启用，2 停用。停用司机不进调度检索，但仍可登录")
+	public R status(@Parameter(description = "主键", required = true) @RequestParam Long id,
+					@Parameter(description = "状态：1 启用，2 停用", required = true) @RequestParam Integer status) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		return R.status(driverService.changeStatus(id, status));
+	}
+
+	private boolean canManage() {
+		return mpUserDataScopeSupport.isMpDispatcher();
+	}
+
+	private Query normalizeQuery(Query query) {
+		if (query == null) {
+			query = new Query();
+		}
+		if (query.getCurrent() == null || query.getCurrent() < DEFAULT_CURRENT) {
+			query.setCurrent(DEFAULT_CURRENT);
+		}
+		if (query.getSize() == null || query.getSize() <= 0) {
+			query.setSize(DEFAULT_SIZE);
+		}
+		if (query.getSize() > MAX_SIZE) {
+			query.setSize(MAX_SIZE);
+		}
+		return query;
+	}
+
+	private void fillExpiryDate(DriverVO driver) {
+		if (driver.getToday() == null) {
+			driver.setToday(LocalDate.now());
+		}
+		if (driver.getWarningDate() == null) {
+			driver.setWarningDate(driver.getToday().plusDays(30));
+		}
+	}
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveVehicleController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveVehicleController.java
new file mode 100644
index 00000000..b6f930a1
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ManageArchiveVehicleController.java
@@ -0,0 +1,169 @@
+/**
+ * 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>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.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.tool.api.R;
+import org.springblade.transport.pojo.entity.TransportVehicle;
+import org.springblade.transport.pojo.vo.TransportVehicleVO;
+import org.springblade.transport.service.ITransportVehicleService;
+import org.springblade.transport.support.MpUserDataScopeSupport;
+import org.springblade.transport.wrapper.TransportVehicleWrapper;
+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;
+
+import java.time.LocalDate;
+
+/**
+ * 调度端车辆档案管理（小程序）
+ * <p>
+ * 对外完整路径：{@code /api/blade-transport/archive/manage/vehicle/**}
+ * （网关 StripPrefix 去掉 {@code blade-transport} 后落入 {@code /archive/manage/vehicle/**}），
+ * 同时兼容未去前缀直连。
+ * <p>
+ * 与管理端 {@code /transport-vehicle/**} 的关系、以及为什么必须回业务 403 而不是 401，
+ * 见 {@link ManageArchiveDriverController} 的类注释。
+ *
+ * @author Chill
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping({"/archive/manage/vehicle", "/blade-transport/archive/manage/vehicle"})
+@Tag(name = "调度端车辆档案", description = "小程序调度端车辆管理")
+public class ManageArchiveVehicleController extends BladeController {
+
+	private static final int DEFAULT_CURRENT = 1;
+	private static final int DEFAULT_SIZE = 10;
+	private static final int MAX_SIZE = 100;
+
+	/**
+	 * 权限不足的业务码。小程序请求层把 401 当会话失效，接口一律不得回 401。
+	 */
+	private static final int FORBIDDEN_CODE = 403;
+
+	private static final String FORBIDDEN_MSG = "仅调度端管理员可管理车辆档案";
+
+	private final ITransportVehicleService transportVehicleService;
+	private final MpUserDataScopeSupport mpUserDataScopeSupport;
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 1)
+	@Operation(summary = "车辆档案分页", description = "keyword 同时模糊匹配车牌、VIN 与所有人；status 不传为启用停用全量；expireStatus 取 within30 / expired")
+	public R<IPage<TransportVehicleVO>> page(TransportVehicleVO vehicle, Query query) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		fillExpiryDate(vehicle);
+		return R.data(transportVehicleService.selectTransportVehiclePage(Condition.getPage(normalizeQuery(query)), vehicle));
+	}
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 2)
+	@Operation(summary = "车辆档案详情")
+	public R<TransportVehicleVO> detail(@Parameter(description = "车辆主键", required = true) @RequestParam Long id) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		TransportVehicle query = new TransportVehicle();
+		query.setId(id);
+		return R.data(TransportVehicleWrapper.build().entityVO(transportVehicleService.getOne(Condition.getQueryWrapper(query))));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 3)
+	@Operation(summary = "新增或修改车辆档案", description = "直接写档案、立即生效，不生成待审快照，也不改动认证状态")
+	public R submit(@Valid @RequestBody TransportVehicle vehicle) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		// 生效指针只由认证审核流水写（通过才建立生效快照），不接受管理端写入
+		vehicle.setEffectiveCertRecordId(null);
+		return R.status(transportVehicleService.submit(vehicle));
+	}
+
+	/**
+	 * 启停用
+	 */
+	@PostMapping("/status")
+	@ApiOperationSupport(order = 4)
+	@Operation(summary = "启用 / 停用车辆", description = "status：1 启用，2 停用。停用车辆不进车辆检索、司机端车辆列表不再出现")
+	public R status(@Parameter(description = "主键", required = true) @RequestParam Long id,
+					@Parameter(description = "状态：1 启用，2 停用", required = true) @RequestParam Integer status) {
+		if (!canManage()) {
+			return R.fail(FORBIDDEN_CODE, FORBIDDEN_MSG);
+		}
+		return R.status(transportVehicleService.changeStatus(id, status));
+	}
+
+	private boolean canManage() {
+		return mpUserDataScopeSupport.isMpDispatcher();
+	}
+
+	private Query normalizeQuery(Query query) {
+		if (query == null) {
+			query = new Query();
+		}
+		if (query.getCurrent() == null || query.getCurrent() < DEFAULT_CURRENT) {
+			query.setCurrent(DEFAULT_CURRENT);
+		}
+		if (query.getSize() == null || query.getSize() <= 0) {
+			query.setSize(DEFAULT_SIZE);
+		}
+		if (query.getSize() > MAX_SIZE) {
+			query.setSize(MAX_SIZE);
+		}
+		return query;
+	}
+
+	private void fillExpiryDate(TransportVehicleVO vehicle) {
+		if (vehicle.getToday() == null) {
+			vehicle.setToday(LocalDate.now());
+		}
+		if (vehicle.getWarningDate() == null) {
+			vehicle.setWarningDate(vehicle.getToday().plusDays(30));
+		}
+	}
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java
index 56bc27de..f2003c5f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java
@@ -114,7 +114,7 @@ public class PaymentApplicationController extends BladeController {
 		}
 		PaymentApplication payment = paymentApplicationService.getById(id);
 		String specStatus = payment == null ? null : payment.getHcsSpecStatus();
-		if (HcsSyncConstant.SPEC_STATUS_NEED.equals(specStatus)) {
+		if (hcsImmediatePushSupport.isSpecPayEnabled() && HcsSyncConstant.SPEC_STATUS_NEED.equals(specStatus)) {
 			return R.success("审批通过，付款特批待发起，可在详情页重推合规");
 		}
 		if (Arrays.asList(HcsSyncConstant.SPEC_STATUS_PUSHING, HcsSyncConstant.SPEC_STATUS_PROCESSING).contains(specStatus)) {
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java
index 2e9fdbc0..11eccfd6 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ContractManageExcel.java
+++ b/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("结束日期")
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java
index 4657465c..491f5a36 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java
@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
 import org.springblade.transport.config.BfiProperties;
 import org.springblade.transport.constant.HcsSyncConstant;
+import org.springblade.hcs.config.HcsProperties;
 import org.springblade.transport.event.KingdeeBillApprovedEvent;
 import org.springblade.transport.pojo.entity.PaymentApplication;
 import org.springblade.transport.service.IFormalSettlementService;
@@ -65,6 +66,7 @@ public class KingdeeApprovalSyncListener {
 	private final IInvoiceApplicationService invoiceApplicationService;
 	private final IInvoiceReceiptService invoiceReceiptService;
 	private final BfiProperties bfiProperties;
+	private final HcsProperties hcsProperties;
 
 	/** 当前审批请求线程的自动推送失败原因，供 Controller 取走提示前端（见类注释线程说明） */
 	private static final ThreadLocal<String> SYNC_FAILURE = new ThreadLocal<>();
@@ -183,9 +185,10 @@ public class KingdeeApprovalSyncListener {
 			return;
 		}
 		// 付款特批未完成（高风险/黑名单/额度超额）时金蝶必然拒推：跳过而非置失败，
-		// 特批通过后由 HcsPaymentSyncSupport 重新发布本事件自动补推
+		// 特批通过后由 HcsPaymentSyncSupport 重新发布本事件自动补推；
+		// 特批不走合同系统（spec-pay.enabled=false）时不跳过
 		PaymentApplication payment = paymentApplicationService.getById(id);
-		if (payment != null && payment.getHcsSpecStatus() != null
+		if (hcsProperties.getSpecPay().isEnabled() && payment != null && payment.getHcsSpecStatus() != null
 			&& List.of(HcsSyncConstant.SPEC_STATUS_NEED, HcsSyncConstant.SPEC_STATUS_PUSHING,
 			HcsSyncConstant.SPEC_STATUS_PROCESSING).contains(payment.getHcsSpecStatus())) {
 			log.info("付款申请[{}]审批通过自动同步金蝶跳过（付款特批未完成）：hcsSpecStatus={}", id, payment.getHcsSpecStatus());
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
index 2f1b5e2a..1cdc59b7 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/DriverMapper.xml
@@ -147,6 +147,11 @@
 
     <sql id="QueryCondition">
         is_deleted = 0
+        <!-- 小程序列表的单框搜索：姓名或手机号命中其一即可。管理端不传 keyword，条件不生效。 -->
+        <if test="driver.keyword != null and driver.keyword != ''">
+            <bind name="driverKeywordLike" value="'%' + driver.keyword + '%'"/>
+            AND (driver_name LIKE #{driverKeywordLike} OR mobile LIKE #{driverKeywordLike})
+        </if>
         <if test="driver.driverName != null and driver.driverName != ''">
             <bind name="driverNameLike" value="'%' + driver.driverName + '%'"/>
             AND driver_name LIKE #{driverNameLike}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/MaintenanceRecordMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/MaintenanceRecordMapper.xml
index 527af228..01a85e04 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/MaintenanceRecordMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/MaintenanceRecordMapper.xml
@@ -14,6 +14,7 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="vehicle_type" property="vehicleType"/>
         <result column="vehicle_no" property="vehicleNo"/>
+        <result column="exception_id" property="exceptionId"/>
         <result column="maintainer" property="maintainer"/>
         <result column="maintenance_time" property="maintenanceTime"/>
         <result column="location" property="location"/>
@@ -27,55 +28,63 @@
         <result column="mileage_unit" property="mileageUnit"/>
         <result column="attachments" property="attachments"/>
         <result column="remark" property="remark"/>
+        <result column="waybill_no" property="waybillNo"/>
+        <result column="exception_type" property="exceptionType"/>
+        <result column="exception_reason" property="exceptionReason"/>
     </resultMap>
 
     <select id="selectMaintenanceRecordPage" resultMap="maintenanceRecordResultMap">
         SELECT
-            id,
-            tenant_id,
-            create_user,
-            create_dept,
-            create_time,
-            update_user,
-            update_time,
-            status,
-            is_deleted,
-            vehicle_type,
-            vehicle_no,
-            maintainer,
-            maintenance_time,
-            location,
-            replaced_part,
-            cost,
-            company,
-            contact,
-            address,
-            factory_time,
-            CASE WHEN mileage = -1 THEN NULL WHEN mileage &lt; 0 THEN 0 ELSE mileage END AS mileage,
-            mileage_unit,
-            attachments,
-            remark
+            r.id,
+            r.tenant_id,
+            r.create_user,
+            r.create_dept,
+            r.create_time,
+            r.update_user,
+            r.update_time,
+            r.status,
+            r.is_deleted,
+            r.vehicle_type,
+            r.vehicle_no,
+            r.exception_id,
+            r.maintainer,
+            r.maintenance_time,
+            r.location,
+            r.replaced_part,
+            r.cost,
+            r.company,
+            r.contact,
+            r.address,
+            r.factory_time,
+            CASE WHEN r.mileage = -1 THEN NULL WHEN r.mileage &lt; 0 THEN 0 ELSE r.mileage END AS mileage,
+            r.mileage_unit,
+            r.attachments,
+            r.remark,
+            d.waybill_no,
+            d.exception_type,
+            d.exception_reason
         FROM
-            blade_vehicle_maintenance_record
+            blade_vehicle_maintenance_record r
+            LEFT JOIN blade_exception_disposal d ON d.id = r.exception_id AND d.is_deleted = 0
         WHERE
-            is_deleted = 0
+            r.is_deleted = 0
         <if test="maintenanceRecord.createDept != null">
-            AND create_dept = #{maintenanceRecord.createDept}
+            AND r.create_dept = #{maintenanceRecord.createDept}
         </if>
         <if test="maintenanceRecord.vehicleType != null and maintenanceRecord.vehicleType != ''">
-            AND vehicle_type = #{maintenanceRecord.vehicleType}
+            AND r.vehicle_type = #{maintenanceRecord.vehicleType}
         </if>
         <if test="maintenanceRecord.vehicleNo != null and maintenanceRecord.vehicleNo != ''">
             <bind name="vehicleNoLike" value="'%' + maintenanceRecord.vehicleNo + '%'"/>
-            AND vehicle_no LIKE #{vehicleNoLike}
+            AND r.vehicle_no LIKE #{vehicleNoLike}
         </if>
         <if test="maintenanceRecord.createTimeStart != null">
-            AND create_time &gt;= #{maintenanceRecord.createTimeStart}
+            AND r.create_time &gt;= #{maintenanceRecord.createTimeStart}
         </if>
         <if test="maintenanceRecord.createTimeEnd != null">
-            AND create_time &lt;= #{maintenanceRecord.createTimeEnd}
+            AND r.create_time &lt;= #{maintenanceRecord.createTimeEnd}
         </if>
-        ORDER BY create_time DESC
+        ORDER BY r.create_time DESC
     </select>
 
 </mapper>
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/ManageArchiveDeptMapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/ManageArchiveDeptMapper.java
new file mode 100644
index 00000000..73ae3d92
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/ManageArchiveDeptMapper.java
@@ -0,0 +1,26 @@
+package org.springblade.transport.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springblade.system.pojo.entity.Dept;
+
+import java.util.List;
+
+/**
+ * 组织树只读查询（小程序组织选择器）
+ * <p>
+ * 不复用 blade-system 的部门接口：那些接口全挂在 {@code @PreAuth(menu = "dept")} 下，
+ * 小程序令牌的 roleId 是占位值 "0"、查不到 blade_role_menu，任何小程序账号都会被拒。
+ * 这里直接按租户读表，只取组织选择需要的四列。
+ */
+public interface ManageArchiveDeptMapper {
+
+	/**
+	 * 租户内启用中的部门，按排序号升序（不含已删除）
+	 */
+	@Select("SELECT id, parent_id AS parentId, dept_name AS deptName, sort FROM blade_dept "
+		+ "WHERE is_deleted = 0 AND status = 1 AND tenant_id = #{tenantId} "
+		+ "ORDER BY sort, id")
+	List<Dept> selectEnabledByTenant(@Param("tenantId") String tenantId);
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml
index 0d5857fd..f261e329 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/TransportVehicleMapper.xml
@@ -116,6 +116,11 @@
 
     <sql id="QueryCondition">
         is_deleted = 0
+        <!-- 小程序列表的单框搜索：车牌、VIN 或所有人命中其一即可。管理端不传 keyword，条件不生效。 -->
+        <if test="vehicle.keyword != null and vehicle.keyword != ''">
+            <bind name="vehicleKeywordLike" value="'%' + vehicle.keyword + '%'"/>
+            AND (plate_no LIKE #{vehicleKeywordLike} OR vin LIKE #{vehicleKeywordLike} OR owner_name LIKE #{vehicleKeywordLike})
+        </if>
         <if test="vehicle.organizationName != null and vehicle.organizationName != ''">
             <!-- 「未分配组织」哨兵值定义在 TransportBusiConstant.UNASSIGNED_ORG_FILTER 与前端
                  tms-erp-web/src/mixins/organization-search.js，改这里必须同步常量与 DriverMapper.xml 的同名分支。
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/ocr/service/IBusinessLicenseOcrService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/ocr/service/IBusinessLicenseOcrService.java
new file mode 100644
index 00000000..dcb8a4bf
--- /dev/null
+++ b/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);
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/ocr/service/impl/BusinessLicenseOcrServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/ocr/service/impl/BusinessLicenseOcrServiceImpl.java
new file mode 100644
index 00000000..332efc39
--- /dev/null
+++ b/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;
+	}
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/pojo/vo/DeptTreeNodeVO.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/pojo/vo/DeptTreeNodeVO.java
new file mode 100644
index 00000000..4908d3ca
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/pojo/vo/DeptTreeNodeVO.java
@@ -0,0 +1,62 @@
+/**
+ * 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>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+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 java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 组织树节点（小程序组织选择器）
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "组织树节点")
+public class DeptTreeNodeVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 部门主键：雪花 ID 超出 JS 安全整数，序列化成字符串，前端不做 Number()
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "部门主键")
+	private Long id;
+
+	@Schema(description = "部门名称")
+	private String name;
+
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@Schema(description = "子部门")
+	private List<DeptTreeNodeVO> children = new ArrayList<>();
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java
index bdfd3327..fdba48f2 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICertAuditService.java
@@ -74,12 +74,13 @@ public interface ICertAuditService {
 	/**
 	 * 审核一条认证记录
 	 *
-	 * @param recordId     认证记录主键
-	 * @param pass         true 通过，false 驳回
-	 * @param rejectReason 驳回原因；驳回时必填，≤200 字
+	 * @param recordId           认证记录主键
+	 * @param pass               true 通过，false 驳回
+	 * @param rejectReason       驳回原因；驳回时必填，≤200 字
+	 * @param auditedSnapshotJson 审核员修订后的全量认证内容；空或空白表示不修订，驳回时忽略
 	 * @return 是否成功
 	 */
-	boolean audit(Long recordId, boolean pass, String rejectReason);
+	boolean audit(Long recordId, boolean pass, String rejectReason, String auditedSnapshotJson);
 
 	/**
 	 * 当前登录用户的审核能力：能否查看、能否审核
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractManageService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractManageService.java
index d4f481b9..7597ecb9 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractManageService.java
+++ b/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);
 
 	/**
 	 * 合同是否可用于生成结算单：已审批、未终止，且临时合同仍在临时效力期内。
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverAppService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverAppService.java
index d7c7d34a..9e6d5b12 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverAppService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverAppService.java
@@ -34,11 +34,11 @@ import java.util.List;
 public interface IDriverAppService {
 
 	/**
-	 * 当前登录用户对应的司机档案（按手机号匹配 blade_transport_driver.mobile）
+	 * 当前登录用户对应的司机档案（按 user_id 匹配 blade_transport_driver.user_id）
 	 *
-	 * @param mobile 小程序可显式传入当前用户手机号；为空时从登录态解析
+	 * @return 司机档案；未登录抛异常，查不到返回 null
 	 */
-	DriverVO currentByPhone(String mobile);
+	DriverVO current();
 
 	/**
 	 * 当前司机绑定的车辆列表（driver.driving_vehicle ↔ vehicle.plate_no）
@@ -49,10 +49,9 @@ public interface IDriverAppService {
 	 * 当前登录用户对应的司机**实体**
 	 * <p>
 	 * 认证提交要写回司机表，且越权校验要读 {@code driving_vehicle}，
-	 * 故这里返回实体而非视图对象。解析顺序：先按登录手机号匹配，
-	 * 匹配不到再按 {@code user_id} 兜底。
+	 * 故这里返回实体而非视图对象。解析口径与 {@link #current()} 一致。
 	 *
-	 * @return 司机实体；未登录或查不到时返回 null
+	 * @return 司机实体；未登录抛异常，查不到返回 null
 	 */
 	Driver currentDriverEntity();
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverService.java
index 73924e3e..d2962801 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IDriverService.java
@@ -111,4 +111,16 @@ public interface IDriverService extends BaseService<Driver> {
 	 */
 	List<DriverExcel> exportDriver(Wrapper<Driver> queryWrapper);
 
+	/**
+	 * 按手机号解析司机档案 ID
+	 * <p>
+	 * 归属主键是档案 ID，手机号只是派单时的号码快照：只有租户内唯一命中才认，
+	 * 0 条（承运商司机、未登录过小程序的司机）与多条（历史脏数据）都返回 null，不抛异常。
+	 *
+	 * @param tenantId 租户ID，为空时取当前登录租户
+	 * @param mobile   手机号
+	 * @return 司机档案ID；无法唯一确定时为 null
+	 */
+	Long resolveDriverIdByMobile(String tenantId, String mobile);
+
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IExceptionDisposalService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IExceptionDisposalService.java
index de58cb2a..2677ef4b 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IExceptionDisposalService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IExceptionDisposalService.java
@@ -28,6 +28,7 @@ import org.springblade.transport.pojo.dto.ExceptionDisposalFollowRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalRejectRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalRouteAdjustRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalUpdateRequest;
+import org.springblade.transport.pojo.dto.ExceptionMaintenanceRecordRequest;
 import org.springblade.transport.pojo.entity.ExceptionDisposal;
 import org.springblade.transport.pojo.vo.ExceptionDisposalVO;
 
@@ -75,4 +76,10 @@ public interface IExceptionDisposalService extends BaseService<ExceptionDisposal
 	 */
 	void adjustRoute(ExceptionDisposalRouteAdjustRequest request);
 
+	/**
+	 * 录入关联维修记录：写一条维修记录并追加一条跟进记录，不结案。
+	 * 一条异常至多一条维修记录；已撤销的异常不允许录入。
+	 */
+	void submitMaintenanceRecord(ExceptionMaintenanceRecordRequest request);
+
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IFormalSettlementService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IFormalSettlementService.java
index 3da31cf3..af7c759c 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IFormalSettlementService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IFormalSettlementService.java
@@ -103,6 +103,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);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java
index f0998c45..6a751337 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ILoadingManageService.java
@@ -29,7 +29,7 @@ public interface ILoadingManageService extends BaseService<LoadingManage> {
 	/**
 	 * 查询项目下已审核生效的承运商合同。
 	 * <p>
-	 * 传入 waybillIds 时，按各子运单客户合同甲方匹配可用承运商合同，再对乙方名称取交集后返回。
+	 * 传入 waybillIds 时，按各子运单客户合同乙方=承运商合同甲方匹配可用承运商合同，再对乙方名称取交集后返回。
 	 */
 	List<LoadingCarrierContractVO> carrierContracts(List<Long> projectIds, List<Long> waybillIds);
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IManageArchiveService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IManageArchiveService.java
new file mode 100644
index 00000000..2379ac66
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IManageArchiveService.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>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.service;
+
+import org.springblade.transport.pojo.vo.ArchiveManageStatsVO;
+import org.springblade.transport.pojo.vo.DeptTreeNodeVO;
+
+import java.util.List;
+
+/**
+ * 调度端档案统计
+ */
+public interface IManageArchiveService {
+
+	/**
+	 * 司机与车辆档案的证件有效期统计
+	 */
+	ArchiveManageStatsVO stats();
+
+	/**
+	 * 组织树：启用中的部门，已剔除「外部组织」整支
+	 */
+	List<DeptTreeNodeVO> deptTree();
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ITripQueryService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ITripQueryService.java
index dbc87bde..c1c8ecb6 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ITripQueryService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ITripQueryService.java
@@ -41,7 +41,7 @@ public interface ITripQueryService {
 	 * <p>
 	 * 库层只取回收口与行级筛选命中的运单行，分组、分档、筛选、排序与分页都在服务层算完再做。
 	 *
-	 * @param query 查询条件，收口由 driverPhone 或 allDrivers 给出
+	 * @param query 查询条件，收口由 driverId（司机档案）或 allDrivers 给出
 	 * @return 运次分页
 	 */
 	IPage<TripVO> page(TripQueryVO query);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java
index a35ee3a3..91597a88 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CertAuditServiceImpl.java
@@ -26,6 +26,7 @@
 package org.springblade.transport.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
@@ -138,20 +139,24 @@ public class CertAuditServiceImpl implements ICertAuditService {
 		detail.setAuditUserName(UserCache.getUserRealName(record.getAuditUser()));
 		detail.setRejectReason(record.getRejectReason());
 		detail.setPendingSnapshotJson(record.getSnapshotJson());
+		// 审核员上次填过的修订版：详情页要能回显，否则重开页面就丢了
+		detail.setAuditedSnapshotJson(record.getAuditedSnapshotJson());
 
 		// 生效值一侧：从未认证通过时为 null，前端按「无对比基准」处理
 		detail.setEffectiveRecordId(effectiveId);
 		detail.setCertified(CertificationRuleSupport.isCertified(effectiveId));
 		if (Func.isNotEmpty(effectiveId)) {
 			TransportCertRecord effective = certRecordService.getById(effectiveId);
-			detail.setEffectiveSnapshotJson(effective == null ? null : effective.getSnapshotJson());
+			// 生效一侧同样修订版优先：审核页是拿「新提交」和「当前生效内容」做 diff 的，
+			// 这里取旧值会让审核员看到一份从未生效过的差异
+			detail.setEffectiveSnapshotJson(CertificationRuleSupport.effectiveSnapshotJson(effective));
 		}
 		return detail;
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean audit(Long recordId, boolean pass, String rejectReason) {
+	public boolean audit(Long recordId, boolean pass, String rejectReason, String auditedSnapshotJson) {
 		TransportCertRecord record = requireRecord(recordId);
 
 		// 终态不可再审。若允许，把指针指着的那条「已通过」改成「已驳回」，
@@ -165,6 +170,17 @@ public class CertAuditServiceImpl implements ICertAuditService {
 				+ TransportCertRecord.REJECT_REASON_MAX_LENGTH + "字）");
 		}
 
+		// 修订版只有「通过」才可能生效：驳回不产生生效内容，传了也不该留痕，
+		// 否则历史里会出现一条「已驳回却带着生效内容」的记录。
+		String revision = pass ? blankToNull(auditedSnapshotJson) : null;
+		// 校验放在写库之前——内容不可用或改动了身份字段就整体回滚，不能先落一条状态再报错。
+		if (revision != null) {
+			requireUsableRevision(record, revision);
+			requireIdentityUnchanged(record, revision);
+		}
+		// 写回档案的是「本次生效内容」：有修订用修订版，没有就用司机原提交。
+		String effectiveSnapshotJson = revision == null ? record.getSnapshotJson() : revision;
+
 		Long auditor = AuthUtil.getUserId();
 		LocalDateTime auditTime = LocalDateTime.now();
 
@@ -177,11 +193,13 @@ public class CertAuditServiceImpl implements ICertAuditService {
 			: CertificationRuleSupport.reasonForReject(rejectReason));
 		patch.setAuditUser(auditor);
 		patch.setAuditTime(auditTime);
+		// 未修订时留 null：框架的 not_null 更新策略会跳过该列，库里保持 NULL 而不是空串
+		patch.setAuditedSnapshotJson(revision);
 		certRecordService.updateById(patch);
 
 		// 2) 认证对象：通过才切指针；驳回只刷展示缓存。两者合并为**一次** UPDATE，
 		//    避免对同一行连续写两次（第二次会把第一次的指针覆盖掉的风险也随之消失）。
-		updateCertTarget(record, pass, rejectReason);
+		updateCertTarget(record, pass, rejectReason, effectiveSnapshotJson);
 		return true;
 	}
 
@@ -212,11 +230,12 @@ public class CertAuditServiceImpl implements ICertAuditService {
 	 * </ul>
 	 * 分两次写同一行除了多一次往返，还会让「先切指针、后被展示缓存更新覆盖」成为可能。
 	 *
-	 * @param record       被审核的记录
-	 * @param pass         是否通过
-	 * @param rejectReason 驳回原因
+	 * @param record                被审核的记录
+	 * @param pass                  是否通过
+	 * @param rejectReason          驳回原因
+	 * @param effectiveSnapshotJson 本次生效内容（修订版优先，否则司机原提交）
 	 */
-	private void updateCertTarget(TransportCertRecord record, boolean pass, String rejectReason) {
+	private void updateCertTarget(TransportCertRecord record, boolean pass, String rejectReason, String effectiveSnapshotJson) {
 		boolean vehicleTarget = TransportCertRecord.BIZ_TYPE_VEHICLE.equals(record.getBizType());
 		Integer status = pass ? TransportCertRecord.STATUS_APPROVED : TransportCertRecord.STATUS_REJECTED;
 		// 只有通过才切指针；驳回时保持 null，框架的 not_null 更新策略会跳过该列
@@ -232,7 +251,7 @@ public class CertAuditServiceImpl implements ICertAuditService {
 				// 不写回的话，审核通过之后管理端与司机端看到的仍是提交之前的旧值——
 				// 状态显示「已通过」、内容却还是旧的，是最容易让人误判的一种不一致。
 				// 与指针合并成同一次 UPDATE。
-				applySnapshotToVehicle(vehicle, record.getSnapshotJson());
+				applySnapshotToVehicle(vehicle, effectiveSnapshotJson);
 			} else {
 				vehicle.setCertificationRejectReason(CertificationRuleSupport.reasonForReject(rejectReason));
 			}
@@ -255,7 +274,7 @@ public class CertAuditServiceImpl implements ICertAuditService {
 			// 不写回的话，司机档案里始终是管理端当初录入的旧值（甚至为空），
 			// 而认证状态已是「已通过」——状态与内容不一致最容易让人误判。
 			// 与指针合并成同一次 UPDATE。
-			applySnapshotToDriver(driver, record.getSnapshotJson());
+			applySnapshotToDriver(driver, effectiveSnapshotJson);
 		} else {
 			driver.setCertificationRejectReason(CertificationRuleSupport.reasonForReject(rejectReason));
 		}
@@ -332,6 +351,122 @@ public class CertAuditServiceImpl implements ICertAuditService {
 		}
 	}
 
+	/**
+	 * 校验审核员填写的修订版内容，不满足时抛错
+	 * <p>
+	 * 修订版是审核员的「最终认定」，会直接写回档案。因此必须能反序列化成当前提交结构，
+	 * 且带上判定「这份内容有效」的关键字段，否则写回等于什么也没写：
+	 * 司机看身份证号与驾驶证号，车辆看行驶证号与核定载质量。
+	 * <p>
+	 * 不满足时抛错、整体回滚——审核员填错 JSON 是操作失误，不能悄悄降级成「不修订」，
+	 * 那样他会以为自己的修订已经生效。
+	 *
+	 * @param record   被审核的记录
+	 * @param revision 已去空白的修订版内容
+	 */
+	private void requireUsableRevision(TransportCertRecord record, String revision) {
+		JSONObject parsed = parseRevision(revision);
+		if (TransportCertRecord.BIZ_TYPE_VEHICLE.equals(record.getBizType())) {
+			VehicleCertSubmitRequest snapshot = toSnapshot(parsed, VehicleCertSubmitRequest.class);
+			if (snapshot == null
+				|| (Func.isEmpty(snapshot.getDrivingLicenseNo()) && Func.isEmpty(snapshot.getApprovedLoadKg()))) {
+				throw new ServiceException("修订内容缺少行驶证号与核定载质量，无法写入车辆档案");
+			}
+			return;
+		}
+		PersonCertSubmitRequest snapshot = toSnapshot(parsed, PersonCertSubmitRequest.class);
+		if (snapshot == null
+			|| (Func.isEmpty(snapshot.getIdCardNo()) && Func.isEmpty(snapshot.getDriverFileNo()))) {
+			throw new ServiceException("修订内容缺少身份证号与驾驶证号，无法写入司机档案");
+		}
+	}
+
+	/**
+	 * 身份字段不可修订：修订版改动了身份证号、驾驶证号（司机）或车牌号（车辆）时拒绝
+	 * <p>
+	 * 审核只认定证件内容，身份字段标识「是谁」，改了审核的就是另一个对象。
+	 * 原提交里该字段为空时（旧数据、空快照）没有可比对的原值，不比对，允许补全。
+	 *
+	 * @param record   被审核的记录
+	 * @param revision 已去空白的修订版内容
+	 */
+	private void requireIdentityUnchanged(TransportCertRecord record, String revision) {
+		JSONObject parsed = parseRevision(revision);
+		if (parsed == null) {
+			return;
+		}
+		if (TransportCertRecord.BIZ_TYPE_VEHICLE.equals(record.getBizType())) {
+			VehicleCertSubmitRequest original = parseSnapshotQuietly(record.getSnapshotJson(), VehicleCertSubmitRequest.class);
+			if (original == null) {
+				return;
+			}
+			VehicleCertSubmitRequest revised = toSnapshot(parsed, VehicleCertSubmitRequest.class);
+			requireSameIdentity(original.getPlateNo(), revised.getPlateNo(), "修订内容不能修改车牌号");
+			return;
+		}
+		PersonCertSubmitRequest original = parseSnapshotQuietly(record.getSnapshotJson(), PersonCertSubmitRequest.class);
+		if (original == null) {
+			return;
+		}
+		String message = "修订内容不能修改身份证号与驾驶证号";
+		PersonCertSubmitRequest revised = toSnapshot(parsed, PersonCertSubmitRequest.class);
+		requireSameIdentity(original.getIdCardNo(), revised.getIdCardNo(), message);
+		requireSameIdentity(original.getDriverFileNo(), revised.getDriverFileNo(), message);
+	}
+
+	/**
+	 * 原提交有值时，修订版必须与之一致；原提交为空时允许补全
+	 *
+	 * @param original 原提交里的身份字段值
+	 * @param revised  修订版里的身份字段值
+	 * @param message  不一致时抛出的文案
+	 */
+	private void requireSameIdentity(String original, String revised, String message) {
+		if (Func.isEmpty(original)) {
+			return;
+		}
+		if (!original.equals(revised)) {
+			throw new ServiceException(message);
+		}
+	}
+
+	/**
+	 * 反序列化审核员填写的修订版 JSON
+	 *
+	 * @param revision 已去空白的修订版内容
+	 * @return 解析结果；内容为字面量 null 时返回 null
+	 */
+	private JSONObject parseRevision(String revision) {
+		try {
+			return JSON.parseObject(revision);
+		} catch (Exception exception) {
+			throw new ServiceException("修订内容格式不正确，请检查后重试");
+		}
+	}
+
+	/**
+	 * 解析原提交快照；为空或无法解析时返回 null（此时没有可比对的原值）
+	 *
+	 * @param snapshotJson 原提交内容
+	 * @param clazz        目标结构
+	 * @param <T>          提交结构类型
+	 * @return 解析结果；为空或解析失败时返回 null
+	 */
+	private <T> T parseSnapshotQuietly(String snapshotJson, Class<T> clazz) {
+		if (Func.isEmpty(snapshotJson)) {
+			return null;
+		}
+		try {
+			return JSON.parseObject(snapshotJson, clazz);
+		} catch (Exception exception) {
+			return null;
+		}
+	}
+
+	private <T> T toSnapshot(JSONObject parsed, Class<T> clazz) {
+		return parsed == null ? null : parsed.toJavaObject(clazz);
+	}
+
 	/**
 	 * 把生效快照里的司机证件字段搬进司机档案（就地写入同一个 patch 对象）
 	 * <p>
@@ -345,33 +480,34 @@ public class CertAuditServiceImpl implements ICertAuditService {
 	 * 快照里为 null 的字段不会写（框架的 not_null 更新策略会跳过），
 	 * 因此不会把管理端填过、司机端没填的字段清空。
 	 * <p>
-	 * 快照缺失、无法解析或不是当前字段定义时**只跳过写回，不阻断审核**：
-	 * 审核本身是独立于写回的业务动作（切指针、置状态），不该因为一份读不懂的快照而失败；
-	 * 何况历史快照本来就存在，阻断会让这些对象再也审不过去。
-	 * 申报的身份证号已落在另一名司机名下时是例外——那会把两条档案写成同一个证件号，
-	 * 必须阻断。
+	 * 快照缺失、无法解析或不是当前字段定义时**直接拒绝本次通过并整体回滚**：
+	 * 「通过」的语义是「把这批证件内容认定为生效值」，没有可用内容却放行，
+	 * 等于给一条空记录盖上已通过的章，状态与内容互相矛盾。
+	 * 内容确实为空的历史记录，由审核员在审核时补全后重审即可。
+	 * 申报的身份证号已落在另一名司机名下时同样阻断——那会把两条档案写成同一个证件号。
 	 *
 	 * @param driver       待更新的司机 patch
 	 * @param snapshotJson 该条记录的全量提交内容
 	 */
 	private void applySnapshotToDriver(Driver driver, String snapshotJson) {
 		if (Func.isEmpty(snapshotJson)) {
-			return;
+			throw new ServiceException("该认证记录没有提交内容，无法写入司机档案；请让司机重新提交一次认证");
 		}
 		PersonCertSubmitRequest snapshot;
 		try {
 			snapshot = JSON.parseObject(snapshotJson, PersonCertSubmitRequest.class);
 		} catch (Exception exception) {
-			return;
+			throw new ServiceException("该认证记录的提交内容无法解析，未写入司机档案；请重新提交一次认证");
 		}
 		if (snapshot == null) {
-			return;
+			throw new ServiceException("该认证记录的提交内容无法解析，未写入司机档案；请重新提交一次认证");
 		}
 		// 字段名对不上时 JSON 会解析成「全是 null」而不报错（历史快照就是这种情况），
 		// 那样写回等于什么也没写，还会把档案里已有的值当成「没填」而跳过。
-		// 故用证件内容里的关键字段判定「这份快照是否是当前格式」，不是就不写。
+		// 故用证件内容里的关键字段判定「这份快照是否是当前格式」，不是就拒绝。
 		if (Func.isEmpty(snapshot.getIdCardNo()) && Func.isEmpty(snapshot.getDriverFileNo())) {
-			return;
+			throw new ServiceException("该认证记录的提交内容与当前字段定义不匹配（可能是早期格式的历史快照），"
+				+ "未写入司机档案；请重新提交一次认证");
 		}
 		// 身份证号要落到档案上，先确认它没有落在别人名下：重复证件号一旦落库，
 		// 建档查重与按证件号识别同一人都会失效
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java
index b8f1e083..b882244c 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java
+++ b/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()));
 	}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java
index 29007ba8..e337f103 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractChangeServiceImpl.java
@@ -44,6 +44,7 @@ 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;
@@ -316,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)
-				.or().eq(ContractChange::getCreateUser, currentUserId)
-				.or().eq(ContractChange::getHandlerUserId, currentUserId));
+			queryWrapper.and(wrapper -> {
+				wrapper.eq(ContractChange::getOrganizationId, currentDeptId)
+					.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());
 		}
@@ -358,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());
@@ -391,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());
@@ -504,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) {
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java
index 3eec25b4..7a58c17f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java
+++ b/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;
@@ -48,6 +49,7 @@ 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;
@@ -60,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;
@@ -449,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());
@@ -510,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());
@@ -665,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)
-				.or().eq(ContractManage::getCreateUser, currentUserId)
-				.or().eq(ContractManage::getHandlerUserId, currentUserId));
+			queryWrapper.and(wrapper -> {
+				wrapper.eq(ContractManage::getOrganizationId, currentDeptId)
+					.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());
 		}
@@ -683,6 +700,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）
@@ -708,6 +726,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;
@@ -737,7 +767,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("无效的合同状态筛选条件");
 		}
 	}
 
@@ -774,6 +804,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());
 			// 归档状态仅由审核通过逻辑自动维护，保存时保留库中已有值。
@@ -798,7 +832,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());
@@ -857,30 +891,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 next = resolveContractInitialSerial(dept);
+		int initialSerial = resolveContractInitialSerial(config);
+		int maxUsed = 0;
+		boolean hasMatched = false;
 		for (ContractManage item : latestList) {
 			String contractNo = TransportBusinessSupport.trimToNull(item.getContractNo());
 			if (Func.isEmpty(contractNo)) {
@@ -890,22 +933,24 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 			if (!matcher.matches()) {
 				continue;
 			}
-			next = Integer.parseInt(matcher.group(1)) + 1;
-			break;
+			hasMatched = true;
+			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) {
-		Integer serial = dept.getContractInitialSerial();
+	private int resolveContractInitialSerial(BusinessDeptConfig config) {
+		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;
 	}
@@ -1022,8 +1067,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.setPartyB(TransportBusinessSupport.trimToNull(contractManage.getPartyB()));
+		contractManage.setPartyAJson(TransportBusinessSupport.trimToNull(contractManage.getPartyAJson()));
+		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()));
@@ -1080,6 +1127,7 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		// 合同名称允许重复，唯一性由合同编号保证。
 		TransportBusinessSupport.validateLength(contractManage.getMainContent(), 1000, "合同主要内容不能超过1000字");
 		TransportBusinessSupport.validateLength(contractManage.getRemark(), 2000, "其他事项说明不能超过2000字");
+		// 草稿不强制甲/乙客商与计费绑定，提交临时/正式时再完整校验
 	}
 
 	private void validateBillingPlans(String billingPlanJson) {
@@ -1091,18 +1139,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);
 			}
@@ -1164,15 +1205,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 {
@@ -1221,8 +1253,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.getPartyB(), "请选择乙方");
+		TransportBusinessSupport.validateRequired(contractManage.getPlatformCompanyName(), "请选择平台公司");
+		ContractPartySupport.validateRequiredParties(contractManage, true);
+		ContractPartySupport.validateBillingPlanBindings(contractManage);
 		validateContractAmountRequired(contractManage);
 	}
 
@@ -1255,6 +1288,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(), "请输入乙方");
@@ -1422,7 +1456,12 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		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());
@@ -1601,7 +1640,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);
 	}
 
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverAppServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverAppServiceImpl.java
index 148ce41e..be023a7a 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverAppServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverAppServiceImpl.java
@@ -27,10 +27,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.feign.IMpUserClient;
-import org.springblade.system.pojo.entity.MpUser;
 import org.springblade.transport.pojo.entity.Driver;
 import org.springblade.transport.pojo.entity.TransportVehicle;
 import org.springblade.transport.pojo.vo.DriverVehicleCardVO;
@@ -55,19 +52,24 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class DriverAppServiceImpl implements IDriverAppService {
 
+	/**
+	 * 启用状态。框架基类只有 status 列与 BladeConstant.DB_STATUS_NORMAL = 1，没有枚举；
+	 * 2 是「停用」，业务侧一律写字面量常量。
+	 */
+	private static final int ENABLED_STATUS = 1;
+
 	private final IDriverService driverService;
 	private final ITransportVehicleService transportVehicleService;
-	private final IMpUserClient mpUserClient;
 
 	@Override
-	public DriverVO currentByPhone(String mobile) {
-		Driver driver = currentDriver(mobile);
+	public DriverVO current() {
+		Driver driver = currentDriver();
 		return driver == null ? null : DriverWrapper.build().entityVO(driver);
 	}
 
 	@Override
 	public List<DriverVehicleCardVO> myVehicles() {
-		Driver driver = currentDriver(null);
+		Driver driver = currentDriver();
 		if (driver == null || Func.isEmpty(driver.getDrivingVehicle())) {
 			return List.of();
 		}
@@ -78,6 +80,8 @@ public class DriverAppServiceImpl implements IDriverAppService {
 		// 精确 + 规范化双条件匹配，统一走共享实现（避免各调用点各自实现而漏掉写法差异）
 		LambdaQueryWrapper<TransportVehicle> plateQuery = Wrappers.lambdaQuery();
 		VehiclePlateSupport.applyPlateMatch(plateQuery, plates);
+		// 停用车辆不再出现在司机端：管理员停用即意味着这辆车不该再被司机拿去接单
+		plateQuery.eq(TransportVehicle::getStatus, ENABLED_STATUS);
 		List<TransportVehicle> vehicles = transportVehicleService.list(
 			plateQuery.orderByDesc(TransportVehicle::getUpdateTime));
 		// 去重（精确与规范化可能命中同一条）
@@ -92,28 +96,23 @@ public class DriverAppServiceImpl implements IDriverAppService {
 
 	@Override
 	public Driver currentDriverEntity() {
-		return currentDriver(null);
+		return currentDriver();
 	}
 
-	private Driver currentDriver(String mobileHint) {
+	/**
+	 * 当前司机的唯一解析入口：只按登录用户的 {@code user_id} 查档案。
+	 * <p>
+	 * 手机号不能用来认人：同一号码可能存在多条档案，按号码查「最近更新的一条」
+	 * 取到的可能是别人的档案；号码本身也会被改。
+	 */
+	private Driver currentDriver() {
 		Long userId = AuthUtil.getUserId();
 		if (userId == null || userId <= 0) {
 			throw new ServiceException("未登录");
 		}
-		String phone = resolvePhone(userId, mobileHint);
-		Driver driver = null;
-		if (Func.isNotEmpty(phone)) {
-			driver = driverService.getOne(Wrappers.<Driver>lambdaQuery()
-				.eq(Driver::getMobile, phone)
-				.orderByDesc(Driver::getUpdateTime)
-				.last("LIMIT 1"));
-		}
-		if (driver == null) {
-			driver = driverService.getOne(Wrappers.<Driver>lambdaQuery()
-				.eq(Driver::getUserId, userId)
-				.last("LIMIT 1"));
-		}
-		return driver;
+		return driverService.getOne(Wrappers.<Driver>lambdaQuery()
+			.eq(Driver::getUserId, userId)
+			.last("LIMIT 1"));
 	}
 
 	private DriverVehicleCardVO toCard(TransportVehicle vehicle) {
@@ -178,53 +177,4 @@ public class DriverAppServiceImpl implements IDriverAppService {
 		return date == null ? "" : date.toString();
 	}
 
-	/**
-	 * 解析用于匹配司机档案的手机号。
-	 * 优先级：前端传入且与本人一致的 mobile → JWT account（司机账号多为手机号）→ 用户中心 phone/account
-	 */
-	private String resolvePhone(Long userId, String mobileHint) {
-		String selfPhone = resolveSelfPhone(userId);
-		String hint = Func.isEmpty(mobileHint) ? null : mobileHint.trim();
-		if (Func.isNotEmpty(hint)) {
-			if (Func.isEmpty(selfPhone)) {
-				// 解析不出本人号码时不能拿前端传的 mobile 去查：
-				// currentDriver 会直接按 mobile 等值查询，传入他人号码即可读到他人档案。
-				// 这里返回空让它退回按 user_id 查，宁可查不到也不越权。
-				return null;
-			}
-			if (!selfPhone.equals(hint)) {
-				throw new ServiceException("只能查询本人司机档案");
-			}
-			return hint;
-		}
-		return selfPhone;
-	}
-
-	private String resolveSelfPhone(Long userId) {
-		String account = AuthUtil.getUserAccount();
-		if (isMobileLike(account)) {
-			return account.trim();
-		}
-		// 小程序用户 phone 带 @Sensitive(MOBILE)，经 Feign 回来是脱敏串，
-		// 因此这里只取未脱敏的 account；脱敏的 phone 一律不用。
-		R<MpUser> result = mpUserClient.userById(userId);
-		if (result != null && R.isSuccess(result) && result.getData() != null) {
-			String userAccount = result.getData().getAccount();
-			if (isMobileLike(userAccount)) {
-				return userAccount.trim();
-			}
-		}
-		return Func.isEmpty(account) ? null : account.trim();
-	}
-
-	/**
-	 * 是否是「可作为司机档案手机号使用」的号码串。
-	 * <p>
-	 * 只判 1 开头的 11~15 位纯数字：库里既有 11 位真实手机号，也有 12 位账号
-	 * （如 175874212082），写死 11 位会让这类账号的司机解析不出本人号码。
-	 */
-	private boolean isMobileLike(String value) {
-		return Func.isNotEmpty(value) && value.trim().matches("^1\\d{10,14}$");
-	}
-
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverCertServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverCertServiceImpl.java
index 703119df..a8e87eda 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverCertServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverCertServiceImpl.java
@@ -209,9 +209,11 @@ public class DriverCertServiceImpl implements IDriverCertService {
 		Driver driver = requireCurrentDriver();
 		// 当前司机实体已加载过，直接读它身上的指针，不再回查一次
 		TransportCertRecord effective = findEffectiveRecord(driver.getEffectiveCertRecordId());
+		// 生效内容以修订版为准：审核员改过的值才是档案里真正生效的那份，
+		// 仍读 snapshot_json 会让司机端拿旧值覆盖审核员的改动
 		return effective == null
 			? null
-			: JSON.parseObject(effective.getSnapshotJson(), PersonCertSubmitRequest.class);
+			: JSON.parseObject(CertificationRuleSupport.effectiveSnapshotJson(effective), PersonCertSubmitRequest.class);
 	}
 
 	@Override
@@ -269,10 +271,14 @@ public class DriverCertServiceImpl implements IDriverCertService {
 		if (!VehiclePlateSupport.isBound(requireCurrentDriver().getDrivingVehicle(), vehicle.getPlateNo())) {
 			throw new ServiceException("无权查看该车辆的认证信息");
 		}
+		// 停用车辆不再对司机端开放：司机列表里已经不显示它，详情/认证入口也不该能进
+		if (Func.isNotEmpty(vehicle.getStatus()) && vehicle.getStatus() != 1) {
+			throw new ServiceException("该车辆已停用，暂不可查看，请联系调度启用");
+		}
 		TransportCertRecord effective = findEffectiveRecord(vehicle.getEffectiveCertRecordId());
 		return effective == null
 			? null
-			: JSON.parseObject(effective.getSnapshotJson(), VehicleCertSubmitRequest.class);
+			: JSON.parseObject(CertificationRuleSupport.effectiveSnapshotJson(effective), VehicleCertSubmitRequest.class);
 	}
 
 	@Override
@@ -406,6 +412,7 @@ public class DriverCertServiceImpl implements IDriverCertService {
 			if (!VehiclePlateSupport.isBound(driver.getDrivingVehicle(), vehicle.getPlateNo())) {
 				throw new ServiceException("无权操作该车辆的认证");
 			}
+			requireEnabledVehicle(vehicle);
 			return vehicle;
 		}
 
@@ -426,11 +433,24 @@ public class DriverCertServiceImpl implements IDriverCertService {
 				// 已登记但不在本人名下，可能属于其他司机 —— 拒绝，不能顺手改归属
 				throw new ServiceException("该车牌已归属其他司机，请联系管理员");
 			}
+			requireEnabledVehicle(existing);
 			return existing;
 		}
 		return createVehicleForDriver(driver, request, normalized);
 	}
 
+	/**
+	 * 停用车辆不接受司机的认证提交
+	 * <p>
+	 * 停用是调度端的管理动作（车辆停驶、报废待办），司机端列表已不再显示停用车；
+	 * 若这里放行，司机仍能凭车牌把停用车提交认证，等于绕过停用。
+	 */
+	private void requireEnabledVehicle(TransportVehicle vehicle) {
+		if (vehicle != null && Func.isNotEmpty(vehicle.getStatus()) && vehicle.getStatus() != 1) {
+			throw new ServiceException("该车辆已停用，请联系调度启用后再认证");
+		}
+	}
+
 	/**
 	 * 按车牌（容忍写法差异）查已登记的车辆
 	 *
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverServiceImpl.java
index 2d4dc598..c4ea6169 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverServiceImpl.java
@@ -25,6 +25,7 @@
  */
 package org.springblade.transport.service.impl;
 
+import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -171,6 +172,31 @@ public class DriverServiceImpl extends BaseServiceImpl<DriverMapper, Driver> imp
 		return bindExistingProfile(existing.getId(), mpUserId);
 	}
 
+	@Override
+	public Long resolveDriverIdByMobile(String tenantId, String mobile) {
+		String resolvedTenantId = trimToNull(tenantId);
+		if (resolvedTenantId == null) {
+			resolvedTenantId = trimToNull(AuthUtil.getTenantId());
+		}
+		String mobileSnapshot = trimToNull(mobile);
+		// 脱敏手机号（如 138****8000）与空号都不是可用业务数据，查不到也不该查
+		if (resolvedTenantId == null || mobileSnapshot == null || mobileSnapshot.contains("*")) {
+			return null;
+		}
+		// 手机号会被二次放号，同租户内可能残留多条历史档案：只有唯一命中才认，不猜
+		List<Driver> matchedDrivers = list(Wrappers.<Driver>lambdaQuery()
+			.select(Driver::getId)
+			.eq(Driver::getTenantId, resolvedTenantId)
+			.eq(Driver::getMobile, mobileSnapshot));
+		if (matchedDrivers.size() != 1) {
+			log.warn("司机档案解析未唯一命中，driver_id 留空。租户={} 手机号={} 命中={} 条",
+				resolvedTenantId, DesensitizedUtil.mobilePhone(mobileSnapshot), matchedDrivers.size());
+			return null;
+		}
+		Driver matchedDriver = matchedDrivers.get(0);
+		return matchedDriver == null ? null : matchedDriver.getId();
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public DriverSyncMobileVO syncMobile(String tenantId, Long mpUserId, String oldPhone, String newPhone) {
@@ -392,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);
 		}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
index afd82e56..9433a569 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/DriverWaybillServiceImpl.java
@@ -33,10 +33,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.feign.IMpUserClient;
-import org.springblade.system.pojo.entity.MpUser;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -154,7 +151,6 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 
 	private final IWaybillService waybillService;
 	private final IDriverService driverService;
-	private final IMpUserClient mpUserClient;
 	private final IProcessConfigService processConfigService;
 	private final ITransportVehicleService transportVehicleService;
 	private final CertificationGate certificationGate;
@@ -166,12 +162,12 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 
 	@Override
 	public DriverWaybillCardVO currentTask() {
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return null;
 		}
 		// 进行中：running，或无需确认接单但仍为 pending 的历史数据
-		List<Waybill> candidates = waybillService.list(scopedQuery(phone)
+		List<Waybill> candidates = waybillService.list(scopedQuery(driver.getId())
 			.in(Waybill::getBusinessStatus, List.of(STATUS_RUNNING, STATUS_PENDING))
 			.orderByDesc(Waybill::getUpdateTime)
 			.last("LIMIT 20"));
@@ -187,12 +183,12 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	@Override
 	public DriverWaybillPreviewVO pendingPreview(Integer size) {
 		DriverWaybillPreviewVO preview = new DriverWaybillPreviewVO();
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return preview;
 		}
 		int limit = normalizePreviewSize(size);
-		List<Waybill> pendingList = waybillService.list(scopedQuery(phone)
+		List<Waybill> pendingList = waybillService.list(scopedQuery(driver.getId())
 			.in(Waybill::getBusinessStatus, PENDING_STATUSES)
 			.orderByDesc(Waybill::getCreateTime));
 		List<Waybill> needAccept = pendingList.stream()
@@ -207,11 +203,11 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	@Override
 	public DriverWaybillTabCountsVO tabCounts() {
 		DriverWaybillTabCountsVO vo = new DriverWaybillTabCountsVO();
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return vo;
 		}
-		List<Waybill> waybills = waybillService.list(scopedQuery(phone)
+		List<Waybill> waybills = waybillService.list(scopedQuery(driver.getId())
 			.in(Waybill::getBusinessStatus, TAB_ALL_STATUSES));
 		long pending = 0;
 		long doing = 0;
@@ -243,12 +239,12 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 		int pageSize = size == null || size < 1 ? DEFAULT_PAGE_SIZE : Math.min(size, MAX_PAGE_SIZE);
 		Page<DriverWaybillCardVO> empty = new Page<>(pageNo, pageSize);
 
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return empty;
 		}
 
-		LambdaQueryWrapper<Waybill> wrapper = scopedQuery(phone);
+		LambdaQueryWrapper<Waybill> wrapper = scopedQuery(driver.getId());
 		// 先按 Tab 口径拉候选，再按过程配置校正 pending→running 后内存分页
 		applyStatusFilterForQuery(wrapper, status);
 		applyKeyword(wrapper, keyword);
@@ -271,18 +267,17 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 
 	@Override
 	public DriverWaybillCardVO detail(Long id) {
-		requireCurrentDriver();
 		Waybill waybill = loadDriverWaybill(id);
 		return toCard(normalizeAcceptStatus(waybill), true);
 	}
 
 	@Override
 	public DriverWaybillCardVO tripCurrentTask() {
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return null;
 		}
-		TripQueryVO query = TripQueryVO.forDriver(phone);
+		TripQueryVO query = TripQueryVO.forDriver(driver.getId());
 		// 待确认（待回单确认）的趟车司机仍需回到卡片上继续操作，与进行中并列作为当前任务
 		query.setStatuses(List.of(TRIP_STATUS_RUNNING, TRIP_STATUS_PENDING_RETURN_CONFIRM));
 		query.setCurrent(1);
@@ -294,11 +289,11 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	@Override
 	public DriverWaybillPreviewVO tripPendingPreview(Integer size) {
 		DriverWaybillPreviewVO preview = new DriverWaybillPreviewVO();
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return preview;
 		}
-		TripQueryVO query = TripQueryVO.forDriver(phone);
+		TripQueryVO query = TripQueryVO.forDriver(driver.getId());
 		query.setStatus(TRIP_STATUS_PENDING);
 		query.setCurrent(1);
 		query.setSize(normalizePreviewSize(size));
@@ -313,11 +308,11 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	@Override
 	public DriverWaybillTabCountsVO tripTabCounts() {
 		DriverWaybillTabCountsVO counts = new DriverWaybillTabCountsVO();
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return counts;
 		}
-		TripTabCountsVO tripCounts = tripQueryService.tabCounts(TripQueryVO.forDriver(phone));
+		TripTabCountsVO tripCounts = tripQueryService.tabCounts(TripQueryVO.forDriver(driver.getId()));
 		counts.setPending(tripCounts.getPending());
 		counts.setDoing(tripCounts.getDoing());
 		counts.setConfirm(tripCounts.getConfirm());
@@ -328,11 +323,11 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 
 	@Override
 	public IPage<DriverWaybillCardVO> tripPage(Integer current, Integer size, Integer status, String keyword) {
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
+		Driver driver = currentDriver();
+		if (driver == null) {
 			return new Page<>(normalizePageNo(current), normalizePageSize(size));
 		}
-		TripQueryVO query = TripQueryVO.forDriver(phone);
+		TripQueryVO query = TripQueryVO.forDriver(driver.getId());
 		query.setStatus(status);
 		query.setKeyword(keyword);
 		query.setCurrent(current);
@@ -347,15 +342,14 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 
 	@Override
 	public DriverWaybillCardVO tripDetail(String tripId) {
-		requireCurrentDriver();
-		TripQueryVO query = TripQueryVO.forDriver(currentUserPhone());
+		Driver driver = requireCurrentDriver();
+		TripQueryVO query = TripQueryVO.forDriver(driver.getId());
 		query.setTripId(tripId);
 		return toTripCard(tripQueryService.detail(query), true);
 	}
 
 	@Override
 	public WaybillTrackVO track(Long id) {
-		requireCurrentDriver();
 		Waybill waybill = loadDriverWaybill(id);
 		LocalDate[] range = resolveTrackDateRange(waybill);
 		return waybillService.trackVehicle(waybill.getId(), range[0].toString(), range[1].toString());
@@ -742,7 +736,7 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	 * 子单集合是司机可见的那一批：已拒单的子单不在其中，否则接单会把本人拒掉的单重新拉回来。
 	 */
 	private List<TripVO.TripWaybillVO> tripChildren(String tripId) {
-		TripQueryVO query = TripQueryVO.forDriver(currentUserPhone());
+		TripQueryVO query = TripQueryVO.forDriver(requireCurrentDriver().getId());
 		query.setTripId(tripId);
 		TripVO trip = tripQueryService.detail(query);
 		List<TripVO.TripWaybillVO> children = trip.getWaybills() == null ? List.of() : trip.getWaybills();
@@ -822,13 +816,10 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 		if (id == null) {
 			throw new ServiceException("运单ID不能为空");
 		}
-		String phone = currentUserPhone();
-		if (Func.isEmpty(phone)) {
-			throw new ServiceException("当前用户手机号为空，无法查找运单");
-		}
+		Driver driver = requireCurrentDriver();
 		// MySQL 的 FOR UPDATE 必须跟在 LIMIT 之后
 		String tail = forUpdate ? "LIMIT 1 FOR UPDATE" : "LIMIT 1";
-		Waybill waybill = waybillService.getOne(scopedQuery(phone, includeRejected)
+		Waybill waybill = waybillService.getOne(scopedQuery(driver.getId(), includeRejected)
 			.eq(Waybill::getId, id).last(tail));
 		if (waybill == null) {
 			throw new ServiceException("运单不存在或无权操作");
@@ -885,14 +876,17 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	}
 
 	/**
-	 * 司机可见运单范围：运单司机手机号（driver_phone）等于当前用户手机号，
+	 * 司机可见运单范围：运单归属档案（driver_id）就是当前司机档案，
 	 * 且该运单未被这个司机拒单。
 	 * <p>
+	 * driver_id 必须有值且大于 0 才算有主：存量数据的 -1 是哨兵值，与 0 一样等同无主。
+	 * 运单上的 driver_phone 只是派单快照，不参与归属判定——司机改号不影响可见性。
+	 * <p>
 	 * 拒单后运单对司机彻底脱离——列表、计数、详情、打卡、接单一律不可达，等管理员重新派单。
 	 * 运单上的司机姓名/手机/车牌不清空，调度重新派单时要知道原来派给谁。
 	 */
-	private LambdaQueryWrapper<Waybill> scopedQuery(String phone) {
-		return scopedQuery(phone, false);
+	private LambdaQueryWrapper<Waybill> scopedQuery(Long driverId) {
+		return scopedQuery(driverId, false);
 	}
 
 	/**
@@ -900,11 +894,10 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	 *                        拒单的运单不可能处于运输中，收口拦不到合法操作，
 	 *                        而保留原判据可避免「已拒单 + 进行中」的历史脏数据被误伤
 	 */
-	private LambdaQueryWrapper<Waybill> scopedQuery(String phone, boolean includeRejected) {
-		String normalizedPhone = Func.toStr(phone, "").trim();
-		LambdaQueryWrapper<Waybill> wrapper = Wrappers.<Waybill>lambdaQuery().and(w -> w
-			.eq(Waybill::getDriverPhone, normalizedPhone)
-			.or().apply("REPLACE(IFNULL(driver_phone,''),' ','') = {0}", normalizedPhone));
+	private LambdaQueryWrapper<Waybill> scopedQuery(Long driverId, boolean includeRejected) {
+		LambdaQueryWrapper<Waybill> wrapper = Wrappers.<Waybill>lambdaQuery()
+			.gt(Waybill::getDriverId, 0)
+			.eq(Waybill::getDriverId, driverId);
 		if (!includeRejected) {
 			wrapper.and(w -> w.isNull(Waybill::getDriverAcceptStatus)
 				.or().ne(Waybill::getDriverAcceptStatus, WaybillProcessSupport.ACCEPT_REJECTED));
@@ -926,69 +919,18 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 	}
 
 	/**
-	 * 当前用户手机号：司机档案 mobile 优先，其次小程序用户账号。
+	 * 当前登录司机：只按登录用户 ID 查司机档案，查不到即「无归属」。
 	 * <p>
-	 * 派单时运单 driver_phone 取自司机档案 mobile，故档案有手机号就以它为准。
-	 */
-	private String currentUserPhone() {
-		Driver driver = currentDriver();
-		if (driver != null && isMobileLike(driver.getMobile())) {
-			return driver.getMobile().trim();
-		}
-		Long userId = AuthUtil.getUserId();
-		if (userId == null || userId <= 0) {
-			return null;
-		}
-		R<MpUser> result = mpUserClient.userById(userId);
-		if (result != null && R.isSuccess(result) && result.getData() != null
-			&& isMobileLike(result.getData().getAccount())) {
-			return result.getData().getAccount().trim();
-		}
-		return null;
-	}
-
-	/**
-	 * 当前登录司机：优先 userId，其次手机号（JWT 账号 / 小程序用户 account）匹配 driver.mobile
+	 * 归属判据：driver_id = 当前登录人的司机档案 id；driver_phone 不参与判定。
 	 */
 	private Driver currentDriver() {
 		Long userId = AuthUtil.getUserId();
 		if (userId == null || userId <= 0) {
 			return null;
 		}
-		Driver driver = driverService.getOne(Wrappers.<Driver>lambdaQuery()
+		return driverService.getOne(Wrappers.<Driver>lambdaQuery()
 			.eq(Driver::getUserId, userId)
 			.last("LIMIT 1"));
-		if (driver != null) {
-			return driver;
-		}
-		String phone = resolveSelfPhone(userId);
-		if (Func.isNotEmpty(phone)) {
-			return driverService.getOne(Wrappers.<Driver>lambdaQuery()
-				.eq(Driver::getMobile, phone)
-				.orderByDesc(Driver::getUpdateTime)
-				.last("LIMIT 1"));
-		}
-		return null;
-	}
-
-	/**
-	 * 解析当前小程序用户可用于匹配司机档案的手机号
-	 */
-	private String resolveSelfPhone(Long userId) {
-		String account = AuthUtil.getUserAccount();
-		if (isMobileLike(account)) {
-			return account.trim();
-		}
-		R<MpUser> result = mpUserClient.userById(userId);
-		if (result != null && R.isSuccess(result) && result.getData() != null
-			&& isMobileLike(result.getData().getAccount())) {
-			return result.getData().getAccount().trim();
-		}
-		return Func.isEmpty(account) ? null : account.trim();
-	}
-
-	private boolean isMobileLike(String value) {
-		return Func.isNotEmpty(value) && value.trim().matches("^1\\d{10,14}$");
 	}
 
 	private List<String> splitPlates(String drivingVehicle) {
@@ -1308,8 +1250,7 @@ public class DriverWaybillServiceImpl implements IDriverWaybillService {
 
 	@Override
 	public void assertCurrentDriverOwnsWaybill(Long waybillId) {
-		// 归属口径与司机打卡、司机接单一致：按当前用户手机号匹配运单司机手机号
-		requireCurrentDriver();
+		// 归属口径与司机打卡、司机接单一致：运单 driver_id 必须是当前登录司机的档案（查不到档案即无归属）
 		loadDriverWaybill(waybillId);
 	}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java
index 031f6ba7..a392a032 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ExceptionDisposalServiceImpl.java
@@ -41,22 +41,28 @@ import org.springblade.transport.pojo.dto.ExceptionDisposalFollowRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalRejectRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalRouteAdjustRequest;
 import org.springblade.transport.pojo.dto.ExceptionDisposalUpdateRequest;
+import org.springblade.transport.pojo.dto.ExceptionMaintenanceRecordRequest;
 import org.springblade.transport.pojo.entity.ExceptionDisposal;
 import org.springblade.transport.pojo.entity.ExceptionDisposalFollowRecord;
 import org.springblade.transport.pojo.entity.LoadingManage;
+import org.springblade.transport.pojo.entity.MaintenanceRecord;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.pojo.vo.ExceptionDisposalFollowRecordVO;
 import org.springblade.transport.pojo.vo.ExceptionDisposalVO;
+import org.springblade.transport.pojo.vo.MaintenanceRecordVO;
 import org.springblade.transport.service.IDriverWaybillService;
 import org.springblade.transport.service.IExceptionDisposalService;
+import org.springblade.transport.service.IMaintenanceRecordService;
 import org.springblade.transport.service.IWaybillService;
 import org.springblade.transport.support.MpUserDataScopeSupport;
 import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.support.WaybillProcessSupport;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -92,6 +98,12 @@ public class ExceptionDisposalServiceImpl
 	/** 拒绝原因长度上限，与上报说明、异常原因同量级，且远小于跟进记录列宽 */
 	private static final int REJECT_REASON_MAX_LENGTH = 200;
 
+	/** 异常子流程录入的维修记录固定为车辆：入口只对「车辆故障维修」类异常开放 */
+	private static final String MAINTENANCE_VEHICLE_TYPE = "车辆";
+
+	/** 维修记录跟进说明前缀；金额必填，维修单位按实际填写拼在后面 */
+	private static final String MAINTENANCE_FOLLOW_PREFIX = "已录入维修记录：费用";
+
 	/** 路线与任务信息的列宽上限，与 PC 改路线同一口径 */
 	private static final int ROUTE_JSON_MAX_LENGTH = 8000;
 	private static final int TASK_INFO_JSON_MAX_LENGTH = 8000;
@@ -119,17 +131,20 @@ public class ExceptionDisposalServiceImpl
 	private final IDriverWaybillService driverWaybillService;
 	private final MpUserDataScopeSupport mpUserDataScopeSupport;
 	private final LoadingManageMapper loadingManageMapper;
+	private final IMaintenanceRecordService maintenanceRecordService;
 
 	public ExceptionDisposalServiceImpl(ExceptionDisposalFollowRecordMapper followRecordMapper,
 										IWaybillService waybillService,
 										IDriverWaybillService driverWaybillService,
 										MpUserDataScopeSupport mpUserDataScopeSupport,
-										LoadingManageMapper loadingManageMapper) {
+										LoadingManageMapper loadingManageMapper,
+										IMaintenanceRecordService maintenanceRecordService) {
 		this.followRecordMapper = followRecordMapper;
 		this.waybillService = waybillService;
 		this.driverWaybillService = driverWaybillService;
 		this.mpUserDataScopeSupport = mpUserDataScopeSupport;
 		this.loadingManageMapper = loadingManageMapper;
+		this.maintenanceRecordService = maintenanceRecordService;
 	}
 
 	@Override
@@ -146,6 +161,7 @@ public class ExceptionDisposalServiceImpl
 		ExceptionDisposalVO vo = convertVO(entity);
 		fillRouteNodes(vo, fillRouteAndCargo(vo, entity.getWaybillId()));
 		vo.setFollowRecords(followRecords(id));
+		vo.setMaintenanceRecord(maintenanceRecord(id));
 		return vo;
 	}
 
@@ -527,6 +543,76 @@ public class ExceptionDisposalServiceImpl
 		updateById(disposal);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void submitMaintenanceRecord(ExceptionMaintenanceRecordRequest request) {
+		if (request == null || request.getId() == null) {
+			throw new ServiceException("请选择需要录入维修记录的异常");
+		}
+		ExceptionDisposal disposal = getExisting(request.getId());
+		if (STATUS_REVOKED.equals(disposal.getDisposalStatus())) {
+			throw new ServiceException("已撤销的异常不允许录入维修记录");
+		}
+		if (Func.isBlank(disposal.getVehicleNo())) {
+			throw new ServiceException("异常未记录车牌号，无法录入维修记录");
+		}
+		// 唯一索引占位后无法再插入，先按 exception_id 拦住（含已逻辑删除的记录）
+		long recorded = maintenanceRecordService.count(Wrappers.<MaintenanceRecord>lambdaQuery()
+			.eq(MaintenanceRecord::getExceptionId, disposal.getId()));
+		if (recorded > 0) {
+			throw new ServiceException("该异常已录入维修记录");
+		}
+
+		MaintenanceRecord record = new MaintenanceRecord();
+		record.setExceptionId(disposal.getId());
+		record.setVehicleType(MAINTENANCE_VEHICLE_TYPE);
+		record.setVehicleNo(disposal.getVehicleNo());
+		record.setMaintenanceTime(request.getMaintenanceTime());
+		record.setLocation(request.getLocation());
+		record.setMaintainer(request.getMaintainer());
+		record.setCompany(request.getCompany());
+		record.setContact(request.getContact());
+		record.setReplacedPart(request.getReplacedPart());
+		record.setCost(request.getCost());
+		record.setMileage(request.getMileage());
+		record.setFactoryTime(request.getFactoryTime());
+		record.setAddress(request.getAddress());
+		record.setRemark(request.getRemark());
+		record.setAttachments(request.getAttachments());
+		// 复用维修记录自身的校验与落库（车船类型、车牌、费用、出厂时间等口径与 PC 一致）
+		try {
+			maintenanceRecordService.submit(record);
+		} catch (DuplicateKeyException exception) {
+			// 并发重复提交：前一条尚在事务中、计数看不见，唯一索引是最终防线
+			throw new ServiceException("该异常已录入维修记录");
+		}
+
+		String followContent = maintenanceFollowContent(record.getCost(), record.getCompany());
+		insertFollowRecord(disposal.getId(), followContent);
+		disposal.setLatestFollowContent(followContent);
+		// 录入维修记录不结案：已了结的异常只补记录与最近跟进，不回退状态
+		if (!WaybillProcessSupport.SETTLED_DISPOSAL_STATUSES.contains(disposal.getDisposalStatus())) {
+			disposal.setDisposalStatus(STATUS_PROCESSING);
+		}
+		updateById(disposal);
+	}
+
+	/** 跟进说明：金额必填，维修单位为空时只写金额 */
+	private String maintenanceFollowContent(BigDecimal cost, String company) {
+		String amount = Func.isEmpty(cost) ? "" : cost.setScale(2, RoundingMode.HALF_UP).toPlainString();
+		String content = MAINTENANCE_FOLLOW_PREFIX + amount + "元";
+		return Func.isBlank(company) ? content : content + "，维修单位" + company.trim();
+	}
+
+	/** 异常关联的维修记录：一条异常至多一条，逻辑删除的视为未录入 */
+	private MaintenanceRecordVO maintenanceRecord(Long disposalId) {
+		MaintenanceRecord record = maintenanceRecordService.getOne(Wrappers.<MaintenanceRecord>lambdaQuery()
+			.eq(MaintenanceRecord::getExceptionId, disposalId)
+			.eq(MaintenanceRecord::getIsDeleted, 0)
+			.last("LIMIT 1"));
+		return record == null ? null : BeanUtil.copyProperties(record, MaintenanceRecordVO.class);
+	}
+
 	/** 已了结（已完成 / 已撤销）的异常不允许再次处置 */
 	private void assertNotSettled(ExceptionDisposal disposal) {
 		if (WaybillProcessSupport.SETTLED_DISPOSAL_STATUSES.contains(disposal.getDisposalStatus())) {
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
index 6dec9268..c1ddc927 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
@@ -97,6 +97,7 @@ import org.springblade.transport.service.IPreSettlementService;
 import org.springblade.transport.service.ISettlementProjectAdvanceWriteOffService;
 import org.springblade.transport.service.IWaybillService;
 import org.springblade.transport.service.KingdeeSyncContext;
+import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.support.KingdeeApBillSyncSupport;
 import org.springblade.transport.support.KingdeeArBillSyncSupport;
 import org.springblade.transport.support.KingdeeSyncLockSupport;
@@ -154,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;
@@ -231,20 +235,24 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 	}
 
 	/**
-	 * 填充已指定应付聚合态：按本页结算单一次批量查认领关系与收票登记，避免 N+1。
+	 * 填充已指定应付聚合态（仅付款结算单）：按本页结算单一次批量查认领关系与收票登记，避免 N+1。
 	 * 聚合规则：任一指定失败 → failed；全部已指定 → assigned；其余（有认领但未指定/未推送）→ unspecified；
 	 * 无认领收票或全部认领票无效不填充，前端展示"-"
 	 *
 	 * @param rows 本页 VO 列表
 	 */
 	private void fillKingdeeAssignStatus(List<FormalSettlementVO> rows) {
-		if (Func.isEmpty(rows)) {
+		// 已指定应付仅付款结算单（先票后款 A302-6）有，收款结算单不参与聚合，避免无意义查询与字段下发
+		List<FormalSettlementVO> payableRows = rows.stream()
+			.filter(row -> "payable".equals(row.getSettlementType()))
+			.toList();
+		if (Func.isEmpty(payableRows)) {
 			return;
 		}
 		List<InvoiceReceiptSettlement> relations = invoiceReceiptSettlementMapper.selectList(
 			Wrappers.<InvoiceReceiptSettlement>lambdaQuery()
 				.in(InvoiceReceiptSettlement::getFormalSettlementId,
-					rows.stream().map(FormalSettlementVO::getId).filter(Objects::nonNull).toList()));
+					payableRows.stream().map(FormalSettlementVO::getId).filter(Objects::nonNull).toList()));
 		if (relations.isEmpty()) {
 			return;
 		}
@@ -263,7 +271,7 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 			receiptsBySettlement.computeIfAbsent(relation.getFormalSettlementId(), key -> new ArrayList<>())
 				.add(receipt);
 		}
-		for (FormalSettlementVO vo : rows) {
+		for (FormalSettlementVO vo : payableRows) {
 			List<InvoiceReceipt> claimed = receiptsBySettlement.get(vo.getId());
 			if (Func.isEmpty(claimed)) {
 				continue;
@@ -1342,6 +1350,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) {
@@ -2105,7 +2220,29 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 		try {
 			Object parsed = JsonUtil.parse(json, Map.class);
 			if (parsed instanceof Map<?, ?> map) {
-				map.forEach((key, value) -> result.put(String.valueOf(key), decimal(value)));
+				BigDecimal otherFeeAmount = BigDecimal.ZERO;
+				for (Map.Entry<?, ?> entry : map.entrySet()) {
+					String key = String.valueOf(entry.getKey());
+					Object value = entry.getValue();
+					if (Func.isBlank(key)) {
+						continue;
+					}
+					if ("otherFreightAmount".equals(key) || "otherFeeTotal".equals(key) || "otherAmount".equals(key)) {
+						otherFeeAmount = otherFeeAmount.add(decimal(value));
+						continue;
+					}
+					if (TransportBusinessSupport.isFreightJsonMetaKey(key)) {
+						continue;
+					}
+					if (value instanceof Map<?, ?> || value instanceof java.util.Collection<?>) {
+						continue;
+					}
+					result.put(key, decimal(value));
+				}
+				if (otherFeeAmount.signum() > 0 && result.keySet().stream()
+					.noneMatch(name -> name != null && (name.contains("其它费") || name.contains("其他费")))) {
+					result.put("其它费用", otherFeeAmount);
+				}
 			}
 		} catch (RuntimeException ignored) {
 			// 兼容历史费用JSON，不影响正式结算保存。
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
index 33ed3b10..f2f9e7ac 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceApplicationServiceImpl.java
@@ -43,6 +43,7 @@ import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplyQueryDTO;
 import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplySaveDTO;
 import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplySaveEntryDTO;
 import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoiceApplySaveFreightDTO;
+import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultItemVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiBillSaveResultVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiInvoiceApplyOpenApiBillVO;
 import org.springblade.thirdparty.bfi.pojo.vo.BfiInvoiceApplyOpenApiInvoiceVO;
@@ -733,9 +734,11 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 	public String doSyncKingdee(Long id) {
 		InvoiceApplication entity = lockedExisting(id);
 		if (!TransportBusiConstant.APPROVED.equals(entity.getApprovalStatus())) throw new ServiceException("仅审批通过的开票申请允许同步金蝶");
-		// 已同步/已开票幂等返回（开票完成为终态）；星瀚内码由附件补传分支经 A303-4 反查回填
-		if (KingdeeBfiConstant.KINGDEE_STATUS_SYNCED.equals(entity.getKingdeeStatus())
-			|| KingdeeBfiConstant.KINGDEE_STATUS_INVOICED.equals(entity.getKingdeeStatus())) {
+		// 已开票为终态幂等返回；已同步且星瀚内码齐备幂等返回——
+		// 已同步但内码缺失（历史推送未落内码）放行，走下方 A303-4 勾稽反查补内码，供 A902 附件上传定位金蝶单据
+		if (KingdeeBfiConstant.KINGDEE_STATUS_INVOICED.equals(entity.getKingdeeStatus())
+			|| (KingdeeBfiConstant.KINGDEE_STATUS_SYNCED.equals(entity.getKingdeeStatus())
+				&& Func.isNotBlank(entity.getKingdeeBillId()))) {
 			return entity.getKingdeeBillNo();
 		}
 		if (Func.isBlank(entity.getApplicationNo())) throw new ServiceException("推送金蝶开票申请失败：开票申请单号为空");
@@ -782,31 +785,40 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		// 每张发票的金蝶业务单据编号（A303-1 billno 候选键，须唯一）：单张=开票申请单号（兼容存量），多张=开票申请单号-张次序号
 		List<String> sheetBillNos = sheets.stream().map(sheet -> this.sheetBillNo(entity, sheet, sheets.size())).toList();
 		// A303-4 幂等预检：按全部候选 billno 查询金蝶是否已生成开票申请单（防上次推送成功但本地回滚的断链重推），
-		// 已生成的张次幂等跳过，未生成的张次重新推送
+		// 实测返回 billno 与推送值完全一致，按 billno 精确匹配；部分张次已生成时不可整单提前返回，须断点续推剩余张次
 		BfiInvoiceApplyQueryDTO idempotentQuery = new BfiInvoiceApplyQueryDTO();
 		idempotentQuery.setPageNo(1);
 		idempotentQuery.setPageSize(Math.max(sheets.size(), 10));
 		idempotentQuery.setBillno(sheetBillNos);
-		Set<String> existSheetBillNos = new LinkedHashSet<>();
+		Map<String, BfiInvoiceApplyVO> existApplyByBillNo = new LinkedHashMap<>();
 		BfiPageVO<BfiInvoiceApplyVO> existPage = bfiService.queryInvoiceApply(idempotentQuery);
 		if (existPage != null && Func.isNotEmpty(existPage.getRows())) {
 			for (BfiInvoiceApplyVO existApply : existPage.getRows()) {
 				if (existApply != null && Func.isNotBlank(existApply.getBillno())
 					&& sheetBillNos.contains(existApply.getBillno())) {
-					existSheetBillNos.add(existApply.getBillno());
-					// 金蝶已生成：直接回填视为同步成功（勾稽纠偏），星瀚内码一并回填（A902 附件上传定位用）
-					log.info("开票申请[{}]经 A303-4 查得金蝶开票申请单已生成（单据编号[{}]，星瀚内码[{}]），跳过重复推送直接回填",
+					existApplyByBillNo.put(existApply.getBillno(), existApply);
+					log.info("开票申请[{}]经 A303-4 查得金蝶开票申请单已生成（单据编号[{}]，星瀚内码[{}]），幂等跳过推送",
 						entity.getApplicationNo(), existApply.getBillno(), existApply.getId());
-					entity.setKingdeeBillNo(existApply.getBillno());
-					entity.setKingdeeBillId(existApply.getId() == null ? null : String.valueOf(existApply.getId()));
-					entity.setKingdeeStatus(KingdeeBfiConstant.KINGDEE_STATUS_SYNCED);
-					entity.setSyncedTime(LocalDateTime.now());
-					updateById(entity);
-					record(entity.getId(), "sync", "同步金蝶（勾稽回填）", TransportBusiConstant.APPROVED, TransportBusiConstant.APPROVED, null, existApply.getBillno());
-					return existApply.getBillno();
 				}
 			}
 		}
+		// 全部张次金蝶均已生成：直接勾稽回填视为同步成功（星瀚内码一并回填，A902 附件上传定位用）
+		if (!existApplyByBillNo.isEmpty() && existApplyByBillNo.keySet().containsAll(sheetBillNos)) {
+			entity.setKingdeeBillNo(String.join(",", existApplyByBillNo.keySet()));
+			entity.setKingdeeBillId(existApplyByBillNo.values().stream()
+				.map(BfiInvoiceApplyVO::getId).filter(Objects::nonNull).findFirst().map(String::valueOf).orElse(null));
+			entity.setKingdeeStatus(KingdeeBfiConstant.KINGDEE_STATUS_SYNCED);
+			entity.setSyncedTime(LocalDateTime.now());
+			updateById(entity);
+			record(entity.getId(), "sync", "同步金蝶（勾稽回填）", TransportBusiConstant.APPROVED, TransportBusiConstant.APPROVED, null, entity.getKingdeeBillNo());
+			return entity.getKingdeeBillNo();
+		}
+		// 部分张次已生成：先回填星瀚内码，已生成张次在下方逐张循环幂等跳过，未生成张次继续推送
+		Set<String> existSheetBillNos = existApplyByBillNo.keySet();
+		if (Func.isBlank(entity.getKingdeeBillId())) {
+			entity.setKingdeeBillId(existApplyByBillNo.values().stream()
+				.map(BfiInvoiceApplyVO::getId).filter(Objects::nonNull).findFirst().map(String::valueOf).orElse(null));
+		}
 		// 组装 A303-1 开票申请单（字段映射见设计文档 6.3/6.4）
 		if (Func.isBlank(entity.getIssuerName())) {
 			throw new ServiceException("推送金蝶开票申请失败：开票单位（销方）为空");
@@ -833,10 +845,16 @@ 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);
-		String kingdeeDeptNumber = kingdeeApBillSyncSupport.kingdeeDeptNumber(entity.getProjectId(), kingdeeContext);
+		FormalSettlement firstSettlement = formalSettlementMapper.selectById(relations.get(0).getFormalSettlementId());
+		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.getSupplierCode()) && Func.isBlank(customer.getCustomerCode()))) {
 			throw new ServiceException("推送金蝶开票申请失败：受票方客户未在客商档案中维护供应商编码或客商编码，请补充后重试");
@@ -873,7 +891,12 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 			BfiBillSaveResultVO saveResult = bfiService.saveInvoiceApply(param);
 			kingdeeApBillSyncSupport.requireBfiSaveSuccess(saveResult,
 				"推送金蝶开票申请发票张[" + Func.toStr(sheet.getSheetNo()) + "]");
-			String kingdeeNo = saveResult.getResult().get(0).getNumber();
+			BfiBillSaveResultItemVO saveItem = saveResult.getResult().get(0);
+			String kingdeeNo = saveItem.getNumber();
+			// 星瀚内码随 A303-1 保存结果回填（A902 附件上传定位金蝶单据用），缺失时由 A303-4 勾稽反查兜底
+			if (Func.isBlank(entity.getKingdeeBillId()) && saveItem.getId() != null) {
+				entity.setKingdeeBillId(String.valueOf(saveItem.getId()));
+			}
 			sheet.setKingdeeBillNo(kingdeeNo);
 			savedBillNos.add(kingdeeNo);
 			pushedNew = true;
@@ -924,9 +947,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);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
index 8ebc06de..017b1ac8 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java
@@ -70,6 +70,7 @@ import org.springblade.transport.mapper.KingdeeInvoicePoolMapper;
 import org.springblade.transport.pojo.dto.InvoiceReceiptSaveRequest;
 import org.springblade.transport.pojo.dto.InvoiceReceiptStatusRequest;
 import org.springblade.transport.pojo.dto.KingdeeInvoicePoolQueryDTO;
+import org.springblade.transport.pojo.entity.ContractManage;
 import org.springblade.transport.pojo.entity.CustomerArchive;
 import org.springblade.transport.pojo.entity.CustomerContact;
 import org.springblade.transport.pojo.entity.CustomerInvoiceInfo;
@@ -691,7 +692,8 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 			return "发票" + Func.toStrWithEmpty(receipt.getInvoiceNo(), String.valueOf(receipt.getId())) + "已推送金蝶，幂等跳过";
 		}
 		// 计划内登记实体以行锁后最新数据替换（并发下推送状态可能已被其他事务改写）
-		plan = new ReceivedInvoicePushPlan(receipt, plan.mirror(), plan.blockedReason());
+		plan = new ReceivedInvoicePushPlan(receipt, plan.mirror(), plan.settlement(), plan.details(),
+			plan.apBillSrcCode(), plan.blockedReason());
 		log.info("收票登记[{}]推送金蝶收票单开始：id={}，推送状态={}", receipt.getInvoiceNo(), receipt.getId(),
 			receipt.getKingdeePushStatus());
 		if (Func.isNotBlank(plan.blockedReason())) {
@@ -733,8 +735,12 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 					fetchMirrorItemsFromPool(plan.mirror());
 				}
 				log.info("收票登记[{}]开始 A303-2 推送金蝶收票单", receipt.getInvoiceNo());
+				ContractManage contract = kingdeeApBillSyncSupport.requireContract(plan.settlement().getContractId(), context);
+				// 明细分录与应付单 A102-2 同源同口径：复用同一结算明细解析结果，结算明细行+结算合计费用项各一条
+				List<KingdeeApBillSyncSupport.BfiEntryGroup> entryGroups =
+					kingdeeApBillSyncSupport.resolveEntryGroups(plan.details(), context);
 				KingdeeReceivedInvoiceSyncSupport.ReceivedInvoicePushOutcome pushOutcome =
-					kingdeeReceivedInvoiceSyncSupport.pushReceivedInvoice(receipt, plan.mirror(), context);
+					kingdeeReceivedInvoiceSyncSupport.pushReceivedInvoice(receipt, plan.mirror(), contract, entryGroups, context);
 				billNo = pushOutcome.billNo();
 				billPkId = pushOutcome.billId();
 				log.info("收票登记[{}]A303-2 推送成功：金蝶收票单[{}]，星瀚内码={}", receipt.getInvoiceNo(), billNo, billPkId);
@@ -814,23 +820,23 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 	private ReceivedInvoicePushPlan buildReceivedInvoicePushPlan(InvoiceReceipt receipt, Map<Long, KingdeeInvoicePool> mirrorById) {
 		String pushStatus = Func.toStrWithEmpty(receipt.getKingdeePushStatus(), KingdeeBfiConstant.RECEIVED_PUSH_UNSYNCED);
 		if (!TransportBusiConstant.APPROVED.equals(receipt.getApprovalStatus())) {
-			return new ReceivedInvoicePushPlan(receipt, null, "仅审批通过的收票登记允许推送金蝶");
+			return new ReceivedInvoicePushPlan(receipt, null, null, null, null, "仅审批通过的收票登记允许推送金蝶");
 		}
 		if (KingdeeBfiConstant.RECEIVED_PUSH_ASSIGNED.equals(pushStatus)) {
-			return new ReceivedInvoicePushPlan(receipt, null, "收票单已指定应付，无需重复推送");
+			return new ReceivedInvoicePushPlan(receipt, null, null, null, null, "收票单已指定应付，无需重复推送");
 		}
 		KingdeeInvoicePool mirror = receipt.getKingdeeInvoicePoolId() == null ? null
 			: mirrorById.get(receipt.getKingdeeInvoicePoolId());
 		if (mirror == null) {
-			return new ReceivedInvoicePushPlan(receipt, null, "收票登记未绑定票池镜像，请先完成同步绑定");
+			return new ReceivedInvoicePushPlan(receipt, null, null, null, null, "收票登记未绑定票池镜像，请先完成同步绑定");
 		}
 		if ("2".equals(mirror.getCheckStatus())) {
-			return new ReceivedInvoicePushPlan(receipt, mirror, "金蝶发票查验不通过，请先人工核实票池发票");
+			return new ReceivedInvoicePushPlan(receipt, mirror, null, null, null, "金蝶发票查验不通过，请先人工核实票池发票");
 		}
 		if (receipt.getDeptId() == null) {
-			return new ReceivedInvoicePushPlan(receipt, mirror, "收票登记未选择结算组织，无法确定金蝶结算组织编码");
+			return new ReceivedInvoicePushPlan(receipt, mirror, null, null, null, "收票登记未选择结算组织，无法确定金蝶结算组织编码");
 		}
-		return new ReceivedInvoicePushPlan(receipt, mirror, null);
+		return new ReceivedInvoicePushPlan(receipt, mirror, null, null, null, null);
 	}
 
 	/** A801-3 幂等预检批量查询：未终态计划按购方单位分组，窗口内翻页匹配防重键 */
@@ -897,14 +903,17 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl<InvoiceReceiptMap
 	}
 
 	/**
-	 * 收票单推送预检计划（blockedReason 非空表示前置拦截，不进入推送流程）。
-	 * 先票后款链路：分摊结算单/防重键不再参与推送前置，指定应付由结算单侧驱动
+	 * 收票单推送预检计划（blockedReason 非空表示前置拦截，不进入推送流程）
 	 *
 	 * @param receipt       收票登记
 	 * @param mirror        绑定的票池镜像（可为 null）
+	 * @param settlement    唯一分摊的应付正式结算单（可为 null）
+	 * @param details       结算单结算明细（防重键组装与 A303-2 分录解析共用，可为 null）
+	 * @param apBillSrcCode 财务应付单防重键（无法组装时为 null）
 	 * @param blockedReason 前置拦截原因
 	 */
-	private record ReceivedInvoicePushPlan(InvoiceReceipt receipt, KingdeeInvoicePool mirror, String blockedReason) {
+	private record ReceivedInvoicePushPlan(InvoiceReceipt receipt, KingdeeInvoicePool mirror,
+	                                       FormalSettlement settlement, List<FormalSettlementDetail> details, String apBillSrcCode, String blockedReason) {
 	}
 
 	// ==================== 先票后款：发票明细查询 / 认领候选 / 结算侧关系同步与指定应付 ====================
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java
index 0777be99..b2f92153 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java
@@ -4,6 +4,7 @@
  */
 package org.springblade.transport.service.impl;
 
+import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -11,6 +12,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 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.jackson.JsonUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -29,9 +31,11 @@ import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
 import org.springblade.transport.pojo.vo.LoadingCarrierContractVO;
 import org.springblade.transport.pojo.vo.LoadingManageVO;
 import org.springblade.transport.service.IContractManageService;
+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;
@@ -89,6 +93,9 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 	@Resource
 	private IProcessConfigService processConfigService;
 
+	@Resource
+	private IDriverService driverService;
+
 	@Override
 	public IPage<LoadingManageVO> selectLoadingManagePage(IPage<LoadingManage> page, LoadingManageVO loadingManage) {
 		IPage<LoadingManage> entityPage = page(page, buildQuery(loadingManage));
@@ -112,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);
-			if (allowedPartyBs.isEmpty()) {
+			allowedCarrierNames = intersectCarrierPartyBs(waybills, contracts);
+			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 -> {
-			LoadingCarrierContractVO option = new LoadingCarrierContractVO();
-			option.setId(contract.getId());
-			option.setContractName(contract.getContractName());
-			option.setCarrierName(contract.getPartyB());
-			return option;
-		}).toList();
+		List<LoadingCarrierContractVO> options = ContractPartySupport.expandCarrierOptions(contracts);
+		if (allowedCarrierNames == null) {
+			return options;
+		}
+		Set<String> allowedNames = allowedCarrierNames;
+		return options.stream()
+			.filter(option -> allowedNames.contains(normalizePartyName(option.getCarrierName())))
+			.toList();
 	}
 
 	@Override
@@ -139,16 +150,17 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 		List<Long> oldWaybillIds = new ArrayList<>();
 		// 新建暂存为草稿；编辑已有单据时保持原业务状态（如待执行），避免被改回草稿
 		String businessStatus = STATUS_DRAFT;
-		if (Func.isNotEmpty(loadingManage.getId())) {
-			LoadingManage oldRecord = loadEditable(loadingManage.getId(), true);
-			oldWaybillIds = waybillIds(oldRecord.getWaybillIdsJson());
-			loadingManage.setLoadingNo(oldRecord.getLoadingNo());
-			loadingManage.setDeptId(oldRecord.getDeptId());
-			loadingManage.setDeptName(oldRecord.getDeptName());
-			if (Func.isNotEmpty(oldRecord.getBusinessStatus())) {
-				businessStatus = oldRecord.getBusinessStatus();
+		LoadingManage stored = Func.isEmpty(loadingManage.getId()) ? null : loadEditable(loadingManage.getId(), true);
+		if (stored != null) {
+			oldWaybillIds = waybillIds(stored.getWaybillIdsJson());
+			loadingManage.setLoadingNo(stored.getLoadingNo());
+			loadingManage.setDeptId(stored.getDeptId());
+			loadingManage.setDeptName(stored.getDeptName());
+			if (Func.isNotEmpty(stored.getBusinessStatus())) {
+				businessStatus = stored.getBusinessStatus();
 			}
 		}
+		applyDriverOwnership(loadingManage, stored);
 		prepareCreateOrUpdate(loadingManage);
 		loadingManage.setBusinessStatus(businessStatus);
 		if (Func.isEmpty(loadingManage.getLoadingNo())) {
@@ -200,6 +212,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 			loadingManage.setDeptId(oldRecord.getDeptId());
 			loadingManage.setDeptName(oldRecord.getDeptName());
 		}
+		applyDriverOwnership(loadingManage, oldRecord);
 		prepareCreateOrUpdate(loadingManage);
 		if (Func.isEmpty(loadingManage.getLoadingNo())) {
 			loadingManage.setLoadingNo(nextCode());
@@ -319,6 +332,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 		loadingManage.setCargoName(first.getCargoName());
 		loadingManage.setVehicleNo(first.getVehicleNo());
 		loadingManage.setTrailerVehicleNo(first.getTrailerVehicleNo());
+		loadingManage.setDriverId(first.getDriverId());
 		loadingManage.setDriverName(first.getDriverName());
 		loadingManage.setDriverPhone(first.getDriverPhone());
 		loadingManage.setEscortName(first.getEscortName());
@@ -478,6 +492,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 		target.setTrailerVehicleNo(source.getTrailerVehicleNo());
 		target.setDriverName(source.getDriverName());
 		target.setDriverPhone(source.getDriverPhone());
+		target.setDriverId(source.getDriverId());
 		target.setEscortName(source.getEscortName());
 		target.setEscortPhone(source.getEscortPhone());
 		target.setCarrierType(source.getCarrierType());
@@ -505,6 +520,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 		target.setBusinessStatus(STATUS_DRAFT);
 		target.setLoadingNo(nextCode());
 		prepare(target);
+		applyDriverOwnership(target, null);
 		validate(target, true);
 		save(target);
 		return detail(target.getId());
@@ -521,6 +537,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 			throw new ServiceException("仅司机拒绝接单后允许重新派单");
 		}
 		prepare(loadingManage);
+		applyDriverOwnership(loadingManage, oldRecord);
 		validate(loadingManage, false);
 		List<Long> oldWaybillIds = waybillIds(oldRecord.getWaybillIdsJson());
 		loadingManage.setLoadingNo(oldRecord.getLoadingNo());
@@ -662,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());
 		}
@@ -781,6 +802,32 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 		}
 	}
 
+	/**
+	 * 写司机归属：档案 ID 只在需要时解析，已落在单据上的归属不会被无关保存抹掉。
+	 * <p>
+	 * 判定顺序：调用方带了正数档案 ID 就用它；更新时 driver_phone 与库中一致且库中 driver_id 非空就保留库中值；
+	 * 其余情况（新建、换号、原本无主）按手机号在租户内唯一匹配司机档案，匹配不到落 null 并留 WARN，不阻断保存。
+	 */
+	private void applyDriverOwnership(LoadingManage loadingManage, LoadingManage stored) {
+		Long driverId = loadingManage.getDriverId();
+		if (driverId != null && driverId > 0) {
+			return;
+		}
+		if (stored != null && Func.isNotEmpty(stored.getDriverId())
+			&& Objects.equals(TransportBusinessSupport.trimToNull(stored.getDriverPhone()), loadingManage.getDriverPhone())) {
+			loadingManage.setDriverId(stored.getDriverId());
+			return;
+		}
+		String tenantId = Func.isNotEmpty(loadingManage.getTenantId()) ? loadingManage.getTenantId() : AuthUtil.getTenantId();
+		Long resolvedDriverId = driverService.resolveDriverIdByMobile(tenantId, loadingManage.getDriverPhone());
+		loadingManage.setDriverId(resolvedDriverId);
+		if (resolvedDriverId == null) {
+			log.warn("配载单 {} 的司机手机号未唯一匹配司机档案，driver_id 落空。租户={} 手机号={}",
+				Func.isEmpty(loadingManage.getLoadingNo()) ? "（未编号）" : loadingManage.getLoadingNo(),
+				tenantId, DesensitizedUtil.mobilePhone(loadingManage.getDriverPhone()));
+		}
+	}
+
 	private void validate(LoadingManage loadingManage, boolean draftMode) {
 		TransportBusinessSupport.validateRequired(loadingManage.getLoadingSubNos(), "配载子单号不能为空");
 		TransportBusinessSupport.validateRequired(loadingManage.getTransportType(), "运输类型不能为空");
@@ -907,13 +954,17 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 	}
 
 	/**
-	 * 同一配载单子运单除同项目外，还必须存在共同的承运商合同乙方（按客户合同甲方匹配后取交集）。
+	 * 同一配载单子运单除同项目外，还必须存在共同的承运商合同乙方（按客户合同乙方=承运商合同甲方匹配后取交集）。
 	 */
 	private void validateCompatibleCarrierPartyB(List<Waybill> waybills) {
 		if (Func.isEmpty(waybills) || waybills.size() < 2) {
 			return;
 		}
 		List<ContractManage> contracts = availableCarrierContracts(projectIdsOf(waybills));
+		// 项目下没有任何可用承运商合同时不存在乙方交集约束；承运类型为「承运商」由 validateCarrierContract 要求选择合同
+		if (Func.isEmpty(contracts)) {
+			return;
+		}
 		Set<String> allowedPartyBs = intersectCarrierPartyBs(waybills, contracts);
 		if (allowedPartyBs.isEmpty()) {
 			throw new ServiceException("所选运单在同一项目下没有共同的承运商合同乙方，不能配载到同一配载单");
@@ -927,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);
 			}
@@ -937,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());
@@ -957,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());
-			if (Func.isNotEmpty(allowedPartyBs) && !allowedPartyBs.contains(partyB)) {
-				throw new ServiceException("所选承运商合同乙方与子运单可共同承运的乙方不一致，可选："
+			String carrierName = normalizePartyName(loadingManage.getCarrierName());
+			if (Func.isNotEmpty(allowedPartyBs) && !allowedPartyBs.contains(carrierName)) {
+				throw new ServiceException("所选承运客商与子运单可共同承运的客商不一致，可选："
 					+ String.join("、", allowedPartyBs));
 			}
 			if (allowedPartyBs.isEmpty()) {
-				throw new ServiceException("所选运单在同一项目下没有共同的承运商合同乙方，不能配载到同一配载单");
+				throw new ServiceException("所选运单在同一项目下没有共同的承运商合同客商，不能配载到同一配载单");
 			}
 		}
-		loadingManage.setCarrierName(carrierContract.getPartyB());
 	}
 
 	private void validateCompletedCarrierContract(LoadingManage loadingManage) {
@@ -1008,14 +1079,13 @@ 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> customerPartyAMap = loadCustomerContractPartyAMap(waybills);
+		Map<Long, Set<String>> customerPartyBMap = loadCustomerContractPartyBMap(waybills);
 		for (Waybill waybill : waybills) {
-			Set<String> available = availableCarrierPartyBs(waybill, projectContracts, customerPartyAMap);
+			Set<String> available = availableCarrierPartyBs(waybill, projectContracts, customerPartyBMap);
 			if (intersection == null) {
 				intersection = new LinkedHashSet<>(available);
 			} else {
@@ -1029,21 +1099,23 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 	}
 
 	private Set<String> availableCarrierPartyBs(Waybill waybill, List<ContractManage> projectContracts,
-												Map<Long, String> customerPartyAMap) {
+												Map<Long, Set<String>> customerPartyBMap) {
 		if (waybill == null || Func.isEmpty(projectContracts)) {
 			return Set.of();
 		}
-		String partyA = customerPartyAMap.get(waybill.getContractId());
+		Long contractId = waybill.getContractId();
+		Set<String> customerPartyBs = contractId == null
+			? Set.of()
+			: customerPartyBMap.getOrDefault(contractId, Set.of());
 		return projectContracts.stream()
 			.filter(contract -> Objects.equals(contract.getProjectId(), waybill.getProjectId()))
-			.filter(contract -> Func.isEmpty(partyA) || Objects.equals(normalizePartyName(contract.getPartyA()), partyA))
-			.map(ContractManage::getPartyB)
-			.map(this::normalizePartyName)
+			.filter(contract -> customerPartyBs.isEmpty() || partyNamesOverlap(partyANames(contract), customerPartyBs))
+			.flatMap(contract -> ContractPartySupport.carrierPartyNames(contract).stream())
 			.filter(Func::isNotEmpty)
 			.collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
-	private Map<Long, String> loadCustomerContractPartyAMap(List<Waybill> waybills) {
+	private Map<Long, Set<String>> loadCustomerContractPartyBMap(List<Waybill> waybills) {
 		List<Long> contractIds = waybills.stream()
 			.map(Waybill::getContractId)
 			.filter(Objects::nonNull)
@@ -1057,11 +1129,55 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 				.in(ContractManage::getId, contractIds))
 			.stream()
 			.collect(Collectors.toMap(ContractManage::getId,
-				contract -> normalizePartyName(contract.getPartyA()),
+				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();
 	}
@@ -1150,6 +1266,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 			.set(Waybill::getCarrierType, loadingManage.getCarrierType())
 			.set(Waybill::getCarrierContractId, loadingManage.getCarrierContractId())
 			.set(Waybill::getCarrierName, loadingManage.getCarrierName())
+			.set(Waybill::getDriverId, loadingManage.getDriverId())
 			.set(Waybill::getDriverName, loadingManage.getDriverName())
 			.set(Waybill::getDriverPhone, loadingManage.getDriverPhone())
 			.set(Waybill::getVehicleNo, loadingManage.getVehicleNo())
@@ -1264,6 +1381,7 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
 			.set(Waybill::getCarrierType, loadingManage.getCarrierType())
 			.set(Waybill::getCarrierContractId, loadingManage.getCarrierContractId())
 			.set(Waybill::getCarrierName, loadingManage.getCarrierName())
+			.set(Waybill::getDriverId, loadingManage.getDriverId())
 			.set(Waybill::getDriverName, loadingManage.getDriverName())
 			.set(Waybill::getDriverPhone, loadingManage.getDriverPhone())
 			.set(Waybill::getVehicleNo, loadingManage.getVehicleNo())
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java
index b49f2563..da691c39 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MaintenanceRecordServiceImpl.java
@@ -27,6 +27,7 @@ package org.springblade.transport.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -81,6 +82,18 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRec
 		return saveOrUpdate(maintenanceRecord);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean deleteLogic(List<Long> ids) {
+		if (Func.isNotEmpty(ids)) {
+			// 唯一索引不因逻辑删除释放：不清空 exception_id，异常侧会永远显示「已录入」却查不到记录
+			update(Wrappers.<MaintenanceRecord>lambdaUpdate()
+				.set(MaintenanceRecord::getExceptionId, null)
+				.in(MaintenanceRecord::getId, ids));
+		}
+		return super.deleteLogic(ids);
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public List<MaintenanceRecordExcel> importMaintenanceRecord(List<MaintenanceRecordExcel> data) {
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageArchiveServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageArchiveServiceImpl.java
new file mode 100644
index 00000000..3a62188b
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageArchiveServiceImpl.java
@@ -0,0 +1,102 @@
+/**
+ * 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>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.service.impl;
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.system.pojo.entity.Dept;
+import org.springblade.transport.mapper.ManageArchiveDeptMapper;
+import org.springblade.transport.pojo.vo.ArchiveManageStatsVO;
+import org.springblade.transport.pojo.vo.DeptTreeNodeVO;
+import org.springblade.transport.pojo.vo.DriverVO;
+import org.springblade.transport.pojo.vo.TransportVehicleVO;
+import org.springblade.transport.service.IDriverService;
+import org.springblade.transport.service.IManageArchiveService;
+import org.springblade.transport.service.ITransportVehicleService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 调度端档案统计
+ */
+@Service
+@AllArgsConstructor
+public class ManageArchiveServiceImpl implements IManageArchiveService {
+
+	/**
+	 * 组织选择器不提供这一支：web 端司机/车辆表单同样剔除「外部组织」。
+	 */
+	private static final String EXTERNAL_ORG_NAME = "外部组织";
+
+	private final IDriverService driverService;
+	private final ITransportVehicleService transportVehicleService;
+	private final ManageArchiveDeptMapper manageArchiveDeptMapper;
+
+	@Override
+	public ArchiveManageStatsVO stats() {
+		// 复用管理端同一套统计：today / warningDate 由各 service 的 prepareQuery 自己填，
+		// 不传筛选条件即全量计数（与小程序侧 searchDrivers 同口径，未按组织收口）
+		ArchiveManageStatsVO vo = new ArchiveManageStatsVO();
+		vo.setDriver(driverService.expiryStat(new DriverVO()));
+		vo.setVehicle(transportVehicleService.expiryStat(new TransportVehicleVO()));
+		return vo;
+	}
+
+	@Override
+	public List<DeptTreeNodeVO> deptTree() {
+		List<Dept> rows = manageArchiveDeptMapper.selectEnabledByTenant(AuthUtil.getTenantId());
+		Map<Long, DeptTreeNodeVO> nodes = new LinkedHashMap<>();
+		for (Dept row : rows) {
+			DeptTreeNodeVO node = new DeptTreeNodeVO();
+			node.setId(row.getId());
+			node.setName(Func.toStr(row.getDeptName()));
+			nodes.put(row.getId(), node);
+		}
+		List<DeptTreeNodeVO> roots = new ArrayList<>();
+		for (Dept row : rows) {
+			DeptTreeNodeVO node = nodes.get(row.getId());
+			DeptTreeNodeVO parent = row.getParentId() == null ? null : nodes.get(row.getParentId());
+			// 父部门停用或删除时该节点作为根保留，避免整支在树上消失
+			if (parent == null) {
+				roots.add(node);
+			} else {
+				parent.getChildren().add(node);
+			}
+		}
+		removeExternalOrg(roots);
+		return roots;
+	}
+
+	private static void removeExternalOrg(List<DeptTreeNodeVO> nodes) {
+		nodes.removeIf(node -> EXTERNAL_ORG_NAME.equals(Func.toStr(node.getName()).trim()));
+		for (DeptTreeNodeVO node : nodes) {
+			removeExternalOrg(node.getChildren());
+		}
+	}
+
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java
index bbb2eb25..8ff20200 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ManageWaybillServiceImpl.java
@@ -38,6 +38,7 @@ import org.springblade.transport.pojo.entity.Driver;
 import org.springblade.transport.pojo.entity.ExceptionDisposal;
 import org.springblade.transport.pojo.entity.LoadingManage;
 import org.springblade.transport.pojo.entity.RiskDisposal;
+import org.springblade.transport.pojo.entity.TransportVehicle;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.pojo.vo.AdminDriverOptionVO;
 import org.springblade.transport.pojo.vo.AdminHomeBadgesVO;
@@ -58,6 +59,7 @@ import org.springblade.transport.service.IExceptionDisposalService;
 import org.springblade.transport.service.ILoadingManageService;
 import org.springblade.transport.service.IManageWaybillService;
 import org.springblade.transport.service.IRiskDisposalService;
+import org.springblade.transport.service.ITransportVehicleService;
 import org.springblade.transport.service.ITripQueryService;
 import org.springblade.transport.service.IWaybillService;
 import org.springblade.transport.support.MpUserDataScopeSupport;
@@ -122,6 +124,9 @@ public class ManageWaybillServiceImpl implements IManageWaybillService {
 	private static final String TRANSPORT_COMMON = "common";
 	private static final String TRANSPORT_LOAD = "load";
 
+	/** 启用状态（base_entity.status）：停用的司机不进派单检索、停用的车不进选车列表 */
+	private static final int ENABLED_STATUS = 1;
+
 	private static final int FEED_LIMIT = 20;
 	private static final int DEFAULT_PAGE_SIZE = 10;
 	private static final int MAX_PAGE_SIZE = 50;
@@ -141,6 +146,7 @@ public class ManageWaybillServiceImpl implements IManageWaybillService {
 	private final IDriverWaybillService driverWaybillService;
 	private final ITripQueryService tripQueryService;
 	private final ILoadingManageService loadingManageService;
+	private final ITransportVehicleService transportVehicleService;
 	private final MpUserDataScopeSupport mpUserDataScopeSupport;
 
 	@Override
@@ -164,7 +170,8 @@ public class ManageWaybillServiceImpl implements IManageWaybillService {
 		home.setStats(stats());
 
 		AdminHomeBadgesVO badges = new AdminHomeBadgesVO();
-		badges.setException(home.getStats().getException());
+		// 快捷入口的红点是待办数，只数待处理：处置中的已经在跟，不再提醒
+		badges.setException(countPendingExceptions());
 		badges.setRisk(countPendingRisks());
 		badges.setPendingReassign(countPendingReassignments());
 		home.setBadges(badges);
@@ -859,6 +866,8 @@ public class ManageWaybillServiceImpl implements IManageWaybillService {
 		String key = Func.toStr(keyword, "").trim();
 		LambdaQueryWrapper<Driver> wrapper = Wrappers.<Driver>lambdaQuery()
 			.eq(Driver::getIsDeleted, 0)
+			// 停用司机不可派单：不进调度检索。停用只拦派单，不拦登录（司机仍能进小程序看自己的运单）
+			.eq(Driver::getStatus, ENABLED_STATUS)
 			.orderByDesc(Driver::getUpdateTime)
 			.last("LIMIT 20");
 		if (Func.isNotBlank(key)) {
@@ -877,27 +886,63 @@ public class ManageWaybillServiceImpl implements IManageWaybillService {
 	@Override
 	public List<AdminVehicleOptionVO> searchVehicles(String keyword) {
 		String key = Func.toStr(keyword, "").trim();
-		LambdaQueryWrapper<Driver> wrapper = Wrappers.<Driver>lambdaQuery()
-			.eq(Driver::getIsDeleted, 0)
-			.isNotNull(Driver::getDrivingVehicle)
-			.ne(Driver::getDrivingVehicle, "")
-			.orderByDesc(Driver::getUpdateTime)
+		// 权威来源是车辆档案表：此前查的是司机表的 driving_vehicle 文本，既看不见没有司机绑定的车，
+		// 也无从判断「是否停用」——停用的车会照样出现在派单选车列表里。
+		LambdaQueryWrapper<TransportVehicle> wrapper = Wrappers.<TransportVehicle>lambdaQuery()
+			.eq(TransportVehicle::getIsDeleted, 0)
+			.eq(TransportVehicle::getStatus, ENABLED_STATUS)
+			.orderByDesc(TransportVehicle::getUpdateTime)
 			.last("LIMIT 30");
 		if (Func.isNotBlank(key)) {
-			wrapper.like(Driver::getDrivingVehicle, key);
+			wrapper.like(TransportVehicle::getPlateNo, key);
 		}
-		java.util.LinkedHashMap<String, AdminVehicleOptionVO> map = new java.util.LinkedHashMap<>();
-		for (Driver d : driverService.list(wrapper)) {
-			String plate = Func.toStr(d.getDrivingVehicle(), "").trim();
-			if (Func.isBlank(plate) || map.containsKey(plate)) {
+		List<TransportVehicle> vehicles = transportVehicleService.list(wrapper);
+		if (Func.isEmpty(vehicles)) {
+			return List.of();
+		}
+		Map<String, String> driverNameByPlate = driverNamesByPlate(vehicles);
+		List<AdminVehicleOptionVO> options = new ArrayList<>();
+		for (TransportVehicle vehicle : vehicles) {
+			String plate = Func.toStr(vehicle.getPlateNo(), "").trim();
+			if (Func.isBlank(plate)) {
 				continue;
 			}
 			AdminVehicleOptionVO vo = new AdminVehicleOptionVO();
 			vo.setVehicleNo(plate);
-			vo.setDriverName(Func.toStr(d.getDriverName(), ""));
-			map.put(plate, vo);
+			vo.setDriverName(Func.toStr(driverNameByPlate.get(plate.toUpperCase()), ""));
+			options.add(vo);
 		}
-		return new java.util.ArrayList<>(map.values());
+		return options;
+	}
+
+	/**
+	 * 车牌 → 绑定司机姓名
+	 * <p>
+	 * 绑定关系是司机侧按车牌文本声明的（{@code driver.driving_vehicle}），车辆行不存司机，
+	 * 所以选车列表要回到司机表补名字；多车牌串的司机匹配不到，这条既有缺陷不在本次改动内。
+	 */
+	private Map<String, String> driverNamesByPlate(List<TransportVehicle> vehicles) {
+		List<String> plates = vehicles.stream()
+			.map(TransportVehicle::getPlateNo)
+			.filter(Func::isNotEmpty)
+			.map(String::toUpperCase)
+			.distinct()
+			.toList();
+		if (plates.isEmpty()) {
+			return Map.of();
+		}
+		List<Driver> drivers = driverService.list(Wrappers.<Driver>lambdaQuery()
+			.eq(Driver::getIsDeleted, 0)
+			.in(Driver::getDrivingVehicle, plates)
+			.select(Driver::getDriverName, Driver::getDrivingVehicle));
+		Map<String, String> names = new LinkedHashMap<>();
+		for (Driver driver : drivers) {
+			if (Func.isEmpty(driver.getDrivingVehicle()) || Func.isEmpty(driver.getDriverName())) {
+				continue;
+			}
+			names.putIfAbsent(driver.getDrivingVehicle().toUpperCase(), driver.getDriverName());
+		}
+		return names;
 	}
 
 	/** 运输方式字典值 → 展示文案 */
@@ -1169,6 +1214,14 @@ public class ManageWaybillServiceImpl implements IManageWaybillService {
 		return exceptionDisposalService.count(wrapper);
 	}
 
+	/** 快捷入口「异常处置」红点：只数待处理（pending），处置中已不算待办 */
+	private long countPendingExceptions() {
+		LambdaQueryWrapper<ExceptionDisposal> wrapper = Wrappers.<ExceptionDisposal>lambdaQuery()
+			.eq(ExceptionDisposal::getDisposalStatus, DISPOSAL_PENDING);
+		applyExceptionDeptScope(wrapper);
+		return exceptionDisposalService.count(wrapper);
+	}
+
 	private long countPendingRisks() {
 		LambdaQueryWrapper<RiskDisposal> wrapper = Wrappers.<RiskDisposal>lambdaQuery()
 			.eq(RiskDisposal::getDisposalStatus, RISK_PENDING);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java
index 3c3dc747..d42b3d8d 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/MasterOrderServiceImpl.java
@@ -4,8 +4,10 @@
  */
 package org.springblade.transport.service.impl;
 
+import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.jackson.JsonUtil;
@@ -24,9 +26,11 @@ import org.springblade.transport.pojo.vo.MasterOrderCarrierVO;
 import org.springblade.transport.pojo.vo.MasterOrderVO;
 import org.springblade.transport.service.IMasterOrderService;
 import org.springblade.transport.service.IContractManageService;
+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;
@@ -50,6 +54,7 @@ import java.util.Objects;
  * @author Chill
  */
 @Service
+@Slf4j
 public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, MasterOrder> implements IMasterOrderService {
 
 	private static final String CARRIER_SELF = "自运";
@@ -58,13 +63,15 @@ public class MasterOrderServiceImpl extends BaseServiceImpl<MasterOrderMapper, M
 	private final ITransportPlanService transportPlanService;
 	private final IProjectApplyService projectApplyService;
 	private final IContractManageService contractManageService;
+	private final IDriverService driverService;
 
 	public MasterOrderServiceImpl(IWaybillService waybillService, ITransportPlanService transportPlanService, IProjectApplyService projectApplyService,
-		IContractManageService contractManageService) {
+		IContractManageService contractManageService, IDriverService driverService) {
 		this.waybillService = waybillService;
 		this.transportPlanService = transportPlanService;
 		this.projectApplyService = projectApplyService;
 		this.contractManageService = contractManageService;
+		this.driverService = driverService;
 	}
 
 	@Override
@@ -81,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.setContractName(contract.getContractName());
-			carrier.setCarrierName(contract.getPartyB());
+			carrier.setContractId(option.getId());
+			carrier.setContractName(option.getContractName());
+			carrier.setCarrierName(option.getCarrierName());
+			carrier.setCarrierPartyId(option.getCarrierPartyId());
+			carrier.setCarrierPartyRole(option.getCarrierPartyRole());
+			carrier.setCreditCode(option.getCreditCode());
+			carrier.setCustomerId(option.getCustomerId());
 			return carrier;
 		}).toList();
 	}
@@ -261,8 +272,23 @@ 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
+		Long driverId = longValue(dispatch, "driverId");
+		if (driverId == null || driverId <= 0) {
+			driverId = driverService.resolveDriverIdByMobile(waybill.getTenantId(), waybill.getDriverPhone());
+			if (driverId == null) {
+				log.warn("总单 {} 派单的司机手机号未唯一匹配司机档案，driver_id 落空（不阻断派单）。租户={} 手机号={}",
+					masterOrder.getMasterNo(), waybill.getTenantId(), DesensitizedUtil.mobilePhone(waybill.getDriverPhone()));
+			}
+		}
+		waybill.setDriverId(driverId);
 		waybill.setCaptainName(string(dispatch, "captainName")); waybill.setCabinNo(string(dispatch, "cabinNo")); waybill.setContainerNo(string(dispatch, "containerNo"));
 		waybill.setEscortName(string(dispatch, "escortName")); waybill.setEscortPhone(string(dispatch, "escortPhone")); waybill.setMileage(nullableDecimal(dispatch, "mileage"));
 		waybill.setDepartureName(string(dispatch, "departureName")); waybill.setDepartureAddress(string(dispatch, "departureAddress"));
@@ -586,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) {
@@ -598,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))) {
-			throw new ServiceException("所选承运商不属于总单客户合同对应项目的有效承运商合同乙方");
+			|| !ContractPartySupport.matchesCarrier(carrierContract, carrierName, carrierPartyId))) {
+			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("公路");
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
index 1189a40d..c5cf9012 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
@@ -51,6 +51,7 @@ import org.springblade.thirdparty.bfi.util.BfiUtil;
 import org.springblade.transport.config.BfiProperties;
 import org.springblade.transport.constant.KingdeeAttachmentConstant;
 import org.springblade.transport.constant.HcsSyncConstant;
+import org.springblade.hcs.config.HcsProperties;
 import org.springblade.transport.constant.KingdeeBfiConstant;
 import org.springblade.transport.constant.KingdeeLockConstant;
 import org.springblade.transport.constant.TransportBusiConstant;
@@ -187,6 +188,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	private final BladeRedis bladeRedis;
 	private final ApplicationEventPublisher eventPublisher;
 	private final HcsCreditCheckSupport hcsCreditCheckSupport;
+	private final HcsProperties hcsProperties;
 	private final IContractExeStageService contractExeStageService;
 
 	@Override
@@ -718,8 +720,9 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		context.paymentNoCache().put(id, entity.getPaymentNo());
 		if (!TransportBusiConstant.APPROVED.equals(entity.getApprovalStatus())) throw new ServiceException("仅审批通过的付款申请允许生成金蝶单据");
 		// 高风险/黑名单客商付款特批门禁：待特批/特批审核中（挂起"特批审核"）禁止推送金蝶，
-		// 特批通过（合规 paymentLegal/result 回调恢复"审批通过"）后放行
-		if (entity.getHcsSpecStatus() != null && List.of(HcsSyncConstant.SPEC_STATUS_NEED, HcsSyncConstant.SPEC_STATUS_PUSHING,
+		// 特批通过（合规 paymentLegal/result 回调恢复"审批通过"）后放行；
+		// 特批不走合同系统（spec-pay.enabled=false）时不拦截
+		if (hcsProperties.getSpecPay().isEnabled() && entity.getHcsSpecStatus() != null && List.of(HcsSyncConstant.SPEC_STATUS_NEED, HcsSyncConstant.SPEC_STATUS_PUSHING,
 			HcsSyncConstant.SPEC_STATUS_PROCESSING).contains(entity.getHcsSpecStatus())) {
 			throw new ServiceException("收款方客商为高风险/黑名单，付款特批审核中（" + entity.getCurrentNode() + "），特批完成后方可推送金蝶");
 		}
@@ -952,20 +955,28 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	}
 
 	/**
-	 * 金蝶付款结果回写主体：A103-2 付款申请单查询回填 + A103-4 付款处理查询补付款记录，
-	 * 由 {@link #syncKingdeePaymentResult()} 在分布式锁保护下调用
+	 * 金蝶付款结果回写主体，由 {@link #syncKingdeePaymentResult()} 在分布式锁保护下调用，执行流程：
+	 * <pre>
+	 * ① 圈定待回写付款申请：审批通过且金蝶状态为 已生成/付款中/生成失败（终态已付款/已关闭不再轮询），
+	 *    生成失败单据一并纳入：金蝶侧已生成说明上次推送实际成功（如下推超时但远端已落单、本地事务回滚），
+	 *    查得即回填纠正为已生成，避免人工重推产生重复单据，未查得则保持生成失败等待人工重推；
+	 * ② A103-2 付款申请单查询回填：按 paymentNo（awrp_src_code）分批查询，同一来源单号取最近修改一条，
+	 *    回填金蝶单号/内码/同步状态/已付金额并联动预结算与正式结算付款记录；连续两轮查询未命中按金蝶反审核删除解锁；
+	 * ③ A103-4 付款处理查询补付款记录：付款中/已付款单据 + 已付款无付款记录单据（补偿），
+	 *    按付款组织 + awrp_sourcebillno（金蝶单据号）数组精确查询，双键勾稽后回填付款记录；
+	 * ④ 汇总执行摘要：各计数随流程累计，单笔失败仅计数不中断整轮
+	 * </pre>
 	 *
 	 * @return 执行摘要
 	 */
 	private String executePaymentResultSync() {
-		// ① 待回写付款申请：审批通过且金蝶状态为 已生成/付款中/生成失败（终态已付款/已关闭不再轮询）。
-		// 生成失败单据一并纳入勾稽：金蝶侧已生成说明上次推送实际成功（如下推请求超时但远端已落单、本地事务回滚），
-		// 查到即回填纠正为已生成，避免人工重新推送产生重复单据；未查到则保持生成失败等待异常处理后重新推送
+		// ① 待回写付款申请：审批通过且金蝶状态为 已生成/付款中/生成失败（终态已付款/已关闭不再轮询）
 		List<PaymentApplication> applications = list(Wrappers.<PaymentApplication>lambdaQuery()
 			.eq(PaymentApplication::getApprovalStatus, TransportBusiConstant.APPROVED)
 			.in(PaymentApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_SYNCED,
 				KingdeeBfiConstant.KINGDEE_STATUS_PAYING, KingdeeBfiConstant.KINGDEE_STATUS_FAILED)
 			.orderByAsc(PaymentApplication::getId));
+		// 自代理：applyPayApplyResult/applyPayBillRecord 带单据级事务，跨方法调用确保注解生效，单笔失败仅回滚自身
 		IPaymentApplicationService self = SpringUtil.getBean(IPaymentApplicationService.class);
 		int updated = 0;
 		int failed = 0;
@@ -975,19 +986,22 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			// ② A103-2 付款申请单查询：按 paymentNo（awrp_src_code）分批查询，同一来源单号取最近修改的一条
 			List<String> paymentNos = applications.stream()
 				.map(PaymentApplication::getPaymentNo).filter(Func::isNotEmpty).distinct().toList();
-			batchForeach(paymentNos, PAY_RESULT_QUERY_BATCH, batch ->
-				payApplyMap.putAll(latestPayApplyBySrcCode(queryPayApplyPages(batch))));
+			this.batchForeach(paymentNos, PAY_RESULT_QUERY_BATCH, batch ->
+				payApplyMap.putAll(this.latestPayApplyBySrcCode(this.queryPayApplyPages(batch))));
+			// 逐单回写：查得即回填并清零消失计数；未查得累计消失轮次（批次其余单据正常返回，排除服务整体故障）
 			for (PaymentApplication application : applications) {
 				BfiPayApplyVO payApply = payApplyMap.get(application.getPaymentNo());
 				if (payApply == null) {
-					// 金蝶侧未查得已推送单据（查询批次其余单据正常返回，排除服务整体故障）：
 					// 累计消失轮次，连续两轮视为金蝶已反审核删除，解锁置失败交人工核实重推
 					this.handlePayApplyMissed(application);
 					continue;
 				}
-				clearPayApplyMissKey(application.getId());
+				this.clearPayApplyMissKey(application.getId());
 				try {
-					if (self.applyPayApplyResult(application, payApply)) paidCount++;
+					// 返回 true 表示付款完成（终态），预结算/正式结算联动由 applyPayApplyResult 内部处理
+					if (self.applyPayApplyResult(application, payApply)) {
+						paidCount++;
+					}
 					updated++;
 				} catch (Exception exception) {
 					failed++;
@@ -995,7 +1009,9 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				}
 			}
 		}
-		// ③ A103-4 付款处理查询：付款中/已付款单据 + 已付款但尚无付款记录的单据（补偿），回填付款记录
+		// ③ A103-4 付款处理查询补付款记录：
+		// 候选一：本轮 A103-2 查得付款中/已付款（paystatus != Unpaid）的轮询单据；
+		// 候选二：已付款终态但尚无真实付款记录的单据（上轮付款记录回填失败的补偿）
 		Map<Long, PaymentApplication> recordCandidates = new LinkedHashMap<>();
 		for (PaymentApplication application : applications) {
 			BfiPayApplyVO payApply = payApplyMap.get(application.getPaymentNo());
@@ -1006,18 +1022,19 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		list(Wrappers.<PaymentApplication>lambdaQuery()
 			.eq(PaymentApplication::getApprovalStatus, TransportBusiConstant.APPROVED)
 			.eq(PaymentApplication::getKingdeeStatus, KingdeeBfiConstant.KINGDEE_STATUS_PAID))
-			.stream().filter(application -> realRecordCount(application.getId()) == 0)
+			.stream().filter(application -> this.realRecordCount(application.getId()) == 0)
 			.forEach(application -> recordCandidates.putIfAbsent(application.getId(), application));
 		int recordWritten = 0;
 		int recordFailed = 0;
 		if (!recordCandidates.isEmpty()) {
+			// 按付款组织分组（org_number 接口必传）：优先取 A103-2 返回的付款组织编码，
+			// 兜底按合同关联项目解析（已付款补偿候选不在本轮 A103-2 返回内，须走兜底）
 			Map<String, List<PaymentApplication>> orgGroups = new LinkedHashMap<>();
 			for (PaymentApplication application : recordCandidates.values()) {
 				BfiPayApplyVO payApply = payApplyMap.get(application.getPaymentNo());
 				String orgNumber = payApply == null ? null : payApply.getPayorgNumber();
 				if (Func.isBlank(orgNumber)) {
 					try {
-						// A103-4 付款人（公司）编码必填：优先取 A103-2 返回付款组织编码，兜底按合同关联项目解析
 						KingdeeSyncContext context = KingdeeSyncContext.empty();
 						orgNumber = kingdeeApBillSyncSupport.bfiOrgNumber(
 							kingdeeApBillSyncSupport.requireContract(application.getContractId(), context), context);
@@ -1028,26 +1045,25 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				}
 				orgGroups.computeIfAbsent(orgNumber, key -> new ArrayList<>()).add(application);
 			}
-			// 以付款处理单源单id/源单编号建立索引，与本地金蝶单据id/单据编号勾稽
-			Map<String, BfiPayBillVO> payBillBySourceId = new HashMap<>();
-			Map<String, BfiPayBillVO> payBillBySourceNumber = new HashMap<>();
-			for (String orgNumber : orgGroups.keySet()) {
-				for (BfiPayBillVO payBill : queryPayBillPages(orgNumber)) {
-					if (Func.isEmpty(payBill.getBillno())) continue;
-					if (payBill.getSourcebillid() != null) {
-						payBillBySourceId.put(String.valueOf(payBill.getSourcebillid()), payBill);
-					}
-					if (Func.isNotEmpty(payBill.getSourcebillnumber())) {
-						payBillBySourceNumber.put(payBill.getSourcebillnumber(), payBill);
-					}
-				}
+			// 按组织 + 金蝶单据号（awrp_sourcebillno 支持数组）分批精确查询付款处理单，结果汇总后统一勾稽
+			List<BfiPayBillVO> payBills = new ArrayList<>();
+			for (Map.Entry<String, List<PaymentApplication>> orgEntry : orgGroups.entrySet()) {
+				List<String> kingdeeBillNos = orgEntry.getValue().stream()
+					.map(PaymentApplication::getKingdeeBillNo).filter(Func::isNotEmpty).distinct().toList();
+				this.batchForeach(kingdeeBillNos, PAY_RESULT_QUERY_BATCH,
+					batch -> payBills.addAll(this.queryPayBillPages(orgEntry.getKey(), batch)));
 			}
+			// 逐单勾稽回填：双键匹配（源单id=付款申请金蝶单据内码 / 源单编号=金蝶单据号），未匹配保持现状等下一轮
 			for (PaymentApplication application : recordCandidates.values()) {
-				BfiPayBillVO payBill = matchPayBill(application, payBillBySourceId, payBillBySourceNumber);
-				if (payBill == null) {
+				if (Func.isBlank(application.getKingdeeBillNo())) {
+					log.warn("付款申请[{}]付款处理查询跳过，金蝶单据编号为空", application.getPaymentNo());
 					continue;
 				}
 				try {
+					BfiPayBillVO payBill = this.matchPayBill(application, payBills);
+					if (payBill == null) {
+						continue;
+					}
 					self.applyPayBillRecord(application, payBill);
 					recordWritten++;
 				} catch (Exception exception) {
@@ -1072,7 +1088,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		if (payApply.getId() != null) {
 			entity.setKingdeeBillId(String.valueOf(payApply.getId()));
 		}
-		String kingdeeStatus = kingdeeResultStatus(payApply);
+		String kingdeeStatus = this.kingdeeResultStatus(payApply);
 		entity.setKingdeeStatus(kingdeeStatus);
 		// 已付金额：A103-2 分录 e_paidamt 汇总；分录缺失且已付款时兜底取申请金额
 		BigDecimal previousPaid = entity.getPaidAmount();
@@ -1082,7 +1098,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				.reduce(BigDecimal.ZERO, BigDecimal::add);
 			entity.setPaidAmount(paidAmount.setScale(2, RoundingMode.HALF_UP));
 		} else if (KingdeeBfiConstant.KINGDEE_STATUS_PAID.equals(kingdeeStatus)) {
-			entity.setPaidAmount(money(entity.getAppliedAmount()).setScale(2, RoundingMode.HALF_UP));
+			entity.setPaidAmount(this.money(entity.getAppliedAmount()).setScale(2, RoundingMode.HALF_UP));
 		}
 		// HCS 履约付款记录推进：金蝶实际付款推进（首次付款或金额变化）后置待同步，扫描任务凭
 		// hcs_perf_fd_id 判定走向——未建过履约记录走 C108-1 新建，已建走 C108-2 更新实际金额
@@ -1095,14 +1111,14 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		updateById(entity);
 		if (KingdeeBfiConstant.KINGDEE_STATUS_PAID.equals(kingdeeStatus)) {
 			// 付款完成：联动履约付款数据（预结算预付记录、正式结算付款记录）
-			syncPreSettlementAdvance(entity, "paid", money(entity.getAppliedAmount()));
-			syncFormalSettlementPayments(entity);
+			this.syncPreSettlementAdvance(entity, "paid", this.money(entity.getAppliedAmount()));
+			this.syncFormalSettlementPayments(entity);
 			return true;
 		}
 		// 生成失败单据勾稽确认金蝶已生成（已生成/付款中）：与推送成功同语义，提前落预付记录回显预付信息
 		if (KingdeeBfiConstant.KINGDEE_STATUS_SYNCED.equals(kingdeeStatus)
 			|| KingdeeBfiConstant.KINGDEE_STATUS_PAYING.equals(kingdeeStatus)) {
-			syncPreSettlementAdvance(entity, TransportBusiConstant.APPROVED, money(entity.getPaidAmount()));
+			this.syncPreSettlementAdvance(entity, TransportBusiConstant.APPROVED, this.money(entity.getPaidAmount()));
 		}
 		return false;
 	}
@@ -1128,7 +1144,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		if (payBill.getActpayamt() != null) {
 			record.setPaidAmount(payBill.getActpayamt().setScale(2, RoundingMode.HALF_UP));
 		}
-		record.setPaidDate(parseKingdeeDate(payBill.getPaydate()));
+		record.setPaidDate(this.parseKingdeeDate(payBill.getPaydate()));
 		record.setKingdeeBillNo(billNo);
 		// 付款处理单查询结果整体留档（凭证号、银行流水、电子回单等信息），便于追溯
 		record.setVoucherJson(JsonUtil.toJson(payBill));
@@ -1199,7 +1215,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				continue;
 			}
 			BfiPayApplyVO existing = latestBySrcCode.get(payApply.getAwrpSrcCode());
-			if (existing == null || strCompare(payApply.getModifytime(), existing.getModifytime()) > 0) {
+			if (existing == null || this.strCompare(payApply.getModifytime(), existing.getModifytime()) > 0) {
 				latestBySrcCode.put(payApply.getAwrpSrcCode(), payApply);
 			}
 		}
@@ -1207,7 +1223,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	}
 
 	private BfiPayApplyVO queryLatestPayApply(String paymentNo) {
-		return latestPayApplyBySrcCode(queryPayApplyPages(List.of(paymentNo))).get(paymentNo);
+		return this.latestPayApplyBySrcCode(this.queryPayApplyPages(List.of(paymentNo))).get(paymentNo);
 	}
 
 	/**
@@ -1219,7 +1235,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	 * @return 星瀚付款申请单id，金蝶未生成返回 null
 	 */
 	private String reconcileExistPayApply(PaymentApplication entity) {
-		BfiPayApplyVO existPayApply = queryLatestPayApply(entity.getPaymentNo());
+		BfiPayApplyVO existPayApply = this.queryLatestPayApply(entity.getPaymentNo());
 		if (existPayApply == null || existPayApply.getId() == null) {
 			return null;
 		}
@@ -1247,21 +1263,27 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	}
 
 	/**
-	 * A103-4 分页查询：按付款人（公司）编码 + 业务日期窗口，自动翻页
+	 * A103-4 分页查询：按付款组织 + 外部来源单据编号（付款申请金蝶单据号）数组精确查询，自动翻页。
 	 * <p>
-	 * 窗口天数取 Nacos thirdParty.bfi.payResult.queryWindowDays（默认 60）
+	 * 业务日期窗口与付款组织为接口必填参数，窗口天数取 Nacos thirdParty.bfi.payResult.queryWindowDays
+	 * （默认 60），仅用于满足必填要求；awrp_sourcebillno 精确过滤后仅返回目标单据的付款处理单，
+	 * 不再拉取组织内全量数据做内存勾稽
 	 *
-	 * @param orgNumber 付款人（公司）编码
+	 * @param orgNumber         付款人（公司）编码，接口必传
+	 * @param awrpSourceBillnos 付款申请金蝶单据号批次
 	 * @return 付款处理单列表
 	 */
-	private List<BfiPayBillVO> queryPayBillPages(String orgNumber) {
+	private List<BfiPayBillVO> queryPayBillPages(String orgNumber, List<String> awrpSourceBillnos) {
 		LocalDate endDate = LocalDate.now();
 		int windowDays = Math.max(bfiProperties.getPayResult().getQueryWindowDays(), 1);
 		LocalDate beginDate = endDate.minusDays(windowDays);
 		BfiPayBillQueryDTO param = new BfiPayBillQueryDTO();
+		// 接口必填参数：付款组织编码 + 业务日期窗口（beigin_bizdate/end_bizdate，金蝶侧拼写如此）
 		param.setOrgNumber(List.of(orgNumber));
 		param.setBeginBizdate(beginDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
 		param.setEndBizdate(endDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
+		// 精确过滤参数：待回填单据的金蝶单据号数组（sourcebillnumber 与之同源）
+		param.setAwrpSourceBillno(awrpSourceBillnos);
 		return BfiUtil.queryAllPages(pageNo -> {
 			param.setPageNo(pageNo);
 			param.setPageSize(PAY_RESULT_PAGE_SIZE);
@@ -1270,21 +1292,24 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	}
 
 	/**
-	 * 以金蝶付款处理单源单id（=付款申请单星瀚id）/源单编号（=付款申请单单据编号）勾稽匹配
+	 * 以金蝶付款处理单源单id（=付款申请单星瀚id）/源单编号（=付款申请单单据编号）勾稽匹配，
+	 * 防止按单号查询返回非本单数据（如金蝶侧查询异常返回他单）
 	 *
-	 * @param application        付款申请实体
-	 * @param payBillBySourceId  源单id索引
-	 * @param payBillBySourceNumber 源单编号索引
+	 * @param application 付款申请实体
+	 * @param payBills    按本单金蝶单据号查询返回的付款处理单列表
 	 * @return 匹配的付款处理单，未匹配返回 null
 	 */
-	private BfiPayBillVO matchPayBill(PaymentApplication application, Map<String, BfiPayBillVO> payBillBySourceId,
-		Map<String, BfiPayBillVO> payBillBySourceNumber) {
-		if (Func.isNotEmpty(application.getKingdeeBillId())
-			&& payBillBySourceId.containsKey(application.getKingdeeBillId())) {
-			return payBillBySourceId.get(application.getKingdeeBillId());
-		}
-		if (Func.isNotEmpty(application.getKingdeeBillNo())) {
-			return payBillBySourceNumber.get(application.getKingdeeBillNo());
+	private BfiPayBillVO matchPayBill(PaymentApplication application, List<BfiPayBillVO> payBills) {
+		for (BfiPayBillVO payBill : payBills) {
+			if (payBill.getSourcebillid() != null
+				&& Func.isNotEmpty(application.getKingdeeBillId())
+				&& String.valueOf(payBill.getSourcebillid()).equals(application.getKingdeeBillId())) {
+				return payBill;
+			}
+			if (Func.isNotEmpty(payBill.getSourcebillnumber())
+				&& payBill.getSourcebillnumber().equals(application.getKingdeeBillNo())) {
+				return payBill;
+			}
 		}
 		return null;
 	}
@@ -1372,8 +1397,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（各接口统一格式）
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PreSettlementServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PreSettlementServiceImpl.java
index 20e911d6..333a16b8 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PreSettlementServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PreSettlementServiceImpl.java
@@ -72,6 +72,7 @@ import org.springblade.transport.service.IPreSettlementService;
 import org.springblade.transport.service.IProjectApplyService;
 import org.springblade.transport.service.ISettlementProjectAdvanceWriteOffService;
 import org.springblade.transport.service.IWaybillService;
+import org.springblade.transport.support.TransportBusinessSupport;
 import org.springblade.transport.wrapper.PreSettlementWrapper;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.feign.ISysClient;
@@ -977,11 +978,12 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 		detail.setBatchNo(source.getBatchNo());
 		detail.setUnitPrice(source.getUnitPrice());
 		detail.setFreightAmount(money(source.getFreightAmount()));
-		detail.setFeeItemsJson(source.getFeeItemsJson());
+		detail.setFeeItemsJson(sanitizeFeeItemsJson(source.getFeeItemsJson()));
 		BigDecimal originalAmount = sourceOriginalAmount(source);
+		BigDecimal settlementAmount = resolveSourceSettlementAmount(source, originalAmount);
 		detail.setOriginalAmount(originalAmount);
-		detail.setAdjustAmount(money(source.getTotalAmount()).subtract(originalAmount));
-		detail.setSettlementAmountTax(money(source.getTotalAmount()));
+		detail.setAdjustAmount(settlementAmount.subtract(originalAmount));
+		detail.setSettlementAmountTax(settlementAmount);
 		detail.setCurrency(Func.isEmpty(source.getCurrency()) ? LOCAL_CURRENCY : source.getCurrency());
 		detail.setRemark(source.getRemark());
 		Waybill waybill = source.getWaybillId() == null ? null : waybillService.getById(source.getWaybillId());
@@ -1008,10 +1010,13 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 				.eq(ReceivablePayableCargoFee::getDetailId, source.getId())
 				.eq(ReceivablePayableCargoFee::getIsDeleted, 0));
 		if (sourceFees.isEmpty() || sourceFees.stream().noneMatch(item -> item.getOriginalAmount() != null)) {
-			return money(source.getTotalAmount());
+			return resolveSourceSettlementAmount(source, money(source.getTotalAmount()));
 		}
-		return sourceFees.stream().map(ReceivablePayableCargoFee::getOriginalAmount)
-			.map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add);
+		BigDecimal total = BigDecimal.ZERO;
+		for (ReceivablePayableCargoFee sourceFee : sourceFees) {
+			total = total.add(resolveCargoFeeAmount(sourceFee, sourceFee.getOriginalAmount()));
+		}
+		return money(total);
 	}
 
 	private void copySourceFees(PreSettlementDetail detail, ReceivablePayableDetail source) {
@@ -1031,10 +1036,11 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 			fee.setMileage(source.getMileage());
 			fee.setUnitPrice(source.getUnitPrice());
 			fee.setFreightAmount(money(source.getFreightAmount()));
-			fee.setFeeItemsJson(source.getFeeItemsJson());
-			fee.setOriginalAmount(money(source.getTotalAmount()));
+			fee.setFeeItemsJson(sanitizeFeeItemsJson(source.getFeeItemsJson()));
+			BigDecimal amount = resolveSourceSettlementAmount(source, money(source.getTotalAmount()));
+			fee.setOriginalAmount(amount);
 			fee.setAdjustAmount(BigDecimal.ZERO.setScale(2));
-			fee.setSettlementAmountTax(money(source.getTotalAmount()));
+			fee.setSettlementAmountTax(amount);
 			fee.setRemark(source.getRemark());
 			detailFeeMapper.insert(fee);
 			return;
@@ -1045,6 +1051,7 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 			fee.setId(null);
 			fee.setPreSettlementDetailId(detail.getId());
 			fee.setSourceFeeId(sourceFee.getId());
+			fee.setFeeItemsJson(sanitizeFeeItemsJson(sourceFee.getFeeItemsJson()));
 			// 历史应付费用可能没有 after_amount，不能在首次打开明细调整时被当成 0。
 			BigDecimal settlementAmount = sourceFee.getAfterAmount() != null
 				? money(sourceFee.getAfterAmount())
@@ -1052,8 +1059,9 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 					? money(source.getTotalAmount())
 					: sourceFee.getOriginalAmount() != null
 						? money(sourceFee.getOriginalAmount()) : BigDecimal.ZERO.setScale(2);
+			settlementAmount = resolveCargoFeeAmount(sourceFee, settlementAmount);
 			BigDecimal originalAmount = sourceFee.getOriginalAmount() == null
-				? settlementAmount : money(sourceFee.getOriginalAmount());
+				? settlementAmount : resolveCargoFeeAmount(sourceFee, sourceFee.getOriginalAmount());
 			fee.setOriginalAmount(originalAmount);
 			fee.setAdjustAmount(settlementAmount.subtract(originalAmount));
 			fee.setSettlementAmountTax(settlementAmount);
@@ -1070,14 +1078,23 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 			.filter(row -> !Integer.valueOf(1).equals(row.getManualFlag()))
 			.collect(Collectors.toMap(this::summaryKey, Function.identity(), (left, right) -> left));
 		Map<String, BigDecimal> aggregates = new LinkedHashMap<>();
-		List<Long> detailIds = listDetails(settlementId).stream().map(PreSettlementDetail::getId).toList();
+		List<PreSettlementDetail> details = listDetails(settlementId);
+		List<Long> detailIds = details.stream().map(PreSettlementDetail::getId).toList();
 		List<PreSettlementDetailFee> feeRows = detailIds.isEmpty() ? List.of()
 			: detailFeeMapper.selectList(Wrappers.<PreSettlementDetailFee>lambdaQuery()
 				.in(PreSettlementDetailFee::getPreSettlementDetailId, detailIds)
 				.eq(PreSettlementDetailFee::getIsDeleted, 0)
 				.orderByAsc(PreSettlementDetailFee::getCreateTime));
+		Set<Long> repairedDetailIds = new LinkedHashSet<>();
 		for (PreSettlementDetailFee feeRow : feeRows) {
+			boolean polluted = isPollutedFeeItemsJson(feeRow.getFeeItemsJson());
 			Map<String, BigDecimal> feeItems = parseFeeItems(feeRow.getFeeItemsJson());
+			if (polluted) {
+				repairDetailFeeAmounts(feeRow, feeItems);
+				if (feeRow.getPreSettlementDetailId() != null) {
+					repairedDetailIds.add(feeRow.getPreSettlementDetailId());
+				}
+			}
 			boolean containsFreight = feeItems.keySet().stream().anyMatch(this::isFreightFeeItem);
 			BigDecimal componentAmount = feeItems.values().stream().map(this::money)
 				.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1093,8 +1110,8 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 				summaryKey(feeTypeMap.getOrDefault(feeItem,
 					""), feeItem),
 				money(amount), BigDecimal::add));
-			BigDecimal residualAmount = money(money(feeRow.getSettlementAmountTax())
-				.subtract(componentAmount));
+			// 脏数据已在上面修复结算金额；正常明细才用 settlementAmountTax 与费用项差额补「其他费用」
+			BigDecimal residualAmount = money(money(feeRow.getSettlementAmountTax()).subtract(componentAmount));
 			if (residualAmount.signum() != 0) {
 				aggregates.merge(
 					summaryKey(feeTypeMap.getOrDefault("其他费用", ""), "其他费用"),
@@ -1141,6 +1158,11 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 			summaryFeeMapper.insert(row);
 		}
 		renumberSummaryFees(settlementId);
+		if (!repairedDetailIds.isEmpty()) {
+			details.stream()
+				.filter(detail -> repairedDetailIds.contains(detail.getId()))
+				.forEach(this::refreshDetail);
+		}
 	}
 
 	private void applySummaryRequest(Long settlementId, List<PreSettlementSaveRequest.SummaryFee> requestRows) {
@@ -1729,7 +1751,29 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 		try {
 			Object parsed = JsonUtil.parse(json, Map.class);
 			if (parsed instanceof Map<?, ?> map) {
-				map.forEach((key, value) -> result.put(String.valueOf(key), decimal(value)));
+				BigDecimal otherFeeAmount = BigDecimal.ZERO;
+				for (Map.Entry<?, ?> entry : map.entrySet()) {
+					String key = String.valueOf(entry.getKey());
+					Object value = entry.getValue();
+					if (Func.isBlank(key)) {
+						continue;
+					}
+					if ("otherFreightAmount".equals(key) || "otherFeeTotal".equals(key) || "otherAmount".equals(key)) {
+						otherFeeAmount = otherFeeAmount.add(decimal(value));
+						continue;
+					}
+					if (TransportBusinessSupport.isFreightJsonMetaKey(key)) {
+						continue;
+					}
+					if (value instanceof Map<?, ?> || value instanceof java.util.Collection<?>) {
+						continue;
+					}
+					result.put(key, decimal(value));
+				}
+				if (otherFeeAmount.signum() > 0 && result.keySet().stream()
+					.noneMatch(name -> name != null && (name.contains("其它费") || name.contains("其他费")))) {
+					result.put("其它费用", otherFeeAmount);
+				}
 			}
 		} catch (Exception ignored) {
 			// 历史脏数据不影响结算单展示。
@@ -1737,6 +1781,74 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 		return result;
 	}
 
+	private boolean isPollutedFeeItemsJson(String json) {
+		if (Func.isEmpty(json)) {
+			return false;
+		}
+		try {
+			Object parsed = JsonUtil.parse(json, Map.class);
+			if (!(parsed instanceof Map<?, ?> map)) {
+				return false;
+			}
+			return map.keySet().stream()
+				.map(String::valueOf)
+				.anyMatch(TransportBusinessSupport::isFreightJsonMetaKey);
+		} catch (Exception ignored) {
+			return false;
+		}
+	}
+
+	private String sanitizeFeeItemsJson(String json) {
+		Map<String, BigDecimal> feeItems = parseFeeItems(json);
+		return JsonUtil.toJson(feeItems);
+	}
+
+	/**
+	 * 来源应付明细金额：若 fee_items_json 混入 freightJson 结构字段，按清洗后费用项重算，避免转预结算翻倍。
+	 */
+	private BigDecimal resolveSourceSettlementAmount(ReceivablePayableDetail source, BigDecimal fallback) {
+		if (source == null) {
+			return money(fallback);
+		}
+		if (!isPollutedFeeItemsJson(source.getFeeItemsJson())) {
+			return money(fallback);
+		}
+		Map<String, BigDecimal> feeItems = parseFeeItems(source.getFeeItemsJson());
+		boolean containsFreight = feeItems.keySet().stream().anyMatch(this::isFreightFeeItem);
+		BigDecimal feeItemTotal = feeItems.values().stream().map(this::money)
+			.reduce(BigDecimal.ZERO, BigDecimal::add);
+		return money(containsFreight ? feeItemTotal : money(source.getFreightAmount()).add(feeItemTotal));
+	}
+
+	private BigDecimal resolveCargoFeeAmount(ReceivablePayableCargoFee sourceFee, BigDecimal fallback) {
+		if (sourceFee == null) {
+			return money(fallback);
+		}
+		if (!isPollutedFeeItemsJson(sourceFee.getFeeItemsJson())) {
+			return money(fallback);
+		}
+		Map<String, BigDecimal> feeItems = parseFeeItems(sourceFee.getFeeItemsJson());
+		boolean containsFreight = feeItems.keySet().stream().anyMatch(this::isFreightFeeItem);
+		BigDecimal feeItemTotal = feeItems.values().stream().map(this::money)
+			.reduce(BigDecimal.ZERO, BigDecimal::add);
+		return money(containsFreight ? feeItemTotal : money(sourceFee.getFreightAmount()).add(feeItemTotal));
+	}
+
+	/** 重建合计时顺带修复已落库的脏费用行金额与 fee_items_json。 */
+	private void repairDetailFeeAmounts(PreSettlementDetailFee feeRow, Map<String, BigDecimal> sanitizedFeeItems) {
+		boolean containsFreight = sanitizedFeeItems.keySet().stream().anyMatch(this::isFreightFeeItem);
+		BigDecimal feeItemTotal = sanitizedFeeItems.values().stream().map(this::money)
+			.reduce(BigDecimal.ZERO, BigDecimal::add);
+		BigDecimal corrected = money(containsFreight
+			? feeItemTotal
+			: money(feeRow.getFreightAmount()).add(feeItemTotal));
+		feeRow.setFeeItemsJson(JsonUtil.toJson(sanitizedFeeItems));
+		feeRow.setOriginalAmount(corrected);
+		feeRow.setSettlementAmountTax(corrected);
+		feeRow.setAdjustAmount(BigDecimal.ZERO.setScale(2));
+		detailFeeMapper.updateById(feeRow);
+	}
+
 	private Map<String, BigDecimal> normalizeFeeItems(Map<String, BigDecimal> feeItems) {
 		Map<String, BigDecimal> result = new LinkedHashMap<>();
 		if (feeItems == null) return result;
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java
index c8427238..21616552 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java
+++ b/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));
@@ -417,11 +427,13 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl<ProjectApplyMapper,
 				applyUndertakeDeptContains(queryWrapper, projectApply.getUndertakeDeptId());
 			}
 		} else if (!Objects.equals(projectApply.getAllDept(), 1)) {
+			// 非超管默认收口：业务部门、平台公司、创建人/经办人/负责人可见
 			Long currentDeptId = TransportBusinessSupport.currentDeptId("项目立项");
 			Long currentUserId = AuthUtil.getUserId();
 			queryWrapper.and(wrapper -> {
 				if (currentDeptId != null) {
-					wrapper.apply("FIND_IN_SET({0}, IFNULL(undertake_dept_id,''))", String.valueOf(currentDeptId));
+					wrapper.eq(ProjectApply::getBusinessDeptId, currentDeptId)
+						.or().apply("FIND_IN_SET({0}, IFNULL(undertake_dept_id,''))", String.valueOf(currentDeptId));
 				}
 				wrapper.or().eq(ProjectApply::getCreateUser, currentUserId)
 					.or().eq(ProjectApply::getHandlerUserId, currentUserId)
@@ -1091,7 +1103,8 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl<ProjectApplyMapper,
 		}
 		Long currentDeptId = TransportBusinessSupport.currentDeptId("项目立项");
 		Long currentUserId = AuthUtil.getUserId();
-		return containsUndertakeDept(projectApply.getUndertakeDeptId(), currentDeptId)
+		return Objects.equals(projectApply.getBusinessDeptId(), currentDeptId)
+			|| containsUndertakeDept(projectApply.getUndertakeDeptId(), currentDeptId)
 			|| Objects.equals(projectApply.getCreateUser(), currentUserId)
 			|| Objects.equals(projectApply.getHandlerUserId(), currentUserId)
 			|| Objects.equals(projectApply.getPrincipalUserId(), currentUserId);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java
index ecb31750..28b0a18b 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java
+++ b/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));
@@ -256,11 +266,13 @@ public class ProjectChangeServiceImpl extends BaseServiceImpl<ProjectChangeMappe
 				applyUndertakeDeptContains(queryWrapper, projectChange.getUndertakeDeptId());
 			}
 		} else if (!Objects.equals(projectChange.getAllDept(), 1)) {
+			// 非超管默认收口：业务部门、平台公司、创建人/经办人/负责人可见
 			Long currentDeptId = TransportBusinessSupport.currentDeptId("项目变更");
 			Long currentUserId = AuthUtil.getUserId();
 			queryWrapper.and(wrapper -> {
 				if (currentDeptId != null) {
-					wrapper.apply("FIND_IN_SET({0}, IFNULL(undertake_dept_id,''))", String.valueOf(currentDeptId));
+					wrapper.eq(ProjectChange::getBusinessDeptId, currentDeptId)
+						.or().apply("FIND_IN_SET({0}, IFNULL(undertake_dept_id,''))", String.valueOf(currentDeptId));
 				}
 				wrapper.or().eq(ProjectChange::getCreateUser, currentUserId)
 					.or().eq(ProjectChange::getHandlerUserId, currentUserId)
@@ -520,7 +532,13 @@ public class ProjectChangeServiceImpl extends BaseServiceImpl<ProjectChangeMappe
 			return true;
 		}
 		Long currentDeptId = TransportBusinessSupport.currentDeptId("项目变更");
-		if (currentDeptId == null || Func.isBlank(projectChange.getUndertakeDeptId())) {
+		if (currentDeptId == null) {
+			return false;
+		}
+		if (Objects.equals(projectChange.getBusinessDeptId(), currentDeptId)) {
+			return true;
+		}
+		if (Func.isBlank(projectChange.getUndertakeDeptId())) {
 			return false;
 		}
 		return List.of(projectChange.getUndertakeDeptId().split(",")).stream()
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java
index 895376d4..a0ee4769 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java
@@ -61,6 +61,8 @@ 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;
 import org.springframework.context.annotation.Lazy;
@@ -478,6 +480,8 @@ public class ReceivablePayableDetailServiceImpl
 					? FEE_SOURCE_MANUAL : FEE_SOURCE_AUTO);
 			}
 		});
+		// 历史脏数据：fee_items_json 误含 freightJson 结构字段导致结算金额翻倍，打开详情时自动修复
+		repairPollutedFreightFeeItems(detail, rows);
 		ReceivablePayableFeeDetailVO result = buildFeeDetail(rows);
 		// 只展示本明细已生成的费用项。合同上其他计费方案的费用项不能叠到当前明细。
 		return result;
@@ -563,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();
@@ -1255,9 +1265,7 @@ public class ReceivablePayableDetailServiceImpl
 			&& !Objects.equals(waybill.getProjectId(), contract.getProjectId())) {
 			return false;
 		}
-		String carrierName = trimToNull(waybill.getCarrierName());
-		String partyB = trimToNull(contract.getPartyB());
-		return carrierName != null && carrierName.equals(partyB);
+		return ContractPartySupport.matchesCarrier(contract, waybill.getCarrierName(), waybill.getCarrierPartyId());
 	}
 
 	private ContractManage findCarrierContract(Waybill waybill) {
@@ -1265,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.getPartyA())) {
+		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.getPartyA())
-			.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) {
@@ -2005,12 +2043,15 @@ public class ReceivablePayableDetailServiceImpl
 	private ReceivablePayableCargoFee buildCargoFee(Long detailId, Waybill waybill) {
 		BigDecimal quantity = money(waybill.getQuantity());
 		BigDecimal unitPrice = money(waybill.getUnitPrice());
-		BigDecimal freightAmount = quantity.multiply(unitPrice).setScale(2, RoundingMode.HALF_UP);
-		BigDecimal otherFeeAmount = money(waybill.getOtherFeeTotal());
-		Map<String, Object> feeItems = parseMap(waybill.getFreightJson());
-		if (feeItems.isEmpty() && otherFeeAmount.compareTo(BigDecimal.ZERO) > 0) {
-			feeItems.put("其它费用", otherFeeAmount);
+		// 优先取运单 freightJson 中的运费；没有再回退数量×单价，避免与费用项重复累加
+		BigDecimal freightAmount = waybillFreight(waybill);
+		if (freightAmount == null) {
+			freightAmount = quantity.multiply(unitPrice).setScale(2, RoundingMode.HALF_UP);
+		} else {
+			freightAmount = money(freightAmount);
 		}
+		// freightJson 是币种/运费合计等结构体，不能整包当作费用项目 Map
+		Map<String, Object> feeItems = resolveWaybillFeeItems(waybill);
 		BigDecimal feeItemTotal = feeItems.values().stream().map(this::decimal).reduce(BigDecimal.ZERO, BigDecimal::add);
 		BigDecimal total = freightAmount.add(feeItemTotal).setScale(2, RoundingMode.HALF_UP);
 		ReceivablePayableCargoFee cargoFee = new ReceivablePayableCargoFee();
@@ -2052,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);
@@ -2513,7 +2572,7 @@ public class ReceivablePayableDetailServiceImpl
 			if (Func.isEmpty(vo.getDataSource())) {
 				vo.setDataSource(isManualFee(row) ? FEE_SOURCE_MANUAL : FEE_SOURCE_AUTO);
 			}
-			Map<String, Object> feeItems = parseMap(row.getFeeItemsJson());
+			Map<String, Object> feeItems = sanitizeFeeItems(parseMap(row.getFeeItemsJson()));
 			feeItemNames.addAll(feeItems.keySet());
 			vo.setFeeItems(feeItems);
 			vo.setTransportQuantityText(formatQuantity(row.getTransportQuantity(), row.getQuantityUnit()));
@@ -2530,6 +2589,52 @@ public class ReceivablePayableDetailServiceImpl
 		return vo;
 	}
 
+	/**
+	 * 修复误把运单 freightJson 结构字段写入 fee_items_json 的历史费用行，
+	 * 并按「运输费字段 + 清洗后费用项」重算结算金额，消除翻倍。
+	 */
+	private void repairPollutedFreightFeeItems(ReceivablePayableDetail detail, List<ReceivablePayableCargoFee> rows) {
+		if (detail == null || rows == null || rows.isEmpty()) {
+			return;
+		}
+		boolean repaired = false;
+		for (ReceivablePayableCargoFee row : rows) {
+			Map<String, Object> rawFeeItems = parseMap(row.getFeeItemsJson());
+			if (!isPollutedFreightFeeItems(rawFeeItems)) {
+				continue;
+			}
+			Map<String, Object> sanitized = sanitizeFeeItems(rawFeeItems);
+			Map<String, BigDecimal> feeItemAmounts = new LinkedHashMap<>();
+			sanitized.forEach((name, value) -> feeItemAmounts.put(name, decimal(value)));
+			BigDecimal afterAmount = adjustedAfterAmount(money(row.getFreightAmount()), feeItemAmounts);
+			row.setFeeItemsJson(JsonUtil.toJson(sanitized));
+			row.setOriginalAmount(afterAmount);
+			row.setAfterAmount(afterAmount);
+			row.setAdjustAmount(BigDecimal.ZERO);
+			cargoFeeMapper.updateById(row);
+			repaired = true;
+		}
+		if (!repaired) {
+			return;
+		}
+		BigDecimal freight = rows.stream().map(fee -> money(fee.getFreightAmount()))
+			.reduce(BigDecimal.ZERO, BigDecimal::add);
+		BigDecimal total = rows.stream().map(fee -> money(fee.getAfterAmount()))
+			.reduce(BigDecimal.ZERO, BigDecimal::add);
+		detail.setFreightAmount(freight);
+		detail.setOtherFeeAmount(total.subtract(freight).setScale(2, RoundingMode.HALF_UP));
+		detail.setTotalAmount(total);
+		detail.setFeeItemsJson(aggregateFeeItemsJson(rows));
+		updateById(detail);
+	}
+
+	private boolean isPollutedFreightFeeItems(Map<String, Object> feeItems) {
+		if (feeItems == null || feeItems.isEmpty()) {
+			return false;
+		}
+		return feeItems.keySet().stream().anyMatch(TransportBusinessSupport::isFreightJsonMetaKey);
+	}
+
 	private List<String> contractFeeItemNames(Long contractId) {
 		if (contractId == null) return List.of();
 		ContractManage contract = contractManageService.getById(contractId);
@@ -3000,7 +3105,7 @@ public class ReceivablePayableDetailServiceImpl
 
 	private String aggregateFeeItemsJson(List<ReceivablePayableCargoFee> fees) {
 		Map<String, BigDecimal> feeItems = new LinkedHashMap<>();
-		fees.forEach(fee -> parseMap(fee.getFeeItemsJson()).forEach((name, value) ->
+		fees.forEach(fee -> sanitizeFeeItems(parseMap(fee.getFeeItemsJson())).forEach((name, value) ->
 			feeItems.merge(name, decimal(value), BigDecimal::add)));
 		return JsonUtil.toJson(feeItems);
 	}
@@ -3456,6 +3561,74 @@ public class ReceivablePayableDetailServiceImpl
 		return code;
 	}
 
+	/**
+	 * 从运单 freightJson / otherFeeTotal 解析费用项目（名称→金额）。
+	 * 仅保留真正的费用项；结构字段（currency、totalFreightAmount 等）不会写入。
+	 */
+	private Map<String, Object> resolveWaybillFeeItems(Waybill waybill) {
+		Map<String, Object> feeItems = new LinkedHashMap<>();
+		Map<String, Object> freight = waybillFreightMap(waybill);
+		freight.forEach((key, value) -> {
+			if (Func.isBlank(key) || TransportBusinessSupport.isFreightJsonMetaKey(key)) {
+				return;
+			}
+			if (value instanceof Map<?, ?> || value instanceof Collection<?>) {
+				return;
+			}
+			// 兼容历史「费用名→金额」扁平 JSON（键名通常含「费」）
+			if (!key.contains("费")) {
+				return;
+			}
+			feeItems.put(key, decimal(value));
+		});
+		BigDecimal otherFeeAmount = money(waybillOtherFee(waybill));
+		if (otherFeeAmount.compareTo(BigDecimal.ZERO) > 0 && !containsOtherFeeItem(feeItems.keySet())) {
+			feeItems.put("其它费用", otherFeeAmount);
+		}
+		return feeItems;
+	}
+
+	/**
+	 * 清洗已落库的 fee_items_json：过滤误写入的 freightJson 结构字段，
+	 * 并将 otherFreightAmount / otherFeeTotal 归一为「其它费用」。
+	 */
+	private Map<String, Object> sanitizeFeeItems(Map<String, Object> raw) {
+		Map<String, Object> feeItems = new LinkedHashMap<>();
+		if (raw == null || raw.isEmpty()) {
+			return feeItems;
+		}
+		BigDecimal otherFeeAmount = BigDecimal.ZERO;
+		for (Map.Entry<String, Object> entry : raw.entrySet()) {
+			String key = entry.getKey();
+			Object value = entry.getValue();
+			if (Func.isBlank(key)) {
+				continue;
+			}
+			if ("otherFreightAmount".equals(key) || "otherFeeTotal".equals(key) || "otherAmount".equals(key)) {
+				otherFeeAmount = otherFeeAmount.add(decimal(value));
+				continue;
+			}
+			if (TransportBusinessSupport.isFreightJsonMetaKey(key)) {
+				continue;
+			}
+			if (value instanceof Map<?, ?> || value instanceof Collection<?>) {
+				continue;
+			}
+			feeItems.put(key, decimal(value));
+		}
+		if (otherFeeAmount.compareTo(BigDecimal.ZERO) > 0 && !containsOtherFeeItem(feeItems.keySet())) {
+			feeItems.put("其它费用", otherFeeAmount);
+		}
+		return feeItems;
+	}
+
+	private boolean containsOtherFeeItem(Collection<String> names) {
+		if (names == null || names.isEmpty()) {
+			return false;
+		}
+		return names.stream().anyMatch(name -> name != null && (name.contains("其它费") || name.contains("其他费")));
+	}
+
 	private Map<String, Object> parseMap(String json) {
 		if (Func.isEmpty(json)) {
 			return new LinkedHashMap<>();
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/SettlementAdjustmentServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/SettlementAdjustmentServiceImpl.java
index f7dd22e3..cfd6d90b 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/SettlementAdjustmentServiceImpl.java
+++ b/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
 				? "该结算单已推送金蝶且旧单已冲销，审批后可直接重新推送新单"
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ShippingTemplateServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ShippingTemplateServiceImpl.java
index 892018b9..c4265240 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ShippingTemplateServiceImpl.java
+++ b/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());
 		}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TemporaryCreditLimitServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TemporaryCreditLimitServiceImpl.java
index fdcc043d..5668c4ef 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TemporaryCreditLimitServiceImpl.java
+++ b/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());
 		}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java
index 12479023..fb47d985 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportPlanServiceImpl.java
+++ b/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 为空的历史数据按创建组织归入当前组织
-			queryWrapper.and(wrapper -> wrapper.eq(TransportPlan::getDeptId, currentDeptId)
-				.or(item -> item.isNull(TransportPlan::getDeptId).eq(TransportPlan::getCreateDept, currentDeptId)));
+			// dept_id 为空的历史数据按创建组织归入当前组织；业务部门可见其项目下的计划
+			queryWrapper.and(wrapper -> {
+				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());
 		}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java
index 4e6e2c00..e0f7f532 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TransportVehicleServiceImpl.java
@@ -71,7 +71,6 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl<TransportVehicl
 	private static final int REMARK_MAX_LENGTH = 200;
 	private static final int DEFAULT_ENABLED_STATUS = 1;
 	private static final int DEFAULT_FALSE = 0;
-	private static final int CERTIFICATION_PENDING = 0;
 	private static final int CERTIFICATION_APPROVED = 1;
 	private static final int CERTIFICATION_REJECTED = 2;
 
@@ -133,8 +132,9 @@ public class TransportVehicleServiceImpl extends BaseServiceImpl<TransportVehicl
 		prepare(vehicle);
 		validate(vehicle);
 		checkUniquePlateNo(vehicle);
-		vehicle.setCertificationStatus(CERTIFICATION_PENDING);
-		vehicle.setCertificationRejectReason(null);
+		// 保存档案不碰认证状态：认证状态与生效快照只由认证审核流水维护。
+		// 这里曾强制置 certification_status = 0（审核中），于是管理端每存一次档案，
+		// 已认证车辆就被改回「审核中」，而审核页并没有对应的待审记录——一个退不出去的死状态。
 		return saveOrUpdate(vehicle);
 	}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TripQueryServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TripQueryServiceImpl.java
index fcff3fdc..ee63e0b3 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TripQueryServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/TripQueryServiceImpl.java
@@ -389,22 +389,22 @@ public class TripQueryServiceImpl implements ITripQueryService {
 	}
 
 	/**
-	 * 运次可见范围：配载段按配载单的司机手机号收口，未配载段按运单的司机手机号收口。
+	 * 运次可见范围：已配载段按配载单的 driver_id 收口，未配载段按运单的 driver_id 收口。
 	 * <p>
-	 * 手机号允许带空格，与运单列表的收口判据一致。
+	 * 归属判据只有司机档案 ID（null 或非正数视为无主），driver_phone 不参与判定。
+	 * 无主的运次由 {@link #scoped} 在外层挡掉。
 	 */
 	private void applyScope(LambdaQueryWrapper<Waybill> wrapper, TripQueryVO condition) {
 		if (condition.isAllDrivers()) {
 			return;
 		}
-		String phone = Func.toStr(condition.getDriverPhone(), "").trim();
+		Long driverId = condition.getDriverId();
 		wrapper.and(scope -> scope
 			.apply("(IFNULL(loading_no, '') <> '' AND loading_no IN (SELECT lm.loading_no FROM blade_loading_manage lm"
-				+ " WHERE lm.is_deleted = 0 AND lm.driver_phone = {0}))", phone)
+				+ " WHERE lm.is_deleted = 0 AND lm.driver_id = {0}))", driverId)
 			.or(lone -> lone
 				.apply("IFNULL(loading_no, '') = ''")
-				.and(row -> row.eq(Waybill::getDriverPhone, phone)
-					.or().apply("REPLACE(IFNULL(driver_phone, ''), ' ', '') = {0}", phone))));
+				.and(row -> row.eq(Waybill::getDriverId, driverId))));
 	}
 
 	/**
@@ -786,7 +786,7 @@ public class TripQueryServiceImpl implements ITripQueryService {
 	}
 
 	/**
-	 * 按运次主键取配载单：主键命中配载单即配载运次，再按司机收口
+	 * 按运次主键取配载单：主键命中配载单即配载运次，再按配载单的司机档案 ID 收口
 	 */
 	private LoadingManage visibleLoading(Long id, TripQueryVO condition) {
 		LoadingManage loading = loadingManageService.getById(id);
@@ -796,7 +796,7 @@ public class TripQueryServiceImpl implements ITripQueryService {
 		if (condition.isAllDrivers()) {
 			return loading;
 		}
-		return samePhone(loading.getDriverPhone(), condition.getDriverPhone()) ? loading : null;
+		return ownedBy(loading.getDriverId(), condition.getDriverId()) ? loading : null;
 	}
 
 	/**
@@ -813,19 +813,23 @@ public class TripQueryServiceImpl implements ITripQueryService {
 		if (condition.isAllDrivers()) {
 			return waybill;
 		}
-		return samePhone(waybill.getDriverPhone(), condition.getDriverPhone()) ? waybill : null;
+		return ownedBy(waybill.getDriverId(), condition.getDriverId()) ? waybill : null;
 	}
 
+	/** 收口条件是否成立：管理端不收口；司机端必须给出有效的档案 ID，缺省一律拒绝 */
 	private boolean scoped(TripQueryVO condition) {
-		return condition.isAllDrivers() || Func.isNotEmpty(Func.toStr(condition.getDriverPhone(), "").trim());
+		Long driverId = condition.getDriverId();
+		return condition.isAllDrivers() || (driverId != null && driverId > 0);
 	}
 
-	private boolean samePhone(String left, String right) {
-		String expected = Func.toStr(right, "").trim().replace(" ", "");
-		if (Func.isEmpty(expected)) {
-			return false;
-		}
-		return expected.equals(Func.toStr(left, "").trim().replace(" ", ""));
+	/**
+	 * 归属判据：行的司机档案 ID 与收口条件相等。
+	 * <p>
+	 * 条件侧缺省（空、0、负数）一律不可见——没有有效档案 ID 就等于没有收口条件，
+	 * 此时任何行都不能算作「本人」，否则业务主键未回填的历史数据会把运次漏给所有人。
+	 */
+	private boolean ownedBy(Long ownerId, Long expectedId) {
+		return expectedId != null && expectedId > 0 && expectedId.equals(ownerId);
 	}
 
 	private TripQueryVO condition(TripQueryVO query) {
@@ -835,7 +839,7 @@ public class TripQueryServiceImpl implements ITripQueryService {
 	/** 去掉 Tab 条件、其余照搬：统计四档时不按某一档收窄 */
 	private TripQueryVO withoutTab(TripQueryVO source) {
 		TripQueryVO copy = new TripQueryVO();
-		copy.setDriverPhone(source.getDriverPhone());
+		copy.setDriverId(source.getDriverId());
 		copy.setAllDrivers(source.isAllDrivers());
 		copy.setDeptIds(source.getDeptIds());
 		copy.setProjectIds(source.getProjectIds());
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java
index 61604120..5eabbc36 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.excel.ImportFailureExcelUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -41,6 +42,7 @@ import org.springblade.transport.pojo.vo.WaybillImportBatchVO;
 import org.springblade.transport.pojo.vo.WaybillImportRowErrorVO;
 import org.springblade.transport.pojo.vo.WaybillImportValidateResultVO;
 import org.springblade.transport.service.ICustomerArchiveService;
+import org.springblade.transport.service.IDriverService;
 import org.springblade.transport.service.IProjectApplyService;
 import org.springblade.transport.service.IReceivablePayableDetailService;
 import org.springblade.transport.service.ILoadingManageService;
@@ -68,6 +70,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /** 运单批次服务实现。 */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class WaybillImportBatchServiceImpl extends BaseServiceImpl<WaybillImportBatchMapper, WaybillImportBatch> implements IWaybillImportBatchService {
@@ -101,6 +104,7 @@ public class WaybillImportBatchServiceImpl extends BaseServiceImpl<WaybillImport
 	private final IReceivablePayableDetailService receivablePayableDetailService;
 	private final ILoadingManageService loadingManageService;
 	private final ISysClient sysClient;
+	private final IDriverService driverService;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -207,7 +211,9 @@ public class WaybillImportBatchServiceImpl extends BaseServiceImpl<WaybillImport
 		List<Waybill> rowWaybills = new ArrayList<>();
 		for (int index = 0; index < rows.size(); index++) {
 			try {
-				rowWaybills.add(buildWaybill(rows.get(index), batch, request.getCarrierContractId(), draft));
+				Waybill builtWaybill = buildWaybill(rows.get(index), batch, request.getCarrierContractId(), draft);
+				fillDriverOwnership(builtWaybill, index + 1);
+				rowWaybills.add(builtWaybill);
 			} catch (Exception exception) {
 				throw new ServiceException("第" + (index + 1) + "行" + (draft ? "保存" : "导入") + "失败：" + exception.getMessage());
 			}
@@ -485,6 +491,26 @@ public class WaybillImportBatchServiceImpl extends BaseServiceImpl<WaybillImport
 		return id == null || id <= 0L ? null : id;
 	}
 
+	/**
+	 * 补齐导入运单的司机档案 ID：行内有（老系统导出）就用，否则按手机号解析。
+	 * 解析不到不阻断导入，只留行级 WARN：承运商司机与未登录过小程序的司机本来就没有档案。
+	 */
+	private void fillDriverOwnership(Waybill waybill, int rowNo) {
+		Long driverId = waybill.getDriverId();
+		if (driverId != null && driverId > 0) {
+			return;
+		}
+		// 解析入口只返回 null 或唯一命中的档案 ID，不需要再按哨兵归一
+		Long resolvedDriverId = driverService.resolveDriverIdByMobile(waybill.getTenantId(), waybill.getDriverPhone());
+		if (resolvedDriverId != null) {
+			waybill.setDriverId(resolvedDriverId);
+			return;
+		}
+		waybill.setDriverId(null);
+		log.warn("第{}行 运单 {} 的司机手机号未唯一匹配司机档案，driver_id 留空（不阻断导入）",
+			rowNo, waybill.getWaybillNo());
+	}
+
 	private Waybill buildWaybill(Map<String, Object> row, WaybillImportBatch batch, Long carrierContractId, boolean draft) {
 		if (row == null) throw new ServiceException("运单数据不正确");
 		Waybill waybill = new Waybill();
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java
index bc263482..c692583e 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillServiceImpl.java
@@ -22,6 +22,7 @@
  */
 package org.springblade.transport.service.impl;
 
+import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -61,12 +62,14 @@ import org.springblade.transport.pojo.vo.WaybillPunchPhotoVO;
 import org.springblade.transport.pojo.vo.WaybillPunchRecordItemVO;
 import org.springblade.transport.pojo.vo.WaybillPunchRecordsVO;
 import org.springblade.transport.pojo.vo.WaybillVO;
+import org.springblade.transport.service.IDriverService;
 import org.springblade.transport.service.ILoadingManageService;
 import org.springblade.transport.service.IProcessConfigService;
 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;
@@ -110,6 +113,9 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 	@jakarta.annotation.Resource
 	private ILoadingManageService loadingManageService;
 
+	@jakarta.annotation.Resource
+	private IDriverService driverService;
+
 	@jakarta.annotation.Resource
 	private IProcessConfigService processConfigService;
 
@@ -147,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));
@@ -1323,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(
-				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());
-			}
+			applyAccountScope(queryWrapper, waybill.getAllDept(), waybill.getDeptId());
 			queryWrapper.in(Waybill::getId, idList).orderByDesc(Waybill::getCreateTime);
 		} else {
 			queryWrapper = buildQuery(waybill);
@@ -1392,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());
@@ -1610,7 +1606,18 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 		TransportBusinessSupport.validateRequired(driverPhone, "手机号不能为空");
 		TransportBusinessSupport.validateRequired(vehicleNo, "车牌号不能为空");
 
-		waybill.setDriverId(request.getDriverId());
+		// 归属主键是档案 ID，手机号只是派单时的号码快照：调用方带了档案 ID 就用它，
+		// 否则按手机号解析；解析入口只返回 null 或唯一命中的档案 ID，承运商司机、未建档司机
+		// 解析为空，派单照旧成功，落空时留 WARN
+		Long driverId = request.getDriverId();
+		if (driverId == null || driverId <= 0) {
+			driverId = driverService.resolveDriverIdByMobile(waybill.getTenantId(), driverPhone);
+			if (driverId == null) {
+				log.warn("运单 {} 的司机手机号未唯一匹配司机档案，driver_id 落空（不阻断派单）。租户={} 手机号={}",
+					waybill.getWaybillNo(), waybill.getTenantId(), DesensitizedUtil.mobilePhone(driverPhone));
+			}
+		}
+		waybill.setDriverId(driverId);
 		waybill.setDriverName(driverName);
 		waybill.setDriverPhone(driverPhone);
 		waybill.setVehicleNo(vehicleNo);
@@ -1801,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);
-		if (Func.isNotEmpty(deptIdList)) {
-			if (deptIdList.size() == 1) {
-				queryWrapper.eq(Waybill::getDeptId, deptIdList.get(0));
-			} else {
-				queryWrapper.in(Waybill::getDeptId, deptIdList);
-			}
-		}
+	/**
+	 * 运单可见范围：超管不限制；普通账号仅本组织运单，以及归属本账号项目的运单。
+	 * 本人创建权限仍只看自己创建的运单。
+	 */
+	private void applyAccountScope(LambdaQueryWrapper<Waybill> queryWrapper, Integer allDept, Long deptId) {
 		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());
 		}
@@ -2211,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())) {
@@ -2220,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())) {
-			throw new ServiceException("承运商合同必须属于所选项目，且合同乙方须与承运商一致");
+			|| !ContractPartySupport.matchesCarrier(carrierContract, waybill.getCarrierName(), waybill.getCarrierPartyId())) {
+			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)));
+			}
 		}
 	}
 
@@ -2236,6 +2297,7 @@ public class WaybillServiceImpl extends BaseServiceImpl<WaybillMapper, Waybill>
 		if (checkDept) {
 			TransportBusinessSupport.assertCurrentDept(waybill.getDeptId(), "运单管理", TransportBusinessSupport.MENU_WAYBILL_MANAGE);
 		}
+		assertWaybillVisible(waybill);
 		return waybill;
 	}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/CertificationRuleSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/CertificationRuleSupport.java
index 7fc8ce28..d0566a01 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/CertificationRuleSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/CertificationRuleSupport.java
@@ -81,6 +81,27 @@ public final class CertificationRuleSupport {
 		return previousPending;
 	}
 
+	/**
+	 * 取一条记录的「当前生效内容」
+	 * <p>
+	 * 审核员可以在通过时修订内容：修订版存在则以修订版为准，否则回退到司机原提交
+	 * （{@code snapshot_json} 永不修改，它是司机当时提交了什么的历史证据）。
+	 * <p>
+	 * 写回档案、司机端读生效值、审核详情对比三处必须用同一套取法，
+	 * 否则会出现「档案是新值、司机端还是旧值」这种自相矛盾。
+	 *
+	 * @param record 认证记录，可为 null
+	 * @return 生效内容 JSON；记录为空、或两者都为空时返回 null
+	 */
+	public static String effectiveSnapshotJson(TransportCertRecord record) {
+		if (record == null) {
+			return null;
+		}
+		return Func.isNotBlank(record.getAuditedSnapshotJson())
+			? record.getAuditedSnapshotJson()
+			: record.getSnapshotJson();
+	}
+
 	/**
 	 * 判定认证对象是否已认证
 	 * <p>
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/ContractPartySupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/ContractPartySupport.java
new file mode 100644
index 00000000..074fd3be
--- /dev/null
+++ b/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;
+		}
+	}
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java
index 12a1060f..ef7203a4 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeApBillSyncSupport.java
@@ -239,19 +239,34 @@ public class KingdeeApBillSyncSupport {
 		if (Func.isBlank(awrpSrcCode)) {
 			return false;
 		}
-		BfiApBillQueryDTO param = new BfiApBillQueryDTO();
-		param.setAwrpSrcCode(List.of(awrpSrcCode));
-		param.setAwrpSrcSys(bfiProperties.getSrcSys());
-		for (BfiApBillVO apBill : BfiUtil.queryAllPages(pageNo -> {
-			param.setPageNo(pageNo);
-			param.setPageSize(PAY_RESULT_PAGE_SIZE);
-			return bfiService.queryApBill(param);
-		})) {
-			if (awrpSrcCode.equals(apBill.getAwrpSrcCode()) && Boolean.TRUE.equals(apBill.getHadwrittenoff())) {
-				return true;
+		return queryApBillWriteOffFlags(List.of(awrpSrcCode)).getOrDefault(awrpSrcCode, Boolean.FALSE);
+	}
+
+	/**
+	 * A102-4 冲销状态批量查询：防重键批量分批查询财务应付单，返回 防重键 -&gt; 是否已冲销
+	 * （hadwrittenoff=true，部分冲销同样视为已冲销；同键多单取或，查不到的键不在结果中即视为未冲销）。
+	 * 定时回写结算单金蝶冲销状态用，整批一次查询消除逐单远程查询 N+1
+	 *
+	 * @param awrpSrcCodes 财务应付单防重键列表
+	 * @return 防重键 -&gt; 是否已冲销
+	 */
+	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 财务应付单保存 ====================
@@ -309,8 +324,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);
 		// 【必填】款项性质.编码
@@ -1022,6 +1037,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()) + "]未关联项目，无法确定金蝶组织编码");
 		}
@@ -1079,20 +1108,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);
-		Dept dept = SysCache.getDept(project.getBusinessDeptId());
-		if (dept == null || Func.isBlank(dept.getKingdeeDeptCode())) {
-			throw new ServiceException("推送金蝶失败，项目业务部门[" + Func.toStr(project.getBusinessDeptName()) + "]未维护金蝶编码，请检查部门数据");
+		return kingdeeDeptNumber(null, projectId, context);
+	}
+
+	/**
+	 * 金蝶部门编码：按合同平台公司下业务部门配置的金蝶部门代码推送
+	 *
+	 * @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();
 	}
 
 	/** 金蝶组织/部门编码共用校验：项目存在且已维护业务部门 */
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java
index f9e214c1..75253e6f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeArBillSyncSupport.java
@@ -150,19 +150,34 @@ public class KingdeeArBillSyncSupport {
 		if (Func.isBlank(arBillSrcCode)) {
 			return false;
 		}
-		BfiArBillQueryDTO param = new BfiArBillQueryDTO();
-		param.setAwrpSrcCode(List.of(arBillSrcCode));
-		param.setAwrpSrcSys(bfiProperties.getSrcSys());
-		for (BfiArBillVO arBill : BfiUtil.queryAllPages(pageNo -> {
-			param.setPageNo(pageNo);
-			param.setPageSize(AR_RESULT_PAGE_SIZE);
-			return bfiService.queryArBill(param);
-		})) {
-			if (arBillSrcCode.equals(arBill.getAwrpSrcCode()) && Boolean.TRUE.equals(arBill.getHadwrittenoff())) {
-				return true;
+		return queryArBillWriteOffFlags(List.of(arBillSrcCode)).getOrDefault(arBillSrcCode, Boolean.FALSE);
+	}
+
+	/**
+	 * A302-4 冲销状态批量查询：防重键批量分批查询财务应收单，返回 防重键 -&gt; 是否已冲销
+	 * （hadwrittenoff=true，部分冲销同样视为已冲销；同键多单取或，查不到的键不在结果中即视为未冲销）。
+	 * 定时回写结算单金蝶冲销状态用，整批一次查询消除逐单远程查询 N+1
+	 *
+	 * @param arBillSrcCodes 财务应收单防重键列表
+	 * @return 防重键 -&gt; 是否已冲销
+	 */
+	public Map<String, Boolean> queryArBillWriteOffFlags(List<String> arBillSrcCodes) {
+		Map<String, Boolean> writeOffFlags = new LinkedHashMap<>();
+		kingdeeApBillSyncSupport.batchForeach(arBillSrcCodes, bfiProperties.getWriteOffResult().getQueryBatchSize(), batch -> {
+			BfiArBillQueryDTO param = new BfiArBillQueryDTO();
+			param.setAwrpSrcCode(batch);
+			param.setAwrpSrcSys(bfiProperties.getSrcSys());
+			for (BfiArBillVO arBill : BfiUtil.queryAllPages(pageNo -> {
+				param.setPageNo(pageNo);
+				param.setPageSize(AR_RESULT_PAGE_SIZE);
+				return bfiService.queryArBill(param);
+			})) {
+				if (Func.isNotEmpty(arBill.getAwrpSrcCode())) {
+					writeOffFlags.merge(arBill.getAwrpSrcCode(), Boolean.TRUE.equals(arBill.getHadwrittenoff()), Boolean::logicalOr);
+				}
 			}
-		}
-		return false;
+		});
+		return writeOffFlags;
 	}
 
 	// ==================== A302-2 财务应收单保存 ====================
@@ -218,8 +233,8 @@ public class KingdeeArBillSyncSupport {
 		param.setOrgNumber(orgNumber);
 		// 收款组织.编码：同结算组织
 		param.setRecorgNumber(orgNumber);
-		// 部门.编码：项目业务部门自身的金蝶编码（结算/收款组织仍传上溯平台公司编码，口径与付款申请/应付单一致）
-		param.setDepartmentNumber(kingdeeApBillSyncSupport.kingdeeDeptNumber(contract.getProjectId(), context));
+		// 部门.编码：合同平台公司下业务部门配置的金蝶部门代码
+		param.setDepartmentNumber(kingdeeApBillSyncSupport.kingdeeDeptNumber(contract, contract.getProjectId(), context));
 		// 【必填】单据日期
 		param.setBizdate(billDateText);
 		// 【必填】往来类型：统一固定客户（KingdeeApBillSyncSupport#bfiAsstactType，与应付单/付款申请同口径）
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java
index 1b7841ad..7208829f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/KingdeeReceivedInvoiceSyncSupport.java
@@ -44,6 +44,7 @@ import org.springblade.thirdparty.bfi.service.IBfiService;
 import org.springblade.thirdparty.bfi.util.BfiUtil;
 import org.springblade.transport.config.BfiProperties;
 import org.springblade.transport.constant.KingdeeBfiConstant;
+import org.springblade.transport.pojo.entity.ContractManage;
 import org.springblade.transport.pojo.entity.InvoiceReceipt;
 import org.springblade.transport.pojo.entity.KingdeeInvoicePool;
 import org.springblade.transport.service.KingdeeSyncContext;
@@ -64,11 +65,12 @@ import java.util.Map;
 /**
  * 金蝶收票单同步支撑组件（图05 环节②③：A303-2 收票单批量保存 + A302-6 收票指定应付 + A801-3 收票单查询）。
  * <p>收票登记「推送金蝶」由 {@link org.springblade.transport.service.IInvoiceReceiptService} 编排前置校验
- * （审批通过、已绑定镜像、A801-3 幂等预检）后调用本组件；先票后款链路：A303-2 推送即终态（pushed），
- * A302-6 指定应付移交付款结算单侧（应付单 A102-2 生成后按认领关系逐单指定）。
- * 报文组装取数：往来户=发票销售方金蝶供应商代码（A901-1），结算组织=页面手选部门沿部门树上溯平台公司，
- * 币别固定 CNY；票面字段取自票池镜像（A801-1 落库），明细分录逐行取发票明细（镜像 items_json），
- * 分录标识 awrp_entry_code=发票号码_seq（重推幂等候选键）。
+ * （审批通过、已绑定镜像、一票一应付、A102-4 应付单已生成预检、A801-3 幂等预检）后调用本组件；
+ * 报文组装取数：主表组织/币种/往来户复用应付支撑组件的合同派生方法，票面字段取自票池镜像
+ * （invoice_type_code 等，A801-1 落库），明细分录与财务应付单 A102-2 同源同口径
+ * （结算明细行+结算合计费用项各一条，{@link KingdeeApBillSyncSupport.BfiEntryGroup}，分录标识同键）。
+ * 防重键：收票单 awrp_src_code=收票登记id，awrp_entry_code=结算明细行单据号/结算合计费用项拼接
+ * （与应付单分录同键，便于金蝶侧逐行勾稽）；A302-6 按「收票单防重键 ↔ 财务应付单防重键」一票一应付指定。
  * 财务应付单侧（A102-2/A102-4）取数与校验复用 {@link KingdeeApBillSyncSupport}。</p>
  *
  * @author Chill
@@ -150,19 +152,21 @@ public class KingdeeReceivedInvoiceSyncSupport {
 
 	/**
 	 * 推送金蝶收票单（A303-2 批量保存，调用方已完成 A801-3 幂等预检）。
-	 * 先票后款链路：收票登记不挂结算单/合同——主表往来户=发票销售方金蝶供应商代码（receipt.supplierCode，
-	 * 缺失实时查 A901-1 一次，仍缺失报错阻断），结算组织=页面手选部门（receipt.deptId）沿部门树反查平台公司，
-	 * 币别固定 CNY，往来类型取固定常量；销方=开票单位、购方=受票单位。
-	 * 明细分录逐行取发票明细行（镜像 items_json，{@link BfiInvoicePoolItemVO}），不与结算明细同源。
+	 * 主表：组织/币种/往来户编码按分摊结算单关联合同派生（与应付单同源），销方=开票单位、购方=受票单位；
+	 * 明细分录与财务应付单 A102-2 同源同口径：结算明细按 货物→费用大类→税率 拆分行+手动添加结算合计费用项每行一条，物料/数量/单价/金额取自
+	 * 与应付单分录同一解析结果（{@link KingdeeApBillSyncSupport.BfiEntryGroup}），分录标识同键。
 	 * 联调口径沿用应付侧：先只送 DTO 标注【必填】字段与票面核心字段（发票号码），
 	 * 非必填的税号/地址/电话/开户行等 setter 注释保留，联调确认后放开
 	 *
-	 * @param receipt 收票登记（审批通过、已绑定镜像）
-	 * @param mirror  票池镜像（票面主表字段+明细行取数来源）
-	 * @param context 金蝶同步上下文（缓存载体）
+	 * @param receipt     收票登记（审批通过、已绑定镜像）
+	 * @param mirror      票池镜像（票面主表字段取数来源）
+	 * @param contract    分摊应付结算单关联合同（组织/币种/往来户派生）
+	 * @param entryGroups 分摊结算单解析出的分录（与应付单 A102-2 同一解析结果）
+	 * @param context     金蝶同步上下文（缓存载体）
 	 * @return 推送结果（单据编号 + 星瀚收票单内码，A902 附件上传定位用）
 	 */
-	public ReceivedInvoicePushOutcome pushReceivedInvoice(InvoiceReceipt receipt, KingdeeInvoicePool mirror, KingdeeSyncContext context) {
+	public ReceivedInvoicePushOutcome pushReceivedInvoice(InvoiceReceipt receipt, KingdeeInvoicePool mirror, ContractManage contract,
+														  List<KingdeeApBillSyncSupport.BfiEntryGroup> entryGroups, KingdeeSyncContext context) {
 		if (Func.isBlank(mirror.getInvoiceTypeCode())) {
 			throw new ServiceException("推送金蝶收票单失败：镜像缺少票易通发票类型编码，请先重新绑定票池发票");
 		}
@@ -183,12 +187,14 @@ public class KingdeeReceivedInvoiceSyncSupport {
 		param.setInvoicetypef7Number(mirror.getInvoiceTypeCode());
 		// 【必填】付款方式：（与应付单一致，不允许金蝶自动推付款）
 		param.setPaymenttype(BfiConstant.PAY_MODE_CASH);
-		// 【必填】往来类型：固定常量（收票登记不挂合同，直接取常量）
-		param.setAsstacttype(KingdeeBfiConstant.BFI_CUSTOMER_ASSTACT_TYPE);
-		// 【必填】结算组织.编码：页面手选部门沿部门树反查平台公司（收票登记 deptId）
-		param.setOrgNumber(kingdeeApBillSyncSupport.kingdeeOrgNumberByDept(receipt.getDeptId(), context));
-		// 【必填】结算币别：固定 CNY（收票登记不挂合同，数电票人民币）
-		param.setCurrencyNumber(KingdeeBfiConstant.BFI_RECEIVED_CURRENCY_NUMBER);
+		// 【必填】往来类型：统一固定客户（KingdeeApBillSyncSupport#bfiAsstactType，与应付单/付款申请同口径）
+		param.setAsstacttype(kingdeeApBillSyncSupport.bfiAsstactType(contract));
+		// 部门金蝶代码校验：收票单主表无部门字段，推送前仍按合同平台公司下业务部门配置校验
+		kingdeeApBillSyncSupport.kingdeeDeptNumber(contract, contract.getProjectId(), context);
+		// 【必填】结算组织.编码：合同平台公司金蝶组织编码（与应付单同源）
+		param.setOrgNumber(kingdeeApBillSyncSupport.bfiOrgNumber(contract, context));
+		// 【必填】结算币别：合同结算币种
+		param.setCurrencyNumber(kingdeeApBillSyncSupport.bfiCurrency(contract));
 		// 【必填】往来户.编码：发票销售方金蝶供应商代码（缺失实时查 A901-1，仍缺失报错阻断）
 		String supplierNumber = this.requireSupplierNumber(receipt, mirror);
 		param.setReceivablessuppNumber(supplierNumber);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java
index 3a88d7ac..842f6ec0 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/TransportBusinessSupport.java
@@ -23,22 +23,32 @@
 
 package org.springblade.transport.support;
 
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.cache.RoleDataScopeCache;
 import org.springblade.system.cache.SysCache;
+import org.springblade.system.cache.UserCache;
 import org.springblade.system.pojo.entity.Dept;
 import org.springblade.system.pojo.vo.RoleDataScopeVO;
+import org.springblade.transport.mapper.ProjectApplyMapper;
+import org.springblade.transport.pojo.entity.ProjectApply;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 运输业务公共校验支持
@@ -87,9 +97,24 @@ public final class TransportBusinessSupport {
 	/** 临时额度管理菜单编码 */
 	public static final String MENU_TEMPORARY_CREDIT_LIMIT = "temporary_credit_limit";
 
+	/**
+	 * 运单 freightJson 结构字段，不是费用项目名。
+	 * 误写入 fee_items_json / 预结算合计时需过滤，否则会出现 totalFreightAmount 等英文费用项并导致金额翻倍。
+	 */
+	public static final Set<String> FREIGHT_JSON_META_KEYS = Set.of(
+		"currency", "totalFreightAmount", "otherFreightAmount", "freightItems",
+		"freightTotal", "totalFreight", "totalAmount", "freight", "freightAmount",
+		"transportFee", "otherFeeTotal", "otherAmount"
+	);
+
 	private TransportBusinessSupport() {
 	}
 
+	/** 是否运单运费 JSON 的结构字段名（不可作为费用项展示）。 */
+	public static boolean isFreightJsonMetaKey(String key) {
+		return Func.isNotBlank(key) && FREIGHT_JSON_META_KEYS.contains(key);
+	}
+
 	/**
 	 * 是否超级管理员：当前用户任一角色别名等于 administrator 即为超级管理员。
 	 *
@@ -109,14 +134,14 @@ public final class TransportBusinessSupport {
 	}
 
 	/**
-	 * 解析指定菜单下的角色数据权限（超管视为全部组织）。
+	 * 解析指定菜单下的角色数据权限（超管视为全部组织），并与用户「数据管理权限」组织取并集。
 	 */
 	public static RoleDataScopeVO resolveRoleDataScope(String menuCode) {
 		if (isAdministrator()) {
 			return RoleDataScopeVO.all();
 		}
 		RoleDataScopeVO scope = RoleDataScopeCache.resolveByMenuCode(menuCode);
-		return scope == null ? RoleDataScopeVO.all() : scope;
+		return mergeUserManageDepts(scope == null ? RoleDataScopeVO.all() : scope);
 	}
 
 	/**
@@ -136,10 +161,43 @@ public final class TransportBusinessSupport {
 		if (isAdministrator()) {
 			return true;
 		}
-		RoleDataScopeVO scope = RoleDataScopeCache.resolveWidest();
+		RoleDataScopeVO scope = resolveWidestDataScope();
 		return scope == null || scope.isAllDept();
 	}
 
+	/**
+	 * 解析最宽角色数据权限，并与用户「数据管理权限」组织取并集。
+	 */
+	public static RoleDataScopeVO resolveWidestDataScope() {
+		if (isAdministrator()) {
+			return RoleDataScopeVO.all();
+		}
+		RoleDataScopeVO scope = RoleDataScopeCache.resolveWidest();
+		return mergeUserManageDepts(scope == null ? RoleDataScopeVO.all() : scope);
+	}
+
+	/**
+	 * 角色组织权限与用户数据管理组织取并集。
+	 * <p>
+	 * 全部组织 / 本人创建 不因用户管理组织改变；其余类型将用户管理组织（含下级）并入 deptIds。
+	 */
+	private static RoleDataScopeVO mergeUserManageDepts(RoleDataScopeVO scope) {
+		if (scope == null || scope.isAllDept() || scope.isOwnCreate()) {
+			return scope;
+		}
+		Long userId = AuthUtil.getUserId();
+		List<Long> manageDeptIds = UserCache.getManageDeptIds(userId);
+		if (Func.isEmpty(manageDeptIds)) {
+			return scope;
+		}
+		LinkedHashSet<Long> mergedDeptIds = new LinkedHashSet<>();
+		if (Func.isNotEmpty(scope.getDeptIds())) {
+			mergedDeptIds.addAll(scope.getDeptIds());
+		}
+		mergedDeptIds.addAll(manageDeptIds);
+		return RoleDataScopeVO.ofDepts(scope.getScopeType(), List.copyOf(mergedDeptIds));
+	}
+
 	/**
 	 * 是否仅本人创建数据权限
 	 */
@@ -164,6 +222,29 @@ public final class TransportBusinessSupport {
 		return dept;
 	}
 
+	/**
+	 * 列表行是否只读：与 {@link #assertCurrentDept(Long, String, String)} 判定保持一致。
+	 * <p>
+	 * 超管 / 全部组织 / 本人创建数据权限下可编辑；指定组织权限下，仅所属组织在授权范围内时可编辑；
+	 * 否则仅当前登录用户所属组织的数据可编辑。
+	 *
+	 * @param deptId   业务数据所属组织
+	 * @param menuCode 菜单编码
+	 * @return true-前端仅展示查看
+	 */
+	public static boolean isDeptReadonly(Long deptId, String menuCode) {
+		RoleDataScopeVO scope = resolveRoleDataScope(menuCode);
+		if (scope.isAllDept() || scope.isOwnCreate()) {
+			return false;
+		}
+		List<Long> allowedDeptIds = scope.getDeptIds();
+		if (Func.isNotEmpty(allowedDeptIds)) {
+			return deptId == null || deptId <= 0 || !allowedDeptIds.contains(deptId);
+		}
+		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
+		return currentDeptId != null && !Objects.equals(deptId, currentDeptId);
+	}
+
 	/**
 	 * 校验目标业务数据属于当前用户可操作的组织。
 	 */
@@ -191,7 +272,7 @@ public final class TransportBusinessSupport {
 		if (hasAllDeptScope()) {
 			return;
 		}
-		RoleDataScopeVO scope = RoleDataScopeCache.resolveWidest();
+		RoleDataScopeVO scope = resolveWidestDataScope();
 		if (scope != null && scope.isOwnCreate()) {
 			return;
 		}
@@ -218,6 +299,99 @@ public final class TransportBusinessSupport {
 		}
 	}
 
+	/**
+	 * 列表可见范围 OR：所属项目的业务部门落在指定组织内。
+	 * <p>
+	 * 与项目立项「本部门可见 business_dept_id」对齐，使合同/运单等业务数据
+	 * 在负责部门（organizationId/deptId）不是当前组织时，业务部门用户仍可看到。
+	 */
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	public static void orProjectVisibleByBusinessDept(AbstractWrapper<?, ?, ?> wrapper, Collection<Long> deptIds) {
+		if (wrapper == null || Func.isEmpty(deptIds)) {
+			return;
+		}
+		List<Long> ids = deptIds.stream().filter(Objects::nonNull).filter(id -> id > 0).distinct().toList();
+		if (ids.isEmpty()) {
+			return;
+		}
+		if (ids.size() == 1) {
+			wrapper.or().apply(
+				"project_id IN (SELECT id FROM blade_project_apply WHERE is_deleted = 0 AND business_dept_id = {0})",
+				ids.get(0));
+			return;
+		}
+		String inList = ids.stream().map(String::valueOf).collect(Collectors.joining(","));
+		wrapper.or().apply(
+			"project_id IN (SELECT id FROM blade_project_apply WHERE is_deleted = 0 AND business_dept_id IN ("
+				+ inList + "))");
+	}
+
+	/**
+	 * 判断项目是否归属指定业务部门（用于详情只读/可操作判定）。
+	 */
+	public static boolean isProjectOwnedByBusinessDept(Long projectId, Long deptId) {
+		if (Func.isEmpty(projectId) || Func.isEmpty(deptId) || deptId <= 0) {
+			return false;
+		}
+		ProjectApplyMapper projectApplyMapper = SpringUtil.getBean(ProjectApplyMapper.class);
+		if (projectApplyMapper == null) {
+			return false;
+		}
+		Long count = projectApplyMapper.selectCount(Wrappers.<ProjectApply>lambdaQuery()
+			.eq(ProjectApply::getId, projectId)
+			.eq(ProjectApply::getBusinessDeptId, deptId)
+			.eq(ProjectApply::getIsDeleted, 0));
+		return count != null && count > 0;
+	}
+
+	/**
+	 * 列表实际使用的组织范围。
+	 * <p>
+	 * 角色菜单未单独收窄、解析结果为「全部组织」时，超管仍不限制；
+	 * 普通用户在未显式请求全部组织（allDept != 1）时收口到当前组织，
+	 * 避免账号看到其他组织的业务数据。本人创建权限不按组织收口。
+	 */
+	public static List<Long> resolveScopedDeptFilterIds(Integer allDept, Long deptId, String moduleName, String menuCode) {
+		List<Long> deptIdList = resolveDeptFilterIds(allDept, deptId, moduleName, menuCode);
+		if (Func.isNotEmpty(deptIdList) || isAdministrator() || isOwnCreateScope(menuCode) || Objects.equals(allDept, 1)) {
+			return deptIdList;
+		}
+		return Collections.singletonList(currentDeptId(moduleName));
+	}
+
+	/**
+	 * 账号项目可见范围：承办部门命中指定组织，或当前用户是项目创建人、经办人、负责人。
+	 */
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	public static void orProjectVisibleByAccount(AbstractWrapper<?, ?, ?> wrapper, Collection<Long> deptIds, Long userId) {
+		if (wrapper == null) {
+			return;
+		}
+		List<Long> ids = deptIds == null ? List.of() : deptIds.stream()
+			.filter(Objects::nonNull)
+			.filter(id -> id > 0)
+			.distinct()
+			.toList();
+		if (!ids.isEmpty()) {
+			if (ids.size() == 1) {
+				wrapper.or().apply(
+					"project_id IN (SELECT id FROM blade_project_apply WHERE is_deleted = 0 AND FIND_IN_SET({0}, IFNULL(undertake_dept_id,'')))",
+					String.valueOf(ids.get(0)));
+			} else {
+				String undertakeSql = ids.stream()
+					.map(id -> "FIND_IN_SET(" + id + ", IFNULL(undertake_dept_id,''))")
+					.collect(Collectors.joining(" OR "));
+				wrapper.or().apply(
+					"project_id IN (SELECT id FROM blade_project_apply WHERE is_deleted = 0 AND (" + undertakeSql + "))");
+			}
+		}
+		if (Func.isNotEmpty(userId) && userId > 0) {
+			wrapper.or().apply(
+				"project_id IN (SELECT id FROM blade_project_apply WHERE is_deleted = 0 AND (create_user = {0} OR handler_user_id = {0} OR principal_user_id = {0}))",
+				userId);
+		}
+	}
+
 	/**
 	 * 解析列表组织筛选 ID。
 	 *
@@ -280,7 +454,7 @@ public final class TransportBusinessSupport {
 			}
 			return Collections.emptyList();
 		}
-		RoleDataScopeVO scope = RoleDataScopeCache.resolveWidest();
+		RoleDataScopeVO scope = resolveWidestDataScope();
 		if (scope != null && scope.isOwnCreate()) {
 			if (Objects.equals(allDept, 1) && Func.isNotEmpty(deptId) && deptId > 0) {
 				return Collections.singletonList(deptId);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java
index 946f1f54..8c4f6c16 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsContractSyncSupport.java
@@ -32,6 +32,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.hcs.config.HcsProperties;
 import org.springblade.hcs.constant.HcsConstant;
@@ -61,6 +62,7 @@ import org.springblade.transport.pojo.entity.ContractManage;
 import org.springblade.transport.pojo.entity.CustomerArchive;
 import org.springblade.transport.pojo.entity.HcsContractCheckLog;
 import org.springblade.transport.pojo.entity.ProjectApply;
+import org.springblade.transport.support.ContractPartySupport;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -577,44 +579,74 @@ public class HcsContractSyncSupport {
 	}
 
 	/**
-	 * signer 相对方（签署方）：甲/乙双方。fdType 档案优先：客商档案为内部组织（customerKind=internal/内部组织）
+	 * signer 相对方（签署方）：甲/乙/丙多方客商。fdType 档案优先：客商档案为内部组织（customerKind=internal/内部组织）
 	 * 的一方为我方签约主体传 inner，另一方传 customer（外部相对方，2026-10-14 联调口径）；
 	 * 双方均非内部组织或查不到档案时按合同类别推定（承运商合同甲=inner，客户合同乙=inner，其余 customer）；
-	 * 丙方（三方合同）TMS 无签约主体字段来源，暂不支持
+	 * 多方时按明细展开，同地位多客商分别签署
 	 */
 	private List<HcsSignerDTO> buildSigners(ContractManage contractManage) {
 		List<HcsSignerDTO> signers = new ArrayList<>();
-		// 甲乙方各反查一次客商档案，编号与内部组织判定共用查询结果
-		CustomerArchive partyAArchive = queryCustomerArchive(contractManage.getPartyA());
-		CustomerArchive partyBArchive = queryCustomerArchive(contractManage.getPartyB());
+		List<String> partyANames = partyNames(contractManage.getPartyAJson(), contractManage.getPartyA());
+		List<String> partyBNames = partyNames(contractManage.getPartyBJson(), contractManage.getPartyB());
+		List<String> partyCNames = partyNames(contractManage.getPartyCJson(), contractManage.getPartyC());
+		String firstPartyA = partyANames.isEmpty() ? null : partyANames.get(0);
+		String firstPartyB = partyBNames.isEmpty() ? null : partyBNames.get(0);
+		CustomerArchive partyAArchive = queryCustomerArchive(firstPartyA);
+		CustomerArchive partyBArchive = queryCustomerArchive(firstPartyB);
 		boolean partyAInternal = HcsCreditCheckSupport.isInternalCustomer(partyAArchive);
 		boolean partyBInternal = HcsCreditCheckSupport.isInternalCustomer(partyBArchive);
 		String partyAType;
 		String partyBType;
+		String partyCType;
 		if (partyAInternal || partyBInternal) {
-			// 档案命中：内部组织一方=我方签约主体（inner），外部一方统一 customer
 			partyAType = partyAInternal ? HcsConstant.SIGNER_FD_TYPE_INNER : HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
 			partyBType = partyBInternal ? HcsConstant.SIGNER_FD_TYPE_INNER : HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
+			partyCType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
 		} else if ("承运商合同".equals(contractManage.getContractCategory())) {
-			// 兜底：档案未命中内部组织，按类别推定——我方为付款/发包方，签约主体在甲方
 			partyAType = HcsConstant.SIGNER_FD_TYPE_INNER;
 			partyBType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
+			partyCType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
 		} else if ("客户合同".equals(contractManage.getContractCategory())) {
-			// 兜底：我方为收款/承运方，签约主体在乙方
 			partyAType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
 			partyBType = HcsConstant.SIGNER_FD_TYPE_INNER;
+			partyCType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
 		} else {
-			// 兜底：其他类别双方统一 customer（2026-10-14 联调口径）
 			partyAType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
 			partyBType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
+			partyCType = HcsConstant.SIGNER_FD_TYPE_CUSTOMER;
+		}
+		for (String partyName : partyANames) {
+			CustomerArchive archive = Objects.equals(partyName, firstPartyA) ? partyAArchive : queryCustomerArchive(partyName);
+			signers.add(signer("甲", partyAType, partyName, archive));
+		}
+		for (String partyName : partyBNames) {
+			CustomerArchive archive = Objects.equals(partyName, firstPartyB) ? partyBArchive : queryCustomerArchive(partyName);
+			signers.add(signer("乙", partyBType, partyName, archive));
+		}
+		for (String partyName : partyCNames) {
+			signers.add(signer("丙", partyCType, partyName, queryCustomerArchive(partyName)));
 		}
-		// 甲方相对方：fdStanding=甲（编号按名称反查，反查不到留空，§9-U6）
-		signers.add(signer("甲", partyAType, contractManage.getPartyA(), partyAArchive));
-		// 乙方相对方：fdStanding=乙
-		signers.add(signer("乙", partyBType, contractManage.getPartyB(), partyBArchive));
 		return signers;
 	}
 
+	private List<String> partyNames(String partyJson, String fallback) {
+		List<String> names = new ArrayList<>();
+		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("[、,]")) {
+				if (Func.isNotEmpty(part) && Func.isNotEmpty(part.trim())) {
+					names.add(part.trim());
+				}
+			}
+		}
+		return names;
+	}
+
 	/**
 	 * 单个相对方：fdType 由签约主体落位规则决定（我方主体 inner，外部相对方 customer）
 	 */
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java
index eee77238..adb50ff2 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsImmediatePushSupport.java
@@ -171,6 +171,13 @@ public class HcsImmediatePushSupport {
 		return hcsProperties.getPush().isImmediateEnabled();
 	}
 
+	/**
+	 * 付款特批走合同合规开关（thirdParty.hcs.spec-pay.enabled），关闭时审批响应不再提示特批待发起/已发起
+	 */
+	public boolean isSpecPayEnabled() {
+		return hcsProperties.getSpecPay().isEnabled();
+	}
+
 	/**
 	 * 项目立项"通过"按钮路径：在审批事务提交返回后由 Controller 同步调用，失败原因留在当前线程供其取走
 	 *
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPaymentSyncSupport.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPaymentSyncSupport.java
index 3fe88486..c6af98fb 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPaymentSyncSupport.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/support/hcs/HcsPaymentSyncSupport.java
@@ -86,8 +86,9 @@ public class HcsPaymentSyncSupport {
 	public String pushPayment(PaymentApplication payment) {
 		StringBuilder result = new StringBuilder();
 		// ① 结算付款特批：提交时高风险/黑名单（须特批附件）或额度超额（hcs_spec_status=need）且未发起时发起 C106-3；
-		//    发起后挂起等待特批结果，特批通过后不推履约数据（各业务环节推送），仅补推金蝶（驳回不产生履约数据）
-		if (HcsSyncConstant.SPEC_STATUS_NEED.equals(payment.getHcsSpecStatus())) {
+		//    发起后挂起等待特批结果，特批通过后不推履约数据（各业务环节推送），仅补推金蝶（驳回不产生履约数据）；
+		//    spec-pay.enabled=false（特批不走合同系统）时跳过发起，need 仅作附件要求留痕
+		if (HcsSyncConstant.SPEC_STATUS_NEED.equals(payment.getHcsSpecStatus()) && hcsProperties.getSpecPay().isEnabled()) {
 			String specResult = hcsSpecPaySyncSupport.pushSpecPay(payment);
 			// C106-4 更新路径不改状态，统一归一为特批审核中，避免下轮扫描重复发起
 			if (HcsSyncConstant.SPEC_STATUS_NEED.equals(payment.getHcsSpecStatus())) {
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/task/KingdeeWriteOffResultTask.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/task/KingdeeWriteOffResultTask.java
new file mode 100644
index 00000000..dd4a0e22
--- /dev/null
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/task/KingdeeWriteOffResultTask.java
@@ -0,0 +1,63 @@
+/**
+ * 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.task;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.transport.config.BfiProperties;
+import org.springblade.transport.service.IFormalSettlementService;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 金蝶冲销状态定时回写任务
+ * <p>
+ * A102-4/A302-4 批量查询已同步结算单对应金蝶旧应付/应收单的 hadwrittenoff（部分冲销视同已冲销），
+ * 回写结算单冲销状态，用于结算单列表展示金蝶旧单是否已冲销。
+ * 业务逻辑收敛在服务方法（分布式锁 + 分批查询 + 批量落库），便于手动触发联调。
+ * <p>
+ * 调度配置（Nacos thirdParty.bfi.writeOffResult.*）：syncEnabled 开关、cron 表达式、queryBatchSize 分批大小。
+ *
+ * @author Chill
+ */
+@Slf4j
+@Component
+@RefreshScope
+@RequiredArgsConstructor
+public class KingdeeWriteOffResultTask {
+
+	private final IFormalSettlementService formalSettlementService;
+	private final BfiProperties bfiProperties;
+
+	/** 金蝶冲销状态回写调度，默认每10分钟执行一次（分钟位与付款结果回写错峰） */
+	@Scheduled(cron = "${thirdParty.bfi.writeOffResult.cron:0 4/10 * * * ?}")
+	public void syncKingdeeWriteOffResult() {
+		if (!bfiProperties.getWriteOffResult().isSyncEnabled()) {
+			return;
+		}
+		try {
+			String summary = formalSettlementService.syncKingdeeWriteOffResult();
+			log.info("定时回写金蝶冲销状态：{}", summary);
+		} catch (Exception exception) {
+			log.error("定时回写金蝶冲销状态异常", exception);
+		}
+	}
+}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonCargoWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonCargoWrapper.java
index c0841d37..d026d57b 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonCargoWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonCargoWrapper.java
@@ -23,12 +23,11 @@
 package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
 import org.springblade.transport.pojo.entity.CommonCargo;
 import org.springblade.transport.pojo.vo.CommonCargoVO;
+import org.springblade.transport.support.TransportBusinessSupport;
 
 import java.math.BigDecimal;
 import java.util.Objects;
@@ -52,8 +51,7 @@ public class CommonCargoWrapper extends BaseEntityWrapper<CommonCargo, CommonCar
 		}
 		commonCargoVO.setCreateUserName(UserCache.getUserRealName(commonCargo.getCreateUser()));
 		commonCargoVO.setUpdateUserName(UserCache.getUserRealName(commonCargo.getUpdateUser()));
-		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
-		commonCargoVO.setReadonly(currentDeptId != null && !Objects.equals(commonCargo.getDeptId(), currentDeptId));
+		commonCargoVO.setReadonly(TransportBusinessSupport.isDeptReadonly(commonCargo.getDeptId(), TransportBusinessSupport.MENU_COMMON_CARGO));
 		return commonCargoVO;
 	}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonRouteWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonRouteWrapper.java
index c52d0f6c..ec5cadee 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonRouteWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/CommonRouteWrapper.java
@@ -23,12 +23,11 @@
 package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
 import org.springblade.transport.pojo.entity.CommonRoute;
 import org.springblade.transport.pojo.vo.CommonRouteVO;
+import org.springblade.transport.support.TransportBusinessSupport;
 
 import java.util.Objects;
 
@@ -48,8 +47,7 @@ public class CommonRouteWrapper extends BaseEntityWrapper<CommonRoute, CommonRou
 		CommonRouteVO commonRouteVO = Objects.requireNonNull(BeanUtil.copyProperties(commonRoute, CommonRouteVO.class));
 		commonRouteVO.setCreateUserName(UserCache.getUserRealName(commonRoute.getCreateUser()));
 		commonRouteVO.setUpdateUserName(UserCache.getUserRealName(commonRoute.getUpdateUser()));
-		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
-		commonRouteVO.setReadonly(currentDeptId != null && !Objects.equals(commonRoute.getDeptId(), currentDeptId));
+		commonRouteVO.setReadonly(TransportBusinessSupport.isDeptReadonly(commonRoute.getDeptId(), TransportBusinessSupport.MENU_COMMON_ROUTE));
 		return commonRouteVO;
 	}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/LoadingManageWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/LoadingManageWrapper.java
index b9456046..e6856ef9 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/LoadingManageWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/LoadingManageWrapper.java
@@ -5,12 +5,11 @@
 package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
 import org.springblade.transport.pojo.entity.LoadingManage;
 import org.springblade.transport.pojo.vo.LoadingManageVO;
+import org.springblade.transport.support.TransportBusinessSupport;
 
 import java.math.BigDecimal;
 import java.util.Objects;
@@ -31,8 +30,7 @@ public class LoadingManageWrapper extends BaseEntityWrapper<LoadingManage, Loadi
 		LoadingManageVO loadingManageVO = Objects.requireNonNull(BeanUtil.copyProperties(loadingManage, LoadingManageVO.class));
 		loadingManageVO.setCreateUserName(UserCache.getUserRealName(loadingManage.getCreateUser()));
 		loadingManageVO.setUpdateUserName(UserCache.getUserRealName(loadingManage.getUpdateUser()));
-		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
-		loadingManageVO.setReadonly(currentDeptId != null && !Objects.equals(loadingManage.getDeptId(), currentDeptId));
+		loadingManageVO.setReadonly(TransportBusinessSupport.isDeptReadonly(loadingManage.getDeptId(), TransportBusinessSupport.MENU_LOADING_MANAGE));
 		loadingManageVO.setBusinessStatusName(businessStatusName(loadingManage.getBusinessStatus()));
 		// 未维护里程的占位值 -1 对外展示为空
 		if (loadingManageVO.getMileage() != null
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ProcessConfigWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ProcessConfigWrapper.java
index 43e3c24e..4bd61773 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ProcessConfigWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ProcessConfigWrapper.java
@@ -23,12 +23,11 @@
 package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
 import org.springblade.transport.pojo.entity.ProcessConfig;
 import org.springblade.transport.pojo.vo.ProcessConfigVO;
+import org.springblade.transport.support.TransportBusinessSupport;
 
 import java.util.Objects;
 
@@ -48,8 +47,7 @@ public class ProcessConfigWrapper extends BaseEntityWrapper<ProcessConfig, Proce
 		ProcessConfigVO processConfigVO = Objects.requireNonNull(BeanUtil.copyProperties(processConfig, ProcessConfigVO.class));
 		processConfigVO.setCreateUserName(UserCache.getUserRealName(processConfig.getCreateUser()));
 		processConfigVO.setUpdateUserName(UserCache.getUserRealName(processConfig.getUpdateUser()));
-		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
-		processConfigVO.setReadonly(currentDeptId != null && !Objects.equals(processConfig.getDeptId(), currentDeptId));
+		processConfigVO.setReadonly(TransportBusinessSupport.isDeptReadonly(processConfig.getDeptId(), TransportBusinessSupport.MENU_PROCESS_CONFIG));
 		processConfigVO.setStatusName(statusName(processConfig.getStatus()));
 		return processConfigVO;
 	}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ShippingTemplateWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ShippingTemplateWrapper.java
index 0301b7d4..a25de296 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ShippingTemplateWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/ShippingTemplateWrapper.java
@@ -23,12 +23,11 @@
 package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
 import org.springblade.transport.pojo.entity.ShippingTemplate;
 import org.springblade.transport.pojo.vo.ShippingTemplateVO;
+import org.springblade.transport.support.TransportBusinessSupport;
 
 import java.util.Objects;
 
@@ -48,8 +47,7 @@ public class ShippingTemplateWrapper extends BaseEntityWrapper<ShippingTemplate,
 		ShippingTemplateVO shippingTemplateVO = Objects.requireNonNull(BeanUtil.copyProperties(shippingTemplate, ShippingTemplateVO.class));
 		shippingTemplateVO.setCreateUserName(UserCache.getUserRealName(shippingTemplate.getCreateUser()));
 		shippingTemplateVO.setUpdateUserName(UserCache.getUserRealName(shippingTemplate.getUpdateUser()));
-		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
-		shippingTemplateVO.setReadonly(currentDeptId != null && !Objects.equals(shippingTemplate.getDeptId(), currentDeptId));
+		shippingTemplateVO.setReadonly(TransportBusinessSupport.isDeptReadonly(shippingTemplate.getDeptId(), TransportBusinessSupport.MENU_SHIPPING_TEMPLATE));
 		return shippingTemplateVO;
 	}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportCertRecordWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportCertRecordWrapper.java
index f6a8d7e2..fdd8994d 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportCertRecordWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportCertRecordWrapper.java
@@ -27,6 +27,7 @@ package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.cache.UserDisplayCache;
 import org.springblade.transport.pojo.entity.TransportCertRecord;
@@ -70,6 +71,8 @@ public class TransportCertRecordWrapper extends BaseEntityWrapper<TransportCertR
 		transportCertRecordVO.setAuditUserName(UserCache.getUserRealName(transportCertRecordVO.getAuditUser()));
 		// 状态文案统一在此翻译，避免小程序、Web、接口各处各造一套说法
 		transportCertRecordVO.setStatusText(CertificationRuleSupport.statusText(transportCertRecordVO.getStatus()));
+		// 是否经过审核员修订：修订版非空才算，空串与空白都不算（前端清空输入框会传空串）
+		transportCertRecordVO.setRevised(Func.isNotBlank(transportCertRecordVO.getAuditedSnapshotJson()));
 		return transportCertRecordVO;
 	}
 
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportPlanWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportPlanWrapper.java
index 4dbbad9c..dcc7e8a2 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportPlanWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/TransportPlanWrapper.java
@@ -23,9 +23,7 @@
 package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.UserCache;
 import org.springblade.transport.pojo.entity.TransportPlan;
 import org.springblade.transport.pojo.vo.TransportPlanVO;
@@ -50,8 +48,7 @@ public class TransportPlanWrapper extends BaseEntityWrapper<TransportPlan, Trans
 		transportPlanVO.setCreateUserName(UserCache.getUserRealName(transportPlan.getCreateUser()));
 		transportPlanVO.setUpdateUserName(UserCache.getUserRealName(transportPlan.getUpdateUser()));
 		transportPlanVO.setDataSource(TransportBusinessSupport.normalizeTransportPlanDataSource(transportPlan.getDataSource()));
-		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
-		transportPlanVO.setReadonly(currentDeptId != null && !Objects.equals(transportPlan.getDeptId(), currentDeptId));
+		transportPlanVO.setReadonly(TransportBusinessSupport.isDeptReadonly(transportPlan.getDeptId(), TransportBusinessSupport.MENU_TRANSPORT_PLAN));
 		transportPlanVO.setBusinessStatusName(businessStatusName(transportPlan.getBusinessStatus()));
 		return transportPlanVO;
 	}
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/WaybillWrapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/WaybillWrapper.java
index d0257f86..b9cb1b77 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/WaybillWrapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/wrapper/WaybillWrapper.java
@@ -23,7 +23,6 @@
 package org.springblade.transport.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.cache.DictBizCache;
@@ -54,8 +53,7 @@ public class WaybillWrapper extends BaseEntityWrapper<Waybill, WaybillVO> {
 		waybillVO.setCreateUserName(UserCache.getUserRealName(waybill.getCreateUser()));
 		waybillVO.setUpdateUserName(UserCache.getUserRealName(waybill.getUpdateUser()));
 		waybillVO.setDataSource(TransportBusinessSupport.normalizeWaybillDataSource(waybill.getDataSource()));
-		Long currentDeptId = Func.firstLong(AuthUtil.getDeptId());
-		waybillVO.setReadonly(currentDeptId != null && !Objects.equals(waybill.getDeptId(), currentDeptId));
+		waybillVO.setReadonly(TransportBusinessSupport.isDeptReadonly(waybill.getDeptId(), TransportBusinessSupport.MENU_WAYBILL_MANAGE));
 		String displayStatus = WaybillProcessSupport.normalizeBusinessStatus(
 			waybill.getBusinessStatus(), waybill.getProcessJson(), waybill.getDriverAcceptStatus());
 		waybillVO.setBusinessStatus(displayStatus);
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/controller/CertificationAuditEndpointTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/controller/CertificationAuditEndpointTest.java
new file mode 100644
index 00000000..b4127ea1
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/controller/CertificationAuditEndpointTest.java
@@ -0,0 +1,143 @@
+/**
+ * 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.controller;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springblade.transport.service.ICertAuditService;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * 认证审核接口的入参绑定测试。
+ * <p>
+ * 同一字段 body 与 query 都可传，两处都给时以 body 为准。
+ */
+class CertificationAuditEndpointTest {
+
+	private static final Long RECORD_ID = 5001L;
+	private static final String REVISION = "{\"realName\":\"李四\",\"idCardNo\":\"450100199001019999\"}";
+
+	private ICertAuditService certAuditService;
+	private MockMvc mockMvc;
+
+	@BeforeEach
+	void setUp() {
+		certAuditService = mock(ICertAuditService.class);
+		when(certAuditService.audit(any(), anyBoolean(), any(), any())).thenReturn(true);
+		mockMvc = MockMvcBuilders.standaloneSetup(new CertificationAuditController(certAuditService)).build();
+	}
+
+	@Test
+	@DisplayName("老调用：只带 query 的 id/pass/rejectReason，行为不变")
+	void legacyQueryOnlyStillWorks() throws Exception {
+		mockMvc.perform(post("/certification-audit/audit")
+				.param("id", String.valueOf(RECORD_ID))
+				.param("pass", "true"))
+			.andExpect(status().isOk())
+			.andExpect(jsonPath("$.code").value(200));
+
+		verify(certAuditService).audit(RECORD_ID, true, null, null);
+	}
+
+	@Test
+	@DisplayName("新调用：body 携带修订内容，透传到服务层")
+	void bodyCarriesRevision() throws Exception {
+		String body = """
+			{"id": 5001, "pass": true, "auditedSnapshotJson": "{\\"realName\\":\\"李四\\",\\"idCardNo\\":\\"450100199001019999\\"}"}
+			""";
+
+		mockMvc.perform(post("/certification-audit/audit")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(body))
+			.andExpect(status().isOk())
+			.andExpect(jsonPath("$.code").value(200));
+
+		verify(certAuditService).audit(RECORD_ID, true, null, REVISION);
+	}
+
+	@Test
+	@DisplayName("两种都带：以 body 为准（query 里的旧值不得覆盖修订）")
+	void bodyWinsOverQuery() throws Exception {
+		String body = """
+			{"id": 5001, "pass": true}
+			""";
+
+		mockMvc.perform(post("/certification-audit/audit")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(body)
+				.param("id", "6001")
+				.param("pass", "false"))
+			.andExpect(status().isOk())
+			.andExpect(jsonPath("$.code").value(200));
+
+		verify(certAuditService).audit(RECORD_ID, true, null, null);
+	}
+
+	@Test
+	@DisplayName("body 只给一半时，缺的字段回退到 query")
+	void partialBodyFallsBackToQuery() throws Exception {
+		String body = """
+			{"id": 5001, "pass": false}
+			""";
+
+		mockMvc.perform(post("/certification-audit/audit")
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(body)
+				.param("rejectReason", "行驶证模糊"))
+			.andExpect(status().isOk())
+			.andExpect(jsonPath("$.code").value(200));
+
+		verify(certAuditService).audit(RECORD_ID, false, "行驶证模糊", null);
+	}
+
+	@Test
+	@DisplayName("缺少 id 或 pass：按业务失败返回（code=400），不能把 null 传进服务层")
+	void missingIdOrPassIsRejected() throws Exception {
+		mockMvc.perform(post("/certification-audit/audit").param("pass", "true"))
+			.andExpect(status().isOk())
+			.andExpect(jsonPath("$.code").value(400));
+
+		mockMvc.perform(post("/certification-audit/audit").param("id", String.valueOf(RECORD_ID)))
+			.andExpect(status().isOk())
+			.andExpect(jsonPath("$.code").value(400));
+
+		verify(certAuditService, never()).audit(anyLong(), anyBoolean(), any(), any());
+	}
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/CertAuditServiceImplTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/CertAuditServiceImplTest.java
index fa461766..942e7f97 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/CertAuditServiceImplTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/CertAuditServiceImplTest.java
@@ -96,7 +96,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<TransportCertRecord> recordCaptor = ArgumentCaptor.forClass(TransportCertRecord.class);
 		verify(certRecordService).updateById(recordCaptor.capture());
@@ -118,7 +118,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<TransportVehicle> captor = ArgumentCaptor.forClass(TransportVehicle.class);
 		verify(transportVehicleService).updateById(captor.capture());
@@ -141,7 +141,7 @@ class CertAuditServiceImplTest {
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
 
 		ServiceException exception = assertThrows(ServiceException.class,
-			() -> service.audit(RECORD_ID, true, null));
+			() -> service.audit(RECORD_ID, true, null, null));
 		assertTrue(exception.getMessage().contains("字段定义不匹配"), exception.getMessage());
 		verify(transportVehicleService, never()).updateById(any(TransportVehicle.class));
 	}
@@ -154,7 +154,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(oldEffectiveId));
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<TransportVehicle> captor = ArgumentCaptor.forClass(TransportVehicle.class);
 		verify(transportVehicleService).updateById(captor.capture());
@@ -169,7 +169,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<TransportVehicle> captor = ArgumentCaptor.forClass(TransportVehicle.class);
 		verify(transportVehicleService).updateById(captor.capture());
@@ -183,7 +183,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(driverService.getById(DRIVER_ID)).thenReturn(driver(null));
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<Driver> captor = ArgumentCaptor.forClass(Driver.class);
 		verify(driverService).updateById(captor.capture());
@@ -199,7 +199,7 @@ class CertAuditServiceImplTest {
 		existing.setDrivingVehicle("桂A12345,桂B67890");
 		when(driverService.getById(DRIVER_ID)).thenReturn(existing);
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<Driver> captor = ArgumentCaptor.forClass(Driver.class);
 		verify(driverService).updateById(captor.capture());
@@ -216,7 +216,7 @@ class CertAuditServiceImplTest {
 		when(transportVehicleService.updateById(any(TransportVehicle.class))).thenReturn(false);
 
 		ServiceException exception = assertThrows(ServiceException.class,
-			() -> service.audit(RECORD_ID, true, null));
+			() -> service.audit(RECORD_ID, true, null, null));
 		assertTrue(exception.getMessage().contains("未生效"), exception.getMessage());
 	}
 
@@ -228,7 +228,7 @@ class CertAuditServiceImplTest {
 		when(driverService.updateById(any(Driver.class))).thenReturn(false);
 
 		ServiceException exception = assertThrows(ServiceException.class,
-			() -> service.audit(RECORD_ID, true, null));
+			() -> service.audit(RECORD_ID, true, null, null));
 		assertTrue(exception.getMessage().contains("司机"), exception.getMessage());
 	}
 
@@ -242,7 +242,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(existingEffectiveId));
 
-		service.audit(RECORD_ID, false, "证件照片模糊");
+		service.audit(RECORD_ID, false, "证件照片模糊", null);
 
 		ArgumentCaptor<TransportCertRecord> recordCaptor = ArgumentCaptor.forClass(TransportCertRecord.class);
 		verify(certRecordService).updateById(recordCaptor.capture());
@@ -264,7 +264,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(existingEffectiveId));
 
-		service.audit(RECORD_ID, false, "运输证过期");
+		service.audit(RECORD_ID, false, "运输证过期", null);
 
 		// 指针字段没有被写成 null，也没有被写成新记录
 		ArgumentCaptor<TransportVehicle> captor = ArgumentCaptor.forClass(TransportVehicle.class);
@@ -277,8 +277,8 @@ class CertAuditServiceImplTest {
 	void rejectRequiresReason() {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
 
-		assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, false, null));
-		assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, false, "   "));
+		assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, false, null, null));
+		assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, false, "   ", null));
 		verify(certRecordService, never()).updateById(any(TransportCertRecord.class));
 	}
 
@@ -288,7 +288,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
 
 		assertThrows(ServiceException.class,
-			() -> service.audit(RECORD_ID, false, "长".repeat(201)));
+			() -> service.audit(RECORD_ID, false, "长".repeat(201), null));
 	}
 
 	// ------------------------------------------------------------ 终态保护
@@ -303,9 +303,9 @@ class CertAuditServiceImplTest {
 			TransportCertRecord record = vehicleRecord(terminal);
 			when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 
-			assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, true, null),
+			assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, true, null, null),
 				"状态 " + terminal + " 属终态，不应可再审");
-			assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, false, "驳回"),
+			assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, false, "驳回", null),
 				"状态 " + terminal + " 属终态，不应可再审");
 		}
 		verify(certRecordService, never()).updateById(any(TransportCertRecord.class));
@@ -315,13 +315,13 @@ class CertAuditServiceImplTest {
 	@DisplayName("记录不存在：拒绝")
 	void recordNotFound() {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(null);
-		assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, true, null));
+		assertThrows(ServiceException.class, () -> service.audit(RECORD_ID, true, null, null));
 	}
 
 	@Test
 	@DisplayName("记录主键为空：拒绝")
 	void recordIdRequired() {
-		assertThrows(ServiceException.class, () -> service.audit(null, true, null));
+		assertThrows(ServiceException.class, () -> service.audit(null, true, null, null));
 	}
 
 	// ------------------------------------------------------------ 审核详情（diff 用）
@@ -470,7 +470,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<Wrapper<TransportVehicle>> captor = ArgumentCaptor.forClass(Wrapper.class);
 		verify(transportVehicleService).update(captor.capture());
@@ -494,7 +494,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(driverService.getById(DRIVER_ID)).thenReturn(driver(null));
 
-		service.audit(RECORD_ID, true, null);
+		service.audit(RECORD_ID, true, null, null);
 
 		ArgumentCaptor<Wrapper<Driver>> captor = ArgumentCaptor.forClass(Wrapper.class);
 		verify(driverService).update(captor.capture());
@@ -518,7 +518,7 @@ class CertAuditServiceImplTest {
 		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
 		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(777L));
 
-		service.audit(RECORD_ID, false, "  行驶证模糊  ");
+		service.audit(RECORD_ID, false, "  行驶证模糊  ", null);
 
 		ArgumentCaptor<TransportVehicle> captor = ArgumentCaptor.forClass(TransportVehicle.class);
 		verify(transportVehicleService).updateById(captor.capture());
@@ -527,6 +527,236 @@ class CertAuditServiceImplTest {
 		verify(transportVehicleService, never()).update(any());
 	}
 
+	// ------------------------------------------------------------ 修订版
+
+	@Test
+	@DisplayName("修订版：通过时写入新列，且 snapshot_json 一个字都不改")
+	void approveStoresAuditedSnapshot() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+		String revision = vehicleRevision();
+
+		service.audit(RECORD_ID, true, null, revision);
+
+		ArgumentCaptor<TransportCertRecord> captor = ArgumentCaptor.forClass(TransportCertRecord.class);
+		verify(certRecordService).updateById(captor.capture());
+		assertEquals(revision, captor.getValue().getAuditedSnapshotJson(),
+			"修订版必须原样留痕，供事后追责");
+		assertNull(captor.getValue().getSnapshotJson(),
+			"snapshot_json 是司机当时提交的内容，审核 patch 里不得出现");
+	}
+
+	@Test
+	@DisplayName("修订版：写回车辆档案的是修订内容，不是司机原提交")
+	void approveAppliesRevisionToVehicleProfile() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+		String revision = vehicleRevision();
+
+		service.audit(RECORD_ID, true, null, revision);
+
+		ArgumentCaptor<TransportVehicle> captor = ArgumentCaptor.forClass(TransportVehicle.class);
+		verify(transportVehicleService).updateById(captor.capture());
+		assertEquals("修订后的所有人", captor.getValue().getOwnerName(), "档案要落修订后的内容");
+		assertEquals(25000, captor.getValue().getApprovedLoadKg());
+		assertEquals("450100999999", captor.getValue().getDrivingLicenseNo());
+	}
+
+	@Test
+	@DisplayName("修订版：司机档案同样以修订内容写回")
+	void approveAppliesRevisionToDriverProfile() {
+		TransportCertRecord record = driverRecord(TransportCertRecord.STATUS_PENDING);
+		record.setSnapshotJson("{}");
+		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
+		when(driverService.getById(DRIVER_ID)).thenReturn(driver(null));
+		String revision = "{\"realName\":\"李四\",\"idCardNo\":\"450100199001019999\","
+			+ "\"driverFileNo\":\"450100888899\"}";
+
+		service.audit(RECORD_ID, true, null, revision);
+
+		ArgumentCaptor<Driver> captor = ArgumentCaptor.forClass(Driver.class);
+		verify(driverService).updateById(captor.capture());
+		assertEquals("李四", captor.getValue().getDriverName());
+		assertEquals("450100199001019999", captor.getValue().getIdCardNo());
+		assertEquals("450100888899", captor.getValue().getDrivingLicenseNo());
+	}
+
+	@Test
+	@DisplayName("修订版：未提供时不写新列，生效内容仍是司机原提交")
+	void approveWithoutRevisionLeavesColumnNull() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+
+		service.audit(RECORD_ID, true, null, null);
+
+		ArgumentCaptor<TransportCertRecord> recordCaptor = ArgumentCaptor.forClass(TransportCertRecord.class);
+		verify(certRecordService).updateById(recordCaptor.capture());
+		assertNull(recordCaptor.getValue().getAuditedSnapshotJson(),
+			"未修订时该列保持 NULL，不能塞一份复制品进来");
+		ArgumentCaptor<TransportVehicle> vehicleCaptor = ArgumentCaptor.forClass(TransportVehicle.class);
+		verify(transportVehicleService).updateById(vehicleCaptor.capture());
+		assertEquals("广西现代物流集团有限公司", vehicleCaptor.getValue().getOwnerName());
+	}
+
+	@Test
+	@DisplayName("修订版：纯空白等于未修订（前端清空输入框就是这种情况）")
+	void blankRevisionIsTreatedAsAbsent() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+
+		service.audit(RECORD_ID, true, null, "   ");
+
+		ArgumentCaptor<TransportCertRecord> captor = ArgumentCaptor.forClass(TransportCertRecord.class);
+		verify(certRecordService).updateById(captor.capture());
+		assertNull(captor.getValue().getAuditedSnapshotJson());
+	}
+
+	@Test
+	@DisplayName("修订版：JSON 无法解析时拒绝，且记录与档案都不写（事务回滚）")
+	void approveRejectsMalformedRevision() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> service.audit(RECORD_ID, true, null, "{不是JSON"));
+		assertTrue(exception.getMessage().contains("修订内容格式不正确"), exception.getMessage());
+		verify(certRecordService, never()).updateById(any(TransportCertRecord.class));
+		verify(transportVehicleService, never()).updateById(any(TransportVehicle.class));
+	}
+
+	@Test
+	@DisplayName("修订版：司机缺身份证号与驾驶证号时拒绝（写回等于什么也没写）")
+	void approveRejectsIncompleteDriverRevision() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(driverRecord(TransportCertRecord.STATUS_PENDING));
+		when(driverService.getById(DRIVER_ID)).thenReturn(driver(null));
+
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> service.audit(RECORD_ID, true, null, "{\"realName\":\"李四\"}"));
+		assertTrue(exception.getMessage().contains("身份证号"), exception.getMessage());
+		verify(driverService, never()).updateById(any(Driver.class));
+		verify(certRecordService, never()).updateById(any(TransportCertRecord.class));
+	}
+
+	@Test
+	@DisplayName("修订版：车辆缺行驶证号与核定载质量时拒绝")
+	void approveRejectsIncompleteVehicleRevision() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> service.audit(RECORD_ID, true, null, "{\"ownerName\":\"只改了个名字\"}"));
+		assertTrue(exception.getMessage().contains("核定载质量"), exception.getMessage());
+		verify(transportVehicleService, never()).updateById(any(TransportVehicle.class));
+	}
+
+	@Test
+	@DisplayName("驳回：修订内容完全忽略，新列保持 NULL")
+	void rejectIgnoresRevision() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+
+		service.audit(RECORD_ID, false, "行驶证模糊", vehicleRevision());
+
+		ArgumentCaptor<TransportCertRecord> captor = ArgumentCaptor.forClass(TransportCertRecord.class);
+		verify(certRecordService).updateById(captor.capture());
+		assertNull(captor.getValue().getAuditedSnapshotJson(),
+			"驳回不产生生效内容，留修订版只会让人误读");
+		assertEquals(TransportCertRecord.STATUS_REJECTED, captor.getValue().getStatus());
+	}
+
+	@Test
+	@DisplayName("空快照不再静默通过：司机记录没有内容、也没有修订时拒绝")
+	void approveRejectsEmptyDriverSnapshot() {
+		TransportCertRecord record = driverRecord(TransportCertRecord.STATUS_PENDING);
+		record.setSnapshotJson(null);
+		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
+		when(driverService.getById(DRIVER_ID)).thenReturn(driver(null));
+
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> service.audit(RECORD_ID, true, null, null));
+		assertTrue(exception.getMessage().contains("司机档案"), exception.getMessage());
+		verify(driverService, never()).updateById(any(Driver.class));
+	}
+
+	@Test
+	@DisplayName("审核详情：修订版内容随详情下发，生效一侧同样修订版优先")
+	void detailExposesAuditedSnapshot() {
+		TransportCertRecord record = vehicleRecord(TransportCertRecord.STATUS_PENDING);
+		record.setAuditedSnapshotJson("{\"vin\":\"REVISED\"}");
+		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
+
+		TransportCertRecord effective = new TransportCertRecord();
+		effective.setId(777L);
+		effective.setSnapshotJson("{\"vin\":\"OLD\"}");
+		effective.setAuditedSnapshotJson("{\"vin\":\"OLD-REVISED\"}");
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(777L));
+		when(certRecordService.getById(777L)).thenReturn(effective);
+
+		CertAuditDetailVO detail = service.detail(RECORD_ID);
+
+		assertEquals("{\"vin\":\"REVISED\"}", detail.getAuditedSnapshotJson());
+		assertEquals("{\"vin\":\"OLD-REVISED\"}", detail.getEffectiveSnapshotJson(),
+			"生效一侧也修订版优先，否则审核页拿旧值做对比");
+	}
+
+	@Test
+	@DisplayName("身份不可修订：司机修订改了身份证号时拒绝，记录不被改动")
+	void approveRejectsDriverIdentityChange() {
+		when(certRecordService.getById(RECORD_ID)).thenReturn(driverRecord(TransportCertRecord.STATUS_PENDING));
+		when(driverService.getById(DRIVER_ID)).thenReturn(driver(null));
+		String revision = "{\"realName\":\"李四\",\"idCardNo\":\"450100199001019999\","
+			+ "\"driverFileNo\":\"450100888888\"}";
+
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> service.audit(RECORD_ID, true, null, revision));
+
+		assertTrue(exception.getMessage().contains("身份证号"), exception.getMessage());
+		verify(driverService, never()).updateById(any(Driver.class));
+		verify(certRecordService, never()).updateById(any(TransportCertRecord.class));
+	}
+
+	@Test
+	@DisplayName("身份不可修订：车辆修订改了车牌号时拒绝（车牌不参与写回，也不能被悄悄换掉）")
+	void approveRejectsVehicleIdentityChange() {
+		String snapshot = "{\"plateNo\":\"桂A32523\",\"drivingLicenseNo\":\"450100123456\","
+			+ "\"approvedLoadKg\":18000,\"ownerName\":\"广西现代物流集团有限公司\"}";
+		when(certRecordService.getById(RECORD_ID))
+			.thenReturn(vehicleRecord(TransportCertRecord.STATUS_PENDING, snapshot));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(null));
+		String revision = "{\"plateNo\":\"桂A99999\",\"drivingLicenseNo\":\"450100999999\","
+			+ "\"approvedLoadKg\":25000}";
+
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> service.audit(RECORD_ID, true, null, revision));
+
+		assertTrue(exception.getMessage().contains("车牌号"), exception.getMessage());
+		verify(transportVehicleService, never()).updateById(any(TransportVehicle.class));
+		verify(certRecordService, never()).updateById(any(TransportCertRecord.class));
+	}
+
+	@Test
+	@DisplayName("身份不可修订：原提交该字段为空时允许补全，正常通过")
+	void approveAllowsCompletingEmptyIdentity() {
+		TransportCertRecord record = driverRecord(TransportCertRecord.STATUS_PENDING);
+		record.setSnapshotJson("{\"realName\":\"张三\"}");
+		when(certRecordService.getById(RECORD_ID)).thenReturn(record);
+		when(driverService.getById(DRIVER_ID)).thenReturn(driver(null));
+		String revision = "{\"realName\":\"张三\",\"idCardNo\":\"450100199001011234\","
+			+ "\"driverFileNo\":\"450100888888\"}";
+
+		service.audit(RECORD_ID, true, null, revision);
+
+		ArgumentCaptor<Driver> captor = ArgumentCaptor.forClass(Driver.class);
+		verify(driverService).updateById(captor.capture());
+		assertEquals("450100199001011234", captor.getValue().getIdCardNo(),
+			"原提交没有身份证号时修订版可以补上");
+	}
+
+	private static String vehicleRevision() {
+		return "{\"drivingLicenseNo\":\"450100999999\",\"approvedLoadKg\":25000,"
+			+ "\"ownerName\":\"修订后的所有人\"}";
+	}
+
 	// ------------------------------------------------------------ 辅助
 
 	private TransportCertRecord vehicleRecord(Integer status) {
@@ -556,6 +786,19 @@ class CertAuditServiceImplTest {
 			+ "\"vehicleType\":\"重型货车\",\"driveLicenseImage\":\"http://oss/xsz.jpg\"}";
 	}
 
+	/**
+	 * 一份字段齐全的司机认证快照
+	 * <p>
+	 * 司机侧的空快照不再「静默跳过」而是拒审，故通过类用例不能再拿 "{}" 走流程；
+	 * 身份证号与驾驶证号是「这份快照是否为当前格式」的判据，缺一不可。
+	 */
+	static String completeDriverSnapshot() {
+		return "{\"realName\":\"张三\",\"idCardNo\":\"450100199001011234\","
+			+ "\"driverFileNo\":\"450100888888\",\"driverClass\":\"A2\","
+			+ "\"headPhoto\":\"http://oss/head.jpg\",\"idCardFrontUrl\":\"http://oss/idcard-front.jpg\","
+			+ "\"idCardBackUrl\":\"http://oss/idcard-back.jpg\"}";
+	}
+
 	private TransportCertRecord driverRecord(Integer status) {
 		TransportCertRecord record = new TransportCertRecord();
 		record.setId(RECORD_ID);
@@ -563,7 +806,7 @@ class CertAuditServiceImplTest {
 		record.setBizId(DRIVER_ID);
 		record.setBizKey("张三");
 		record.setStatus(status);
-		record.setSnapshotJson("{}");
+		record.setSnapshotJson(completeDriverSnapshot());
 		return record;
 	}
 
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverAppServiceImplTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverAppServiceImplTest.java
index 9878ad99..746259c8 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverAppServiceImplTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverAppServiceImplTest.java
@@ -1,15 +1,16 @@
 package org.springblade.transport.service.impl;
 
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
-import org.springblade.system.feign.IMpUserClient;
-import org.springblade.system.pojo.entity.MpUser;
 import org.springblade.transport.pojo.entity.Driver;
 import org.springblade.transport.pojo.entity.TransportVehicle;
 import org.springblade.transport.pojo.vo.DriverVehicleCardVO;
@@ -17,19 +18,23 @@ import org.springblade.transport.service.IDriverService;
 import org.springblade.transport.service.ITransportVehicleService;
 
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
 
 /**
- * 司机端车辆卡片（重新认证表单的数据来源）测试。
+ * 司机端「当前司机」解析与车辆卡片（重新认证表单的数据来源）测试。
  * <p>
- * 卡片字段会**直接进表单**，所以这里盯的不是「显示得好不好看」，而是两条会让回显出错的契约：
+ * 解析侧盯住 ADR-0028 的唯一入口：登录用户 → {@code user_id} → 档案，手机号只是档案上的一个字段，
+ * 不参与查找；卡片字段会**直接进表单**，所以这里盯的不是「显示得好不好看」，而是两条会让回显出错的契约：
  * 日期字段只能是 {@code yyyy-MM-dd} 或空串（不能是「长期」这类文字）；
  * 标了长期有效的字段不能再下发一个作废的止期。
  */
@@ -42,11 +47,17 @@ class DriverAppServiceImplTest {
 	private ITransportVehicleService transportVehicleService;
 	private DriverAppServiceImpl service;
 
+	@BeforeAll
+	static void initTableInfo() {
+		// 实体元数据就绪后，LambdaQueryWrapper 才能把 Driver::getUserId 解析成列名
+		TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), Driver.class);
+	}
+
 	@BeforeEach
 	void setUp() {
 		driverService = mock(IDriverService.class);
 		transportVehicleService = mock(ITransportVehicleService.class);
-		service = new DriverAppServiceImpl(driverService, transportVehicleService, mock(IMpUserClient.class));
+		service = new DriverAppServiceImpl(driverService, transportVehicleService);
 	}
 
 	@Test
@@ -85,33 +96,69 @@ class DriverAppServiceImplTest {
 		assertEquals("2028-12-04", card.getRoadTransportCertStartDate());
 	}
 
-	// ---------------------------------------------------------------- 手机号解析
+	// ---------------------------------------------------------------- 当前司机解析
 
 	@Test
-	@DisplayName("12 位手机号也能解析出本人号码——库里存在 12 位司机账号，写死 11 位会让他们查不到自己的档案")
-	void twelveDigitAccountIsUsableAsPhone() {
-		assertEquals("黄大富", currentByPhone("175874212082", "175874212082", null).getDriverName());
+	@DisplayName("同号两条档案时取登录人自己那条——按手机号取「最近更新的一条」会把冒名者当成当前司机")
+	void currentDriverComesFromUserIdNotMobile() {
+		Driver owner = driver(9001L, USER_ID, "黄大富", MOBILE);
+		owner.setUpdateTime(new Date(1735689600000L));
+		Driver impostor = driver(9002L, 7002L, "冒名者", MOBILE);
+		impostor.setUpdateTime(new Date(1767225600000L));
+
+		when(driverService.getOne(any(LambdaQueryWrapper.class))).thenAnswer(invocation -> {
+			LambdaQueryWrapper<Driver> wrapper = invocation.getArgument(0);
+			String sqlSegment = wrapper.getSqlSegment();
+			if (sqlSegment.contains("mobile")) {
+				return impostor;
+			}
+			return sqlSegment.contains("user_id") ? owner : null;
+		});
+
+		try (MockedStatic<AuthUtil> authUtil = mockStatic(AuthUtil.class)) {
+			authUtil.when(AuthUtil::getUserId).thenReturn(USER_ID);
+			// 司机账号本身就是手机号：手机号优先的实现正是靠它命中那条同号档案
+			authUtil.when(AuthUtil::getUserAccount).thenReturn(MOBILE);
+			assertEquals("黄大富", service.current().getDriverName());
+		}
 	}
 
 	@Test
-	@DisplayName("小程序用户 phone 是脱敏串时改用其 account——脱敏 phone 既查不到档案，也会把本人真实号码误判成越权")
-	void maskedUserPhoneFallsBackToAccount() {
-		MpUser user = new MpUser();
-		user.setPhone("175****12082");
-		user.setAccount("175874212082");
+	@DisplayName("没有档案时返回空数据而不是异常——没档案的登录用户看到的是空页面、也不能操作")
+	void missingProfileReturnsEmptyInsteadOfFailing() {
+		when(driverService.getOne(any(LambdaQueryWrapper.class))).thenReturn(null);
 
-		assertEquals("黄大富", currentByPhone(null, null, user).getDriverName());
+		try (MockedStatic<AuthUtil> authUtil = mockStatic(AuthUtil.class)) {
+			authUtil.when(AuthUtil::getUserId).thenReturn(USER_ID);
+			assertNull(service.current(), "查不到档案时档案为空");
+			assertNull(service.currentDriverEntity(), "查不到档案时实体为空");
+			assertTrue(service.myVehicles().isEmpty(), "查不到档案时车辆列表为空");
+		}
 	}
 
 	@Test
-	@DisplayName("传他人手机号一律拒绝——不能因为解析不到本人号码就放行，那等于允许按手机号查任意档案")
-	void otherPeoplesMobileIsRejected() {
-		assertEquals("只能查询本人司机档案", assertThrows(ServiceException.class,
-			() -> currentByPhone("13900000001", "175874212082", null)).getMessage());
+	@DisplayName("未登录直接抛异常，不能当成「没有档案」静默返回空")
+	void anonymousIsRejected() {
+		try (MockedStatic<AuthUtil> authUtil = mockStatic(AuthUtil.class)) {
+			authUtil.when(AuthUtil::getUserId).thenReturn(null);
+			assertEquals("未登录", assertThrows(ServiceException.class,
+				() -> service.current()).getMessage());
+			assertEquals("未登录", assertThrows(ServiceException.class, service::myVehicles).getMessage());
+			assertEquals("未登录", assertThrows(ServiceException.class, service::currentDriverEntity).getMessage());
+		}
 	}
 
 	// ---------------------------------------------------------------- 辅助
 
+	private Driver driver(Long id, Long userId, String driverName, String mobile) {
+		Driver driver = new Driver();
+		driver.setId(id);
+		driver.setUserId(userId);
+		driver.setDriverName(driverName);
+		driver.setMobile(mobile);
+		return driver;
+	}
+
 	/** 造一辆只关心有效期三个字段的车 */
 	private TransportVehicle vehicle(LocalDate licenseStart, LocalDate licenseEnd, Integer licenseLongTerm) {
 		TransportVehicle vehicle = new TransportVehicle();
@@ -129,13 +176,9 @@ class DriverAppServiceImplTest {
 		return vehicle;
 	}
 
-	/** 按当前登录司机的手机号跑一次「我的车辆」，取第一张卡片 */
+	/** 按当前登录司机跑一次「我的车辆」，取第一张卡片 */
 	private DriverVehicleCardVO firstCard(TransportVehicle vehicle) {
-		Driver driver = new Driver();
-		driver.setId(9001L);
-		driver.setUserId(USER_ID);
-		driver.setDriverName("韦司机");
-		driver.setMobile(MOBILE);
+		Driver driver = driver(9001L, USER_ID, "韦司机", MOBILE);
 		driver.setDrivingVehicle(vehicle.getPlateNo());
 
 		when(driverService.getOne(any(LambdaQueryWrapper.class))).thenReturn(driver);
@@ -143,39 +186,9 @@ class DriverAppServiceImplTest {
 
 		try (MockedStatic<AuthUtil> authUtil = mockStatic(AuthUtil.class)) {
 			authUtil.when(AuthUtil::getUserId).thenReturn(USER_ID);
-			// 账号本身就是手机号，resolvePhone 走这条短路分支，不再回调用户中心
-			authUtil.when(AuthUtil::getUserAccount).thenReturn(MOBILE);
 			List<DriverVehicleCardVO> cards = service.myVehicles();
 			assertEquals(1, cards.size(), "应当只返回绑定到本人的这一辆车");
 			return cards.get(0);
 		}
 	}
-
-	/**
-	 * 按给定的登录态跑一次 currentByPhone。
-	 *
-	 * @param mobileHint 前端传入的 mobile，可为 null
-	 * @param account    JWT 里的账号，可为 null
-	 * @param user       小程序用户，可为 null（表示走不到小程序用户中心）
-	 */
-	private Driver currentByPhone(String mobileHint, String account, MpUser user) {
-		IMpUserClient mpUserClient = mock(IMpUserClient.class);
-		if (user != null) {
-			when(mpUserClient.userById(USER_ID)).thenReturn(R.data(user));
-		}
-		DriverAppServiceImpl scoped = new DriverAppServiceImpl(driverService, transportVehicleService, mpUserClient);
-
-		Driver driver = new Driver();
-		driver.setId(9002L);
-		driver.setUserId(USER_ID);
-		driver.setDriverName("黄大富");
-		driver.setMobile("175874212082");
-		when(driverService.getOne(any(LambdaQueryWrapper.class))).thenReturn(driver);
-
-		try (MockedStatic<AuthUtil> authUtil = mockStatic(AuthUtil.class)) {
-			authUtil.when(AuthUtil::getUserId).thenReturn(USER_ID);
-			authUtil.when(AuthUtil::getUserAccount).thenReturn(account);
-			return scoped.currentByPhone(mobileHint);
-		}
-	}
 }
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverCertServiceImplTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverCertServiceImplTest.java
index 7e99a3e5..10b8e190 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverCertServiceImplTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverCertServiceImplTest.java
@@ -358,6 +358,56 @@ class DriverCertServiceImplTest {
 		assertNull(service.getEffectivePersonCert());
 	}
 
+	@Test
+	@DisplayName("读生效值：有修订版时返回修订版内容（司机端不能拿旧值覆盖审核员的改动）")
+	void getEffectivePersonCertPrefersRevision() {
+		Long effectiveId = 777L;
+		Driver driver = driver(PLATE);
+		driver.setEffectiveCertRecordId(effectiveId);
+		when(driverAppService.currentDriverEntity()).thenReturn(driver);
+		when(certRecordService.getById(effectiveId)).thenReturn(pointedRecord(effectiveId,
+			"司机原提交", "审核员修订"));
+
+		PersonCertSubmitRequest result = service.getEffectivePersonCert();
+
+		assertEquals("审核员修订", result.getRealName());
+	}
+
+	@Test
+	@DisplayName("读生效值：车辆同理，修订版优先")
+	void getEffectiveVehicleCertPrefersRevision() {
+		when(driverAppService.currentDriverEntity()).thenReturn(driver(PLATE));
+		when(transportVehicleService.getById(VEHICLE_ID)).thenReturn(vehicle(VEHICLE_ID, PLATE, 777L));
+		when(certRecordService.getById(777L)).thenReturn(pointedVehicleRecord(777L,
+			"司机原提交", "审核员修订"));
+
+		VehicleCertSubmitRequest result = service.getEffectiveVehicleCert(VEHICLE_ID);
+
+		assertEquals("审核员修订", result.getOwnerName());
+	}
+
+	private TransportCertRecord pointedRecord(Long id, String submittedName, String revisedName) {
+		PersonCertSubmitRequest submitted = new PersonCertSubmitRequest();
+		submitted.setRealName(submittedName);
+		PersonCertSubmitRequest revised = new PersonCertSubmitRequest();
+		revised.setRealName(revisedName);
+		TransportCertRecord record = record(id, TransportCertRecord.STATUS_APPROVED);
+		record.setSnapshotJson(JSON.toJSONString(submitted));
+		record.setAuditedSnapshotJson(JSON.toJSONString(revised));
+		return record;
+	}
+
+	private TransportCertRecord pointedVehicleRecord(Long id, String submittedName, String revisedName) {
+		VehicleCertSubmitRequest submitted = new VehicleCertSubmitRequest();
+		submitted.setOwnerName(submittedName);
+		VehicleCertSubmitRequest revised = new VehicleCertSubmitRequest();
+		revised.setOwnerName(revisedName);
+		TransportCertRecord record = record(id, TransportCertRecord.STATUS_APPROVED);
+		record.setSnapshotJson(JSON.toJSONString(submitted));
+		record.setAuditedSnapshotJson(JSON.toJSONString(revised));
+		return record;
+	}
+
 	@Test
 	@DisplayName("重新提交后，生效值仍是旧的（核心验收点：提交不影响已认证状态）")
 	void resubmitKeepsEffectiveValue() {
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java
index bc544d0a..98dcafb8 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverNodePunchPhotoTest.java
@@ -12,7 +12,6 @@ import org.mockito.MockedStatic;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.jackson.JsonUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -95,7 +94,6 @@ class DriverNodePunchPhotoTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			driverService,
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java
index 06667c50..132a3b98 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchFinishFlagTest.java
@@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -92,7 +91,6 @@ class DriverPunchFinishFlagTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			mock(IDriverService.class),
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java
index 0009525f..25c4b5ed 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverPunchNodeCardTest.java
@@ -10,7 +10,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.springblade.core.tool.jackson.JsonUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -87,7 +86,6 @@ class DriverPunchNodeCardTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			mock(IDriverService.class),
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverResolveMobileTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverResolveMobileTest.java
new file mode 100644
index 00000000..89ba9503
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverResolveMobileTest.java
@@ -0,0 +1,131 @@
+package org.springblade.transport.service.impl;
+
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springblade.system.feign.IMpUserClient;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.transport.mapper.DriverMapper;
+import org.springblade.transport.pojo.entity.Driver;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 手机号 -> 司机档案 ID 解析入口的测试。
+ * <p>
+ * 归属主键是档案 ID，手机号只是派单时的号码快照：只有租户内唯一命中才认，0 条与多条都不认。
+ * 解析结果是"能不能写归属"的判断，不是业务校验，因此任何入参都只返回 null，不抛异常。
+ */
+class DriverResolveMobileTest {
+
+	private static final String TENANT_ID = "000000";
+	private static final String MOBILE = "13800138000";
+
+	private DriverMapper driverMapper;
+	private DriverServiceImpl service;
+
+	@BeforeAll
+	static void initTableInfo() {
+		MybatisConfiguration configuration = new MybatisConfiguration();
+		MapperBuilderAssistant assistant = new MapperBuilderAssistant(configuration, "");
+		assistant.setCurrentNamespace("test");
+		TableInfoHelper.initTableInfo(assistant, Driver.class);
+	}
+
+	@BeforeEach
+	void setUp() throws Exception {
+		driverMapper = mock(DriverMapper.class);
+		service = new DriverServiceImpl(mock(IMpUserClient.class), mock(ISysClient.class));
+		inject("baseMapper", driverMapper);
+	}
+
+	@Test
+	@DisplayName("租户内唯一命中：返回档案 ID")
+	void returnsProfileIdWhenUnique() {
+		when(driverMapper.selectList(any())).thenReturn(List.of(profile(9001L)));
+
+		assertEquals(9001L, service.resolveDriverIdByMobile(TENANT_ID, MOBILE));
+	}
+
+	@Test
+	@DisplayName("租户内没有档案：返回 null")
+	void returnsNullWhenAbsent() {
+		when(driverMapper.selectList(any())).thenReturn(Collections.emptyList());
+
+		assertNull(service.resolveDriverIdByMobile(TENANT_ID, MOBILE));
+	}
+
+	@Test
+	@DisplayName("租户内多条档案（历史同号）：返回 null，不猜")
+	void returnsNullWhenMultiple() {
+		List<Driver> profiles = new ArrayList<>();
+		profiles.add(profile(9001L));
+		profiles.add(profile(9002L));
+		when(driverMapper.selectList(any())).thenReturn(profiles);
+
+		assertNull(service.resolveDriverIdByMobile(TENANT_ID, MOBILE));
+	}
+
+	@Test
+	@DisplayName("手机号为空或脱敏串：返回 null，且不查库")
+	void returnsNullWithoutQueryForBlankOrMaskedMobile() {
+		assertNull(service.resolveDriverIdByMobile(TENANT_ID, null));
+		assertNull(service.resolveDriverIdByMobile(TENANT_ID, " "));
+		assertNull(service.resolveDriverIdByMobile(TENANT_ID, "138****8000"));
+		verify(driverMapper, never()).selectList(any());
+	}
+
+	@Test
+	@DisplayName("租户为空：取当前登录租户，仍不抛异常")
+	void fallsBackToCurrentTenant() {
+		when(driverMapper.selectList(any())).thenReturn(List.of(profile(9001L)));
+
+		Long driverId = null;
+		try (org.mockito.MockedStatic<org.springblade.core.secure.utils.AuthUtil> authUtil
+			= org.mockito.Mockito.mockStatic(org.springblade.core.secure.utils.AuthUtil.class)) {
+			authUtil.when(org.springblade.core.secure.utils.AuthUtil::getTenantId).thenReturn(TENANT_ID);
+			driverId = service.resolveDriverIdByMobile(null, MOBILE);
+		}
+		assertEquals(9001L, driverId);
+	}
+
+	private Driver profile(Long id) {
+		Driver profile = new Driver();
+		profile.setId(id);
+		profile.setIsDeleted(0);
+		profile.setTenantId(TENANT_ID);
+		profile.setMobile(MOBILE);
+		return profile;
+	}
+
+	private void inject(String field, Object value) throws Exception {
+		Class<?> type = service.getClass();
+		while (type != null) {
+			try {
+				Field declared = type.getDeclaredField(field);
+				declared.setAccessible(true);
+				declared.set(service, value);
+				return;
+			} catch (NoSuchFieldException ignored) {
+				type = type.getSuperclass();
+			}
+		}
+		throw new IllegalStateException("未找到字段：" + field);
+	}
+
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverSyncMobileTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverSyncMobileTest.java
index 35568abb..16b484b9 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverSyncMobileTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverSyncMobileTest.java
@@ -105,6 +105,17 @@ class DriverSyncMobileTest {
 		verify(driverMapper, never()).updateById(any(Driver.class));
 	}
 
+	@Test
+	@DisplayName("改号链路不持有运单/配载服务：换号只改档案，不回写单据上的手机号快照")
+	void phoneSyncDoesNotDependOnWaybillServices() {
+		for (Field field : DriverServiceImpl.class.getDeclaredFields()) {
+			String typeName = field.getType().getSimpleName();
+			assertFalse(typeName.contains("Waybill") || typeName.contains("LoadingManage"),
+				"改号链路引入了 " + typeName + "：换号不得顺手回写运单/配载单的司机快照，"
+					+ "否则司机档案与历史单据的归属会一起漂移");
+		}
+	}
+
 	@Test
 	@DisplayName("档案 mobile 与账号旧号不一致：不动档案，返回可读原因（不抛异常）")
 	void skipsWhenProfileMobileDiffersFromOldPhone() {
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java
index 05c3af55..cad12c15 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripAcceptRejectTest.java
@@ -14,7 +14,6 @@ import org.mockito.MockedStatic;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -57,7 +56,10 @@ class DriverTripAcceptRejectTest {
 
 	private static final Long USER_ID = 7401L;
 	private static final Long DRIVER_ID = 9001L;
-	private static final String PHONE = "17587421208";
+	/** 派单时落在运次上的号码快照。 */
+	private static final String SNAPSHOT_PHONE = "17587421208";
+	/** 司机改号后档案与登录账号上的号码。 */
+	private static final String CURRENT_PHONE = "17687421208";
 	private static final String TRIP_ID = "2101146192739459074";
 	private static final Long PENDING_ID = 2101144166395699202L;
 	private static final Long SECOND_ID = 2101145869819994113L;
@@ -85,7 +87,6 @@ class DriverTripAcceptRejectTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			driverService,
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			certificationGate,
@@ -121,7 +122,8 @@ class DriverTripAcceptRejectTest {
 			"两张子运单与接单司机一起下发：" + capturedUpdateParams());
 		assertTrue(capturedWhereSql().contains("(id IN ("), capturedWhereSql());
 		assertEquals(TRIP_ID, capturedQuery().getTripId());
-		assertEquals(PHONE, capturedQuery().getDriverPhone(), "归属仍按司机手机号收口");
+		assertEquals(DRIVER_ID, capturedQuery().getDriverId(),
+			"运次查询按司机档案 ID 收口：手机号换了也认得出本人");
 	}
 
 	@Test
@@ -340,6 +342,16 @@ class DriverTripAcceptRejectTest {
 		verify(waybillService, never()).update(any());
 	}
 
+	@Test
+	@DisplayName("没有司机档案的账号不能运次接单：不按手机号回退、不提供代报")
+	void tripAcceptWithoutDriverProfileIsRefused() {
+		when(driverService.getOne(any())).thenReturn(null);
+
+		assertEquals("未找到当前登录司机档案", assertThrows(ServiceException.class,
+			() -> runAsDriver(() -> service.tripAccept(TRIP_ID))).getMessage());
+		verify(waybillService, never()).update(any());
+	}
+
 	// ------------------------------------------------------------ 夹具
 
 	private <T> T runAsDriver(Supplier<T> action) {
@@ -373,7 +385,7 @@ class DriverTripAcceptRejectTest {
 	private void stubTrip(TripVO.TripWaybillVO[] leading, TripVO.TripWaybillVO... children) {
 		TripVO trip = new TripVO();
 		trip.setId(TRIP_ID);
-		trip.setDriverPhone(PHONE);
+		trip.setDriverPhone(SNAPSHOT_PHONE);
 		List<TripVO.TripWaybillVO> all = new java.util.ArrayList<>(List.of(leading));
 		all.addAll(List.of(children));
 		trip.setWaybills(all);
@@ -400,7 +412,7 @@ class DriverTripAcceptRejectTest {
 		driver.setUserId(USER_ID);
 		driver.setDriverName("黄宇富");
 		driver.setDrivingVehicle("桂A32523");
-		driver.setMobile(PHONE);
+		driver.setMobile(CURRENT_PHONE);
 		return driver;
 	}
 
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java
index 8ac29d0f..c0034f02 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverTripCardTest.java
@@ -10,7 +10,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.MockedStatic;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -74,7 +73,6 @@ class DriverTripCardTest {
 
 	private IWaybillService waybillService;
 	private IDriverService driverService;
-	private IMpUserClient mpUserClient;
 	private ITripQueryService tripQueryService;
 	private WaybillEnroutePunchMapper enroutePunchMapper;
 	private WaybillNodePunchMapper nodePunchMapper;
@@ -94,14 +92,12 @@ class DriverTripCardTest {
 	void setUp() {
 		waybillService = mock(IWaybillService.class);
 		driverService = mock(IDriverService.class);
-		mpUserClient = mock(IMpUserClient.class);
 		tripQueryService = mock(ITripQueryService.class);
 		enroutePunchMapper = mock(WaybillEnroutePunchMapper.class);
 		nodePunchMapper = mock(WaybillNodePunchMapper.class);
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			driverService,
-			mpUserClient,
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
@@ -125,7 +121,7 @@ class DriverTripCardTest {
 		IPage<DriverWaybillCardVO> page = runAsDriver(() -> service.tripPage(1, 10, null, null));
 
 		given = capturedQuery();
-		assertEquals(PHONE, given.getDriverPhone());
+		assertEquals(DRIVER_ID, given.getDriverId(), "运次列表按司机档案 ID 收口");
 		assertEquals(1, given.getCurrent());
 		assertEquals(10, given.getSize(), "一页 10 条即 10 个运次");
 		assertNull(given.getStatus());
@@ -334,10 +330,9 @@ class DriverTripCardTest {
 	}
 
 	@Test
-	@DisplayName("收口缺失时不放行：空页、零统计、当前任务为空，且不查运次")
-	void missingPhoneIsRefused() {
+	@DisplayName("收口缺失时不放行：没有司机档案就空页、零统计、当前任务为空，且不查运次")
+	void missingDriverProfileIsRefused() {
 		when(driverService.getOne(any())).thenReturn(null);
-		when(mpUserClient.userById(any())).thenReturn(null);
 
 		IPage<DriverWaybillCardVO> page = runAsDriver(() -> service.tripPage(null, null, null, null));
 		DriverWaybillPreviewVO preview = runAsDriver(() -> service.tripPendingPreview(null));
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java
index 42b742fe..ab2bd8e5 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillAutoCompleteTest.java
@@ -11,7 +11,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.MockedStatic;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -116,7 +115,6 @@ class DriverWaybillAutoCompleteTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			driverService,
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java
index 13ace47b..af981add 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillCardLocationTest.java
@@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -73,7 +72,6 @@ class DriverWaybillCardLocationTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			mock(IDriverService.class),
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java
index f1223d3c..8c4ad4ec 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillNodePunchTest.java
@@ -7,7 +7,6 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -55,7 +54,6 @@ class DriverWaybillNodePunchTest {
 		service = new DriverWaybillServiceImpl(
 			mock(IWaybillService.class),
 			mock(IDriverService.class),
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java
index 7f3f6cae..2dc1e234 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillOwnershipTest.java
@@ -12,7 +12,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.MockedStatic;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -27,26 +26,34 @@ import org.springblade.transport.support.CertificationGate;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
  * 司机对运单的归属校验（异常上报等按运单操作的前置条件）。
  * <p>
- * 口径：当前用户手机号匹配运单 {@code driverPhone}。
+ * 口径：登录用户按 {@code user_id} 解析到司机档案，运单归属键是运单上的 {@code driver_id}；
+ * {@code driver_phone} 只是派单快照，不参与判定。
  * 管理端与调度员账号没有司机档案，会停在这里，这是刻意的：不提供代报。
  */
 class DriverWaybillOwnershipTest {
 
 	private static final Long WAYBILL_ID = 5301L;
 	private static final Long USER_ID = 7001L;
-	private static final String PHONE = "13800138000";
+	private static final Long DRIVER_ID = 9001L;
+	private static final Long OTHER_DRIVER_ID = 9002L;
+	/** 派单时落在运单上的号码快照。 */
+	private static final String SNAPSHOT_PHONE = "13800138000";
+	/** 司机改号后档案与登录账号上的号码。 */
+	private static final String CURRENT_PHONE = "13900139000";
 
 	private IDriverService driverService;
 	private IWaybillService waybillService;
@@ -58,6 +65,7 @@ class DriverWaybillOwnershipTest {
 		MapperBuilderAssistant assistant = new MapperBuilderAssistant(configuration, "");
 		assistant.setCurrentNamespace("test");
 		TableInfoHelper.initTableInfo(assistant, Waybill.class);
+		TableInfoHelper.initTableInfo(assistant, Driver.class);
 	}
 
 	@BeforeEach
@@ -67,7 +75,6 @@ class DriverWaybillOwnershipTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			driverService,
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
@@ -91,33 +98,26 @@ class DriverWaybillOwnershipTest {
 	}
 
 	@Test
-	@DisplayName("司机档案与登录态都没有手机号时被拒")
-	void withoutPhoneIsRejected() {
-		Driver driver = driver(null);
-		when(driverService.getOne(any())).thenReturn(driver);
+	@DisplayName("司机档案只按登录用户 ID 解析，不按手机号回退")
+	void driverProfileResolvedByUserIdOnly() {
+		when(driverService.getOne(any())).thenReturn(driver(CURRENT_PHONE));
+		when(waybillService.getOne(any())).thenReturn(waybill());
 
-		ServiceException exception = assertThrows(ServiceException.class,
-			() -> runOwnershipCheck(WAYBILL_ID));
+		assertDoesNotThrow(() -> runOwnershipCheck(WAYBILL_ID));
 
-		assertEquals("当前用户手机号为空，无法查找运单", exception.getMessage());
+		ArgumentCaptor<LambdaQueryWrapper<Driver>> captor = ArgumentCaptor.forClass(LambdaQueryWrapper.class);
+		verify(driverService, times(1)).getOne(captor.capture());
+		LambdaQueryWrapper<Driver> wrapper = captor.getValue();
+		assertTrue(wrapper.getTargetSql().contains("user_id"),
+			"司机档案必须按登录用户 ID 解析：" + wrapper.getTargetSql());
+		assertFalse(wrapper.getTargetSql().contains("mobile"),
+			"司机档案不允许再按手机号回退：" + wrapper.getTargetSql());
 	}
 
 	@Test
-	@DisplayName("运单司机手机号与当前用户不一致时被拒")
-	void waybillOfAnotherPhoneIsRejected() {
-		when(driverService.getOne(any())).thenReturn(driver(PHONE));
-		when(waybillService.getOne(any())).thenReturn(null);
-
-		ServiceException exception = assertThrows(ServiceException.class,
-			() -> runOwnershipCheck(WAYBILL_ID));
-
-		assertEquals("运单不存在或无权操作", exception.getMessage());
-	}
-
-	@Test
-	@DisplayName("本人手机号运单放行，且查询确实按司机手机号收敛")
-	void ownWaybillPasses() {
-		when(driverService.getOne(any())).thenReturn(driver(PHONE));
+	@DisplayName("司机改号后本人运单仍放行，归属只认 driver_id")
+	void ownWaybillPassesAfterNumberChange() {
+		when(driverService.getOne(any())).thenReturn(driver(CURRENT_PHONE));
 		when(waybillService.getOne(any())).thenReturn(waybill());
 
 		assertDoesNotThrow(() -> runOwnershipCheck(WAYBILL_ID));
@@ -125,17 +125,55 @@ class DriverWaybillOwnershipTest {
 		ArgumentCaptor<LambdaQueryWrapper<Waybill>> captor = ArgumentCaptor.forClass(LambdaQueryWrapper.class);
 		verify(waybillService).getOne(captor.capture());
 		LambdaQueryWrapper<Waybill> wrapper = captor.getValue();
-		assertTrue(wrapper.getTargetSql().contains("driver_phone"),
-			"归属查询必须落在运单司机手机号上：" + wrapper.getTargetSql());
-		assertTrue(wrapper.getParamNameValuePairs().values().stream()
-				.anyMatch(PHONE::equals),
-			"归属查询必须带上当前用户手机号：" + wrapper.getParamNameValuePairs());
+		// 护栏：归属查询必须落在运单 driver_id 上，不能再出现手机号比较，否则改号即失效。
+		assertTrue(wrapper.getTargetSql().contains("driver_id"),
+			"归属查询必须落在运单司机档案 ID 上：" + wrapper.getTargetSql());
+		assertFalse(wrapper.getTargetSql().contains("driver_phone"),
+			"归属查询不能再比较运单司机手机号快照：" + wrapper.getTargetSql());
+		assertTrue(wrapper.getParamNameValuePairs().values().contains(DRIVER_ID),
+			"归属查询必须带上当前司机档案 ID：" + wrapper.getParamNameValuePairs());
+		assertFalse(wrapper.getParamNameValuePairs().values().contains(SNAPSHOT_PHONE),
+			"快照号不参与归属判定：" + wrapper.getParamNameValuePairs());
+		assertFalse(wrapper.getParamNameValuePairs().values().contains(CURRENT_PHONE),
+			"档案手机号不参与归属判定：" + wrapper.getParamNameValuePairs());
+	}
+
+	@Test
+	@DisplayName("同号换人：同手机号但不同档案看不到对方的运单")
+	void waybillOwnedByAnotherDriverWithSamePhoneIsRejected() {
+		when(driverService.getOne(any())).thenReturn(driver(CURRENT_PHONE));
+		// 库里存在该运单，但归属档案是另一个同号档案，按 driver_id 收口后查不到。
+		when(waybillService.getOne(any())).thenReturn(null);
+
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> runOwnershipCheck(WAYBILL_ID));
+
+		assertEquals("运单不存在或无权操作", exception.getMessage());
+
+		ArgumentCaptor<LambdaQueryWrapper<Waybill>> captor = ArgumentCaptor.forClass(LambdaQueryWrapper.class);
+		verify(waybillService).getOne(captor.capture());
+		LambdaQueryWrapper<Waybill> wrapper = captor.getValue();
+		// 参数槽由 SQL 片段构建时填充：不先取一次片段，参数表是空的
+		wrapper.getTargetSql();
+		assertTrue(wrapper.getParamNameValuePairs().values().contains(DRIVER_ID),
+			"收口条件必须是当前档案 ID：" + wrapper.getParamNameValuePairs());
+		assertFalse(wrapper.getParamNameValuePairs().values().contains(OTHER_DRIVER_ID),
+			"不能把别人的档案 ID 当查询条件：" + wrapper.getParamNameValuePairs());
+	}
+
+	@Test
+	@DisplayName("司机档案没有手机号也能按档案 ID 认领自己的运单")
+	void profileWithoutPhoneStillOwnsByDriverId() {
+		when(driverService.getOne(any())).thenReturn(driver(null));
+		when(waybillService.getOne(any())).thenReturn(waybill());
+
+		assertDoesNotThrow(() -> runOwnershipCheck(WAYBILL_ID));
 	}
 
 	@Test
 	@DisplayName("运单ID为空时被拒")
 	void withoutWaybillIdIsRejected() {
-		when(driverService.getOne(any())).thenReturn(driver(PHONE));
+		when(driverService.getOne(any())).thenReturn(driver(CURRENT_PHONE));
 
 		ServiceException exception = assertThrows(ServiceException.class,
 			() -> runOwnershipCheck(null));
@@ -148,14 +186,14 @@ class DriverWaybillOwnershipTest {
 	private void runOwnershipCheck(Long waybillId) {
 		try (MockedStatic<AuthUtil> authUtil = mockStatic(AuthUtil.class)) {
 			authUtil.when(AuthUtil::getUserId).thenReturn(USER_ID);
-			authUtil.when(AuthUtil::getUserAccount).thenReturn(PHONE);
+			authUtil.when(AuthUtil::getUserAccount).thenReturn(CURRENT_PHONE);
 			service.assertCurrentDriverOwnsWaybill(waybillId);
 		}
 	}
 
 	private Driver driver(String mobile) {
 		Driver driver = new Driver();
-		driver.setId(9001L);
+		driver.setId(DRIVER_ID);
 		driver.setUserId(USER_ID);
 		driver.setDriverName("韦司机");
 		driver.setMobile(mobile);
@@ -166,7 +204,8 @@ class DriverWaybillOwnershipTest {
 		Waybill waybill = new Waybill();
 		waybill.setId(WAYBILL_ID);
 		waybill.setWaybillNo("YD202610070001");
-		waybill.setDriverPhone(PHONE);
+		waybill.setDriverId(DRIVER_ID);
+		waybill.setDriverPhone(SNAPSHOT_PHONE);
 		waybill.setIsDeleted(0);
 		return waybill;
 	}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java
index 49502666..dc4b349c 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillRejectDetachTest.java
@@ -15,7 +15,6 @@ import org.mockito.ArgumentMatchers;
 import org.mockito.MockedStatic;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -34,6 +33,7 @@ import org.springblade.transport.support.CertificationGate;
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -58,7 +58,10 @@ class DriverWaybillRejectDetachTest {
 	private static final Long USER_ID = 7401L;
 	private static final Long DRIVER_ID = 9001L;
 	private static final String PLATE = "沪AE31312";
-	private static final String PHONE = "13800138002";
+	/** 派单时落在运单上的号码快照。 */
+	private static final String SNAPSHOT_PHONE = "13800138002";
+	/** 司机改号后档案与登录账号上的号码。 */
+	private static final String CURRENT_PHONE = "13900139002";
 	private static final Long REJECTED_ID = 7201L;
 
 	private IDriverService driverService;
@@ -83,7 +86,6 @@ class DriverWaybillRejectDetachTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			driverService,
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			certificationGate,
@@ -155,6 +157,29 @@ class DriverWaybillRejectDetachTest {
 		assertEquals(2, page.getRecords().size());
 	}
 
+	@Test
+	@DisplayName("司机改号后运单仍可见，卡片仍展示派单时的号码快照")
+	void numberChangeKeepsWaybillsVisible() {
+		// 同一个档案：档案与登录账号已换成新号，运单快照还是派单时的旧号
+		when(waybillService.list(ArgumentMatchers.<com.baomidou.mybatisplus.core.conditions.Wrapper<Waybill>>any()))
+			.thenReturn(List.of(waybill(7202L, "YD-20261001-0002", "pending", "pending")));
+
+		IPage<DriverWaybillCardVO> page = runAsDriver(() -> service.page(1, 10, null, null));
+
+		assertEquals(1, page.getTotal(), "改号不影响本人运单的可见性");
+		assertEquals(SNAPSHOT_PHONE, page.getRecords().get(0).getDriverPhone(),
+			"卡片展示的仍是运单上的号码快照，不改成本人新号");
+	}
+
+	@Test
+	@DisplayName("重新派回后运单恢复可见：归属看新的 driver_id，不看历史拒单")
+	void reassignedWaybillBecomesVisibleAgain() {
+		when(waybillService.getOne(any()))
+			.thenReturn(waybill(REJECTED_ID, "YD-20261010-0001", "pending", "pending"));
+
+		assertDoesNotThrow(() -> runAsDriver(() -> service.detail(REJECTED_ID)));
+	}
+
 	@Test
 	@DisplayName("已拒单运单的详情不可达：取单条件已把它挡住")
 	void detailOfRejectedIsUnreachable() {
@@ -218,7 +243,7 @@ class DriverWaybillRejectDetachTest {
 		driver.setUserId(USER_ID);
 		driver.setDriverName("黄大富");
 		driver.setDrivingVehicle(PLATE);
-		driver.setMobile(PHONE);
+		driver.setMobile(CURRENT_PHONE);
 		return driver;
 	}
 
@@ -231,7 +256,8 @@ class DriverWaybillRejectDetachTest {
 		waybill.setId(id);
 		waybill.setWaybillNo(no);
 		waybill.setVehicleNo(PLATE);
-		waybill.setDriverPhone(PHONE);
+		waybill.setDriverId(DRIVER_ID);
+		waybill.setDriverPhone(SNAPSHOT_PHONE);
 		waybill.setBusinessStatus(businessStatus);
 		waybill.setDriverAcceptStatus(acceptStatus);
 		waybill.setIsDeleted(0);
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java
index 1789c892..029adb95 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/DriverWaybillTabStatusTest.java
@@ -12,7 +12,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.feign.IMpUserClient;
 import org.springblade.transport.mapper.ExceptionDisposalMapper;
 import org.springblade.transport.mapper.WaybillEnroutePunchMapper;
 import org.springblade.transport.mapper.WaybillNodePunchMapper;
@@ -35,6 +34,7 @@ import java.util.List;
 import java.util.function.Supplier;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -51,8 +51,12 @@ class DriverWaybillTabStatusTest {
 
 	private static final Long WAYBILL_ID = 5901L;
 	private static final Long USER_ID = 7001L;
+	private static final Long DRIVER_ID = 9001L;
 	private static final String PLATE = "桂AAW3256";
-	private static final String PHONE = "13800138002";
+	/** 派单时落在运单上的号码快照。 */
+	private static final String SNAPSHOT_PHONE = "13800138002";
+	/** 司机改号后档案与登录账号上的号码。 */
+	private static final String CURRENT_PHONE = "13900139002";
 
 	private IWaybillService waybillService;
 	private IDriverService driverService;
@@ -81,7 +85,6 @@ class DriverWaybillTabStatusTest {
 		service = new DriverWaybillServiceImpl(
 			waybillService,
 			driverService,
-			mock(IMpUserClient.class),
 			mock(IProcessConfigService.class),
 			mock(ITransportVehicleService.class),
 			mock(CertificationGate.class),
@@ -141,6 +144,27 @@ class DriverWaybillTabStatusTest {
 		assertEquals(1, counts.getAll());
 	}
 
+	@Test
+	@DisplayName("司机改号后三档计数不变，计数查询按 driver_id 收口")
+	void tabCountsAfterNumberChangeScopedByDriverId() {
+		DriverWaybillTabCountsVO counts = runAsDriver(service::tabCounts);
+
+		assertEquals(1, counts.getDoing(), "改号不影响本人运单的分档");
+		assertEquals(1, counts.getAll());
+
+		LambdaQueryWrapper<Waybill> wrapper = firstQueriedWrapper();
+		// 护栏：计数查询必须落在运单 driver_id 上；比对手机号的话，改号后司机的数字会清零
+		String sql = wrapper.getTargetSql();
+		assertTrue(sql.contains("driver_id"), "计数查询必须按司机档案 ID 收口：" + sql);
+		assertFalse(sql.contains("driver_phone"), "计数查询不能再比较运单手机号快照：" + sql);
+		assertTrue(wrapper.getParamNameValuePairs().values().contains(DRIVER_ID),
+			"计数查询必须带上当前司机档案 ID：" + wrapper.getParamNameValuePairs());
+		assertFalse(wrapper.getParamNameValuePairs().values().contains(SNAPSHOT_PHONE),
+			"快照号不参与计数：" + wrapper.getParamNameValuePairs());
+		assertFalse(wrapper.getParamNameValuePairs().values().contains(CURRENT_PHONE),
+			"档案手机号不参与计数：" + wrapper.getParamNameValuePairs());
+	}
+
 	// ------------------------------------------------------------ 夹具
 
 	private <T> T runAsDriver(Supplier<T> action) {
@@ -167,6 +191,15 @@ class DriverWaybillTabStatusTest {
 		return statuses;
 	}
 
+	@SuppressWarnings("unchecked")
+	private LambdaQueryWrapper<Waybill> firstQueriedWrapper() {
+		assertEquals(1, queried.size(), "一次列表查询");
+		LambdaQueryWrapper<Waybill> wrapper = (LambdaQueryWrapper<Waybill>) queried.get(0);
+		// 参数槽由 SQL 片段构建时填充：不先取一次片段，参数表是空的
+		wrapper.getSqlSegment();
+		return wrapper;
+	}
+
 	@SuppressWarnings("unchecked")
 	private static Wrapper<Waybill> anyWrapper() {
 		return org.mockito.ArgumentMatchers.<Wrapper<Waybill>>any();
@@ -177,7 +210,8 @@ class DriverWaybillTabStatusTest {
 		waybill.setId(WAYBILL_ID);
 		waybill.setWaybillNo("YD202610080002");
 		waybill.setVehicleNo(PLATE);
-		waybill.setDriverPhone(PHONE);
+		waybill.setDriverId(DRIVER_ID);
+		waybill.setDriverPhone(SNAPSHOT_PHONE);
 		waybill.setBusinessStatus(WaybillProcessSupport.STATUS_PENDING_RETURN_CONFIRM);
 		waybill.setIsDeleted(0);
 		return waybill;
@@ -185,10 +219,10 @@ class DriverWaybillTabStatusTest {
 
 	private Driver driver() {
 		Driver driver = new Driver();
-		driver.setId(9001L);
+		driver.setId(DRIVER_ID);
 		driver.setUserId(USER_ID);
 		driver.setDrivingVehicle(PLATE);
-		driver.setMobile(PHONE);
+		driver.setMobile(CURRENT_PHONE);
 		return driver;
 	}
 
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalDetailPayloadTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalDetailPayloadTest.java
index 7f425f84..2834ff42 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalDetailPayloadTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalDetailPayloadTest.java
@@ -19,6 +19,7 @@ import org.springblade.transport.pojo.entity.LoadingManage;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.pojo.vo.ExceptionDisposalVO;
 import org.springblade.transport.service.IDriverWaybillService;
+import org.springblade.transport.service.IMaintenanceRecordService;
 import org.springblade.transport.service.IWaybillService;
 
 import java.lang.reflect.Field;
@@ -86,7 +87,8 @@ class ExceptionDisposalDetailPayloadTest {
 		loadingManageMapper = mock(LoadingManageMapper.class);
 		service = new ExceptionDisposalServiceImpl(
 			followRecordMapper, waybillService, mock(IDriverWaybillService.class),
-			mock(org.springblade.transport.support.MpUserDataScopeSupport.class), loadingManageMapper);
+			mock(org.springblade.transport.support.MpUserDataScopeSupport.class), loadingManageMapper,
+			mock(IMaintenanceRecordService.class));
 		inject("baseMapper", disposalMapper);
 	}
 
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalListQueryTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalListQueryTest.java
index a8c9d84b..80688ef5 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalListQueryTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalListQueryTest.java
@@ -20,6 +20,7 @@ import org.springblade.transport.pojo.entity.ExceptionDisposal;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.pojo.vo.ExceptionDisposalVO;
 import org.springblade.transport.service.IDriverWaybillService;
+import org.springblade.transport.service.IMaintenanceRecordService;
 import org.springblade.transport.service.IWaybillService;
 
 import java.lang.reflect.Field;
@@ -73,7 +74,8 @@ class ExceptionDisposalListQueryTest {
 			waybillService,
 			mock(IDriverWaybillService.class),
 			scopeSupport,
-			loadingManageMapper);
+			loadingManageMapper,
+			mock(IMaintenanceRecordService.class));
 		inject("baseMapper", disposalMapper);
 		when(disposalMapper.selectPage(any(), any())).thenReturn(new Page<ExceptionDisposal>(1, 10));
 	}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRejectRevokeTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRejectRevokeTest.java
index 706b5d37..667a1168 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRejectRevokeTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRejectRevokeTest.java
@@ -21,6 +21,7 @@ import org.springblade.transport.pojo.entity.ExceptionDisposal;
 import org.springblade.transport.pojo.entity.ExceptionDisposalFollowRecord;
 import org.springblade.transport.pojo.vo.ExceptionDisposalVO;
 import org.springblade.transport.service.IDriverWaybillService;
+import org.springblade.transport.service.IMaintenanceRecordService;
 import org.springblade.transport.service.IWaybillService;
 
 import java.lang.reflect.Field;
@@ -69,7 +70,7 @@ class ExceptionDisposalRejectRevokeTest {
 		service = new ExceptionDisposalServiceImpl(
 			followRecordMapper, mock(IWaybillService.class), mock(IDriverWaybillService.class),
 			mock(org.springblade.transport.support.MpUserDataScopeSupport.class),
-			mock(LoadingManageMapper.class));
+			mock(LoadingManageMapper.class), mock(IMaintenanceRecordService.class));
 		inject("baseMapper", disposalMapper);
 		when(disposalMapper.updateById(any(ExceptionDisposal.class))).thenReturn(1);
 		when(followRecordMapper.insert(any(ExceptionDisposalFollowRecord.class))).thenReturn(1);
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java
index 04ba435c..4328e1a9 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalReportGateTest.java
@@ -19,6 +19,7 @@ import org.springblade.transport.mapper.LoadingManageMapper;
 import org.springblade.transport.pojo.entity.ExceptionDisposal;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.service.IDriverWaybillService;
+import org.springblade.transport.service.IMaintenanceRecordService;
 import org.springblade.transport.service.IWaybillService;
 
 import java.lang.reflect.Field;
@@ -74,7 +75,7 @@ class ExceptionDisposalReportGateTest {
 		service = new ExceptionDisposalServiceImpl(
 			mock(ExceptionDisposalFollowRecordMapper.class), waybillService, driverWaybillService,
 			mock(org.springblade.transport.support.MpUserDataScopeSupport.class),
-			mock(LoadingManageMapper.class));
+			mock(LoadingManageMapper.class), mock(IMaintenanceRecordService.class));
 		inject("baseMapper", disposalMapper);
 
 		when(waybillService.getById(WAYBILL_ID)).thenReturn(waybill());
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRouteAdjustTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRouteAdjustTest.java
index 7c9c0b6b..26067a72 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRouteAdjustTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ExceptionDisposalRouteAdjustTest.java
@@ -23,6 +23,7 @@ import org.springblade.transport.pojo.entity.ExceptionDisposalFollowRecord;
 import org.springblade.transport.pojo.entity.LoadingManage;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.service.IDriverWaybillService;
+import org.springblade.transport.service.IMaintenanceRecordService;
 import org.springblade.transport.service.IWaybillService;
 
 import java.lang.reflect.Field;
@@ -88,7 +89,8 @@ class ExceptionDisposalRouteAdjustTest {
 		loadingManageMapper = mock(LoadingManageMapper.class);
 		service = new ExceptionDisposalServiceImpl(
 			followRecordMapper, waybillService, mock(IDriverWaybillService.class),
-			mock(org.springblade.transport.support.MpUserDataScopeSupport.class), loadingManageMapper);
+			mock(org.springblade.transport.support.MpUserDataScopeSupport.class), loadingManageMapper,
+			mock(IMaintenanceRecordService.class));
 		inject("baseMapper", disposalMapper);
 		when(disposalMapper.updateById(any(ExceptionDisposal.class))).thenReturn(1);
 		when(followRecordMapper.insert(any(ExceptionDisposalFollowRecord.class))).thenReturn(1);
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageAdmissionTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageAdmissionTest.java
index a8eccbcd..f3bbe693 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageAdmissionTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageAdmissionTest.java
@@ -19,6 +19,7 @@ import org.springblade.transport.pojo.entity.ContractManage;
 import org.springblade.transport.pojo.entity.LoadingManage;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.service.IContractManageService;
+import org.springblade.transport.service.IDriverService;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -81,6 +82,7 @@ class LoadingManageAdmissionTest {
 		inject("baseMapper", loadingManageMapper);
 		inject("waybillMapper", waybillMapper);
 		inject("contractManageService", contractManageService);
+		inject("driverService", mock(IDriverService.class));
 		authUtil = mockStatic(AuthUtil.class);
 		authUtil.when(AuthUtil::getDeptId).thenReturn(String.valueOf(DEPT_ID));
 	}
@@ -292,6 +294,33 @@ class LoadingManageAdmissionTest {
 		assertEquals("所选承运商合同不存在、未审核通过或已失效", exception.getMessage());
 	}
 
+	@Test
+	@DisplayName("子运单的客户合同快照为空时不按甲方过滤，取不到甲方也不空指针")
+	void missingCustomerContractDoesNotFilterByPartyA() {
+		Waybill withSnapshot = waybill(1L, WAYBILL_NO_A, "road", "pending", null, PROJECT_A);
+		withSnapshot.setContractId(OTHER_CONTRACT_ID);
+		stubWaybills(withSnapshot, waybill(2L, WAYBILL_NO_B, "road", "pending", null, PROJECT_A));
+		stubContract(CONTRACT_ID, PROJECT_A);
+
+		assertDoesNotThrow(() -> service.submit(submitPayload(List.of(1L, 2L))));
+	}
+
+	@Test
+	@DisplayName("项目下没有可用承运商合同时不按乙方交集拦截：自运的多张子运单照常提交")
+	void noAvailableCarrierContractSkipsPartyBCheck() {
+		stubWaybills(
+			waybill(1L, WAYBILL_NO_A, "road", "pending", null, PROJECT_A),
+			waybill(2L, WAYBILL_NO_B, "road", "pending", null, PROJECT_A));
+		when(contractManageService.list(anyContractWrapper())).thenReturn(List.of());
+		LoadingManage payload = submitPayload(List.of(1L, 2L));
+		payload.setCarrierType("自运");
+		payload.setCarrierContractId(null);
+		payload.setDriverName("张三");
+		payload.setDriverPhone("13800008000");
+
+		assertDoesNotThrow(() -> service.submit(payload));
+	}
+
 	// ------------------------------------------------------------ 放行
 
 	@Test
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageChildStatusWriteTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageChildStatusWriteTest.java
index 10dab615..3213ac95 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageChildStatusWriteTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/LoadingManageChildStatusWriteTest.java
@@ -1,5 +1,7 @@
 package org.springblade.transport.service.impl;
 
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -15,16 +17,20 @@ import org.mockito.ArgumentMatchers;
 import org.mockito.MockedStatic;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.transport.mapper.LoadingManageMapper;
 import org.springblade.transport.mapper.WaybillMapper;
 import org.springblade.transport.pojo.entity.LoadingManage;
 import org.springblade.transport.pojo.entity.ProcessConfig;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.service.IContractManageService;
+import org.springblade.transport.service.IDriverService;
 import org.springblade.transport.service.IProcessConfigService;
 import org.springblade.transport.service.IReceivablePayableDetailService;
+import org.springblade.transport.support.LogCapture;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.regex.Matcher;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -32,9 +38,11 @@ import java.util.Map;
 import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -60,6 +68,12 @@ class LoadingManageChildStatusWriteTest {
 	private static final String LOADING_NO = "PZ-20261018-001";
 	private static final Long LOADING_ID = 1800000000000000001L;
 	private static final String DRIVER_PHONE = "13800138000";
+	private static final String TENANT_ID = "000000";
+	private static final Long RESOLVED_DRIVER_ID = 9321L;
+	private static final Long MANUAL_DRIVER_ID = 7001L;
+	private static final Long OTHER_PROFILE_ID = 8888L;
+	private static final String OTHER_DRIVER_PHONE = "13900139000";
+	private static final Long SOURCE_LOADING_ID = 1800000000000000002L;
 
 	private static final Long NEED_ACCEPT_WAYBILL_ID = 3101L;
 	private static final Long NO_ACCEPT_WAYBILL_ID = 3102L;
@@ -80,6 +94,7 @@ class LoadingManageChildStatusWriteTest {
 		"carrier_type",
 		"carrier_contract_id",
 		"carrier_name",
+		"driver_id",
 		"driver_name",
 		"driver_phone",
 		"vehicle_no",
@@ -104,6 +119,8 @@ class LoadingManageChildStatusWriteTest {
 	private IProcessConfigService processConfigService;
 	private IContractManageService contractManageService;
 	private IReceivablePayableDetailService receivablePayableDetailService;
+	private IDriverService driverService;
+	private LoadingManageMapper loadingManageMapper;
 	private LoadingManageServiceImpl service;
 	private MockedStatic<AuthUtil> authUtil;
 
@@ -115,6 +132,7 @@ class LoadingManageChildStatusWriteTest {
 		assistant.setCurrentNamespace("test");
 		TableInfoHelper.initTableInfo(assistant, Waybill.class);
 		TableInfoHelper.initTableInfo(assistant, ProcessConfig.class);
+		TableInfoHelper.initTableInfo(assistant, LoadingManage.class);
 	}
 
 	@BeforeEach
@@ -123,14 +141,19 @@ class LoadingManageChildStatusWriteTest {
 		processConfigService = mock(IProcessConfigService.class);
 		contractManageService = mock(IContractManageService.class);
 		receivablePayableDetailService = mock(IReceivablePayableDetailService.class);
+		driverService = mock(IDriverService.class);
+		loadingManageMapper = mock(LoadingManageMapper.class);
 		service = spy(new LoadingManageServiceImpl());
 		inject(service, "waybillMapper", waybillMapper);
 		inject(service, "processConfigService", processConfigService);
 		inject(service, "contractManageService", contractManageService);
 		inject(service, "receivablePayableDetailService", receivablePayableDetailService);
+		inject(service, "driverService", driverService);
+		inject(service, "baseMapper", loadingManageMapper);
 		doReturnTrue(service);
 		authUtil = mockStatic(AuthUtil.class);
 		authUtil.when(AuthUtil::getDeptId).thenReturn(DEPT_ID);
+		authUtil.when(AuthUtil::getTenantId).thenReturn(TENANT_ID);
 	}
 
 	@AfterEach
@@ -309,6 +332,179 @@ class LoadingManageChildStatusWriteTest {
 		verify(processConfigService, never()).list(ArgumentMatchers.<Wrapper<ProcessConfig>>any());
 	}
 
+	@Test
+	@DisplayName("提交配载单：按手机号解析到档案 ID 时，配载单与子单一起记住归属")
+	void submitWritesResolvedDriverId() {
+		stubWaybills(waybill(NO_ACCEPT_WAYBILL_ID, NO_ACCEPT_PROJECT_ID));
+		stubConfigs(config(NO_ACCEPT_PROJECT_ID, NO_ACCEPT_JSON));
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(RESOLVED_DRIVER_ID);
+
+		assertTrue(service.submit(loadingForm(NO_ACCEPT_WAYBILL_ID)));
+
+		assertEquals(RESOLVED_DRIVER_ID, capturedLoading().getDriverId());
+		assertEquals(RESOLVED_DRIVER_ID, statusSyncUpdates().get(0).setValue("driver_id"),
+			"子单必须与配载单写同一个归属，否则司机端按归属查不到这张票");
+	}
+
+	@Test
+	@DisplayName("解析不到档案（承运商司机）：提交照常成功，归属留空")
+	void submitAllowsUnresolvedDriverId() {
+		stubWaybills(waybill(NO_ACCEPT_WAYBILL_ID, NO_ACCEPT_PROJECT_ID));
+		stubConfigs(config(NO_ACCEPT_PROJECT_ID, NO_ACCEPT_JSON));
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(null);
+
+		assertTrue(service.submit(loadingForm(NO_ACCEPT_WAYBILL_ID)));
+
+		assertNull(capturedLoading().getDriverId());
+		assertNull(statusSyncUpdates().get(0).setValue("driver_id"));
+	}
+
+	@Test
+	@DisplayName("进行中编辑保留的子单：任务字段更新也带上司机归属，改派后不留旧值")
+	void runningEditCarriesDriverIdToKeptWaybills() {
+		LoadingManage record = runningRecord();
+		stubLoadingRecord(record);
+		stubWaybills(waybill(NEED_ACCEPT_WAYBILL_ID, NEED_ACCEPT_PROJECT_ID));
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(RESOLVED_DRIVER_ID);
+
+		assertTrue(service.submit(editForm(LOADING_ID, NEED_ACCEPT_WAYBILL_ID)));
+
+		CapturedUpdate taskUpdate = waybillUpdates().stream()
+			.filter(update -> update.columns().contains("driver_name"))
+			.findFirst()
+			.orElseThrow();
+		assertEquals(List.of(NEED_ACCEPT_WAYBILL_ID), taskUpdate.whereIds());
+		assertEquals(RESOLVED_DRIVER_ID, taskUpdate.setValue("driver_id"));
+	}
+
+	@Test
+	@DisplayName("复制配载单：沿用源单的司机归属，不按手机号重解析覆盖")
+	void copyKeepsSourceDriverId() {
+		LoadingManage source = copySource();
+		source.setDriverId(555L);
+		stubCopyDependencies(source);
+
+		service.copy(SOURCE_LOADING_ID);
+
+		assertEquals(555L, capturedSaved().getDriverId());
+	}
+
+	@Test
+	@DisplayName("复制配载单：源单没有归属时，用手机号解析出的档案 ID")
+	void copyFallsBackToResolvedDriverId() {
+		LoadingManage source = copySource();
+		stubCopyDependencies(source);
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(RESOLVED_DRIVER_ID);
+
+		service.copy(SOURCE_LOADING_ID);
+
+		assertEquals(RESOLVED_DRIVER_ID, capturedSaved().getDriverId());
+	}
+
+	@Test
+	@DisplayName("已归属的单子号码没变：无关字段的保存不重解析，归属原样保留")
+	void unrelatedEditKeepsStoredDriverId() {
+		LoadingManage record = runningRecord();
+		record.setDriverId(RESOLVED_DRIVER_ID);
+		stubLoadingRecord(record);
+		stubWaybills(waybill(NEED_ACCEPT_WAYBILL_ID, NEED_ACCEPT_PROJECT_ID));
+		// 这一次谁都解析不到：只要实现还按手机号重解析，归属就会被清空
+		when(driverService.resolveDriverIdByMobile(any(), any())).thenReturn(null);
+
+		assertTrue(service.submit(editForm(LOADING_ID, NEED_ACCEPT_WAYBILL_ID)));
+
+		assertEquals(RESOLVED_DRIVER_ID, capturedLoading().getDriverId());
+		assertEquals(RESOLVED_DRIVER_ID, statusSyncUpdates().get(0).setValue("driver_id"));
+		verify(driverService, never()).resolveDriverIdByMobile(any(), any());
+	}
+
+	@Test
+	@DisplayName("人工补过归属的单子：号码恰好命中别人的档案，保存也不改归属")
+	void unrelatedEditKeepsManualOwnership() {
+		LoadingManage record = runningRecord();
+		record.setDriverId(MANUAL_DRIVER_ID);
+		stubLoadingRecord(record);
+		stubWaybills(waybill(NEED_ACCEPT_WAYBILL_ID, NEED_ACCEPT_PROJECT_ID));
+		when(driverService.resolveDriverIdByMobile(any(), any())).thenReturn(OTHER_PROFILE_ID);
+
+		assertTrue(service.submit(editForm(LOADING_ID, NEED_ACCEPT_WAYBILL_ID)));
+
+		assertEquals(MANUAL_DRIVER_ID, capturedLoading().getDriverId(),
+			"人工归属不能被一次无关保存改到同号的另一个档案上");
+		assertEquals(MANUAL_DRIVER_ID, statusSyncUpdates().get(0).setValue("driver_id"));
+	}
+
+	@Test
+	@DisplayName("-1 哨兵的归属：号码没变的保存原样保留，不抹成 NULL")
+	void sentinelDriverIdSurvivesUnrelatedEdit() {
+		LoadingManage record = runningRecord();
+		record.setDriverId(-1L);
+		stubLoadingRecord(record);
+		stubWaybills(waybill(NEED_ACCEPT_WAYBILL_ID, NEED_ACCEPT_PROJECT_ID));
+		when(driverService.resolveDriverIdByMobile(any(), any())).thenReturn(null);
+
+		assertTrue(service.submit(editForm(LOADING_ID, NEED_ACCEPT_WAYBILL_ID)));
+
+		assertEquals(-1L, capturedLoading().getDriverId());
+	}
+
+	@Test
+	@DisplayName("换司机：号码变了就按新号码重新解析，归属跟着换")
+	void changingPhoneResolvesNewDriverId() {
+		LoadingManage record = pendingRecord();
+		record.setDriverId(RESOLVED_DRIVER_ID);
+		stubLoadingRecord(record);
+		stubWaybills(waybill(NEED_ACCEPT_WAYBILL_ID, NEED_ACCEPT_PROJECT_ID));
+		stubConfigs(config(NEED_ACCEPT_PROJECT_ID, NEED_ACCEPT_JSON));
+		when(driverService.resolveDriverIdByMobile(any(), eq(OTHER_DRIVER_PHONE))).thenReturn(OTHER_PROFILE_ID);
+		LoadingManage form = editForm(LOADING_ID, NEED_ACCEPT_WAYBILL_ID);
+		form.setDriverPhone(OTHER_DRIVER_PHONE);
+
+		assertTrue(service.submit(form));
+
+		assertEquals(OTHER_PROFILE_ID, capturedLoading().getDriverId());
+		assertEquals(OTHER_PROFILE_ID, statusSyncUpdates().get(0).setValue("driver_id"));
+	}
+
+	@Test
+	@DisplayName("号码改成一个解析不到的号：归属落空，子单同步落空")
+	void changingPhoneToUnresolvedNumberClearsDriverId() {
+		LoadingManage record = pendingRecord();
+		record.setDriverId(RESOLVED_DRIVER_ID);
+		stubLoadingRecord(record);
+		stubWaybills(waybill(NEED_ACCEPT_WAYBILL_ID, NEED_ACCEPT_PROJECT_ID));
+		stubConfigs(config(NEED_ACCEPT_PROJECT_ID, NEED_ACCEPT_JSON));
+		when(driverService.resolveDriverIdByMobile(any(), eq(OTHER_DRIVER_PHONE))).thenReturn(null);
+		LoadingManage form = editForm(LOADING_ID, NEED_ACCEPT_WAYBILL_ID);
+		form.setDriverPhone(OTHER_DRIVER_PHONE);
+
+		assertTrue(service.submit(form));
+
+		assertNull(capturedLoading().getDriverId());
+		assertNull(statusSyncUpdates().get(0).setValue("driver_id"));
+	}
+
+	@Test
+	@DisplayName("解析不到档案：留一条脱敏 WARN，保存照常成功")
+	void unresolvedPhoneLogsMaskedWarning() {
+		stubWaybills(waybill(NO_ACCEPT_WAYBILL_ID, NO_ACCEPT_PROJECT_ID));
+		stubConfigs(config(NO_ACCEPT_PROJECT_ID, NO_ACCEPT_JSON));
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(null);
+		try (LogCapture logs = LogCapture.open(LoadingManageServiceImpl.class)) {
+			assertTrue(service.submit(loadingForm(NO_ACCEPT_WAYBILL_ID)));
+
+			String warning = logs.events().stream()
+				.filter(event -> event.getLevel() == Level.WARN)
+				.map(ILoggingEvent::getFormattedMessage)
+				.filter(message -> message.contains("司机档案"))
+				.findFirst()
+				.orElseThrow(() -> new AssertionError("解析失败必须留 WARN，实际日志：" + logs.messages()));
+			assertTrue(warning.contains("138****8000"), "WARN 里的号码必须脱敏，实际：" + warning);
+			assertFalse(warning.contains(DRIVER_PHONE), "WARN 里不能出现完整号码，实际：" + warning);
+			assertTrue(warning.contains(LOADING_NO), "WARN 要带业务标识（配载单号），实际：" + warning);
+		}
+	}
+
 	// ------------------------------------------------------------ 夹具
 
 	private LoadingManage loadingForm(Long... waybillIds) {
@@ -375,10 +571,54 @@ class LoadingManageChildStatusWriteTest {
 		return waybill;
 	}
 
-	private String capturedLoadingStatus() {
+	private LoadingManage runningRecord() {
+		LoadingManage record = loadingRecord("running", NEED_ACCEPT_WAYBILL_ID);
+		record.setVehicleNo("桂A12345");
+		record.setDriverName("张三");
+		record.setDriverPhone(DRIVER_PHONE);
+		return record;
+	}
+
+	private LoadingManage pendingRecord() {
+		LoadingManage record = loadingRecord("pending", NEED_ACCEPT_WAYBILL_ID);
+		record.setVehicleNo("桂A12345");
+		record.setDriverName("张三");
+		record.setDriverPhone(DRIVER_PHONE);
+		return record;
+	}
+
+	private LoadingManage copySource() {
+		LoadingManage source = loadingRecord("pending", NEED_ACCEPT_WAYBILL_ID);
+		source.setLoadingSubNos("YD-" + NEED_ACCEPT_WAYBILL_ID);
+		source.setTransportType("公路运输");
+		source.setVehicleNo("桂A12345");
+		source.setDriverName("张三");
+		source.setDriverPhone(DRIVER_PHONE);
+		source.setDepartureAddress("南宁");
+		source.setArrivalAddress("广州");
+		return source;
+	}
+
+	private void stubCopyDependencies(LoadingManage source) {
+		source.setId(SOURCE_LOADING_ID);
+		doReturn(source).when(service).getById(SOURCE_LOADING_ID);
+		doReturn(null).when(service).detail(any());
+	}
+
+	private LoadingManage capturedSaved() {
+		ArgumentCaptor<LoadingManage> captor = ArgumentCaptor.forClass(LoadingManage.class);
+		verify(service, atLeastOnce()).save(captor.capture());
+		return captor.getValue();
+	}
+
+	private LoadingManage capturedLoading() {
 		ArgumentCaptor<LoadingManage> captor = ArgumentCaptor.forClass(LoadingManage.class);
 		verify(service, atLeastOnce()).saveOrUpdate(captor.capture());
-		return captor.getValue().getBusinessStatus();
+		return captor.getValue();
+	}
+
+	private String capturedLoadingStatus() {
+		return capturedLoading().getBusinessStatus();
 	}
 
 	private void stubWaybills(Waybill... waybills) {
@@ -438,18 +678,28 @@ class LoadingManageChildStatusWriteTest {
 	}
 
 	private static void inject(LoadingManageServiceImpl target, String fieldName, Object value) {
-		try {
-			Field field = LoadingManageServiceImpl.class.getDeclaredField(fieldName);
-			field.setAccessible(true);
-			field.set(target, value);
-		} catch (ReflectiveOperationException exception) {
-			throw new IllegalStateException("注入测试替身失败：" + fieldName, exception);
+		Class<?> type = LoadingManageServiceImpl.class;
+		while (type != null) {
+			try {
+				Field field = type.getDeclaredField(fieldName);
+				field.setAccessible(true);
+				field.set(target, value);
+				return;
+			} catch (NoSuchFieldException ignored) {
+				type = type.getSuperclass();
+			} catch (ReflectiveOperationException exception) {
+				throw new IllegalStateException("注入测试替身失败：" + fieldName, exception);
+			}
 		}
+		throw new IllegalStateException("注入测试替身失败：" + fieldName);
 	}
 
 	/** 一条被捕获的批量更新：SET 的列 → 值、WHERE 的运单 id */
 	private record CapturedUpdate(String sqlSet, String whereSql, Map<String, Object> params, List<String> columns) {
 
+		private static final java.util.regex.Pattern PARAM_REF =
+			java.util.regex.Pattern.compile("#\\{ew\\.paramNameValuePairs\\.([^}]+)}");
+
 		@SuppressWarnings("unchecked")
 		static CapturedUpdate of(Wrapper<Waybill> wrapper) {
 			LambdaUpdateWrapper<Waybill> update = (LambdaUpdateWrapper<Waybill>) wrapper;
@@ -478,8 +728,20 @@ class LoadingManageChildStatusWriteTest {
 			return null;
 		}
 
+		/** 只认 WHERE 段用到的参数：SET 段的 driver_id 也是 Long，混进来会当成运单 id */
 		List<Long> whereIds() {
-			return params.values().stream().filter(Long.class::isInstance).map(Long.class::cast).toList();
+			Set<String> setParamKeys = new java.util.HashSet<>();
+			Matcher matcher = PARAM_REF.matcher(sqlSet);
+			while (matcher.find()) {
+				setParamKeys.add(matcher.group(1));
+			}
+			List<Long> ids = new java.util.ArrayList<>();
+			for (Map.Entry<String, Object> entry : params.entrySet()) {
+				if (entry.getValue() instanceof Long longValue && !setParamKeys.contains(entry.getKey())) {
+					ids.add(longValue);
+				}
+			}
+			return ids;
 		}
 	}
 }
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeBadgeTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeBadgeTest.java
new file mode 100644
index 00000000..d455cd83
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeBadgeTest.java
@@ -0,0 +1,138 @@
+package org.springblade.transport.service.impl;
+
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
+import org.mockito.MockedStatic;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.system.cache.UserDisplayCache;
+import org.springblade.transport.pojo.entity.ExceptionDisposal;
+import org.springblade.transport.pojo.entity.Waybill;
+import org.springblade.transport.pojo.vo.AdminHomeVO;
+import org.springblade.transport.pojo.vo.TripTabCountsVO;
+import org.springblade.transport.service.IDriverService;
+import org.springblade.transport.service.IDriverWaybillService;
+import org.springblade.transport.service.IExceptionDisposalService;
+import org.springblade.transport.service.ILoadingManageService;
+import org.springblade.transport.service.IRiskDisposalService;
+import org.springblade.transport.service.ITripQueryService;
+import org.springblade.transport.service.IWaybillService;
+import org.springblade.transport.support.MpUserDataScopeSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 调度端首页「异常处置」快捷入口的红点：只数待处理（pending）的异常。
+ * <p>
+ * 统计卡的「在途异常」仍按未了结（pending + processing）算，两处口径不同：红点是待办提醒，
+ * 处置中的异常已经在跟进，再算进红点会让它一直清不掉。
+ * <p>
+ * 这里走 {@code home()}：红点是聚合接口里的字段，只测计数方法证明不了它接在哪一处。
+ */
+class ManageAdminHomeBadgeTest {
+
+	private static final String DEPT_ID = "1123598813738675201";
+	private static final Long USER_ID = 1900000000000000001L;
+	private static final long PENDING_COUNT = 3L;
+	private static final long INCOMPLETE_COUNT = 7L;
+
+	private ManageWaybillServiceImpl service;
+	private IExceptionDisposalService exceptionService;
+	private MockedStatic<AuthUtil> authUtil;
+
+	@BeforeAll
+	static void initTableInfo() {
+		MybatisConfiguration configuration = new MybatisConfiguration();
+		MapperBuilderAssistant assistant = new MapperBuilderAssistant(configuration, "");
+		assistant.setCurrentNamespace("test");
+		TableInfoHelper.initTableInfo(assistant, Waybill.class);
+		TableInfoHelper.initTableInfo(assistant, ExceptionDisposal.class);
+	}
+
+	@BeforeEach
+	void setUp() {
+		IWaybillService waybillService = mock(IWaybillService.class);
+		exceptionService = mock(IExceptionDisposalService.class);
+		ITripQueryService tripQueryService = mock(ITripQueryService.class);
+		when(tripQueryService.tabCounts(ArgumentMatchers.any())).thenReturn(new TripTabCountsVO());
+		when(exceptionService.list(ArgumentMatchers.<Wrapper<ExceptionDisposal>>any()))
+			.thenReturn(new ArrayList<>());
+		when(waybillService.list(ArgumentMatchers.<Wrapper<Waybill>>any())).thenReturn(new ArrayList<>());
+		// 待重新派单的分页查询回它收到的 Page（总数从入参上读，回 null 会空指针）
+		when(waybillService.page(ArgumentMatchers.any(), ArgumentMatchers.any()))
+			.thenAnswer(invocation -> invocation.getArgument(0));
+		// 处置状态的计数被查两次：带 processing 的是「未了结」，只带 pending 的是「待处理」
+		when(exceptionService.count(ArgumentMatchers.<Wrapper<ExceptionDisposal>>any()))
+			.thenAnswer(invocation -> coversProcessing(invocation.getArgument(0)) ? INCOMPLETE_COUNT : PENDING_COUNT);
+		service = new ManageWaybillServiceImpl(
+			waybillService,
+			mock(IDriverService.class),
+			exceptionService,
+			mock(IRiskDisposalService.class),
+			mock(IDriverWaybillService.class),
+			tripQueryService,
+			mock(ILoadingManageService.class),
+			mock(org.springblade.transport.service.ITransportVehicleService.class),
+			mock(MpUserDataScopeSupport.class));
+		authUtil = mockStatic(AuthUtil.class);
+		authUtil.when(AuthUtil::getUserRole).thenReturn("yewu");
+		authUtil.when(AuthUtil::getDeptId).thenReturn(DEPT_ID);
+		authUtil.when(AuthUtil::getUserId).thenReturn(USER_ID);
+	}
+
+	@AfterEach
+	void tearDown() {
+		authUtil.close();
+	}
+
+	@Test
+	@DisplayName("红点只数待处理，统计卡的在途异常仍是未了结数")
+	void exceptionBadgeCountsPendingOnly() {
+		AdminHomeVO home;
+		try (MockedStatic<UserDisplayCache> ignored = mockStatic(UserDisplayCache.class)) {
+			home = service.home();
+		}
+
+		assertEquals(PENDING_COUNT, home.getBadges().getException(), "处置中的异常不再计入红点");
+		assertEquals(INCOMPLETE_COUNT, home.getStats().getException(), "统计卡口径不变：pending + processing");
+
+		ArgumentCaptor<Wrapper<ExceptionDisposal>> captor = ArgumentCaptor.forClass(Wrapper.class);
+		verify(exceptionService, times(2)).count(captor.capture());
+		List<String> segments = captor.getAllValues().stream()
+			.map(ManageAdminHomeBadgeTest::sqlSegment)
+			.collect(Collectors.toList());
+		assertTrue(segments.stream().anyMatch(segment -> segment.contains("disposal_status IN")),
+			"统计卡仍要数未了结：处置状态取 pending 与 processing 两档：" + segments);
+		assertTrue(segments.stream().anyMatch(segment -> segment.contains("disposal_status = ")),
+			"红点只认待处理：处置状态是等值条件，不再带 processing：" + segments);
+	}
+
+	/** 计数条件里是否含处置中：带 IN 的才是「pending + processing」那次查询 */
+	private static boolean coversProcessing(Wrapper<ExceptionDisposal> wrapper) {
+		return sqlSegment(wrapper).contains("disposal_status IN");
+	}
+
+	private static String sqlSegment(Wrapper<ExceptionDisposal> wrapper) {
+		return ((AbstractWrapper<?, ?, ?>) wrapper).getSqlSegment();
+	}
+
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeFeedTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeFeedTest.java
index a0228fcd..5567c1ff 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeFeedTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageAdminHomeFeedTest.java
@@ -85,6 +85,7 @@ class ManageAdminHomeFeedTest {
 			mock(IDriverWaybillService.class),
 			mock(ITripQueryService.class),
 			mock(ILoadingManageService.class),
+			mock(org.springblade.transport.service.ITransportVehicleService.class),
 			mock(org.springblade.transport.support.MpUserDataScopeSupport.class));
 		when(exceptionService.list(ArgumentMatchers.<Wrapper<ExceptionDisposal>>any()))
 			.thenReturn(new ArrayList<>());
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageTripListDetailTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageTripListDetailTest.java
index 0cb91cb2..1fbe9b16 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageTripListDetailTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageTripListDetailTest.java
@@ -102,6 +102,7 @@ class ManageTripListDetailTest {
 			driverWaybillService,
 			tripQueryService,
 			loadingManageService,
+			mock(org.springblade.transport.service.ITransportVehicleService.class),
 			mock(org.springblade.transport.support.MpUserDataScopeSupport.class));
 		when(exceptionDisposalService.list(ArgumentMatchers.<Wrapper<ExceptionDisposal>>any()))
 			.thenReturn(new ArrayList<>());
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillBusinessStatusTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillBusinessStatusTest.java
index 5a0efd11..8bcaab0c 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillBusinessStatusTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillBusinessStatusTest.java
@@ -66,6 +66,7 @@ class ManageWaybillBusinessStatusTest {
 			mock(IDriverWaybillService.class),
 			mock(ITripQueryService.class),
 			mock(ILoadingManageService.class),
+			mock(org.springblade.transport.service.ITransportVehicleService.class),
 			mock(org.springblade.transport.support.MpUserDataScopeSupport.class));
 		when(exceptionDisposalService.list(anyWrapper())).thenReturn(new ArrayList<>());
 	}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillOrgScopeTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillOrgScopeTest.java
index ad8d8b48..55edaeb5 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillOrgScopeTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/ManageWaybillOrgScopeTest.java
@@ -91,6 +91,7 @@ class ManageWaybillOrgScopeTest {
 			mock(IDriverWaybillService.class),
 			tripQueryService,
 			mock(ILoadingManageService.class),
+			mock(org.springblade.transport.service.ITransportVehicleService.class),
 			mpUserDataScopeSupport);
 		when(exceptionDisposalService.list(ArgumentMatchers.<Wrapper<ExceptionDisposal>>any()))
 			.thenReturn(new ArrayList<>());
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/MasterOrderDriverIdTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/MasterOrderDriverIdTest.java
new file mode 100644
index 00000000..c9290709
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/MasterOrderDriverIdTest.java
@@ -0,0 +1,143 @@
+package org.springblade.transport.service.impl;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springblade.transport.pojo.entity.MasterOrder;
+import org.springblade.transport.pojo.entity.Waybill;
+import org.springblade.transport.service.IContractManageService;
+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.LogCapture;
+
+import java.lang.reflect.Method;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 多联总单派单建运单时写司机档案 ID 的测试。
+ * <p>
+ * 派单请求可能来自调度（带档案 ID），也可能只填了姓名手机号（手工派单、承运商司机），
+ * 后者按手机号解析；解析不到也不能挡住派单。
+ */
+class MasterOrderDriverIdTest {
+
+	private static final String DRIVER_PHONE = "13800138000";
+	private static final Long RESOLVED_DRIVER_ID = 9321L;
+
+	private IWaybillService waybillService;
+	private IDriverService driverService;
+	private MasterOrderServiceImpl service;
+
+	@BeforeEach
+	void setUp() {
+		waybillService = mock(IWaybillService.class);
+		driverService = mock(IDriverService.class);
+		service = new MasterOrderServiceImpl(waybillService, mock(ITransportPlanService.class),
+			mock(IProjectApplyService.class), mock(IContractManageService.class), driverService);
+		when(waybillService.submit(any(Waybill.class))).thenReturn(true);
+	}
+
+	@Test
+	@DisplayName("调度带了档案 ID：按它写，不再按手机号解析")
+	void keepsExplicitDriverId() throws Exception {
+		Map<String, Object> dispatch = dispatch();
+		dispatch.put("driverId", 7001L);
+
+		assertTrue(createWaybill(dispatch));
+
+		assertEquals(7001L, submittedWaybill().getDriverId());
+		verify(driverService, never()).resolveDriverIdByMobile(any(), any());
+	}
+
+	@Test
+	@DisplayName("只填了手机号：派单时解析出档案 ID 写入运单")
+	void resolvesDriverIdFromPhone() throws Exception {
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(RESOLVED_DRIVER_ID);
+
+		assertTrue(createWaybill(dispatch()));
+
+		assertEquals(RESOLVED_DRIVER_ID, submittedWaybill().getDriverId());
+	}
+
+	@Test
+	@DisplayName("解析不到档案（承运商司机）：运单照常提交，归属留空")
+	void allowsDispatchWithoutProfile() throws Exception {
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(null);
+
+		assertTrue(createWaybill(dispatch()));
+
+		assertNull(submittedWaybill().getDriverId());
+		verify(waybillService).submit(any(Waybill.class));
+	}
+
+	@Test
+	@DisplayName("解析不到档案：落空时留一条脱敏 WARN，派单照常成功")
+	void unresolvedProfileLogsMaskedWarning() throws Exception {
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(null);
+		try (LogCapture logs = LogCapture.open(MasterOrderServiceImpl.class)) {
+			assertTrue(createWaybill(dispatch()));
+
+			String warning = logs.events().stream()
+				.filter(event -> event.getLevel() == Level.WARN)
+				.map(ILoggingEvent::getFormattedMessage)
+				.filter(message -> message.contains("司机档案"))
+				.findFirst()
+				.orElseThrow(() -> new AssertionError("解析失败必须留 WARN，实际日志：" + logs.messages()));
+			assertTrue(warning.contains("138****8000"), "WARN 里的号码必须脱敏，实际：" + warning);
+			assertFalse(warning.contains(DRIVER_PHONE), "WARN 里不能出现完整号码，实际：" + warning);
+			assertTrue(warning.contains("ZD-20261027-001"), "WARN 要带业务标识（总单号），实际：" + warning);
+		}
+	}
+
+	// ------------------------------------------------------------ 夹具
+
+	private boolean createWaybill(Map<String, Object> dispatch) throws Exception {
+		MasterOrder masterOrder = new MasterOrder();
+		masterOrder.setId(1L);
+		masterOrder.setMasterNo("ZD-20261027-001");
+		masterOrder.setProjectId(2101L);
+		masterOrder.setProjectName("测试项目");
+		Method method = MasterOrderServiceImpl.class
+			.getDeclaredMethod("createWaybill", MasterOrder.class, List.class);
+		method.setAccessible(true);
+		return (boolean) method.invoke(service, masterOrder, List.of(dispatch));
+	}
+
+	private Map<String, Object> dispatch() {
+		Map<String, Object> dispatch = new LinkedHashMap<>();
+		dispatch.put("documentType", "运单");
+		dispatch.put("transportType", "公路运输");
+		dispatch.put("carrierType", "自运");
+		dispatch.put("driverName", "张三");
+		dispatch.put("driverPhone", DRIVER_PHONE);
+		dispatch.put("vehicleNo", "桂A12345");
+		dispatch.put("quantity", 1);
+		dispatch.put("unitPrice", 100);
+		return dispatch;
+	}
+
+	private Waybill submittedWaybill() {
+		ArgumentCaptor<Waybill> captor = ArgumentCaptor.forClass(Waybill.class);
+		verify(waybillService).submit(captor.capture());
+		return captor.getValue();
+	}
+
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/MasterOrderProgressTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/MasterOrderProgressTest.java
index f7d77747..aa52fec8 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/MasterOrderProgressTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/MasterOrderProgressTest.java
@@ -14,6 +14,7 @@ import org.springblade.transport.pojo.entity.TransportPlan;
 import org.springblade.transport.pojo.entity.Waybill;
 import org.springblade.transport.pojo.vo.MasterOrderVO;
 import org.springblade.transport.service.IContractManageService;
+import org.springblade.transport.service.IDriverService;
 import org.springblade.transport.service.IProjectApplyService;
 import org.springblade.transport.service.ITransportPlanService;
 import org.springblade.transport.service.IWaybillService;
@@ -67,7 +68,8 @@ class MasterOrderProgressTest {
 			waybillService,
 			transportPlanService,
 			mock(IProjectApplyService.class),
-			mock(IContractManageService.class));
+			mock(IContractManageService.class),
+			mock(IDriverService.class));
 		inject("baseMapper", masterOrderMapper);
 
 		when(transportPlanService.list(anyWrapper())).thenReturn(List.of());
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/PersonCertRoundTripTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/PersonCertRoundTripTest.java
index 0fee6807..d6e3c229 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/PersonCertRoundTripTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/PersonCertRoundTripTest.java
@@ -108,7 +108,7 @@ class PersonCertRoundTripTest {
 	void submitThenApprove() {
 		// 1) 先走一遍完整流程，让该司机有一个生效值
 		Long firstRecordId = driverCertService.submitPersonCert(personCert("张三", "110101199001011234"));
-		certAuditService.audit(firstRecordId, true, null);
+		certAuditService.audit(firstRecordId, true, null, null);
 		assertEquals("张三", driverCertService.getEffectivePersonCert().getRealName(),
 			"审核通过后应能查到生效值");
 
@@ -120,7 +120,7 @@ class PersonCertRoundTripTest {
 			"指针应仍指向原来那条已通过记录");
 
 		// 3) 审核通过：生效值才变成新值
-		certAuditService.audit(secondRecordId, true, null);
+		certAuditService.audit(secondRecordId, true, null, null);
 		assertEquals("张三改名", driverCertService.getEffectivePersonCert().getRealName(),
 			"审核通过后生效值应切到新记录");
 		assertEquals(secondRecordId, driver.getEffectiveCertRecordId());
@@ -130,10 +130,10 @@ class PersonCertRoundTripTest {
 	@DisplayName("驳回后生效值不变（已认证对象不会被驳回下线）")
 	void rejectKeepsEffectiveValue() {
 		Long firstRecordId = driverCertService.submitPersonCert(personCert("张三", "110101199001011234"));
-		certAuditService.audit(firstRecordId, true, null);
+		certAuditService.audit(firstRecordId, true, null, null);
 
 		Long secondRecordId = driverCertService.submitPersonCert(personCert("张三改名", "110101199001011234"));
-		certAuditService.audit(secondRecordId, false, "证件照片模糊");
+		certAuditService.audit(secondRecordId, false, "证件照片模糊", null);
 
 		assertEquals("张三", driverCertService.getEffectivePersonCert().getRealName(),
 			"驳回只终结该次提交，既得认证必须保持有效");
@@ -149,7 +149,7 @@ class PersonCertRoundTripTest {
 		assertNull(driverCertService.getEffectivePersonCert(),
 			"待审期间不应有生效值");
 
-		certAuditService.audit(recordId, true, null);
+		certAuditService.audit(recordId, true, null, null);
 		assertEquals("张三", driverCertService.getEffectivePersonCert().getRealName());
 	}
 
@@ -171,18 +171,18 @@ class PersonCertRoundTripTest {
 		// 被作废的那条不能再被审核（否则会把已作废的记录变成生效值）
 		org.junit.jupiter.api.Assertions.assertThrows(
 			org.springblade.core.log.exception.ServiceException.class,
-			() -> certAuditService.audit(first, true, null));
+			() -> certAuditService.audit(first, true, null, null));
 	}
 
 	@Test
 	@DisplayName("已通过的记录不可再被审核（防止把生效快照改坏）")
 	void approvedRecordCannotBeReaudited() {
 		Long recordId = driverCertService.submitPersonCert(personCert("张三", "110101199001011234"));
-		certAuditService.audit(recordId, true, null);
+		certAuditService.audit(recordId, true, null, null);
 
 		org.junit.jupiter.api.Assertions.assertThrows(
 			org.springblade.core.log.exception.ServiceException.class,
-			() -> certAuditService.audit(recordId, false, "事后反悔"));
+			() -> certAuditService.audit(recordId, false, "事后反悔", null));
 		assertEquals("张三", driverCertService.getEffectivePersonCert().getRealName(),
 			"重复审核被拒后，生效值不受影响");
 	}
@@ -314,7 +314,7 @@ class PersonCertRoundTripTest {
 		request.setQualificationBack("http://example.com/q-back.jpg");
 
 		Long recordId = driverCertService.submitPersonCert(request);
-		certAuditService.audit(recordId, true, null);
+		certAuditService.audit(recordId, true, null, null);
 
 		// 档案里必须是这次提交的内容：只切指针、不写内容的话，
 		// 认证状态显示「已通过」而档案仍是旧值，管理端与司机端会各看各的
@@ -342,7 +342,7 @@ class PersonCertRoundTripTest {
 		request.setAddressRegion("   ");
 		request.setAddress("");
 		Long recordId = driverCertService.submitPersonCert(request);
-		certAuditService.audit(recordId, true, null);
+		certAuditService.audit(recordId, true, null, null);
 
 		// 框架的 not_null 更新策略只跳过 null：写空串会把管理端填过的住址清掉
 		assertEquals("广西壮族自治区柳州市柳北区", driver.getAddressRegion(),
@@ -358,7 +358,7 @@ class PersonCertRoundTripTest {
 		driver.setIdCardNo("110101199001011234");
 
 		Long recordId = driverCertService.submitPersonCert(personCert("张三改名", "110101199001011234"));
-		certAuditService.audit(recordId, true, null);
+		certAuditService.audit(recordId, true, null, null);
 
 		// 审核通过即认可这次申报：档案里必须也是申报的姓名，
 		// 否则司机端卡片显示档案名、「重新认证」表单回填快照名，同一个页面上两个名字
@@ -377,7 +377,7 @@ class PersonCertRoundTripTest {
 		Long recordId = driverCertService.submitPersonCert(personCert("张三", "110101199001011999"));
 
 		ServiceException exception = assertThrows(ServiceException.class,
-			() -> certAuditService.audit(recordId, true, null));
+			() -> certAuditService.audit(recordId, true, null, null));
 		assertTrue(exception.getMessage().contains("另一名司机档案"), exception.getMessage());
 		// 真实环境下这次审核由 @Transactional 整体回滚（记录仍是待审）；
 		// 单测没有事务，故这里校验更直接的一点：拦截发生在写档案之前，别人的证件号没被写进来
@@ -392,25 +392,27 @@ class PersonCertRoundTripTest {
 		PersonCertSubmitRequest request = personCert("张三", "110101199001011234");
 		request.setHeadPhoto("http://example.com/new-head.jpg");
 		Long recordId = driverCertService.submitPersonCert(request);
-		certAuditService.audit(recordId, false, "证件照片模糊");
+		certAuditService.audit(recordId, false, "证件照片模糊", null);
 
 		assertEquals("http://example.com/original-head.jpg", driver.getHeadPhoto(),
 			"驳回只终结该次提交，档案内容不得被改动");
 	}
 
 	@Test
-	@DisplayName("历史快照：读不懂就跳过写回，审核本身照常通过")
-	void legacySnapshotSkipsWriteBackWithoutFailingAudit() {
-		// 早期格式的快照没有 idCardNo / driverFileNo，解析出来字段全是 null；
-		// 此时既不能把 null 当成「司机没填」写进档案，也不能让这次审核直接失败
+	@DisplayName("历史快照：读不懂就拒绝通过并回滚（不再静默放行）")
+	void legacySnapshotBlocksAuditInsteadOfPassing() {
+		// 早期格式的快照没有 idCardNo / driverFileNo，解析出来字段全是 null。
+		// 「通过」的语义是「把这批内容认定为生效值」，内容读不懂就无从认定，
+		// 必须拒绝——静默放行等于给一条空记录盖上已通过的章。
 		Long recordId = driverCertService.submitPersonCert(personCert("张三", "110101199001011234"));
 		TransportCertRecord record = recordStore.get(recordId);
 		record.setSnapshotJson("{\"legacyField\":\"早期格式的旧内容\"}");
 
-		certAuditService.audit(recordId, true, null);
+		ServiceException exception = assertThrows(ServiceException.class,
+			() -> certAuditService.audit(recordId, true, null, null));
 
-		assertEquals(TransportCertRecord.STATUS_APPROVED, recordStore.get(recordId).getStatus(),
-			"快照读不懂不该阻断审核");
-		assertEquals(recordId, driver.getEffectiveCertRecordId(), "指针仍应照常切换");
+		assertTrue(exception.getMessage().contains("不匹配"), exception.getMessage());
+		// 内存版记录表没有事务，这里只验最关键的一条：生效指针不能被切过去
+		assertNull(driver.getEffectiveCertRecordId(), "审核失败不得切换生效指针");
 	}
 }
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripQueryServiceImplTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripQueryServiceImplTest.java
index d717921a..b12f1624 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripQueryServiceImplTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripQueryServiceImplTest.java
@@ -50,7 +50,10 @@ import static org.mockito.Mockito.when;
  */
 class TripQueryServiceImplTest {
 
+	/** 派单时的司机手机号快照：只用于展示，归属判据是下面的档案 ID */
 	private static final String PHONE = "17587421208";
+	private static final Long DRIVER_ID = 9001L;
+	private static final Long OTHER_DRIVER_ID = 9002L;
 	private static final String LOADING_NO = "PZ-20261017-001";
 	private static final Long LOADING_ID = 2111350784070275123L;
 	private static final Long WAYBILL_ID = 2110690671695380513L;
@@ -85,7 +88,7 @@ class TripQueryServiceImplTest {
 	@Test
 	@DisplayName("段一在库层只做收口与行级筛选，分组与分档不在 SQL 里")
 	void rowsAreFetchedWithoutDatabaseGrouping() {
-		TripQueryVO query = TripQueryVO.forDriver(PHONE);
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
 		query.setStatus(1);
 		query.setCurrent(1);
 		query.setSize(10);
@@ -98,9 +101,9 @@ class TripQueryServiceImplTest {
 		assertFalse(sql.contains("LIMIT"), "分页在服务层，不在 wrapper 里拼：" + sql);
 		assertFalse(sql.contains("MAX(create_time)"), "排序键在服务层算：" + sql);
 		assertTrue(sql.contains("blade_loading_manage"), "配载段按配载单的司机收口：" + sql);
-		assertTrue(sql.contains("lm.driver_phone = ?"), "司机手机号要作为参数下发：" + sql);
-		assertTrue(sql.contains("REPLACE(IFNULL(driver_phone, ''), ' ', '') = ?"),
-			"未配载段按运单司机收口，且容忍手机号带空格：" + sql);
+		assertTrue(sql.contains("lm.driver_id = ?"), "配载段按配载单的司机档案 ID 收口：" + sql);
+		assertTrue(sql.contains("driver_id = ?"), "未配载段按运单的司机档案 ID 收口：" + sql);
+		assertFalse(sql.contains("driver_phone"), "手机号不再是归属判据：" + sql);
 		assertTrue(sql.contains("business_status IN"), "草稿子单不成运次：" + sql);
 		assertTrue(sql.contains("driver_accept_status"), "被该司机拒单的子单不进运次：" + sql);
 	}
@@ -108,7 +111,7 @@ class TripQueryServiceImplTest {
 	@Test
 	@DisplayName("段一只 select 用得上的列，大 JSON 列不拖回来")
 	void onlyNeededColumnsAreSelected() {
-		service.page(TripQueryVO.forDriver(PHONE));
+		service.page(TripQueryVO.forDriver(DRIVER_ID));
 
 		String select = String.valueOf(capturedRowQuery().getSqlSelect());
 		assertTrue(select.contains("process_json"), "分档要按过程配置推导，必须取：" + select);
@@ -124,7 +127,7 @@ class TripQueryServiceImplTest {
 	@Test
 	@DisplayName("组织收口给了就落在库层运单行上，分档与分页都由缩过的行集合算")
 	void deptScopeIsAppliedOnRows() {
-		TripQueryVO query = TripQueryVO.forDriver(PHONE);
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
 		query.setDeptIds(List.of(1123598813738675202L, 1123598813738675201L));
 
 		service.page(query);
@@ -134,7 +137,7 @@ class TripQueryServiceImplTest {
 		Set<Object> values = new HashSet<>(capturedRowQuery().getParamNameValuePairs().values());
 		assertTrue(values.contains(1123598813738675202L) && values.contains(1123598813738675201L),
 			"组织值按参数下发：" + values);
-		assertTrue(capturedRowSql().contains("driver_phone"), "组织收口不顶替司机收口：两种收口同时生效");
+		assertTrue(capturedRowSql().contains("driver_id"), "组织收口不顶替司机收口：两种收口同时生效");
 	}
 
 	@Test
@@ -152,7 +155,7 @@ class TripQueryServiceImplTest {
 	@Test
 	@DisplayName("组织收口缺省时不下发组织条件：超管与司机端都按不传处理")
 	void deptScopeIsOptional() {
-		service.page(TripQueryVO.forDriver(PHONE));
+		service.page(TripQueryVO.forDriver(DRIVER_ID));
 
 		assertFalse(capturedRowSql().contains("dept_id"), "不给组织集合即不过滤：" + capturedRowSql());
 	}
@@ -165,7 +168,7 @@ class TripQueryServiceImplTest {
 			waybill(2L, "YD-2", null, "completed", "accepted", at(2000L), ACCEPT_NO),
 			waybill(3L, "YD-3", null, "running", "accepted", at(1000L), ACCEPT_NO));
 
-		TripQueryVO doing = TripQueryVO.forDriver(PHONE);
+		TripQueryVO doing = TripQueryVO.forDriver(DRIVER_ID);
 		doing.setStatus(1);
 		IPage<TripVO> doingPage = service.page(doing);
 
@@ -175,11 +178,11 @@ class TripQueryServiceImplTest {
 		assertTrue(doingPage.getRecords().stream().allMatch(trip -> Integer.valueOf(1).equals(trip.getStatus())),
 			"每张卡的 status 都要等于这一档");
 
-		TripQueryVO done = TripQueryVO.forDriver(PHONE);
+		TripQueryVO done = TripQueryVO.forDriver(DRIVER_ID);
 		done.setStatus(2);
 		assertEquals(List.of("2"), service.page(done).getRecords().stream().map(TripVO::getId).toList());
 
-		TripQueryVO all = TripQueryVO.forDriver(PHONE);
+		TripQueryVO all = TripQueryVO.forDriver(DRIVER_ID);
 		all.setStatus(null);
 		assertEquals(3, service.page(all).getTotal(), "不传 Tab 为全部（不含已取消）");
 	}
@@ -192,12 +195,12 @@ class TripQueryServiceImplTest {
 			waybill(2L, "YD-2", null, "running", null, at(2000L), ACCEPT_YES),
 			waybill(1L, "YD-1", null, "pending", "pending", at(1000L), ACCEPT_NO));
 
-		TripQueryVO pending = TripQueryVO.forDriver(PHONE);
+		TripQueryVO pending = TripQueryVO.forDriver(DRIVER_ID);
 		pending.setStatus(0);
 		assertEquals(List.of("2"), service.page(pending).getRecords().stream().map(TripVO::getId).toList(),
 			"库值 running 但要接单未接 → 落待接单档");
 
-		TripQueryVO doing = TripQueryVO.forDriver(PHONE);
+		TripQueryVO doing = TripQueryVO.forDriver(DRIVER_ID);
 		doing.setStatus(1);
 		assertEquals(List.of("1"), service.page(doing).getRecords().stream().map(TripVO::getId).toList(),
 			"库值 pending 但不需要接单 → 落进行中档");
@@ -212,8 +215,8 @@ class TripQueryServiceImplTest {
 			List.of(
 				waybill(1L, "YD-1", LOADING_NO, "running", null, at(3000L), ACCEPT_YES),
 				waybill(2L, "YD-2", LOADING_NO, "running", null, at(2000L), ACCEPT_YES)));
-		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(PHONE)));
-		TripQueryVO query = TripQueryVO.forDriver(PHONE);
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
 		query.setKeyword("PZ-20261017");
 
 		TripVO trip = service.page(query).getRecords().get(0);
@@ -232,7 +235,7 @@ class TripQueryServiceImplTest {
 	void unloadedWaybillIsItsOwnTrip() {
 		stubRows(waybill(WAYBILL_ID, "YD-20260920-0003", null, "running", null, at(1000L), ACCEPT_NO));
 
-		IPage<TripVO> page = service.page(TripQueryVO.forDriver(PHONE));
+		IPage<TripVO> page = service.page(TripQueryVO.forDriver(DRIVER_ID));
 
 		assertEquals(1, page.getTotal());
 		assertEquals(1, page.getRecords().size());
@@ -256,7 +259,7 @@ class TripQueryServiceImplTest {
 		row.setMasterNo("DL-20261001-0001");
 		stubRows(row);
 
-		TripVO trip = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
+		TripVO trip = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
 
 		assertEquals(Boolean.TRUE, trip.getMultimodal(), "挂总单即含多式联运");
 		assertEquals("common", trip.getTransportOrgType(), "运输类型是组织形态维，与多式联运各算一个值");
@@ -270,9 +273,9 @@ class TripQueryServiceImplTest {
 		stubRows(
 			onMasterOrder,
 			waybill(2092186187470467073L, "YD-2", LOADING_NO, "running", null, at(1000L), ACCEPT_NO));
-		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(PHONE)));
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
 
-		TripVO trip = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
+		TripVO trip = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
 
 		assertEquals("load", trip.getTransportOrgType());
 		assertEquals(Boolean.TRUE, trip.getMultimodal(), "两个事实叠加，不做互斥单选");
@@ -283,7 +286,7 @@ class TripQueryServiceImplTest {
 	void unloadedTripStateComesFromFetchedWaybill() {
 		stubRows(waybill(WAYBILL_ID, "YD-20260920-0003", null, "pending", "pending", at(1000L), ACCEPT_YES));
 
-		TripVO trip = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
+		TripVO trip = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
 
 		assertEquals(Boolean.TRUE, trip.getRequireAccept());
 		assertEquals("pending", trip.getAcceptStatus());
@@ -300,7 +303,7 @@ class TripQueryServiceImplTest {
 		row.setEstimatedEndTime(LocalDate.of(2026, 8, 24));
 		stubRows(row);
 
-		TripVO listed = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
+		TripVO listed = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
 
 		assertEquals(LocalDate.of(2026, 8, 7), listed.getEstimatedStartDate(), "列表卡片与详情同源，不能只在列表补");
 		assertEquals(LocalDate.of(2026, 8, 24), listed.getEstimatedEndDate());
@@ -319,7 +322,7 @@ class TripQueryServiceImplTest {
 	void loadingMissingIsDropped() {
 		stubRows(waybill(2092186187239780353L, "YD-20260825-0006", LOADING_NO, "running", null, at(1000L), ACCEPT_YES));
 
-		IPage<TripVO> page = service.page(TripQueryVO.forDriver(PHONE));
+		IPage<TripVO> page = service.page(TripQueryVO.forDriver(DRIVER_ID));
 
 		assertTrue(page.getRecords().isEmpty(), "配载单取不到就不给这一趟车");
 		assertEquals(1, page.getTotal(), "总数按运次算，卡片少一张时总数仍在");
@@ -335,9 +338,9 @@ class TripQueryServiceImplTest {
 			waybill(2092186187470467073L, "YD-20260825-0007", LOADING_NO, "running", null, earlier, ACCEPT_NO),
 			waybill(2092186187571130369L, "YD-20260825-0008", LOADING_NO, "running", null, earlier, ACCEPT_NO),
 			waybill(2102780956493299713L, "YD-20260923-0008", LOADING_NO, "running", null, latest, ACCEPT_NO));
-		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(PHONE)));
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
 
-		TripVO trip = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
+		TripVO trip = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
 
 		assertEquals(String.valueOf(LOADING_ID), trip.getId());
 		assertEquals(LOADING_NO, trip.getLoadingNo());
@@ -358,9 +361,9 @@ class TripQueryServiceImplTest {
 		stubRows(
 			waybill(2092186187239780353L, "YD-1", LOADING_NO, "pending", "pending", at(2000L), ACCEPT_YES),
 			waybill(2092186187470467073L, "YD-2", LOADING_NO, "running", null, at(1000L), ACCEPT_NO));
-		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(PHONE)));
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
 
-		TripVO trip = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
+		TripVO trip = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
 
 		assertEquals(Boolean.TRUE, trip.getRequireAccept(), "跨项目按 OR 合并：一张要接单整趟车都要接单");
 		assertEquals("pending", trip.getAcceptStatus());
@@ -372,8 +375,8 @@ class TripQueryServiceImplTest {
 	void repeatedReadsDoNotDriftAndNeverWrite() {
 		stubOneLoadedTrip();
 
-		TripVO first = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
-		TripVO second = service.page(TripQueryVO.forDriver(PHONE)).getRecords().get(0);
+		TripVO first = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
+		TripVO second = service.page(TripQueryVO.forDriver(DRIVER_ID)).getRecords().get(0);
 
 		assertEquals(first.getStatus(), second.getStatus());
 		assertEquals(first.getAcceptStatus(), second.getAcceptStatus());
@@ -412,19 +415,19 @@ class TripQueryServiceImplTest {
 			waybill(2L, "YD-2", null, "running", null, at(2000L), ACCEPT_YES),
 			waybill(1L, "YD-1", null, "running", null, at(1000L), ACCEPT_YES));
 
-		TripQueryVO firstPage = TripQueryVO.forDriver(PHONE);
+		TripQueryVO firstPage = TripQueryVO.forDriver(DRIVER_ID);
 		firstPage.setCurrent(1);
 		firstPage.setSize(2);
 		assertEquals(3, service.page(firstPage).getTotal(), "总数是过滤后的运次数，不是运单数");
 		assertEquals(List.of("3", "2"), service.page(firstPage).getRecords().stream().map(TripVO::getId).toList());
 
-		TripQueryVO secondPage = TripQueryVO.forDriver(PHONE);
+		TripQueryVO secondPage = TripQueryVO.forDriver(DRIVER_ID);
 		secondPage.setCurrent(2);
 		secondPage.setSize(2);
 		assertEquals(List.of("1"), service.page(secondPage).getRecords().stream().map(TripVO::getId).toList(),
 			"第 2 页接着第 1 页，不重复不遗漏");
 
-		TripQueryVO bySeven = TripQueryVO.forDriver(PHONE);
+		TripQueryVO bySeven = TripQueryVO.forDriver(DRIVER_ID);
 		bySeven.setCurrent(1);
 		bySeven.setSize(7);
 		assertEquals(3, service.page(bySeven).getTotal(), "换每页条数总数不变");
@@ -440,7 +443,7 @@ class TripQueryServiceImplTest {
 			waybill(2L, "YD-2", null, "running", null, at(2000L), ACCEPT_NO),
 			waybill(1L, "YD-1", null, "completed", "accepted", at(1000L), ACCEPT_NO));
 
-		TripTabCountsVO counts = service.tabCounts(TripQueryVO.forDriver(PHONE));
+		TripTabCountsVO counts = service.tabCounts(TripQueryVO.forDriver(DRIVER_ID));
 
 		assertEquals(1, counts.getPending());
 		assertEquals(2, counts.getDoing());
@@ -476,7 +479,7 @@ class TripQueryServiceImplTest {
 		stubRows(
 			waybill(2L, "YD-2", LOADING_NO, "completed", "accepted", at(2000L), ACCEPT_NO),
 			waybill(1L, "YD-1", LOADING_NO, "running", null, at(1000L), ACCEPT_NO));
-		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(PHONE)));
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
 		TripQueryVO query = TripQueryVO.forAdmin();
 		query.setException("exception");
 		query.setExceptionWaybillIds(java.util.Set.of(2L));
@@ -572,7 +575,7 @@ class TripQueryServiceImplTest {
 	@Test
 	@DisplayName("详情与列表同口径：子单快照没有接单节点、项目生效配置要求接单时，详情也算待接单")
 	void detailUsesLiveProcessConfig() {
-		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(PHONE));
+		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(DRIVER_ID));
 		Waybill child = waybill(2092186187239780353L, "YD-20260915-0001", LOADING_NO, "running", "pending",
 			at(2000L), ACCEPT_NO);
 		child.setProjectId(7001L);
@@ -590,7 +593,7 @@ class TripQueryServiceImplTest {
 	@Test
 	@DisplayName("详情仍是只读取数：生效配置只写回内存里的行，不落库")
 	void detailStaysReadOnly() {
-		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(PHONE));
+		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(DRIVER_ID));
 		Waybill child = waybill(2092186187239780353L, "YD-20260915-0001", LOADING_NO, "running", "pending",
 			at(2000L), ACCEPT_NO);
 		child.setProjectId(7001L);
@@ -611,7 +614,7 @@ class TripQueryServiceImplTest {
 		when(loadingManageService.getById(WAYBILL_ID)).thenReturn(null);
 		when(waybillService.getById(WAYBILL_ID))
 			.thenReturn(waybill(WAYBILL_ID, "YD-20260920-0003", null, "running", null, at(1000L), ACCEPT_YES));
-		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(PHONE));
+		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(DRIVER_ID));
 		stubChildren();
 
 		TripVO lone = service.detail(tripQuery(String.valueOf(WAYBILL_ID)));
@@ -627,13 +630,13 @@ class TripQueryServiceImplTest {
 	@Test
 	@DisplayName("详情的收口与列表一致：别人的运次、子单全被拒单的配载运次都不可达")
 	void detailRefusesForeignTrips() {
-		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading("13800000001"));
+		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(OTHER_DRIVER_ID));
 		when(waybillService.getById(WAYBILL_ID))
 			.thenReturn(waybill(WAYBILL_ID, "YD-20260920-0003", null, "running", null, at(1000L), ACCEPT_YES));
 
 		assertThrows(ServiceException.class, () -> service.detail(tripQuery(String.valueOf(LOADING_ID))));
 
-		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(PHONE));
+		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(DRIVER_ID));
 		when(waybillService.list(anyWaybillWrapper())).thenReturn(List.of());
 		assertThrows(ServiceException.class, () -> service.detail(tripQuery(String.valueOf(LOADING_ID))));
 
@@ -647,14 +650,119 @@ class TripQueryServiceImplTest {
 	void rejectedChildrenLeaveTheTrip() {
 		// 段一的可见口径已经把被拒子单挡在库层，取回来是空则这趟车不存在
 		stubRows();
-		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(PHONE)));
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
 
-		IPage<TripVO> page = service.page(TripQueryVO.forDriver(PHONE));
+		IPage<TripVO> page = service.page(TripQueryVO.forDriver(DRIVER_ID));
 
 		assertTrue(page.getRecords().isEmpty(), "可见子单为空时不给没有子单的运次");
 		assertEquals(0, page.getTotal());
 	}
 
+	// ------------------------------------------------------------ 收口判据：司机档案 ID
+
+	@Test
+	@DisplayName("司机改号后运次仍可见：判据是档案 ID，派单快照号不再参与")
+	void driverScopeSurvivesPhoneChange() {
+		Waybill lone = waybill(7001L, "YD-LONE-0001", null, "running", null, at(1000L), ACCEPT_YES);
+		stubRows(
+			waybill(2092186187239780353L, "YD-20260825-0006", LOADING_NO, "running", null, at(2000L), ACCEPT_YES),
+			lone);
+		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(DRIVER_ID));
+		when(waybillService.getById(7001L)).thenReturn(lone);
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
+
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
+		query.setCurrent(1);
+		query.setSize(10);
+		IPage<TripVO> page = service.page(query);
+
+		assertEquals(2, page.getTotal(), "档案换号不影响归属：已配载与未配载两段都要按档案 ID 命中");
+		assertEquals(Set.of(LOADING_NO, "YD-LONE-0001"),
+			page.getRecords().stream().map(TripVO::getTripNo).collect(java.util.stream.Collectors.toSet()));
+		assertTrue(page.getRecords().stream().allMatch(trip -> PHONE.equals(trip.getDriverPhone())),
+			"响应里的司机手机号仍是派单快照，改号后不变");
+
+		assertEquals(LOADING_NO, service.detail(tripQuery(String.valueOf(LOADING_ID))).getTripNo());
+		assertEquals(PHONE, service.detail(tripQuery(String.valueOf(LOADING_ID))).getDriverPhone(),
+			"已配载运次详情仍回派单快照号");
+		assertEquals(PHONE, service.detail(tripQuery(String.valueOf(7001L))).getDriverPhone(),
+			"未配载运次详情仍回派单快照号");
+	}
+
+	@Test
+	@DisplayName("同号换人不放行：手机号相同、档案 ID 不同的运次仍然看不到")
+	void samePhoneDoesNotGrantAccess() {
+		// 派单快照号一模一样，档案 ID 却是别人
+		Waybill foreignLone = waybill(7002L, "YD-LONE-0002", null, "running", null, at(1000L), ACCEPT_YES);
+		foreignLone.setDriverId(OTHER_DRIVER_ID);
+		when(waybillService.getById(7002L)).thenReturn(foreignLone);
+
+		assertThrows(ServiceException.class, () -> service.detail(tripQuery(String.valueOf(7002L))),
+			"快照号相同不代表同一个司机");
+
+		// 已配载段同样只认配载单上的档案 ID
+		when(loadingManageService.getById(LOADING_ID)).thenReturn(loading(OTHER_DRIVER_ID));
+		assertThrows(ServiceException.class, () -> service.detail(tripQuery(String.valueOf(LOADING_ID))),
+			"配载单归别人时详情同样拒绝");
+	}
+
+	@Test
+	@DisplayName("两段各按自己的 driver_id 判：已配载看配载单，未配载看运单")
+	void driverScopeReadsDriverIdOnBothSegments() {
+		Waybill loadedRow = waybill(2092186187239780353L, "YD-20260825-0006", LOADING_NO, "running", null,
+			at(2000L), ACCEPT_YES);
+		// 运单行归别人、配载单归本人：已配载段只认配载单
+		loadedRow.setDriverId(OTHER_DRIVER_ID);
+		stubRows(loadedRow);
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
+		query.setCurrent(1);
+		query.setSize(10);
+
+		assertEquals(1, service.page(query).getTotal(), "已配载段按配载单的 driver_id 收口，不看运单行的");
+
+		Waybill lone = waybill(7003L, "YD-LONE-0003", null, "running", null, at(1000L), ACCEPT_YES);
+		// 运单归本人、手机号却完全对不上：未配载段只认运单的 driver_id
+		lone.setDriverPhone("13800000003");
+		stubRows(lone);
+
+		IPage<TripVO> page = service.page(query);
+		assertEquals(1, page.getTotal(), "未配载段按运单的 driver_id 收口，不看手机号");
+		assertEquals("13800000003", page.getRecords().get(0).getDriverPhone(), "展示的仍是运单上的派单快照号");
+	}
+
+	@Test
+	@DisplayName("管理端不按司机收口：带上任何 driverId 都照样全出")
+	void adminScopeIgnoresDriverId() {
+		stubRows(
+			waybill(2L, "YD-2", null, "running", null, at(2000L), ACCEPT_YES),
+			waybill(1L, "YD-1", null, "running", null, at(1000L), ACCEPT_YES));
+
+		for (Long driverId : java.util.Arrays.asList(null, 0L, -1L, OTHER_DRIVER_ID)) {
+			TripQueryVO admin = TripQueryVO.forAdmin();
+			admin.setDriverId(driverId);
+
+			assertEquals(2, service.page(admin).getTotal(), "管理端收口与司机无关：" + driverId);
+		}
+	}
+
+	@Test
+	@DisplayName("收口缺省（空、0、负数）一律空集：不放行也不抛异常")
+	void missingDriverIdIsRefused() {
+		stubRows(waybill(1L, "YD-1", null, "running", null, at(1000L), ACCEPT_YES));
+
+		for (Long driverId : java.util.Arrays.asList(null, 0L, -1L, -9001L)) {
+			TripQueryVO query = TripQueryVO.forDriver(driverId);
+
+			IPage<TripVO> page = service.page(query);
+			assertEquals(0, page.getTotal(), "收口缺失不能退回「不按司机收口」：" + driverId);
+			assertTrue(page.getRecords().isEmpty());
+			assertEquals(0, service.tabCounts(query).getAll(), "统计同样为零：" + driverId);
+			assertThrows(ServiceException.class, () -> service.detail(query), "详情直接拒绝：" + driverId);
+		}
+		verify(waybillService, never()).list(anyWaybillWrapper());
+	}
+
 	// ------------------------------------------------------------ 夹具
 
 	@SuppressWarnings("unchecked")
@@ -712,7 +820,7 @@ class TripQueryServiceImplTest {
 	}
 
 	private List<TripVO> orgTypeTrips(String orgType) {
-		TripQueryVO query = TripQueryVO.forDriver(PHONE);
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
 		query.setTransportOrgType(orgType);
 		query.setCurrent(1);
 		query.setSize(50);
@@ -737,7 +845,7 @@ class TripQueryServiceImplTest {
 		stubRows(
 			waybill(2092186187239780353L, "YD-20260825-0006", LOADING_NO, "running", null, at(2000L), ACCEPT_YES),
 			waybill(2092186187470467073L, "YD-20260825-0007", LOADING_NO, "running", "pending", at(1000L), ACCEPT_NO));
-		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(PHONE)));
+		when(loadingManageService.list(anyLoadingWrapper())).thenReturn(List.of(loading(DRIVER_ID)));
 	}
 
 	private void stubChildren() {
@@ -756,23 +864,25 @@ class TripQueryServiceImplTest {
 	}
 
 	private TripQueryVO tripQuery(String tripId) {
-		TripQueryVO query = TripQueryVO.forDriver(PHONE);
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
 		query.setTripId(tripId);
 		return query;
 	}
 
 	private LoadingManage loading(String loadingNo, Long loadingId) {
-		LoadingManage loading = loading(PHONE);
+		LoadingManage loading = loading(DRIVER_ID);
 		loading.setId(loadingId);
 		loading.setLoadingNo(loadingNo);
 		return loading;
 	}
 
-	private LoadingManage loading(String driverPhone) {
+	private LoadingManage loading(Long driverId) {
 		LoadingManage loading = new LoadingManage();
 		loading.setId(LOADING_ID);
 		loading.setLoadingNo(LOADING_NO);
-		loading.setDriverPhone(driverPhone);
+		loading.setDriverId(driverId);
+		// 配载单上留的是派单时的手机号快照，档案改号后它不变
+		loading.setDriverPhone(PHONE);
 		loading.setDriverName("黄宇富");
 		loading.setVehicleNo("桂A32523");
 		loading.setProjectName("武宣建筑原料运输项目");
@@ -791,6 +901,8 @@ class TripQueryServiceImplTest {
 		waybill.setLoadingNo(loadingNo);
 		waybill.setBusinessStatus(businessStatus);
 		waybill.setDriverAcceptStatus(acceptStatus);
+		waybill.setDriverId(DRIVER_ID);
+		// 运单上留的是派单时的手机号快照，档案改号后它不变
 		waybill.setDriverPhone(PHONE);
 		waybill.setProcessJson(processJson);
 		waybill.setCreateTime(createTime);
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripReadServiceBoundaryTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripReadServiceBoundaryTest.java
index ec37714d..e8432184 100644
--- a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripReadServiceBoundaryTest.java
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/TripReadServiceBoundaryTest.java
@@ -45,6 +45,7 @@ import static org.mockito.Mockito.when;
 class TripReadServiceBoundaryTest {
 
 	private static final String PHONE = "17587421208";
+	private static final Long DRIVER_ID = 9001L;
 	private static final String LOADING_NO = "PZ-20261017-001";
 	/** 19 位雪花号，按数字下发会被双精度取整 */
 	private static final Long LOADING_ID = 2111350784070275074L;
@@ -100,7 +101,7 @@ class TripReadServiceBoundaryTest {
 			child(CHILD_B, "cancelled", null, ACCEPT_NO, at(1787671422000L)));
 
 		// 「全部」按定义不含已取消档，别在它上面找这趟车；这一趟车本身仍要算成已取消
-		TripQueryVO query = TripQueryVO.forDriver(PHONE);
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
 		query.setStatus(3);
 		TripVO trip = onlyTrip(query);
 
@@ -205,7 +206,7 @@ class TripReadServiceBoundaryTest {
 	void emptyChildrenDoNotThrow() {
 		stubLoadedTrip();
 
-		IPage<TripVO> page = service.page(TripQueryVO.forDriver(PHONE));
+		IPage<TripVO> page = service.page(TripQueryVO.forDriver(DRIVER_ID));
 
 		assertTrue(page.getRecords().isEmpty(), "配载单在、可见子单为空时不给没有子单的运次");
 
@@ -239,6 +240,8 @@ class TripReadServiceBoundaryTest {
 		bare.setBusinessStatus("pending");
 		bare.setDriverAcceptStatus("pending");
 		bare.setProcessJson(ACCEPT_YES);
+		bare.setDriverId(DRIVER_ID);
+		// 运单上留的是派单时的手机号快照，档案改号后它不变
 		bare.setDriverPhone(PHONE);
 		when(waybillService.list(anyWaybillWrapper())).thenReturn(List.of(bare));
 
@@ -368,7 +371,7 @@ class TripReadServiceBoundaryTest {
 	}
 
 	private TripVO onlyTrip() {
-		return onlyTrip(TripQueryVO.forDriver(PHONE));
+		return onlyTrip(TripQueryVO.forDriver(DRIVER_ID));
 	}
 
 	private TripVO onlyTrip(TripQueryVO query) {
@@ -378,7 +381,7 @@ class TripReadServiceBoundaryTest {
 	}
 
 	private TripQueryVO detailQuery() {
-		TripQueryVO query = TripQueryVO.forDriver(PHONE);
+		TripQueryVO query = TripQueryVO.forDriver(DRIVER_ID);
 		query.setTripId(String.valueOf(LOADING_ID));
 		return query;
 	}
@@ -387,6 +390,8 @@ class TripReadServiceBoundaryTest {
 		LoadingManage loading = new LoadingManage();
 		loading.setId(LOADING_ID);
 		loading.setLoadingNo(LOADING_NO);
+		loading.setDriverId(DRIVER_ID);
+		// 配载单上留的是派单时的手机号快照
 		loading.setDriverPhone(PHONE);
 		loading.setDriverName("黄宇富");
 		loading.setVehicleNo("桂A32523");
@@ -401,6 +406,8 @@ class TripReadServiceBoundaryTest {
 		waybill.setLoadingNo(LOADING_NO);
 		waybill.setBusinessStatus(businessStatus);
 		waybill.setDriverAcceptStatus(acceptStatus);
+		waybill.setDriverId(DRIVER_ID);
+		// 运单上留的是派单时的手机号快照
 		waybill.setDriverPhone(PHONE);
 		waybill.setProcessJson(processJson);
 		waybill.setCreateTime(createTime);
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillImportDriverIdTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillImportDriverIdTest.java
new file mode 100644
index 00000000..b7bf273b
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillImportDriverIdTest.java
@@ -0,0 +1,110 @@
+package org.springblade.transport.service.impl;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springblade.system.feign.ISysClient;
+import org.springblade.transport.pojo.entity.Waybill;
+import org.springblade.transport.service.ICustomerArchiveService;
+import org.springblade.transport.service.IDriverService;
+import org.springblade.transport.service.ILoadingManageService;
+import org.springblade.transport.service.IProjectApplyService;
+import org.springblade.transport.service.IReceivablePayableDetailService;
+import org.springblade.transport.service.ITransportPlanService;
+import org.springblade.transport.service.IWaybillService;
+
+import java.lang.reflect.Method;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 批量导入运单时写司机档案 ID 的测试。
+ * <p>
+ * 导入模板可能带档案 ID（老系统导出），也可能只有司机姓名手机号。
+ * 解析不到档案时只留行级 WARN，该行照常导入（承运商司机本来就没有小程序档案）。
+ */
+class WaybillImportDriverIdTest {
+
+	private static final String DRIVER_PHONE = "13800138000";
+	private static final Long RESOLVED_DRIVER_ID = 9321L;
+
+	private IDriverService driverService;
+	private WaybillImportBatchServiceImpl service;
+
+	@BeforeEach
+	void setUp() {
+		driverService = mock(IDriverService.class);
+		service = new WaybillImportBatchServiceImpl(
+			mock(IWaybillService.class),
+			mock(ICustomerArchiveService.class),
+			mock(IProjectApplyService.class),
+			mock(ITransportPlanService.class),
+			mock(IReceivablePayableDetailService.class),
+			mock(ILoadingManageService.class),
+			mock(ISysClient.class),
+			driverService);
+	}
+
+	@Test
+	@DisplayName("行内带了档案 ID：直接用，不再按手机号解析")
+	void keepsDriverIdFromRow() throws Exception {
+		Waybill waybill = importedWaybill(7001L);
+
+		fillDriverOwnership(waybill, 3);
+
+		assertEquals(7001L, waybill.getDriverId());
+		verify(driverService, never()).resolveDriverIdByMobile(any(), any());
+	}
+
+	@Test
+	@DisplayName("行内只有手机号：按手机号解析出档案 ID 写入")
+	void resolvesDriverIdFromRowPhone() throws Exception {
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(RESOLVED_DRIVER_ID);
+
+		Waybill waybill = importedWaybill(null);
+		fillDriverOwnership(waybill, 3);
+
+		assertEquals(RESOLVED_DRIVER_ID, waybill.getDriverId());
+	}
+
+	@Test
+	@DisplayName("解析不到档案：该行照常导入，归属留空（只留行级 WARN）")
+	void keepsRowWithoutResolvedProfile() throws Exception {
+		when(driverService.resolveDriverIdByMobile(any(), eq(DRIVER_PHONE))).thenReturn(null);
+
+		Waybill waybill = importedWaybill(null);
+		assertDoesNotThrow(() -> fillDriverOwnership(waybill, 3));
+
+		assertNull(waybill.getDriverId());
+	}
+
+	// ------------------------------------------------------------ 夹具
+
+	private void fillDriverOwnership(Waybill waybill, int rowNo) throws Exception {
+		Method method = WaybillImportBatchServiceImpl.class.getDeclaredMethod("fillDriverOwnership", Waybill.class, int.class);
+		method.setAccessible(true);
+		try {
+			method.invoke(service, waybill, rowNo);
+		} catch (java.lang.reflect.InvocationTargetException exception) {
+			throw (Exception) exception.getCause();
+		}
+	}
+
+	private Waybill importedWaybill(Long driverId) {
+		Waybill waybill = new Waybill();
+		waybill.setWaybillNo("YD-IMPORT-1");
+		waybill.setDriverId(driverId);
+		waybill.setDriverName("张三");
+		waybill.setDriverPhone(DRIVER_PHONE);
+		return waybill;
+	}
+
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillReassignDriverIdTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillReassignDriverIdTest.java
new file mode 100644
index 00000000..8646431a
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/service/impl/WaybillReassignDriverIdTest.java
@@ -0,0 +1,197 @@
+package org.springblade.transport.service.impl;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springblade.transport.mapper.WaybillMapper;
+import org.springblade.transport.pojo.entity.Waybill;
+import org.springblade.transport.service.IDriverService;
+import org.springblade.transport.service.IProcessConfigService;
+import org.springblade.transport.support.LogCapture;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * 重新派单写司机档案 ID 的测试。
+ * <p>
+ * 派单是司机归属的唯一入口：调用方带了档案 ID（>0）就按它写，
+ * 只带姓名手机号（承运商司机、手工派单）就按手机号解析；解析不到也不能挡住派单。
+ */
+class WaybillReassignDriverIdTest {
+
+	private static final Long WAYBILL_ID = 1900000000000000001L;
+	private static final String TENANT_ID = "000000";
+	private static final String DRIVER_PHONE = "13800138000";
+	private static final Long RESOLVED_DRIVER_ID = 9321L;
+
+	private WaybillMapper waybillMapper;
+	private IDriverService driverService;
+	private WaybillServiceImpl service;
+
+	@BeforeAll
+	static void initTableInfo() {
+		MybatisConfiguration configuration = new MybatisConfiguration();
+		MapperBuilderAssistant assistant = new MapperBuilderAssistant(configuration, "");
+		assistant.setCurrentNamespace("test");
+		TableInfoHelper.initTableInfo(assistant, Waybill.class);
+	}
+
+	@BeforeEach
+	void setUp() throws Exception {
+		waybillMapper = mock(WaybillMapper.class);
+		driverService = mock(IDriverService.class);
+		service = new WaybillServiceImpl();
+		inject("baseMapper", waybillMapper);
+		inject("driverService", driverService);
+		inject("processConfigService", processConfigService());
+		when(waybillMapper.selectById(WAYBILL_ID)).thenReturn(pendingWaybill());
+		when(waybillMapper.updateById(any(Waybill.class))).thenReturn(1);
+	}
+
+	@Test
+	@DisplayName("调用方带了档案 ID：按它写，不再按手机号解析")
+	void keepsExplicitDriverId() {
+		Waybill request = reassignRequest(7721L);
+
+		assertTrue(service.reassignWithoutDeptCheck(request));
+
+		assertEquals(7721L, capturedWaybill().getDriverId());
+		verify(driverService, never()).resolveDriverIdByMobile(any(), anyString());
+	}
+
+	@Test
+	@DisplayName("调用方只带手机号：按手机号解析出档案 ID 写入")
+	void resolvesDriverIdFromPhone() {
+		when(driverService.resolveDriverIdByMobile(TENANT_ID, DRIVER_PHONE)).thenReturn(RESOLVED_DRIVER_ID);
+
+		assertTrue(service.reassignWithoutDeptCheck(reassignRequest(null)));
+
+		assertEquals(RESOLVED_DRIVER_ID, capturedWaybill().getDriverId());
+	}
+
+	@Test
+	@DisplayName("档案 ID 为 0 或 -1（无主哨兵）：按手机号重新解析")
+	void resolvesWhenDriverIdIsSentinel() throws Exception {
+		when(driverService.resolveDriverIdByMobile(TENANT_ID, DRIVER_PHONE)).thenReturn(RESOLVED_DRIVER_ID);
+
+		assertTrue(service.reassignWithoutDeptCheck(reassignRequest(0L)));
+		assertEquals(RESOLVED_DRIVER_ID, capturedWaybill().getDriverId());
+
+		setUpAgain();
+		assertTrue(service.reassignWithoutDeptCheck(reassignRequest(-1L)));
+		assertEquals(RESOLVED_DRIVER_ID, capturedWaybill().getDriverId());
+	}
+
+	@Test
+	@DisplayName("解析不到档案（承运商司机）：派单照常成功，归属留空")
+	void allowsReassignWithoutResolvedProfile() {
+		when(driverService.resolveDriverIdByMobile(TENANT_ID, DRIVER_PHONE)).thenReturn(null);
+
+		assertTrue(service.reassignWithoutDeptCheck(reassignRequest(null)));
+
+		assertNull(capturedWaybill().getDriverId());
+	}
+
+	@Test
+	@DisplayName("解析不到档案：落空时留一条脱敏 WARN，派单照常成功")
+	void unresolvedProfileLogsMaskedWarning() {
+		when(driverService.resolveDriverIdByMobile(TENANT_ID, DRIVER_PHONE)).thenReturn(null);
+		try (LogCapture logs = LogCapture.open(WaybillServiceImpl.class)) {
+			assertTrue(service.reassignWithoutDeptCheck(reassignRequest(null)));
+
+			String warning = logs.events().stream()
+				.filter(event -> event.getLevel() == Level.WARN)
+				.map(ILoggingEvent::getFormattedMessage)
+				.filter(message -> message.contains("司机档案"))
+				.findFirst()
+				.orElseThrow(() -> new AssertionError("解析失败必须留 WARN，实际日志：" + logs.messages()));
+			assertTrue(warning.contains("138****8000"), "WARN 里的号码必须脱敏，实际：" + warning);
+			assertFalse(warning.contains(DRIVER_PHONE), "WARN 里不能出现完整号码，实际：" + warning);
+			assertTrue(warning.contains("YD-20261027-001"), "WARN 要带业务标识（运单号），实际：" + warning);
+		}
+	}
+
+	// ------------------------------------------------------------ 夹具
+
+	private void setUpAgain() throws Exception {
+		waybillMapper = mock(WaybillMapper.class);
+		service = new WaybillServiceImpl();
+		inject("baseMapper", waybillMapper);
+		inject("driverService", driverService);
+		inject("processConfigService", processConfigService());
+		when(waybillMapper.selectById(WAYBILL_ID)).thenReturn(pendingWaybill());
+		when(waybillMapper.updateById(any(Waybill.class))).thenReturn(1);
+	}
+
+	private IProcessConfigService processConfigService() {
+		IProcessConfigService processConfigService = mock(IProcessConfigService.class);
+		when(processConfigService.listByIds(any())).thenReturn(Collections.emptyList());
+		return processConfigService;
+	}
+
+	private Waybill pendingWaybill() {
+		Waybill waybill = new Waybill();
+		waybill.setId(WAYBILL_ID);
+		waybill.setIsDeleted(0);
+		waybill.setTenantId(TENANT_ID);
+		waybill.setWaybillNo("YD-20261027-001");
+		waybill.setBusinessStatus("pending");
+		waybill.setTransportType("road");
+		waybill.setDriverName("张三");
+		waybill.setDriverPhone("13900139000");
+		waybill.setVehicleNo("桂A12345");
+		return waybill;
+	}
+
+	private Waybill reassignRequest(Long driverId) {
+		Waybill request = new Waybill();
+		request.setId(WAYBILL_ID);
+		request.setDriverId(driverId);
+		request.setDriverName("李四");
+		request.setDriverPhone(DRIVER_PHONE);
+		request.setVehicleNo("桂A88888");
+		return request;
+	}
+
+	private Waybill capturedWaybill() {
+		ArgumentCaptor<Waybill> captor = ArgumentCaptor.forClass(Waybill.class);
+		verify(waybillMapper, org.mockito.Mockito.atLeastOnce()).updateById(captor.capture());
+		return captor.getValue();
+	}
+
+	private void inject(String field, Object value) throws Exception {
+		Class<?> type = service.getClass();
+		while (type != null) {
+			try {
+				Field declared = type.getDeclaredField(field);
+				declared.setAccessible(true);
+				declared.set(service, value);
+				return;
+			} catch (NoSuchFieldException ignored) {
+				type = type.getSuperclass();
+			}
+		}
+		throw new IllegalStateException("未找到字段：" + field);
+	}
+
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/support/DriverIdBackfillSqlTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/support/DriverIdBackfillSqlTest.java
new file mode 100644
index 00000000..968f1671
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/support/DriverIdBackfillSqlTest.java
@@ -0,0 +1,289 @@
+package org.springblade.transport.support;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * 存量司机档案 ID 回填脚本的文本护栏。
+ * <p>
+ * 仓库里没有连库的测试基座，回填脚本的正确性只能靠「读脚本、断言不变量」来守。
+ * 这里守的是「改脚本时最容易写坏、写坏了又不会报错」的几条：
+ * <ul>
+ *   <li>只填 {@code driver_id IS NULL} 的行 —— 手滑把条件放宽成 {@code <= 0} 就会覆盖
+ *       {@code -1}（无主哨兵）和已经派给别人的单。</li>
+ *   <li>{@code driver_id = -1} 必须有一道显式排除 —— 只靠 {@code IS NULL} 挡住是隐式的，
+ *       后人看不出「-1 不能动」是需求，容易在重构时丢掉。</li>
+ *   <li>跨表比较必须显式 {@code COLLATE} —— 运单/配载单侧是 {@code utf8mb4_0900_ai_ci}，
+ *       司机档案侧是 {@code utf8mb4_general_ci}，漏了就在执行时抛
+ *       {@code ERROR 1267 Illegal mix of collations}，而这只有真跑库才会暴露。</li>
+ *   <li>不许 {@code SET driver_phone} / {@code SET update_time} —— 手机号是派单时的号码快照，
+ *       回填是「补归属」不是「改快照」；{@code update_time} 一改，业务上就分不清这张单是不是
+ *       真的被人动过。</li>
+ *   <li>唯一命中（{@code COUNT(*) = 1}）与可重复执行（{@code IF NOT EXISTS} / {@code INSERT IGNORE}
+ *       / {@code IS NULL} 兜底）—— 同号多档案时填空会把单挂错人，重复跑必须零变更。</li>
+ * </ul>
+ * 这些断言只在脚本文本层面成立，不证明数据结果正确；数据结果由脚本第 2 节校验负责。
+ */
+class DriverIdBackfillSqlTest {
+
+	/**
+	 * 每个用例跑两张表：运单一份、配载单一份，规则完全相同。
+	 */
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("只更新 driver_id 为 NULL 的行")
+	void onlyFillsNullDriverId(String fileName, String table) {
+		List<String> updates = updateStatements(script(fileName));
+		assertFalse(updates.isEmpty(), fileName + " 里找不到 UPDATE 语句：回填脚本必须真的写 driver_id");
+
+		for (String update : updates) {
+			String where = whereClause(update).toUpperCase();
+			assertTrue(where.contains("DRIVER_ID IS NULL"),
+				table + " 的 UPDATE 缺少 driver_id IS NULL："
+					+ "条件一放宽就会覆盖 -1（无主哨兵）与已派单的行。原文：" + squeeze(update));
+			assertTrue(setClause(update).toUpperCase().contains("DRIVER_ID"),
+				table + " 的 UPDATE 没有写 driver_id：" + squeeze(update));
+		}
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("driver_id = -1 的哨兵行有一道显式排除")
+	void keepsSentinelRowsUntouched(String fileName, String table) {
+		List<String> updates = updateStatements(script(fileName));
+		assertFalse(updates.isEmpty(), fileName + " 里找不到 UPDATE 语句");
+
+		for (String update : updates) {
+			String where = whereClause(update);
+			assertTrue(where.contains("-1"),
+				table + " 的 UPDATE 没有出现 -1 保护：哨兵行会被回填覆盖。原文：" + squeeze(update));
+			assertTrue(where.toUpperCase().contains("IS NOT TRUE") || where.toUpperCase().contains("NOT ("),
+				table + " 的 UPDATE 里 -1 只是一笔带过（例如 driver_id <> -1），"
+					+ "对 NULL 行的比较结果是 NULL、条件不成立，要填的行会被整批漏掉。原文：" + squeeze(update));
+		}
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("跨表比较手机号与租户时显式 COLLATE")
+	void comparesAcrossTablesWithExplicitCollate(String fileName, String table) {
+		for (String line : body(fileName).split("\\R")) {
+			String trimmed = line.trim();
+			if (trimmed.isEmpty() || !trimmed.contains("=")) {
+				continue;
+			}
+			boolean tenantComparison = countOf(trimmed, ".tenant_id") >= 2;
+			boolean mobileComparison = trimmed.contains(".mobile") && trimmed.contains("driver_phone");
+			if (!tenantComparison && !mobileComparison) {
+				continue;
+			}
+			assertTrue(trimmed.toUpperCase().contains("COLLATE"),
+				table + " 的跨表比较没有显式 COLLATE（会抛 ERROR 1267 Illegal mix of collations）：" + trimmed);
+		}
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("不改写 driver_phone 快照")
+	void neverRewritesPhoneSnapshot(String fileName, String table) {
+		for (String update : updateStatements(script(fileName))) {
+			assertFalse(setClause(update).toUpperCase().contains("DRIVER_PHONE"),
+				table + " 的 UPDATE 改写了 driver_phone：手机号是派单时的号码快照，回填只补归属。原文：" + squeeze(update));
+		}
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("不改写 update_time")
+	void neverRewritesUpdateTime(String fileName, String table) {
+		for (String update : updateStatements(script(fileName))) {
+			assertFalse(setClause(update).toUpperCase().contains("UPDATE_TIME"),
+				table + " 的 UPDATE 改写了 update_time：回填不是业务动作，改了就看不出单据是否真被人动过。原文：" + squeeze(update));
+		}
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("同号多档案不填：命中映射要求唯一")
+	void requiresUniqueMobileMatch(String fileName, String table) {
+		String body = body(fileName);
+		assertTrue(Pattern.compile("(?i)HAVING\\s+COUNT\\(\\*\\)\\s*=\\s*1").matcher(body).find(),
+			table + " 的回填映射没有 HAVING COUNT(*) = 1：同号多档案时会把单挂到其中一条档案上");
+		assertTrue(Pattern.compile("(?i)COUNT\\(DISTINCT\\s+d\\.id\\)\\s*>\\s*1").matcher(body).find(),
+			table + " 没有同号多档案的冲突清单：跳过多少、为什么跳过必须可复核");
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("可重复执行：存档表与命中映射都带重复执行保护")
+	void isRerunnable(String fileName, String table) {
+		String body = body(fileName);
+		assertTrue(Pattern.compile("(?i)CREATE\\s+TABLE\\s+IF\\s+NOT\\s+EXISTS").matcher(body).find(),
+			table + " 的存档表没有 IF NOT EXISTS：第二次执行会报 1050 Table already exists，跑不完");
+		assertTrue(Pattern.compile("(?i)INSERT\\s+IGNORE").matcher(body).find(),
+			table + " 的命中映射没有 INSERT IGNORE：第二次执行会撞主键，跑不完");
+
+		String insert = statement(body, "INSERT IGNORE");
+		assertFalse(insert.isEmpty(), table + " 的 INSERT IGNORE 不是一条完整语句");
+		assertTrue(insert.toUpperCase().contains("DRIVER_ID IS NULL"),
+			table + " 的命中映射没有 driver_id IS NULL 兜底：重复执行会给已经填过的行反复建映射");
+		assertTrue(body.contains("ROW_COUNT()"),
+			table + " 的分批循环没有 ROW_COUNT() 退出条件：会死循环或只跑第一批");
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("分批执行：循环里带 LIMIT 的批次大小")
+	void batchesInBoundedChunks(String fileName, String table) {
+		String body = body(fileName);
+		assertTrue(body.contains("REPEAT") || body.contains("WHILE"),
+			table + " 的回填没有分批循环：一次性 UPDATE 全表会长时间锁行");
+		assertTrue(Pattern.compile("(?i)LIMIT\\s+(\\d+|v_\\w+)").matcher(body).find(),
+			table + " 的 LIMIT 后面不是批次大小的数字或变量：不是真正的分批");
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("脚本按目录惯例分了 0 存档 / 1 订正 / 2 校验 / 3 回退")
+	void hasRequiredSections(String fileName, String table) {
+		String script = script(fileName);
+		assertTrue(script.contains("-- 0. 存档"), table + " 缺 -- 0. 存档 段");
+		assertTrue(script.contains("-- 1. 订正"), table + " 缺 -- 1. 订正 段");
+		assertTrue(script.contains("-- 2. 校验"), table + " 缺 -- 2. 校验 段");
+		assertTrue(script.contains("-- 3. 回退"), table + " 缺 -- 3. 回退 段");
+	}
+
+	@ParameterizedTest(name = "{0}")
+	@CsvSource({
+		"blade_waybill_driver_id_backfill_20261028.sql, blade_waybill",
+		"blade_loading_manage_driver_id_backfill_20261028.sql, blade_loading_manage"
+	})
+	@DisplayName("取数与写入全在 SQL 内：不经过 JSON 中转")
+	void keepsSnowflakeIdsInsideSql(String fileName, String table) {
+		String body = body(fileName).toUpperCase();
+		assertFalse(body.contains("JSON_"),
+			table + " 的脚本用了 JSON 函数中转：19 位雪花 ID 过 JSON 会丢精度，取数与写入必须在 SQL 内完成");
+	}
+
+	private static String script(String fileName) {
+		Path path = locate(fileName);
+		try {
+			return Files.readString(path, StandardCharsets.UTF_8);
+		} catch (IOException exception) {
+			throw new UncheckedIOException("读不了回填脚本：" + path, exception);
+		}
+	}
+
+	private static Path locate(String fileName) {
+		List<Path> candidates = List.of(
+			Path.of("..", "..", "doc", "sql", "transport", fileName),
+			Path.of("doc", "sql", "transport", fileName));
+		List<String> tried = new ArrayList<>();
+		for (Path candidate : candidates) {
+			if (Files.isRegularFile(candidate)) {
+				return candidate;
+			}
+			tried.add(candidate.toAbsolutePath().normalize().toString());
+		}
+		fail("找不到回填脚本 " + fileName + "。surefire 的工作目录是模块目录（blade-service/blade-transport），"
+			+ "脚本应在 ../../doc/sql/transport/ 下。已尝试：" + String.join("；", tried));
+		return null;
+	}
+
+	private static List<String> updateStatements(String script) {
+		List<String> updates = new ArrayList<>();
+		Matcher matcher = Pattern.compile("(?is)\\bUPDATE\\b.*?;").matcher(stripComments(script));
+		while (matcher.find()) {
+			updates.add(matcher.group());
+		}
+		return updates;
+	}
+
+	private static String statement(String body, String prefix) {
+		Matcher matcher = Pattern.compile("(?is)\\b" + Pattern.quote(prefix) + "\\b.*?;").matcher(body);
+		return matcher.find() ? matcher.group() : "";
+	}
+
+	private static String setClause(String update) {
+		String upper = update.toUpperCase();
+		int set = upper.indexOf(" SET ");
+		if (set < 0) {
+			fail("UPDATE 里没有 SET：" + squeeze(update));
+		}
+		int where = upper.indexOf(" WHERE ", set);
+		return where < 0 ? update.substring(set) : update.substring(set, where);
+	}
+
+	private static String whereClause(String update) {
+		int where = update.toUpperCase().indexOf(" WHERE ");
+		if (where < 0) {
+			fail("UPDATE 里没有 WHERE：" + squeeze(update));
+		}
+		return update.substring(where);
+	}
+
+	private static String body(String fileName) {
+		return stripComments(script(fileName));
+	}
+
+	private static String stripComments(String script) {
+		return script.replaceAll("(?s)/\\*.*?\\*/", " ").replaceAll("--[^\\r\\n]*", " ");
+	}
+
+	private static int countOf(String text, String needle) {
+		int count = 0;
+		int index = text.indexOf(needle);
+		while (index >= 0) {
+			count++;
+			index = text.indexOf(needle, index + needle.length());
+		}
+		return count;
+	}
+
+	private static String squeeze(String sql) {
+		return sql.replaceAll("\\s+", " ").trim();
+	}
+
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/support/LogCapture.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/support/LogCapture.java
new file mode 100644
index 00000000..7fa8d76b
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/support/LogCapture.java
@@ -0,0 +1,48 @@
+package org.springblade.transport.support;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+/**
+ * 抓取某个类的日志输出（logback ListAppender）。
+ * <p>
+ * 「解析失败时留一条脱敏 WARN」这类要求只看返回值验不出来，必须断言真实日志正文。
+ */
+public final class LogCapture implements AutoCloseable {
+
+	private final Logger logger;
+	private final ListAppender<ILoggingEvent> appender;
+
+	private LogCapture(Logger logger, ListAppender<ILoggingEvent> appender) {
+		this.logger = logger;
+		this.appender = appender;
+	}
+
+	public static LogCapture open(Class<?> loggerType) {
+		Logger logger = (Logger) LoggerFactory.getLogger(loggerType);
+		ListAppender<ILoggingEvent> appender = new ListAppender<>();
+		appender.start();
+		logger.addAppender(appender);
+		return new LogCapture(logger, appender);
+	}
+
+	/** 已按占位符填充好的日志正文，按发生顺序 */
+	public List<String> messages() {
+		return appender.list.stream().map(ILoggingEvent::getFormattedMessage).toList();
+	}
+
+	public List<ILoggingEvent> events() {
+		return List.copyOf(appender.list);
+	}
+
+	@Override
+	public void close() {
+		logger.detachAppender(appender);
+		appender.stop();
+	}
+
+}
diff --git a/blade-service/blade-transport/src/test/java/org/springblade/transport/wrapper/TransportCertRecordWrapperRevisionTest.java b/blade-service/blade-transport/src/test/java/org/springblade/transport/wrapper/TransportCertRecordWrapperRevisionTest.java
new file mode 100644
index 00000000..df025a94
--- /dev/null
+++ b/blade-service/blade-transport/src/test/java/org/springblade/transport/wrapper/TransportCertRecordWrapperRevisionTest.java
@@ -0,0 +1,86 @@
+/**
+ * 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.wrapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.springblade.system.cache.UserCache;
+import org.springblade.system.cache.UserDisplayCache;
+import org.springblade.transport.pojo.entity.TransportCertRecord;
+import org.springblade.transport.pojo.vo.TransportCertRecordVO;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mockStatic;
+
+/**
+ * 认证记录视图对象的修订版标记与字段可见性
+ * <p>
+ * 两件事必须同时成立：司机端要能从 {@code revised} 看出「这条记录经过审核员修订」，
+ * 而又不能顺着 VO 把整份修订内容（含身份证号、证件照地址）再下发一遍。
+ *
+ * @author Chill
+ */
+class TransportCertRecordWrapperRevisionTest {
+
+	@Test
+	@DisplayName("修订版非空才算修订，空串与空白不算")
+	void marksRevisedOnlyWhenRevisionPresent() {
+		try (MockedStatic<UserDisplayCache> ignoredDisplay = mockStatic(UserDisplayCache.class);
+			 MockedStatic<UserCache> ignoredUser = mockStatic(UserCache.class)) {
+			assertTrue(wrapper().fillDisplayFields(record("{\"realName\":\"张三\"}")).getRevised(), "有修订版应标记为已修订");
+			assertFalse(wrapper().fillDisplayFields(record(null)).getRevised(), "无修订版不应标记");
+			assertFalse(wrapper().fillDisplayFields(record("")).getRevised(), "空串不应标记");
+			assertFalse(wrapper().fillDisplayFields(record("   ")).getRevised(), "空白不应标记");
+		}
+	}
+
+	@Test
+	@DisplayName("视图对象序列化不包含修订内容，只保留 revised 标记")
+	void voJsonOmitsRevisionContent() throws Exception {
+		TransportCertRecordVO vo = record("{\"realName\":\"张三\"}");
+		vo.setRevised(Boolean.TRUE);
+
+		String json = new ObjectMapper().writeValueAsString(vo);
+
+		assertFalse(json.contains("auditedSnapshotJson"), "修订内容不得随 VO 下发：" + json);
+		assertTrue(json.contains("\"revised\":true"), "必须下发 revised 标记：" + json);
+	}
+
+	private static TransportCertRecordWrapper wrapper() {
+		return TransportCertRecordWrapper.build();
+	}
+
+	private static TransportCertRecordVO record(String auditedSnapshotJson) {
+		TransportCertRecordVO vo = new TransportCertRecordVO();
+		vo.setSnapshotJson("{\"realName\":\"李四\"}");
+		vo.setAuditedSnapshotJson(auditedSnapshotJson);
+		return vo;
+	}
+
+}
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiFeignClientConfig.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiFeignClientConfig.java
index 72396d90..1c791a1d 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiFeignClientConfig.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiFeignClientConfig.java
@@ -69,8 +69,9 @@ public class BfiFeignClientConfig {
 	}
 
 	@Bean
-	public Request.Options options() {
-		return new Request.Options(10, TimeUnit.SECONDS, 60, TimeUnit.SECONDS, true);
+	public Request.Options options(BfiProperties properties) {
+		return new Request.Options(properties.getConnectTimeoutSeconds(), TimeUnit.SECONDS,
+			properties.getReadTimeoutSeconds(), TimeUnit.SECONDS, true);
 	}
 
 	@Bean
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiProperties.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiProperties.java
index fd0ef5de..a3b59f98 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiProperties.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/config/BfiProperties.java
@@ -64,6 +64,14 @@ public class BfiProperties {
 	 * 语言字串，默认 zh_CN
 	 */
 	private String language = "zh_CN";
+	/**
+	 * Feign 连接超时秒数，默认 10 秒
+	 */
+	private long connectTimeoutSeconds = 10;
+	/**
+	 * Feign 读超时秒数，默认 120 秒：金蝶保存类接口偶发超 60 秒，超时后远端可能已生成单据，重推会自动勾稽防重
+	 */
+	private long readTimeoutSeconds = 120;
 	/**
 	 * 是否启用 mock 模式（开发调试用）：开启后 IBfiClient 走本地桩目录（有桩用桩、无桩透传真实接口，见 BfiClientMock）
 	 */
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/feign/IBfiClient.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/feign/IBfiClient.java
index dd983387..e16bc3df 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/feign/IBfiClient.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/feign/IBfiClient.java
@@ -220,10 +220,11 @@ public interface IBfiClient {
 	 * @param accessToken  访问令牌，通过 getToken 获取
 	 * @param pageNo       页码，从1开始
 	 * @param pageSize     页数
-	 * @param beginBizdate 开始业务日期
-	 * @param endBizdate   结束业务日期
+	 * @param beginBizdate 开始业务日期，必传
+	 * @param endBizdate   结束业务日期，必传
 	 * @param billno       单据编号
-	 * @param orgNumber    付款人（公司）.编码
+	 * @param orgNumber    付款人（公司）.编码，必传，支持多个
+	 * @param awrpSourceBillno 外部来源单据编号（付款申请金蝶单据号），支持多个，精确过滤付款处理单
 	 * @return 付款处理分页数据
 	 */
 	@GetMapping(PAY_BILL_QUERY_URL)
@@ -233,7 +234,8 @@ public interface IBfiClient {
 													  @RequestParam("beigin_bizdate") String beginBizdate,
 													  @RequestParam("end_bizdate") String endBizdate,
 													  @RequestParam(value = "billno", required = false) List<String> billno,
-													  @RequestParam("org_number") List<String> orgNumber);
+													  @RequestParam("org_number") List<String> orgNumber,
+													  @RequestParam(value = "awrp_sourcebillno", required = false) List<String> awrpSourceBillno);
 
 	/**
 	 * A902-1 客户查询
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java
index 385a2dfa..e18f31ed 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/dto/BfiPayBillQueryDTO.java
@@ -64,7 +64,11 @@ public class BfiPayBillQueryDTO implements Serializable {
 	 */
 	private List<String> billno;
 	/**
-	 * 付款人（公司）.编码
+	 * 付款人（公司）.编码，必传，支持多个
 	 */
 	private List<String> orgNumber;
+	/**
+	 * 外部来源单据编号（付款申请金蝶单据号），支持多个，精确过滤付款处理单
+	 */
+	private List<String> awrpSourceBillno;
 }
diff --git a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java
index e010b0f5..bb6e2c1c 100644
--- a/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java
+++ b/blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/service/impl/BfiServiceImpl.java
@@ -294,6 +294,7 @@ public class BfiServiceImpl implements IBfiService {
 		if (param == null || param.getPageNo() == null || param.getPageSize() == null) {
 			throw new BfiException("查询BFI付款处理失败，分页参数不能为空");
 		}
+		// 接口必填参数：业务日期范围 + 付款组织编码；awrp_sourcebillno 可选，精确过滤付款处理单
 		if (StringUtil.isBlank(param.getBeginBizdate()) || StringUtil.isBlank(param.getEndBizdate())) {
 			throw new BfiException("查询BFI付款处理失败，业务日期范围不能为空");
 		}
@@ -302,7 +303,8 @@ public class BfiServiceImpl implements IBfiService {
 		}
 		String accessToken = getAccessToken();
 		BfiResultVO<BfiPageVO<BfiPayBillVO>> result = commonCall("付款处理查询", () -> client.payBillQuery(accessToken,
-			param.getPageNo(), param.getPageSize(), param.getBeginBizdate(), param.getEndBizdate(), param.getBillno(), param.getOrgNumber()));
+			param.getPageNo(), param.getPageSize(), param.getBeginBizdate(), param.getEndBizdate(), param.getBillno(),
+			param.getOrgNumber(), param.getAwrpSourceBillno()));
 		return result.getData();
 	}
 
diff --git a/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/config/HcsProperties.java b/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/config/HcsProperties.java
index 56580bb0..5998ab9b 100644
--- a/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/config/HcsProperties.java
+++ b/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/config/HcsProperties.java
@@ -273,6 +273,13 @@ public class HcsProperties {
 
 	@Data
 	public static class SpecPay {
+		/**
+		 * 付款特批走合同合规开关（thirdParty.hcs.spec-pay.enabled，默认 false 不推送合同合规）：
+		 * true 时审批通过后发起 C106-3/4、挂起"特批审核"、特批完成前拦截金蝶推送；
+		 * false 时不再发起 C106-3/4、不挂起、不拦截金蝶推送；
+		 * 提交时高风险/黑名单风险校验与「特批附件」必传逻辑保留（risk.check-on-payment）
+		 */
+		private boolean enabled = false;
 		/**
 		 * 特批单据状态（fd_doc_status，示例 10，§9-U3 待联调）
 		 */
diff --git a/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/pojo/vo/IDCardVO.java b/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/pojo/vo/IDCardVO.java
index 0098b2b9..85f8cae5 100644
--- a/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/pojo/vo/IDCardVO.java
+++ b/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/pojo/vo/IDCardVO.java
@@ -38,9 +38,22 @@ public class IDCardVO implements Serializable {
      */
     @JsonFormat(pattern = DateUtil.PATTERN_DATE, timezone = "GMT+8")
     private Date birthday;
+    /**
+     *  住址
+     */
+    private String address;
+    /**
+     *  有效期起
+     */
+    @JsonFormat(pattern = DateUtil.PATTERN_DATE, timezone = "GMT+8")
+    private Date validDateStart;
     /**
      *  有效期止
      */
     @JsonFormat(pattern = DateUtil.PATTERN_DATE, timezone = "GMT+8")
     private Date validDateEnd;
+    /**
+     *  长期有效：1-是，0-否
+     */
+    private Integer longTerm;
 }
diff --git a/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/service/impl/OCRServiceImpl.java b/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/service/impl/OCRServiceImpl.java
index e4853d28..5303dabb 100644
--- a/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/service/impl/OCRServiceImpl.java
+++ b/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/service/impl/OCRServiceImpl.java
@@ -1,6 +1,9 @@
 package org.springblade.thirdparty.ocr.service.impl;
 
 import cn.hutool.core.lang.TypeReference;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -13,10 +16,10 @@ import org.springblade.thirdparty.ocr.constant.OCRImageType;
 import org.springblade.thirdparty.ocr.convert.AttachmentIndexConvert;
 import org.springblade.thirdparty.ocr.exception.OCRException;
 import org.springblade.thirdparty.ocr.feign.IOCRClient;
-import org.springblade.thirdparty.ocr.feign.IOCROtherClient;
 import org.springblade.thirdparty.ocr.pojo.dto.*;
 import org.springblade.thirdparty.ocr.pojo.vo.*;
 import org.springblade.thirdparty.ocr.service.IOCRService;
+import org.springblade.thirdparty.ocr.support.ShenFenZhengIdCardSupport;
 import org.springblade.thirdparty.ocr.util.ConvertUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -43,10 +46,12 @@ public class OCRServiceImpl implements IOCRService {
     private static final BigDecimal WEIGHT_LIMIT = BigDecimal.valueOf(200);
 
     private final IOCRClient client;
-    private final IOCROtherClient otherClient;
 
-    @Value("${thirdParty.ocr.baseOtherUrl}")
-    private String ocrBaseOtherUrl;
+    /**
+     * 身份证 OCR 服务地址，Nacos：thirdParty.ocr.idCardBaseUrl
+     */
+    @Value("${thirdParty.ocr.idCardBaseUrl:${thirdParty.ocr.baseOtherUrl}}")
+    private String idCardBaseUrl;
 
     @Override
     public TransportCertificateVO recognitionTransportCertificate(CertificateBatchRecognitionDTO param) {
@@ -339,45 +344,79 @@ public class OCRServiceImpl implements IOCRService {
         if (CollectionUtils.isEmpty(urls)) {
             throw new OCRException("图像链接不能为空");
         }
+        if (StringUtil.isBlank(idCardBaseUrl)) {
+            throw new OCRException("身份证OCR服务地址未配置（thirdParty.ocr.idCardBaseUrl）");
+        }
         IDCardVO result = new IDCardVO();
         try {
             for (String url : urls) {
-                OCRCardBankDetRecDTO param = new OCRCardBankDetRecDTO(url);
-//				param.setDataType("IDCard-Main");
-                log.info("调用ocr证件定位+结构化信息提取接口，请求地址：{}，请求参数：{}",
-                        getCardBankDetRecUrl(), JSONUtil.toJsonStr(param));
-                OCRResultVO<OCRBigCommonCardVO> resultVO = otherClient.cardBankDetRec(param);
-                if (resultVO != null && OCRConstant.SUCCESS_CODE.equals(resultVO.getCode())) {
-                    // 成功
-                    OCRBigCommonCardVO card = resultVO.getResult();
-                    convertIDCard(result, card);
+                if (StringUtil.isBlank(url)) {
                     continue;
                 }
-                log.error("调用ocr接口证件定位+结构化信息提取异常响应参数：{}", JSONUtil.toJsonStr(resultVO));
-                String message = getMessage(resultVO);
-                throw new OCRException("调用ocr接口证件定位+结构化信息提取异常 " + message);
+                ShenFenZhengIdCardSupport.merge(result, recognizeIdCardByShenFenZheng(url.trim()));
             }
         } catch (OCRException e) {
             throw e;
         } catch (Exception e) {
-            log.error("调用ocr接口证件定位+结构化信息提取异常", e);
-            throw new OCRException("调用ocr接口证件定位+结构化信息提取异常");
+            log.error("调用身份证OCR接口异常", e);
+            throw new OCRException("调用身份证OCR接口异常");
         }
         return result;
     }
 
-    private String getCardBankDetRecUrl() {
-        return ocrBaseOtherUrl.replaceAll("/+$", "") + "/CardBankDetRec";
+    /**
+     * 下载图片后以 formData.image_file 调用 ShenFenZheng
+     *
+     * @param imageUrl 可访问的图片地址
+     * @return 单张识别结果
+     */
+    private IDCardVO recognizeIdCardByShenFenZheng(String imageUrl) {
+        String requestUrl = idCardBaseUrl.replaceAll("/+$", "") + ShenFenZhengIdCardSupport.PATH;
+        byte[] imageBytes;
+        try {
+            imageBytes = HttpUtil.downloadBytes(imageUrl);
+        } catch (Exception exception) {
+            log.error("下载身份证图片失败，url={}", imageUrl, exception);
+            throw new OCRException("下载身份证图片失败");
+        }
+        if (imageBytes == null || imageBytes.length == 0) {
+            throw new OCRException("身份证图片内容为空");
+        }
+        String fileName = resolveImageFileName(imageUrl);
+        log.info("调用身份证OCR接口，请求地址：{}，文件名：{}，大小：{}", requestUrl, fileName, imageBytes.length);
+        try (HttpResponse response = HttpRequest.post(requestUrl)
+                .form(ShenFenZhengIdCardSupport.FILE_FIELD, imageBytes, fileName)
+                .timeout(60000)
+                .execute()) {
+            String body = response.body();
+            log.info("调用身份证OCR接口响应，status={}，body={}", response.getStatus(), body);
+            if (!response.isOk()) {
+                throw new OCRException("调用身份证OCR接口失败，HTTP状态码：" + response.getStatus());
+            }
+            if (!ShenFenZhengIdCardSupport.isSuccess(body)) {
+                throw new OCRException("身份证OCR识别失败");
+            }
+            return ShenFenZhengIdCardSupport.parse(body);
+        } catch (OCRException exception) {
+            throw exception;
+        } catch (Exception exception) {
+            log.error("调用身份证OCR接口异常，url={}", requestUrl, exception);
+            throw new OCRException("调用身份证OCR接口异常");
+        }
     }
 
-    /**
-     *  转换身份证
-     * @param result
-     * @param card
-     * @return
-     */
-    private void convertIDCard(IDCardVO result, OCRBigCommonCardVO card) {
-        convert(result, card, ConvertUtil::getIDCardSetter, null);
+    private String resolveImageFileName(String imageUrl) {
+        String path = imageUrl;
+        int queryIndex = path.indexOf('?');
+        if (queryIndex >= 0) {
+            path = path.substring(0, queryIndex);
+        }
+        int slashIndex = path.lastIndexOf('/');
+        String name = slashIndex >= 0 ? path.substring(slashIndex + 1) : path;
+        if (StringUtil.isBlank(name) || !name.contains(".")) {
+            return "id-card.jpg";
+        }
+        return name;
     }
 
     /**
diff --git a/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/support/ShenFenZhengIdCardSupport.java b/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/support/ShenFenZhengIdCardSupport.java
new file mode 100644
index 00000000..73e69d45
--- /dev/null
+++ b/blade-third-party-api/blade-ocr-api/src/main/java/org/springblade/thirdparty/ocr/support/ShenFenZhengIdCardSupport.java
@@ -0,0 +1,301 @@
+/**
+ * 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.thirdparty.ocr.support;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.thirdparty.ocr.pojo.vo.IDCardVO;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 身份证 OCR（ShenFenZheng）响应解析
+ * <p>
+ * 第三方返回形如：
+ * {@code result."0" = [[{"label":"身份证_姓名"}], [{"result":"张三"}], {"r":[...]}]}，
+ * 这里抽成「标签 → 文本」后再回填 {@link IDCardVO}。
+ *
+ * @author Chill
+ */
+public final class ShenFenZhengIdCardSupport {
+
+	/**
+	 * 接口路径
+	 */
+	public static final String PATH = "/ShenFenZheng";
+
+	/**
+	 * formData 文件字段名
+	 */
+	public static final String FILE_FIELD = "image_file";
+
+	private static final String LONG_TERM_TEXT = "长期";
+
+	private static final Pattern DATE_PATTERN = Pattern.compile("(\\d{4})\\D+(\\d{1,2})\\D+(\\d{1,2})");
+
+	private static final Map<String, BiConsumer<IDCardVO, String>> FIELD_SETTERS = initFieldSetters();
+
+	private ShenFenZhengIdCardSupport() {
+	}
+
+	/**
+	 * 解析第三方原始 JSON 为身份证 VO
+	 *
+	 * @param responseBody 响应原文
+	 * @return 识别结果；结构异常时返回空对象
+	 */
+	public static IDCardVO parse(String responseBody) {
+		IDCardVO result = new IDCardVO();
+		if (StringUtil.isBlank(responseBody)) {
+			return result;
+		}
+		JSONObject root = JSONUtil.parseObj(responseBody);
+		Map<String, String> fields = readLabelValues(root.getJSONObject("result"));
+		for (Map.Entry<String, String> entry : fields.entrySet()) {
+			BiConsumer<IDCardVO, String> setter = FIELD_SETTERS.get(normalizeLabel(entry.getKey()));
+			if (setter != null && StringUtil.isNotBlank(entry.getValue())) {
+				setter.accept(result, entry.getValue().trim());
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * 判断第三方是否识别成功
+	 *
+	 * @param responseBody 响应原文
+	 * @return true 表示成功
+	 */
+	public static boolean isSuccess(String responseBody) {
+		if (StringUtil.isBlank(responseBody)) {
+			return false;
+		}
+		JSONObject root = JSONUtil.parseObj(responseBody);
+		Boolean status = root.getBool("status");
+		if (Boolean.TRUE.equals(status)) {
+			return true;
+		}
+		// 个别版本只给 identifyCode，1001 视为成功
+		Integer identifyCode = root.getInt("identifyCode");
+		return identifyCode != null && identifyCode == 1001;
+	}
+
+	/**
+	 * 合并多张图的识别结果：后写的非空值覆盖先写的，方便正反面各识别一次后汇总
+	 *
+	 * @param target 汇总目标
+	 * @param source 本次识别结果
+	 */
+	public static void merge(IDCardVO target, IDCardVO source) {
+		if (target == null || source == null) {
+			return;
+		}
+		if (StringUtil.isNotBlank(source.getName())) {
+			target.setName(source.getName());
+		}
+		if (StringUtil.isNotBlank(source.getIdNo())) {
+			target.setIdNo(source.getIdNo());
+		}
+		if (StringUtil.isNotBlank(source.getGender())) {
+			target.setGender(source.getGender());
+		}
+		if (StringUtil.isNotBlank(source.getNation())) {
+			target.setNation(source.getNation());
+		}
+		if (source.getBirthday() != null) {
+			target.setBirthday(source.getBirthday());
+		}
+		if (StringUtil.isNotBlank(source.getAddress())) {
+			target.setAddress(source.getAddress());
+		}
+		if (source.getValidDateStart() != null) {
+			target.setValidDateStart(source.getValidDateStart());
+		}
+		if (source.getValidDateEnd() != null) {
+			target.setValidDateEnd(source.getValidDateEnd());
+		}
+		if (source.getLongTerm() != null) {
+			target.setLongTerm(source.getLongTerm());
+		}
+	}
+
+	private static Map<String, String> readLabelValues(JSONObject result) {
+		Map<String, String> fields = new LinkedHashMap<>();
+		if (result == null || result.isEmpty()) {
+			return fields;
+		}
+		for (String key : result.keySet()) {
+			JSONArray item = result.getJSONArray(key);
+			if (item == null || item.size() < 2) {
+				continue;
+			}
+			String label = readNestedText(item.get(0), "label");
+			String value = readNestedText(item.get(1), "result");
+			if (StringUtil.isNotBlank(label) && StringUtil.isNotBlank(value)) {
+				fields.put(label, value);
+			}
+		}
+		return fields;
+	}
+
+	private static String readNestedText(Object node, String fieldName) {
+		if (node instanceof JSONArray array) {
+			if (array.isEmpty()) {
+				return null;
+			}
+			Object first = array.get(0);
+			if (first instanceof JSONObject object) {
+				return object.getStr(fieldName);
+			}
+			return null;
+		}
+		if (node instanceof JSONObject object) {
+			return object.getStr(fieldName);
+		}
+		return null;
+	}
+
+	private static String normalizeLabel(String label) {
+		return StringUtil.isBlank(label) ? "" : label.trim();
+	}
+
+	private static Map<String, BiConsumer<IDCardVO, String>> initFieldSetters() {
+		Map<String, BiConsumer<IDCardVO, String>> setters = new LinkedHashMap<>();
+		setters.put("身份证_姓名", IDCardVO::setName);
+		setters.put("姓名", IDCardVO::setName);
+		setters.put("身份证_公民身份号码", IDCardVO::setIdNo);
+		setters.put("公民身份号码", IDCardVO::setIdNo);
+		setters.put("公民身份证号码", IDCardVO::setIdNo);
+		setters.put("身份证_性别", IDCardVO::setGender);
+		setters.put("性别", IDCardVO::setGender);
+		setters.put("身份证_民族", (card, value) -> card.setNation(normalizeNation(value)));
+		setters.put("民族", (card, value) -> card.setNation(normalizeNation(value)));
+		setters.put("身份证_出生", (card, value) -> card.setBirthday(parseDate(value)));
+		setters.put("出生", (card, value) -> card.setBirthday(parseDate(value)));
+		setters.put("身份证_住址", IDCardVO::setAddress);
+		setters.put("住址", IDCardVO::setAddress);
+		setters.put("身份证_有效期限", ShenFenZhengIdCardSupport::applyValidity);
+		setters.put("有效期限", ShenFenZhengIdCardSupport::applyValidity);
+		setters.put("身份证_签发日期", (card, value) -> card.setValidDateStart(parseDate(value)));
+		setters.put("签发日期", (card, value) -> card.setValidDateStart(parseDate(value)));
+		setters.put("身份证_失效日期", ShenFenZhengIdCardSupport::applyEndDate);
+		setters.put("失效日期", ShenFenZhengIdCardSupport::applyEndDate);
+		return setters;
+	}
+
+	private static String normalizeNation(String value) {
+		String nation = value == null ? "" : value.trim();
+		if (nation.isEmpty()) {
+			return nation;
+		}
+		return nation.endsWith("族") ? nation : nation + "族";
+	}
+
+	private static void applyValidity(IDCardVO card, String value) {
+		if (StringUtil.isBlank(value)) {
+			return;
+		}
+		if (value.contains(LONG_TERM_TEXT)) {
+			card.setLongTerm(1);
+			card.setValidDateEnd(null);
+			Date start = parseFirstDate(value);
+			if (start != null) {
+				card.setValidDateStart(start);
+			}
+			return;
+		}
+		card.setLongTerm(0);
+		Date start = parseFirstDate(value);
+		Date end = parseLastDate(value);
+		if (start != null) {
+			card.setValidDateStart(start);
+		}
+		if (end != null) {
+			card.setValidDateEnd(end);
+		}
+	}
+
+	private static void applyEndDate(IDCardVO card, String value) {
+		if (StringUtil.isBlank(value)) {
+			return;
+		}
+		if (value.contains(LONG_TERM_TEXT)) {
+			card.setLongTerm(1);
+			card.setValidDateEnd(null);
+			return;
+		}
+		Date end = parseDate(value);
+		if (end != null) {
+			card.setLongTerm(0);
+			card.setValidDateEnd(end);
+		}
+	}
+
+	private static Date parseDate(String text) {
+		return parseFirstDate(text);
+	}
+
+	private static Date parseFirstDate(String text) {
+		Matcher matcher = DATE_PATTERN.matcher(text);
+		if (!matcher.find()) {
+			return null;
+		}
+		return toDate(matcher.group(1), matcher.group(2), matcher.group(3));
+	}
+
+	private static Date parseLastDate(String text) {
+		Matcher matcher = DATE_PATTERN.matcher(text);
+		String year = null;
+		String month = null;
+		String day = null;
+		while (matcher.find()) {
+			year = matcher.group(1);
+			month = matcher.group(2);
+			day = matcher.group(3);
+		}
+		if (year == null) {
+			return null;
+		}
+		return toDate(year, month, day);
+	}
+
+	private static Date toDate(String year, String month, String day) {
+		try {
+			String formatted = String.format("%s-%02d-%02d", year, Integer.parseInt(month), Integer.parseInt(day));
+			return DateUtil.parse(formatted, DateUtil.PATTERN_DATE);
+		} catch (Exception ignored) {
+			return null;
+		}
+	}
+}
diff --git a/doc/docs/业务流程/2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.md b/doc/docs/业务流程/2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.md
index 462c0452..63ff19da 100644
--- a/doc/docs/业务流程/2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.md
+++ b/doc/docs/业务流程/2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.md
@@ -1,9 +1,10 @@
-# 金蝶（星瀚）BFI 对接操作手册（纯操作版）
+# 金蝶（星瀚）BFI 与合同合规系统（HCS）对接操作手册（纯操作版）
 
-> 整理日期：2026-10-14（2026-11-03 汇总修订）
-> 适用对象：TMS 业务操作人员（财务/业务）、系统管理员、实施运维。
+> 整理日期：2026-10-14（2026-11-04 金蝶+合同系统合并修订）
+> 适用对象：TMS 业务操作人员（财务/业务/合同经办）、系统管理员、实施运维。
 > 本文只讲**怎么操作**：在哪个页面、点什么按钮、前提是什么、成功的标志是什么、失败了怎么处理。
-> 接口与代码细节见同目录《2026-10-14-金蝶（星瀚）BFI全链路梳理（前端-后端-定时任务·业务域汇总与操作手册）》；
+> 覆盖两个外部系统的全部日常操作：**金蝶（星瀚）BFI**（客商、结算、付款、开票、收票、收款、结算调整）与**合同合规系统（HCS）**（项目立项、合同、特批、客商风险、履约计划/记录，见 4.2–4.18）。
+> 接口与代码细节见同目录《2026-10-14-金蝶（星瀚）BFI全链路梳理（前端-后端-定时任务·业务域汇总与操作手册）》与 hcs合同 目录各梳理文档；
 > 预付与结算调整的深度说明见《2026-10-18-预付转正式结算单与项目预付操作手册（纯操作·带状态）》《2026-10-17-结算调整单操作流程说明（分场景）》（本文已汇总其操作要点）。
 
 ## 修改记录
@@ -11,9 +12,10 @@
 | 日期 | 修订内容 |
 |---|---|
 | 2026-10-14 | 初版 |
-| 2026-10-19 | 核对并补充 4.2 定时任务运转逻辑（cron 默认值、错峰、终态不轮询、防呆与自愈行为） |
+| 2026-10-19 | 核对并补充 5.2 定时任务运转逻辑（cron 默认值、错峰、终态不轮询、防呆与自愈行为） |
 | 2026-10-31 | ① 收票登记改「先票后款」：收票登记只选票推金蝶收票单（不再关联结算单，新增手选结算组织/发票明细），「认领收票单+指定应付」移到付款结算单；② 收款流水与认领改口径：数据源改金蝶收款单（A301-1）、「推送金蝶」「查询金蝶认领结果」按钮下线、认领只登记本地、作废同步合同合规；③ 客商建档新增供应商编码自动获取与收款信息开户行带出联行号操作；④ 准备事项、定时任务清单、FAQ、速查表同步更新 |
-| 2026-11-03 | **四文档汇总修订（合并《2026-10-17 结算调整单》《2026-10-18 预付与项目预付》两本手册 + 按 11-01/11-02 代码与界面更新）**：① 全篇菜单更名对齐系统实际（预付结算单/付款结算单/收款结算单，新增 1.4 页面名称对照）；② 1.1 状态表补页面显示别名与「已指定应付」列；③ 新增 3.3 进度预付、3.4 项目预付（含客商风险与付款特批）、3.5 项目预付核销、3.6 尾款结算、3.10 结算调整单、3.14 作废与撤销；④ 开票申请按「剩余可开票金额」累计控制（放开必须未开票限制）、分摊发票金额系统自动分摊；⑤ **收票后款认领按 11-02 改造更新**：发票登记移到付款结算单工具栏、弹窗回显已认领收票单、「匹配结算单金额」支持手动修改、查看页新增「是否已指定应付」列与「重新推送」入口、列表指定失败悬浮展示原因；⑥ **A302-6 指定应付定时自动补偿改开关控制（默认关闭）改人工兜底**；⑦ 4/5/6 节同步更新，截图全面更新（付款结算单列表与发票登记弹窗、选择收票单、查看页发票信息、指定失败悬浮、付款管理已指定应付列、收票登记表单去税率） |
+| 2026-11-03 | **四文档汇总修订（合并《2026-10-17 结算调整单》《2026-10-18 预付与项目预付》两本手册 + 按 11-01/11-02 代码与界面更新）**：① 全篇菜单更名对齐系统实际（预付结算单/付款结算单/收款结算单，新增 1.4 页面名称对照）；② 1.1 状态表补页面显示别名与「已指定应付」列；③ 新增 4.5 进度预付、4.6 项目预付（含客商风险与付款特批）、4.7 项目预付核销、4.8 尾款结算、4.12 结算调整单、4.16 作废与撤销；④ 开票申请按「剩余可开票金额」累计控制（放开必须未开票限制）、分摊发票金额系统自动分摊；⑤ **收票后款认领按 11-02 改造更新**：发票登记移到付款结算单工具栏、弹窗回显已认领收票单、「匹配结算单金额」支持手动修改、查看页新增「是否已指定应付」列与「重新推送」入口、列表指定失败悬浮展示原因；⑥ **A302-6 指定应付定时自动补偿改开关控制（默认关闭）改人工兜底**；⑦ 4/5/6 节同步更新，截图全面更新（付款结算单列表与发票登记弹窗、选择收票单、查看页发票信息、指定失败悬浮、付款管理已指定应付列、收票登记表单去税率） |
+| 2026-11-04 | **合并合同系统（HCS）操作内容，形成金蝶+合同系统组合手册（并入《HCS合同管理操作手册（纯操作版）》《履约计划与履约记录四场景业务说明》《客商黑名单与风险等级业务说明》）**：① **新增第 2 节「全链路总览」**（**12 条环节流程链**【系统】→步骤→▼ 格式逐环节梳理、两条通用规则与三条先后依赖；场景分流/拦截提示原文/成功提示在 4.x 对应小节体现），原第 2–6 节顺延为第 3–7 节，日常操作小节相应重排为 4.1–4.18；② 新增 1.5–1.8（HCS 是什么与合规状态、特批状态、三条推送路径、客商风险与黑名单口径），1.4 页面对照补客商/项目/合同顺序；③ 第 3 节新增合同系统准备清单；④ **项目立项推合规、合同管理与推送合规（含合同特批/变更/归档）置于 4.2/4.3（客商章节后）**；付款特批操作细节不单独成节（`spec-pay.enabled` 开关口径保留在 4.6）；⑤ 新增 4.17 客商风险查看与筛选、4.18 履约计划与履约记录四场景；⑥ 4.6/4.10/4.14 补合同系统联动与金蝶实付门禁口径；⑦ 第 5 节新增 5.5 HCS 定时任务与开关及**六任务逐项运转逻辑**（判重/更新分流、特批兜底查询、金蝶实付门禁、开票自愈、收票合同回溯、风险分批刷新）；⑧ 第 6/7 节补 HCS 常见问题与操作入口；⑨ 合同支持甲乙丙多方客商（2026-11-02）已写入 4.3；⑩ 新增截图 41/42/43（付款结果回写列表效果，FKD2026110300003↔FKSQ-000000282 对照），引用 HCS 手册现有截图 |
 
 ---
 
@@ -26,6 +28,8 @@
 
 ​	13737128880   websoft5386339
 
+合同合规系统（HCS）测试环境地址：https://contract-sit.gxwuzi.com/   账号：13737128880   密码：Mk13737128880@
+
 ### 1.1 金蝶单据状态含义（列表里看到的字段）
 
 各列表的「金蝶单据状态」列是同一个字段，但不同页面的**显示文案**不同（下表「页面显示」列），看到哪个词都对得上：
@@ -53,21 +57,27 @@
 | 金蝶锁定中（红标） | 金蝶已锁单 | 不可编辑、不可作废 |
 | 锁定失败·补偿中 | 加锁没成功 | 系统每 5 分钟自动补偿重锁（≤5 次） |
 | 锁定失败·已达上限 | 自动补偿 5 次都没成功 | 不再自动重试；重新点一次「同步金蝶」即可重置计数补锁，必要时联系管理员 |
-| 金蝶删单 / 金蝶解锁（留痕） | 金蝶侧把单删了或解锁过 | 付款申请→金蝶状态变"生成失败"待重推；结算单/开票申请→系统自动作废（见 3.14） |
+| 金蝶删单 / 金蝶解锁（留痕） | 金蝶侧把单删了或解锁过 | 付款申请→金蝶状态变"生成失败"待重推；结算单/开票申请→系统自动作废（见 4.16） |
 
 ### 1.3 两条推送路径
 
-- **自动**：审批「通过」时系统自动推送金蝶（需管理员开启对应开关，见第 4 节）；开启后审批接口会直接返回推送结果，失败时页面提示「审批通过，但自动同步金蝶失败：xxx」。
-- **手动**：列表勾选单据点工具栏「同步金蝶 / 批量同步」按钮。开关没开时用这条路径。（收款流水认领没有推送动作——认领只登记本地并自动推合同合规，见 3.12。）
+- **自动**：审批「通过」时系统自动推送金蝶（需管理员开启对应开关，见第 5 节）；开启后审批接口会直接返回推送结果，失败时页面提示「审批通过，但自动同步金蝶失败：xxx」。
+- **手动**：列表勾选单据点工具栏「同步金蝶 / 批量同步」按钮。开关没开时用这条路径。（收款流水认领没有推送动作——认领只登记本地并自动推合同合规，见 4.14。）
 
 两条路径效果完全一样，重复点不会重复推送（系统自动查重）。
 
+合同系统（HCS）另有自己的三条推送路径（即时/定时/手动），见 1.7；两条系统各自独立推送、互不替代。
+
 ### 1.4 页面名称对照（先看这个）
 
 系统菜单已按"应付 / 应收"拆分，本文全部使用系统里的实际名称（旧的「正式结算单/预结算单」叫法已不再使用）：
 
 | 本文场景 | 系统菜单位置 | 页面名称 |
 |---|---|---|
+| 客商档案 | 客商管理 | 客商档案 |
+| 项目立项 | 项目管理 | **项目管理** |
+| 合同新增/审批/推送合规 | 合同管理 | **合同管理** |
+| 合同变更单 | 合同管理 | **合同变更** |
 | 预付结算单（原预结算单） | 结算管理 | **预付结算单** |
 | 应付正式结算单 | 结算管理 | **付款结算单** |
 | 应收正式结算单 | 结算管理 | **收款结算单** |
@@ -76,7 +86,6 @@
 | 开票申请列表 | 收付款管理 | **开票管理** |
 | 收票登记 | 收付款管理 | 收票管理 |
 | 收款流水/认领记录 | 收付款管理 | 收款流水、认领记录 |
-| 客商档案 | 客商管理 | 客商档案 |
 
 付款申请的**付款类型**有三种，列表和表单里都按这个名称显示：
 
@@ -86,9 +95,271 @@
 | 项目预付 | 项目预付 | 不挂结算单，按项目+承运商合同预付 |
 | 尾款付款 | 尾款付款 | 挂付款结算单付尾款 |
 
+### 1.5 合同系统（HCS）与「合规状态」
+
+TMS 合同审批通过后，合同会推送到桂物合同合规系统（HCS）。HCS 完成客商风险校验、合同合规校验、特批和金蝶同步，并把合规合同ID、金蝶合同ID、特批结果回写到 TMS。项目立项、开票登记、收票单、付款履约数据按同一套框架推送（见 4.2–4.18）。
+
+各单据列表的「**合规状态**」列是同一个字段，不同页面显示文案一致：
+
+| 状态值 | 页面显示 | 含义 | 还会变吗 |
+|---|---|---|---|
+| unsynced | 待推送 | 审批已通过，尚未成功推送 HCS | 会（推送成功变已推送） |
+| synced | 已推送 | HCS 已受理，已回填合规ID | 会（特批状态、金蝶ID可能继续变化） |
+| failed | 推送失败 | 推送失败，鼠标悬停合规状态可查看原因 | 会（自动重试或手动重推成功后变已推送） |
+
+> 「已推送」只代表 HCS 已受理，不代表特批和金蝶同步已完成；金蝶合同ID/金蝶项目ID由 HCS 完成金蝶同步后回写，可能延迟。
+
+### 1.6 特批状态（合同与付款共用）
+
+| 状态值 | 页面显示 | 含义 | 后续 |
+|---|---|---|---|
+| need | 待特批 | 尚未进入特批流程，多见于存量数据或推送未完成 | 重新推送成功后转特批中 |
+| processing | 特批中 | HCS 正在审批特批；合同列表当前节点显示「特批审核」 | 等待 HCS 回传、定时查询或人工确认 |
+| approved | 特批通过 | 特批完成 | 合同恢复「审批通过」，继续后续流程 |
+| rejected | 特批驳回 | 特批未通过 | 合同/付款审批联动「已驳回」，修改后重新提交 |
+
+合同特批看合同详情「合规信息」区的特批状态；**付款申请页面没有独立特批状态列**，看列表「当前节点」：显示「特批审核」即为特批中，通过后恢复「审批通过」，驳回则审核状态变「已驳回」。
+
+![付款管理列表「当前节点」列：特批中的付款申请当前节点显示「特批审核」（审核状态仍为审批通过，不能只看审核状态判断流程是否结束；特批通过恢复「审批通过」后金蝶单据才会生成）](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/42-付款管理-特批审核当前节点.png)
+
+### 1.7 合同系统三条推送路径
+
+| 路径 | 触发时机 | 开关 | 说明 |
+|---|---|---|---|
+| 自动即时推送 | 审批人点「通过」后 | `thirdParty.hcs.push.immediate-enabled` | 项目立项、合同受此开关控制；审批响应等待推送结果，失败提示「审批通过，但合规推送失败：xxx」 |
+| 定时扫描推送 | 每 5 分钟（五个业务错峰） | `thirdParty.hcs.push.{bizType}.sync-enabled` | 扫「待推送/推送失败未超限」的单据；只有合同任务额外兜底查询特批结果 |
+| 手动推送 | 随时 | 无 | 列表行内「推送合规」或工具栏「批量推送合规」（开票登记、收票单页面无推送按钮，靠定时或运维接口） |
+
+- **付款申请**：审批通过后即时发起付款特批/推送合规的动作受 `thirdParty.hcs.spec-pay.enabled` 控制（★2026-11-03 起默认关闭，见 4.6）；定时扫描只做失败补偿。
+- 三条路径共用同一套推送逻辑；HCS 侧有判重，重复触发不会重复生成。
+- 推送失败默认自动重试 **5 次**，超过后只能人工重推（人工重推会把失败次数清零）。
+
+### 1.8 客商风险与黑名单口径
+
+客商风险数据来自两个外部系统，每日 02:30 自动刷新到客商档案（范围：合同期限内生效合同的甲乙方客商）：
+
+| 数据 | 来源 | 说明 |
+|---|---|---|
+| 风险等级 | 合同合规系统（C101-1） | 低风险 / 中风险 / 高风险 |
+| 金蝶黑名单 | 金蝶（星瀚）· 国资委黑名单（A801-5） | 命中记录失信类别（**A 类禁止交易类** / B 类风险警示类）与列入事由 |
+
+- **黑名单仅指金蝶黑名单命中**；合同合规系统返回的黑名单状态字段只用于付款提交强制校验，不在列表展示。
+- 客商档案、合同列表的「客商风险」列为等级+黑名单组合展示（等级在前，如「高风险、黑名单」），红色标签悬浮查看明细（失信类别、列入事由、风险等级）；查看与筛选操作见 4.17。
+- 内部组织客商不查询风险，默认「无风险」；数据每天 02:30 刷新，当天新增客商以客商表单实时提示为准，列表次日生效。
+- 风险管控作用点：①客商准入提审黑名单硬校验（4.1 第 3 步）；②合同推送自动特批（4.3 第四步）；③付款提交特批附件必传（4.6）。
+
 ---
 
-## 2. 一次性准备（实施/管理员操作）
+## 2. 全链路总览（各环节流程）
+
+> 本章讲清各环节的先后顺序、每一步推给哪个系统、成功标志是什么；逐环节的操作细节见「日常操作流程」章节对应小节（节号在各链标题中）。
+
+### 2.1 各环节流程链（【系统】→ 步骤 → ▼，按业务顺序编号）
+
+**① 客商建档与同步（4.1）**
+```text
+【TMS】客商档案新增（blade_customer_archive）
+   │  ① 录统一社会信用代码满 18 位 → 实时查金蝶（A901-1）回填工商信息
+   │  ② 收款信息「开户行」失焦 → 按行名从金蝶带出联行号；保存前按行号反查校验
+   │  ③ 提交审批 → 按纳税人识别号查金蝶黑名单（A801-5）：A 类禁止提交
+   ▼
+审批通过 → 自动推金蝶（A902）
+   │  ④ 成功 kingdee_status=synced；失败 failed（行内「同步金蝶」重推）
+   │  ⑤ 定时任务（每天 02:00）复查金蝶审核状态：通过 → exist（终态）
+   ▼
+金蝶已审核客商（exist）
+```
+
+
+**② 项目立项推合规（4.2）**
+```text
+【TMS】项目立项（blade_project_apply）
+   │  ① 审批通过 / 变更审批通过 → 待推送
+   ▼
+推送合规（审批即时开关 / 定时扫描 / 行内「推送合规」）
+   │  ② C102-3 按项目编号判重：命中 → 回填已有合规ID（不重复建）
+   │  ③ 未命中 → C102-1 新建（付款/开票额度万元×10000 转元）
+   │  ④ 已有合规ID（变更）→ C102-2 更新
+   ▼
+【TMS】合规状态=已推送 + 合规项目ID 落库（hcs_fd_id）
+   │  ⑤ 合规完成金蝶同步后回调 projectLegal/result → 回填金蝶项目ID/编号（不改合规状态）
+   ▼
+列表「金蝶项目ID / 金蝶项目编号」回显（推送成功≠金蝶项目已建）
+```
+
+
+**③ 合同推合规与合同特批（4.3）**
+```text
+【TMS】合同（blade_contract_manage）
+   │  ① 审批通过 / 变更审批通过 → 推合规（即时开关 / 定时扫描 / 行内「推送合规」）
+   ▼
+推送链（单条依次执行）
+   │  ② 附件转传 C103-2（失败整条推送失败）
+   │  ③ 客商风险 C101-1 + 金蝶黑名单 A801-5（甲乙逐个查，命中只标记不阻断）
+   │  ④ C103-3 按合同编号判重 → C103-1 起草 / C103-11 更新（高风险随报文发起特批）
+   │  ⑤ 履约规则 C103-9 行级同步（开关开启时；失败整条 failed，下轮凭合规ID走更新补偿）
+   ▼
+【TMS】合规状态=已推送 + 合规合同ID 落库
+   │  ⑥ 风险命中 → 特批状态=特批中、当前节点「特批审核」（特批中禁止重推）
+   ▼
+特批结果：contractLegal/result 回调 或 定时 C103-4 查询兜底
+   │  ⑦ 通过 → 恢复「审批通过」（金蝶合同ID可能同时回填）
+   │  ⑧ 驳回 → 合同联动「已驳回」，修改后重新提交审批、重新推送
+```
+
+
+**④ 预付结算单 → 进度预付（4.4/4.5）**
+```text
+【TMS】预付结算单（blade_pre_settlement，本身不推金蝶）
+   │  ① 制单/审批通过（外币在此选汇率日期带出结算汇率）
+   ▼
+三个出口：预付申请（进度预付） / 项目预付核销 / 尾款结算
+   │  ② 工具栏「预付申请」（限应付+审批通过+未转结算+同一合同，可多选）
+   ▼
+【TMS】付款申请新增页（blade_payment_application，类型锁定「进度预付」）
+   │  ③ 结算金额/可付款金额自动带出 → 填申请付款金额/付款方式/收款方 → 保存
+   │  ④ 提交 → 审批通过 → 推金蝶（见⑧）
+   ▼
+金蝶付讫（已付款）→ 自动回写预付结算单垫资记录与「已付款金额」
+```
+
+
+**⑤ 项目预付与核销（4.6/4.7）**
+```text
+【TMS】付款申请新增，付款类型=项目预付（不挂结算单）
+   │  ① 先选项目再选承运商合同 → 提交校验项目额度/客户额度 → 审批通过
+   ▼
+推金蝶（预付款通道，金蝶生成「其他付款申请」）
+   │  ② 金蝶付款完成 → 金蝶状态「已付款」（未付款不能核销）
+   ▼
+【TMS】结算单编辑页「项目预付核销」分区（blade_settlement_project_advance_write_off）
+   │  ③ 「选择」弹窗只列：同合同 + 审批通过 + 金蝶已付款 + 有剩余可核销额
+   │  ④ 核销金额计入「已付金额（含预付、核销）」，可核销额度即时占用
+```
+
+
+**⑥ 尾款结算（4.8）**
+```text
+【TMS】预付结算单列表勾选（同项目、应付、审批通过、无在途预付申请）
+   │  ① 工具栏「尾款结算」→ 跳新增付款结算单，明细/费用项合并带入
+   │  ② 结算合计三口径：结算合计（全额）/ 已付金额（含预付、核销）/ 剩余未付
+   │  ③ 来源预付结算单被锁定（不能再发起预付、不能作废）
+   ▼
+保存草稿 → 提交 → 审批通过 → 推金蝶（见⑦）
+```
+
+
+**⑦ 结算单推送金蝶（4.9）**
+```text
+【TMS】付款结算单 / 收款结算单（blade_formal_settlement）
+   │  ① 审批通过；外币先重选汇率日期带出结算汇率（预付结算单汇率不自动继承）
+   ▼
+推送（审批自动开关 / 工具栏「同步金蝶」）
+   │  ② 应付 A102-2 / 应收 A302-2 按结算类型自动分流
+   │  ③ 成功：金蝶单据号回填 + 状态已同步 + 金蝶锁定（不可改/不可作废）
+   │  ④ 应付单生成后，系统自动对本单认领的收票单执行「指定应付」（见⑩）
+   ▼
+失败：悬浮状态标签看原因；failed 重推任务每 10 分钟自动续推
+```
+
+
+**⑧ 付款申请推送与实付回写（4.10）**
+```text
+【TMS】付款申请（blade_payment_application，审批通过）
+   │  ① 门禁：付款特批审核中拦截推送金蝶（仅特批走合规开关开启时）
+   │  ② 推金蝶 A103（预付走预付款通道）：已生成 + 金蝶单号 + 落锁
+   │  ③ 履约计划金额本地累加（blade_contract_exe_stage，按款项性质精确匹配）
+   ▼
+金蝶付款结果回写（定时 10 分钟 / 工具栏「同步付款结果」）
+   │  ④ 已生成 → 付款中 → 已付款（回写付款记录/凭证）/ 已关闭
+   ▼
+实付回写（paidAmount>0）→ 自动重新置待同步
+   │  ⑤ C103-9 重推履约计划 → C108-1 新建 / C108-2 更新付款履约记录（一张申请一条）
+   │     未实付时整体照常已推送，结果说明「金蝶未实际付款…」（正常等待，非失败）
+```
+
+
+**⑨ 开票申请（4.11）**
+```text
+【TMS】开票申请（blade_invoice_application）
+   │  ① 选应收结算单（审批通过+剩余可开票金额>0）→ 分摊发票金额系统自动分摊 → 审批通过
+   ▼
+推金蝶（按发票张次逐张）
+   │  ② A303-1：一张申请 N 张发票 → N 张金蝶开票申请单，逐张锁定
+   ▼
+开票结果回写（定时 10 分钟）
+   │  ③ 发票逐张落库 → 状态「开票完成」（终态）
+   │  ④ 合规 C111 开票登记（金蝶已开票自动重置待同步 → C111-3 更新票据日期/状态）
+   │  ⑤ 每张发票一条开票履约记录（C108-1，合规检索「开票履约-发票号」）
+```
+
+
+**⑩ 收票登记 → 认领 → 指定应付（4.12，先票后款两段式）**
+```text
+【TMS】收票登记（blade_invoice_receipt）
+   │  ① 票池选票（带出发票明细）+ 手选结算组织 → 保存前重查金蝶票池可用性
+   │  ② 审批通过 → 推金蝶收票单 A303-2（按登记ID幂等防重）→ 终态 pushed
+   │  ③ 合规 C109 推收票单 → 成功后按认领分摊行推履约收票记录（C108-1）
+   ▼
+【TMS】付款结算单认领收票单（blade_invoice_receipt_settlement）
+   │  ④ 三入口等效：编辑页「选择收票单」/ 工具栏「发票登记」/ 查看页「重新推送」
+   │  ⑤ 一张收票单只能被一张付款结算单认领；匹配金额默认=发票金额可改小
+   ▼
+应付单推送金蝶后 → 系统自动指定应付（A302-6）
+   │  ⑥ 收票状态 pushed → assigned（终态）；指定失败不影响结算单，人工入口重推兜底
+```
+
+
+**⑪ 收款流水与认领（4.14）**
+```text
+【金蝶】A301-1 收款单
+   │  ① 手动同步（可按窗口重复执行，幂等）
+   ▼
+【TMS】收款流水列表（blade_kingdee_receipt_flow）
+   │  ② 勾选/单条 → 选择应收正式结算单 → 填分摊金额
+   ▼
+【TMS】认领（blade_receipt_claim + blade_receipt_claim_settlement）
+   │  ③ 更新流水累计认领金额/状态、刷新结算单收款汇总
+   │  ④ 事务提交后推合规：C103-9 → C107-1 → C108-1（失败只落标记，不自动重试）
+   ▼
+合规侧认领记录（C107-1 返回 fdId 落库 blade_receipt_claim_hcs_record）
+   │  ⑤ 需要撤销时在「认领记录」页作废
+   ▼
+本地回退金额 + 推 C107-3（fdStatus=1 已作废；计划金额与履约流水不回冲）
+```
+
+
+**⑫ 结算调整单（4.13）**
+```text
+【TMS】结算调整单（blade_settlement_adjustment，只能手工新增，无作废）
+   │  ① 选可调整结算单（审批通过+未完成收付款+无在途付款申请）→ 带出费用明细
+   │  ② 录调整金额（可为负/新增手工费用）→ 选单时做金蝶冲销预检（软提示不拦截）
+   ▼
+审批「通过」（确认后按原单是否推过金蝶自动分流）
+   │  ③ 场景A 原单未推金蝶：调整直接回写原单 → 自动推送金蝶（应付/应收+落锁+附件）
+   │  ④ 场景B 原单已推金蝶：原单零改动只追加变更记录 → 提示财务先在金蝶手工冲销旧单
+   ▼
+场景B 续：金蝶侧冲销完成后 → 业务点「重新推送（高危）」
+   │  ⑤ 硬闸门查金蝶旧单必须已冲销 → 克隆新结算单（直接审批通过态）→ 推金蝶
+   │  ⑥ 项目预付核销行随迁新单；原单标记「已调整」仅存档；失败复用新单续推（幂等）
+```
+
+
+### 2.2 两条通用规则与三条先后依赖（先记这些，大部分问题都是顺序或状态没走到）
+
+**通用规则**：
+- 同一套推送逻辑两条触发路径：审批通过自动推（开关开启时）与页面手动按钮效果完全一致，重复触发自动查重，不会重复生成金蝶/合规单据。
+- 推送成功即落锁：结算单/付款/开票推送成功后自动锁金蝶侧单据——不可编辑、不可作废（见 1.2）。
+
+**三条先后依赖**：
+
+1. **结算单必须先推金蝶**，付款申请、开票申请才能推——付款从金蝶应付单下推、开票前系统检查金蝶应收单。
+2. **合同必须先推合规**，付款特批与履约数据才有前提（C106-3 要求关联合同有合规ID；履约计划/记录以合同为根）。
+3. **履约记录晚于业务发生**：付款=金蝶实付后、收款=认领提交后、开票=金蝶开票完成后、收票=收票单推合规后——审批通过就去合规找记录是找不到的（付款场景连计划金额都还没同步），口径对照见 4.18。
+
+---
+
+## 3. 一次性准备（实施/管理员操作）
 
 | # | 事项 | 操作人 | 操作内容 | 不做的后果 |
 |---|---|---|---|---|
@@ -98,14 +369,30 @@
 | 4 | 平台公司金蝶组织编码 | 管理员 | 组织管理维护「是否平台公司=是」并填**金蝶编码** | 收款流水同步直接报错拦截；收票按手选部门上溯平台公司取组织编码失败也会推送拦截 |
 | 5 | 票池票种白名单 | 运维 | Nacos 配 `thirdParty.bfi.invoiceReceipt.invoiceTypes`（要同步的发票种类编码，逗号分隔） | 票池同步不到对应票种 |
 | 6 | 物料映射 | 运维 | Nacos 配 `thirdparty.bfi.material.*`（有默认值，建议显式确认） | 推送报「运输方式未配置」类拦截 |
-| 7 | 定时任务开关 | 运维 | 按第 4 节清单逐项开启 | 只能全靠手动按钮 |
-| 8 | 审批自动同步开关 | 运维 | 按第 4 节 `autoSync.*` 按域开启 | 审批通过后不自动推送，走手动 |
+| 7 | 定时任务开关 | 运维 | 按第 5 节清单逐项开启 | 只能全靠手动按钮 |
+| 8 | 审批自动同步开关 | 运维 | 按第 5 节 `autoSync.*` 按域开启 | 审批通过后不自动推送，走手动 |
+
+**合同系统（HCS）准备**（Nacos 前缀 `thirdParty.hcs.*`，与上表金蝶准备相互独立）：
+
+| # | 事项 | 操作人 | 操作内容 | 不做的后果 |
+|---|---|---|---|---|
+| 1 | HCS 连接配置 | 运维 | `baseUrl`、`authorization`、`key-auth` | 所有推送失败或认证被拒 |
+| 2 | 合同类别模板映射 | 运维 | `contract.template-mapping` 为**每个合同类别**配置 HCS 模板ID（YAML 中文键必须写 `"[承运商合同]"` 括号写法） | 未映射的类别推送必失败 |
+| 3 | 项目立项模板编码 | 运维 | `project.template-code` | 项目立项推送必失败 |
+| 4 | 付款特批模板与开关 | 运维 | `spec-pay.template-id`、`payment-purpose/nature/type` 字典；★`spec-pay.enabled` 特批走合规开关，**默认 false**（见 4.6） | 开启但未配模板时特批发起失败；默认关闭时付款不走合规特批 |
+| 5 | 履约计划/记录开关 | 运维 | `exe-stage.sync-enabled`（履约计划）、`perf-record.sync-enabled`（履约记录，默认 false，开启需配 `perf-record.xform-id`） | 不推送履约数据（不影响合同主流程） |
+| 6 | 附件下载基址 | 运维 | `attachment.file-download-base`；`transfer-enabled=true` | 合同有附件时转传失败 |
+| 7 | 币种映射 | 运维 | 合同 `contract.currency-name-mapping`；开票 `invoice.currency-id-mapping`（**RMB 必配**） | 币种传错或为空；RMB 未配时开票登记每轮失败 |
+| 8 | 风险/额度校验开关 | 运维 | `contract.require-risk-check=true`、`risk.check-on-payment=true`、`credit.check-enabled`（超额自动转特批） | 关闭后高风险合同/付款不触发特批 |
+| 9 | 推送开关 | 运维 | `push.immediate-enabled`（项目/合同即时）、`push.{project|contract|payment|invoice-application|invoice-receipt}.sync-enabled`（定时扫描，默认全关，见 5.5） | 只能靠手动按钮推送 |
+| 10 | 客商风险每日刷新 | 运维 | `risk.refresh-enabled` 上线置 `true`（默认 false，每天 02:30） | 客商档案/合同列表「客商风险」列无数据 |
+| 11 | 客商名称一致性 | 业务 | 合同甲乙方名称与客商档案全称或简称一致 | 风险校验取不到客商被跳过，可能漏特批 |
 
 ---
 
-## 3. 日常操作流程
+## 4. 日常操作流程
 
-### 3.1 客商建档与同步
+### 4.1 客商建档与同步
 
 **页面：客商管理 → 客商档案**
 
@@ -117,9 +404,10 @@
 2. 维护**收款账户**和发票信息（纳税人识别号用于黑名单校验）。
    - 收款信息「开户行」输入后失焦，系统自动按行名从金蝶**带出联行号**；带不出时可手动填写，保存时系统会按联行号反查金蝶校验，查不到会拦截保存。
 3. 提交审批：系统自动做**黑名单校验**。
-   - 提交被拦「命中黑名单」→ 该客商为国资委黑名单 A 类，**不能提交**，走线下处置。
+   - 提交被拦「命中黑名单」→ 该客商为国资委黑名单 A 类（禁止交易类），**不能提交**，走线下处置；B 类（风险警示类）仅告警默认放行并记录；黑名单查询异常时暂缓提交（防漏拦），稍后重试。
 4. 审批「通过」→ 系统自动推送金蝶 → 列表 `kingdee_status` 变 **synced**。
    - 变 **failed** → 看失败原因（悬停/详情），修复后点行内「同步金蝶」重推。
+   - failed 原因是金蝶侧该客商「审核中」→ 等金蝶审核完由定时任务自动升级（**无需反复重推**）。
 5. synced 是「金蝶已受理」；金蝶审核通过后由定时任务升级为 **exist**（终态，无需操作）。
 
 推送成功后金蝶侧效果（供确认推送结果时对照）：
@@ -132,7 +420,7 @@
 
 ![客商档案表单：基础信息含「供应商编码」（金蝶供应商编码，系统自动获取）；收款信息 tab 维护开户行/联行号（开户行失焦按行名从金蝶带出联行号，保存前按行号校验）](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/15-客商档案-供应商编码.png)
 
-![image-20261030195438695](F:\workspace\work\xdwl\tms-api\doc\docs\业务流程\2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets\image-20261030195438695.png)
+![新增客商表单风险实时提示：客商名称下方显示「被列入外部黑名单（失信类别：风险警示类）…」红色提示，悬浮见明细；提交审批时按纳税人识别号做金蝶黑名单硬校验（A 类禁止提交）](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/image-20261030195438695.png)
 
 
 
@@ -140,7 +428,88 @@
 
 > ·注意：审批通过后的**档案变更不会重新推送金蝶**。改了信用代码等关键信息需人工确认金蝶侧一致性。
 
-### 3.2 预付结算单（进度预付与尾款结算的前置）
+### 4.2 项目立项推送合同合规
+
+**页面：项目管理 → 项目管理**
+
+项目立项审批通过后，TMS 把项目信息推送到合同合规系统（C102）：首次推送先按**项目编号**判重，命中直接回填已有合规项目ID（不重复建）；变更审批通过后按已有合规项目ID更新。项目没有客商风险特批环节。
+
+![项目管理列表：审批通过且未推送的项目行内显示「推送合规」；合规状态/金蝶项目ID列在表格右侧横向滚动区](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/41-项目管理列表-推送合规.png)
+
+**前提**：项目审核状态为「审批通过」或「变更审批通过」、项目编号不为空；运维已配置 `thirdParty.hcs.project.template-code`（第 3 节 HCS 准备 #3）。
+
+1. **自动路径**：审批「通过」时即时推送（开关 `push.immediate-enabled` 开启时页面显示「正在推送合规，请稍候…」遮罩，等待结束勿重复点击）；未开启时等定时扫描（`push.project.sync-enabled`，每 5 分钟）。
+2. **手动路径**：行内「**推送合规**」→ 确认弹窗「确定」→ 等遮罩结束列表自动刷新；勾选多条可点工具栏「**批量推送合规**」（选中项必须全部满足推送条件，否则整批提示「选中数据中有 N 条不符合推送条件」）。
+3. **成功标志**：合规状态变**已推送**；提示可能为「项目立项新建成功：项目编号」（新建）、「项目立项更新成功：项目编号」（变更更新）、「判重命中，回填已有合规项目ID」。
+4. **结果查看**：列表「金蝶项目ID」「金蝶项目编号」由 HCS 完成金蝶同步后回调回填，可能延迟——**推送成功 ≠ 金蝶项目已建**，稍后刷新查看。
+5. **失败处理**：悬停合规状态看原因（常见：「立项表单模板编码未配置」→运维补配置；C102 接口异常/超时→稍后重推）。失败每 5 分钟自动重试，超 5 次停止，人工重推清零。
+6. **项目变更**：审批通过/变更审批通过的项目行内「变更」→ 修改提交审批 → 通过后按合规项目ID更新 HCS；从未推送过的按首推处理（先判重再新建）。
+
+### 4.3 合同管理：新增、审批与推送合规
+
+**页面：合同管理 → 合同管理 / 合同变更**
+
+合同是付款特批与履约数据的前提：付款申请的特批、履约计划/记录都挂在**已推送合规的合同**下。合同列表的「合规状态」「金蝶合同ID」「当前节点」「归档状态」列是本节的主看板。
+
+![合同列表状态与操作列：合同阶段/审核状态/归档状态/合规状态/金蝶合同ID/当前节点（特批审核=特批中）/操作列（查看/复制/变更/附件上传/推送合规），工具栏含「批量推送合规」](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/02-合同列表状态与操作列.png)
+
+**第一步：新增与提交审批**
+
+![新增合同：签约类型、合同名称、合同类型、项目、甲乙方、合同期限、金额、结算方式等基本信息（甲乙方可选多个客商，支持甲乙丙多方；推送合规按多方展开签署方）](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/04-新增合同-基本信息.png)
+
+1. 「新增」填写基本信息（合同编号可不填，按合同负责部门规则自动生成）、计费信息、结算单规则、付款比例设置——**正式合同**这三块必须完整并通过校验，**临时合同**只校验基础必填项。
+2. 上传附件：用印材料区（用印材料/双章归档文件/其他文件）、佐证材料区（**特批附件**/其他文件）。**高风险/黑名单客商合同必须上传「特批附件」**，否则提交被拦截（提示见 4.6 同款）。
+3. 三种提交：「保存」（草稿，不推送）/「提交临时合同」（有效期 30 天，及时「转正式合同」）/「提交正式合同」。提交后审核状态「审批中」。
+
+**第二步：审批与推送合规**
+
+![手动推送合规确认：列表行内「推送合规」，确认后显示「正在推送合规，请稍候…」](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/15-手动推送合规确认.png)
+
+1. 审批人点「通过」→ 即时推送（开关开启时）或等定时扫描；也可对「待推送/推送失败」的合同行内「推送合规」/勾选后工具栏「批量推送合规」手工推。
+2. **成功标志**：合规状态**已推送** + 详情回填**合规合同ID**。
+3. **推送时系统自动做的事**（供理解，无需操作）：附件转传合规（C103-2）→ 客商风险校验（C101-1 + 金蝶黑名单 A801-5，甲乙双方逐个查，**命中只标记不阻断推送**）→ 判重/起草（C103-3/C103-1，报文含业务合同号与归档状态）→ 履约规则同步（C103-9，开关开启时同步合同表单「履约规则」页签的付款/收款计划行）→ 高风险/黑名单命中则挂起「特批审核」（第四步）。
+4. **失败处理**：悬停合规状态看原因。常见：「合同类别 [xxx] 未配置合规模板ID」→运维补映射；附件转传失败→查下载基址与附件；C103-1/C103-11 业务校验错误→按返回 msg 修数据。超 5 次停止自动重试，人工重推清零。
+   - 怀疑合规侧其实已生成：**直接重推即可**——本地无合规ID先走判重回填，已有合规ID走更新，两种路径都不会重复生成合同。
+
+![待推送与推送失败列表：合规状态列「待推送/推送失败」，行内「推送合规」按钮，失败原因可悬停查看](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/14-待推送与推送失败列表.png)
+
+**第三步：查看推送结果（合同详情「合规信息」区）**
+
+![合同详情合规信息：合规同步状态、合规合同ID、客商风险、特批状态、特批说明](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/06-合同详情-基本信息与合规信息.png)
+
+- 合规状态=已推送且合规合同ID不为空即推送成功；**金蝶合同ID**由 HCS 金蝶同步后回写，可能延迟，空着先刷新。
+- **已推送的合同不能直接编辑**——要改内容必须走「变更」（第五步），否则会在合规侧产生重复合同。
+
+**第四步：高风险/黑名单合同特批**
+
+![高风险客商合同：合规信息显示客商风险红色标签与特批状态](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/12-特批待发起.png)
+
+1. 触发条件：甲方或乙方为外部客商，且客商为高风险或金蝶黑名单命中（口径见 1.8）。
+2. 流程：推送成功后合同自动进入特批 → 特批状态「特批中」、当前节点「**特批审核**」→ HCS 完成后经回调或定时查询（随合同扫描任务，每 5 分钟兜底）回传 → **特批通过**：恢复「审批通过」（金蝶合同ID可能同时回填）；**特批驳回**：合同审批联动「已驳回」，修改后重新提交审批、重新推送。
+3. **人工确认特批结果**（结果长时间未回传时）：详情「合规信息」右上角「**确认特批结果**」→ 输入 `approved`（通过）或 `rejected`（驳回）→ 确定。仅「特批中」可操作，确认前务必与合规侧核对。
+
+![确认特批结果：输入 approved 或 rejected](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/13-确认特批结果.png)
+
+4. 特批中的合同**不允许重推**（提示「合同特批审核中，禁止重推」）。详情页右上角「发起特批」是旧版独立入口，点击提示接口不存在可忽略——特批随推送自动发起。
+
+**第五步：合同变更（已推送合同改内容）**
+
+![合同变更页面：在正式合同基础上修改基本信息、附件、计费、结算和付款比例](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/09-合同变更-基本信息.png)
+
+1. 合同管理列表行内「**变更**」（变更驳回后点「重新提交变更」）→ 系统创建变更单草稿并跳转「**合同变更**」页面；同一合同已有审批中的变更单时拦截，有草稿/已撤回/变更驳回的变更单时打开继续编辑。
+2. 选**变更类型**（合同信息变更/结算规则变更/终止合同——「终止合同」当前版本未开放）→ 修改内容 → 填**变更原因**（最多 500 字）→ 上传变更材料 → 「提交」。
+3. 审批人在「合同变更」列表审批：**通过** → 回写原合同（状态变「变更审批通过」）并按合规合同ID更新 HCS（C103-11），履约计划行随变更重推，变更记录保留在合同详情底部；**驳回** → 变更单「变更驳回」可改后重提；审批中可**撤回**（不影响原合同状态）。
+
+![合同变更下部：填写变更原因（最多 500 字）并上传变更材料](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/10-合同变更-原因与材料.png)
+
+**第六步：附件上传与归档**
+
+![附件上传弹窗：先选附件位置（用印材料/佐证材料），再选附件类型并上传](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/11-附件上传弹窗.png)
+
+1. 列表行内「**附件上传**」（正式合同审批通过后）：选附件位置与类型上传（支持 pdf/图片/office/zip 等，单个 ≤50MB）。
+2. **归档**：附件类型选「**双章归档文件**」（位置=用印材料）→ 合同归档状态变「已归档」，且已推送合规的合同**即时**更新合规侧归档状态为「待归档」并挂载归档附件；未推送的合同在首次推送报文中自带归档状态。合规侧后续归档流转由合规系统维护。
+
+### 4.4 预付结算单（进度预付与尾款结算的前置）
 
 **页面：结算管理 → 预付结算单**（原「预结算单」，本身不推送金蝶）
 
@@ -152,19 +521,19 @@
    ![预付结算单编辑页：汇率日期/结算汇率字段（人民币时禁用为 1.00，外币选择日期后自动带出）](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/12-预结算单-汇率字段.png)
 2. 提交审批 → 审批「通过」（或驳回后修改重新提交）。
 3. 审批通过后的三个出口：
-   - **发起进度预付**：工具栏「预付申请」（限应付且已审批、未转付款结算、同一合同可多选）→ 跳转付款申请新增页，见 3.3；
-   - **项目预付核销**：付款结算单/预付结算单编辑页「项目预付核销」分区，见 3.5；
-   - **尾款结算（转付款结算单）**：工具栏「尾款结算」→ 见 3.6；转后本单被锁定（不能再发起预付、不能作废）。
-4. 注意：**付款结算单的汇率不自动继承预付结算单**，转正式后需在编辑时重新选汇率日期带出（见 3.13），否则推送金蝶不带汇率。
+   - **发起进度预付**：工具栏「预付申请」（限应付且已审批、未转付款结算、同一合同可多选）→ 跳转付款申请新增页，见 4.5；
+   - **项目预付核销**：付款结算单/预付结算单编辑页「项目预付核销」分区，见 4.7；
+   - **尾款结算（转付款结算单）**：工具栏「尾款结算」→ 见 4.8；转后本单被锁定（不能再发起预付、不能作废）。
+4. 注意：**付款结算单的汇率不自动继承预付结算单**，转正式后需在编辑时重新选汇率日期带出（见 4.15），否则推送金蝶不带汇率。
 5. 金蝶付款回写联动：进度预付在金蝶付讫（已付款）后，系统自动在本单垫资记录回写付款金额与金蝶付款单号，并刷新「申请预付金额 / 已付款金额」两列——无需手工登记（异常时管理员可用回写接口手工补）。
 
-### 3.3 进度预付（预付结算单 → 付款申请）
+### 4.5 进度预付（预付结算单 → 付款申请）
 
 **页面：结算管理 → 预付结算单 →（预付申请）→ 收付款管理 → 付款管理**
 
 **前提**：预付结算单是**应付**、状态**审批通过**、还没转付款结算。
 
-1. 进「预付结算单」列表，勾选单据（**同一合同**可多选；不满足"应付+审批通过+未转付款结算+同合同"会按钮拦截提示）。
+1. 进「预付结算单」列表，勾选单据（**同一合同**可多选；不满足"应付+审批通过+未转付款结算+同合同"会按钮拦截提示 → 逐项核对：类型改应付/先完成审批/已转单的换其他预付结算单/不同合同的分开勾选）。
 2. 点工具栏「**预付申请**」→ 自动跳到「付款申请新增页」：**付款类型固定为"进度预付"不可改**，所选预付结算单已带入、结算单号只读，"结算金额 / 可付款金额"自动带出。
 
 ![付款申请表单（进度预付）：付款类型=进度预付且锁定，结算单号只读带出，结算金额/可付款金额自动显示，需填申请付款金额、付款方式、收款方](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/32-付款申请表单-进度预付.png)
@@ -176,12 +545,12 @@
 4. 填「申请付款金额」（不超过可付款金额）、「付款方式」（选承兑汇票时要再选汇票台账）、「收款方」→「**保存**」。
 5. 回到「付款管理」列表 → 找到该单 →「提交」→ 审批人「通过」。
 
-**状态变化**：付款申请 `草稿 → 审批中 → 审批通过`；随后系统自动推金蝶，金蝶状态 `未生成 → 已生成 → 付款中 → 已付款`（推送与回写见 3.8）。
+**状态变化**：付款申请 `草稿 → 审批中 → 审批通过`；随后系统自动推金蝶，金蝶状态 `未生成 → 已生成 → 付款中 → 已付款`（推送与回写见 4.10）。
 **同时发生**：预付结算单列表出现「申请预付金额 / 已付款金额」两列并随付款进度更新；预付结算单仍可继续「尾款结算」。
 
 > 若提交/通过后看到黄色警告写着金蝶推送失败：审批结果**不受影响**，稍后自动重推，或到付款管理列表勾选后点「批量同步」。
 
-### 3.4 项目预付（不挂结算单）
+### 4.6 项目预付（不挂结算单）
 
 **页面：收付款管理 → 付款管理 →（新增付款申请，付款类型=项目预付）**
 
@@ -195,23 +564,25 @@
 1. 填写：**所属项目**（必选）→ **合同名称**（必选，**选了项目后才能选**，只能选承运商合同）→ 申请付款金额、付款方式、付款方/收款方等。本类型不挂结算单，不显示结算信息与发票相关内容。
 2. 「保存」→「付款管理」列表「提交」→ 审批人「通过」。
 
-**会被拦截的情况（提示原文）**：
-- "申请付款金额不能超过项目额度"（项目额度 = 项目资金需求额度 + **审批通过且在有效期内**的临时额度；按单笔申请金额比较）
-- "申请付款金额不能超过客户额度"（按收款方匹配客商档案的信用额度）
-- "项目预付必须选择有效合同"、"付款申请只能选择承运商合同"
-- "申请付款金额不能超过可付款金额"（项目预付的可付款金额=项目资金需求×10000）
+**会被拦截的情况（提示原文 → 解决）**：
+- "申请付款金额不能超过项目额度"（项目额度 = 项目资金需求额度 + **审批通过且在有效期内**的临时额度；按单笔申请金额比较）→ 调小申请金额，或让管理员先审批通过临时额度管理里的临时额度。
+- "申请付款金额不能超过客户额度"（按收款方匹配客商档案的信用额度）→ 调小申请金额，或联系管理员上调该客商档案的信用额度。
+- "项目预付必须选择有效合同"、"付款申请只能选择承运商合同" → 先选所属项目再选合同；只选承运商合同，选了其他类别合同换掉。
+- "申请付款金额不能超过可付款金额"（项目预付的可付款金额=项目资金需求×10000）→ 调小申请金额；确需更大额度先在项目立项/变更里调增资金需求额度。
 
-**状态变化**：同 3.3。**务必等到金蝶状态「已付款」**，否则下一步核销（3.5）做不了。
+**状态变化**：同 4.5。**务必等到金蝶状态「已付款」**，否则下一步核销（4.7）做不了。
 
 **客商风险与付款特批（所有付款申请提交时通用）**：
 - 提交时如果**收款方是高风险/黑名单客商**：会被拦截——"收款方[x]为高风险/黑名单客商，必须上传「特批附件」类型附件后再提交审批"。先在附件区上传类型为「特批附件」的文件再提交。
-- 如果触发**合规额度超额**（HCS 口径）：**不会拦截提交**，单据转入「付款特批」流程，特批完成后才会推金蝶。
-- 审批人点「通过」后，弹窗提示可能带一句话，常见三种：
-  - "审批通过，已发起付款特批，特批通过后将自动推送履约数据并同步金蝶" → 等特批完成，系统自动推；
-  - "审批通过，已同步金蝶：XXX" → 已经推成功；
+- **付款特批是否走合同合规系统由开关 `thirdParty.hcs.spec-pay.enabled` 控制（2026-11-03 起默认关闭）**：
+  - **关闭（当前默认）**：审批通过后**不发起**合规特批、不挂起「特批审核」，直接同步金蝶；触发合规额度超额也不转特批，照常走金蝶。特批附件必传校验保留（高风险/黑名单收款方仍必须上传）。
+  - **开启**：触发合规额度超额（或高风险/黑名单）时**不拦截提交**，审批通过后自动发起付款特批，特批完成后才推金蝶（特批流程由实施/管理员配合处理，本文不展开）。
+- 审批人点「通过」后，弹窗提示可能带一句话：
+  - "审批通过，已同步金蝶：XXX" → 已经推成功（开关关闭时的常见提示）；
+  - "审批通过，已发起付款特批，特批通过后将自动推送履约数据并同步金蝶" → 开关开启且走了特批，等特批完成；
   - "审批通过，但自动同步金蝶失败：…" → 审批不受影响，稍后自动重推或手动「批量同步」。
 
-### 3.5 项目预付核销（在结算单上抵扣）
+### 4.7 项目预付核销（在结算单上抵扣）
 
 **页面：结算管理 → 预付结算单 / 付款结算单（编辑页「项目预付核销」分区）**
 
@@ -228,18 +599,18 @@
 4. 在「**本次核销金额**」列：默认已按"可核销金额"填满，可以改小。
 5. 「保存」。
 
-**会被拦截的情况（提示原文）**：
-- "预付单 XXX 本次核销金额必须大于 0"
-- "预付单 XXX 本次核销金额不能超过可核销金额"
-- "项目预付核销合计不能超过结算单金额"
-- "仅可选择审核通过的项目预付单"
-- "预付单 XXX 尚未付款，项目预付须金蝶付款完成后方可核销"
-- "同一项目预付单不可重复核销"
-- "项目预付单与结算单合同不一致"
+**会被拦截的情况（提示原文 → 解决）**：
+- "预付单 XXX 本次核销金额必须大于 0" → 核销行本次核销金额填大于 0 的数（不需要核销就删掉该行）。
+- "预付单 XXX 本次核销金额不能超过可核销金额" → 把本次核销金额改小到不超过该行「可核销金额」。
+- "项目预付核销合计不能超过结算单金额" → 减小各行核销金额，使合计不超过结算单金额。
+- "仅可选择审核通过的项目预付单" → 只能从弹窗候选里选（弹窗已过滤），手工改动数据导致的不合法行删掉重选。
+- "预付单 XXX 尚未付款，项目预付须金蝶付款完成后方可核销" → 等该预付单金蝶状态变「已付款」（4.10 回写）后再核销。
+- "同一项目预付单不可重复核销" → 该预付单已在本单或其他结算单核销过，弹窗里已灰掉的行不能重复选。
+- "项目预付单与结算单合同不一致" → 只核销与结算单同一合同的项目预付单。
 
 **状态变化**：结算单「**已付金额（含预付、核销）**」立刻增大、「剩余未付金额」减小；核销金额会同时计入"已申请付款金额"和"已付金额"两个口径；列表上"申请付款金额（含预付）/已收已付合计（含预付）/剩余可付/收付款状态"同步变化。
 
-### 3.6 尾款结算（预付结算单转付款结算单，容纳预付）
+### 4.8 尾款结算（预付结算单转付款结算单，容纳预付）
 
 **页面：结算管理 → 预付结算单 →（尾款结算）→ 新增付款结算单**
 
@@ -254,17 +625,17 @@
 
 ![编辑付款结算单：结算合计区底部一行显示 结算合计（原金额）/已付金额（含预付、核销）/剩余未付金额，下方依次为 结算明细/附件/项目预付核销/发票信息 分区](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/37-付款结算单编辑页-结算合计三口径.png)
 
-4. 「项目预付核销」区会**自动带出来源预付结算上已核销的行**，可增/删/改金额（口径见 3.5）。
+4. 「项目预付核销」区会**自动带出来源预付结算上已核销的行**，可增/删/改金额（口径见 4.7）。
 5. 「保存」（草稿）→「提交」→ 审批人「通过」。
 
-**会被拦截的情况**：
-- "仅审核通过的预付结算单可转付款结算"
-- "尾款结算只能选择同一项目下的预付结算单"
-- "该预结算单存在在途预付申请，无法尾款结算"（**审批中或已审批但还没付完款的预付申请都算在途**，先把预付处理完/付完再来转）
+**会被拦截的情况（提示原文 → 解决）**：
+- "仅审核通过的预付结算单可转付款结算" → 先把预付结算单审批通过再勾选。
+- "尾款结算只能选择同一项目下的预付结算单" → 取消勾选不同项目的单据，只留同一项目。
+- "该预结算单存在在途预付申请，无法尾款结算"（**审批中或已审批但还没付完款的预付申请都算在途**）→ 先把在途预付申请处理完/付完款再来转。
 
-**状态变化**：付款结算单 `草稿 → 审批中 → 审批通过`；预付结算单被标记为已转付款结算（来源被锁定：不能再发起预付、不能作废）。随后走 3.7 推送金蝶。
+**状态变化**：付款结算单 `草稿 → 审批中 → 审批通过`；预付结算单被标记为已转付款结算（来源被锁定：不能再发起预付、不能作废）。随后走 4.9 推送金蝶。
 
-### 3.7 结算单推送（付款结算单 / 收款结算单）
+### 4.9 结算单推送（付款结算单 / 收款结算单）
 
 **页面：结算管理 → 付款结算单（应付）/ 收款结算单（应收）**
 
@@ -272,15 +643,15 @@
 
 ![收款结算单列表（应收）：与付款结算单同构，工具栏含 同步金蝶；金蝶单据状态需为「已同步」才能开票](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/40-收款结算单列表-应收.png)
 
-前提：结算单已审批通过；非人民币结算单已维护汇率（见 3.13）；客商已 synced/exist。
+前提：结算单已审批通过；非人民币结算单已维护汇率（见 4.15）；客商已 synced/exist。
 
 1. **自动路径**：审批「通过」时自动推送（开关开启时）。
 2. **手动路径**：勾选一条或多条单据 → 工具栏「同步金蝶」。
    - 应付单（A102-2）/ 应收单（A302-2）按结算类型自动分流，无需选择。
 3. 成功标志：列表出现**金蝶单据号**，状态变 **已同步**，并出现「金蝶锁定中」标签。
 4. 失败处理：状态变 **同步失败** → 鼠标悬浮状态标签看失败原因 → 常见原因：
-   - 「请先同步金蝶应付单」类 → 关联结算单还没推（付款/开票依赖结算单先推，见 3.8/3.9）；
-   - 客商编码取不到 → 先完成 3.1；
+   - 「请先同步金蝶应付单」类 → 关联结算单还没推（付款/开票依赖结算单先推，见 4.10/4.11）；
+   - 客商编码取不到 → 先完成 4.1；
    - 部门金蝶组织编码缺失 → 找管理员维护。
 5. 纠偏：如果怀疑推送实际成功但本地状态没更新，等定时勾稽（或联系运维手动触发），系统会自动核对金蝶侧并纠正状态/补单号。
 
@@ -290,7 +661,7 @@
 
 ![金蝶财务应收单与 TMS 结算单对照：应收金额、费用合计对应，明细行物料/车号/运输货物逐行对应](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/bfi-effect-a302-应收单对照.png)
 
-### 3.8 付款申请推送与结果回写
+### 4.10 付款申请推送与结果回写
 
 **页面：收付款管理 → 付款管理**
 
@@ -311,28 +682,28 @@
    - **生成失败** → 鼠标悬浮状态标签看失败原因，修复后重推（批量同步按钮即可，系统会自动跳过金蝶已有的）；系统每 10 分钟也会自动重推。
    - 单据在金蝶被删：回调后自动置生成失败并清单号，直接重推；
    - 金蝶删了但回调丢了：约 20 分钟后系统自动检测到「查不到」并解锁置生成失败，再重推。
+   - 推送被拦"收款方客商为高风险/黑名单，付款特批审核中（特批审核），特批完成后方可推送金蝶" → 仅付款特批走合规开关（`spec-pay.enabled`，默认关闭）开启时出现：特批通过（当前节点恢复「审批通过」）后自动续推，无需人工操作（特批流程由实施配合处理，口径见 4.6）。
+6. **合同系统联动（履约数据自动推送）**：付款申请审批通过只做**本地履约计划金额累加**（不推合规）；**金蝶实际付款（状态「已付款」）回写后**，系统才自动推送履约计划（C103-9）与履约记录（C108）到合同合规系统——受 `exe-stage.sync-enabled`/`perf-record.sync-enabled` 开关控制，效果与核对方法见 4.18。
 
-推送成功后金蝶侧效果（供确认推送结果时对照）：
+推送成功后的效果对照（TMS 回填与金蝶侧，供确认推送结果时对照）：
 
 ![TMS 付款申请与金蝶付款申请单对照：申请付款金额、收款账号、结算方式逐项对应；金蝶单号 FKSQ-… 与 TMS 列表回写的金蝶单号一致](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/bfi-effect-a103-付款申请对照.png)
 
 ![预付款推送效果：TMS 进度预付在金蝶生成「其他付款申请」，预付款金额、收款账户对应，附件随单上传](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/bfi-effect-a103-3-预付款对照.png)
 
+![付款结果回写后付款管理列表效果：金蝶单据状态变「已付款」（FKSQ-000000282），已付款金额 66364.33 自动回填；右侧「已指定应付」列同步展示（指定失败红色可悬浮看原因）](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/43-付款管理列表-已付款回写.png)
 
-
-![image-20261030203349665](F:\workspace\work\xdwl\tms-api\doc\docs\业务流程\2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets\image-20261030203349665.png)
-
-
+![付款结果回写效果：TMS 付款申请（FKD2026110300003）查看页「付款记录」回写实付金额 66364.33/付款单号/付款凭证（出纳付款-桂糖物流-202611-0007），与金蝶付款处理单（上游单据编码 FKSQ-000000282、付款金额 ¥66,364.33、票据状态已付款）逐项对应](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/image-20261103185134875.png)
 
 > 注意：推送后单据被金蝶锁定，**不能改金额、不能作废**。发现金额错误必须先金蝶侧处理。
 
-### 3.9 开票申请推送与开票结果
+### 4.11 开票申请推送与开票结果
 
 **页面：收付款管理 → 开票管理**
 
 ![开票管理：工具栏「批量同步」逐张推送（按发票张次拆单）；搜索区可按「金蝶单据状态」筛选](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/05-开票管理-批量同步.png)
 
-前提：有一张**收款结算单**（应收），**审批通过**、未作废、**剩余可开票金额 > 0**，且已完成 3.7 应收推送（开票前系统会先检查金蝶里有没有这张单的应收单）。
+前提：有一张**收款结算单**（应收），**审批通过**、未作废、**剩余可开票金额 > 0**，且已完成 4.9 应收推送（开票前系统会先检查金蝶里有没有这张单的应收单）。
 > 已放开"必须未开票"的限制：**部分开票过的结算单只要还有剩余可开票金额，可以再次选择继续开**，累计额度自动控制（可开票金额=结算金额 − 已被其他未作废开票申请占用的金额）。
 
 1. 新增：进「开票管理」列表 → 点「新增」→ 「结算单」右侧「**选择**」→ 弹窗「**选择应收正式结算单**」→ 按结算单号/项目/合同搜索并勾选 →「确定」（**合并开票必须同一合同**）。
@@ -352,13 +723,13 @@
 7. 查开票结果：等定时回写（默认每 10 分钟），状态变 **开票完成**（终态，全部发票张次都有回写结果才到这一步）。
 8. 查看发票文件：正式结算单详情 →「开票发票」区 → 查看/下载（PDF 优先）。
 
-**会被拦截的情况（提示原文）**：
-- "只能选择审批通过、未作废的应收正式结算单"
-- "合并开票的结算单必须属于同一合同"
-- "本次开票金额不能超过可开票金额" / "本次开票金额必须大于 0"
-- "电子专票的纳税人识别号/开户行/开户账号/注册地址…"（必填校验）
-- "运费不能与其他费用合并开在同一张发票中"
-- 推金蝶时提示"正式结算单[x]财务应收单未在金蝶生成，请先在正式付款单页面同步金蝶"（先做 3.7 应收推送）
+**会被拦截的情况（提示原文 → 解决）**：
+- "只能选择审批通过、未作废的应收正式结算单" → 先把收款结算单审批通过/不作废，再重新选单。
+- "合并开票的结算单必须属于同一合同" → 取消不同合同的结算单，分两张开票申请（每张限同一合同）。
+- "本次开票金额不能超过可开票金额" / "本次开票金额必须大于 0" → 调小开票内容金额到剩余可开票金额以内；负数/0 修正为有效金额。
+- "电子专票的纳税人识别号/开户行/开户账号/注册地址…"（必填校验）→ 到客商档案补全发票信息（受票方开票信息），或改选其他发票类型。
+- "运费不能与其他费用合并开在同一张发票中" → 运费单独放一张发票（增加发票张次分开放）。
+- 推金蝶时提示"正式结算单[x]财务应收单未在金蝶生成，请先在正式付款单页面同步金蝶" → 先做 4.9 应收推送，成功后再推开票。
 
 **限制**：开票申请一旦推到金蝶（已同步/开票完成）就**锁定不能改**；数电票已经开出来的只能走红冲，不能在本系统作废。**预付和核销不影响开票金额**，开票始终按结算单的**全额**来匹配。
 
@@ -366,7 +737,7 @@
 
 ![开票申请按发票张次拆分：TMS 开票内容第1张/第2张分别生成金蝶开票申请单，购销方、不含税金额逐项对应](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/bfi-effect-a303-1-开票张次对照.png)
 
-### 3.10 收票登记（进项发票·先票后款）
+### 4.12 收票登记（进项发票·先票后款）
 
 **页面：收付款管理 → 收票管理（先票）+ 结算管理 → 付款结算单（后款）**
 
@@ -386,14 +757,15 @@
 
     ![金蝶侧收票管理·全票池查询：TMS 票池选票的数据源头](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/img.png)
    - 票池数据来自定时同步（默认每 30 分钟）；票号精确搜索时若本地没有会**自动去金蝶现查**。
-   - 查不到票 → 等同步或让运维检查票种白名单配置/手动触发同步（见 4.2）。
+   - 查不到票 → 等同步或让运维检查票种白名单配置/手动触发同步（见 5.2）。
 2. 选**结算组织**（合同承办部门）——推送金蝶时按它确定结算组织编码，必填。
 3. 保存：系统自动**重查金蝶票池校验可用性**——票已被别人登记/认领/红冲/作废会保存失败并提示原因。
 4. 提交审批 → 审批「通过」自动推送，或勾选 → 工具栏「批量同步」。
 5. 成功标志：状态 **已推送（pushed）**（金蝶收票单已生成）。**到这里收票就完成了**——指定应付由付款结算单负责（见第二步）。
    - failed 且提示发票状态异常（红冲/作废）→ 该票在金蝶已不可用，需人工处理，不要重推。
-   - failed 且提示「供应商代码/往来户」→ 发票销方未建档或未同步金蝶，先完成 3.1 客商建档再重推。
+   - failed 且提示「供应商代码/往来户」→ 发票销方未建档或未同步金蝶，先完成 4.1 客商建档再重推。
    - failed 且提示免税/零税率行 → 该票存在系统无法映射的税率行，人工核实后联系金蝶方约定编码。
+   - failed 且提示结算组织/平台公司类 → 手选结算组织部门上溯不到带金蝶编码的平台公司，管理员补维护组织档案后重推。
 6. 附件：表单附件区可查看/下载发票原件（系统自动从金蝶取，PDF 优先）。
 
 ![收票登记表单（先票后款改造后）：发票号码选金蝶票据池发票带出票面与「发票明细」；「结算组织（合同承办部门）」必选；「结算信息」区只读——认领关系由付款结算单侧维护](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/13-收票登记-先票后款表单.png)
@@ -425,7 +797,7 @@
 
 ![付款结算单查看页「发票信息」区：列为 发票号/开票日期/发票类型/发票金额/可匹配发票金额/匹配结算单金额（指定失败行可编辑）/「是否已指定应付」（未指定·指定失败·已指定应付）＋操作列 查看/下载/重新推送；下方付款信息区回显付款申请金蝶单号](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/19-查看页发票信息-指定应付状态与重新推送.png)
 
-**系统自动指定应付**：付款结算单推送金蝶（应付单生成，见 3.7）后，系统对**本单认领且已推送**的收票单逐张执行「指定应付」，收票状态推进为 **assigned**（已指定应付，终态）。指定失败不影响结算单推送——失败票用入口 B/C 人工重推兜底。
+**系统自动指定应付**：付款结算单推送金蝶（应付单生成，见 4.9）后，系统对**本单认领且已推送**的收票单逐张执行「指定应付」，收票状态推进为 **assigned**（已指定应付，终态）。指定失败不影响结算单推送——失败票用入口 B/C 人工重推兜底。
 
 ![付款结算单列表「指定失败」悬浮：聚合展示本单各票的失败原因（如"发票xxx：推送金蝶收票单失败：…"），无需翻日志](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/16b-付款结算单列表-指定失败原因悬浮.png)
 
@@ -434,7 +806,7 @@
 **口径与注意**：
 - 一张收票单只能被一张付款结算单认领；匹配金额合计可超结算金额（覆盖即完成收票）。
 - 收票单一直卡在 pushed：说明还没被任何付款结算单认领（或认领它的结算单应付单还没推送成功），认领并推送后自动接上；已认领但指定失败的，用入口 B/C 重推。
-- ⚠️ **定时自动补发指定默认关闭**（2026-11-02 起）：收票结果回写任务不再自动对「pushed+已认领」的票补发指定应付（开关 `thirdParty.bfi.receivedInvoiceResult.assignCompensationEnabled`，默认 false），**由人工入口兜底**（发票登记推送 / 查看页重新推送）；需要恢复自动补发时由运维开启该开关（见 4.1）。
+- ⚠️ **定时自动补发指定默认关闭**（2026-11-02 起）：收票结果回写任务不再自动对「pushed+已认领」的票补发指定应付（开关 `thirdParty.bfi.receivedInvoiceResult.assignCompensationEnabled`，默认 false），**由人工入口兜底**（发票登记推送 / 查看页重新推送）；需要恢复自动补发时由运维开启该开关（见 5.1）。
 - 结算单作废/移除认领**不会**自动通知金蝶解除指定，需金蝶侧人工处理后重推。
 
 推送成功后金蝶侧状态与效果（供确认推送结果时对照）：
@@ -445,7 +817,7 @@
 
 ![结算单详情「发票信息」区：认领的发票可 查看/下载（系统从金蝶取原件，PDF 优先）；付款信息区回显付款申请金蝶单号](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/bfi-effect-a801-2-发票查看下载.png)
 
-### 3.11 结算调整单（结算单金额调整）
+### 4.13 结算调整单（结算单金额调整）
 
 **页面：结算管理 → 结算调整单**
 
@@ -514,7 +886,7 @@
 - 原单的下游关联（开票申请、收款认领、对账）**不迁移**，留在原单；新单发票状态、收付款状态从零开始（应收新单显示"未开票/未收款"属正常）。
 - 已审批通过的调整单**无法驳回、无法作废、无法撤回**；金额再错就新建调整单二次调整。
 
-### 3.12 收款流水与认领
+### 4.14 收款流水与认领
 
 **页面：收付款管理 → 收款流水、认领记录**
 
@@ -522,17 +894,17 @@
 
 1. **同步流水**：收款流水页 → 工具栏「**手动同步流水**」→ 拉取金蝶收款单（按业务日期窗口，默认今天倒推 60 天，全公司口径）。
    ![收款流水：工具栏「手动同步流水」拉取金蝶收款单、「批量认领」进入认领；列表展示收款单号（即金蝶收款单号）/收款金额（认领上限）/未匹配金额（仅参考）等，无推送相关列](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/08-收款流水-手动同步流水.png)
-   - 报错「组织管理中未维护平台公司金蝶编码」→ 找管理员维护组织档案（第 2 节 #4）。
+   - 报错「组织管理中未维护平台公司金蝶编码」→ 找管理员维护组织档案（第 3 节 #4）。
    - 需要更早的历史流水 → 让运维调大同步窗口天数配置后重新同步。
 2. **认领**：点流水「认领」进入详情（或勾选多条「批量认领」，要求同付款人+对方账号）→ 选择**审批通过的应收结算单**、填分摊金额 → 确认。
-   - 认领只落本地，不推金蝶；认领后系统自动把本次认领推送到**合同合规系统**（失败只记标记，不影响认领）。
-   - 分摊总额不能超过「剩余可认领金额」（=收款金额−已认领金额）；「未匹配金额」是金蝶参考值，**为 0 不影响认领**。
+   - 认领只落本地，不推金蝶；认领提交后系统自动把本次认领推送到**合同合规系统**（履约计划金额累加 + 认领记录 C107-1 + 履约流水 C108-1，效果见 4.18；推送失败只记标记**不自动重试**，不影响认领本身）。
+   - 分摊总额不能超过「剩余可认领金额」（=收款金额−已认领金额），超出会拦截 → 调小本次分摊金额，或先作废之前的认领腾出额度；「未匹配金额」是金蝶参考值，**为 0 不影响认领**。
 3. **查看进度**：金蝶收款单状态（已推送/审核通过/已收款）随每次「手动同步流水」自动刷新，无需回写操作。
-4. **作废**：认领记录页 → 本人记录行内「作废」→ 确认（提示含"同步作废合同合规系统认领记录"）→ 本地回退金额 + 自动同步合规作废。
+4. **作废**：认领记录页 → 本人记录行内「作废」→ 确认（提示含"同步作废合同合规系统认领记录"）→ 本地回退金额 + 自动同步合规作废（合规侧认领记录置为作废 C107-3；**履约计划金额与履约流水不回冲**，见 4.18）。
    ![认领记录：仅显示本人认领记录；行内「作废」回退金额并同步作废合同合规系统认领记录；原「查询金蝶认领结果」按钮已删除](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/09-认领记录-列表.png)
    - 作废不会影响金蝶收款单本身（金蝶侧红冲由财务人工处置）。
 
-### 3.13 汇率维护（非人民币结算）
+### 4.15 汇率维护（非人民币结算）
 
 结算单（预付结算单/付款结算单/收款结算单）编辑时：选择非 RMB 币种 → 选择**汇率日期** → 系统自动从金蝶带出汇率并重算本位币金额。带不出（金蝶该日无汇率）→ 换日期或联系金蝶侧确认。**预付结算单的汇率不自动继承到付款结算单**，转正式后需重新维护。
 
@@ -542,7 +914,7 @@
 
 ![金蝶侧效果：汇率 6.7367、金额(本位币)自动换算，与 TMS 结算单的本位币合计一致](./2026-10-14-金蝶（星瀚）BFI对接操作手册（纯操作版）.assets/bfi-effect-a801-4-外币汇率推送.png)
 
-### 3.14 作废与撤销：能做什么、状态怎么变
+### 4.16 作废与撤销：能做什么、状态怎么变
 
 | 我想…… | 前提 | 操作位置 | 状态变化 |
 |---|---|---|---|
@@ -554,16 +926,81 @@
 | 金蝶侧删付款申请 | — | 金蝶操作后系统自动处理 | 付款申请金蝶状态→生成失败，金蝶单号被清空；**未付的预付记录联动作废**；人工核实后重推，重推成功会重新建档；**已核销的行不会自动删**，需要人工作废该预付款才回落 |
 | 金蝶侧删结算单 | — | 金蝶操作后系统自动处理 | 结算单被**系统自动作废**，同步状态还原，核销行删除 |
 | 金蝶侧删开票申请 | — | 金蝶操作后系统自动处理 | 开票申请被**系统自动作废**，来源结算单开票状态回落 |
-| 结算调整 | 结算单已审批通过（含已同步金蝶） | 结算调整单（3.11） | 金额调整走调整单：原单标记"已调整"并禁止再付款，调整后的新单自动迁移核销行与金蝶推送 |
-| 作废收票认领 | — | 结算单移除认领后金蝶侧人工解除 | 移除认领/结算单作废**不会**自动通知金蝶解除指定，需金蝶侧人工处理（3.10） |
+| 结算调整 | 结算单已审批通过（含已同步金蝶） | 结算调整单（4.13） | 金额调整走调整单：原单标记"已调整"并禁止再付款，调整后的新单自动迁移核销行与金蝶推送 |
+| 作废收票认领 | — | 结算单移除认领后金蝶侧人工解除 | 移除认领/结算单作废**不会**自动通知金蝶解除指定，需金蝶侧人工处理（4.12） |
 
 > 一句话记住：**预付一旦真付出去（已付款），作废不会把钱退回**，只会把台账和核销额度清掉。
 
+### 4.17 客商风险与黑名单（查看与筛选）
+
+**页面：客商管理 → 客商档案（列表/表单）、合同管理列表/详情**
+
+数据每日 02:30 自动刷新（合同期限内生效合同的甲乙方客商），口径见 1.8。
+
+![客商档案列表：展开搜索后可见「客商风险」下拉筛选，列表客商风险列为等级+黑名单组合标签](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/16-客商档案列表-客商风险.png)
+
+1. **筛选**：搜索栏「展开」→「客商风险」下拉选 黑名单/高风险/中风险/低风险 → 查询。
+2. **看明细**：红色标签**鼠标悬浮**，展示失信类别、列入事由、风险等级。
+
+![客商风险悬浮明细：被列入外部黑名单（失信类别、列入事由）与风险等级](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/17-客商风险悬浮明细.png)
+
+3. **当天新增客商**：客商表单填客商名称失焦即实时查询，名称下方显示红色风险提示（悬浮见明细）；列表落库数据次日刷新后生效。
+4. **显示规则**：组合展示等级在前（如「高风险、黑名单」红）；仅黑名单/仅高风险红；中风险黄；低风险/无风险绿；内部组织默认「无风险」；未查询到显示「-」。
+5. **合同列表/详情同口径**：实时关联客商档案组装甲乙双方风险，红色标签悬浮看双方明细。
+
+![合同列表客商风险列：红色标签悬浮展示甲乙双方风险明细](../hcs合同/2026-10-23-HCS合同管理操作手册（纯操作版）.assets/18-合同列表-客商风险悬浮.png)
+
+> 「客商风险」显示「-」：客商不在合同期限内生效合同的关联范围，或刚创建未被刷新过——等次日 02:30 或联系运维补刷。黑名单命中但标签没显示「黑名单」字样：金蝶黑名单类别/事由数据缺失时只显示等级段，同样等刷新。
+
+### 4.18 履约计划与履约记录（付款/收款/开票/收票四场景）
+
+**页面：无 TMS 页面**——履约数据由系统在各业务节点**自动**推送合同合规系统，业务侧只在**合规系统履约记录列表**核对（按标题前缀检索最快：付款履约- / 收款履约- / 开票履约- / 收票履约-；核对四项：合同、金额、日期口径、条数）。
+
+**先看懂两个概念**：
+- **履约计划**＝合同收付款的**计划台账**（打算收/付多少）：来源为合同表单「履约规则」页签；合同没维护时审批通过自动补默认行（承运商合同=付款计划，客户合同=收款计划）。
+- **履约记录**＝计划行的**实际发生流水**（真正付/收/开/收了多少）。**先有计划（拿到合规阶段ID）才有记录**；记录必须挂某条计划下——合同没推合规或计划没推成功时记录暂时生成不了，条件满足后自动补上。
+
+**计划金额什么时候变**（系统自动，无需操作）：
+
+| 业务动作 | 变化 | 同步合规时点 |
+|---|---|---|
+| 付款申请审批通过 | 对应付款计划金额 += 申请金额（按款项性质精确匹配，预付款不加进度款） | **金蝶实际付款后**随履约记录一起推 |
+| 收款流水认领完成 | 收款计划金额 += 本次分摊金额 | 认领提交后立即推 |
+| 合同「履约规则」增删改 | 行级新增/更新/删除标记 | 随合同链/付款链/收款链下一次推送 |
+
+计划金额是「已批准/已认领」口径，实际发生额看履约记录——两者对不上属正常口径差异。
+
+**四场景履约记录对照**（全部自动生成）：
+
+| 场景 | 什么时候生成 | 生成条数 | 金额 | 日期 | 合规检索标题 |
+|---|---|---|---|---|---|
+| 付款 | **金蝶实际付款回写后**（4.10「已付款」状态就是触发点） | 一张付款申请一条，分次付款更新同一条的实际金额 | 申请金额/实付金额 | 申请日期 | 付款履约- |
+| 收款 | **认领提交后**（4.14，事件驱动，失败不自动重试） | 每次认领 × 涉及合同各一条 | 本次分摊金额 | 认领日期 | 收款履约- |
+| 开票 | **金蝶开票完成、发票回写后**（4.11 开票完成状态之后） | 每张发票一条 | 发票价税合计 | 发票开票日期 | 开票履约- |
+| 收票 | **收票单推合规成功后**（4.12 推送成功后） | 每条结算分摊行（认领关系行）一条 | 分摊收票金额 | 发票日期 | 收票履约- |
+
+**与本文操作的对应关系与常见误区**：
+- 付款：审批通过后去合规找付款履约记录——**还没有**，属正常；金蝶付款（4.10 第 4 步）后才会出现，计划金额累加也同步此时才推（提示「金蝶未实际付款，待付款后推送履约计划与履约记录」是正常结果说明，不是失败）。特批中的付款不推履约，特批通过同样要等实付。
+- 收款：认领提交后自动推（认领记录 C107-1 + 履约流水）；**作废认领**只在合规侧把认领记录置作废（C107-3），计划金额与履约流水**不回冲**。
+- 开票：4.11 推送金蝶→开票完成回写→下一轮开票任务自动推；金蝶开票结果回写会自动把开票登记重置为待同步，无需人工重推。
+- 收票：收票登记推送金蝶后收票单推合规（C109）→ 成功后按**已认领的分摊行**自动推；未认领结算单的收票单没有分摊行，不生成履约记录（属正常）。
+
+**异常与重试**：
+
+| 场景 | 失败自动重试 | 业务要做什么 |
+|---|---|---|
+| 付款/开票/收票 | 是（对应扫描任务每 5 分钟） | 一般无需处理；长期失败联系管理员 |
+| 收款 | **否**（事件驱动） | 合规侧没数据时联系管理员排查 |
+
+暂时生成不了的常见原因（按顺序自查，条件满足后自动补推）：合同未推合规 → 履约计划未推成功 → 单据未审批通过 →（开票）金蝶未开票完成 →（收票）收票单未推合规 →（付款）金蝶未实际付款。
+
+> 作废/驳回的影响：付款审批驳回不产生记录；付款申请作废、认领作废**不回冲**计划金额与履约记录（认领仅合规侧认领记录作废）；需要金额回退在合规侧人工处理或单独提需求。
+
 ---
 
-## 4. 定时任务与开关（运维视角）
+## 5. 定时任务与开关（运维视角）
 
-### 4.1 任务清单（Nacos `thirdparty.bfi.*` 配置）
+### 5.1 任务清单（Nacos `thirdparty.bfi.*` 配置）
 
 | 任务 | 干什么 | 开关键 | cron 键（默认值） | 手动替代按钮 |
 |---|---|---|---|---|
@@ -577,7 +1014,7 @@
 
 > 收款认领推送定时任务（原 `receiptClaimPush`）已于 2026-10-29 随 A301-3 链路下线删除；相关 Nacos 配置 `claimAnnounce.*`、`receiptClaimPush.*` 可清理。
 
-### 4.2 各任务的运转逻辑
+### 5.2 各任务的运转逻辑
 
 **共性规则（先读这个）**
 
@@ -587,53 +1024,122 @@
 - **默认执行时间错峰**（付款 ：01、failed 重推 ：05、收票 ：08、锁补偿每 5 分钟的 ：02、票池每 30 分钟的 ：16），互不挤占；自行改 cron 时建议保留错峰。
 
 **① 付款结果回写（10 分钟）**
-扫「审批通过且已推送 / 付款中 / 推送失败」的付款申请 → 到金蝶查付款申请单和付款处理单 → 推进 已生成 → 付款中 → **已付款 / 已关闭**，已付款时回写付款记录/凭证，并联动刷新预付结算垫资、结算付款记录（3.8 第 3 步的「正常等定时回写」就是它）。
+扫「审批通过且已推送 / 付款中 / 推送失败」的付款申请 → 到金蝶查付款申请单和付款处理单 → 推进 已生成 → 付款中 → **已付款 / 已关闭**，已付款时回写付款记录/凭证，并联动刷新预付结算垫资、结算付款记录（4.10 第 3 步的「正常等定时回写」就是它）。
 - 自愈一（应收勾稽）：已推送但失败、或缺金蝶单号的**应收结算单**，查金蝶有则自动补单号、纠回已同步——「实际推成功但本地显示失败」的场景自动痊愈；
-- 自愈二（开票结果）：已受理的开票申请自动落发票信息并推进 **开票完成（终态）**（3.9 第 7 步的定时回写就是它）；
+- 自愈二（开票结果）：已受理的开票申请自动落发票信息并推进 **开票完成（终态）**（4.11 第 7 步的定时回写就是它）；
 - 防呆（金蝶删单）：已生成/付款中的单据**连续 2 轮（约 20 分钟）在金蝶查不到** → 判定金蝶侧已删，自动解锁置生成失败并清空金蝶单号，等人工核实后重推；重推带幂等预检，金蝶单据其实还在时会自动回填，不会重复生成。
 
 **② 收票结果回写（10 分钟）**
 扫 已推送（pushed）/ 已指定应付（assigned）的收票登记，按近 **30 天**回看窗口查金蝶收票单，一轮处理三种情况：
-- 票在金蝶被作废/红冲 → 置 failed（推送失败）并提示人工处理（**不要重推**，见 3.10）；
-- pushed 且**已被付款结算单认领** → 自动补发「指定应付」推进 已指定应付（终态）——**受开关 `…receivedInvoiceResult.assignCompensationEnabled` 控制，默认关闭**：关闭时跳过补发并记日志，由人工入口（发票登记推送/查看页重新推送）指定；pushed 且未被认领 → 跳过不动（认领后由结算单侧接上，见 3.10）；
+- 票在金蝶被作废/红冲 → 置 failed（推送失败）并提示人工处理（**不要重推**，见 4.12）；
+- pushed 且**已被付款结算单认领** → 自动补发「指定应付」推进 已指定应付（终态）——**受开关 `…receivedInvoiceResult.assignCompensationEnabled` 控制，默认关闭**：关闭时跳过补发并记日志，由人工入口（发票登记推送/查看页重新推送）指定；pushed 且未被认领 → 跳过不动（认领后由结算单侧接上，见 4.12）；
 - assigned 但缺金蝶收票单号 → 自动补登单号。
 窗口内查不到的保持现状不动（不判删除），由人工重推兜底。
 
 **③ 客商同步（每天 02:00）**
 一次扫全部审批通过客商，干三件事：
 - **未推送/推送失败** → 先复查金蝶：已有且已审核的直接置 **exist（终态）**（不重复建档）；金蝶侧审核中则置 failed 提示稍后；确实没有才推送；
-- **已推送（synced）** → 金蝶审核通过自动升级 **exist（终态）**（3.1 第 5 步的定时升级就是它）；
+- **已推送（synced）** → 金蝶审核通过自动升级 **exist（终态）**（4.1 第 5 步的定时升级就是它）；
 - **金蝶侧停用（enable=0）** → TMS 档案联动停用；金蝶恢复可用**不会**自动启用（单向联动，需人工启用）。
 
 **④ 全票池同步（30 分钟）**
-按近 **30 天**增量窗口分页拉取金蝶全票池发票到本地镜像表（含发票明细行），收票选票、发票明细带出、票池查询全部走本地镜像——所以**刚在金蝶开的票要等同步后才能选到**；急用可让运维手动触发同步端点，或用票号精确搜索（会自动去金蝶现查，见 3.10）。
+按近 **30 天**增量窗口分页拉取金蝶全票池发票到本地镜像表（含发票明细行），收票选票、发票明细带出、票池查询全部走本地镜像——所以**刚在金蝶开的票要等同步后才能选到**；急用可让运维手动触发同步端点，或用票号精确搜索（会自动去金蝶现查，见 4.12）。
 
 **⑤ failed 重推（10 分钟）**
 只重推 **failed（推送失败）** 单据（结算 → 付款 → 开票 → 收票四个域依次处理）；**unsynced（审批通过但从未推送）不会自动推**——历史存量单不会被上线后批量补推，仍走手动按钮。前置没就绪（如销方供应商代码缺失、镜像明细缺失）会再次 failed、下轮继续；前置就绪后自动续推成功。
-⚠️ 重推**没有次数上限**：根因不修（联行号缺失、组织编码缺失等）会每 10 分钟失败一次刷日志，修复根因是唯一正解（呼应 4.4）。
+⚠️ 重推**没有次数上限**：根因不修（联行号缺失、组织编码缺失等）会每 10 分钟失败一次刷日志，修复根因是唯一正解（呼应 5.4）。
 
 **⑥ 锁单补偿（5 分钟）**
 扫「推送成功但金蝶锁定失败」的锁记录，重试加锁，**最多 5 次**；超过 5 次放弃，需运维调手动补偿端点 `POST /formal-settlement/retry-kingdee-bill-lock`（对应 1.2 的「锁定失败·已达上限」标签）。
 
-### 4.3 审批自动同步开关（按业务域独立）
+### 5.3 审批自动同步开关（按业务域独立）
 
 `thirdParty.bfi.autoSync.settlement`（结算单）/ `…payment`（付款）/ `…invoiceApply`（开票）/ `…receipt`（收票），默认全关。**代码默认全部关闭，必须在 Nacos 显式开启**；客商档案审批推送不受此开关控制（始终自动）。
 
-### 4.4 运维注意
+### 5.4 运维注意
 
 - 所有定时任务带**分布式锁**：多实例部署只跑一份；手动按钮和定时共用锁，定时运行中手动触发会直接跳过（属正常）。
 - 开了「failed 重推」后，持续失败的单据每 10 分钟会重试一次，**修复根因**（配置/数据）比反复观察更重要。
 - 手动触发全票池同步与定时是同一逻辑，数据量大时耐心等待，不要反复点。
 - **A302-6 指定应付补偿开关**默认关闭（安全兜底）：pushed+已认领的收票单不会自动变"已指定应付"，业务用「发票登记」/查看页「重新推送」人工指定；确需自动补偿时在 Nacos 开 `thirdParty.bfi.receivedInvoiceResult.assignCompensationEnabled=true`。
 
+### 5.5 合同系统（HCS）定时任务与开关（Nacos `thirdParty.hcs.*` 配置）
+
+HCS 推送由**五个推送定时任务**（各 5 分钟、分钟位 0–4 错峰）、**一个客商风险每日刷新任务**和一组手动接口组成；定时任务、手动接口与审批即时推送共用同一套推送逻辑。
+
+| 任务 | 扫描对象 | 推送链路（HCS 接口） | 独立开关（默认 false） | 默认 cron | 手动触发 |
+|---|---|---|---|---|---|
+| 项目立项 C102 | 审批通过/变更审批通过，待推送/失败未超限 | C102-3 判重 → C102-1 新建 / C102-2 更新 | `push.project.sync-enabled` | `0 */5 * * * ?` | `POST /hcs/sync/project/{id}`、`/hcs/sync/project`、`/batch` |
+| 合同 C103 | 同上；**同轮补查特批结果**（仅此任务有） | C101-1 风险 → C103-2 附件 → C103-3 判重 → C103-1 起草 / C103-11 更新 → C103-9 履约规则（开关）→ 高风险挂特批 | `push.contract.sync-enabled` | `0 1/5 * * * ?` | `POST /hcs/sync/contract/{id}`、`/hcs/sync/contract`、`/batch` |
+| 付款链 C106/C108 | 审批通过付款申请 | `hcs_spec_status=need` 时 C106-3/4 特批（受 `spec-pay.enabled` 门禁，默认关）→ **金蝶实付门禁** → C103-9 计划重推 → C108 履约记录（开关） | `push.payment.sync-enabled` | `0 2/5 * * * ?` | `POST /hcs/sync/payment/{id}`、`/hcs/sync/payment` |
+| 开票登记 C111 | 审批通过开票申请 | C111-1 判重 → C111-2 新增 → C111-3 更新（金蝶开票结果回写后自动重置待同步触发） | `push.invoice-application.sync-enabled` | `0 3/5 * * * ?` | `POST /hcs/sync/invoice-application/{id}`、`/hcs/sync/invoice-application` |
+| 收票单 C109 | 审批通过收票单 | C109-1 新建 / C109-2 更新 → 成功后按认领分摊行推履约收票记录 | `push.invoice-receipt.sync-enabled` | `0 4/5 * * * ?` | `POST /hcs/sync/invoice-receipt/{id}`、`/hcs/sync/invoice-receipt` |
+| 客商风险刷新 | 期限内生效合同甲乙方客商 | 逐个 C101-1 风险等级 + 批量 A801-5 金蝶黑名单，落库客商档案 | `risk.refresh-enabled`（上线置 true） | `0 30 2 * * ?` | 无手动接口（可临时改 cron 补刷） |
+
+**公共规则**：扫描条件=审批通过 + 待推送/失败未超限（`push.max-retry` 默认 5，单轮 `push.batch-size` 默认 50 条）；按业务域抢 Redis 锁（TTL 240 秒），多实例只跑一份；单条失败只记该条不拖批次；**手动接口不检查开关、不抢锁**（开关关闭时可临时补推，避免与定时同一时刻执行）。
+
+**各任务运转逻辑**
+
+**① 项目立项任务（C102，每 5 分钟）**
+扫「审批通过/变更审批通过 + 待推送/推送失败」的项目立项：
+- **无合规项目ID（首推）**：先调 C102-3 按项目编号判重——命中直接回填已有合规ID置已推送（不重复建）；未命中调 C102-1 新建（依赖 `project.template-code`，未配置整条失败），成功后回填合规项目ID。
+- **已有合规项目ID（变更）**：调 C102-2 更新。
+- **金蝶结果回调**（`projectLegal/result`）：HCS 完成金蝶同步后按项目编号定位，成功回填「金蝶项目ID/编号」、失败记原因——**不改合规状态、不触发重推**，所以「已推送但金蝶项目ID空」只代表金蝶同步未完成。
+- 付款额度/开票额度按万元×10000 转元推送，计划保证金仍按万元直传。
+
+**② 合同任务（C103，每 5 分钟）**
+扫「审批通过/变更审批通过 + 待推送/推送失败」的合同，单条推送依次：
+- **特批挂起门禁**：特批中（processing）的合同跳过推送；手动重推报「合同特批审核中，禁止重推」。
+- **客商风险 C101-1 + 金蝶黑名单 A801-5**：甲乙双方逐个查（客商档案匹配不到或内部组织则跳过该方不阻断）；命中只做标记，**不阻断推送**。
+- **附件转传 C103-2**：失败会导致整条推送失败（查下载基址与附件）。
+- **判重/起草/更新**：无合规合同ID先 C103-3 按合同编号判重（命中回填置已推送），未命中 C103-1 起草（报文含业务合同号、归档状态；高风险/黑名单时随报文 `fdSepcailContract=true` 在合规侧发起特批）；已有合规ID走 C103-11 更新（变更、归档即时同步同走此接口）。
+- **履约规则 C103-9**（`exe-stage.sync-enabled`）：按合同「履约规则」页签的行级新增/更新/删除同步；无可同步行自动跳过。失败整条置 failed——因合规ID已先回填，下轮重推走 C103-11 更新补偿，**不会重复起草**。
+- **高风险挂起特批**：风险命中时置特批中、当前节点「特批审核」；合规回调（秒批/秒驳）先到时不覆盖已落地结果。
+- **★特批结果兜底查询（仅本任务有）**：每轮推完待同步合同后，另查「特批中且有合规ID」的合同（最多 50 条），逐条调 C103-4 查详情：合规侧已通过 → 恢复「审批通过」；已驳回 → 合同审批联动「已驳回」；其他状态继续等。手动接口不补查特批结果，需用「确认特批结果」人工兜底。
+
+**③ 付款链任务（C106/C108，每 5 分钟）**
+扫「审批通过 + 待推送/推送失败」的付款申请：
+- **特批发起**（`spec-pay.enabled=true` 时）：待特批（need）且无特批流程ID调 C106-3 发起（依赖 `spec-pay.template-id` 与关联合同的合规ID），已有流程ID调 C106-4 更新；发起成功回填流程ID、置特批中。**开关关闭（当前默认）时整步跳过**。
+- **★金蝶实际付款门禁**：付款审批通过只做**本地履约计划金额累加**；金蝶实付金额为空或 ≤0 时，履约计划与履约记录**都不推送**，整体照常置已推送，结果说明「金蝶未实际付款，待付款后推送履约计划与履约记录」（**正常状态不是失败**）；金蝶付款回写（4.10「已付款」）后自动重新置待同步，下一轮扫描自动续推。
+- **实付后推送**：先 C103-9 重推累加后的付款计划行（按款项性质精确匹配），再推履约记录——无履约记录ID调 C108-1 新建（返回ID立即落库），已有则 C108-2 更新（分期付款推进实际金额，一张申请永远一条记录）。
+- **特批结果**：HCS 回调 `paymentLegal/result` 或人工 `POST /hcs/spec-pay/confirm`——通过恢复「审批通过」并触发金蝶自动同步；驳回置「已驳回」，重新提交后重新发起特批。
+
+**④ 开票登记任务（C111，每 5 分钟）**
+扫「审批通过 + 待推送/推送失败」的开票申请：
+- 无合规ID先 C111-1 按申请编号判重，未命中 C111-2 新增——**必须能经应收结算链路回溯到合同编号**，回溯不到整条失败；币种映射 `invoice.currency-id-mapping` 的 RMB 必配，否则整条失败。
+- 新增成功后若金蝶状态已是开票完成，立即调 C111-3 更新票据日期/状态；已有合规ID同样走 C111-3。
+- **自愈**：金蝶开票结果回写（4.11「开票完成」）会把合规状态自动重置为待推送，下一轮扫描自动执行 C111-3 更新——无需人工重推。
+- 本任务**没有结果回调**，以列表合规状态与失败说明为准。
+
+**⑤ 收票单任务（C109，每 5 分钟）**
+扫「审批通过 + 待推送/推送失败」的收票登记：
+- 无合规ID调 C109-1 新建，成功回填合规ID；已有合规ID调 C109-2 更新。
+- **合同关联回溯**：收票单 → 结算关系（付款结算单认领）→ 正式结算单 → 合同；先票后款下**未认领结算单的收票单回溯不到合同**，取人工补录字段（运维），都没有时合同字段传空只记警告、**不阻断推送**。
+- 推送成功后按**认领分摊行**逐条推履约收票记录（C108-1，每条分摊行一条）；未认领的没有分摊行，不生成履约记录（属正常，见 4.18）。
+
+**⑥ 客商风险每日刷新任务（C101-1 + A801-5，每天 02:30）**
+- 刷新范围：**合同期限内**（起止或临时期限覆盖当天）且审核通过、未终止合同的甲乙方关联客商；内部组织客商跳过（默认无风险）。
+- 外部客商按 **200/批**：每批调一次 A801-5 金蝶黑名单批量查询 + 逐个调 C101-1 风险等级（该接口仅支持单编号）；结果立即落库客商档案（风险等级、金蝶黑名单类别/事由、查询时间）并留痕校验日志；**批间互不影响，单批失败不中断其余批次**。
+- 该任务**不走推送框架**：不抢推送锁、不改单据合规状态、无手动触发接口；临时补刷可把 `risk.refresh-cron` 改为近时刻执行后改回。
+- 日志按「定时刷新客商风险」检索。
+
+**关键业务开关**：`push.immediate-enabled`（项目/合同审批即时推送）；`spec-pay.enabled`（★付款特批走合规，默认 false，见 4.6）；`exe-stage.sync-enabled`（履约计划 C103-9，合同/付款/收款三条链共用）；`perf-record.sync-enabled`（履约记录 C108，默认 false）；`contract.require-risk-check`、`risk.check-on-payment`、`credit.check-enabled`（风险与额度校验）；`attachment.transfer-enabled` + `attachment.file-download-base`（附件转传）；`mock-enabled` 生产必须 false。
+
+**运维注意**：
+- 开关默认全关、按域灰度打开；**开启扫描前先看存量**——扫描不区分"从未推送/推送失败"，一开所有审批通过且未同步的单据都入队（每轮 50 条）。
+- 失败每 5 分钟自动重试、超 5 次停止；人工重推清零计数，但**修复根因**（模板映射/币种映射/附件基址）才是正解。
+- **付款依赖合同**：付款特批与履约规则都以合同合规ID为前提；履约数据以**金蝶实际付款**为门禁——结果说明「金蝶未实际付款，待付款后推送履约计划与履约记录」是正常状态，不要当失败处理。
+- 开票登记必须配 `invoice.currency-id-mapping` 的 `RMB`，否则每轮失败。
+- 模板映射调整后可调 `POST /hcs/master-data/refresh` 刷新模板/分类/币种缓存并校验映射；日志按单据编号/`hcs` 关键字检索（本地目录 `F:\home\tms\blade-transport`），客商风险刷新按「定时刷新客商风险」检索。
+
 ---
 
-## 5. 常见问题与异常处理（FAQ）
+## 6. 常见问题与异常处理（FAQ）
 
 | 现象 | 原因 | 处理 |
 |---|---|---|
 | 推送结算单不带汇率 | 结算单没维护汇率（预付结算单的汇率**不自动继承**到付款结算单） | 在结算单编辑页重选汇率日期自动带出后再推 |
-| 推送报「客商编码」类错误 | 客商未推送金蝶或档案缺数据 | 先完成客商同步（3.1），再推单据 |
+| 推送报「客商编码」类错误 | 客商未推送金蝶或档案缺数据 | 先完成客商同步（4.1），再推单据 |
 | 推送报「请先同步金蝶应付单/应收单」 | 前置单据未推送 | 顺序：结算单(应付/应收) → 付款/开票（收票登记已不依赖结算单，仅付款结算单指定应付需要应付单先推送） |
 | 推送报组织/部门编码类错误 | 部门没维护金蝶组织编码 | 管理员补维护后重推 |
 | 推送报联行号类错误 | 客商收款账户联行号缺失 | 财务补维护收款账户后重推 |
@@ -642,36 +1148,49 @@
 | 列表「锁定失败」标签 | 推送成功但金蝶锁单接口失败 | 系统自动补偿（≤5 次）；急用让运维调手动补偿端点 |
 | 单据要改但显示「金蝶锁定中」 | 已推送并被金蝶锁定 | 到金蝶侧解锁/删单 → TMS 自动还原后即可编辑；不可强行作废 |
 | 付款状态长时间不更新 | 回写定时未开启或金蝶侧未处理 | 点「同步付款结果」；仍无 → 金蝶侧查付款处理单 |
-| 付款申请审批通过了，但金蝶那边没有单 | 推送失败（生成失败）或走了付款特批 | 看「金蝶单据状态」：生成失败勾选后点「批量同步」或等 10 分钟自动重推；提示"已发起付款特批"要等特批完成 |
+| 付款申请审批通过了，但金蝶那边没有单 | 推送失败（生成失败）或走了付款特批 | 看「金蝶单据状态」：生成失败勾选后点「批量同步」或等 10 分钟自动重推；提示"已发起付款特批"（特批走合规开关开启时）要等特批完成 |
 | 开票申请已同步但没发票信息 | 开票结果未回写 | 等定时/联系运维手动触发；确认金蝶票易通已开票 |
 | 票池选票查不到 | 镜像未同步到该票种 | 检查票种白名单配置；运维手动触发全票池同步；票号精确搜索可触发自动现查 |
 | 保存收票登记被拦「可用金额为0」 | 票已被占用/认领/红冲 | 换票或在金蝶确认票据状态 |
-| 收票推送报「供应商代码/往来户」类错误 | 发票销方未建档或未同步金蝶（取不到金蝶供应商代码） | 先完成客商建档与同步（3.1），再重推 |
+| 收票推送报「供应商代码/往来户」类错误 | 发票销方未建档或未同步金蝶（取不到金蝶供应商代码） | 先完成客商建档与同步（4.1），再重推 |
 | 收票推送报免税/零税率行 | 系统无法映射该税率行编码 | 人工核实票面，联系金蝶方约定编码后放开 |
 | 收票推送报结算组织/平台公司类错误 | 手选部门上溯不到带金蝶编码的平台公司 | 找管理员维护组织金蝶编码后重推 |
-| 收票卡在已推送（pushed）不动 | 未被付款结算单认领，或认领它的结算单应付单未推送成功；或已认领但指定失败且自动补偿开关关闭 | 在付款结算单「发票登记」/查看页「重新推送」处理；未认领的先认领；已认领失败的用人工入口重推（3.10） |
+| 收票卡在已推送（pushed）不动 | 未被付款结算单认领，或认领它的结算单应付单未推送成功；或已认领但指定失败且自动补偿开关关闭 | 在付款结算单「发票登记」/查看页「重新推送」处理；未认领的先认领；已认领失败的用人工入口重推（4.12） |
 | 结算单/付款管理「已指定应付」列显示指定失败 | 认领的收票单 A302-6 指定失败 | **悬浮状态标签看聚合失败原因** → 付款结算单查看页对该票「重新推送」（可先改匹配金额），或工具栏「发票登记」重推 |
 | 认领收票单被拦「一张收票单只能被一张付款结算单认领」 | 已被其他有效付款结算单认领 | 先在原结算单移除认领（金蝶侧人工解除指定）再认领 |
-| 为什么选不到某张预付结算单发起预付 | 需要**应付**、**审批通过**、**未转付款结算**、且所选单据**同一合同** | 按 3.3 前提检查 |
-| 付款管理工具栏的「预付申请」发起的是哪种预付 | 固定是**进度预付**（配合预付结算单） | **项目预付**要点「新增付款申请」后手动把付款类型选成"项目预付"（3.4） |
-| 为什么核销弹窗里找不到那笔项目预付 | 必须与结算单**同一合同**、**审批通过**、**金蝶已付款**、还有**剩余可核销额** | 按 3.5 前提检查 |
+| 为什么选不到某张预付结算单发起预付 | 需要**应付**、**审批通过**、**未转付款结算**、且所选单据**同一合同** | 按 4.5 前提检查 |
+| 付款管理工具栏的「预付申请」发起的是哪种预付 | 固定是**进度预付**（配合预付结算单） | **项目预付**要点「新增付款申请」后手动把付款类型选成"项目预付"（4.6） |
+| 为什么核销弹窗里找不到那笔项目预付 | 必须与结算单**同一合同**、**审批通过**、**金蝶已付款**、还有**剩余可核销额** | 按 4.7 前提检查 |
 | 为什么新增开票申请时选不到某张收款结算单 | 需要**审批通过、未作废、剩余可开票金额>0**；跨合同不能合并开票 | 已申请开票金额（未作废的占用）会扣减可开票额；部分开票过的单只要还有余额可以再选 |
-| 开票提示要先去同步金蝶 | 开票前系统检查金蝶应收单 | 先在「收款结算单」列表点「同步金蝶」（3.7） |
+| 开票提示要先去同步金蝶 | 开票前系统检查金蝶应收单 | 先在「收款结算单」列表点「同步金蝶」（4.9） |
 | 结算单已付金额比我算的多/少 | 已付金额**含**进度预付、项目预付核销；核销金额同时计入"已申请付款金额"和"已付金额" | 属正常口径 |
-| 结算单金额写错了怎么改 | 审批通过后不能直接改 | 走「结算调整单」（3.11） |
-| 结算调整单选不到某张结算单 | 已完成收付款 / 已发起尾款 / 有关联付款申请在途 / 未审批通过 | 按 3.11 前提检查 |
+| 结算单金额写错了怎么改 | 审批通过后不能直接改 | 走「结算调整单」（4.13） |
+| 结算调整单选不到某张结算单 | 已完成收付款 / 已发起尾款 / 有关联付款申请在途 / 未审批通过 | 按 4.13 前提检查 |
 | 结算调整单重推被拦「旧单未冲销」 | 原单已推送金蝶且财务还没在金蝶冲销 | 财务在金蝶手工冲销旧单后再点「重新推送（高危）」（部分冲销视同已冲销） |
 | 结算调整单重推失败，新单显示同步失败 | 克隆新单已生成但推送金蝶失败 | 再点「重新推送」复用新单续推，不会重复建单；失败原因悬浮看新单 |
 | 对「已调整」原单发起付款被拦 | 原单已作废（被调整单重推替代） | 使用调整后的新单发起付款 |
-| 单据上的「作废」是灰的/没有 | 状态不是审批通过；结算单已同步金蝶；已被金蝶锁定 | 见 3.14 作废前提 |
+| 单据上的「作废」是灰的/没有 | 状态不是审批通过；结算单已同步金蝶；已被金蝶锁定 | 见 4.16 作废前提 |
 | 收款流水同步为空/报组织编码错误 | 组织管理未维护「平台公司」金蝶编码，或窗口内无数据 | 找管理员维护组织金蝶编码；需要更早流水时调大同步窗口天数配置 |
 | 认领/作废后合规侧没有记录 | 合同合规推送失败（只落标记不重试） | 让运维查合规推送记录失败原因，人工在合规侧补录；认领/作废本身不受影响 |
 | 想作废认领 | — | 认领记录页本人记录直接「作废」：本地回退金额并自动同步合规作废；金蝶收款单本身不受影响（红冲由金蝶财务人工处置） |
 | 断网/金蝶宕机期间推了一半 | 部分单据 failed | 恢复后 failed 重推任务（或手动）自动续推，系统查重不会重复生成金蝶单据 |
+| 合同审批通过后合规状态一直「待推送」 | 未开即时推送，合同扫描也未开启或未到执行时间 | 手动点「推送合规」；或让运维开启 `push.contract.sync-enabled`（5.5） |
+| 合同推送失败提示「合同类别 [xxx] 未配置合规模板ID」 | Nacos 模板映射缺该类别 | 运维补 `contract.template-mapping` 后重推（注意中文键括号写法） |
+| 合同「特批审核」节点长时间不动 | HCS 特批结果未回传 | 详情「合规信息」→「确认特批结果」人工确认 approved/rejected（4.3 第四步） |
+| 特批中的合同想重推/想改内容 | 特批未结束；已推送合同不能直接编辑 | 不允许重推，等结果；改动走「变更」流程（4.3 第五步） |
+| 合同已推送但金蝶合同ID为空 | HCS 金蝶同步有延迟 | 稍后刷新；长期为空联系管理员 |
+| 高风险收款方提交付款被拦截 | 未上传「特批附件」 | 附件区新增一行类型选「特批附件」重新提交（**特批开关关闭也拦截**，属客商准入风控） |
+| 付款/合同没触发特批但客商明明是高风险 | 客商名称与客商档案不匹配导致风险校验被跳过；或非高风险且未命中金蝶黑名单 | 核对甲乙方/收款方名称与客商档案全称或简称一致（1.8） |
+| 客商档案/合同「客商风险」列显示「-」 | 客商不在合同期限内生效合同关联范围，或刚创建未被刷新过 | 等次日 02:30 刷新；当天可在客商表单实时查询（4.17） |
+| 金蝶黑名单命中但列表没显示「黑名单」 | 金蝶黑名单类别/事由数据缺失，只显示等级段 | 等次日刷新或联系运维补刷；确认 `risk.refresh-enabled` 已开启 |
+| 合规里没有付款履约计划/记录 | 履约数据以**金蝶实际付款**为门禁，未实付不推 | 正常等待金蝶付款回写后自动推（4.18） |
+| 合规里没有收款履约记录 | 认领推送失败**不自动重试** | 联系运维查合规推送记录，人工在合规侧补录；认领本身不受影响 |
+| 项目审批通过后合规状态「待推送」 | 未开即时推送或项目扫描未开启 | 行内「推送合规」；或运维开 `push.project.sync-enabled`（4.2） |
+| 项目推送成功但金蝶项目ID为空 | HCS 金蝶同步结果未回传 | 稍后刷新；长期为空联系管理员 |
 
 ---
 
-## 6. 附：操作入口速查表
+## 7. 附：操作入口速查表
 
 | 页面 | 按钮/操作 | 作用 |
 |---|---|---|
@@ -705,7 +1224,16 @@
 | 运维专用 | `POST /formal-settlement/sync-kingdee-ar-result` | 手动应收勾稽纠偏 |
 | 运维专用 | `POST /invoice-application/sync-kingdee-invoice-result` | 手动开票结果回写 |
 | 运维专用 | `POST /formal-settlement/invoice-assign-kingdee` | 手动触发结算单认领收票单的指定应付 |
+| 项目管理 | 行内「推送合规」/工具栏「批量推送合规」 | 推送/重推项目立项到合同合规（C102，4.2） |
+| 合同管理 | 行内「推送合规」/工具栏「批量推送合规」 | 推送/重推合同到合同合规（C103，4.3） |
+| 合同详情 | 合规信息「确认特批结果」 | 特批中人工确认 approved/rejected（4.3） |
+| 合同管理 | 行内「变更」/「附件上传」 | 合同变更更新 HCS（C103-11）；补传附件与归档即时同步（4.3） |
+| 客商档案 | 搜索「客商风险」筛选 / 红色标签悬浮 | 按风险筛选客商；看失信类别/列入事由/等级明细（4.17） |
+| 运维专用 | `POST /hcs/sync/{bizType}/{id}` | 单条重推（bizType=project/contract/payment/invoice-application/invoice-receipt，不受开关限制） |
+| 运维专用 | `POST /hcs/sync/{bizType}`（`/batch` 仅 project、contract） | 按扫描逻辑推一轮 / 按勾选ID批量重推 |
+| 运维专用 | `POST /hcs/spec-pay/confirm`、`POST /hcs/contract/spec/confirm` | 人工确认付款/合同特批结果（参数 id、result） |
+| 运维专用 | `POST /hcs/master-data/refresh` | 刷新 HCS 模板/分类/币种缓存并校验映射 |
 
 ---
 
-> 本文基于 2026-10-14 代码整理；2026-10-19 核对补充定时任务运转逻辑；2026-10-31 按先票后款改造与收款流水 A301-1 改造修订；**2026-11-03 汇总《2026-10-17 结算调整单》《2026-10-18 预付与项目预付》两本操作手册，并按 2026-11-01/11-02 代码修订收票指定应付链路（发票登记工具栏入口、匹配金额可改、查看页重新推送、已指定应付列、A302-6 自动补偿开关默认关闭）**。系统升级后按钮与提示如有出入，以页面实际为准，并核对全链路总纲文档的更新说明。
+> 本文基于 2026-10-14 代码整理；2026-10-19 核对补充定时任务运转逻辑；2026-10-31 按先票后款改造与收款流水 A301-1 改造修订；2026-11-03 汇总《2026-10-17 结算调整单》《2026-10-18 预付与项目预付》两本操作手册，并按 2026-11-01/11-02 代码修订收票指定应付链路（发票登记工具栏入口、匹配金额可改、查看页重新推送、已指定应付列、A302-6 自动补偿开关默认关闭）；**2026-11-04 合并合同合规系统（HCS）操作内容（项目立项、合同、特批、客商风险、履约计划/记录），并纳入付款特批走合规开关（`thirdParty.hcs.spec-pay.enabled` 默认关闭，2026-11-03）**。系统升级后按钮与提示如有出入，以页面实际为准，并核对全链路总纲文档与 HCS 手册的更新说明。
diff --git a/doc/docs/业务流程/2026-10-16-结算调整单接入金蝶设计（未推送自动推-已推送冲销后重推新单）.md b/doc/docs/业务流程/2026-10-16-结算调整单接入金蝶设计（未推送自动推-已推送冲销后重推新单）.md
index 7e0a0b4d..d31ac25f 100644
--- a/doc/docs/业务流程/2026-10-16-结算调整单接入金蝶设计（未推送自动推-已推送冲销后重推新单）.md
+++ b/doc/docs/业务流程/2026-10-16-结算调整单接入金蝶设计（未推送自动推-已推送冲销后重推新单）.md
@@ -137,6 +137,7 @@
 - 预检为**软提示**，不阻断建单（默认建议）；是否升级为硬拦截由业务另行确认。
 - **降级**：金蝶查询超时/不可用/接口异常时，预检返回"未校验"，**不阻断**建单与回带，由后续审批分流与重推闸门兜底。
 - 预检结果**只用于提示**，不作为后续环节的结论缓存：审批（操作 2）、重推（操作 3）各自按**当下**状态重新判定。
+- 预检查询结果**顺带回写**正式结算单的冲销状态字段（`kingdee_writeoff_status`，见 §15）供列表展示；异常降级时不回写、保留上次值。
 
 ![选单后金蝶冲销预检：该结算单已推送金蝶且旧单尚未冲销时的醒目提示，仅为软提示，不阻断建单](./2026-10-16-结算调整单接入金蝶设计（未推送自动推-已推送冲销后重推新单）.assets/03-新增调整单-选单后金蝶冲销预检提示.png)
 
@@ -171,7 +172,7 @@
 `repush(调整单id)` 重写为：
 
 1. **前置校验**：调整单 `approvalStatus = approved`；原单存在。
-2. **冲销校验（硬闸门）**：取调整单号 + 原单号，按旧键（`原结算单号_明细单据号`）查 A102-4（应付）/ A302-4（应收）；要求存在且 `hadwrittenoff = true`，否则抛出「原应付/应收单尚未在金蝶冲销，禁止重推」。
+2. **冲销校验（硬闸门）**：取调整单号 + 原单号，按旧键（`原结算单号_明细单据号`）查 A102-4（应付）/ A302-4（应收）；要求存在且 `hadwrittenoff = true`，否则抛出「原应付/应收单尚未在金蝶冲销，禁止重推」。**闸门查询结果无论放行还是拦截均回写**正式结算单冲销状态（§15.3③），拦截后列表即同步为"未冲销"。
 3. **克隆新正式结算单**：`cloneFormalSettlement(原单, 调整单)`
    - 新号由 `nextNo` 取正式流水（`FJS`/`SJS`+日期+4 位）；
    - 克隆明细、明细费项、汇总费项、发票、汇率等；
@@ -198,7 +199,7 @@
 
 - 只认 `hadwrittenoff = true`（`BfiApBillVO` 158 / `BfiArBillVO` 138）。部分冲销同样放行。
 - `iswrittenoff` 不单独作为放行依据。落地前需用 Apifox 实测 A102-4/A302-4 确实回传 `hadwrittenoff`。
-- **两处判定，用途不同**：操作 1 选单预检 = 软提示（第 6.2 节）；操作 3 重推 = **硬闸门**（第 8 节）。预检不替代闸门——冲销在金蝶可被撤销，且建单到重推期间状态可能变化。
+- **三处判定，用途不同**：操作 1 选单预检 = 软提示（第 6.2 节）；操作 3 重推 = **硬闸门**（第 8 节）；定时回写 = 列表展示供数（第 15 节）。预检不替代闸门——冲销在金蝶可被撤销，且建单到重推期间状态可能变化；定时回写值**只用于展示**，闸门放行永远以实时查询为准。
 
 ### 9.3 克隆新正式结算单
 
@@ -296,3 +297,49 @@ ALTER TABLE blade_formal_settlement ADD COLUMN adjust_status VARCHAR(32) NULL CO
 5. **按钮与菜单**：「推送金蝶」与「重新推送」合并为**单一入口**（按金蝶状态分流：未同步/失败→推原结算单；已同步→冲销后重推新单），统一复用既有菜单 `settlement_adjustment_repush`，不新增菜单。
 6. **待实测**：A102-4/A302-4 的 `hadwrittenoff` 实际回传（§13.1）；克隆新单对 `PreSettlement` 占用的影响（§13.2）。
 
+---
+
+## 15. 金蝶冲销状态落库与列表展示（2026-10-30 新增）
+
+### 15.1 背景与定位
+
+预检（§6.2）与重推闸门（§8）是**事件触发**的单点实时校验：只有建调整单、点重推时才会查金蝶，覆盖不到结算单列表的全量展示；而列表是高频页面，不能每次刷新/翻页都实时查金蝶（外部依赖与延迟会拖垮列表）。因此把冲销状态**持久化 + 定时回写**（与 `PaymentKingdeeResultTask` 既有回写模式一致）；决策时刻（预检提示、闸门放行）仍坚持实时查询。三条链路互补：**接口查询保证决策正确，定时回写保证列表有数**。
+
+### 15.2 数据模型（DDL）
+
+脚本 `doc/sql/transport/lqj/20261102/06_blade_formal_settlement_kingdee_writeoff_20261030.sql`（可重复执行）：
+
+```sql
+ALTER TABLE blade_formal_settlement ADD COLUMN kingdee_write_off_status VARCHAR(20) NULL COMMENT '金蝶冲销状态：unwrittenoff-未冲销 writtenoff-已冲销（NULL=未推送金蝶或未校验）';
+ALTER TABLE blade_formal_settlement ADD COLUMN kingdee_write_off_time datetime NULL COMMENT '金蝶冲销状态确认时间（定时回写/预检回写时间）';
+```
+
+> 列名遵循 MyBatis-Plus 驼峰转下划线默认映射（`kingdeeWriteOffStatus` → `kingdee_write_off_status`），实体无需 `@TableField`；脚本对早期误建的旧列名（`kingdee_writeoff_status`）会先重命名再补缺，可重复执行。
+
+实体 `FormalSettlement` 同步加 `kingdeeWriteOffStatus` / `kingdeeWriteOffTime`；`FormalSettlementVO` 继承实体自动带出，无需改 VO。
+
+### 15.3 三条查询/回写链路
+
+| 链路 | 触发 | 行为 |
+|---|---|---|
+| ① 定时回写（兜底供数） | `PaymentKingdeeResultTask` 子流程④（默认每 10 分钟，single-flight 锁 `kingdee-writeoff-sync`） | 扫 `kingdeeSyncStatus=synced` 的结算单 → 结算明细分批一次查全（消除 N+1）组装防重键 → A102-4/A302-4 整批查询 `hadwrittenoff` → 状态有变化的 `updateBatchById` 批量回写；金蝶异常整轮告警、保持上次值 |
+| ② 预检实时回写 | 操作 1 选单预检 | 查询成功即回写该单状态（已冲销/未冲销都存）；异常降级"未校验"不回写 |
+| ③ 闸门实时回写 | 操作 3 重推硬闸门 | 查询结果无论放行/拦截均回写（拦截=未冲销也存，提示后列表即同步） |
+
+回写统一走 `FormalSettlementServiceImpl.refreshKingdeeWriteOff(id, writtenOff)`：状态未变化不落库，避免预检反复点击重复写库。
+
+### 15.4 列表展示口径
+
+| 场景 | 显示 |
+|---|---|
+| 未推送金蝶（unsynced/failed） | `-` |
+| 已推送，尚未回写过（存量上线初期） | 未校验 |
+| 已推送，旧单未冲销 | 未冲销（黄） |
+| 已推送，旧单已冲销（含部分冲销） | 已冲销（绿） |
+
+前端：`formalSettlementTable.js` 新增「金蝶冲销状态」列（`formalSettlement.js` COLUMN_EXTRA 标记 `slot`）、`formal-settlement-table-panel.vue` 单元格插槽渲染标签、`utils/kingdee.js` 新增 `kingdeeWriteOffTagType` 颜色映射、`formalSettlementSearch.js` 新增 `kingdeeWriteOffStatusOptions` 文案。
+
+### 15.5 与硬闸门的关系（重要）
+
+定时回写值**只用于展示**，允许滞后一个调度周期（默认 10 分钟）；重推放行与否**永远以闸门实时查询为准**（§8.2），不读取定时值——避免拿旧状态放行导致金蝶重复生成应付/应收单。
+
diff --git a/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md b/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md
index 84c209fa..b0954288 100644
--- a/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md
+++ b/doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md
@@ -136,7 +136,7 @@ A301-1 收款单查询（业务日期窗口取 `thirdParty.bfi.recBillSync.days`
 
 ### 3.6 新增表
 
-`blade_receipt_claim_hcs_record`（收款认领合规推送记录，DDL 见 `doc/sql/transport/lqj/20261028/01_blade_receipt_claim_hcs_record_20261028.sql`）：
+`blade_receipt_claim_hcs_record`（收款认领合规推送记录，DDL 见 `doc/sql/transport/lqj/20261102/01_blade_receipt_claim_hcs_record_20261028.sql`）：
 
 | 字段 | 说明 |
 | --- | --- |
diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml
index a3243b7d..1be026b9 100644
--- a/doc/nacos/blade-dev.yaml
+++ b/doc/nacos/blade-dev.yaml
@@ -92,8 +92,12 @@ thirdParty:
   ocr:
     # OCR磅单、车牌识别接口地址
     baseUrl: http://127.0.0.1:8080
-    # OCR证件识别接口地址
+    # OCR证件识别接口地址（银行卡等通用证件）
     baseOtherUrl: http://127.0.0.1:8080
+    # 身份证 OCR 服务地址（POST /ShenFenZheng，formData 字段 image_file）
+    idCardBaseUrl: http://124.71.22.123:8500
+    # 营业执照 OCR 服务地址（POST /businessLicense，JSON：img_path、data_type）
+    businessLicenseBaseUrl: http://124.71.22.123:8888
   wps:
     # WPS开放接口地址
     baseUrl: http://127.0.0.1:8080
@@ -152,6 +156,9 @@ thirdParty:
     username: ${BFI_USERNAME:XDWL-03024}
     accountId: ${BFI_ACCOUNT_ID:2454399096727798784}
     language: ${BFI_LANGUAGE:zh_CN}
+    # Feign 超时（秒）：金蝶保存类接口偶发超 60 秒，超时后远端可能已生成单据，重推会自动勾稽防重
+    connectTimeoutSeconds: ${BFI_CONNECT_TIMEOUT_SECONDS:10}
+    readTimeoutSeconds: ${BFI_READ_TIMEOUT_SECONDS:120}
     # 数据来源系统编码（推送金蝶公共参数：客商、付款申请等统一使用），默认 WLTMS（运输TMS）
     srcSys: ${BFI_SRC_SYS:WLTMS}
 
@@ -324,6 +331,8 @@ thirdParty:
       require-contract-synced: ${HCS_CREDIT_REQUIRE_CONTRACT_SYNCED:true}
     # 结算付款特批（C106-3/4）
     spec-pay:
+      # 付款特批走合同合规开关（false 时不再发起 C106-3/4、不挂起"特批审核"、不拦金蝶推送；提交时特批附件必传逻辑保留）
+      enabled: ${HCS_SPEC_PAY_ENABLED:false}
       # 单据状态（示例 10）
       doc-status: ${HCS_SPEC_PAY_DOC_STATUS:10}
       # 付款用途/性质/类型字典值（§9-U3 待联调后配置）
diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml
index 93d9729e..60322695 100644
--- a/doc/nacos/blade-prod.yaml
+++ b/doc/nacos/blade-prod.yaml
@@ -54,8 +54,12 @@ thirdParty:
   ocr:
     # OCR磅单、车牌识别接口地址
     baseUrl: http://127.0.0.1:8080
-    # OCR证件识别接口地址
+    # OCR证件识别接口地址（银行卡等通用证件）
     baseOtherUrl: http://127.0.0.1:8080
+    # 身份证 OCR 服务地址（POST /ShenFenZheng，formData 字段 image_file）
+    idCardBaseUrl: http://124.71.22.123:8500
+    # 营业执照 OCR 服务地址（POST /businessLicense，JSON：img_path、data_type）
+    businessLicenseBaseUrl: http://124.71.22.123:8888
   wps:
     # WPS开放接口地址
     baseUrl: http://127.0.0.1:8080
@@ -118,6 +122,9 @@ thirdParty:
     username: ${BFI_USERNAME:}
     accountId: ${BFI_ACCOUNT_ID:}
     language: ${BFI_LANGUAGE:zh_CN}
+    # Feign 超时（秒）：金蝶保存类接口偶发超 60 秒，超时后远端可能已生成单据，重推会自动勾稽防重
+    connectTimeoutSeconds: ${BFI_CONNECT_TIMEOUT_SECONDS:10}
+    readTimeoutSeconds: ${BFI_READ_TIMEOUT_SECONDS:120}
     # 数据来源系统编码（推送金蝶公共参数：客商、付款申请等统一使用），默认 WLTMS（运输TMS）
     srcSys: ${BFI_SRC_SYS:WLTMS}
     # 金蝶黑名单查询（A801-5 客商提审拦截）：禁止交易类（A）始终拦截；
diff --git a/doc/nacos/third-party-api.yaml b/doc/nacos/third-party-api.yaml
index dddca1fe..864baf09 100644
--- a/doc/nacos/third-party-api.yaml
+++ b/doc/nacos/third-party-api.yaml
@@ -3,8 +3,12 @@ thirdParty:
   ocr:
     # OCR磅单、车牌识别接口地址
     baseUrl: ${OCR_BASE_URL:http://127.0.0.1:8080}
-    # OCR证件识别接口地址
+    # OCR证件识别接口地址（银行卡等通用证件）
     baseOtherUrl: ${OCR_BASE_OTHER_URL:http://127.0.0.1:8080}
+    # 身份证 OCR 服务地址（POST /ShenFenZheng，formData 字段 image_file）
+    idCardBaseUrl: ${OCR_ID_CARD_BASE_URL:http://124.71.22.123:8500}
+    # 营业执照 OCR 服务地址（POST /businessLicense，JSON：img_path、data_type）
+    businessLicenseBaseUrl: ${OCR_BUSINESS_LICENSE_BASE_URL:http://124.71.22.123:8888}
   wps:
     # WPS开放接口地址
     baseUrl: ${WPS_BASE_URL:http://127.0.0.1:8080}
@@ -48,6 +52,9 @@ thirdParty:
     accountId: ${BFI_ACCOUNT_ID:}
     # 语言字串，默认 zh_CN
     language: ${BFI_LANGUAGE:zh_CN}
+    # Feign 超时（秒）：金蝶保存类接口偶发超 60 秒，超时后远端可能已生成单据，重推会自动勾稽防重
+    connectTimeoutSeconds: ${BFI_CONNECT_TIMEOUT_SECONDS:10}
+    readTimeoutSeconds: ${BFI_READ_TIMEOUT_SECONDS:120}
 
     # BFI 客户端本地 Mock 开关（联调自测用，生产必须 false）：
     # true 时 IBfiClient 有桩用桩（{mockDir}/{接口方法名}.json）、无桩透传真实 Feign 接口，调用侧零改动
@@ -270,6 +277,8 @@ thirdParty:
       require-contract-synced: ${HCS_CREDIT_REQUIRE_CONTRACT_SYNCED:true}
     # 结算付款特批（C106-3/4）
     spec-pay:
+      # 付款特批走合同合规开关（false 时不再发起 C106-3/4、不挂起"特批审核"、不拦金蝶推送；提交时特批附件必传逻辑保留）
+      enabled: ${HCS_SPEC_PAY_ENABLED:false}
       # 单据状态（示例 10）
       doc-status: ${HCS_SPEC_PAY_DOC_STATUS:10}
       # 付款用途/性质/类型字典值（§9-U3 待联调后配置）
diff --git a/doc/sql/transport/blade_base_menu_view_permission_patch_20261104.sql b/doc/sql/transport/blade_base_menu_view_permission_patch_20261104.sql
new file mode 100644
index 00000000..d595f321
--- /dev/null
+++ b/doc/sql/transport/blade_base_menu_view_permission_patch_20261104.sql
@@ -0,0 +1,44 @@
+-- ----------------------------
+-- 补齐基础/系统业务模块「查看」按钮权限（角色授权用）
+-- 执行前请确认目标库尚未存在同 code 菜单
+-- ----------------------------
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2075429330000000001, 2075421555200860162, 'port_terminal_view', '查看', 'port_terminal_view', '', '', 1, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'port_terminal_view' AND `is_deleted` = 0);
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2075429280000000001, 2075427962415456258, 'railway_station_view', '查看', 'railway_station_view', '', '', 1, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'railway_station_view' AND `is_deleted` = 0);
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2075431850000000001, 2075431169720033282, 'airport_master_view', '查看', 'airport_master_view', '', '', 1, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'airport_master_view' AND `is_deleted` = 0);
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2075449000000000009, 2075449000000000001, 'currency_view', '查看', 'currency_view', '', '', 1, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'currency_view' AND `is_deleted` = 0);
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2075449100000000006, 2075449100000000001, 'customer_type_view', '查看', 'customer_type_view', '', '', 1, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'customer_type_view' AND `is_deleted` = 0);
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2075449200000000009, 2075449200000000001, 'fee_item_view', '查看', 'fee_item_view', '', '', 1, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'fee_item_view' AND `is_deleted` = 0);
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2075449300000000006, 2075449300000000001, 'measurement_unit_view', '查看', 'measurement_unit_view', '', '', 1, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'measurement_unit_view' AND `is_deleted` = 0);
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2080110200000000105, 2080110200000000101, 'business_dept_config_view', '查看', 'business_dept_config_view', '', '', 4, 2, 0, 1, NULL, '', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'business_dept_config_view' AND `is_deleted` = 0);
diff --git a/doc/sql/transport/blade_biz_dept_backfill_by_creator_20261104.sql b/doc/sql/transport/blade_biz_dept_backfill_by_creator_20261104.sql
new file mode 100644
index 00000000..7f623bdf
--- /dev/null
+++ b/doc/sql/transport/blade_biz_dept_backfill_by_creator_20261104.sql
@@ -0,0 +1,511 @@
+-- ----------------------------
+-- 业务数据「所属组织」旧残留批量订正
+-- 口径：按创建人当前所属组织（blade_user.dept_id 首个）回填 dept_id / dept_name（或 organization_name）
+-- 适用：各环境 OA/组织同步后，业务表仍挂着已删/不存在/空组织的存量数据
+-- 可重复执行；update_time 不改，保留原值
+-- ----------------------------
+--
+-- 订正范围（仅处理残留）：
+--   1) dept_id 为空或 <=0
+--   2) dept_id 在 blade_dept 中不存在或已逻辑删除
+--   仅名称字段的表：organization_name / dept_name 为空，或名称在当前未删除组织中找不到
+--
+-- 取值规则：
+--   create_user → blade_user.dept_id（多组织取逗号分隔第一个，与登录态 AuthUtil.firstLong 一致）
+--             → blade_dept.dept_name
+--   创建人无组织、或组织已失效：跳过该行
+--
+-- 特殊：
+--   blade_customer_archive 客商所属组织业务上固定为「广西现代物流集团有限公司」，
+--   不按创建人组织回填，残留时改挂该顶级组织。
+--   合同负责部门（organization_id）/ 票据使用部门（blade_bill_payment.dept_id）不在本脚本范围。
+--
+-- 执行顺序：
+--   0 预览 → 1 备份 → 2 订正 → 3 校验；出问题用 4 回退
+-- ----------------------------
+
+SET NAMES utf8mb4;
+
+-- ----------------------------
+-- 0. 预览：各表待订正条数（执行订正前先看）
+-- ----------------------------
+-- DROP TEMPORARY TABLE IF EXISTS tmp_user_current_dept;
+-- CREATE TEMPORARY TABLE tmp_user_current_dept AS
+-- SELECT
+--   u.id AS user_id,
+--   CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) AS dept_id,
+--   d.dept_name AS dept_name
+-- FROM blade_user u
+-- INNER JOIN blade_dept d
+--   ON d.id = CAST(SUBSTRING_INDEX(TRIM(IFNULL(u.dept_id, '')), ',', 1) AS UNSIGNED)
+--  AND IFNULL(d.is_deleted, 0) = 0
+-- WHERE IFNULL(u.is_deleted, 0) = 0
+--   AND IFNULL(TRIM(u.dept_id), '') <> ''
+--   AND CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) > 0;
+-- ALTER TABLE tmp_user_current_dept ADD PRIMARY KEY (user_id);
+--
+-- SELECT 'blade_common_route' AS table_name, COUNT(*) AS pending_cnt
+-- FROM blade_common_route t
+-- INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+-- WHERE IFNULL(t.is_deleted, 0) = 0
+--   AND (t.dept_id IS NULL OR t.dept_id <= 0
+--        OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+-- -- 其余表同理，可按第 2 节表清单自行复制预览
+
+-- ----------------------------
+-- 1. 备份表（不存在则创建；可重复执行）
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS blade_biz_dept_backfill_bak_20261104 (
+	bak_id BIGINT NOT NULL AUTO_INCREMENT,
+	table_name VARCHAR(64) NOT NULL,
+	biz_id BIGINT NOT NULL,
+	old_dept_id BIGINT DEFAULT NULL,
+	old_dept_name VARCHAR(255) DEFAULT NULL,
+	new_dept_id BIGINT DEFAULT NULL,
+	new_dept_name VARCHAR(255) DEFAULT NULL,
+	create_user BIGINT DEFAULT NULL,
+	bak_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	PRIMARY KEY (bak_id),
+	KEY idx_biz_dept_bak_table_biz (table_name, biz_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='所属组织订正备份20261104';
+
+START TRANSACTION;
+
+-- 创建人 → 当前所属组织（多组织取第一个）
+DROP TEMPORARY TABLE IF EXISTS tmp_user_current_dept;
+CREATE TEMPORARY TABLE tmp_user_current_dept AS
+SELECT
+	u.id AS user_id,
+	CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) AS dept_id,
+	d.dept_name AS dept_name
+FROM blade_user u
+INNER JOIN blade_dept d
+	ON d.id = CAST(SUBSTRING_INDEX(TRIM(IFNULL(u.dept_id, '')), ',', 1) AS UNSIGNED)
+	AND IFNULL(d.is_deleted, 0) = 0
+WHERE IFNULL(u.is_deleted, 0) = 0
+	AND IFNULL(TRIM(u.dept_id), '') <> ''
+	AND CAST(SUBSTRING_INDEX(TRIM(u.dept_id), ',', 1) AS UNSIGNED) > 0;
+ALTER TABLE tmp_user_current_dept ADD PRIMARY KEY (user_id);
+
+-- 客商固定顶级组织
+DROP TEMPORARY TABLE IF EXISTS tmp_fixed_owner_dept;
+CREATE TEMPORARY TABLE tmp_fixed_owner_dept AS
+SELECT d.id AS dept_id, d.dept_name
+FROM blade_dept d
+WHERE IFNULL(d.is_deleted, 0) = 0
+	AND d.dept_name = '广西现代物流集团有限公司'
+ORDER BY d.id
+LIMIT 1;
+ALTER TABLE tmp_fixed_owner_dept ADD PRIMARY KEY (dept_id);
+
+-- ----------------------------
+-- 2. 订正：dept_id + dept_name 类表
+-- ----------------------------
+
+-- 2.1 常用线路
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_common_route', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_common_route t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_common_route t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.2 常用货物
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_common_cargo', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_common_cargo t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_common_cargo t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.3 过程配置
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_process_config', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_process_config t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_process_config t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.4 发货模板
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_shipping_template', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_shipping_template t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_shipping_template t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.5 运输计划
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_transport_plan', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_transport_plan t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_transport_plan t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.6 运单
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_waybill', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_waybill t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_waybill t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.7 配载
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_loading_manage', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_loading_manage t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_loading_manage t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.8 常用地址
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_common_address', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_common_address t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_common_address t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.9 预结算
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_pre_settlement', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_pre_settlement t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_pre_settlement t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.10 正式结算
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_formal_settlement', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_formal_settlement t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_formal_settlement t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.11 应收应付明细
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_receivable_payable_detail', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_receivable_payable_detail t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_receivable_payable_detail t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.12 异常处置
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_exception_disposal', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_exception_disposal t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_exception_disposal t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.13 风险处置
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_risk_disposal', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_risk_disposal t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_risk_disposal t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.14 开票申请
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_invoice_application', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_invoice_application t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_invoice_application t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.15 收票登记
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_invoice_receipt', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_invoice_receipt t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_invoice_receipt t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.16 付款申请
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_payment_application', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_payment_application t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_payment_application t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.17 运输对账
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_transport_reconciliation', t.id, t.dept_id, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_transport_reconciliation t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+UPDATE blade_transport_reconciliation t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- 2.18 客商档案：固定挂顶级「广西现代物流集团有限公司」
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_customer_archive', t.id, t.dept_id, t.dept_name, f.dept_id, f.dept_name, t.create_user
+FROM blade_customer_archive t
+CROSS JOIN tmp_fixed_owner_dept f
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0)
+		OR IFNULL(t.dept_id, 0) <> f.dept_id);
+
+UPDATE blade_customer_archive t
+CROSS JOIN tmp_fixed_owner_dept f
+SET t.dept_id = f.dept_id,
+	t.dept_ids = CAST(f.dept_id AS CHAR),
+	t.dept_name = f.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_id IS NULL OR t.dept_id <= 0
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0)
+		OR IFNULL(t.dept_id, 0) <> f.dept_id);
+
+-- ----------------------------
+-- 2.19 仅名称字段：司机 / 车辆 / 船舶 / 派车
+-- ----------------------------
+
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_transport_driver', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_transport_driver t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+UPDATE blade_transport_driver t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.organization_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_transport_vehicle', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_transport_vehicle t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+UPDATE blade_transport_vehicle t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.organization_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_transport_ship', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_transport_ship t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+UPDATE blade_transport_ship t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.organization_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_vehicle_dispatch', t.id, NULL, t.organization_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_vehicle_dispatch t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+UPDATE blade_vehicle_dispatch t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.organization_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.organization_name IS NULL OR TRIM(t.organization_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.organization_name));
+
+-- 2.20 结算调整单（仅 dept_name）
+INSERT INTO blade_biz_dept_backfill_bak_20261104 (table_name, biz_id, old_dept_id, old_dept_name, new_dept_id, new_dept_name, create_user)
+SELECT 'blade_settlement_adjustment', t.id, NULL, t.dept_name, c.dept_id, c.dept_name, t.create_user
+FROM blade_settlement_adjustment t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_name IS NULL OR TRIM(t.dept_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.dept_name));
+
+UPDATE blade_settlement_adjustment t
+INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+SET t.dept_name = c.dept_name
+WHERE IFNULL(t.is_deleted, 0) = 0
+	AND (t.dept_name IS NULL OR TRIM(t.dept_name) = ''
+		OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE IFNULL(d.is_deleted, 0) = 0 AND d.dept_name = t.dept_name));
+
+COMMIT;
+
+-- ----------------------------
+-- 3. 校验（订正后执行）
+-- ----------------------------
+-- SELECT table_name, COUNT(*) AS bak_rows
+-- FROM blade_biz_dept_backfill_bak_20261104
+-- GROUP BY table_name
+-- ORDER BY table_name;
+--
+-- -- 仍挂无效组织、且创建人当前有有效组织的运单（示例，期望 0）
+-- SELECT COUNT(*) AS still_bad
+-- FROM blade_waybill t
+-- INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+-- WHERE IFNULL(t.is_deleted, 0) = 0
+--   AND (t.dept_id IS NULL OR t.dept_id <= 0
+--        OR NOT EXISTS (SELECT 1 FROM blade_dept d WHERE d.id = t.dept_id AND IFNULL(d.is_deleted, 0) = 0));
+
+-- ----------------------------
+-- 4. 回退（按备份表恢复；按需取消注释）
+-- ----------------------------
+-- UPDATE blade_waybill t
+-- INNER JOIN blade_biz_dept_backfill_bak_20261104 b
+--   ON b.table_name = 'blade_waybill' AND b.biz_id = t.id
+-- SET t.dept_id = b.old_dept_id, t.dept_name = b.old_dept_name;
+-- -- 其他表同理替换 table_name / 字段名
+
+-- ----------------------------
+-- 5. 可选：全量强制按创建人当前组织覆盖（不仅残留）
+--    默认不要执行；确认业务需要「全部改挂创建人当前组织」时再跑
+-- ----------------------------
+-- UPDATE blade_waybill t
+-- INNER JOIN tmp_user_current_dept c ON c.user_id = t.create_user
+-- SET t.dept_id = c.dept_id, t.dept_name = c.dept_name
+-- WHERE IFNULL(t.is_deleted, 0) = 0;
diff --git a/doc/sql/transport/blade_business_dept_config_20261102.sql b/doc/sql/transport/blade_business_dept_config_20261102.sql
new file mode 100644
index 00000000..e42118f9
--- /dev/null
+++ b/doc/sql/transport/blade_business_dept_config_20261102.sql
@@ -0,0 +1,38 @@
+-- 业务部门配置：平台公司 + 业务部门 映射合同编号前缀、初始流水号、金蝶部门代码
+CREATE TABLE IF NOT EXISTS `blade_business_dept_config` (
+  `id` bigint NOT NULL COMMENT '主键',
+  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '000000' COMMENT '租户ID',
+  `platform_company_id` bigint NOT NULL COMMENT '平台公司ID',
+  `platform_company_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台公司名称',
+  `business_dept_id` bigint NOT NULL COMMENT '业务部门ID',
+  `business_dept_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '业务部门名称',
+  `contract_code_prefix` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '合同编码前缀（平台公司简称+业务部门简称）',
+  `initial_serial` int DEFAULT NULL COMMENT '初始流水号（1-999，系统已有相同流水号则跳过）',
+  `kingdee_company_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '金蝶公司代码（取自平台公司组织金蝶代码）',
+  `kingdee_dept_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '金蝶部门代码',
+  `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+  `create_user` bigint DEFAULT NULL COMMENT '创建人',
+  `create_dept` bigint DEFAULT NULL COMMENT '创建部门',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_user` bigint DEFAULT NULL COMMENT '修改人',
+  `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+  `status` int DEFAULT 1 COMMENT '状态',
+  `is_deleted` int DEFAULT 0 COMMENT '是否已删除',
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `idx_biz_dept_config_platform` (`platform_company_id`) USING BTREE,
+  KEY `idx_biz_dept_config_dept` (`business_dept_id`) USING BTREE,
+  KEY `idx_biz_dept_config_tenant` (`tenant_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='业务部门配置';
+
+-- 合同管理增加平台公司字段
+ALTER TABLE `blade_contract_manage`
+  ADD COLUMN `platform_company_id` bigint DEFAULT NULL COMMENT '平台公司ID' AFTER `organization_name`,
+  ADD COLUMN `platform_company_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台公司' AFTER `platform_company_id`;
+
+-- 系统管理菜单：业务部门配置
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
+(2080110200000000101, 1123598815738675203, 'business_dept_config', '业务部门配置', 'business_dept_config', '/system/business-dept-config', 'iconfont iconicon_group', 25, 1, 0, 1, NULL, '', 0),
+(2080110200000000102, 2080110200000000101, 'business_dept_config_add', '新增', 'business_dept_config_add', '', '', 1, 2, 0, 1, NULL, '', 0),
+(2080110200000000103, 2080110200000000101, 'business_dept_config_edit', '编辑', 'business_dept_config_edit', '', '', 2, 2, 0, 1, NULL, '', 0),
+(2080110200000000104, 2080110200000000101, 'business_dept_config_delete', '删除', 'business_dept_config_delete', '', '', 3, 2, 0, 1, NULL, '', 0),
+(2080110200000000105, 2080110200000000101, 'business_dept_config_view', '查看', 'business_dept_config_view', '', '', 4, 2, 0, 1, NULL, '', 0);
diff --git a/doc/sql/transport/blade_contract_party_multi_20261102.sql b/doc/sql/transport/blade_contract_party_multi_20261102.sql
new file mode 100644
index 00000000..6be20f99
--- /dev/null
+++ b/doc/sql/transport/blade_contract_party_multi_20261102.sql
@@ -0,0 +1,53 @@
+-- 合同甲/乙/丙多方客商明细 + 运单/配载承运客商明细定位字段
+-- utf8mb4_general_ci
+
+-- 合同管理：多方客商 JSON 与丙方汇总
+ALTER TABLE `blade_contract_manage`
+  ADD COLUMN `party_a_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '甲方客商明细JSON' AFTER `party_b`,
+  ADD COLUMN `party_b_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '乙方客商明细JSON' AFTER `party_a_json`,
+  ADD COLUMN `party_c_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '丙方客商明细JSON' AFTER `party_b_json`,
+  ADD COLUMN `party_c` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '丙方' AFTER `party_c_json`;
+
+-- 合同变更：同步多方字段
+ALTER TABLE `blade_contract_change`
+  ADD COLUMN `party_a_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '甲方客商明细JSON' AFTER `party_b`,
+  ADD COLUMN `party_b_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '乙方客商明细JSON' AFTER `party_a_json`,
+  ADD COLUMN `party_c_json` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '丙方客商明细JSON' AFTER `party_b_json`,
+  ADD COLUMN `party_c` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '丙方' AFTER `party_c_json`;
+
+-- 历史数据迁移：原甲/乙方名称生成单行明细（仅名称，后续编辑补全客商ID）
+UPDATE `blade_contract_manage`
+SET `party_a_json` = CASE
+  WHEN `party_a` IS NOT NULL AND TRIM(`party_a`) <> '' AND (`party_a_json` IS NULL OR TRIM(`party_a_json`) = '')
+    THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_a`, '\\', '\\\\'), '"', '\\"'), '"}]')
+  ELSE `party_a_json`
+END,
+`party_b_json` = CASE
+  WHEN `party_b` IS NOT NULL AND TRIM(`party_b`) <> '' AND (`party_b_json` IS NULL OR TRIM(`party_b_json`) = '')
+    THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_b`, '\\', '\\\\'), '"', '\\"'), '"}]')
+  ELSE `party_b_json`
+END
+WHERE `is_deleted` = 0;
+
+UPDATE `blade_contract_change`
+SET `party_a_json` = CASE
+  WHEN `party_a` IS NOT NULL AND TRIM(`party_a`) <> '' AND (`party_a_json` IS NULL OR TRIM(`party_a_json`) = '')
+    THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_a`, '\\', '\\\\'), '"', '\\"'), '"}]')
+  ELSE `party_a_json`
+END,
+`party_b_json` = CASE
+  WHEN `party_b` IS NOT NULL AND TRIM(`party_b`) <> '' AND (`party_b_json` IS NULL OR TRIM(`party_b_json`) = '')
+    THEN CONCAT('[{"id":"', REPLACE(UUID(), '-', ''), '","customerName":"', REPLACE(REPLACE(`party_b`, '\\', '\\\\'), '"', '\\"'), '"}]')
+  ELSE `party_b_json`
+END
+WHERE `is_deleted` = 0;
+
+-- 运单：承运客商明细定位
+ALTER TABLE `blade_waybill`
+  ADD COLUMN `carrier_party_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商明细行ID' AFTER `carrier_contract_id`,
+  ADD COLUMN `carrier_party_role` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商角色 B/C' AFTER `carrier_party_id`;
+
+-- 配载：承运客商明细定位
+ALTER TABLE `blade_loading_manage`
+  ADD COLUMN `carrier_party_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商明细行ID' AFTER `carrier_contract_id`,
+  ADD COLUMN `carrier_party_role` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '承运客商角色 B/C' AFTER `carrier_party_id`;
diff --git a/doc/sql/transport/blade_currency.sql b/doc/sql/transport/blade_currency.sql
index 8bdd98d5..287ea1b0 100644
--- a/doc/sql/transport/blade_currency.sql
+++ b/doc/sql/transport/blade_currency.sql
@@ -40,3 +40,4 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000006, 2075449000000000001, 'currency_edit', '编辑', 'currency_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000007, 2075449000000000001, 'currency_status', '修改状态', 'currency_status', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000008, 2075449000000000001, 'currency_add', '新增', 'currency_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000009, 2075449000000000001, 'currency_view', '查看', 'currency_view', '', '', 1, 2, 0, 1, NULL, '', 0);
diff --git a/doc/sql/transport/blade_customer_type.sql b/doc/sql/transport/blade_customer_type.sql
index 4e4d8563..de47ddbb 100644
--- a/doc/sql/transport/blade_customer_type.sql
+++ b/doc/sql/transport/blade_customer_type.sql
@@ -26,3 +26,4 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000003, 2075449100000000001, 'customer_type_edit', '编辑', 'customer_type_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000004, 2075449100000000001, 'customer_type_status', '修改状态', 'customer_type_status', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000005, 2075449100000000001, 'customer_type_add', '新增', 'customer_type_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000006, 2075449100000000001, 'customer_type_view', '查看', 'customer_type_view', '', '', 1, 2, 0, 1, NULL, '', 0);
diff --git a/doc/sql/transport/blade_dept_tree_permission_patch_20261104.sql b/doc/sql/transport/blade_dept_tree_permission_patch_20261104.sql
new file mode 100644
index 00000000..274b3520
--- /dev/null
+++ b/doc/sql/transport/blade_dept_tree_permission_patch_20261104.sql
@@ -0,0 +1,9 @@
+-- ----------------------------
+-- 组织树 /dept/tree 独立权限菜单（角色「数据权限」中配置）
+-- 未配置该菜单数据权限时，组织树接口默认返回空（不展示）
+-- ----------------------------
+
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`)
+SELECT 2076110415738675232, 1123598815738675205, 'dept_tree', '树形结构', 'dept_tree', '/api/blade-system/dept/tree', 'file-text', 5, 2, 2, 1, '', '组织树接口独立数据权限配置项；未配置时组织树默认不展示', 0
+FROM DUAL
+WHERE NOT EXISTS (SELECT 1 FROM `blade_menu` WHERE `code` = 'dept_tree' AND `is_deleted` = 0);
diff --git a/doc/sql/transport/blade_fee_item.sql b/doc/sql/transport/blade_fee_item.sql
index b2f69e80..ae50d9e4 100644
--- a/doc/sql/transport/blade_fee_item.sql
+++ b/doc/sql/transport/blade_fee_item.sql
@@ -33,3 +33,4 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000006, 2075449200000000001, 'fee_item_import', '批量导入', 'fee_item_import', '/api/blade-system/fee-item/import-fee-item', 'upload', 5, 2, 3, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000007, 2075449200000000001, 'fee_item_template', '下载模板', 'fee_item_template', '/api/blade-system/fee-item/export-template', 'download', 6, 2, 2, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000008, 2075449200000000001, 'fee_item_export', '批量导出', 'fee_item_export', '/api/blade-system/fee-item/export-fee-item', 'download', 7, 2, 2, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000009, 2075449200000000001, 'fee_item_view', '查看', 'fee_item_view', '', '', 1, 2, 0, 1, NULL, '', 0);
diff --git a/doc/sql/transport/blade_loading_manage_20260804.sql b/doc/sql/transport/blade_loading_manage_20260804.sql
index ffadac6b..4d10b9f4 100644
--- a/doc/sql/transport/blade_loading_manage_20260804.sql
+++ b/doc/sql/transport/blade_loading_manage_20260804.sql
@@ -21,6 +21,7 @@ CREATE TABLE IF NOT EXISTS `blade_loading_manage` (
   `trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号',
   `driver_name` varchar(100) DEFAULT NULL COMMENT '司机',
   `driver_phone` varchar(50) DEFAULT NULL COMMENT '联系电话',
+  `driver_id` bigint(20) DEFAULT NULL COMMENT '司机ID',
   `escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
   `escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
   `carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型',
@@ -50,7 +51,8 @@ CREATE TABLE IF NOT EXISTS `blade_loading_manage` (
   UNIQUE KEY `uk_loading_manage_no` (`loading_no`) USING BTREE,
   KEY `idx_loading_manage_carrier_contract_id` (`carrier_contract_id`) USING BTREE,
   KEY `idx_loading_manage_dept` (`dept_id`) USING BTREE,
-  KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE
+  KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE,
+  KEY `idx_loading_manage_tenant_driver_id` (`tenant_id`, `driver_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配载管理';
 
 INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
diff --git a/doc/sql/transport/blade_loading_manage_driver_id_20261028.sql b/doc/sql/transport/blade_loading_manage_driver_id_20261028.sql
new file mode 100644
index 00000000..73b762ba
--- /dev/null
+++ b/doc/sql/transport/blade_loading_manage_driver_id_20261028.sql
@@ -0,0 +1,80 @@
+-- ============================================================
+-- blade_loading_manage_driver_id_20261028.sql
+-- ============================================================
+-- 运单/配载单写入司机档案 ID，把「归属」与「手机号快照」解耦：
+--   blade_loading_manage.driver_id  配载单当前司机的司机档案 ID（blade_transport_driver.id）
+--   blade_waybill.driver_id         已有列（本脚本只补索引），派单/配载/导入时写入
+-- 归属判据：driver_id > 0 才算有主；0、-1 与 NULL 一律等同「无主」（承运商司机、未登录过小程序的司机）。
+-- 历史数据不回填：手机号二次放号后按号反查会张冠李戴，旧单统一按无主处理，等下一次派单/配载再写入。
+-- 本脚本只做结构升级，不改任何业务数据；以下结构变更可重复执行。
+
+-- ------------------------------------------------------------
+-- 0. 存档
+-- ------------------------------------------------------------
+-- 本脚本无数据订正，无需备份表。
+
+-- ------------------------------------------------------------
+-- 1. 结构变更
+-- ------------------------------------------------------------
+-- ① blade_loading_manage.driver_id
+SET @ddl_sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE `blade_loading_manage` ADD COLUMN `driver_id` bigint(20) DEFAULT NULL COMMENT ''司机ID'' AFTER `driver_phone`',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'blade_loading_manage'
+    AND COLUMN_NAME = 'driver_id'
+);
+PREPARE ddl_stmt FROM @ddl_sql;
+EXECUTE ddl_stmt;
+DEALLOCATE PREPARE ddl_stmt;
+
+-- ② blade_loading_manage 按租户 + 司机归属检索（司机端/归属巡检）
+SET @ddl_sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE `blade_loading_manage` ADD KEY `idx_loading_manage_tenant_driver_id` (`tenant_id`, `driver_id`) USING BTREE',
+    'SELECT 1')
+  FROM information_schema.STATISTICS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'blade_loading_manage'
+    AND INDEX_NAME = 'idx_loading_manage_tenant_driver_id'
+);
+PREPARE ddl_stmt FROM @ddl_sql;
+EXECUTE ddl_stmt;
+DEALLOCATE PREPARE ddl_stmt;
+
+-- ③ blade_waybill 按租户 + 司机归属检索（列已存在，只补索引）
+SET @ddl_sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE `blade_waybill` ADD KEY `idx_waybill_tenant_driver_id` (`tenant_id`, `driver_id`) USING BTREE',
+    'SELECT 1')
+  FROM information_schema.STATISTICS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'blade_waybill'
+    AND INDEX_NAME = 'idx_waybill_tenant_driver_id'
+);
+PREPARE ddl_stmt FROM @ddl_sql;
+EXECUTE ddl_stmt;
+DEALLOCATE PREPARE ddl_stmt;
+
+-- ------------------------------------------------------------
+-- 2. 校验
+-- ------------------------------------------------------------
+-- 列存在（期望 1 行）
+-- SELECT COUNT(*) FROM information_schema.COLUMNS
+--  WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_loading_manage' AND COLUMN_NAME = 'driver_id';
+-- 索引存在（期望 2 行）
+-- SELECT TABLE_NAME, INDEX_NAME, COLUMN_NAME FROM information_schema.STATISTICS
+--  WHERE TABLE_SCHEMA = DATABASE()
+--    AND INDEX_NAME IN ('idx_loading_manage_tenant_driver_id', 'idx_waybill_tenant_driver_id')
+--  ORDER BY TABLE_NAME, SEQ_IN_INDEX;
+-- 归属分布（历史单 driver_id 应为空）
+-- SELECT COUNT(*) AS total, SUM(driver_id IS NOT NULL AND driver_id > 0) AS owned FROM blade_waybill;
+
+-- ------------------------------------------------------------
+-- 3. 回退
+-- ------------------------------------------------------------
+-- ALTER TABLE `blade_waybill` DROP INDEX `idx_waybill_tenant_driver_id`;
+-- ALTER TABLE `blade_loading_manage` DROP INDEX `idx_loading_manage_tenant_driver_id`;
+-- ALTER TABLE `blade_loading_manage` DROP COLUMN `driver_id`;
diff --git a/doc/sql/transport/blade_loading_manage_driver_id_backfill_20261028.sql b/doc/sql/transport/blade_loading_manage_driver_id_backfill_20261028.sql
new file mode 100644
index 00000000..b2a42d36
--- /dev/null
+++ b/doc/sql/transport/blade_loading_manage_driver_id_backfill_20261028.sql
@@ -0,0 +1,239 @@
+-- ============================================================
+-- blade_loading_manage_driver_id_backfill_20261028.sql
+-- ============================================================
+-- 存量配载单补司机档案 ID：把「归属」从手机号快照切到 blade_transport_driver.id
+-- 写业务数据。第 0 节建存档表，第 1 节分批回填，第 2 节校验（只读，执行后必看），第 3 节回退。可重复执行。
+--
+-- 为什么要订正：
+--   票 01 之后配载单的归属键是 driver_id（blade_transport_driver.id），driver_phone 只是配载时的号码快照。
+--   存量配载单全部只有号码、没有 driver_id（票 01 才加的列），司机端按档案 ID 查配载单会一张都查不到；
+--   按号码反查又会踩二次放号与改号，所以才需要先按「唯一命中」把能确定的补齐。
+--   本脚本只处理「号码在本租户内唯一命中一条未删除档案」的配载单，其余留在原样、进清单等人工处置。
+--
+-- 判定与边界（严格按票面口径，不扩大）：
+--   ① 只动 driver_id IS NULL 的行。driver_id = -1 是「无主」哨兵，正数表示已有归属，两者一行都不动；
+--      第 1 节的 WHERE 里另加了一道显式排除（(driver_id = -1) IS NOT TRUE），
+--      防止后人把条件放宽成 driver_id <= 0 时把哨兵一起覆盖。
+--   ② 唯一命中：同租户内、is_deleted = 0、mobile 与 driver_phone 相等的档案恰好 1 条。
+--      命中 0 条 → 进「无法匹配」清单；命中 ≥2 条 → 进「冲突」清单。两类都跳过，不猜。
+--      逻辑删除的档案不参与命中：档案删了以后重跑脚本，不能把这些单挂到废弃档案上。
+--   ③ 手机号为空、空白、含 * 的跳过（* 是脱敏占位，不是真号码）。
+--   ④ driver_phone、update_time 与其它任何列都不改，只写 driver_id。
+--   ⑤ 逻辑删除的配载单同样回填：票面口径只有 driver_id IS NULL，不额外收窄范围；
+--      这些单不会回到列表，回填对它们无副作用。
+--   ⑥ 跨表比较显式 COLLATE：blade_loading_manage.driver_phone / tenant_id 是 utf8mb4_0900_ai_ci，
+--      blade_transport_driver.mobile / tenant_id 与存档表都是 utf8mb4_general_ci；
+--      不显式 COLLATE 会抛 ERROR 1267 Illegal mix of collations，只有真跑库才会暴露。
+--      第 2.4 节拿存档表比 driver_phone 同样要带 COLLATE utf8mb4_0900_ai_ci。
+--   ⑦ 取数与写入全在 SQL 内完成，不经 JSON / 客户端中转：19 位雪花 ID 过 JSON 会丢精度。
+--   ⑧ 分批执行（默认每批 500 行），每批独立提交，中断后重跑从剩余 NULL 行继续。
+--
+-- 范围说明：与运单脚本同一口径，只做「手机号 → 档案唯一命中」这一条规则；其余留给人工处置。
+-- 幂等：命中映射先落存档表；重复执行时映射新增 0 行、回填更新 0 行，结果不变（第 2.2 节校验）。
+-- 执行方式（脚本里有 DELIMITER 与存储过程，按分号切句的 GUI 客户端会切错）：
+--   mysql -h127.0.0.1 -uroot -p transport < blade_loading_manage_driver_id_backfill_20261028.sql
+
+-- ------------------------------------------------------------
+-- 0. 存档（必须在订正之前执行；重复执行不会覆盖已有存档）
+-- ------------------------------------------------------------
+-- 存档表同时是第 1 节的「命中映射」：一行 = 一个待回填的配载单 + 它唯一命中的档案 ID。
+-- 回填前先把映射定下来：回填只按映射写，跑之前就能看出「打算填谁」，回退也按它还原。
+CREATE TABLE IF NOT EXISTS blade_loading_manage_driver_id_bak_20261028 (
+  loading_id bigint NOT NULL COMMENT '配载单ID',
+  driver_id_before bigint DEFAULT NULL COMMENT '回填前的司机ID（本脚本只处理 NULL）',
+  driver_id_after bigint DEFAULT NULL COMMENT '回填写入的司机档案ID（blade_transport_driver.id）',
+  driver_phone varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '回填前的手机号快照，用来证明没有被改写',
+  update_time_before datetime DEFAULT NULL COMMENT '回填前的更新时间，用来证明没有被改写',
+  PRIMARY KEY (loading_id),
+  KEY idx_driver_id_after (driver_id_after)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='20261028 配载单司机档案ID回填存档';
+
+-- 命中映射：只收「号码唯一命中一条未删除档案」的 NULL 行。
+-- INSERT IGNORE + WHERE driver_id IS NULL：第二次执行不会重复建映射，已经填过的行不会再进映射。
+INSERT IGNORE INTO blade_loading_manage_driver_id_bak_20261028 (loading_id, driver_id_before, driver_id_after, driver_phone, update_time_before)
+SELECT matched.biz_id, NULL, matched.driver_id, matched.driver_phone, matched.update_time
+  FROM (
+        SELECT w.id AS biz_id,
+               MIN(d.id) AS driver_id,
+               w.driver_phone AS driver_phone,
+               w.update_time AS update_time
+          FROM blade_loading_manage w
+          JOIN blade_transport_driver d
+            ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
+           AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
+           AND d.is_deleted = 0
+         WHERE w.driver_id IS NULL
+           AND (w.driver_id = -1) IS NOT TRUE
+           AND w.driver_phone IS NOT NULL
+           AND TRIM(w.driver_phone) <> ''
+           AND w.driver_phone NOT LIKE '%*%'
+         GROUP BY w.id, w.driver_phone, w.update_time
+        HAVING COUNT(*) = 1
+       ) matched;
+
+-- ------------------------------------------------------------
+-- 1. 订正（分批回填，默认每批 500 行）
+-- ------------------------------------------------------------
+-- 循环退出条件是「这一批没有更新任何行」，所以重复执行时第一批就是 0 行，脚本空转结束。
+-- 每批单独提交（不开长事务）：大表上不会长时间持锁，中断后重跑从剩余 NULL 行继续。
+DELIMITER $$
+DROP PROCEDURE IF EXISTS backfill_blade_loading_manage_driver_id_20261028$$
+CREATE PROCEDURE backfill_blade_loading_manage_driver_id_20261028(IN p_batch_size INT)
+BEGIN
+  DECLARE v_batch_size INT DEFAULT 500;
+  DECLARE v_affected INT DEFAULT 0;
+
+  IF p_batch_size IS NOT NULL AND p_batch_size > 0 THEN
+    SET v_batch_size = p_batch_size;
+  END IF;
+
+  CREATE TEMPORARY TABLE IF NOT EXISTS tmp_loading_manage_driver_id_20261028 (
+    loading_id bigint NOT NULL,
+    PRIMARY KEY (loading_id)
+  ) ENGINE = InnoDB;
+
+  REPEAT
+    -- 取批：只取还空着的行，填过的行不再入批，所以每一批都在推进，不会原地打转
+    DELETE FROM tmp_loading_manage_driver_id_20261028;
+
+    INSERT INTO tmp_loading_manage_driver_id_20261028 (loading_id)
+    SELECT b.loading_id
+      FROM blade_loading_manage_driver_id_bak_20261028 b
+      JOIN blade_loading_manage w ON w.id = b.loading_id
+     WHERE w.driver_id IS NULL
+     ORDER BY b.loading_id
+     LIMIT v_batch_size;
+
+    UPDATE blade_loading_manage w
+      JOIN blade_loading_manage_driver_id_bak_20261028 b ON b.loading_id = w.id
+      JOIN tmp_loading_manage_driver_id_20261028 t ON t.loading_id = w.id
+       SET w.driver_id = b.driver_id_after
+     WHERE w.driver_id IS NULL
+       AND (w.driver_id = -1) IS NOT TRUE
+       AND b.driver_id_after IS NOT NULL;
+
+    SET v_affected = ROW_COUNT();
+  UNTIL v_affected = 0 END REPEAT;
+
+  DROP TEMPORARY TABLE IF EXISTS tmp_loading_manage_driver_id_20261028;
+END$$
+DELIMITER ;
+
+CALL backfill_blade_loading_manage_driver_id_20261028(500);
+DROP PROCEDURE IF EXISTS backfill_blade_loading_manage_driver_id_20261028;
+
+-- ------------------------------------------------------------
+-- 2. 校验（执行后必看；本节只有 SELECT，不动数据）
+-- ------------------------------------------------------------
+-- 2.1 规模：存档多少行、还剩多少 NULL 行、正数归属多少行（跑前跑后各查一次）
+--   remaining_null_rows 只会减少「本次命中」的那部分；差额应当等于第 2.7 节的命中行数。
+SELECT COUNT(*) AS archived_rows FROM blade_loading_manage_driver_id_bak_20261028;
+SELECT COUNT(*) AS remaining_null_rows FROM blade_loading_manage WHERE driver_id IS NULL;
+SELECT SUM(driver_id > 0) AS owned_rows,
+       SUM(driver_id = -1) AS sentinel_rows,
+       SUM(driver_id IS NULL) AS null_rows
+  FROM blade_loading_manage;
+
+-- 2.2 哨兵不变：跑前跑后各执行一次，四列必须完全相同（-1 一行都不能动）
+SELECT COUNT(*) AS sentinel_rows,
+       SUM(id) AS sentinel_id_sum,
+       MIN(id) AS min_id,
+       MAX(id) AS max_id
+  FROM blade_loading_manage
+ WHERE driver_id = -1;
+
+-- 2.3 写入正确：本次映射的行，driver_id 必须等于映射值（期望 0 行）
+SELECT COUNT(*) AS wrong_driver_id
+  FROM blade_loading_manage_driver_id_bak_20261028 b
+  JOIN blade_loading_manage w ON w.id = b.loading_id
+ WHERE NOT (w.driver_id <=> b.driver_id_after);
+
+-- 2.4 快照没有被改写：本次映射的行，driver_phone 与 update_time 必须与存档逐行一致（期望 0 行）
+SELECT COUNT(*) AS snapshot_rewritten
+  FROM blade_loading_manage_driver_id_bak_20261028 b
+  JOIN blade_loading_manage w ON w.id = b.loading_id
+ WHERE NOT (w.driver_phone <=> b.driver_phone COLLATE utf8mb4_0900_ai_ci)
+    OR NOT (w.update_time <=> b.update_time_before);
+
+-- 2.5 冲突清单：同号多档案，这些行被跳过（期望 0 行；有输出就是「为什么没填」的答案）
+SELECT w.driver_phone AS conflicting_phone,
+       COUNT(DISTINCT w.id) AS pending_rows,
+       COUNT(DISTINCT d.id) AS driver_profiles,
+       GROUP_CONCAT(DISTINCT d.id ORDER BY d.id) AS driver_profile_ids
+  FROM blade_loading_manage w
+  JOIN blade_transport_driver d
+    ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
+   AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
+   AND d.is_deleted = 0
+ WHERE w.driver_id IS NULL
+   AND (w.driver_id = -1) IS NOT TRUE
+   AND w.driver_phone IS NOT NULL
+   AND TRIM(w.driver_phone) <> ''
+   AND w.driver_phone NOT LIKE '%*%'
+ GROUP BY w.driver_phone
+HAVING COUNT(DISTINCT d.id) > 1;
+
+-- 2.6 无法匹配清单：号码在本租户内命中 0 条档案，这些行按规则跳过（等人工处置，脚本不猜）
+SELECT w.driver_phone AS unmatched_phone,
+       COUNT(*) AS pending_rows
+  FROM blade_loading_manage w
+ WHERE w.driver_id IS NULL
+   AND (w.driver_id = -1) IS NOT TRUE
+   AND w.driver_phone IS NOT NULL
+   AND TRIM(w.driver_phone) <> ''
+   AND w.driver_phone NOT LIKE '%*%'
+   AND NOT EXISTS (
+         SELECT 1
+           FROM blade_transport_driver d
+          WHERE d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
+            AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
+            AND d.is_deleted = 0)
+ GROUP BY w.driver_phone
+ ORDER BY pending_rows DESC, unmatched_phone;
+
+-- 2.7 逐司机对照：按手机号可见单量 vs 按档案 ID 可见单量
+--   by_phone        = 号码快照等于该档案号码的单量（旧口径，改号/二次放号会串）
+--   by_driver_id    = 档案 ID 等于该档案的单量（新口径）
+--   phone_only_null = 号码对上、但归属还空着的单（本次应被回填的那部分）
+--   phone_only_sentinel = 号码对上、但归属被标成 -1 无主的单（回填不碰，需要人工确认）
+--   phone_only_other_owner = 号码对上、却已归属另一条档案的单（改号/换司机后号码被复用）
+--   id_only_phone_differs = 已归属该档案、但号码快照不是该档案当前号码的单（改号后的历史快照）
+SELECT d.id AS driver_id,
+       d.driver_name,
+       d.mobile,
+       (SELECT COUNT(*) FROM blade_loading_manage w WHERE w.driver_id = d.id) AS by_driver_id,
+       (SELECT COUNT(*) FROM blade_loading_manage w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile) AS by_phone,
+       (SELECT COUNT(*) FROM blade_loading_manage w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
+           AND w.driver_id IS NULL) AS phone_only_null,
+       (SELECT COUNT(*) FROM blade_loading_manage w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
+           AND w.driver_id = -1) AS phone_only_sentinel,
+       (SELECT COUNT(*) FROM blade_loading_manage w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
+           AND w.driver_id > 0
+           AND w.driver_id <> d.id) AS phone_only_other_owner,
+       (SELECT COUNT(*) FROM blade_loading_manage w
+         WHERE w.driver_id = d.id
+           AND (w.driver_phone IS NULL
+                OR NOT (w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile))) AS id_only_phone_differs
+  FROM blade_transport_driver d
+ WHERE d.is_deleted = 0
+ ORDER BY by_phone DESC, by_driver_id DESC, driver_id;
+
+-- ------------------------------------------------------------
+-- 3. 回退（仅在需要撤销本次回填时手工执行）
+-- ------------------------------------------------------------
+-- 按存档表把本次写入的行还原成 NULL。只还原「当前值仍等于本次写入值」的行：
+-- 回填之后又被人改派过的单不会被冲掉。
+-- UPDATE blade_loading_manage w
+--   JOIN blade_loading_manage_driver_id_bak_20261028 b ON b.loading_id = w.id
+--    SET w.driver_id = b.driver_id_before
+--  WHERE w.driver_id <=> b.driver_id_after;
+-- 回退只碰 driver_id，不碰 driver_phone / update_time。备份表确认不再需要时再删：
+-- DROP TABLE blade_loading_manage_driver_id_bak_20261028;
diff --git a/doc/sql/transport/blade_measurement_unit.sql b/doc/sql/transport/blade_measurement_unit.sql
index 175be766..6c213b00 100644
--- a/doc/sql/transport/blade_measurement_unit.sql
+++ b/doc/sql/transport/blade_measurement_unit.sql
@@ -30,4 +30,5 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 (2075449300000000002, 2075449300000000001, 'measurement_unit_delete', '删除', 'measurement_unit_delete', '', '', 1, 2, 0, 1, NULL, '', 0),
 (2075449300000000003, 2075449300000000001, 'measurement_unit_edit', '编辑', 'measurement_unit_edit', '', '', 1, 2, 0, 1, NULL, '', 0),
 (2075449300000000004, 2075449300000000001, 'measurement_unit_status', '修改状态', 'measurement_unit_status', '', '', 1, 2, 0, 1, NULL, '', 0),
-(2075449300000000005, 2075449300000000001, 'measurement_unit_add', '新增', 'measurement_unit_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+(2075449300000000005, 2075449300000000001, 'measurement_unit_add', '新增', 'measurement_unit_add', '', '', 1, 2, 0, 1, NULL, '', 0),
+(2075449300000000006, 2075449300000000001, 'measurement_unit_view', '查看', 'measurement_unit_view', '', '', 1, 2, 0, 1, NULL, '', 0);
diff --git a/doc/sql/transport/blade_tms_business.sql b/doc/sql/transport/blade_tms_business.sql
index a91fa295..4dbf5c84 100644
--- a/doc/sql/transport/blade_tms_business.sql
+++ b/doc/sql/transport/blade_tms_business.sql
@@ -300,7 +300,8 @@ CREATE TABLE `blade_waybill` (
   KEY `idx_waybill_dept` (`dept_id`) USING BTREE,
   KEY `idx_waybill_plan_id` (`plan_id`) USING BTREE,
   KEY `idx_waybill_carrier_contract_id` (`carrier_contract_id`) USING BTREE,
-  KEY `idx_waybill_create_time` (`create_time`) USING BTREE
+  KEY `idx_waybill_create_time` (`create_time`) USING BTREE,
+  KEY `idx_waybill_tenant_driver_id` (`tenant_id`,`driver_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='运单管理';
 
 -- ----------------------------
@@ -330,6 +331,7 @@ CREATE TABLE `blade_loading_manage` (
   `trailer_vehicle_no` varchar(100) DEFAULT NULL COMMENT '挂车车牌号',
   `driver_name` varchar(100) DEFAULT NULL COMMENT '司机',
   `driver_phone` varchar(50) DEFAULT NULL COMMENT '联系电话',
+  `driver_id` bigint(20) DEFAULT NULL COMMENT '司机ID',
   `escort_name` varchar(100) DEFAULT NULL COMMENT '押运人',
   `escort_phone` varchar(50) DEFAULT NULL COMMENT '押运人手机号',
   `carrier_type` varchar(50) DEFAULT NULL COMMENT '承运类型',
@@ -359,7 +361,8 @@ CREATE TABLE `blade_loading_manage` (
   UNIQUE KEY `uk_loading_manage_no` (`loading_no`) USING BTREE,
   KEY `idx_loading_manage_carrier_contract_id` (`carrier_contract_id`) USING BTREE,
   KEY `idx_loading_manage_dept` (`dept_id`) USING BTREE,
-  KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE
+  KEY `idx_loading_manage_create_time` (`create_time`) USING BTREE,
+  KEY `idx_loading_manage_tenant_driver_id` (`tenant_id`,`driver_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='配载管理';
 
 -- ----------------------------
diff --git a/doc/sql/transport/blade_transport_cert_record_20261002.sql b/doc/sql/transport/blade_transport_cert_record_20261002.sql
index 8e9b8870..4d14057a 100644
--- a/doc/sql/transport/blade_transport_cert_record_20261002.sql
+++ b/doc/sql/transport/blade_transport_cert_record_20261002.sql
@@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS `blade_transport_cert_record` (
   `biz_key` varchar(100) DEFAULT NULL COMMENT '展示键：司机姓名/车牌号',
   `status` int(11) NOT NULL COMMENT '审核状态：0审核中 1已通过 2已驳回 3已作废',
   `snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '该次提交的全量认证内容JSON，一经创建不可修改',
+  `audited_snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '审核通过时确定的修订版内容；NULL=未修订',
   `reject_reason` varchar(200) DEFAULT NULL COMMENT '驳回原因，仅状态为已驳回时有值',
   `submit_time` datetime DEFAULT NULL COMMENT '提交时间',
   `submit_user` bigint(20) DEFAULT NULL COMMENT '提交人',
diff --git a/doc/sql/transport/blade_transport_cert_record_audit_revision_20261028.sql b/doc/sql/transport/blade_transport_cert_record_audit_revision_20261028.sql
new file mode 100644
index 00000000..786742ef
--- /dev/null
+++ b/doc/sql/transport/blade_transport_cert_record_audit_revision_20261028.sql
@@ -0,0 +1,68 @@
+-- ----------------------------
+-- 认证记录：新增修订版快照列 audited_snapshot_json（2026-10-28）
+-- ----------------------------
+-- 背景：审核员可以在审核页面对提交内容做修订（全字段可改，身份字段除外）。
+-- 修订结果必须留痕：snapshot_json 是「司机当时提交了什么」，一经创建逐字节不可改；
+-- 修订版另存一列，「审核通过时到底认定了什么内容」才查得清。
+--
+-- 语义：
+--   NULL        —— 未修订，生效内容即 snapshot_json；
+--   非 NULL     —— 审核通过时认定的修订版全量 JSON，生效内容以它为准。
+-- 只在「通过」时同事务写入；驳回不写（驳回不产生生效内容，留修订版只会让人误读）。
+-- 修订人/修订时间复用 audit_user / audit_time，不新增列。
+--
+-- 只做结构变更，不回填数据：存量记录一律保持 NULL（历史审核确实没有修订动作）。
+--
+-- 不加索引：本列只在审核详情与生效内容读取时按主键取用，从不作为查询条件；
+-- longtext 建索引会超出索引键长度并拖慢写入。
+--
+-- 幂等：先查 information_schema 判列，列已存在（或类型/可空性已符合）即跳过；
+-- 只用 PREPARE 动态语句、不用存储过程，因此不需要 DELIMITER——按分号逐句切分的
+-- 客户端（含数据库驱动）也能直接执行。重复执行零变更。
+
+SET @cert_record_schema = DATABASE();
+
+-- ----------------------------
+-- 0. 表存在性守卫
+-- ----------------------------
+-- 表不存在时故意执行一条只读查询，让客户端报 1146「Table ... doesn't exist」；
+-- 否则下面因查不到列而静默跳过，脚本会假绿。
+SET @cert_record_guard_sql = (
+  SELECT IF(COUNT(*) > 0,
+            'SELECT 1',
+            'SELECT 1 FROM `blade_transport_cert_record` LIMIT 0')
+    FROM information_schema.tables
+   WHERE table_schema = @cert_record_schema
+     AND table_name = 'blade_transport_cert_record'
+);
+PREPARE cert_record_guard_stmt FROM @cert_record_guard_sql;
+EXECUTE cert_record_guard_stmt;
+DEALLOCATE PREPARE cert_record_guard_stmt;
+
+-- ----------------------------
+-- 1. 加列 audited_snapshot_json
+-- ----------------------------
+-- 位置紧接 snapshot_json：两列是同一份内容的前后两态，放一起便于对照。
+-- 条件分三种：列不存在则 ADD；列存在但类型不是 longtext 或可空性不是 YES 则 MODIFY
+-- （防止历史上的手工变更把列建成 varchar 而截断 JSON）；其余情况跳过。
+SET @cert_record_audited_snapshot_sql = (
+  SELECT IF(COUNT(*) = 0,
+            'ALTER TABLE `blade_transport_cert_record` ADD COLUMN `audited_snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''审核通过时确定的修订版内容；NULL=未修订'' AFTER `snapshot_json`',
+            IF(SUM(data_type <> 'longtext' OR is_nullable <> 'YES') > 0,
+               'ALTER TABLE `blade_transport_cert_record` MODIFY COLUMN `audited_snapshot_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''审核通过时确定的修订版内容；NULL=未修订''',
+               'SELECT 1'))
+    FROM information_schema.columns
+   WHERE table_schema = @cert_record_schema
+     AND table_name = 'blade_transport_cert_record'
+     AND column_name = 'audited_snapshot_json'
+);
+PREPARE cert_record_audited_snapshot_stmt FROM @cert_record_audited_snapshot_sql;
+EXECUTE cert_record_audited_snapshot_stmt;
+DEALLOCATE PREPARE cert_record_audited_snapshot_stmt;
+
+-- ----------------------------
+-- 2. 回滚
+-- ----------------------------
+-- 只新增了一列、未进任何索引，回滚即删该列；
+-- snapshot_json 的 updateStrategy=NEVER 与生成列 pending_biz_id、唯一键 uk_cert_record_pending 均不受影响：
+--   ALTER TABLE `blade_transport_cert_record` DROP COLUMN `audited_snapshot_json`;
diff --git a/doc/sql/transport/blade_vehicle_maintenance_record.sql b/doc/sql/transport/blade_vehicle_maintenance_record.sql
index db77ce8d..63148ebd 100644
--- a/doc/sql/transport/blade_vehicle_maintenance_record.sql
+++ b/doc/sql/transport/blade_vehicle_maintenance_record.sql
@@ -7,6 +7,7 @@ CREATE TABLE `blade_vehicle_maintenance_record`  (
   `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
   `vehicle_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '车船类型',
   `vehicle_no` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '车牌号/船号',
+  `exception_id` bigint NULL DEFAULT NULL COMMENT '关联异常处置ID（小程序录入时写入）',
   `maintainer` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '维修人',
   `maintenance_time` datetime NOT NULL COMMENT '维修时间',
   `location` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '维修位置',
@@ -29,5 +30,6 @@ CREATE TABLE `blade_vehicle_maintenance_record`  (
   `is_deleted` int NULL DEFAULT 0 COMMENT '是否已删除',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_vehicle_maintenance_record_no`(`vehicle_no`) USING BTREE,
-  INDEX `idx_vehicle_maintenance_record_time`(`maintenance_time`) USING BTREE
+  INDEX `idx_vehicle_maintenance_record_time`(`maintenance_time`) USING BTREE,
+  UNIQUE INDEX `uk_vehicle_maintenance_record_exception`(`exception_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '车辆维修记录';
diff --git a/doc/sql/transport/blade_vehicle_maintenance_record_exception_20261029.sql b/doc/sql/transport/blade_vehicle_maintenance_record_exception_20261029.sql
new file mode 100644
index 00000000..7e40a217
--- /dev/null
+++ b/doc/sql/transport/blade_vehicle_maintenance_record_exception_20261029.sql
@@ -0,0 +1,35 @@
+-- 维修记录关联异常处置
+-- 日期：2026-10-29
+-- 小程序调度端在「车辆故障维修」类异常下录入维修记录，记录通过 exception_id 关联该条异常。
+-- 一条异常至多一条维修记录，故建唯一索引；唯一索引允许多个 NULL，PC 手工录入/导入的记录不受影响。
+
+DELIMITER $$
+
+DROP PROCEDURE IF EXISTS `upgrade_blade_vehicle_maintenance_record_exception_20261029`$$
+CREATE PROCEDURE `upgrade_blade_vehicle_maintenance_record_exception_20261029`()
+BEGIN
+  DECLARE db_name varchar(128);
+  SET db_name = DATABASE();
+
+  IF NOT EXISTS (SELECT 1 FROM information_schema.columns
+                 WHERE table_schema = db_name
+                   AND table_name = 'blade_vehicle_maintenance_record'
+                   AND column_name = 'exception_id') THEN
+    ALTER TABLE `blade_vehicle_maintenance_record`
+      ADD COLUMN `exception_id` bigint NULL DEFAULT NULL COMMENT '关联异常处置ID（小程序录入时写入）'
+      AFTER `vehicle_no`;
+  END IF;
+
+  IF NOT EXISTS (SELECT 1 FROM information_schema.statistics
+                 WHERE table_schema = db_name
+                   AND table_name = 'blade_vehicle_maintenance_record'
+                   AND index_name = 'uk_vehicle_maintenance_record_exception') THEN
+    ALTER TABLE `blade_vehicle_maintenance_record`
+      ADD UNIQUE INDEX `uk_vehicle_maintenance_record_exception`(`exception_id`) USING BTREE;
+  END IF;
+END$$
+
+CALL `upgrade_blade_vehicle_maintenance_record_exception_20261029`()$$
+DROP PROCEDURE `upgrade_blade_vehicle_maintenance_record_exception_20261029`$$
+
+DELIMITER ;
diff --git a/doc/sql/transport/blade_waybill_driver_id_backfill_20261028.sql b/doc/sql/transport/blade_waybill_driver_id_backfill_20261028.sql
new file mode 100644
index 00000000..22417a64
--- /dev/null
+++ b/doc/sql/transport/blade_waybill_driver_id_backfill_20261028.sql
@@ -0,0 +1,242 @@
+-- ============================================================
+-- blade_waybill_driver_id_backfill_20261028.sql
+-- ============================================================
+-- 存量运单补司机档案 ID：把「归属」从手机号快照切到 blade_transport_driver.id
+-- 写业务数据。第 0 节建存档表，第 1 节分批回填，第 2 节校验（只读，执行后必看），第 3 节回退。可重复执行。
+--
+-- 为什么要订正：
+--   票 01 之后运单的归属键是 driver_id（blade_transport_driver.id），driver_phone 只是派单时的号码快照。
+--   存量运单大多只有号码、没有 driver_id，司机端按档案 ID 查单会整批漏掉它们；
+--   按号码反查又会踩二次放号与改号（本机库实测：黄宇富档案已改号 15577122721，
+--   名下 92 张单仍写着旧号 17587421208，其中 20 张 driver_id 为空、5 张能从接单司机推出来，
+--   剩下 15 张号码已经对不上任何档案——本脚本不猜，它们会出现在第 2.6 节清单里）。
+--   本脚本只处理「号码在本租户内唯一命中一条未删除档案」的运单，其余留在原样、进清单等人工处置。
+--
+-- 判定与边界（严格按票面口径，不扩大）：
+--   ① 只动 driver_id IS NULL 的行。driver_id = -1 是「无主」哨兵，正数表示已有归属，两者一行都不动；
+--      第 1 节的 WHERE 里另加了一道显式排除（(driver_id = -1) IS NOT TRUE），
+--      防止后人把条件放宽成 driver_id <= 0 时把哨兵一起覆盖。
+--   ② 唯一命中：同租户内、is_deleted = 0、mobile 与 driver_phone 相等的档案恰好 1 条。
+--      命中 0 条 → 进「无法匹配」清单；命中 ≥2 条 → 进「冲突」清单。两类都跳过，不猜。
+--      逻辑删除的档案不参与命中：档案删了以后重跑脚本，不能把这些单挂到废弃档案上。
+--   ③ 手机号为空、空白、含 * 的跳过（* 是脱敏占位，不是真号码）。
+--   ④ driver_phone、update_time 与其它任何列都不改，只写 driver_id。
+--   ⑤ 逻辑删除的运单同样回填：票面口径只有 driver_id IS NULL，不额外收窄范围；
+--      这些单不会回到列表，回填对它们无副作用。
+--   ⑥ 跨表比较显式 COLLATE：blade_waybill.driver_phone / tenant_id 是 utf8mb4_0900_ai_ci，
+--      blade_transport_driver.mobile / tenant_id 与存档表都是 utf8mb4_general_ci；
+--      不显式 COLLATE 会抛 ERROR 1267 Illegal mix of collations，只有真跑库才会暴露。
+--      第 2.4 节拿存档表比 driver_phone 同样要带 COLLATE utf8mb4_0900_ai_ci。
+--   ⑦ 取数与写入全在 SQL 内完成，不经 JSON / 客户端中转：19 位雪花 ID 过 JSON 会丢精度。
+--   ⑧ 分批执行（默认每批 500 行），每批独立提交，中断后重跑从剩余 NULL 行继续。
+--
+-- 范围说明：本脚本只做「手机号 → 档案唯一命中」这一条规则。
+--   不引入 driver_accept_driver_id 推断，也不按姓名/历史号码猜归属：这些属于人工处置，在票面范围外。
+-- 幂等：命中映射先落存档表；重复执行时映射新增 0 行、回填更新 0 行，结果不变（第 2.2 节校验）。
+-- 执行方式（脚本里有 DELIMITER 与存储过程，按分号切句的 GUI 客户端会切错）：
+--   mysql -h127.0.0.1 -uroot -p transport < blade_waybill_driver_id_backfill_20261028.sql
+
+-- ------------------------------------------------------------
+-- 0. 存档（必须在订正之前执行；重复执行不会覆盖已有存档）
+-- ------------------------------------------------------------
+-- 存档表同时是第 1 节的「命中映射」：一行 = 一个待回填的运单 + 它唯一命中的档案 ID。
+-- 回填前先把映射定下来：回填只按映射写，跑之前就能看出「打算填谁」，回退也按它还原。
+CREATE TABLE IF NOT EXISTS blade_waybill_driver_id_bak_20261028 (
+  waybill_id bigint NOT NULL COMMENT '运单ID',
+  driver_id_before bigint DEFAULT NULL COMMENT '回填前的司机ID（本脚本只处理 NULL）',
+  driver_id_after bigint DEFAULT NULL COMMENT '回填写入的司机档案ID（blade_transport_driver.id）',
+  driver_phone varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '回填前的手机号快照，用来证明没有被改写',
+  update_time_before datetime DEFAULT NULL COMMENT '回填前的更新时间，用来证明没有被改写',
+  PRIMARY KEY (waybill_id),
+  KEY idx_driver_id_after (driver_id_after)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='20261028 运单司机档案ID回填存档';
+
+-- 命中映射：只收「号码唯一命中一条未删除档案」的 NULL 行。
+-- INSERT IGNORE + WHERE driver_id IS NULL：第二次执行不会重复建映射，已经填过的行不会再进映射。
+INSERT IGNORE INTO blade_waybill_driver_id_bak_20261028 (waybill_id, driver_id_before, driver_id_after, driver_phone, update_time_before)
+SELECT matched.biz_id, NULL, matched.driver_id, matched.driver_phone, matched.update_time
+  FROM (
+        SELECT w.id AS biz_id,
+               MIN(d.id) AS driver_id,
+               w.driver_phone AS driver_phone,
+               w.update_time AS update_time
+          FROM blade_waybill w
+          JOIN blade_transport_driver d
+            ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
+           AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
+           AND d.is_deleted = 0
+         WHERE w.driver_id IS NULL
+           AND (w.driver_id = -1) IS NOT TRUE
+           AND w.driver_phone IS NOT NULL
+           AND TRIM(w.driver_phone) <> ''
+           AND w.driver_phone NOT LIKE '%*%'
+         GROUP BY w.id, w.driver_phone, w.update_time
+        HAVING COUNT(*) = 1
+       ) matched;
+
+-- ------------------------------------------------------------
+-- 1. 订正（分批回填，默认每批 500 行）
+-- ------------------------------------------------------------
+-- 循环退出条件是「这一批没有更新任何行」，所以重复执行时第一批就是 0 行，脚本空转结束。
+-- 每批单独提交（不开长事务）：大表上不会长时间持锁，中断后重跑从剩余 NULL 行继续。
+DELIMITER $$
+DROP PROCEDURE IF EXISTS backfill_blade_waybill_driver_id_20261028$$
+CREATE PROCEDURE backfill_blade_waybill_driver_id_20261028(IN p_batch_size INT)
+BEGIN
+  DECLARE v_batch_size INT DEFAULT 500;
+  DECLARE v_affected INT DEFAULT 0;
+
+  IF p_batch_size IS NOT NULL AND p_batch_size > 0 THEN
+    SET v_batch_size = p_batch_size;
+  END IF;
+
+  CREATE TEMPORARY TABLE IF NOT EXISTS tmp_waybill_driver_id_20261028 (
+    waybill_id bigint NOT NULL,
+    PRIMARY KEY (waybill_id)
+  ) ENGINE = InnoDB;
+
+  REPEAT
+    -- 取批：只取还空着的行，填过的行不再入批，所以每一批都在推进，不会原地打转
+    DELETE FROM tmp_waybill_driver_id_20261028;
+
+    INSERT INTO tmp_waybill_driver_id_20261028 (waybill_id)
+    SELECT b.waybill_id
+      FROM blade_waybill_driver_id_bak_20261028 b
+      JOIN blade_waybill w ON w.id = b.waybill_id
+     WHERE w.driver_id IS NULL
+     ORDER BY b.waybill_id
+     LIMIT v_batch_size;
+
+    UPDATE blade_waybill w
+      JOIN blade_waybill_driver_id_bak_20261028 b ON b.waybill_id = w.id
+      JOIN tmp_waybill_driver_id_20261028 t ON t.waybill_id = w.id
+       SET w.driver_id = b.driver_id_after
+     WHERE w.driver_id IS NULL
+       AND (w.driver_id = -1) IS NOT TRUE
+       AND b.driver_id_after IS NOT NULL;
+
+    SET v_affected = ROW_COUNT();
+  UNTIL v_affected = 0 END REPEAT;
+
+  DROP TEMPORARY TABLE IF EXISTS tmp_waybill_driver_id_20261028;
+END$$
+DELIMITER ;
+
+CALL backfill_blade_waybill_driver_id_20261028(500);
+DROP PROCEDURE IF EXISTS backfill_blade_waybill_driver_id_20261028;
+
+-- ------------------------------------------------------------
+-- 2. 校验（执行后必看；本节只有 SELECT，不动数据）
+-- ------------------------------------------------------------
+-- 2.1 规模：存档多少行、还剩多少 NULL 行、正数归属多少行（跑前跑后各查一次）
+--   remaining_null_rows 只会减少「本次命中」的那部分；差额应当等于第 2.7 节的命中行数。
+SELECT COUNT(*) AS archived_rows FROM blade_waybill_driver_id_bak_20261028;
+SELECT COUNT(*) AS remaining_null_rows FROM blade_waybill WHERE driver_id IS NULL;
+SELECT SUM(driver_id > 0) AS owned_rows,
+       SUM(driver_id = -1) AS sentinel_rows,
+       SUM(driver_id IS NULL) AS null_rows
+  FROM blade_waybill;
+
+-- 2.2 哨兵不变：跑前跑后各执行一次，四列必须完全相同（-1 一行都不能动）
+SELECT COUNT(*) AS sentinel_rows,
+       SUM(id) AS sentinel_id_sum,
+       MIN(id) AS min_id,
+       MAX(id) AS max_id
+  FROM blade_waybill
+ WHERE driver_id = -1;
+
+-- 2.3 写入正确：本次映射的行，driver_id 必须等于映射值（期望 0 行）
+SELECT COUNT(*) AS wrong_driver_id
+  FROM blade_waybill_driver_id_bak_20261028 b
+  JOIN blade_waybill w ON w.id = b.waybill_id
+ WHERE NOT (w.driver_id <=> b.driver_id_after);
+
+-- 2.4 快照没有被改写：本次映射的行，driver_phone 与 update_time 必须与存档逐行一致（期望 0 行）
+SELECT COUNT(*) AS snapshot_rewritten
+  FROM blade_waybill_driver_id_bak_20261028 b
+  JOIN blade_waybill w ON w.id = b.waybill_id
+ WHERE NOT (w.driver_phone <=> b.driver_phone COLLATE utf8mb4_0900_ai_ci)
+    OR NOT (w.update_time <=> b.update_time_before);
+
+-- 2.5 冲突清单：同号多档案，这些行被跳过（期望 0 行；有输出就是「为什么没填」的答案）
+SELECT w.driver_phone AS conflicting_phone,
+       COUNT(DISTINCT w.id) AS pending_rows,
+       COUNT(DISTINCT d.id) AS driver_profiles,
+       GROUP_CONCAT(DISTINCT d.id ORDER BY d.id) AS driver_profile_ids
+  FROM blade_waybill w
+  JOIN blade_transport_driver d
+    ON d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
+   AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
+   AND d.is_deleted = 0
+ WHERE w.driver_id IS NULL
+   AND (w.driver_id = -1) IS NOT TRUE
+   AND w.driver_phone IS NOT NULL
+   AND TRIM(w.driver_phone) <> ''
+   AND w.driver_phone NOT LIKE '%*%'
+ GROUP BY w.driver_phone
+HAVING COUNT(DISTINCT d.id) > 1;
+
+-- 2.6 无法匹配清单：号码在本租户内命中 0 条档案，这些行按规则跳过（等人工处置，脚本不猜）
+SELECT w.driver_phone AS unmatched_phone,
+       COUNT(*) AS pending_rows
+  FROM blade_waybill w
+ WHERE w.driver_id IS NULL
+   AND (w.driver_id = -1) IS NOT TRUE
+   AND w.driver_phone IS NOT NULL
+   AND TRIM(w.driver_phone) <> ''
+   AND w.driver_phone NOT LIKE '%*%'
+   AND NOT EXISTS (
+         SELECT 1
+           FROM blade_transport_driver d
+          WHERE d.tenant_id COLLATE utf8mb4_0900_ai_ci = w.tenant_id
+            AND d.mobile COLLATE utf8mb4_0900_ai_ci = w.driver_phone
+            AND d.is_deleted = 0)
+ GROUP BY w.driver_phone
+ ORDER BY pending_rows DESC, unmatched_phone;
+
+-- 2.7 逐司机对照：按手机号可见单量 vs 按档案 ID 可见单量
+--   by_phone        = 号码快照等于该档案号码的单量（旧口径，改号/二次放号会串）
+--   by_driver_id    = 档案 ID 等于该档案的单量（新口径）
+--   phone_only_null = 号码对上、但归属还空着的单（本次应被回填的那部分）
+--   phone_only_sentinel = 号码对上、但归属被标成 -1 无主的单（回填不碰，需要人工确认）
+--   phone_only_other_owner = 号码对上、却已归属另一条档案的单（改号/换司机后号码被复用）
+--   id_only_phone_differs = 已归属该档案、但号码快照不是该档案当前号码的单（改号后的历史快照）
+SELECT d.id AS driver_id,
+       d.driver_name,
+       d.mobile,
+       (SELECT COUNT(*) FROM blade_waybill w WHERE w.driver_id = d.id) AS by_driver_id,
+       (SELECT COUNT(*) FROM blade_waybill w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile) AS by_phone,
+       (SELECT COUNT(*) FROM blade_waybill w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
+           AND w.driver_id IS NULL) AS phone_only_null,
+       (SELECT COUNT(*) FROM blade_waybill w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
+           AND w.driver_id = -1) AS phone_only_sentinel,
+       (SELECT COUNT(*) FROM blade_waybill w
+         WHERE w.tenant_id COLLATE utf8mb4_0900_ai_ci = d.tenant_id
+           AND w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile
+           AND w.driver_id > 0
+           AND w.driver_id <> d.id) AS phone_only_other_owner,
+       (SELECT COUNT(*) FROM blade_waybill w
+         WHERE w.driver_id = d.id
+           AND (w.driver_phone IS NULL
+                OR NOT (w.driver_phone COLLATE utf8mb4_0900_ai_ci = d.mobile))) AS id_only_phone_differs
+  FROM blade_transport_driver d
+ WHERE d.is_deleted = 0
+ ORDER BY by_phone DESC, by_driver_id DESC, driver_id;
+
+-- ------------------------------------------------------------
+-- 3. 回退（仅在需要撤销本次回填时手工执行）
+-- ------------------------------------------------------------
+-- 按存档表把本次写入的行还原成 NULL。只还原「当前值仍等于本次写入值」的行：
+-- 回填之后又被人改派过的单不会被冲掉。
+-- UPDATE blade_waybill w
+--   JOIN blade_waybill_driver_id_bak_20261028 b ON b.waybill_id = w.id
+--    SET w.driver_id = b.driver_id_before
+--  WHERE w.driver_id <=> b.driver_id_after;
+-- 回退只碰 driver_id，不碰 driver_phone / update_time。备份表确认不再需要时再删：
+-- DROP TABLE blade_waybill_driver_id_bak_20261028;
diff --git a/doc/sql/transport/lqj/20261028/01_blade_payment_application_kingdee_fail_reason_20261028.sql b/doc/sql/transport/lqj/20261102/01_blade_payment_application_kingdee_fail_reason_20261028.sql
similarity index 100%
rename from doc/sql/transport/lqj/20261028/01_blade_payment_application_kingdee_fail_reason_20261028.sql
rename to doc/sql/transport/lqj/20261102/01_blade_payment_application_kingdee_fail_reason_20261028.sql
diff --git a/doc/sql/transport/lqj/20261027/01_blade_payment_spec_attach_fd_id_20261027.sql b/doc/sql/transport/lqj/20261102/01_blade_payment_spec_attach_fd_id_20261027.sql
similarity index 100%
rename from doc/sql/transport/lqj/20261027/01_blade_payment_spec_attach_fd_id_20261027.sql
rename to doc/sql/transport/lqj/20261102/01_blade_payment_spec_attach_fd_id_20261027.sql
diff --git a/doc/sql/transport/lqj/20261028/01_blade_receipt_claim_hcs_record_20261028.sql b/doc/sql/transport/lqj/20261102/01_blade_receipt_claim_hcs_record_20261028.sql
similarity index 100%
rename from doc/sql/transport/lqj/20261028/01_blade_receipt_claim_hcs_record_20261028.sql
rename to doc/sql/transport/lqj/20261102/01_blade_receipt_claim_hcs_record_20261028.sql
diff --git a/doc/sql/transport/lqj/temp/02_blade_customer_archive_hcs_risk_20261030.sql b/doc/sql/transport/lqj/20261102/02_blade_customer_archive_hcs_risk_20261030.sql
similarity index 100%
rename from doc/sql/transport/lqj/temp/02_blade_customer_archive_hcs_risk_20261030.sql
rename to doc/sql/transport/lqj/20261102/02_blade_customer_archive_hcs_risk_20261030.sql
diff --git a/doc/sql/transport/lqj/20261028/02_blade_kingdee_fail_reason_20261028.sql b/doc/sql/transport/lqj/20261102/02_blade_kingdee_fail_reason_20261028.sql
similarity index 100%
rename from doc/sql/transport/lqj/20261028/02_blade_kingdee_fail_reason_20261028.sql
rename to doc/sql/transport/lqj/20261102/02_blade_kingdee_fail_reason_20261028.sql
diff --git a/doc/sql/transport/lqj/temp/03_blade_customer_risk_dict_20261030.sql b/doc/sql/transport/lqj/20261102/03_blade_customer_risk_dict_20261030.sql
similarity index 100%
rename from doc/sql/transport/lqj/temp/03_blade_customer_risk_dict_20261030.sql
rename to doc/sql/transport/lqj/20261102/03_blade_customer_risk_dict_20261030.sql
diff --git a/doc/sql/transport/lqj/temp/04_blade_contract_black_status_rename_20261030.sql b/doc/sql/transport/lqj/20261102/04_blade_contract_black_status_rename_20261030.sql
similarity index 100%
rename from doc/sql/transport/lqj/temp/04_blade_contract_black_status_rename_20261030.sql
rename to doc/sql/transport/lqj/20261102/04_blade_contract_black_status_rename_20261030.sql
diff --git a/doc/sql/transport/lqj/temp/05_blade_contract_risk_fields_drop_20261030.sql b/doc/sql/transport/lqj/20261102/05_blade_contract_risk_fields_drop_20261030.sql
similarity index 100%
rename from doc/sql/transport/lqj/temp/05_blade_contract_risk_fields_drop_20261030.sql
rename to doc/sql/transport/lqj/20261102/05_blade_contract_risk_fields_drop_20261030.sql
diff --git a/doc/sql/transport/lqj/20261102/06_blade_formal_settlement_kingdee_writeoff_20261030.sql b/doc/sql/transport/lqj/20261102/06_blade_formal_settlement_kingdee_writeoff_20261030.sql
new file mode 100644
index 00000000..a5fc952a
--- /dev/null
+++ b/doc/sql/transport/lqj/20261102/06_blade_formal_settlement_kingdee_writeoff_20261030.sql
@@ -0,0 +1,68 @@
+-- 正式结算单：新增金蝶冲销状态字段
+-- 列名遵循 MyBatis-Plus 驼峰转下划线默认映射（kingdeeWriteOffStatus -> kingdee_write_off_status，kingdeeWriteOffTime -> kingdee_write_off_time）；
+-- 若存在早期脚本误建的旧列名 kingdee_writeoff_status / kingdee_writeoff_time 则先重命名，否则按缺失新增
+-- 结算单列表展示金蝶侧旧应付/应收单冲销状态：定时任务按 A102-4/A302-4 hadwrittenoff 批量回写，
+-- 选单预检/重推闸门实时查询后顺带回写；默认 unwrittenoff-未冲销（金蝶单据在未冲销前即视为未冲销，避免首跑全量初始化回写），writtenoff-已冲销（部分冲销视同已冲销）
+
+-- ==================== kingdee_write_off_status ====================
+-- 旧列名重命名（早期脚本版本，不存在则跳过）
+SET @old_col := (
+  SELECT COUNT(*) FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_formal_settlement'
+    AND COLUMN_NAME = 'kingdee_writeoff_status'
+);
+SET @ddl_sql = IF(@old_col = 1,
+  'ALTER TABLE `blade_formal_settlement` CHANGE COLUMN `kingdee_writeoff_status` `kingdee_write_off_status` varchar(20) COLLATE utf8mb4_general_ci DEFAULT ''unwrittenoff'' COMMENT ''金蝶冲销状态：unwrittenoff-未冲销（默认） writtenoff-已冲销''',
+  'SELECT 1');
+PREPARE ddl_stmt FROM @ddl_sql;
+EXECUTE ddl_stmt;
+DEALLOCATE PREPARE ddl_stmt;
+
+-- 缺失则新增（支持重复执行）
+SET @ddl_sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE `blade_formal_settlement` ADD COLUMN `kingdee_write_off_status` varchar(20) COLLATE utf8mb4_general_ci DEFAULT ''unwrittenoff'' COMMENT ''金蝶冲销状态：unwrittenoff-未冲销（默认） writtenoff-已冲销'' AFTER `kingdee_fail_reason`',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'blade_formal_settlement'
+    AND COLUMN_NAME = 'kingdee_write_off_status'
+);
+PREPARE ddl_stmt FROM @ddl_sql;
+EXECUTE ddl_stmt;
+DEALLOCATE PREPARE ddl_stmt;
+
+-- 存量已同步结算单回填默认未冲销（可重复执行：仅补 NULL 行；未同步单据保持默认值即可，前端按同步状态展示'-'）
+UPDATE `blade_formal_settlement`
+SET `kingdee_write_off_status` = 'unwrittenoff'
+WHERE `kingdee_write_off_status` IS NULL
+  AND `kingdee_sync_status` = 'synced'
+  AND `is_deleted` = 0;
+
+-- ==================== kingdee_write_off_time ====================
+-- 旧列名重命名（早期脚本版本，不存在则跳过）
+SET @old_col := (
+  SELECT COUNT(*) FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'blade_formal_settlement'
+    AND COLUMN_NAME = 'kingdee_writeoff_time'
+);
+SET @ddl_sql = IF(@old_col = 1,
+  'ALTER TABLE `blade_formal_settlement` CHANGE COLUMN `kingdee_writeoff_time` `kingdee_write_off_time` datetime DEFAULT NULL COMMENT ''金蝶冲销状态确认时间（定时回写/预检回写时间）''',
+  'SELECT 1');
+PREPARE ddl_stmt FROM @ddl_sql;
+EXECUTE ddl_stmt;
+DEALLOCATE PREPARE ddl_stmt;
+
+-- 缺失则新增（支持重复执行）
+SET @ddl_sql = (
+  SELECT IF(COUNT(*) = 0,
+    'ALTER TABLE `blade_formal_settlement` ADD COLUMN `kingdee_write_off_time` datetime DEFAULT NULL COMMENT ''金蝶冲销状态确认时间（定时回写/预检回写时间）'' AFTER `kingdee_write_off_status`',
+    'SELECT 1')
+  FROM information_schema.COLUMNS
+  WHERE TABLE_SCHEMA = DATABASE()
+    AND TABLE_NAME = 'blade_formal_settlement'
+    AND COLUMN_NAME = 'kingdee_write_off_time'
+);
+PREPARE ddl_stmt FROM @ddl_sql;
+EXECUTE ddl_stmt;
+DEALLOCATE PREPARE ddl_stmt;
diff --git a/doc/sql/transport/lqj/temp/blade_customer_archive_add_supplier_code_20261030.sql b/doc/sql/transport/lqj/20261102/blade_customer_archive_add_supplier_code_20261030.sql
similarity index 100%
rename from doc/sql/transport/lqj/temp/blade_customer_archive_add_supplier_code_20261030.sql
rename to doc/sql/transport/lqj/20261102/blade_customer_archive_add_supplier_code_20261030.sql
diff --git a/doc/sql/transport/lqj/temp/06_blade_invoice_receipt_supplier_code_menu_20261031.sql b/doc/sql/transport/lqj/temp/06_blade_invoice_receipt_supplier_code_menu_20261031.sql
deleted file mode 100644
index a8279540..00000000
--- a/doc/sql/transport/lqj/temp/06_blade_invoice_receipt_supplier_code_menu_20261031.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- 先票后款改造（收票登记A303-2 + 付款结算单A102-2 + A302-6指定应付）
--- ① blade_invoice_receipt 新增 supplier_code：往来户=发票销售方在金蝶的供应商代码（A901-1），保存时尽力回填、推送前强校验
--- ② 付款结算单（payment_settlement）下新增「发票登记」按钮权限：结算单审批后发票登记关联收票单并推送指定应付
--- 幂等可重复执行：列查 information_schema，菜单 NOT EXISTS 防重
-
--- ① 收票登记表新增 supplier_code 列
-SET @ddl = (
-  SELECT IF(
-    (SELECT COUNT(*) FROM information_schema.COLUMNS
-     WHERE TABLE_SCHEMA = DATABASE()
-       AND TABLE_NAME = 'blade_invoice_receipt'
-       AND COLUMN_NAME = 'supplier_code') = 0,
-    'ALTER TABLE `blade_invoice_receipt` ADD COLUMN `supplier_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT ''往来户金蝶供应商代码（发票销售方，A901-1，保存时尽力回填、推送前强校验）'' AFTER `payee_name`',
-    'SELECT 1'));
-PREPARE stmt FROM @ddl;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
--- ② 付款结算单「发票登记」按钮权限（先票后款路径B：列表发票登记 → 关联收票单 → 推送 A302-6 指定应付）
-INSERT INTO `blade_menu`
-(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`)
-SELECT
-  2090000000000002300,
-  p.id,
-  'payment_settlement_invoice_register',
-  '发票登记',
-  'payment_settlement_invoice_register',
-  '',
-  '',
-  2,
-  2,
-  0,
-  1,
-  NULL,
-  '先票后款：结算单审批后发票登记关联收票单并推送金蝶指定应付',
-  0
-FROM `blade_menu` p
-WHERE p.`code` = 'payment_settlement'
-  AND p.`is_deleted` = 0
-  AND NOT EXISTS (
-    SELECT 1 FROM `blade_menu` x
-    WHERE x.`code` = 'payment_settlement_invoice_register' AND x.`is_deleted` = 0
-  )
-LIMIT 1;
diff --git a/doc/sql/transport/lqj/temp/19_blade_dict_fee_category_warehouse_20261103.sql b/doc/sql/transport/lqj/temp/19_blade_dict_fee_category_warehouse_20261103.sql
deleted file mode 100644
index 7ba40275..00000000
--- a/doc/sql/transport/lqj/temp/19_blade_dict_fee_category_warehouse_20261103.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- 金蝶分录仓储大类（A102-2/A302-2/A103-1 分录拆分按费用项档案分类编码判定仓储大类，无名称关键字兜底）。
--- ① 业务字典 fee_category 新增子项 A05 仓储；② 费用项档案仓储类费用项归入 A05（分类生效前提）。
--- id 由 UUID_SHORT() 动态生成，幂等可重复执行。
-
--- ① 业务字典 fee_category 新增子项：A05 仓储
-INSERT INTO blade_dict_biz (id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark, is_sealed, status, is_deleted)
-SELECT UUID_SHORT(), '000000',
-  (SELECT id FROM blade_dict_biz WHERE code = 'fee_category' AND dict_key = '-1' AND tenant_id = '000000' AND is_deleted = 0 LIMIT 1),
-  'fee_category', 'A05', '仓储', 1, '金蝶分录仓储大类', 0, 1, 0
-WHERE NOT EXISTS (
-  SELECT 1 FROM blade_dict_biz
-  WHERE code = 'fee_category' AND dict_key = 'A05' AND tenant_id = '000000' AND is_deleted = 0
-);
-
-# -- ② 费用项档案：仓储类费用项归入 A05（已执行则更新 0 行，幂等）
-# UPDATE blade_fee_item
-# SET fee_category = 'A05'
-# WHERE is_deleted = 0
-#   AND fee_category <> 'A05'
-#   AND (name LIKE '%仓储%' OR name LIKE '%堆存%' OR name LIKE '%保管%');
diff --git a/doc/sql/transport/transport.sql b/doc/sql/transport/transport.sql
index b8152384..2aa8621f 100644
--- a/doc/sql/transport/transport.sql
+++ b/doc/sql/transport/transport.sql
@@ -836,6 +836,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675230, 1123598815738675205, 'dept_edit', '修改', 'edit', '/system/dept/edit', 'form', 2, 2, 2, 1, '', NULL, 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675231, 1123598815738675205, 'dept_delete', '删除', 'delete', '/api/blade-system/dept/remove', 'delete', 3, 2, 3, 1, '', NULL, 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675232, 1123598815738675205, 'dept_view', '查看', 'view', '/system/dept/view', 'file-text', 4, 2, 2, 1, '', NULL, 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2076110415738675232, 1123598815738675205, 'dept_tree', '树形结构', 'dept_tree', '/api/blade-system/dept/tree', 'file-text', 5, 2, 2, 1, '', '组织树接口独立数据权限配置项；未配置时组织树默认不展示', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675233, 1123598815738675206, 'dict_add', '新增', 'add', '/system/dict/add', 'plus', 1, 2, 1, 1, '', NULL, 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675234, 1123598815738675206, 'dict_edit', '修改', 'edit', '/system/dict/edit', 'form', 2, 2, 2, 1, '', NULL, 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (1123598815738675235, 1123598815738675206, 'dict_delete', '删除', 'delete', '/api/blade-system/dict/remove', 'delete', 3, 2, 3, 1, '', NULL, 0);
@@ -998,7 +999,9 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429169922023425, 2075427962415456258, 'railway_station_edit', '编辑', 'railway_station_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429216734650369, 2075427962415456258, 'railway_station_status', '修改状态', 'railway_station_status', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429274242752513, 2075427962415456258, 'railway_station_add', '新增', 'railway_station_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429280000000001, 2075427962415456258, 'railway_station_view', '查看', 'railway_station_view', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429329544650754, 2075421555200860162, 'port_terminal_add', '新增', 'port_terminal_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075429330000000001, 2075421555200860162, 'port_terminal_view', '查看', 'port_terminal_view', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431169720033282, 1164733399668962201, 'airport_master', '空港机场主数据', 'airport_master', '/base/airport-master', 'iconfont icon-fengche', 30, 1, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431461312241665, 2075431169720033282, 'airport_master_import', '批量导入', 'airport_master_import', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431522544885762, 2075431169720033282, 'airport_master_template', '下载模板', 'airport_master_template', '', '', 1, 2, 0, 1, NULL, '', 0);
@@ -1007,6 +1010,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431710063828994, 2075431169720033282, 'airport_master_edit', '编辑', 'airport_master_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431753298714626, 2075431169720033282, 'airport_master_status', '修改状态', 'airport_master_status', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431820189474818, 2075431169720033282, 'airport_master_add', '新增', 'airport_master_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075431850000000001, 2075431169720033282, 'airport_master_view', '查看', 'airport_master_view', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000001, 1164733399668962201, 'currency', '币种汇率管理', 'currency', '/base/currency', 'iconfont iconicon_exchange', 40, 1, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000002, 2075449000000000001, 'currency_import', '批量导入', 'currency_import', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000003, 2075449000000000001, 'currency_template', '下载模板', 'currency_template', '', '', 1, 2, 0, 1, NULL, '', 0);
@@ -1015,11 +1019,13 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000006, 2075449000000000001, 'currency_edit', '编辑', 'currency_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000007, 2075449000000000001, 'currency_status', '修改状态', 'currency_status', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000008, 2075449000000000001, 'currency_add', '新增', 'currency_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449000000000009, 2075449000000000001, 'currency_view', '查看', 'currency_view', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000001, 1164733399668962201, 'customer_type', '客商类型', 'customer_type', '/base/customer-type', 'iconfont icon-hezuohuobanmiyueguanli', 50, 1, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000002, 2075449100000000001, 'customer_type_delete', '批量删除', 'customer_type_delete', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000003, 2075449100000000001, 'customer_type_edit', '编辑', 'customer_type_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000004, 2075449100000000001, 'customer_type_status', '修改状态', 'customer_type_status', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000005, 2075449100000000001, 'customer_type_add', '新增', 'customer_type_add', '', '', 1, 2, 0, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449100000000006, 2075449100000000001, 'customer_type_view', '查看', 'customer_type_view', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000001, 1164733399668962201, 'fee_item', '费用项', 'fee_item', '/base/fee-item', 'iconfont icon-shoucang', 60, 1, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000002, 2075449200000000001, 'fee_item_delete', '批量删除', 'fee_item_delete', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000003, 2075449200000000001, 'fee_item_edit', '编辑', 'fee_item_edit', '', '', 1, 2, 0, 1, NULL, '', 0);
@@ -1028,6 +1034,7 @@ INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `s
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000006, 2075449200000000001, 'fee_item_import', '批量导入', 'fee_item_import', '/api/blade-system/fee-item/import-fee-item', 'upload', 5, 2, 3, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000007, 2075449200000000001, 'fee_item_template', '下载模板', 'fee_item_template', '/api/blade-system/fee-item/export-template', 'download', 6, 2, 2, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000008, 2075449200000000001, 'fee_item_export', '批量导出', 'fee_item_export', '/api/blade-system/fee-item/export-fee-item', 'download', 7, 2, 2, 1, NULL, '', 0);
+INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075449200000000009, 2075449200000000001, 'fee_item_view', '查看', 'fee_item_view', '', '', 1, 2, 0, 1, NULL, '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075436235826896898, 0, 'blade-transport', '车/船务管理', 'blade-transport', '/vehicle', 'iconfont icon-shebeiguanli', 10, 1, 0, 1, '', '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075437082342301697, 2075436235826896898, 'maintenance_record', '维修记录', 'maintenance_record', '/vehicle/maintenance-record', 'iconfont icon-wxbgongju', 20, 1, 0, 1, '', '', 0);
 INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES (2075437237678350338, 2075436235826896898, 'maintenance_plan', '保养记录', 'maintenance_plan', '/vehicle/maintenance-plan', 'iconfont iconicon_exchange', 30, 1, 0, 1, '', '', 0);
@@ -5620,6 +5627,7 @@ CREATE TABLE `blade_vehicle_maintenance_record` (
   `tenant_id` varchar(12) DEFAULT '000000' COMMENT '租户ID',
   `vehicle_type` varchar(20) NOT NULL COMMENT '车船类型',
   `vehicle_no` varchar(30) NOT NULL COMMENT '车牌号/船号',
+  `exception_id` bigint(20) DEFAULT NULL COMMENT '关联异常处置ID（小程序录入时写入）',
   `maintainer` varchar(20) DEFAULT NULL COMMENT '维修人',
   `maintenance_time` datetime NOT NULL COMMENT '维修时间',
   `location` varchar(100) DEFAULT NULL COMMENT '维修位置',
@@ -5642,7 +5650,8 @@ CREATE TABLE `blade_vehicle_maintenance_record` (
   `is_deleted` int(11) DEFAULT '0' COMMENT '是否已删除',
   PRIMARY KEY (`id`) USING BTREE,
   KEY `idx_vehicle_maintenance_record_no` (`vehicle_no`) USING BTREE,
-  KEY `idx_vehicle_maintenance_record_time` (`maintenance_time`) USING BTREE
+  KEY `idx_vehicle_maintenance_record_time` (`maintenance_time`) USING BTREE,
+  UNIQUE KEY `uk_vehicle_maintenance_record_exception` (`exception_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='车辆维修记录';
 
 -- ----------------------------