fix: 解锁标识术语统一为金蝶锁单/金蝶删单

- 回调操作类型展示口径统一:SAVE=金蝶锁单(保存触发解锁,单据仍在)、DELETE=金蝶删单
- 同步更新解锁标识标签、VO 注释与业务流程文档
This commit is contained in:
刘泉佳
2026-10-15 11:44:37 +08:00
parent f23e24e808
commit cb19618101
6 changed files with 8 additions and 8 deletions
@@ -55,7 +55,7 @@ public class FormalSettlementVO extends FormalSettlement implements KingdeeUnloc
private LocalDateTime kingdeeUnlockTime;
@TableField(exist = false) @Schema(description = "金蝶侧解锁操作人(回调报文 operator)")
private String kingdeeUnlockOperator;
@TableField(exist = false) @Schema(description = "解锁动作名称:金蝶删单/金蝶解锁")
@TableField(exist = false) @Schema(description = "解锁动作名称:金蝶删单/金蝶锁单")
private String kingdeeUnlockOperationName;
@TableField(exist = false) private String preSettlementNos;
@TableField(exist = false) private String preSettlementNo;
@@ -60,7 +60,7 @@ public class InvoiceApplicationVO extends InvoiceApplication implements KingdeeU
@TableField(exist = false) private LocalDateTime kingdeeUnlockTime;
/** 金蝶侧解锁操作人(回调报文 operator) */
@TableField(exist = false) private String kingdeeUnlockOperator;
/** 解锁动作名称:金蝶删单/金蝶解锁 */
/** 解锁动作名称:金蝶删单/金蝶锁单 */
@TableField(exist = false) private String kingdeeUnlockOperationName;
@TableField(exist = false) private String createUserName;
@TableField(exist = false) private List<InvoiceApplicationSettlement> settlements;
@@ -30,7 +30,7 @@ public interface KingdeeUnlockMark {
void setKingdeeUnlockOperator(String kingdeeUnlockOperator);
/**
* 解锁动作名称:金蝶删单/金蝶解锁
* 解锁动作名称:金蝶删单/金蝶锁单
*/
void setKingdeeUnlockOperationName(String kingdeeUnlockOperationName);
}
@@ -54,7 +54,7 @@ public class PaymentApplicationVO extends PaymentApplication implements KingdeeU
@TableField(exist = false) private LocalDateTime kingdeeUnlockTime;
/** 金蝶侧解锁操作人(回调报文 operator) */
@TableField(exist = false) private String kingdeeUnlockOperator;
/** 解锁动作名称:金蝶删单/金蝶解锁 */
/** 解锁动作名称:金蝶删单/金蝶锁单 */
@TableField(exist = false) private String kingdeeUnlockOperationName;
@TableField(exist = false) private List<PaymentApplicationInvoice> invoices;
@TableField(exist = false) private List<PaymentApplicationRecord> paymentRecords;
@@ -310,7 +310,7 @@ public class KingdeeBillLockServiceImpl extends ServiceImpl<KingdeeBillLockMappe
row.setKingdeeUnlockTime(unlockRecord.getUnlockTime());
row.setKingdeeUnlockOperator(unlockRecord.getNotifyOperator());
row.setKingdeeUnlockOperationName(KingdeeLockConstant.OPERATION_DELETE.equals(unlockRecord.getOperationType())
? "金蝶删单" : "金蝶解锁");
? "金蝶删单" : "金蝶锁单");
}
}
@@ -100,7 +100,7 @@ unLockNotifyBusiData 由金蝶发起(source=金蝶、target=我方)。因此
| 字段 | 变化 |
| --- | --- |
| lock_status | locked → unlocked(终态) |
| operation_type | 回调报文 operationType(SAVE-仅解锁 / DELETE-删单) |
| operation_type | 回调报文 operationType(SAVE-金蝶锁单(保存触发解锁,单据仍在)/ DELETE-金蝶删单) |
| unlock_time | WLTMS 处理时间(注意:非金蝶报文 time,金蝶侧操作时间以日志为准) |
| notify_operator | 回调报文 operator(金蝶侧操作人) |
@@ -141,7 +141,7 @@ failed(锁定失败,待补偿)→ locked(金蝶锁定中)→ unlocked
│ │
│ ├─ 锁定成功:locked(冻结,不可动)
│ │ │
│ │ ├─ 金蝶解锁(SAVE):unlocked,流水留痕
│ │ ├─ 金蝶锁单(SAVE):unlocked,流水留痕
│ │ └─ 金蝶删单(DELETE):作废 + 同步信息还原 unsynced
│ │ (结算明细/付款/开票关联的后续动作
│ │ 由各自前置校验自然拦截重推)
@@ -170,7 +170,7 @@ failed(锁定失败,待补偿)→ locked(金蝶锁定中)→ unlocked
VO 实现 `KingdeeUnlockMark` 展示契约(解锁时间/操作人/动作名称三字段),
`KingdeeBillLockService.fillUnlockMarks` 对无活跃锁的行一次 IN 反查最新 unlocked 锁记录(`mapUnlockedLocks`)统一回填;
前端三个页面(付款申请/开票申请/正式结算单)金蝶锁状态列渲染:`kingdeeUnlockTime` 非空 →
「金蝶删单」红 tag /「金蝶解锁」橙 tag,tooltip 显示操作人+时间;后续单据(如收票单)接入锁单时 VO 实现契约即可复用
「金蝶删单」红 tag /「金蝶锁单」橙 tag,tooltip 显示操作人+时间;后续单据(如收票单)接入锁单时 VO 实现契约即可复用
## 五、代码落点速查