feat: 正式结算单整合项目预付核销并关联展示预付付款记录

核销金额计入结算单已申请/已付汇总（仅已付款预付可核销）；保存转移来源预结算核销行、调整重推迁移核销行；付款申请作废/结算单作废/金蝶删单回调/预结算作废联动清理核销行；结算调整前校验核销合计；详情返回统一预付付款记录（advancePayments）；列表页批量汇总避免N+1
2026-10-18 14:31:10 +08:00
parent 32f14b9299
commit a4b5f09160
10 changed files with 332 additions and 8 deletions
@@ -72,6 +72,7 @@ public class FormalSettlementVO extends FormalSettlement implements KingdeeUnloc
 	@TableField(exist = false) @Schema(description = "开票申请经金蝶回写的发票结果（含文件地址，只读展示）")
 	private List<InvoiceApplicationInvoice> issuedInvoices;
 	@TableField(exist = false) private List<PaymentApplicationVO> paymentApplications;
+	@TableField(exist = false) private List<SettlementAdvancePaymentVO> advancePayments;
 	@TableField(exist = false) private List<SettlementAdjustmentVO> adjustments;
 	@TableField(exist = false) private List<FormalSettlementChangeRecord> changeRecords;
 }
@@ -0,0 +1,72 @@
+/**
+ * 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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 结算单统一预付付款记录（进度预付 / 项目预付核销，供付款记录合并展示）
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "结算单统一预付付款记录")
+public class SettlementAdvancePaymentVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "记录类型：progress_advance 进度预付 / project_advance 项目预付核销")
+	private String recordType;
+
+	@Schema(description = "付款单号")
+	private String paymentNo;
+
+	@Schema(description = "申请金额（进度预付为申请预付金额，项目预付为本次核销金额）")
+	private BigDecimal appliedAmount;
+
+	@Schema(description = "已付款金额（底层付款申请实付）")
+	private BigDecimal paidAmount;
+
+	@Schema(description = "单据状态")
+	private String billStatus;
+
+	@Schema(description = "金蝶单据号")
+	private String kingdeeBillNo;
+
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
+	@Schema(description = "创建时间（统一取底层付款申请创建时间）")
+	private Date createTime;
+
+}