feat: 付款申请纳入金蝶单据锁定与解锁流程（推送后锁单-删单回调还原-作废守卫-锁状态展示）

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

@@ -46,6 +46,9 @@ public class PaymentApplicationVO extends PaymentApplication {
 	@TableField(exist = false) private Integer attachmentCount;
 	@TableField(exist = false) private String attachmentSyncStatus;
 	@TableField(exist = false) private String attachmentSyncStatusName;
+	@TableField(exist = false) private String kingdeeLockStatus;
+	@TableField(exist = false) private String kingdeeLockFailReason;
+	@TableField(exist = false) private Integer kingdeeTryCount;
 	@TableField(exist = false) private List<PaymentApplicationInvoice> invoices;
 	@TableField(exist = false) private List<PaymentApplicationRecord> paymentRecords;
 	@TableField(exist = false) private List<PaymentApplicationSettlement> settlements;

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

@@ -24,12 +24,15 @@ import org.springblade.transport.constant.TransportBusiConstant;
 import org.springblade.transport.mapper.FormalSettlementMapper;
 import org.springblade.transport.mapper.InvoiceApplicationMapper;
 import org.springblade.transport.mapper.KingdeeBillLockMapper;
+import org.springblade.transport.mapper.PaymentApplicationMapper;
 import org.springblade.transport.pojo.entity.FormalSettlement;
 import org.springblade.transport.pojo.entity.InvoiceApplication;
 import org.springblade.transport.pojo.entity.KingdeeBillLock;
+import org.springblade.transport.pojo.entity.PaymentApplication;
 import org.springblade.transport.service.IFormalSettlementService;
 import org.springblade.transport.service.IInvoiceApplicationService;
 import org.springblade.transport.service.IKingdeeBillLockService;
+import org.springblade.transport.service.IPaymentApplicationService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -66,6 +69,7 @@ public class KingdeeBillLockServiceImpl extends ServiceImpl<KingdeeBillLockMappe
 	private final BfiProperties bfiProperties;
 	private final FormalSettlementMapper formalSettlementMapper;
 	private final InvoiceApplicationMapper invoiceApplicationMapper;
+	private final PaymentApplicationMapper paymentApplicationMapper;
 
 	@Override
 	public String lockAfterPush(String sourceBillType, Long sourceBillId, String sourceBillNo, String targetBillType, List<String> targetBillNos) {
@@ -210,6 +214,20 @@ public class KingdeeBillLockServiceImpl extends ServiceImpl<KingdeeBillLockMappe
 				}
 				SpringUtil.getBean(IInvoiceApplicationService.class).voidByKingdee(application.getId(), operator);
 			}
+			case KingdeeLockConstant.SOURCE_PAY_APPLY -> {
+				PaymentApplication application = paymentApplicationMapper.selectById(lockRecord.getSourceBillId());
+				if (application == null || Objects.equals(application.getIsDeleted(), 1)) {
+					log.warn("金蝶删单回调源付款申请不存在：id={}", lockRecord.getSourceBillId());
+					return;
+				}
+				if (TransportBusiConstant.VOIDED.equals(application.getApprovalStatus())) {
+					log.info("金蝶删单回调源付款申请[{}]已作废（幂等跳过）", application.getPaymentNo());
+					return;
+				}
+				// 复用 ADR-0005 解锁口径：不作废源单，kingdeeStatus→生成失败、清编号内码（原值留档），
+				// 不自动重推，人工核实后重新推送（A103-2 勾稽预检防重复推单）
+				SpringUtil.getBean(IPaymentApplicationService.class).unlockBill(application.getId(), "金蝶删单回调");
+			}
 			default -> log.warn("金蝶删单回调暂不支持的单据类型：targetBillType={}（映射预留）", lockRecord.getTargetBillType());
 		}
 	}

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.KingdeeBfiConstant;
+import org.springblade.transport.constant.KingdeeLockConstant;
 import org.springblade.transport.constant.TransportBusiConstant;
 import org.springblade.transport.mapper.BillLedgerMapper;
 import org.springblade.transport.mapper.BillLedgerUsageMapper;
@@ -82,6 +83,7 @@ import org.springblade.transport.pojo.entity.FormalSettlement;
 import org.springblade.transport.pojo.entity.FormalSettlementDetail;
 import org.springblade.transport.pojo.entity.FormalSettlementPayment;
 import org.springblade.transport.pojo.entity.FormalSettlementSource;
+import org.springblade.transport.pojo.entity.KingdeeBillLock;
 import org.springblade.transport.pojo.entity.PaymentApplication;
 import org.springblade.transport.pojo.entity.PaymentApplicationInvoice;
 import org.springblade.transport.pojo.entity.PaymentApplicationRecord;
@@ -93,6 +95,7 @@ import org.springblade.transport.pojo.entity.TemporaryCreditLimit;
 import org.springblade.transport.pojo.vo.PaymentApplicationReferenceAmountVO;
 import org.springblade.transport.pojo.vo.PaymentApplicationVO;
 import org.springblade.transport.service.IFormalSettlementService;
+import org.springblade.transport.service.IKingdeeBillLockService;
 import org.springblade.transport.service.IPaymentApplicationService;
 import org.springblade.transport.service.KingdeeSyncContext;
 import org.springblade.transport.support.KingdeeApBillSyncSupport;
@@ -155,6 +158,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	private final BillLedgerUsageMapper billLedgerUsageMapper;
 	private final TemporaryCreditLimitMapper temporaryCreditLimitMapper;
 	private final IFormalSettlementService formalSettlementService;
+	private final IKingdeeBillLockService kingdeeBillLockService;
 	private final IBfiService bfiService;
 	private final KingdeeApBillSyncSupport kingdeeApBillSyncSupport;
 	private final KingdeeAttachmentSyncSupport kingdeeAttachmentSyncSupport;
@@ -193,6 +197,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			return vo;
 		});
 		fillAttachmentSyncStatus(KingdeeAttachmentConstant.BIZ_PAY_APPLICATION, voPage.getRecords());
+		fillKingdeeLockStatus(voPage.getRecords());
 		return voPage;
 	}
 
@@ -218,10 +223,35 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		}
 	}
 
+	/**
+	 * 填充金蝶锁状态标识（locked-锁定中/failed-锁定失败；unlocked 终态不返回）：
+	 * 锁表按本页源单一次批量查询，避免 N+1；locked 时前端可禁用编辑/作废，
+	 * failed 时展示失败原因（tryCount 达上限 5 提示重推同步金蝶）
+	 *
+	 * @param rows 本页 VO 列表
+	 */
+	private void fillKingdeeLockStatus(List<PaymentApplicationVO> rows) {
+		if (Func.isEmpty(rows)) {
+			return;
+		}
+		Map<Long, KingdeeBillLock> lockMap = kingdeeBillLockService.mapActiveLocks(KingdeeLockConstant.SOURCE_PAY_APPLY,
+			rows.stream().map(PaymentApplicationVO::getId).toList());
+		for (PaymentApplicationVO vo : rows) {
+			KingdeeBillLock lockRecord = lockMap.get(vo.getId());
+			if (lockRecord == null) {
+				continue;
+			}
+			vo.setKingdeeLockStatus(lockRecord.getLockStatus());
+			vo.setKingdeeLockFailReason(lockRecord.getFailReason());
+			vo.setKingdeeTryCount(lockRecord.getTryCount());
+		}
+	}
+
 	@Override
 	public PaymentApplicationVO detail(Long id) {
 		PaymentApplication entity = existing(id);
 		PaymentApplicationVO vo = PaymentApplicationWrapper.build().entityVO(entity);
+		fillKingdeeLockStatus(List.of(vo));
 		vo.setInvoices(invoiceMapper.selectList(Wrappers.<PaymentApplicationInvoice>lambdaQuery()
 			.eq(PaymentApplicationInvoice::getPaymentApplicationId, id).orderByAsc(PaymentApplicationInvoice::getLineNo)));
 		vo.setPaymentRecords(recordMapper.selectList(Wrappers.<org.springblade.transport.pojo.entity.PaymentApplicationRecord>lambdaQuery()
@@ -386,6 +416,8 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	public void voidBill(PaymentApplicationStatusRequest request) {
 		PaymentApplication entity = lockedPayment(request.getId());
 		if (!TransportBusiConstant.APPROVED.equals(entity.getApprovalStatus())) throw new ServiceException("仅审批通过的付款申请允许作废");
+		// 金蝶锁定中禁止作废（lockBusiData 已锁单，金蝶侧未解锁前单据不可改动）
+		kingdeeBillLockService.checkEditable(KingdeeLockConstant.SOURCE_PAY_APPLY, request.getId());
 		if (isBillPayment(entity.getPaymentMethod())) releaseBillBalance(entity);
 		entity.setApprovalStatus(TransportBusiConstant.VOIDED);
 		entity.setCurrentNode("已作废");
@@ -427,9 +459,34 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			self().markKingdeeSyncFailed(id);
 			throw new ServiceException("推送金蝶付款申请失败：" + exception.getMessage());
 		}
+		// 主单事务提交后锁定金蝶付款申请单（lockBusiData）：一张付款申请对一张金蝶付款申请单，接口1对1；
+		// 失败只留 failed 锁记录由补偿任务重锁，不污染主单同步状态；锁定失败摘要拼入返回值，页面直接可见
+		String lockFailSummary = lockKingdeeBillAfterPush(id);
 		// 主单事务提交后联带上传附件（A902）：失败只记附件同步状态，不回滚不污染主单同步状态，重推自动补传
 		syncAttachmentsAfterPush(id);
-		return kingdeeBillId;
+		return Func.isBlank(lockFailSummary) ? kingdeeBillId
+			: kingdeeBillId + "；注意：金蝶单据锁定未成功（" + lockFailSummary + "），系统将自动补偿重锁，重推同步金蝶可立即补锁";
+	}
+
+	/**
+	 * 金蝶付款申请单锁定（lockBusiData）：A103-1/A103-3 推送成功事务提交后调用，
+	 * 一张付款申请对一张金蝶付款申请单；锁定异常独立捕获，不影响主单同步结果
+	 *
+	 * @param id 付款申请id
+	 * @return 锁定失败的金蝶单号摘要，全部锁定成功返回 null
+	 */
+	private String lockKingdeeBillAfterPush(Long id) {
+		try {
+			PaymentApplication entity = getById(id);
+			if (entity == null || Func.isBlank(entity.getKingdeeBillNo())) {
+				return null;
+			}
+			return kingdeeBillLockService.lockAfterPush(KingdeeLockConstant.SOURCE_PAY_APPLY, id, entity.getPaymentNo(),
+				KingdeeLockConstant.TARGET_PAY_APPLY, Func.toStrList(entity.getKingdeeBillNo()));
+		} catch (Exception exception) {
+			log.error("付款申请[{}]金蝶单据锁定联带动作异常（锁记录已落库待补偿）", id, exception);
+			return "锁定动作异常，已留档待补偿";
+		}
 	}
 
 	/**

doc/docs/业务流程/2026-10-09-金蝶单据锁定与解锁业务流程（lockBusiData锁定-unLockNotifyBusiData回调-失败补偿-删单还原）.md

@@ -1,7 +1,7 @@
 # 金蝶单据锁定与解锁业务流程（lockBusiData 锁定 - unLockNotifyBusiData 回调 - 失败补偿 - 删单还原）
 
-- 日期：2026-10-09（2026-10-10 变更：lockBusiData 确认为 1对1 接口，不支持逗号拼接批量，锁定/补偿改为逐张调用）
-- 范围：正式结算单（应付 A102-2 / 应收 A302-2）、开票申请单（A303-1）推送金蝶成功后的单据锁定、金蝶解锁/删单回调、锁定失败定时补偿
+- 日期：2026-10-09（2026-10-10 变更：① lockBusiData 确认为 1对1 接口，不支持逗号拼接批量，锁定/补偿改为逐张调用；② 付款申请单纳入锁单范围并完成接线）
+- 范围：正式结算单（应付 A102-2 / 应收 A302-2）、开票申请单（A303-1）、付款申请单（A103-1 应付下推 / A103-3 直接保存，2026-10-10 新纳入）推送金蝶成功后的单据锁定、金蝶解锁/删单回调、锁定失败定时补偿
 - 设计文档：`docs/superpowers/specs/2026-10-09-kingdee-bill-lock-unlock-design.md`
 - 锁记录表：`blade_kingdee_bill_lock`（一行 = 一张金蝶目标单）
 
@@ -12,10 +12,13 @@
 | 正式结算单（应付） | A102-2 财务应付单保存 | 结算单页面「同步金蝶」 | ApFin_other_BT_S | 推送成功后 |
 | 正式结算单（应收） | A302-2 财务应收单保存 | 同上 | arfin_other_BT_S | 推送成功后 |
 | 开票申请单 | A303-1 开票申请新增 | 开票申请页面「同步金蝶」 | cdm_paybill_bank_elect_BT_S（每张发票张次一张） | 推送成功后 |
+| 付款申请单 | A103-1 应付下推（正式结算付款）/ A103-3 直接保存（预付款） | 付款申请页面「同步金蝶」（单笔/批量） | ap_payapply_oth_BT_S（每张付款申请一张） | 推送成功后 |
 
 - lockBusiData：WLTMS 调金蝶，源系统 WLTMS、目标系统 XH、lockAction=LOCK
 - unLockNotifyBusiData：金蝶调 WLTMS，源系统 XH、目标系统 WLTMS、lockAction=UNLOCK
 - 传参约定：接口 1对1，单次仅一个源单号（sourceBillNo）对一个金蝶单号（targetBillNo）；多张金蝶单（开票申请一张主单对 N 张金蝶单）逐张调用，单张成败互不影响，成败结果批量落库
+- 付款申请天然 1对1：一张付款申请对应一张金蝶付款申请单（A103-1/A103-3 均同类型），源单号=付款申请号 paymentNo
+- WLTMS 单据类型常量已预留：`KingdeeLockConstant.SOURCE_PAY_APPLY`（PAY_APPLY）/`TARGET_PAY_APPLY`（ap_payapply_oth_BT_S），且已在 `TARGET_TO_SOURCE_MAP` 反查映射中
 - 出入参同构，应答为 `{updateCount, updateResultList}` 裸结构（逐单 1-成功/0-失败）
 
 ## 二、主线流程
@@ -24,7 +27,7 @@
 
 ```
 用户点「同步金蝶」
- ├─ doSyncKingdee（单据级事务）：幂等预检 → A102-2/A302-2/A303-1 保存 → 回写 kingdeeBillNo/同步状态=synced
+  ├─ doSyncKingdee（单据级事务）：幂等预检 → A102-2/A302-2/A303-1/A103-1/A103-3 保存 → 回写 kingdeeBillNo/同步状态=synced
  │   └─ 事务提交
  ├─ 锁定（lockAfterPush）：
  │   ├─ 每张金蝶目标单一行锁记录，先落 failed 占位（保证补偿扫表无遗漏）
@@ -38,6 +41,7 @@
 
 - 开票申请：`作废`入口被 `checkEditable` 拦截（提示"该单据已被金蝶锁定，不可修改"）
 - 结算单：synced 状态本身已拦截编辑/调整/作废，锁定期被同一组守卫覆盖
+- 付款申请：`作废`入口被 `checkEditable` 拦截（金蝶锁定中不可改动；草稿保存/删除仅限推送前，无需守卫）
 - 重复点「同步金蝶」：推送幂等命中直接返回已有单号，已 locked 的锁记录跳过，不会重复锁
 
 ### 2. 金蝶侧解锁回调（金蝶 → WLTMS）
@@ -57,8 +61,11 @@
           │                同步信息还原推送前状态：kingdeeSyncStatus→unsynced、
           │                清 kingdeeBillNo/kingdeeBillId/syncedTime
           │                变更流水记"金蝶删单回调自动废除"，操作人=金蝶报文 operator
-          └─ INVOICE_APPLY → 开票申请作废，kingdeeStatus→unsynced、清单据编号，
-                              刷新关联结算单开票状态，动作流水记 kingdee_delete
+          ├─ INVOICE_APPLY → 开票申请作废，kingdeeStatus→unsynced、清单据编号，
+          │                    刷新关联结算单开票状态，动作流水记 kingdee_delete
+          └─ PAY_APPLY → 付款申请复用 unlockBill(id, "金蝶删单回调")（ADR-0005 口径）：
+                           kingdeeStatus→生成失败、清 kingdeeBillId/kingdeeBillNo（原值日志留档），
+                           不作废源单、不自动重推，人工核实后重推（A103-2 勾稽预检防重复推单）
 应答：{updateCount: 处理张数, updateResultList: [1]}
 ```
 
@@ -84,6 +91,8 @@ failed（锁定失败，待补偿）→ locked（金蝶锁定中）→ unlocked
 
 同单重新推送生成新锁记录，走新一轮循环。
 
+付款申请双路解锁共用同一还原口径（unlockBill，ADR-0005）：① 金蝶删单/解锁回调（本流程）；② A103-2 定时回写"已同步单据连续两轮查询消失"兜底。两路幂等由 kingdeeStatus 状态机保证，非已生成/付款中状态自动跳过。
+
 **业务单据生命周期**（以结算单为例）：
 
 ```
@@ -110,19 +119,23 @@ failed（锁定失败，待补偿）→ locked（金蝶锁定中）→ unlocked
    （后端 `mapActiveLocks` 每页一次批量查锁表，无 N+1；unlocked 终态不返回即 null=无锁/已解锁）。
    前端渲染：`locked` 红 tag「金蝶锁定中」并禁用编辑/作废（后端守卫是权威）；`failed` 且 `tryCount<5` 橙 tag「锁定失败·补偿中」tooltip 显示原因；
    `failed` 且 `tryCount≥5` 红 tag「锁定失败·已达重试上限」提示重推同步金蝶；null 不显示
+7. **付款申请纳入**（2026-10-10 新增）：一张付款申请=一张金蝶付款申请单，1对1约定天然满足，无需逐张拆分；
+   DELETE 还原不作废源单，复用既有 `unlockBill`（ADR-0005：生成失败+清编号内码+人工重推），与 A103-2 反审核删除兜底同口径；
+   推送结果即时回填 kingdeeBillNo（`requireBfiBillIdAndFillNo`），推送事务提交后即以该单号 `lockAfterPush`；
+   锁定失败摘要拼入「同步金蝶」返回值（与开票申请同款），页面直接可见
 
 ## 五、代码落点速查
 
 | 内容 | 位置 |
 | --- | --- |
 | 锁单 Feign/DTO/应答 VO | `blade-bfi-api`：`BfiBillLockDTO`、`BfiBillLockResultVO`、`IBfiClient.lockBusiData`、`IBfiService.lockBusiData` |
-| 锁类型常量与映射 | `transport/constant/KingdeeLockConstant` |
-| 锁状态展示填充 | `IKingdeeBillLockService.mapActiveLocks`（批量查活跃锁）+ `FormalSettlementServiceImpl/InvoiceApplicationServiceImpl.fillKingdeeLockStatus`（列表/详情填充）+ 两个 VO 的 `kingdeeLockStatus/kingdeeLockFailReason/kingdeeTryCount` 字段 |
+| 锁类型常量与映射 | `transport/constant/KingdeeLockConstant`（PAY_APPLY/ap_payapply_oth_BT_S 已进 TARGET_TO_SOURCE_MAP） |
+| 锁状态展示填充 | `IKingdeeBillLockService.mapActiveLocks`（批量查活跃锁）+ `FormalSettlementServiceImpl/InvoiceApplicationServiceImpl/PaymentApplicationServiceImpl.fillKingdeeLockStatus`（列表/详情填充）+ 三个 VO 的 `kingdeeLockStatus/kingdeeLockFailReason/kingdeeTryCount` 字段 |
 | 锁记录实体/服务 | `KingdeeBillLock`、`IKingdeeBillLockService` + `KingdeeBillLockServiceImpl` |
 | 回调端点 | `KingdeeBfiPublicController`：`POST /kingdee-bfi/unLockNotifyBusiData`（PERMIT_ALL + TenantIgnore） |
 | 补偿定时任务 | `KingdeeBillLockRetryTask`（`thirdParty.bfi.billLock.retryEnabled`，默认每5分钟） |
-| 推送后锁定触发 | `FormalSettlementServiceImpl.syncKingdee`、`InvoiceApplicationServiceImpl.syncKingdee`（事务提交后） |
-| 删单还原 | `FormalSettlementServiceImpl.voidByKingdee`、`InvoiceApplicationServiceImpl.voidByKingdee` |
+| 推送后锁定触发 | `FormalSettlementServiceImpl.syncKingdee`、`InvoiceApplicationServiceImpl.syncKingdee`、`PaymentApplicationServiceImpl.syncKingdee`（均为事务提交后） |
+| 删单还原 | `FormalSettlementServiceImpl.voidByKingdee`、`InvoiceApplicationServiceImpl.voidByKingdee`；付款申请复用 `PaymentApplicationServiceImpl.unlockBill`（ADR-0005 口径，回调分发于 `KingdeeBillLockServiceImpl.restoreOnKingdeeDelete`） |
 | 建表脚本 | `doc/sql/transport/blade_kingdee_bill_lock_20261009.sql` |
 
 ## 六、联调前配置
@@ -136,4 +149,5 @@ failed（锁定失败，待补偿）→ locked（金蝶锁定中）→ unlocked
    ③ 框架层规则兜底：`blade.secure.auth` 追加两 pattern 的 `permitAll()` 规则（模板与 Nacos 实际均已配）。
    Nacos 实际配置已核对一致；环境级 blade-dev/test/prod.yaml 无 secure 段覆盖。
    联调验证：服务启动后无令牌 POST 应返回业务参数校验错误（JSON），返回 401「请求未授权」即白名单未生效
-4. 与金蝶确认 WLTMS 单据类型编码（SETTLEMENT/INVOICE_APPLY）与 DELETE 还原口径
+4. 与金蝶确认 WLTMS 单据类型编码（SETTLEMENT/INVOICE_APPLY/PAY_APPLY）与 DELETE 还原口径
+   （付款申请 DELETE 不作废源单、走生成失败+人工重推，与 A103-2 反审核删除兜底同口径，待业务确认）