!4 fix: 结算调整单重推拦截报错补充具体结算单号

Merge pull request !4 from mindless/feature/20261016-settlement-adjustment-kingdee
2026-10-19 06:58:25 +00:00
parent c5d5687999 3b3e5442f1
commit 68a5d581f3
43 changed files with 2828 additions and 100 deletions
@@ -172,4 +172,12 @@ public class FormalSettlement extends TenantEntity {
 	 * 作废原因，驳回时记录驳回原因
 	 */
 	private String voidReason;
+	/**
+	 * 来源原正式结算单号：结算调整重推生成的新单，指向被调整的原单
+	 */
+	private String originFormalSettlementNo;
+	/**
+	 * 调整状态：adjusted-已被结算调整（原单标记）
+	 */
+	private String adjustStatus;
 }
@@ -30,6 +30,10 @@ public class SettlementAdjustment extends TenantEntity {
 	private String currentNode;
 	private String currentProcessor;
 	private String kingdeeSyncStatus;
+	/**
+	 * 金蝶单据号（未推送场景回填原结算单金蝶单号；重推场景回填新单金蝶单号）
+	 */
+	private String kingdeeBillNo;
 	private String attachmentsJson;
 	private String remark;
 	private LocalDateTime approvedTime;
@@ -58,6 +58,8 @@ public class FormalSettlementVO extends FormalSettlement implements KingdeeUnloc
 	private String kingdeeUnlockOperator;
 	@TableField(exist = false) @Schema(description = "解锁动作名称：金蝶删单/金蝶锁单")
 	private String kingdeeUnlockOperationName;
+	@TableField(exist = false) @Schema(description = "调整状态名称：adjusted-已调整")
+	private String adjustStatusName;
 	@TableField(exist = false) private String preSettlementNos;
 	@TableField(exist = false) private String preSettlementNo;
 	@TableField(exist = false) private List<FormalSettlementSource> sources;
@@ -70,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;
 }
@@ -17,7 +17,6 @@ public class SettlementAdjustmentVO extends SettlementAdjustment {
 	private String approvalStatusName;
 	private String settlementTypeName;
 	private String createUserName;
-	private String kingdeeBillNo;
 	private List<SettlementAdjustmentDetail> details;
 	private List<FormalSettlementDetail> formalDetails;
 }
@@ -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;
+
+}
@@ -17,7 +17,40 @@ public interface ISettlementAdjustmentService {
 	Long saveDraft(SettlementAdjustmentSaveRequest request);
 	void removeDraft(Long id);
 	void submit(SettlementAdjustmentStatusRequest request);
-	void approve(SettlementAdjustmentStatusRequest request);
+	/**
+	 * 审批通过：未推送场景回写原单并发布金蝶自动推送事件；已推送场景原单零改动仅追加变更记录。
+	 *
+	 * @param request 审批请求
+	 * @return 已推送场景的手工冲销提示文案，未推送场景返回 null
+	 */
+	String approve(SettlementAdjustmentStatusRequest request);
 	void returnBill(SettlementAdjustmentStatusRequest request);
 	String repush(Long adjustmentId);
+
+	/**
+	 * 选单后金蝶冲销预检（软提示，不阻断建单）：未推送 / 已推送已冲销 / 已推送未冲销；
+	 * 金蝶查询异常降级返回「未校验」，由审批分流与重推闸门兜底
+	 *
+	 * @param formalSettlementId 选定正式结算单id
+	 * @return syncStatus / writtenOff / message
+	 */
+	Map<String, Object> kingdeeWriteOffPrecheck(Long formalSettlementId);
+
+	/**
+	 * 推送金蝶（未推送/生成失败场景）：推送关联正式结算单，成功后由正式结算单回填调整单金蝶单号与同步状态
+	 *
+	 * @param adjustmentId 结算调整单id
+	 * @return 金蝶单据编号
+	 */
+	String syncKingdee(Long adjustmentId);
+
+	/**
+	 * 重推克隆+应用（独立事务，由 repush 经自代理调用）：克隆原单为新正式结算单并应用调整，
+	 * 供推送失败重试时幂等复用
+	 *
+	 * @param originalSettlementId 原正式结算单id
+	 * @param adjustmentId         结算调整单id
+	 * @return 新正式结算单id
+	 */
+	Long cloneAndApplyForRepush(Long originalSettlementId, Long adjustmentId);
 }