From 583bab1a4f7f97505a418ac9cb6a91bd7a6af298 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Sun, 18 Oct 2026 05:12:27 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=BB=93=E7=AE=97=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E4=B8=8E=E6=B1=87=E7=A5=A8=E6=A0=A1=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=AE=8C=E5=96=84=E5=8F=98=E6=9B=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=8E=E8=8F=9C=E5=8D=95=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 付款可付款占用、汇票仅可选未到期收票、正式结算计费方式与金蝶同步、导入运单删除校验，并补充结算菜单与变更明细 SQL。 Co-authored-by: Cursor --- .../dto/PreSettlementDetailAdjustRequest.java | 2 +- .../entity/FormalSettlementChangeRecord.java | 4 + .../pojo/entity/FormalSettlementDetail.java | 8 + .../entity/FormalSettlementDetailFee.java | 8 + .../PaymentApplicationReferenceAmountVO.java | 2 + .../service/impl/BillLedgerServiceImpl.java | 7 +- .../impl/FormalSettlementServiceImpl.java | 183 +++++++++++++++- .../impl/PaymentApplicationServiceImpl.java | 159 +++++++++++--- .../impl/PreSettlementServiceImpl.java | 205 ++++++++++++++++-- .../impl/WaybillImportBatchServiceImpl.java | 12 +- .../blade_formal_settlement_20260818.sql | 42 ++-- ...rmal_settlement_change_record_20260827.sql | 2 + ...ttlement_change_record_detail_20261018.sql | 30 +++ .../blade_pre_settlement_20260818.sql | 2 +- .../blade_settlement_menu_split_20261018.sql | 163 ++++++++++++++ 15 files changed, 745 insertions(+), 84 deletions(-) create mode 100644 doc/sql/transport/blade_formal_settlement_change_record_detail_20261018.sql create mode 100644 doc/sql/transport/blade_settlement_menu_split_20261018.sql diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/PreSettlementDetailAdjustRequest.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/PreSettlementDetailAdjustRequest.java index bbfddec7..8d2383a9 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/PreSettlementDetailAdjustRequest.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/PreSettlementDetailAdjustRequest.java @@ -33,7 +33,7 @@ public class PreSettlementDetailAdjustRequest implements Serializable { @Schema(description = "预结算明细ID") private Long detailId; - @Schema(description = "调整原因") + @Schema(description = "备注（写入结算明细备注，非必填）") private String changeReason; @Schema(description = "明细费用行") diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementChangeRecord.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementChangeRecord.java index b3834bc4..8d95679f 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementChangeRecord.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementChangeRecord.java @@ -25,6 +25,10 @@ public class FormalSettlementChangeRecord extends TenantEntity { private Integer lineNo; private String operationType; private String changeContent; + /** 变更前数据JSON */ + private String beforeData; + /** 变更后数据JSON */ + private String afterData; private String changeReason; private String operatorName; private LocalDateTime changeTime; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetail.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetail.java index 899dffe1..96f273cd 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetail.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetail.java @@ -8,7 +8,9 @@ */ package org.springblade.transport.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @@ -123,6 +125,12 @@ public class FormalSettlementDetail extends TenantEntity { * 批次号 */ private String batchNo; + /** + * 计费方式（来源应收应付货物费用计费类型，非本表字段） + */ + @TableField(exist = false) + @Schema(description = "计费方式") + private String billingType; /** * 运输单价 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetailFee.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetailFee.java index c4e62e26..0dcae4f5 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetailFee.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementDetailFee.java @@ -8,7 +8,9 @@ */ package org.springblade.transport.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @@ -70,6 +72,12 @@ public class FormalSettlementDetailFee extends TenantEntity { * 费用项JSON */ private String feeItemsJson; + /** + * 命中计费规则JSON（来源费用带回，非本表字段） + */ + @TableField(exist = false) + @Schema(description = "命中计费规则JSON") + private String billingRulesJson; /** * 原金额 */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/PaymentApplicationReferenceAmountVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/PaymentApplicationReferenceAmountVO.java index 367ae478..d750370b 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/PaymentApplicationReferenceAmountVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/PaymentApplicationReferenceAmountVO.java @@ -27,4 +27,6 @@ public class PaymentApplicationReferenceAmountVO implements Serializable { @Schema(description = "结算金额") private BigDecimal settlementAmount; @Schema(description = "累计申请付款金额") private BigDecimal cumulativeAppliedAmount; @Schema(description = "可付款金额") private BigDecimal payableAmount; + /** 该结算单当前为第几次付款（含本次，已作废不计） */ + @Schema(description = "付款次序") private Integer paymentSequence; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/BillLedgerServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/BillLedgerServiceImpl.java index 0e08c8a2..a2728da7 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/BillLedgerServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/BillLedgerServiceImpl.java @@ -104,12 +104,17 @@ public class BillLedgerServiceImpl extends BaseServiceImpl availableList(String keyword, Long deptId, Long selectedId) { + LocalDate today = LocalDate.now(); + // 付款申请仅可选：收票类型、未到期、有可用余额；已选中的汇票始终带回以便回显 return list(Wrappers.lambdaQuery() .and(Func.isNotEmpty(keyword), wrapper -> wrapper.like(BillLedger::getBillNo, keyword) .or().like(BillLedger::getIssuerName, keyword) .or().like(BillLedger::getReceiverName, keyword)) .and(wrapper -> wrapper - .gt(BillLedger::getAvailableBalance, BigDecimal.ZERO) + .and(available -> available + .eq(BillLedger::getBillType, "received") + .ge(BillLedger::getMaturityDate, today) + .gt(BillLedger::getAvailableBalance, BigDecimal.ZERO)) .or(selectedId != null, child -> child.eq(BillLedger::getId, selectedId))) .orderByAsc(BillLedger::getMaturityDate) .orderByDesc(BillLedger::getCreateTime)).stream() 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 aedcfb5c..cbfdb8e0 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 @@ -315,6 +315,7 @@ public class FormalSettlementServiceImpl extends BaseServiceImpllambdaQuery() @@ -352,6 +353,36 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl details) { + if (details == null || details.isEmpty()) { + return; + } + List sourceDetailIds = details.stream() + .map(FormalSettlementDetail::getSourceDetailId) + .filter(Objects::nonNull) + .distinct() + .toList(); + if (sourceDetailIds.isEmpty()) { + return; + } + Map billingTypeMap = receivablePayableCargoFeeMapper.selectList( + Wrappers.lambdaQuery() + .in(ReceivablePayableCargoFee::getDetailId, sourceDetailIds) + .orderByAsc(ReceivablePayableCargoFee::getLineNo)) + .stream() + .filter(fee -> Func.isNotEmpty(fee.getBillingType())) + .collect(Collectors.groupingBy(ReceivablePayableCargoFee::getDetailId, + Collectors.mapping(ReceivablePayableCargoFee::getBillingType, + Collectors.collectingAndThen(Collectors.toCollection(LinkedHashSet::new), + values -> String.join("、", values))))); + for (FormalSettlementDetail detail : details) { + detail.setBillingType(billingTypeMap.getOrDefault(detail.getSourceDetailId(), "")); + } + } + /** * 为历史正式结算明细补充运单收发货信息，保留明细中已有的快照值。 */ @@ -1090,9 +1121,23 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl detailFees(Long detailId) { FormalSettlementDetail detail = detailMapper.selectById(detailId); if (detail == null || Objects.equals(detail.getIsDeleted(), 1)) throw new ServiceException("正式结算明细不存在"); - return detailFeeMapper.selectList(Wrappers.lambdaQuery() + List fees = detailFeeMapper.selectList(Wrappers.lambdaQuery() .eq(FormalSettlementDetailFee::getFormalSettlementDetailId, detailId) .orderByAsc(FormalSettlementDetailFee::getLineNo)); + List sourceFeeIds = fees.stream().map(FormalSettlementDetailFee::getSourceFeeId) + .filter(Objects::nonNull).toList(); + if (sourceFeeIds.isEmpty()) { + return fees; + } + Map sourceFeeMap = receivablePayableCargoFeeMapper.selectBatchIds(sourceFeeIds).stream() + .collect(Collectors.toMap(ReceivablePayableCargoFee::getId, Function.identity(), (left, right) -> left)); + fees.forEach(fee -> { + ReceivablePayableCargoFee sourceFee = sourceFeeMap.get(fee.getSourceFeeId()); + if (sourceFee != null) { + fee.setBillingRulesJson(sourceFee.getBillingRulesJson()); + } + }); + return fees; } @Override @@ -1102,11 +1147,15 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl existing = detailFees(detail.getId()).stream() .collect(Collectors.toMap(FormalSettlementDetailFee::getId, item -> item)); if (existing.size() != request.getRows().size()) throw new ServiceException("费用调整行数据不完整"); List changes = new java.util.ArrayList<>(); + Map beforeData = new LinkedHashMap<>(); + Map afterData = new LinkedHashMap<>(); for (PreSettlementDetailAdjustRequest.FeeRow row : request.getRows()) { FormalSettlementDetailFee fee = existing.get(row.getId()); if (fee == null) throw new ServiceException("存在无效的货物费用行"); @@ -1119,7 +1168,6 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl rows = detailFees(detail.getId()); detail.setTransportQuantity(rows.stream().map(FormalSettlementDetailFee::getTransportQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + detail.setMileage(rows.stream().map(FormalSettlementDetailFee::getMileage).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + // 运输单价无法按行简单求和，与前端暂存逻辑一致：取首行费用单价。 + detail.setUnitPrice(rows.stream().map(FormalSettlementDetailFee::getUnitPrice).filter(Objects::nonNull).findFirst().orElse(null)); detail.setFreightAmount(rows.stream().map(FormalSettlementDetailFee::getFreightAmount).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add)); detail.setOriginalAmount(rows.stream().map(FormalSettlementDetailFee::getOriginalAmount).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add)); detail.setSettlementAmountTax(rows.stream().map(FormalSettlementDetailFee::getSettlementAmountTax).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add)); - detail.setSettlementAmountNoTax(rows.stream().map(FormalSettlementDetailFee::getSettlementAmountNoTax).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)); + boolean hasNoTax = rows.stream().anyMatch(fee -> fee.getSettlementAmountNoTax() != null); + detail.setSettlementAmountNoTax(hasNoTax + ? rows.stream().map(FormalSettlementDetailFee::getSettlementAmountNoTax).filter(Objects::nonNull).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add) + : null); detail.setAdjustAmount(detail.getSettlementAmountTax().subtract(detail.getOriginalAmount())); - detail.setRemark(reason); + Map feeItems = new LinkedHashMap<>(); + rows.forEach(fee -> parseFeeItems(fee.getFeeItemsJson()).forEach((name, amount) -> + feeItems.merge(name, money(amount), BigDecimal::add))); + detail.setFeeItemsJson(JsonUtil.toJson(feeItems)); + detail.setRemark(detailRemark); detailMapper.updateById(detail); + appendTextChange(changes, beforeData, afterData, "备注", beforeDetailRemark, detailRemark); + if (changes.isEmpty()) { + throw new ServiceException("未修改任何结算明细费用"); + } rebuildSummaryFees(settlement.getId()); refreshSettlementAmount(settlement); saveChange(settlement.getId(), "结算明细项", detail.getLineNo(), "调整", - changes.isEmpty() ? "调整结算明细费用" : String.join("；", changes), reason); + String.join("；", changes), detailRemark, beforeData, afterData); } private void rebuildSummaryFees(Long settlementId) { @@ -1314,10 +1376,18 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl changes = new java.util.ArrayList<>(); + Map beforeData = new LinkedHashMap<>(); + Map afterData = new LinkedHashMap<>(); + appendChange(changes, beforeData, afterData, "调整金额", beforeAdjustAmount, row.getAdjustAmount()); + appendChange(changes, beforeData, afterData, "结算金额", beforeSettlementAmount, row.getSettlementAmount()); + appendTextChange(changes, beforeData, afterData, "备注", beforeRemark, row.getRemark()); + if (!changes.isEmpty()) { + saveChange(settlementId, "合计费用项", row.getLineNo(), "调整", String.join("；", changes), "", + beforeData, afterData); + } } for (FormalSettlementSummaryFee manualRow : existingManualRows) { - if (!retainedManualIds.contains(manualRow.getId())) summaryFeeMapper.deleteById(manualRow.getId()); + if (!retainedManualIds.contains(manualRow.getId())) { + summaryFeeMapper.deleteById(manualRow.getId()); + Map beforeData = new LinkedHashMap<>(); + Map afterData = new LinkedHashMap<>(); + beforeData.put("费用类型", manualRow.getFeeType()); + beforeData.put("费用项", manualRow.getFeeItem()); + beforeData.put("调整金额", money(manualRow.getAdjustAmount())); + beforeData.put("结算金额", money(manualRow.getSettlementAmount())); + beforeData.put("备注", manualRow.getRemark()); + afterData.put("费用类型", ""); + afterData.put("费用项", ""); + afterData.put("调整金额", BigDecimal.ZERO.setScale(2)); + afterData.put("结算金额", BigDecimal.ZERO.setScale(2)); + afterData.put("备注", ""); + saveChange(settlementId, "合计费用项", manualRow.getLineNo(), "删除", + "删除合计费用项【" + manualRow.getFeeItem() + "】金额【" + money(manualRow.getSettlementAmount()) + "】", + "", beforeData, afterData); + } } renumberSummaryFees(settlementId); } @@ -1995,14 +2097,77 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl changes = new java.util.ArrayList<>(); + Map beforeData = new LinkedHashMap<>(); + Map afterData = new LinkedHashMap<>(); + if (creating) { + changes.add("新增合计费用项【" + row.getFeeItem() + "】金额【" + money(row.getSettlementAmount()) + "】"); + beforeData.put("费用类型", ""); + beforeData.put("费用项", ""); + beforeData.put("调整金额", BigDecimal.ZERO.setScale(2)); + beforeData.put("结算金额", BigDecimal.ZERO.setScale(2)); + beforeData.put("备注", ""); + afterData.put("费用类型", row.getFeeType()); + afterData.put("费用项", row.getFeeItem()); + afterData.put("调整金额", money(row.getAdjustAmount())); + afterData.put("结算金额", money(row.getSettlementAmount())); + afterData.put("备注", row.getRemark()); + saveChange(settlementId, "合计费用项", row.getLineNo(), "新增", String.join("；", changes), "", + beforeData, afterData); + return; + } + appendTextChange(changes, beforeData, afterData, "费用类型", beforeFeeType, row.getFeeType()); + appendTextChange(changes, beforeData, afterData, "费用项", beforeFeeItem, row.getFeeItem()); + appendChange(changes, beforeData, afterData, "调整金额", beforeAdjustAmount, row.getAdjustAmount()); + appendChange(changes, beforeData, afterData, "结算金额", beforeSettlementAmount, row.getSettlementAmount()); + appendTextChange(changes, beforeData, afterData, "备注", beforeRemark, row.getRemark()); + if (changes.isEmpty()) { + return; + } + saveChange(settlementId, "合计费用项", row.getLineNo(), "调整", String.join("；", changes), "", + beforeData, afterData); + } + + private void appendChange(List changes, Map beforeData, Map afterData, + String fieldName, BigDecimal before, BigDecimal after) { + BigDecimal oldValue = money(before); + BigDecimal newValue = money(after); + if (oldValue.compareTo(newValue) != 0) { + changes.add("【" + fieldName + "】从【" + oldValue + "】调整为【" + newValue + "】"); + beforeData.put(fieldName, oldValue); + afterData.put(fieldName, newValue); + } + } + + private void appendTextChange(List changes, Map beforeData, Map afterData, + String fieldName, String before, String after) { + String oldValue = before == null ? "" : before; + String newValue = after == null ? "" : after; + if (!Objects.equals(oldValue, newValue)) { + changes.add("【" + fieldName + "】从【" + oldValue + "】调整为【" + newValue + "】"); + beforeData.put(fieldName, oldValue); + afterData.put(fieldName, newValue); + } + } + private void saveChange(Long settlementId, String changeType, Integer lineNo, String operationType, String content, String reason) { + saveChange(settlementId, changeType, lineNo, operationType, content, reason, null, null); + } + + private void saveChange(Long settlementId, String changeType, Integer lineNo, String operationType, + String content, String reason, Map beforeData, Map afterData) { FormalSettlementChangeRecord record = new FormalSettlementChangeRecord(); record.setFormalSettlementId(settlementId); record.setChangeType(changeType); record.setLineNo(lineNo); record.setOperationType(operationType); record.setChangeContent(content); + record.setBeforeData(beforeData == null ? null : JsonUtil.toJson(beforeData)); + record.setAfterData(afterData == null ? null : JsonUtil.toJson(afterData)); record.setChangeReason(reason); record.setOperatorName(Func.isEmpty(AuthUtil.getUserName()) ? "system" : AuthUtil.getUserName()); record.setChangeTime(LocalDateTime.now()); 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 b3643674..6b827dd5 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 @@ -118,6 +118,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -324,6 +325,7 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl resolvePreSettlements(List ids) { - if (ids.size() <= 1) { + if (ids.isEmpty()) { return List.of(); } List settlements = ids.stream().map(preSettlementMapper::selectById).toList(); @@ -1953,9 +1955,11 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl !Objects.equals(contractId, item.getContractId()))) { - throw new ServiceException("多选预结算单必须属于同一合同"); + if (settlements.size() > 1) { + Long contractId = settlements.get(0).getContractId(); + if (contractId == null || settlements.stream().anyMatch(item -> !Objects.equals(contractId, item.getContractId()))) { + throw new ServiceException("多选预结算单必须属于同一合同"); + } } return settlements; } @@ -1982,24 +1986,30 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl settlements) { - if (settlements.size() > 1) { - settlementRelationMapper.delete(Wrappers.lambdaQuery() - .eq(PaymentApplicationSettlement::getPaymentApplicationId, entity.getId())); - } else { - settlementRelationMapper.delete(Wrappers.lambdaQuery() - .eq(PaymentApplicationSettlement::getPaymentApplicationId, entity.getId()) - .isNotNull(PaymentApplicationSettlement::getPreSettlementId)); + settlementRelationMapper.delete(Wrappers.lambdaQuery() + .eq(PaymentApplicationSettlement::getPaymentApplicationId, entity.getId()) + .isNotNull(PaymentApplicationSettlement::getPreSettlementId)); + List targetSettlements = settlements; + if (targetSettlements.isEmpty() && entity.getPreSettlementId() != null) { + PreSettlement single = preSettlementMapper.selectById(entity.getPreSettlementId()); + if (single != null && !Objects.equals(single.getIsDeleted(), 1)) { + targetSettlements = List.of(single); + } + } + if (targetSettlements.isEmpty()) { return; } - BigDecimal totalBase = settlements.stream() + // 单选/多选均落关联行，生成即占用可付款额度（删除草稿或审核不通过后释放） + BigDecimal totalBase = targetSettlements.stream() .map(item -> payableOfPreSettlement(item.getId(), item.getSettlementAmount(), entity.getId())) .reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal remainingApplied = money(entity.getAppliedAmount()); - for (int index = 0; index < settlements.size(); index++) { - PreSettlement settlement = settlements.get(index); + for (int index = 0; index < targetSettlements.size(); index++) { + PreSettlement settlement = targetSettlements.get(index); BigDecimal base = payableOfPreSettlement(settlement.getId(), settlement.getSettlementAmount(), entity.getId()); - BigDecimal applied = index == settlements.size() - 1 || totalBase.compareTo(BigDecimal.ZERO) == 0 - ? remainingApplied : money(entity.getAppliedAmount()).multiply(base).divide(totalBase, 2, RoundingMode.DOWN); + BigDecimal applied = index == targetSettlements.size() - 1 || totalBase.compareTo(BigDecimal.ZERO) == 0 + ? remainingApplied + : money(entity.getAppliedAmount()).multiply(base).divide(totalBase, 2, RoundingMode.DOWN); PaymentApplicationSettlement relation = new PaymentApplicationSettlement(); relation.setPaymentApplicationId(entity.getId()); relation.setPreSettlementId(settlement.getId()); @@ -2049,16 +2059,22 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl wrapper) { - return list(wrapper.ne(PaymentApplication::getApprovalStatus, TransportBusiConstant.VOIDED)).stream() - .filter(item -> !releasedBillPayment(item)) + return list(wrapper).stream() + .filter(item -> !releasedOccupiedPayment(item)) .map(PaymentApplication::getAppliedAmount).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); } - /** 汇票付款被驳回后不再占用结算单可付款金额，删除草稿由逻辑删除自然释放。 */ - private boolean releasedBillPayment(PaymentApplication payment) { - return payment != null - && isBillPayment(payment.getPaymentMethod()) - && TransportBusiConstant.RETURNED.equals(payment.getApprovalStatus()); + /** + * 已释放占用的付款申请：作废、审核不通过（驳回）不再占用可付款金额； + * 删除草稿由逻辑删除自然释放。生成草稿/审批中/审批通过均占用。 + */ + private boolean releasedOccupiedPayment(PaymentApplication payment) { + if (payment == null || Objects.equals(payment.getIsDeleted(), 1)) { + return true; + } + String status = payment.getApprovalStatus(); + return TransportBusiConstant.VOIDED.equals(status) + || TransportBusiConstant.RETURNED.equals(status); } private BigDecimal cumulativeAppliedAmount(String paymentType, Long referenceId, Long excludeId) { @@ -2071,14 +2087,88 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl paymentIds = new LinkedHashSet<>(); + if (preSettlementReference) { + List relations = settlementRelationMapper.selectList( + Wrappers.lambdaQuery() + .eq(PaymentApplicationSettlement::getPreSettlementId, referenceId) + .eq(PaymentApplicationSettlement::getIsDeleted, 0)); + for (PaymentApplicationSettlement relation : relations) { + if (relation.getPaymentApplicationId() != null) { + paymentIds.add(relation.getPaymentApplicationId()); + } + } + list(Wrappers.lambdaQuery() + .eq(PaymentApplication::getPreSettlementId, referenceId) + .ne(PaymentApplication::getApprovalStatus, TransportBusiConstant.VOIDED)) + .forEach(payment -> paymentIds.add(payment.getId())); + } else { + List relations = settlementRelationMapper.selectList( + Wrappers.lambdaQuery() + .eq(PaymentApplicationSettlement::getFormalSettlementId, referenceId) + .eq(PaymentApplicationSettlement::getIsDeleted, 0)); + for (PaymentApplicationSettlement relation : relations) { + if (relation.getPaymentApplicationId() != null) { + paymentIds.add(relation.getPaymentApplicationId()); + } + } + list(Wrappers.lambdaQuery() + .eq(PaymentApplication::getSettlementId, referenceId) + .ne(PaymentApplication::getApprovalStatus, TransportBusiConstant.VOIDED)) + .forEach(payment -> paymentIds.add(payment.getId())); + } + if (paymentIds.isEmpty()) { + return 1; + } + long priorCount = listByIds(paymentIds.stream().toList()).stream() + .filter(payment -> !releasedOccupiedPayment(payment)) + .filter(payment -> !Objects.equals(payment.getId(), excludeId)) + .count(); + return (int) priorCount + 1; + } + private BigDecimal cumulativeFormalSettlementApplied(Long settlementId, Long excludeId) { - return sumApplied(Wrappers.lambdaQuery() + // 多选正式结算时按关联行累计占用；单选兼容主表 settlementId + List relations = settlementRelationMapper.selectList( + Wrappers.lambdaQuery() + .eq(PaymentApplicationSettlement::getFormalSettlementId, settlementId) + .eq(PaymentApplicationSettlement::getIsDeleted, 0)); + Set coveredPaymentIds = new HashSet<>(); + BigDecimal relationAmount = BigDecimal.ZERO; + if (!relations.isEmpty()) { + Map payments = listByIds(relations.stream() + .map(PaymentApplicationSettlement::getPaymentApplicationId).filter(Objects::nonNull).distinct().toList()) + .stream().collect(Collectors.toMap(PaymentApplication::getId, item -> item, (left, right) -> left)); + for (PaymentApplicationSettlement relation : relations) { + PaymentApplication payment = payments.get(relation.getPaymentApplicationId()); + if (releasedOccupiedPayment(payment) || Objects.equals(payment.getId(), excludeId)) { + if (payment != null) { + coveredPaymentIds.add(payment.getId()); + } + continue; + } + coveredPaymentIds.add(payment.getId()); + relationAmount = relationAmount.add(money(relation.getAppliedAmount())); + } + } + BigDecimal legacyAmount = sumApplied(Wrappers.lambdaQuery() .eq(PaymentApplication::getSettlementId, settlementId) - .ne(excludeId != null, PaymentApplication::getId, excludeId)); + .ne(excludeId != null, PaymentApplication::getId, excludeId) + .notIn(!coveredPaymentIds.isEmpty(), PaymentApplication::getId, coveredPaymentIds)); + return relationAmount.add(legacyAmount); } private BigDecimal cumulativePreSettlementApplied(Long preSettlementId, Long excludeId) { - // 进度预付、尾款付款关联同一预结算单时累计占用可付款额度；多选时按关联行的申请金额累计，避免把整单金额算到第一张预结算上 + // 进度预付、尾款付款关联同一预结算单时累计占用可付款额度；按关联行申请金额累计，兼容历史仅写主表的单据 List relations = settlementRelationMapper.selectList( Wrappers.lambdaQuery() .eq(PaymentApplicationSettlement::getPreSettlementId, preSettlementId) @@ -2091,23 +2181,21 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl item, (left, right) -> left)); for (PaymentApplicationSettlement relation : relations) { PaymentApplication payment = payments.get(relation.getPaymentApplicationId()); - if (payment == null || Objects.equals(payment.getIsDeleted(), 1)) { + if (releasedOccupiedPayment(payment) || Objects.equals(payment.getId(), excludeId)) { + if (payment != null) { + coveredPaymentIds.add(payment.getId()); + } continue; } coveredPaymentIds.add(payment.getId()); - if (Objects.equals(payment.getId(), excludeId) || TransportBusiConstant.VOIDED.equals(payment.getApprovalStatus()) - || releasedBillPayment(payment)) { - continue; - } relationAmount = relationAmount.add(money(relation.getAppliedAmount())); } } BigDecimal legacyAmount = list(Wrappers.lambdaQuery() .eq(PaymentApplication::getPreSettlementId, preSettlementId) .ne(excludeId != null, PaymentApplication::getId, excludeId) - .notIn(!coveredPaymentIds.isEmpty(), PaymentApplication::getId, coveredPaymentIds) - .ne(PaymentApplication::getApprovalStatus, TransportBusiConstant.VOIDED)).stream() - .filter(item -> !releasedBillPayment(item)) + .notIn(!coveredPaymentIds.isEmpty(), PaymentApplication::getId, coveredPaymentIds)).stream() + .filter(item -> !releasedOccupiedPayment(item)) .map(PaymentApplication::getAppliedAmount).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); return relationAmount.add(legacyAmount); } @@ -2150,6 +2238,9 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl sourcePage = sourceDetailMapper.selectPage( new Page<>(page.getCurrent(), page.getSize()), wrapper); Page> result = new Page<>(sourcePage.getCurrent(), sourcePage.getSize(), sourcePage.getTotal()); - result.setRecords(sourcePage.getRecords().stream().map(this::candidateMap).toList()); + List> records = sourcePage.getRecords().stream().map(this::candidateMap).toList(); + fillCandidateBillingTypes(records); + result.setRecords(records); return result; } @@ -616,7 +618,9 @@ public class PreSettlementServiceImpl extends BaseServiceImpl existingMap = detailFees(detail.getId()).stream() .collect(Collectors.toMap(PreSettlementDetailFee::getId, Function.identity())); if (request.getRows().size() != existingMap.size()) { @@ -636,7 +640,6 @@ public class PreSettlementServiceImpl extends BaseServiceImpl beforeFeeItems = parseFeeItems(fee.getFeeItemsJson()); fee.setTransportQuantity(nonNegative(requestRow.getTransportQuantity(), "运输总量")); fee.setMileage(nonNegative(requestRow.getMileage(), "里程")); @@ -649,7 +652,6 @@ public class PreSettlementServiceImpl extends BaseServiceImpl> records) { + if (records == null || records.isEmpty()) { + return; + } + List detailIds = records.stream() + .map(item -> Func.toLong(item.get("id"))) + .filter(id -> id != null && id > 0) + .distinct() + .toList(); + if (detailIds.isEmpty()) { + return; + } + Map billingTypeMap = sourceFeeMapper.selectList( + Wrappers.lambdaQuery() + .in(ReceivablePayableCargoFee::getDetailId, detailIds) + .orderByAsc(ReceivablePayableCargoFee::getLineNo)) + .stream() + .filter(fee -> Func.isNotEmpty(fee.getBillingType())) + .collect(Collectors.groupingBy(ReceivablePayableCargoFee::getDetailId, + Collectors.mapping(ReceivablePayableCargoFee::getBillingType, + Collectors.collectingAndThen(Collectors.toCollection(LinkedHashSet::new), + values -> String.join("、", values))))); + for (Map record : records) { + Long detailId = Func.toLong(record.get("id")); + record.put("billingType", billingTypeMap.getOrDefault(detailId, "")); + } + } + private void synchronizeDetails(PreSettlement settlement, List requestedIds, boolean allowSourceMismatch) { List distinctIds = requestedIds.stream().filter(Objects::nonNull).distinct().toList(); List existingDetails = listDetails(settlement.getId()); @@ -1001,13 +1036,30 @@ public class PreSettlementServiceImpl extends BaseServiceImpllambdaQuery() .eq(PreSettlementSummaryFee::getPreSettlementId, settlementId) .eq(PreSettlementSummaryFee::getManualFlag, 0)); - int lineNo = 1; - for (Map.Entry entry : aggregates.entrySet()) { + // 尽量沿用已有系统归集行的序号，避免重建后与手工费用交错顺序被打乱。 + List> orderedAggregates = new ArrayList<>(aggregates.entrySet()); + orderedAggregates.sort((left, right) -> { + PreSettlementSummaryFee leftOld = existingGenerated.get(left.getKey()); + PreSettlementSummaryFee rightOld = existingGenerated.get(right.getKey()); + Integer leftLineNo = leftOld == null ? null : leftOld.getLineNo(); + Integer rightLineNo = rightOld == null ? null : rightOld.getLineNo(); + if (leftLineNo == null && rightLineNo == null) { + return 0; + } + if (leftLineNo == null) { + return 1; + } + if (rightLineNo == null) { + return -1; + } + return Integer.compare(leftLineNo, rightLineNo); + }); + for (Map.Entry entry : orderedAggregates) { String[] keyParts = entry.getKey().split("\\|", 2); PreSettlementSummaryFee old = existingGenerated.get(entry.getKey()); PreSettlementSummaryFee row = new PreSettlementSummaryFee(); row.setPreSettlementId(settlementId); - row.setLineNo(lineNo++); + row.setLineNo(old == null || old.getLineNo() == null ? Integer.MAX_VALUE : old.getLineNo()); row.setFeeType(keyParts[0]); row.setFeeItem(keyParts.length > 1 ? keyParts[1] : ""); // 原金额是明细首次生成时的快照，多次调整后不得被当前结算金额覆盖。 @@ -1023,7 +1075,14 @@ public class PreSettlementServiceImpl extends BaseServiceImpl requestRows) { - if (requestRows == null) return; + if (requestRows == null) { + return; + } + // 空列表表示沿用 rebuildSummaryFees 结果（如更换合同后），不得再按空请求删光合计行。 + if (requestRows.isEmpty()) { + renumberSummaryFees(settlementId); + return; + } Map> allowedManualFees = new LinkedHashMap<>(); if (requestRows.stream().anyMatch(row -> Integer.valueOf(1).equals(row.getManualFlag()))) { for (Map option : feeOptions()) { @@ -1043,6 +1102,7 @@ public class PreSettlementServiceImpl extends BaseServiceImpl availableGeneratedRows = new ArrayList<>(existingGeneratedRows); Set retainedManualIds = new LinkedHashSet<>(); Set retainedGeneratedIds = new LinkedHashSet<>(); + int lineNo = 1; for (PreSettlementSaveRequest.SummaryFee requestRow : requestRows) { if (Integer.valueOf(1).equals(requestRow.getManualFlag())) { String feeType = requiredText(requestRow.getFeeType(), "费用类型"); @@ -1059,11 +1119,20 @@ public class PreSettlementServiceImpl extends BaseServiceImpl beforeData = new LinkedHashMap<>(); + Map afterData = new LinkedHashMap<>(); + beforeData.put("费用项", row.getFeeItem()); + beforeData.put("调整金额", before); + beforeData.put("结算金额", money(row.getOriginalAmount().add(before))); + afterData.put("费用项", row.getFeeItem()); + afterData.put("调整金额", row.getAdjustAmount()); + afterData.put("结算金额", money(row.getSettlementAmount())); + saveChange(settlementId, "合计费用项", row.getLineNo(), "调整", + "【" + row.getFeeItem() + "-调整金额】从【" + before + "】调整为【" + row.getAdjustAmount() + "】", + "", beforeData, afterData); } } for (PreSettlementSummaryFee manualRow : manualRows) { if (!retainedManualIds.contains(manualRow.getId())) { summaryFeeMapper.deleteById(manualRow.getId()); - saveChange(settlementId, "合计费用项", null, "删除", - "删除" + manualRow.getFeeItem() + "费用" + manualRow.getSettlementAmount(), ""); + Map beforeData = new LinkedHashMap<>(); + Map afterData = new LinkedHashMap<>(); + beforeData.put("费用类型", manualRow.getFeeType()); + beforeData.put("费用项", manualRow.getFeeItem()); + beforeData.put("调整金额", money(manualRow.getAdjustAmount())); + beforeData.put("结算金额", money(manualRow.getSettlementAmount())); + beforeData.put("备注", manualRow.getRemark()); + afterData.put("费用类型", ""); + afterData.put("费用项", ""); + afterData.put("调整金额", BigDecimal.ZERO.setScale(2)); + afterData.put("结算金额", BigDecimal.ZERO.setScale(2)); + afterData.put("备注", ""); + saveChange(settlementId, "合计费用项", manualRow.getLineNo(), "删除", + "删除合计费用项【" + manualRow.getFeeItem() + "】金额【" + money(manualRow.getSettlementAmount()) + "】", + "", beforeData, afterData); } } for (PreSettlementSummaryFee generatedRow : existingGeneratedRows) { @@ -1122,32 +1218,63 @@ public class PreSettlementServiceImpl extends BaseServiceImpl fees = detailFees(detail.getId()); + BigDecimal transportQuantity = fees.stream().map(PreSettlementDetailFee::getTransportQuantity) + .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal mileage = fees.stream().map(PreSettlementDetailFee::getMileage) + .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal freightAmount = fees.stream().map(PreSettlementDetailFee::getFreightAmount) .map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal originalAmount = fees.stream().map(PreSettlementDetailFee::getOriginalAmount) .map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal settlementAmountTax = fees.stream().map(PreSettlementDetailFee::getSettlementAmountTax) .map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal settlementAmountNoTax = fees.stream().map(PreSettlementDetailFee::getSettlementAmountNoTax) + .filter(Objects::nonNull).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); Map feeItems = new LinkedHashMap<>(); fees.forEach(fee -> parseFeeItems(fee.getFeeItemsJson()).forEach((name, amount) -> feeItems.merge(name, money(amount), BigDecimal::add))); + // 运输单价无法按行简单求和，与前端暂存逻辑一致：取首行费用单价。 + BigDecimal unitPrice = fees.stream().map(PreSettlementDetailFee::getUnitPrice) + .filter(Objects::nonNull).findFirst().orElse(null); + String remark = fees.stream().map(PreSettlementDetailFee::getRemark) + .filter(Func::isNotEmpty).findFirst().orElse(detail.getRemark()); + detail.setTransportQuantity(money(transportQuantity)); + detail.setMileage(mileage); + detail.setUnitPrice(unitPrice); detail.setFreightAmount(money(freightAmount)); detail.setOriginalAmount(money(originalAmount)); detail.setAdjustAmount(money(settlementAmountTax.subtract(originalAmount))); detail.setSettlementAmountTax(money(settlementAmountTax)); + detail.setSettlementAmountNoTax(fees.stream().anyMatch(fee -> fee.getSettlementAmountNoTax() != null) + ? money(settlementAmountNoTax) : null); detail.setFeeItemsJson(JsonUtil.toJson(feeItems)); + detail.setRemark(limitRemark(remark, 200)); detailMapper.updateById(detail); } + /** + * 结算金额以结算合计为准（含手工新增费用），与详情页合计及付款申请取数口径一致。 + * 合计行为空时回退为明细含税金额合计。 + */ private void refreshSettlementAmount(PreSettlement settlement) { - BigDecimal settlementAmount = listDetails(settlement.getId()).stream() - .map(PreSettlementDetail::getSettlementAmountTax).map(this::money) - .reduce(BigDecimal.ZERO, BigDecimal::add); + List summaryFees = listSummaryFees(settlement.getId()); + BigDecimal settlementAmount; + if (!summaryFees.isEmpty()) { + settlementAmount = summaryFees.stream() + .map(PreSettlementSummaryFee::getSettlementAmount) + .map(this::money) + .reduce(BigDecimal.ZERO, BigDecimal::add); + } else { + settlementAmount = listDetails(settlement.getId()).stream() + .map(PreSettlementDetail::getSettlementAmountTax) + .map(this::money) + .reduce(BigDecimal.ZERO, BigDecimal::add); + } settlement.setSettlementAmount(money(settlementAmount)); BigDecimal rate = normalizeRate(settlement.getExchangeRate(), settlement.getCurrency()); settlement.setExchangeRate(rate); @@ -1405,6 +1532,40 @@ public class PreSettlementServiceImpl extends BaseServiceImpl changes = new ArrayList<>(); + Map beforeData = new LinkedHashMap<>(); + Map afterData = new LinkedHashMap<>(); + if (creating) { + changes.add("新增合计费用项【" + row.getFeeItem() + "】金额【" + money(row.getSettlementAmount()) + "】"); + beforeData.put("费用类型", ""); + beforeData.put("费用项", ""); + beforeData.put("调整金额", BigDecimal.ZERO.setScale(2)); + beforeData.put("结算金额", BigDecimal.ZERO.setScale(2)); + beforeData.put("备注", ""); + afterData.put("费用类型", row.getFeeType()); + afterData.put("费用项", row.getFeeItem()); + afterData.put("调整金额", money(row.getAdjustAmount())); + afterData.put("结算金额", money(row.getSettlementAmount())); + afterData.put("备注", row.getRemark()); + saveChange(settlementId, "合计费用项", row.getLineNo(), "新增", String.join("；", changes), "", + beforeData, afterData); + return; + } + appendTextChange(changes, beforeData, afterData, "费用类型", beforeFeeType, row.getFeeType()); + appendTextChange(changes, beforeData, afterData, "费用项", beforeFeeItem, row.getFeeItem()); + appendChange(changes, beforeData, afterData, "调整金额", beforeAdjustAmount, row.getAdjustAmount()); + appendChange(changes, beforeData, afterData, "结算金额", beforeSettlementAmount, row.getSettlementAmount()); + appendTextChange(changes, beforeData, afterData, "备注", beforeRemark, row.getRemark()); + if (changes.isEmpty()) { + return; + } + saveChange(settlementId, "合计费用项", row.getLineNo(), "调整", String.join("；", changes), "", + beforeData, afterData); + } + private void saveChange(Long settlementId, String changeType, Integer lineNo, String operationType, String content, String reason) { saveChange(settlementId, changeType, lineNo, operationType, content, reason, null, null); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java index 5a40decd..0f92b9b4 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/WaybillImportBatchServiceImpl.java @@ -385,9 +385,17 @@ public class WaybillImportBatchServiceImpl extends BaseServiceImpl idList = Func.toLongList(ids); if (Func.isEmpty(idList)) throw new ServiceException("请选择需要删除的运单批次"); + List batches = listByIds(idList).stream() + .filter(batch -> !Objects.equals(batch.getIsDeleted(), 1)) + .toList(); + // 与前端一致：仅草稿可删；选中含已完成/进行中时整批拒绝 + boolean hasNonDraft = batches.stream() + .anyMatch(batch -> !STATUS_DRAFT.equals(batch.getImportStatus())); + if (hasNonDraft) { + throw new ServiceException("已完成运单不可删除"); + } BusinessRemoveResultVO result = new BusinessRemoveResultVO(); - for (WaybillImportBatch batch : listByIds(idList)) { - if (Objects.equals(batch.getIsDeleted(), 1)) continue; + for (WaybillImportBatch batch : batches) { List waybills = waybillService.list(Wrappers.lambdaQuery() .eq(Waybill::getImportBatchId, batch.getId()).eq(Waybill::getIsDeleted, 0)); if (Func.isNotEmpty(waybills)) { diff --git a/doc/sql/transport/blade_formal_settlement_20260818.sql b/doc/sql/transport/blade_formal_settlement_20260818.sql index 98ccfc06..240eafcb 100644 --- a/doc/sql/transport/blade_formal_settlement_20260818.sql +++ b/doc/sql/transport/blade_formal_settlement_20260818.sql @@ -44,7 +44,9 @@ CREATE TABLE IF NOT EXISTS `blade_formal_settlement_change_record` ( `update_user` bigint(20) DEFAULT NULL, `update_time` datetime DEFAULT NULL, `status` int(11) DEFAULT '1', `is_deleted` int(11) DEFAULT '0', `formal_settlement_id` bigint(20) NOT NULL COMMENT '正式结算单ID', `change_type` varchar(50) NOT NULL COMMENT '变更类型', `line_no` int(11) DEFAULT NULL COMMENT '行号', `operation_type` varchar(30) NOT NULL COMMENT '操作类型', - `change_content` text NOT NULL COMMENT '变更内容', `change_reason` varchar(200) DEFAULT NULL COMMENT '变更原因', + `change_content` text NOT NULL COMMENT '变更内容', + `before_data` longtext COMMENT '变更前数据JSON', `after_data` longtext COMMENT '变更后数据JSON', + `change_reason` varchar(200) DEFAULT NULL COMMENT '变更原因', `operator_name` varchar(100) DEFAULT NULL COMMENT '操作人', `change_time` datetime NOT NULL COMMENT '变更时间', PRIMARY KEY (`id`), KEY `idx_formal_settlement_change_bill` (`formal_settlement_id`), KEY `idx_formal_settlement_change_time` (`change_time`) @@ -123,17 +125,29 @@ CREATE TABLE IF NOT EXISTS `blade_formal_settlement_payment` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='正式结算付款申请'; INSERT INTO `blade_menu` (`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) VALUES -(2090000000000001040,2090000000000001000,'formal_settlement','正式结算单','formal_settlement','/settlement/formal-settlement','iconfont icon-caidanguanli',4,1,0,1,NULL,'',0), -(2090000000000001041,2090000000000001040,'formal_settlement_view','查看','formal_settlement_view','','',1,2,0,1,NULL,'',0), -(2090000000000001042,2090000000000001040,'formal_settlement_add','新增','formal_settlement_add','','',2,2,0,1,NULL,'',0), -(2090000000000001043,2090000000000001040,'formal_settlement_edit','编辑','formal_settlement_edit','','',3,2,0,1,NULL,'',0), -(2090000000000001044,2090000000000001040,'formal_settlement_delete','删除','formal_settlement_delete','','',4,2,0,1,NULL,'',0), -(2090000000000001045,2090000000000001040,'formal_settlement_submit','提交审批','formal_settlement_submit','','',5,2,0,1,NULL,'',0), -(2090000000000001046,2090000000000001040,'formal_settlement_approve','审批','formal_settlement_approve','','',6,2,0,1,NULL,'',0), -(2090000000000001047,2090000000000001040,'formal_settlement_sync','同步金蝶','formal_settlement_sync','','',7,2,0,1,NULL,'',0), -(2090000000000001048,2090000000000001040,'formal_settlement_print','打印','formal_settlement_print','','',8,2,0,1,NULL,'',0), -(2090000000000001049,2090000000000001040,'formal_settlement_export','导出','formal_settlement_export','','',9,2,0,1,NULL,'',0), -(2090000000000001050,2090000000000001040,'formal_settlement_void','作废','formal_settlement_void','','',10,2,0,1,NULL,'',0), -(2090000000000001051,2090000000000001040,'formal_settlement_adjust','明细调整','formal_settlement_adjust','','',11,2,0,1,NULL,'',0), -(2090000000000001052,2090000000000001040,'formal_settlement_payment','付款申请','formal_settlement_payment','','',12,2,0,1,NULL,'',0) +(2090000000000001040,2090000000000001000,'payment_settlement','付款结算单','payment_settlement','/settlement/payment-settlement','iconfont icon-caidanguanli',4,1,0,1,NULL,'',0), +(2090000000000001041,2090000000000001040,'payment_settlement_view','查看','payment_settlement_view','','',1,2,0,1,NULL,'',0), +(2090000000000001042,2090000000000001040,'payment_settlement_add','新增','payment_settlement_add','','',2,2,0,1,NULL,'',0), +(2090000000000001043,2090000000000001040,'payment_settlement_edit','编辑','payment_settlement_edit','','',3,2,0,1,NULL,'',0), +(2090000000000001044,2090000000000001040,'payment_settlement_delete','删除','payment_settlement_delete','','',4,2,0,1,NULL,'',0), +(2090000000000001045,2090000000000001040,'payment_settlement_submit','提交审批','payment_settlement_submit','','',5,2,0,1,NULL,'',0), +(2090000000000001046,2090000000000001040,'payment_settlement_approve','审批','payment_settlement_approve','','',6,2,0,1,NULL,'',0), +(2090000000000001047,2090000000000001040,'payment_settlement_sync','同步金蝶','payment_settlement_sync','','',7,2,0,1,NULL,'',0), +(2090000000000001048,2090000000000001040,'payment_settlement_print','打印','payment_settlement_print','','',8,2,0,1,NULL,'',0), +(2090000000000001049,2090000000000001040,'payment_settlement_export','导出','payment_settlement_export','','',9,2,0,1,NULL,'',0), +(2090000000000001050,2090000000000001040,'payment_settlement_void','作废','payment_settlement_void','','',10,2,0,1,NULL,'',0), +(2090000000000001051,2090000000000001040,'payment_settlement_adjust','明细调整','payment_settlement_adjust','','',11,2,0,1,NULL,'',0), +(2090000000000001052,2090000000000001040,'payment_settlement_payment','付款申请','payment_settlement_payment','','',12,2,0,1,NULL,'',0), +(2090000000000002100,2090000000000001000,'receipt_settlement','收款结算单','receipt_settlement','/settlement/receipt-settlement','iconfont icon-caidanguanli',5,1,0,1,NULL,'',0), +(2090000000000002101,2090000000000002100,'receipt_settlement_view','查看','receipt_settlement_view','','',1,2,0,1,NULL,'',0), +(2090000000000002102,2090000000000002100,'receipt_settlement_add','新增','receipt_settlement_add','','',2,2,0,1,NULL,'',0), +(2090000000000002103,2090000000000002100,'receipt_settlement_edit','编辑','receipt_settlement_edit','','',3,2,0,1,NULL,'',0), +(2090000000000002104,2090000000000002100,'receipt_settlement_delete','删除','receipt_settlement_delete','','',4,2,0,1,NULL,'',0), +(2090000000000002105,2090000000000002100,'receipt_settlement_submit','提交审批','receipt_settlement_submit','','',5,2,0,1,NULL,'',0), +(2090000000000002106,2090000000000002100,'receipt_settlement_approve','审批','receipt_settlement_approve','','',6,2,0,1,NULL,'',0), +(2090000000000002107,2090000000000002100,'receipt_settlement_sync','同步金蝶','receipt_settlement_sync','','',7,2,0,1,NULL,'',0), +(2090000000000002108,2090000000000002100,'receipt_settlement_print','打印','receipt_settlement_print','','',8,2,0,1,NULL,'',0), +(2090000000000002109,2090000000000002100,'receipt_settlement_export','导出','receipt_settlement_export','','',9,2,0,1,NULL,'',0), +(2090000000000002110,2090000000000002100,'receipt_settlement_void','作废','receipt_settlement_void','','',10,2,0,1,NULL,'',0), +(2090000000000002111,2090000000000002100,'receipt_settlement_adjust','明细调整','receipt_settlement_adjust','','',11,2,0,1,NULL,'',0) ON DUPLICATE KEY UPDATE `name`=VALUES(`name`),`path`=VALUES(`path`),`is_deleted`=0; diff --git a/doc/sql/transport/blade_formal_settlement_change_record_20260827.sql b/doc/sql/transport/blade_formal_settlement_change_record_20260827.sql index 08ba660e..bf2abb67 100644 --- a/doc/sql/transport/blade_formal_settlement_change_record_20260827.sql +++ b/doc/sql/transport/blade_formal_settlement_change_record_20260827.sql @@ -14,6 +14,8 @@ CREATE TABLE IF NOT EXISTS `blade_formal_settlement_change_record` ( `line_no` int(11) DEFAULT NULL COMMENT '行号', `operation_type` varchar(30) COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型', `change_content` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '变更内容', + `before_data` longtext COLLATE utf8mb4_general_ci COMMENT '变更前数据JSON', + `after_data` longtext COLLATE utf8mb4_general_ci COMMENT '变更后数据JSON', `change_reason` varchar(200) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '变更原因', `operator_name` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '操作人', `change_time` datetime NOT NULL COMMENT '变更时间', diff --git a/doc/sql/transport/blade_formal_settlement_change_record_detail_20261018.sql b/doc/sql/transport/blade_formal_settlement_change_record_detail_20261018.sql new file mode 100644 index 00000000..65eb28e7 --- /dev/null +++ b/doc/sql/transport/blade_formal_settlement_change_record_detail_20261018.sql @@ -0,0 +1,30 @@ +-- 正式结算变更记录补充前后值明细，与预结算变更记录口径一致。 +SET @before_data_exists := ( + SELECT COUNT(1) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'blade_formal_settlement_change_record' + AND COLUMN_NAME = 'before_data' +); +SET @before_data_sql := IF( + @before_data_exists = 0, + 'ALTER TABLE `blade_formal_settlement_change_record` ADD COLUMN `before_data` longtext COLLATE utf8mb4_general_ci COMMENT ''变更前数据JSON'' AFTER `change_content`', + 'SELECT 1' +); +PREPARE before_data_stmt FROM @before_data_sql; +EXECUTE before_data_stmt; +DEALLOCATE PREPARE before_data_stmt; + +SET @after_data_exists := ( + SELECT COUNT(1) FROM information_schema.COLUMNS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'blade_formal_settlement_change_record' + AND COLUMN_NAME = 'after_data' +); +SET @after_data_sql := IF( + @after_data_exists = 0, + 'ALTER TABLE `blade_formal_settlement_change_record` ADD COLUMN `after_data` longtext COLLATE utf8mb4_general_ci COMMENT ''变更后数据JSON'' AFTER `before_data`', + 'SELECT 1' +); +PREPARE after_data_stmt FROM @after_data_sql; +EXECUTE after_data_stmt; +DEALLOCATE PREPARE after_data_stmt; diff --git a/doc/sql/transport/blade_pre_settlement_20260818.sql b/doc/sql/transport/blade_pre_settlement_20260818.sql index 2079beb9..6f20b639 100644 --- a/doc/sql/transport/blade_pre_settlement_20260818.sql +++ b/doc/sql/transport/blade_pre_settlement_20260818.sql @@ -200,7 +200,7 @@ CREATE TABLE IF NOT EXISTS `blade_pre_settlement_change_record` ( INSERT INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES -(2090000000000001020, 2090000000000001000, 'pre_settlement', '预结算', 'pre_settlement', '/settlement/pre-settlement', 'iconfont icon-caidanguanli', 3, 1, 0, 1, NULL, '', 0), +(2090000000000001020, 2090000000000001000, 'pre_settlement', '预付结算单', 'pre_settlement', '/settlement/pre-settlement', 'iconfont icon-caidanguanli', 3, 1, 0, 1, NULL, '', 0), (2090000000000001021, 2090000000000001020, 'pre_settlement_view', '查看', 'pre_settlement_view', '', '', 1, 2, 0, 1, NULL, '', 0), (2090000000000001022, 2090000000000001020, 'pre_settlement_add', '新增', 'pre_settlement_add', '', '', 2, 2, 0, 1, NULL, '', 0), (2090000000000001023, 2090000000000001020, 'pre_settlement_edit', '编辑', 'pre_settlement_edit', '', '', 3, 2, 0, 1, NULL, '', 0), diff --git a/doc/sql/transport/blade_settlement_menu_split_20261018.sql b/doc/sql/transport/blade_settlement_menu_split_20261018.sql new file mode 100644 index 00000000..27df1058 --- /dev/null +++ b/doc/sql/transport/blade_settlement_menu_split_20261018.sql @@ -0,0 +1,163 @@ +-- 结算菜单调整： +-- 1）预结算 → 预付结算单 +-- 2）正式结算单拆分为：付款结算单（应付）、收款结算单（应收） +-- 执行后需重新登录；已授权「正式结算单/付款结算单」的角色会同步授权「收款结算单」。 + +-- ① 预结算改名 +UPDATE `blade_menu` +SET `name` = '预付结算单' +WHERE `code` = 'pre_settlement' + AND `is_deleted` = 0; + +-- ② 原正式结算单菜单改为「付款结算单」（保留原菜单 id，角色授权不丢） +UPDATE `blade_menu` +SET `code` = 'payment_settlement', + `name` = '付款结算单', + `alias` = 'payment_settlement', + `path` = '/settlement/payment-settlement', + `is_deleted` = 0 +WHERE `code` IN ('formal_settlement', 'payment_settlement') + AND `category` = 1 + AND `is_deleted` = 0; + +-- 付款结算单按钮权限码：formal_settlement_* → payment_settlement_* +UPDATE `blade_menu` child +INNER JOIN `blade_menu` parent + ON parent.`id` = child.`parent_id` + AND parent.`code` = 'payment_settlement' + AND parent.`is_deleted` = 0 +SET child.`code` = REPLACE(child.`code`, 'formal_settlement_', 'payment_settlement_'), + child.`alias` = REPLACE(IFNULL(child.`alias`, child.`code`), 'formal_settlement_', 'payment_settlement_'), + child.`is_deleted` = 0 +WHERE child.`category` = 2 + AND child.`code` LIKE 'formal_settlement_%'; + +-- ③ 新增「收款结算单」菜单 +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT + 2090000000000002100, + parent.`parent_id`, + 'receipt_settlement', + '收款结算单', + 'receipt_settlement', + '/settlement/receipt-settlement', + IFNULL(parent.`source`, 'iconfont icon-caidanguanli'), + IFNULL(parent.`sort`, 4) + 1, + 1, 0, 1, NULL, '', 0 +FROM `blade_menu` parent +WHERE parent.`code` = 'payment_settlement' + AND parent.`is_deleted` = 0 + AND NOT EXISTS ( + SELECT 1 FROM `blade_menu` x WHERE x.`code` = 'receipt_settlement' AND x.`is_deleted` = 0 + ) +LIMIT 1; + +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002101, p.id, 'receipt_settlement_view', '查看', 'receipt_settlement_view', '', '', 1, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_view' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002102, p.id, 'receipt_settlement_add', '新增', 'receipt_settlement_add', '', '', 2, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_add' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002103, p.id, 'receipt_settlement_edit', '编辑', 'receipt_settlement_edit', '', '', 3, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_edit' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002104, p.id, 'receipt_settlement_delete', '删除', 'receipt_settlement_delete', '', '', 4, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_delete' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002105, p.id, 'receipt_settlement_submit', '提交审批', 'receipt_settlement_submit', '', '', 5, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_submit' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002106, p.id, 'receipt_settlement_approve', '审批', 'receipt_settlement_approve', '', '', 6, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_approve' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002107, p.id, 'receipt_settlement_sync', '同步金蝶', 'receipt_settlement_sync', '', '', 7, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_sync' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002108, p.id, 'receipt_settlement_print', '打印', 'receipt_settlement_print', '', '', 8, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_print' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002109, p.id, 'receipt_settlement_export', '导出', 'receipt_settlement_export', '', '', 9, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_export' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002110, p.id, 'receipt_settlement_void', '作废', 'receipt_settlement_void', '', '', 10, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_void' AND x.is_deleted = 0) +LIMIT 1; +INSERT INTO `blade_menu` +(`id`,`parent_id`,`code`,`name`,`alias`,`path`,`source`,`sort`,`category`,`action`,`is_open`,`component`,`remark`,`is_deleted`) +SELECT 2090000000000002111, p.id, 'receipt_settlement_adjust', '明细调整', 'receipt_settlement_adjust', '', '', 11, 2, 0, 1, NULL, '', 0 +FROM `blade_menu` p WHERE p.code = 'receipt_settlement' AND p.is_deleted = 0 + AND NOT EXISTS (SELECT 1 FROM `blade_menu` x WHERE x.code = 'receipt_settlement_adjust' AND x.is_deleted = 0) +LIMIT 1; + +-- ④ 角色授权：持有付款结算单的角色同步收款结算单（含按钮） +INSERT INTO `blade_role_menu` (`id`, `menu_id`, `role_id`) +SELECT + 2091200000000000000 + CAST(rm.`role_id` AS UNSIGNED) % 100000, + receipt.`id`, + rm.`role_id` +FROM `blade_role_menu` rm +JOIN `blade_menu` payment ON payment.`id` = rm.`menu_id` + AND payment.`code` = 'payment_settlement' + AND payment.`is_deleted` = 0 +JOIN `blade_menu` receipt ON receipt.`code` = 'receipt_settlement' + AND receipt.`is_deleted` = 0 +WHERE NOT EXISTS ( + SELECT 1 FROM `blade_role_menu` x + WHERE x.`menu_id` = receipt.`id` AND x.`role_id` = rm.`role_id` +); + +INSERT INTO `blade_role_menu` (`id`, `menu_id`, `role_id`) +SELECT + 2091300000000000000 + + (CAST(rm.`role_id` AS UNSIGNED) % 100000) * 20 + + (CAST(receipt_btn.`id` AS UNSIGNED) % 20), + receipt_btn.`id`, + rm.`role_id` +FROM `blade_role_menu` rm +JOIN `blade_menu` payment_btn ON payment_btn.`id` = rm.`menu_id` + AND payment_btn.`code` LIKE 'payment_settlement_%' + AND payment_btn.`is_deleted` = 0 +JOIN `blade_menu` receipt_btn + ON receipt_btn.`code` = REPLACE(payment_btn.`code`, 'payment_settlement_', 'receipt_settlement_') + AND receipt_btn.`is_deleted` = 0 +WHERE NOT EXISTS ( + SELECT 1 FROM `blade_role_menu` x + WHERE x.`menu_id` = receipt_btn.`id` AND x.`role_id` = rm.`role_id` +); + +-- ⑤ 残留旧正式结算菜单隐藏 +UPDATE `blade_menu` +SET `is_deleted` = 1 +WHERE `code` = 'formal_settlement' + AND `category` = 1;