🐛 修复单据号取号忽略逻辑删除，并优化OA人员组织绑定

人员同步改为绑定已有组织并归并旁路存量；付款/开票/结算/对账等取号按最大流水含已删数据；运单导入数量单位改读计量单位主数据。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-18 22:20:17 +08:00
parent ddaa6f2c45
commit 74bc8c844d
19 changed files with 499 additions and 271 deletions
@@ -27,9 +27,20 @@ package org.springblade.transport.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.BillPayment;

 /** 汇票付款 Mapper。 @author Chill */
@Mapper
 public interface BillPaymentMapper extends BaseMapper<BillPayment> {
+
+	/**
+	 * 查询指定租户、指定日期前缀下已使用的最大汇票付款流水号。
+	 * 不过滤逻辑删除数据，避免唯一索引仍占用历史编号时重复生成。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(payment_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_bill_payment WHERE tenant_id = #{tenantId} "
+		+ "AND payment_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -29,4 +29,13 @@ public interface FormalSettlementMapper extends BaseMapper<FormalSettlement> {
 	/** 恢复逻辑删除的正式结算单主记录。 */
 	@Update("UPDATE blade_formal_settlement SET is_deleted = 0 WHERE tenant_id = #{tenantId} AND id = #{id} AND is_deleted = 1")
 	int restoreByIdIncludingDeleted(@Param("tenantId") String tenantId, @Param("id") Long id);
+
+	/**
+	 * 查询指定租户、指定日期前缀下已使用的最大正式结算单流水号。
+	 * 不过滤逻辑删除数据，避免唯一索引仍占用历史编号时重复生成。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(formal_settlement_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_formal_settlement WHERE tenant_id = #{tenantId} "
+		+ "AND formal_settlement_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -10,9 +10,20 @@ package org.springblade.transport.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.FormalSettlementPayment;

 /** 正式结算付款申请 Mapper。 @author Chill */
@Mapper
 public interface FormalSettlementPaymentMapper extends BaseMapper<FormalSettlementPayment> {
+
+	/**
+	 * 查询指定租户、指定日期前缀下已使用的最大付款申请流水号。
+	 * 不过滤逻辑删除数据，避免唯一索引仍占用历史编号时重复生成。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(payment_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_formal_settlement_payment WHERE tenant_id = #{tenantId} "
+		+ "AND payment_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -27,6 +27,8 @@ package org.springblade.transport.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.InvoiceApplication;

 /**
@@ -36,4 +38,13 @@ import org.springblade.transport.pojo.entity.InvoiceApplication;
 */
@Mapper
 public interface InvoiceApplicationMapper extends BaseMapper<InvoiceApplication> {
+
+	/**
+	 * 查询指定租户、指定日期前缀下已使用的最大开票申请流水号。
+	 * 不过滤逻辑删除数据，避免唯一索引仍占用历史编号时重复生成。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(application_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_invoice_application WHERE tenant_id = #{tenantId} "
+		+ "AND application_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -21,9 +21,20 @@ package org.springblade.transport.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.PaymentApplication;

 /** 付款申请 Mapper。 @author Chill */
@Mapper
 public interface PaymentApplicationMapper extends BaseMapper<PaymentApplication> {
+
+	/**
+	 * 查询指定租户、指定日期前缀下已使用的最大付款申请流水号。
+	 * 不过滤逻辑删除数据，避免唯一索引仍占用历史编号时重复生成。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(payment_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_payment_application WHERE tenant_id = #{tenantId} "
+		+ "AND payment_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -10,6 +10,8 @@ package org.springblade.transport.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.PreSettlementAdvance;

 /**
@@ -19,4 +21,12 @@ import org.springblade.transport.pojo.entity.PreSettlementAdvance;
 */
@Mapper
 public interface PreSettlementAdvanceMapper extends BaseMapper<PreSettlementAdvance> {
+
+	/**
+	 * 查询预付单号最大流水（含逻辑删除）。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(advance_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_pre_settlement_advance WHERE tenant_id = #{tenantId} "
+		+ "AND advance_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -10,6 +10,8 @@ package org.springblade.transport.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.PreSettlement;

 /**
@@ -19,4 +21,20 @@ import org.springblade.transport.pojo.entity.PreSettlement;
 */
@Mapper
 public interface PreSettlementMapper extends BaseMapper<PreSettlement> {
+
+	/**
+	 * 查询预结算单号最大流水（含逻辑删除）。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(pre_settlement_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_pre_settlement WHERE tenant_id = #{tenantId} "
+		+ "AND pre_settlement_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxPreSettlementDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
+
+	/**
+	 * 查询预结算转正式结算单号最大流水（含逻辑删除）。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(formal_settlement_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_pre_settlement WHERE tenant_id = #{tenantId} "
+		+ "AND formal_settlement_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxFormalSettlementDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -2,7 +2,19 @@ package org.springblade.transport.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springblade.transport.pojo.entity.SettlementAdjustment;

@Mapper
-public interface SettlementAdjustmentMapper extends BaseMapper<SettlementAdjustment> {}
+public interface SettlementAdjustmentMapper extends BaseMapper<SettlementAdjustment> {
+
+	/**
+	 * 查询指定租户、指定日期前缀下已使用的最大结算调整单流水号。
+	 * 不过滤逻辑删除数据，避免唯一索引仍占用历史编号时重复生成。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(adjustment_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_settlement_adjustment WHERE tenant_id = #{tenantId} "
+		+ "AND adjustment_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
+}
@@ -22,4 +22,13 @@ public interface TransportReconciliationMapper extends BaseMapper<TransportRecon
 	/** 恢复逻辑删除的运输对账单主记录。 */
 	@Update("UPDATE blade_transport_reconciliation SET is_deleted = 0 WHERE tenant_id = #{tenantId} AND id = #{id} AND is_deleted = 1")
 	int restoreByIdIncludingDeleted(@Param("tenantId") String tenantId, @Param("id") Long id);
+
+	/**
+	 * 查询指定租户、指定日期前缀下已使用的最大对账单流水号。
+	 * 不过滤逻辑删除数据，避免唯一索引仍占用历史编号时重复生成。
+	 */
+	@Select("SELECT COALESCE(MAX(CAST(SUBSTRING(reconciliation_no, CHAR_LENGTH(#{prefix}) + 1) AS UNSIGNED)), 0) "
+		+ "FROM blade_transport_reconciliation WHERE tenant_id = #{tenantId} "
+		+ "AND reconciliation_no LIKE CONCAT(#{prefix}, '%')")
+	Long selectMaxDailySequence(@Param("tenantId") String tenantId, @Param("prefix") String prefix);
 }
@@ -309,10 +309,11 @@ public class BillPaymentServiceImpl extends BaseServiceImpl<BillPaymentMapper, B
 		return request.getId();
 	}

+	/** 生成当日汇票付款单号；按最大流水号 +1，且计入逻辑删除数据 */
 	private synchronized String nextNo() {
 		String prefix = "HP" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-		return prefix + String.format("%05d", count(Wrappers.<BillPayment>lambdaQuery()
-			.likeRight(BillPayment::getPaymentNo, prefix)) + 1);
+		Long maxSequence = baseMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%05d", (maxSequence == null ? 0L : maxSequence) + 1);
 	}

 	private BigDecimal positive(BigDecimal value, String name) {
@@ -286,21 +286,8 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 			default -> throw new ServiceException("结算类型不正确");
 		};
 		String prefix = code + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-		List<String> numbers = list(Wrappers.<FormalSettlement>lambdaQuery()
-			.select(FormalSettlement::getFormalSettlementNo)
-			.likeRight(FormalSettlement::getFormalSettlementNo, prefix))
-			.stream().map(FormalSettlement::getFormalSettlementNo).toList();
-		int sequence = 1;
-		if (!numbers.isEmpty()) {
-			String latest = numbers.stream().max(String::compareTo).orElse(prefix);
-			try {
-				sequence = Integer.parseInt(latest.substring(prefix.length())) + 1;
-			} catch (RuntimeException ignored) {
-				sequence = Math.toIntExact(count(Wrappers.<FormalSettlement>lambdaQuery()
-					.likeRight(FormalSettlement::getFormalSettlementNo, prefix))) + 1;
-			}
-		}
-		return prefix + String.format("%05d", sequence);
+		Long maxSequence = baseMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%05d", (maxSequence == null ? 0L : maxSequence) + 1);
 	}

 	@Override
@@ -2190,11 +2177,11 @@ public class FormalSettlementServiceImpl extends BaseServiceImpl<FormalSettlemen
 		target.setCurrency(Func.isEmpty(source.getCurrency()) ? "RMB" : source.getCurrency()); target.setLocalCurrency("RMB");
 	}

+	/** 生成当日正式结算付款单号；按最大流水号 +1，且计入逻辑删除数据 */
 	private synchronized String nextPaymentNo() {
 		String prefix = "FK" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-		long count = paymentMapper.selectCount(Wrappers.<FormalSettlementPayment>lambdaQuery()
-			.likeRight(FormalSettlementPayment::getPaymentNo, prefix));
-		return prefix + String.format("%04d", count + 1);
+		Long maxSequence = paymentMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%04d", (maxSequence == null ? 0L : maxSequence) + 1);
 	}

 	private BigDecimal money(BigDecimal value) { return (value == null ? BigDecimal.ZERO : value).setScale(2, RoundingMode.HALF_UP); }
@@ -1679,10 +1679,11 @@ public class InvoiceApplicationServiceImpl extends BaseServiceImpl<InvoiceApplic
 		return ids == null ? List.of() : Func.toLongList(ids).stream().distinct().toList();
 	}

-	private String nextNo() {
+	/** 生成当日开票申请单号；按最大流水号 +1，且计入逻辑删除数据 */
+	private synchronized String nextNo() {
 		String prefix = "KP-" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-		return prefix + String.format("%05d", count(Wrappers.<InvoiceApplication>lambdaQuery()
-			.likeRight(InvoiceApplication::getApplicationNo, prefix)) + 1);
+		Long maxSequence = baseMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%05d", (maxSequence == null ? 0L : maxSequence) + 1);
 	}

 	private String normalizeDepartmentEmails(String value, List<CustomerInvoiceInfoVO> invoiceInfos) {
@@ -2455,7 +2455,14 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
 	}
 	private PaymentApplication existing(Long id) { PaymentApplication entity = getById(id); if (entity == null || Objects.equals(entity.getIsDeleted(), 1)) throw new ServiceException("付款申请不存在"); return entity; }
 	private PaymentApplication editable(Long id) { PaymentApplication entity = existing(id); if (!List.of(TransportBusiConstant.DRAFT, TransportBusiConstant.RETURNED).contains(entity.getApprovalStatus())) throw new ServiceException("当前状态不可编辑"); return entity; }
-	private String nextNo() { String prefix = "FKD" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); return prefix + String.format("%05d", count(Wrappers.<PaymentApplication>lambdaQuery().likeRight(PaymentApplication::getPaymentNo, prefix)) + 1); }
+	/**
+	 * 生成当日付款申请单号；按最大流水号 +1，且计入逻辑删除数据，避免撞 uk_payment_application_no
+	 */
+	private synchronized String nextNo() {
+		String prefix = "FKD" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+		Long maxSequence = baseMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%05d", (maxSequence == null ? 0L : maxSequence) + 1);
+	}
 	private BigDecimal nonNegative(BigDecimal value, String name) { if (value == null || value.compareTo(BigDecimal.ZERO) < 0) throw new ServiceException(name + "不能小于0"); return value; }
 	private BigDecimal money(BigDecimal value) { return value == null ? BigDecimal.ZERO : value; }
 	private String limit(String value, int length) { if (value != null && value.length() > length) throw new ServiceException("备注不能超过" + length + "个字符"); return value; }
@@ -85,7 +85,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -1780,44 +1779,25 @@ public class PreSettlementServiceImpl extends BaseServiceImpl<PreSettlementMappe
 		return String.valueOf(feeType) + "|" + String.valueOf(feeItem);
 	}

+	/** 生成当日预结算单号；按最大流水号 +1，且计入逻辑删除数据 */
 	private synchronized String nextPreSettlementNo() {
-		return nextDailyCode("YJ", PreSettlement::getPreSettlementNo);
+		String prefix = "YJ" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+		Long maxSequence = baseMapper.selectMaxPreSettlementDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%05d", (maxSequence == null ? 0L : maxSequence) + 1);
 	}

+	/** 生成预结算转正式结算单号；按最大流水号 +1，且计入逻辑删除数据 */
 	private synchronized String nextFormalSettlementNo() {
-		return nextDailyCode("ZJ", PreSettlement::getFormalSettlementNo);
+		String prefix = "ZJ" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+		Long maxSequence = baseMapper.selectMaxFormalSettlementDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%05d", (maxSequence == null ? 0L : maxSequence) + 1);
 	}

+	/** 生成当日预付单号；按最大流水号 +1，且计入逻辑删除数据 */
 	private synchronized String nextAdvanceNo() {
 		String prefix = "YF" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-		PreSettlementAdvance latest = advanceMapper.selectOne(Wrappers.<PreSettlementAdvance>lambdaQuery()
-			.likeRight(PreSettlementAdvance::getAdvanceNo, prefix)
-			.orderByDesc(PreSettlementAdvance::getAdvanceNo)
-			.last("limit 1"));
-		return prefix + String.format("%05d", nextSequence(latest == null ? null : latest.getAdvanceNo(), prefix));
-	}
-
-	private String nextDailyCode(String code, Function<PreSettlement, String> getter) {
-		String prefix = code + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-		PreSettlement latest = list(Wrappers.<PreSettlement>lambdaQuery()
-			.and(query -> query.likeRight(PreSettlement::getPreSettlementNo, prefix)
-				.or().likeRight(PreSettlement::getFormalSettlementNo, prefix))
-			.orderByDesc(PreSettlement::getCreateTime)
-			.last("limit 1")).stream().max(Comparator.comparing(item -> {
-			String value = getter.apply(item);
-			return value == null ? "" : value;
-		})).orElse(null);
-		String latestCode = latest == null ? null : getter.apply(latest);
-		return prefix + String.format("%05d", nextSequence(latestCode, prefix));
-	}
-
-	private int nextSequence(String latestCode, String prefix) {
-		if (latestCode == null || !latestCode.startsWith(prefix)) return 1;
-		try {
-			return Integer.parseInt(latestCode.substring(prefix.length())) + 1;
-		} catch (NumberFormatException exception) {
-			return 1;
-		}
+		Long maxSequence = advanceMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%05d", (maxSequence == null ? 0L : maxSequence) + 1);
 	}

 }
@@ -392,7 +392,12 @@ public class SettlementAdjustmentServiceImpl extends BaseServiceImpl<SettlementA
 	private SettlementAdjustmentVO toVO(SettlementAdjustment item) { SettlementAdjustmentVO vo = new SettlementAdjustmentVO(); org.springframework.beans.BeanUtils.copyProperties(item, vo); vo.setCreateUserName(UserCache.getUserRealName(item.getCreateUser())); vo.setApprovalStatusName(statusName(item.getApprovalStatus())); vo.setSettlementTypeName(typeName(item.getSettlementType())); return vo; }
 	private String statusName(String value) { return Map.of(TransportBusiConstant.DRAFT, "草稿", TransportBusiConstant.REVIEWING, "审批中", TransportBusiConstant.APPROVED, "审批通过", TransportBusiConstant.RETURNED, "已驳回").getOrDefault(value, value); }
 	private String typeName(String value) { return "receivable".equals(value) ? "应收" : "payable".equals(value) ? "应付" : ""; }
-	private synchronized String nextNo() { String prefix = "TZ" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE); long count = count(Wrappers.<SettlementAdjustment>lambdaQuery().likeRight(SettlementAdjustment::getAdjustmentNo, prefix)); return prefix + String.format("%04d", count + 1); }
+	/** 生成当日结算调整单号；按最大流水号 +1，且计入逻辑删除数据 */
+	private synchronized String nextNo() {
+		String prefix = "TZ" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
+		Long maxSequence = baseMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		return prefix + String.format("%04d", (maxSequence == null ? 0L : maxSequence) + 1);
+	}
 	private BigDecimal money(BigDecimal value) { return value == null ? BigDecimal.ZERO : value; }
 	private String requiredText(String value, String field, int max) { if (Func.isEmpty(value)) throw new ServiceException(field + "不能为空"); return limit(value.trim(), max); }
 	private String limit(String value, int max) { if (value != null && value.length() > max) throw new ServiceException("内容不能超过" + max + "个字"); return value; }
@@ -1512,20 +1512,14 @@ public class TransportReconciliationServiceImpl
 	private BigDecimal sumExternalQuantity(List<TransportReconciliationExternal> rows) { return rows.stream().map(TransportReconciliationExternal::getTransportQuantity).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); }
 	private BigDecimal sumInternalAmount(List<TransportReconciliationInternal> rows) { return rows.stream().map(TransportReconciliationInternal::getSettlementAmount).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); }
 	private BigDecimal sumExternalAmount(List<TransportReconciliationExternal> rows) { return rows.stream().map(TransportReconciliationExternal::getSettlementAmount).map(this::money).reduce(BigDecimal.ZERO, BigDecimal::add); }
+	/** 生成当日运输对账单号；按最大流水号 +1，且计入逻辑删除数据 */
 	private synchronized String nextNo() {
 		String prefix = "DZD" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-		int sequence = list(Wrappers.<TransportReconciliation>lambdaQuery()
-			.select(TransportReconciliation::getReconciliationNo)
-			.likeRight(TransportReconciliation::getReconciliationNo, prefix))
-			.stream()
-			.map(TransportReconciliation::getReconciliationNo)
-			.filter(number -> number != null && number.length() == prefix.length() + 5)
-			.map(number -> number.substring(prefix.length()))
-			.filter(suffix -> suffix.chars().allMatch(Character::isDigit))
-			.mapToInt(Integer::parseInt)
-			.max()
-			.orElse(0) + 1;
-		if (sequence > 99999) throw new ServiceException("当日运输对账单号流水已用完");
+		Long maxSequence = baseMapper.selectMaxDailySequence(AuthUtil.getTenantId(), prefix);
+		long sequence = (maxSequence == null ? 0L : maxSequence) + 1;
+		if (sequence > 99999) {
+			throw new ServiceException("当日运输对账单号流水已用完");
+		}
 		return prefix + String.format("%05d", sequence);
 	}
 }
@@ -25,6 +25,7 @@ import org.springblade.system.cache.UserCache;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.pojo.entity.DictBiz;
 import org.springblade.system.pojo.entity.CargoType;
+import org.springblade.system.pojo.entity.MeasurementUnit;
 import org.springblade.transport.excel.WaybillImportBatchExcel;
 import org.springblade.transport.mapper.WaybillImportBatchMapper;
 import org.springblade.transport.pojo.dto.WaybillImportBatchRequest;
@@ -919,13 +920,14 @@ public class WaybillImportBatchServiceImpl extends BaseServiceImpl<WaybillImport
 	}

 	private void validateQuantityUnit(Map<String, Object> row, List<String> quantityUnitOptions, List<String> errors) {
-		String quantityUnit = stringValue(row, "quantityUnit", "数量单位");
+		String quantityUnit = stringValue(row, "quantityUnit", "数量单位", "*数量单位");
 		if (Func.isEmpty(quantityUnit)) {
 			return;
 		}
-
-		if (!quantityUnitOptions.contains(quantityUnit)) {
-			errors.add("数量单位必须为系统枚举值之一");
+		String normalized = quantityUnit.trim();
+		boolean matched = quantityUnitOptions.stream().anyMatch(option -> option.equalsIgnoreCase(normalized));
+		if (!matched) {
+			errors.add("数量单位「" + normalized + "」未在计量单位主数据中匹配");
 		}
 	}

@@ -1186,9 +1188,28 @@ public class WaybillImportBatchServiceImpl extends BaseServiceImpl<WaybillImport
 			.orElse(normalized);
 	}

+	/** 数量单位从计量单位主数据读取（单位名称、编码均可匹配）。 */
 	private List<String> loadQuantityUnitOptions() {
-		// 常见数量单位
-		return List.of("吨", "千克", "立方米", "件", "箱", "台", "个", "升", "米", "平方米");
+		R<List<MeasurementUnit>> response = sysClient.getMeasurementUnits();
+		if (response == null || !response.isSuccess() || response.getData() == null) {
+			throw new ServiceException("计量单位基础数据读取失败，请稍后重试");
+		}
+		Set<String> options = new HashSet<>();
+		for (MeasurementUnit unit : response.getData()) {
+			if (unit == null || (unit.getStatus() != null && !Objects.equals(unit.getStatus(), 1))) {
+				continue;
+			}
+			if (Func.isNotEmpty(unit.getUnitName())) {
+				options.add(unit.getUnitName().trim());
+			}
+			if (Func.isNotEmpty(unit.getUnitCode())) {
+				options.add(unit.getUnitCode().trim());
+			}
+		}
+		if (options.isEmpty()) {
+			throw new ServiceException("计量单位主数据为空，请先在基础数据中配置计量单位");
+		}
+		return new ArrayList<>(options);
 	}

 	/**