!8 付款特批+履约计划履约记录(付款+开票+收票+收款)+金蝶编码取A901-1供应商接口返回的number

Merge pull request !8 from mindless/feature/20261027-hcs-bif-all
2026-11-04 08:33:15 +00:00
parent 69f9c9af7f 847a9cae23
commit e40703fc26
87 changed files with 4166 additions and 368 deletions
@@ -216,12 +216,6 @@ public class ContractChange extends TenantEntity {
 	@Schema(description = "其他事项说明")
 	private String remark;

-	@Schema(description = "合规客商风险等级（展示用）")
-	private String hcsRiskLevel;
-
-	@Schema(description = "合规客商黑名单状态（展示用）")
-	private String hcsBlackStatus;
-
 	@Schema(description = "审批状态")
 	private String approvalStatus;

@@ -258,15 +258,6 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "合规履约计划ID（C103-9 返回 fdExeplanId）")
 	private String hcsExeplanId;

-	@Schema(description = "合规客商风险等级（C101-1，甲方/乙方取高）")
-	private String hcsRiskLevel;
-
-	@Schema(description = "合规客商黑名单状态（C101-1，甲方/乙方取是）")
-	private String hcsBlackStatus;
-
-	@Schema(description = "合规风险校验时间")
-	private LocalDateTime hcsRiskTime;
-
 	@Schema(description = "合规特批流程ID（C103-8 返回）")
 	private String hcsSpecFdId;

@@ -52,6 +52,9 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "客商编号")
 	private String customerCode;

+	@Schema(description = "供应商编码（金蝶A901-1供应商查询返回number，建档/同步时落库）")
+	private String supplierCode;
+
 	@Schema(description = "客商简称")
 	private String shortName;

@@ -182,4 +185,19 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "金蝶推送时间")
 	private LocalDateTime kingdeeSyncTime;

+	@Schema(description = "合规客商风险等级（C101-1，每日定时刷新）：0=低风险，1=中风险，2=高风险")
+	private String hcsRiskLevel;
+
+	@Schema(description = "合规客商黑名单状态（C101-1，每日定时刷新）：yes=是，no=否，handing=处理中")
+	private String kingdeeBlackStatus;
+
+	@Schema(description = "合规客商风险最近查询时间（C101-1）")
+	private LocalDateTime hcsRiskTime;
+
+	@Schema(description = "金蝶黑名单失信类别（A801-5 awrp_combofield_title，缺失兜底 awrp_combofield）")
+	private String kingdeeBlackCategory;
+
+	@Schema(description = "金蝶黑名单列入事由（A801-5 awrp_textareafield）")
+	private String kingdeeBlackReason;
+
 }
@@ -160,6 +160,10 @@ public class FormalSettlement extends TenantEntity {
 	 * 金蝶同步状态：unsynced-未同步 synced-已同步 failed-同步失败
 	 */
 	private String kingdeeSyncStatus;
+	/**
+	 * 金蝶推送失败原因（仅 failed 态展示；重推成功转 synced 后残留原因不再回显）
+	 */
+	private String kingdeeFailReason;
 	/**
 	 * 附件JSON
 	 */
@@ -167,6 +167,10 @@ public class InvoiceApplication extends TenantEntity {
 	 * 金蝶同步状态：unsynced-未同步 synced-已同步 failed-同步失败 invoiced-开票完成（终态）
 	 */
 	private String kingdeeStatus;
+	/**
+	 * 金蝶推送失败原因（仅 failed 态展示；重推成功转 synced 后残留原因不再回显）
+	 */
+	private String kingdeeFailReason;
 	/**
 	 * 同步金蝶时间
 	 */
@@ -77,4 +77,11 @@ public class InvoiceApplicationInvoice extends TenantEntity {
 	@Schema(description = "A303-5 返回原文JSON留档")
 	private String rawJson;

+	/** 履约开票记录ID（C108-1 返回；非空即已推送，扫描据此幂等跳过） */
+	private String hcsPerfFdId;
+	/** 履约开票记录推送失败重试次数 */
+	private Integer hcsPerfRetryCount;
+	/** 履约开票记录最近推送失败原因（成功后清空） */
+	private String hcsPerfSyncMsg;
+
 }
@@ -55,4 +55,10 @@ public class InvoiceReceiptSettlement extends TenantEntity {
 	private BigDecimal settlementAmount;
 	private BigDecimal receivedInvoiceAmount;
 	private BigDecimal allocatedInvoiceAmount;
+	/** 履约收票记录ID（C108-1 返回；非空即已推送，扫描据此幂等跳过） */
+	private String hcsPerfFdId;
+	/** 履约收票记录推送失败重试次数 */
+	private Integer hcsPerfRetryCount;
+	/** 履约收票记录最近推送失败原因（成功后清空） */
+	private String hcsPerfSyncMsg;
 }
@@ -117,6 +117,8 @@ public class PaymentApplication extends TenantEntity {
 	private String kingdeeBillId;
 	/** 金蝶同步状态：unsynced 未生成 / synced 已生成 / paying 付款中 / paid 已付款 / closed 已关闭 / failed 生成失败 */
 	private String kingdeeStatus;
+	/** 金蝶推送失败原因（仅 failed 态展示；重推成功转 synced 后残留原因不再回显） */
+	private String kingdeeFailReason;
 	/** 附件信息JSON */
 	private String attachmentsJson;
 	/** 备注 */
@@ -141,6 +143,8 @@ public class PaymentApplication extends TenantEntity {
 	private String hcsSpecFdId;
 	/** 特批状态：none/need/pushing/processing/approved/rejected */
 	private String hcsSpecStatus;
+	/** 合规付款特批结果附件ID（paymentLegal/result 回调 fileUrl，C103-5 下载入参、金蝶附件联带用） */
+	private String hcsSpecAttachFdId;
 	/** 履约记录ID（C108-1 返回，C108-2 更新必传） */
 	private String hcsPerfFdId;
 }
@@ -30,6 +30,8 @@ public class SettlementAdjustment extends TenantEntity {
 	private String currentNode;
 	private String currentProcessor;
 	private String kingdeeSyncStatus;
+	/** 金蝶推送失败原因（随结算单推送失败落库，仅 failed 态展示） */
+	private String kingdeeFailReason;
 	/**
 	 * 金蝶单据号（未推送场景回填原结算单金蝶单号；重推场景回填新单金蝶单号）
 	 */
@@ -67,4 +67,12 @@ public class ContractChangeVO extends ContractChange {
 	@Schema(description = "同步状态名称")
 	private String syncStatusName;

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

+	@TableField(exist = false)
+	@Schema(description = "客商风险等级（甲乙双方关联客商档案实时组装，等级取高）：0=低风险，1=中风险，2=高风险")
+	private String hcsRiskLevel;
+
+	@TableField(exist = false)
+	@Schema(description = "客商黑名单状态（甲乙双方关联客商档案实时组装，任一方金蝶黑名单命中记是）：yes/no")
+	private String kingdeeBlackStatus;
+
+	@TableField(exist = false)
+	@Schema(description = "客商风险明细文案（甲乙双方风险信息合并，列表悬浮展示，与客商列表/表单实时提示同口径）")
+	private String hcsRiskDetail;
+
 }
@@ -106,4 +106,12 @@ public class CustomerArchiveVO extends CustomerArchive {
 	@Schema(description = "已付金额合计（元）")
 	private BigDecimal usedFundLimit;

+	@TableField(exist = false)
+	@Schema(description = "客商风险筛选值：blacklist黑名单/high高风险/middle中风险/low低风险")
+	private String customerRisk;
+
+	@TableField(exist = false)
+	@Schema(description = "客商风险明细（后台组装：合同系统风险等级+金蝶黑名单失信类别/列入事由）")
+	private String hcsRiskDetail;
+
 }
@@ -63,6 +63,9 @@ public class CustomerRiskVO implements Serializable {
 	@Schema(description = "风险等级名称（服务端转义：黑名单/高风险/中风险/低风险，黑名单优先；无等级为空）")
 	private String riskLevelName;

+	@Schema(description = "是否命中金蝶黑名单（A801-5，黑名单展示口径；红字细分由前端按等级+本标记翻译）")
+	private Boolean kingdeeBlackHit;
+
 	@Schema(description = "是否高风险/黑名单客商（外部客商专用，内部组织恒为 false）")
 	private Boolean risky;

@@ -26,6 +26,7 @@
 package org.springblade.transport.pojo.vo;

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