✨ 新增项目预付核销，并修复平台公司多选、常用线路组织过滤与登录 IP 连坐锁

结算附件支持项目预付核销并扣减可付款金额；加固项目平台公司多选字段扩容脚本；常用线路新增归属组织与列表筛选对齐；登录失败仅按账号锁定，取消 IP 级连坐。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-16 02:01:58 +08:00
parent 0657cfe69f
commit 93a6555293
24 changed files with 817 additions and 29 deletions
@@ -32,6 +32,8 @@ public class FormalSettlementSaveRequest implements Serializable {
 	private String remark;
 	private List<SummaryFee> summaryFees;
 	private List<Invoice> invoices;
+	/** 项目预付核销 */
+	private List<SettlementProjectAdvanceWriteOffRequest> projectAdvanceWriteOffs;

 	@Data
 	public static class DetailAdjustment implements Serializable {
@@ -76,6 +76,9 @@ public class PreSettlementSaveRequest implements Serializable {
 	@Schema(description = "结算合计费用")
 	private List<SummaryFee> summaryFees;

+	@Schema(description = "项目预付核销")
+	private List<SettlementProjectAdvanceWriteOffRequest> projectAdvanceWriteOffs;
+
 	@Data
 	@Schema(description = "结算合计费用")
 	public static class SummaryFee implements Serializable {
@@ -0,0 +1,53 @@
+/**
+ * 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.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 结算单项目预付核销保存行
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "结算单项目预付核销保存行")
+public class SettlementProjectAdvanceWriteOffRequest implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "项目预付付款申请ID")
+	private Long paymentApplicationId;
+
+	@Schema(description = "本次核销金额")
+	private BigDecimal writeOffAmount;
+
+}
@@ -0,0 +1,90 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 结算单项目预付核销实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_settlement_project_advance_write_off")
+@Schema(description = "结算单项目预付核销")
+public class SettlementProjectAdvanceWriteOff extends TenantEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "结算单类型：pre/formal")
+	private String settlementType;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "预结算/正式结算单ID")
+	private Long settlementId;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "项目预付付款申请ID")
+	private Long paymentApplicationId;
+
+	@Schema(description = "预付单号")
+	private String paymentNo;
+
+	@Schema(description = "项目预付金额")
+	private BigDecimal projectAdvanceAmount;
+
+	@Schema(description = "本次核销金额")
+	private BigDecimal writeOffAmount;
+
+	@Schema(description = "金蝶预付单号")
+	private String kingdeeBillNo;
+
+	@TableField(exist = false)
+	@Schema(description = "可核销金额（动态计算）")
+	private BigDecimal availableWriteOffAmount;
+
+	@TableField(exist = false)
+	@Schema(description = "预付单创建人姓名")
+	private String createUserName;
+
+	@TableField(exist = false)
+	@Schema(description = "预付单创建时间（展示用）")
+	private Date paymentCreateTime;
+
+}
@@ -20,6 +20,7 @@ import org.springblade.transport.pojo.entity.FormalSettlementSource;
 import org.springblade.transport.pojo.entity.FormalSettlementPayment;
 import org.springblade.transport.pojo.entity.FormalSettlementSummaryFee;
 import org.springblade.transport.pojo.entity.InvoiceApplicationInvoice;
+import org.springblade.transport.pojo.entity.SettlementProjectAdvanceWriteOff;
 import org.springframework.format.annotation.DateTimeFormat;

 import java.io.Serial;
@@ -64,6 +65,8 @@ public class FormalSettlementVO extends FormalSettlement implements KingdeeUnloc
 	@TableField(exist = false) private List<FormalSettlementSummaryFee> summaryFees;
 	@TableField(exist = false) private List<FormalSettlementPayment> payments;
 	@TableField(exist = false) private List<FormalSettlementInvoice> invoices;
+	@TableField(exist = false) @Schema(description = "项目预付核销")
+	private List<SettlementProjectAdvanceWriteOff> projectAdvanceWriteOffs;
 	@TableField(exist = false) @Schema(description = "开票申请经金蝶回写的发票结果（含文件地址，只读展示）")
 	private List<InvoiceApplicationInvoice> issuedInvoices;
 	@TableField(exist = false) private List<PaymentApplicationVO> paymentApplications;
@@ -35,6 +35,7 @@ import org.springblade.transport.pojo.entity.PreSettlementChangeRecord;
 import org.springblade.transport.pojo.entity.PreSettlementDetail;
 import org.springblade.transport.pojo.entity.PreSettlementDetailFee;
 import org.springblade.transport.pojo.entity.PreSettlementSummaryFee;
+import org.springblade.transport.pojo.entity.SettlementProjectAdvanceWriteOff;
 import org.springframework.format.annotation.DateTimeFormat;

 import java.io.Serial;
@@ -100,6 +101,10 @@ public class PreSettlementVO extends PreSettlement {
 	@Schema(description = "预付信息")
 	private List<PreSettlementAdvance> advances;

+	@TableField(exist = false)
+	@Schema(description = "项目预付核销")
+	private List<SettlementProjectAdvanceWriteOff> projectAdvanceWriteOffs;
+
 	@TableField(exist = false)
 	@Schema(description = "变更记录")
 	private List<PreSettlementChangeRecord> 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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 ProjectAdvanceWriteOffOptionVO implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "付款申请ID")
+	private Long paymentApplicationId;
+
+	@Schema(description = "预付单号")
+	private String paymentNo;
+
+	@Schema(description = "项目预付金额")
+	private BigDecimal projectAdvanceAmount;
+
+	@Schema(description = "可核销金额")
+	private BigDecimal availableWriteOffAmount;
+
+	@Schema(description = "金蝶预付单号")
+	private String kingdeeBillNo;
+
+	@Schema(description = "创建人姓名")
+	private String createUserName;
+
+	@Schema(description = "创建时间")
+	private Date createTime;
+
+}