From 82724ceaa03d1b75f5172693dc9c6f5ac890094d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com>
Date: Thu, 29 Oct 2026 02:15:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=A6=E6=88=AA=E5=B7=B2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=9A=84=E6=AD=A3=E5=BC=8F=E7=BB=93=E7=AE=97=E5=8D=95?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=8F=91=E8=B5=B7=E4=BB=98=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/TransportBusiConstant.java          |  3 +++
 .../impl/FormalSettlementServiceImpl.java        |  4 +++-
 .../impl/PaymentApplicationServiceImpl.java      | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/TransportBusiConstant.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/TransportBusiConstant.java
index 93f278b8..60a36c71 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/TransportBusiConstant.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/constant/TransportBusiConstant.java
@@ -61,6 +61,9 @@ public final class TransportBusiConstant {
 	/** 审批状态：已作废（终态）。 */
 	public static final String VOIDED = "voided";
 
+	/** 正式结算单调整标识：已调整（结算调整重推后的归档原单，金额已作废，不可再用于下游业务）。 */
+	public static final String SETTLEMENT_ADJUST_STATUS_ADJUSTED = "adjusted";
+
 	/**
 	 * 「未分配组织」筛选项的哨兵值，不是真实组织名。
 	 * <p>
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
index 497919f0..0e978b4f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/FormalSettlementServiceImpl.java
@@ -790,7 +790,7 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 		// 原单只加标记，业务字段不动
 		update(Wrappers.<FormalSettlement>lambdaUpdate()
 			.eq(FormalSettlement::getId, settlementId)
-			.set(FormalSettlement::getAdjustStatus, "adjusted"));
+			.set(FormalSettlement::getAdjustStatus, TransportBusiConstant.SETTLEMENT_ADJUST_STATUS_ADJUSTED));
 		kingdeeBillLockService.unlockByAdjustRepush(KingdeeLockConstant.SOURCE_SETTLEMENT, settlementId, AuthUtil.getUserName());
 		saveChange(settlementId, "结算单基本信息", null, "调整",
 			"结算调整单" + Func.toStr(adjustmentNo) + "重推生成新单" + Func.toStr(newSettlementNo) + "，原单标记已调整", null);
@@ -1251,6 +1251,8 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 	private String createPayment(FormalSettlement settlement, BigDecimal appliedAmount, String remark) {
 		if (!TransportBusiConstant.APPROVED.equals(settlement.getApprovalStatus())) throw new ServiceException("仅审批通过的正式结算单允许发起付款申请");
 		if (!"payable".equals(settlement.getSettlementType())) throw new ServiceException("仅应付正式结算单允许发起付款申请");
+		if (TransportBusiConstant.SETTLEMENT_ADJUST_STATUS_ADJUSTED.equals(settlement.getAdjustStatus()))
+			throw new ServiceException("结算单[" + Func.toStr(settlement.getFormalSettlementNo()) + "]已因结算调整作废，不可再发起付款，请使用调整后的新单");
 		long activePaymentCount = paymentMapper.selectCount(Wrappers.<FormalSettlementPayment>lambdaQuery()
 			.eq(FormalSettlementPayment::getFormalSettlementId, settlement.getId())
 			.eq(FormalSettlementPayment::getIsDeleted, 0)
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
index def5f9a8..cc2ff23d 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
@@ -299,6 +299,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				if (!TransportBusiConstant.APPROVED.equals(formalSettlement.getApprovalStatus())) {
 					throw new ServiceException("只能选择审批通过、未作废的正式结算单");
 				}
+				assertFormalSettlementPayable(formalSettlement);
 				settlementAmount = money(formalSettlement.getSettlementAmount());
 			} else {
 				// 尾款付款也允许关联预结算单
@@ -2145,6 +2146,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 				}
 			} else {
 				if (!TransportBusiConstant.APPROVED.equals(source.getApprovalStatus())) throw new ServiceException("只能选择审批通过、未作废的正式结算单");
+				assertFormalSettlementPayable(source);
 				entity.setSettlementId(source.getId()); entity.setSettlementNo(source.getFormalSettlementNo()); entity.setPreSettlementId(null); entity.setPreSettlementNo(null);
 				entity.setProjectId(source.getProjectId()); entity.setProjectName(source.getProjectName()); entity.setDeptId(source.getDeptId()); entity.setDeptName(source.getDeptName()); entity.setContractId(source.getContractId()); entity.setContractNo(source.getContractNo()); entity.setContractName(source.getContractName()); entity.setPayerName(source.getPayerName()); entity.setPayeeName(source.getPayeeName()); entity.setSettlementAmount(source.getSettlementAmount()); entity.setPayableAmount(payableOfFormalSettlement(source.getId(), source.getSettlementAmount(), entity.getId())); entity.setBillType("正式结算单");
 			}
@@ -2199,6 +2201,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 			|| !TransportBusiConstant.APPROVED.equals(item.getApprovalStatus()) || !"payable".equals(item.getSettlementType()))) {
 			throw new ServiceException("只能选择审批通过的应付正式结算单");
 		}
+		settlements.forEach(this::assertFormalSettlementPayable);
 		Long contractId = settlements.get(0).getContractId();
 		if (contractId == null || settlements.stream().anyMatch(item -> !Objects.equals(contractId, item.getContractId()))) {
 			throw new ServiceException("多选正式结算单必须属于同一合同");
@@ -2206,6 +2209,19 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 		return settlements;
 	}
 
+	/**
+	 * 付款链路闸门：结算调整重推会把原单标记为已调整并冲销金蝶旧单，
+	 * 原单仅作存档，剩余应付口径归新单，此处拦截避免对已作废金额重复付款
+	 *
+	 * @param settlement 待付款的正式结算单
+	 */
+	private void assertFormalSettlementPayable(FormalSettlement settlement) {
+		if (TransportBusiConstant.SETTLEMENT_ADJUST_STATUS_ADJUSTED.equals(settlement.getAdjustStatus())) {
+			throw new ServiceException("结算单[" + Func.toStr(settlement.getFormalSettlementNo())
+				+ "]已因结算调整作废，不可再发起付款，请使用调整后的新单");
+		}
+	}
+
 	private boolean hasMultipleFormalReferences(PaymentApplicationSaveRequest request) {
 		return TransportBusiConstant.PAYMENT_TYPE_SETTLEMENT.equals(request.getPaymentType()) && request.getSettlementIds() != null
 			&& request.getSettlementIds().stream().filter(Objects::nonNull).distinct().count() > 1;