采购申请批量提交、订单导入重复校验；修复考勤异常申请字段不匹配

gaoluyang

8 天以前 25a40b9c4e6a1b650610b8b13088d486699532ce

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java

@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.erp.service.purchase;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -13,6 +15,9 @@
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSubmitBatchRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
@@ -22,8 +27,12 @@
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -31,16 +40,22 @@
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.repository.ProcessDefinition;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;

/**
 * ERP 采购申请 Service 实现类
@@ -70,6 +85,10 @@

    @Resource
    private ErpSupplierService supplierService;
    @Resource
    private SrmSupplierApi srmSupplierApi;
    @Resource
    private MdmItemApi mdmItemApi;

    @Resource
    private BpmProcessInstanceApi processInstanceApi;
@@ -85,6 +104,13 @@
    @Resource
    private StorageAttachmentApi storageAttachmentApi;

    /**
     * 自身代理：批量提交时逐单调用 {@link #submitPurchaseRequest}，保证每张申请独立事务
     */
    @Autowired
    @Lazy
    private ErpPurchaseRequestService self;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createPurchaseRequest(ErpPurchaseRequestSaveReqVO createReqVO) {
@@ -94,8 +120,10 @@
        if (createReqVO.getSupplierId() != null) {
            supplierService.validateSupplier(createReqVO.getSupplierId());
        }
        // 3. 生成申请单号
        String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
        // 3. 确定申请单号（前端填写则用自定义单号，留空则自动生成），并校验唯一性
        String customNo = StrUtil.trim(createReqVO.getNo());
        String no = StrUtil.isNotBlank(customNo) ? customNo
                : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
        if (purchaseRequestMapper.selectByNo(no) != null) {
            throw exception(PURCHASE_REQUEST_NO_EXISTS);
        }
@@ -129,7 +157,7 @@
    @Transactional(rollbackFor = Exception.class)
    public void updatePurchaseRequest(ErpPurchaseRequestSaveReqVO updateReqVO) {
        // 1. 校验存在 + 草稿状态
        ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExistsAndDraft(updateReqVO.getId());
        ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestCanModify(updateReqVO.getId());
        // 2. 校验供应商（如果指定）
        if (updateReqVO.getSupplierId() != null) {
            supplierService.validateSupplier(updateReqVO.getSupplierId());
@@ -149,6 +177,188 @@
        storageAttachmentApi.updateAttachments("file", "erp_purchase_request", updateReqVO.getId(), updateReqVO.getBlobIds());
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importList) {
        ErpPurchaseRequestImportRespVO respVO = ErpPurchaseRequestImportRespVO.builder()
                .createList(new ArrayList<>())
                .updateList(new ArrayList<>())
                .failureList(new LinkedHashMap<>())
                .build();
        if (CollUtil.isEmpty(importList)) {
            return respVO;
        }

        // 1. 预热“供应商名称/编码 -> 供应商编号”映射（供应商为可选）
        Map<String, Long> supplierIdMap = new HashMap<>();
        CommonResult<List<SrmSupplierRespDTO>> supplierResult = srmSupplierApi.getSupplierSimpleList();
        if (supplierResult != null && CollUtil.isNotEmpty(supplierResult.getData())) {
            supplierResult.getData().forEach(supplier -> {
                if (StrUtil.isNotBlank(supplier.getName())) {
                    supplierIdMap.putIfAbsent(supplier.getName().trim(), supplier.getId());
                }
                if (StrUtil.isNotBlank(supplier.getCode())) {
                    supplierIdMap.putIfAbsent(supplier.getCode().trim(), supplier.getId());
                }
            });
        }

        // 2. 按“采购申请单号”分组
        Map<String, List<ErpPurchaseRequestImportExcelVO>> groups = new LinkedHashMap<>();
        for (int i = 0; i < importList.size(); i++) {
            ErpPurchaseRequestImportExcelVO row = importList.get(i);
            if (row == null || (StrUtil.isBlank(row.getProductCode()) && StrUtil.isBlank(row.getSupplierName())
                    && StrUtil.isBlank(row.getNo()))) {
                continue; // 跳过空行
            }
            String key = StrUtil.isNotBlank(row.getNo()) ? row.getNo().trim() : "__row_" + (i + 2);
            groups.computeIfAbsent(key, k -> new ArrayList<>()).add(row);
        }

        // 3. 逐张申请导入
        for (Map.Entry<String, List<ErpPurchaseRequestImportExcelVO>> entry : groups.entrySet()) {
            List<ErpPurchaseRequestImportExcelVO> rows = entry.getValue();
            String label = StrUtil.isNotBlank(rows.get(0).getNo()) ? rows.get(0).getNo().trim()
                    : "第 " + entry.getKey().substring("__row_".length()) + " 行";
            try {
                ErpPurchaseRequestDO purchaseRequest = createPurchaseRequestByImport(rows, supplierIdMap);
                respVO.getCreateList().add(purchaseRequest.getNo());
            } catch (Exception ex) {
                respVO.getFailureList().put(label, resolveImportErrorMessage(ex));
            }
        }
        return respVO;
    }

    /**
     * 依据导入数据创建一张采购申请（含明细）。申请人/申请部门由当前登录用户自动填充；状态为“未提交(0)”。
     */
    private ErpPurchaseRequestDO createPurchaseRequestByImport(List<ErpPurchaseRequestImportExcelVO> rows,
                                                              Map<String, Long> supplierIdMap) {
        ErpPurchaseRequestImportExcelVO head = rows.get(0);

        // 1. 供应商（可选）：填了则按名称/编码匹配并校验
        Long supplierId = null;
        if (StrUtil.isNotBlank(head.getSupplierName())) {
            supplierId = supplierIdMap.get(head.getSupplierName().trim());
            if (supplierId == null) {
                throw new IllegalArgumentException("供应商不存在：" + head.getSupplierName());
            }
            supplierService.validateSupplier(supplierId);
        }

        // 2. 明细
        List<ErpPurchaseRequestSaveReqVO.Item> items = new ArrayList<>();
        for (ErpPurchaseRequestImportExcelVO row : rows) {
            if (StrUtil.isBlank(row.getProductCode())) {
                throw new IllegalArgumentException("产品编码不能为空");
            }
            CommonResult<MdmItemRespDTO> itemResult = mdmItemApi.getItemByCode(row.getProductCode().trim());
            MdmItemRespDTO item = itemResult == null ? null : itemResult.getData();
            if (item == null) {
                throw new IllegalArgumentException("产品不存在：" + row.getProductCode());
            }
            if (row.getCount() == null) {
                throw new IllegalArgumentException("产品[" + row.getProductCode() + "]的数量不能为空");
            }
            if (item.getUnitMeasureId() == null) {
                throw new IllegalArgumentException("产品[" + row.getProductCode() + "]未配置计量单位，请先在物料中维护");
            }
            ErpPurchaseRequestSaveReqVO.Item itemVO = new ErpPurchaseRequestSaveReqVO.Item();
            itemVO.setProductId(item.getId());
            itemVO.setProductUnitId(item.getUnitMeasureId());
            // 单价：未填写时取物料的采购价
            itemVO.setProductPrice(row.getProductPrice() != null ? row.getProductPrice()
                    : (item.getPurchasePrice() != null ? item.getPurchasePrice() : BigDecimal.ZERO));
            itemVO.setCount(row.getCount());
            itemVO.setTaxPercent(row.getTaxPercent());
            itemVO.setDemandTime(parseImportDate(row.getDemandTime()));
            itemVO.setQcCheckFlag("是".equals(StrUtil.trim(row.getQcCheckFlag())));
            itemVO.setRemark(row.getRemark());
            items.add(itemVO);
        }

        // 3. 单号：填了就用（校验唯一），没填自动生成 CGSQ...
        String no = StrUtil.isNotBlank(head.getNo()) ? head.getNo().trim()
                : noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_REQUEST_NO_PREFIX);
        if (purchaseRequestMapper.selectByNo(no) != null) {
            throw new IllegalArgumentException("采购申请单号已存在：" + no);
        }

        // 4. 申请人 / 申请部门：取当前登录用户及其部门
        Long userId = getLoginUserId();
        AdminUserRespDTO user = userId == null ? null : adminUserApi.getUser(userId);
        Long deptId = user != null ? user.getDeptId() : null;

        // 5. 组装主表（状态为“未提交”）
        ErpPurchaseRequestDO purchaseRequest = new ErpPurchaseRequestDO();
        purchaseRequest.setNo(no);
        purchaseRequest.setSupplierId(supplierId);
        purchaseRequest.setRequestTime(parseImportDateTime(head.getRequestTime()));
        purchaseRequest.setRequestReason(head.getRequestReason());
        purchaseRequest.setRemark(head.getRemark());
        purchaseRequest.setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus());
        purchaseRequest.setRequestUserId(userId);
        purchaseRequest.setRequestDeptId(deptId);
        purchaseRequest.setDepositPrice(BigDecimal.ZERO);

        List<ErpPurchaseRequestItemDO> itemDOs = validatePurchaseRequestItems(items);
        calculateTotalPrice(purchaseRequest, itemDOs);
        purchaseRequestMapper.insert(purchaseRequest);
        itemDOs.forEach(item -> item.setRequestId(purchaseRequest.getId()));
        purchaseRequestItemMapper.insertBatch(itemDOs);
        return purchaseRequest;
    }

    private LocalDateTime parseImportDateTime(String text) {
        if (StrUtil.isBlank(text)) {
            return LocalDateTime.now();
        }
        String value = text.trim();
        for (String pattern : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd HH:mm:ss"}) {
            try {
                return LocalDateTime.parse(value, DateTimeFormatter.ofPattern(pattern));
            } catch (Exception ignored) {
                // 继续尝试下一个格式
            }
        }
        for (String pattern : new String[]{"yyyy-MM-dd", "yyyy/M/d"}) {
            try {
                return LocalDate.parse(value, DateTimeFormatter.ofPattern(pattern)).atStartOfDay();
            } catch (Exception ignored) {
                // 继续尝试下一个格式
            }
        }
        throw new IllegalArgumentException("申请时间格式不正确：" + text + "，示例 2026-01-01 10:00:00");
    }

    private LocalDate parseImportDate(String text) {
        if (StrUtil.isBlank(text)) {
            return null;
        }
        String value = text.trim();
        for (String pattern : new String[]{"yyyy-MM-dd", "yyyy/M/d"}) {
            try {
                return LocalDate.parse(value, DateTimeFormatter.ofPattern(pattern));
            } catch (Exception ignored) {
                // 继续尝试下一个格式
            }
        }
        try {
            return LocalDateTime.parse(value, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).toLocalDate();
        } catch (Exception ignored) {
            // 忽略
        }
        throw new IllegalArgumentException("需求日期格式不正确：" + text + "，示例 2026-01-01");
    }

    private String resolveImportErrorMessage(Exception ex) {
        if (ex instanceof cn.iocoder.yudao.framework.common.exception.ServiceException serviceException) {
            return serviceException.getMessage();
        }
        return StrUtil.blankToDefault(ex.getMessage(), "导入失败");
    }

    private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
        purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
        purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
@@ -165,10 +375,14 @@
    private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
        return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
            if (item.getProductPrice() != null && item.getCount() != null) {
                item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
                // 单价为含税单价：含税金额 = 单价 × 数量；税额 = 含税金额 × 税率；不含税金额 = 含税金额 - 税额
                BigDecimal taxInclusivePrice = MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount());
                BigDecimal taxPrice = null;
                if (item.getTaxPercent() != null) {
                    item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
                    taxPrice = MoneyUtils.priceMultiplyPercent(taxInclusivePrice, item.getTaxPercent());
                }
                item.setTaxPrice(taxPrice);
                item.setTotalPrice(taxPrice != null ? taxInclusivePrice.subtract(taxPrice) : taxInclusivePrice);
            }
        }));
    }
@@ -198,8 +412,9 @@
            return;
        }
        purchaseRequests.forEach(purchaseRequest -> {
            // 只有草稿状态才能删除
            if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())) {
            Integer status = purchaseRequest.getStatus();
            if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
                    && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
                throw exception(PURCHASE_REQUEST_DELETE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
            }
        });
@@ -245,13 +460,17 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void submitPurchaseRequest(Long id, String processDefinitionKey, Long userId) {
        // 1. 校验存在 + 草稿状态
        ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExistsAndDraft(id);
        // 1. 校验存在 + 草稿/驳回状态
        ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
        if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())
                && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(purchaseRequest.getStatus())) {
            throw exception(PURCHASE_REQUEST_SUBMIT_FAIL_NOT_DRAFT, purchaseRequest.getNo());
        }

        // 2. 校验是否有明细
        List<ErpPurchaseRequestItemDO> items = purchaseRequestItemMapper.selectListByRequestId(id);
        if (CollUtil.isEmpty(items)) {
            throw exception(PURCHASE_REQUEST_NOT_EXISTS); // TODO: 添加明细为空的错误码
            throw exception(PURCHASE_REQUEST_ITEM_EMPTY, purchaseRequest.getNo());
        }

        // 3. 创建 BPM 流程实例
@@ -265,6 +484,52 @@
                .setId(id)
                .setStatus(ErpPurchaseRequestStatusEnum.PROCESS.getStatus())
                .setProcessInstanceId(processInstanceId));
    }

    @Override
    public ErpPurchaseRequestSubmitBatchRespVO submitPurchaseRequestBatch(List<Long> ids,
                                                                          String processDefinitionKey,
                                                                          Long userId) {
        ErpPurchaseRequestSubmitBatchRespVO respVO = ErpPurchaseRequestSubmitBatchRespVO.builder()
                .successIds(new ArrayList<>())
                .failureMap(new LinkedHashMap<>())
                .build();
        if (CollUtil.isEmpty(ids)) {
            return respVO;
        }
        List<Long> distinctIds = ids.stream().filter(Objects::nonNull).distinct().toList();
        if (CollUtil.isEmpty(distinctIds)) {
            return respVO;
        }

        // 1. 预热申请单号，失败时前端可直接看到是哪张申请单
        Map<Long, String> noMap = purchaseRequestMapper.selectRequestListByIds(distinctIds).stream()
                .filter(request -> request.getId() != null && StrUtil.isNotBlank(request.getNo()))
                .collect(java.util.stream.Collectors.toMap(ErpPurchaseRequestDO::getId, ErpPurchaseRequestDO::getNo,
                        (a, b) -> a));

        // 2. 逐单提交：单张失败不影响其它申请，通过 self 代理保证每张独立事务
        for (Long id : distinctIds) {
            String label = noMap.getOrDefault(id, "编号 " + id);
            try {
                self.submitPurchaseRequest(id, processDefinitionKey, userId);
                respVO.getSuccessIds().add(id);
            } catch (Exception ex) {
                String reason = resolveSubmitErrorMessage(ex);
                if (respVO.getFailureMap().containsKey(label)) {
                    label = label + "（编号 " + id + "）";
                }
                respVO.getFailureMap().put(label, reason);
            }
        }
        return respVO;
    }

    private String resolveSubmitErrorMessage(Exception ex) {
        if (ex instanceof cn.iocoder.yudao.framework.common.exception.ServiceException serviceException) {
            return serviceException.getMessage();
        }
        return StrUtil.blankToDefault(ex.getMessage(), "提交失败");
    }

    @Override
@@ -367,10 +632,20 @@
        // 1. 获取申请明细
        List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectListByRequestId(id);
        if (CollUtil.isEmpty(requestItems)) {
            throw exception(PURCHASE_REQUEST_NOT_EXISTS);
            throw exception(PURCHASE_REQUEST_ITEM_EMPTY, purchaseRequest.getNo());
        }

        // 2. 生成采购订单号
        // 2. 先尝试复用系统内已存在且供应商、明细完全一致的已审核采购订单（通常来自采购订单导入），
        //    避免审批通过后又生成一张重复订单
        ErpPurchaseOrderDO reusableOrder = findReusablePurchaseOrder(purchaseRequest, requestItems);
        if (reusableOrder != null) {
            linkPurchaseRequestToOrder(purchaseRequest, requestItems, reusableOrder);
            log.info("[doGeneratePurchaseOrder] 采购申请({}) 复用已有采购订单({})，未重复生成",
                    id, reusableOrder.getNo());
            return reusableOrder.getId();
        }

        // 3. 生成采购订单号
        String orderNo = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_ORDER_NO_PREFIX);
        if (purchaseOrderMapper.selectByNo(orderNo) != null) {
            throw exception(PURCHASE_ORDER_NO_EXISTS);
@@ -423,6 +698,143 @@
    }

    /**
     * 查找可复用的采购订单：供应商相同，且明细（物料、数量、单价、税率）与申请完全一致。
     *
     * 只匹配已审核订单，避免把申请挂到尚未审核的订单上；优先选择尚未关联采购申请的导入订单，
     * 其次选择编号最小的订单。匹配到的订单会加行锁，防止并发审批时两张申请同时占用同一张订单。
     */
    private ErpPurchaseOrderDO findReusablePurchaseOrder(ErpPurchaseRequestDO purchaseRequest,
                                                         List<ErpPurchaseRequestItemDO> requestItems) {
        if (purchaseRequest.getSupplierId() == null || CollUtil.isEmpty(requestItems)) {
            return null;
        }
        String targetFingerprint = buildRequestFingerprint(purchaseRequest.getSupplierId(), requestItems);
        if (targetFingerprint == null) {
            return null;
        }

        // 1. 查询同供应商的已审核订单，按指纹筛选完全一致的
        List<ErpPurchaseOrderDO> orders = purchaseOrderMapper.selectList(
                purchaseRequest.getSupplierId(), ErpAuditStatus.APPROVE.getStatus());
        if (CollUtil.isEmpty(orders)) {
            return null;
        }
        Map<Long, List<ErpPurchaseOrderItemDO>> orderItemMap = purchaseOrderItemMapper.selectListByOrderIds(
                        orders.stream().map(ErpPurchaseOrderDO::getId).toList()).stream()
                .collect(java.util.stream.Collectors.groupingBy(ErpPurchaseOrderItemDO::getOrderId));
        List<ErpPurchaseOrderDO> candidates = orders.stream()
                .filter(order -> targetFingerprint.equals(
                        buildOrderFingerprint(order.getSupplierId(), orderItemMap.get(order.getId()))))
                // 已入库/已退货的订单说明这笔采购已经执行过，不能拿来顶新申请，否则新需求会被“吃掉”
                .filter(order -> order.getInCount() == null
                        || order.getInCount().compareTo(BigDecimal.ZERO) == 0)
                .filter(order -> order.getReturnCount() == null
                        || order.getReturnCount().compareTo(BigDecimal.ZERO) == 0)
                .sorted(Comparator
                        .comparing((ErpPurchaseOrderDO order) ->
                                hasLinkedRequestItem(orderItemMap.get(order.getId())) ? 1 : 0)
                        .thenComparing(ErpPurchaseOrderDO::getId))
                .toList();
        if (CollUtil.isEmpty(candidates)) {
            return null;
        }
        if (candidates.size() > 1) {
            log.warn("[findReusablePurchaseOrder] 采购申请({}) 匹配到 {} 张相同订单：{}，将复用最早的一张",
                    purchaseRequest.getId(), candidates.size(),
                    candidates.stream().map(ErpPurchaseOrderDO::getNo).toList());
        }

        // 2. 加行锁后重新加载，避免并发审批重复占用
        ErpPurchaseOrderDO candidate = purchaseOrderMapper.selectByIdForUpdate(candidates.get(0).getId());
        if (candidate == null || !ErpAuditStatus.APPROVE.getStatus().equals(candidate.getStatus())) {
            return null;
        }
        return candidate;
    }

    /**
     * 将采购申请关联到已存在的采购订单，并把订单明细回填申请明细编号。
     * 已被其它申请关联过的明细不重复回填，只建立申请单与订单的关联。
     */
    private void linkPurchaseRequestToOrder(ErpPurchaseRequestDO purchaseRequest,
                                            List<ErpPurchaseRequestItemDO> requestItems,
                                            ErpPurchaseOrderDO purchaseOrder) {
        List<ErpPurchaseOrderItemDO> orderItems = purchaseOrderItemMapper.selectListByOrderId(purchaseOrder.getId());
        List<ErpPurchaseOrderItemDO> remaining = new ArrayList<>(orderItems);
        List<ErpPurchaseOrderItemDO> updates = new ArrayList<>();
        for (ErpPurchaseRequestItemDO requestItem : requestItems) {
            ErpPurchaseOrderItemDO match = remaining.stream()
                    .filter(orderItem -> orderItem.getRequestItemId() == null)
                    .filter(orderItem -> Objects.equals(orderItem.getProductId(), requestItem.getProductId())
                            && numberEquals(orderItem.getCount(), requestItem.getCount())
                            && numberEquals(orderItem.getProductPrice(), requestItem.getProductPrice())
                            && numberEquals(orderItem.getTaxPercent(), requestItem.getTaxPercent()))
                    .findFirst().orElse(null);
            if (match != null) {
                match.setRequestItemId(requestItem.getId());
                updates.add(match);
                remaining.remove(match);
            }
        }
        if (CollUtil.isNotEmpty(updates)) {
            purchaseOrderItemMapper.updateBatch(updates);
        }

        purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
                .setId(purchaseRequest.getId())
                .setOrderId(purchaseOrder.getId())
                .setOrderNo(purchaseOrder.getNo()));
        log.info("[linkPurchaseRequestToOrder] 采购申请({}) 关联采购订单({})，回填明细 {} 条",
                purchaseRequest.getId(), purchaseOrder.getNo(), updates.size());
    }

    private String buildRequestFingerprint(Long supplierId, List<ErpPurchaseRequestItemDO> items) {
        if (supplierId == null || CollUtil.isEmpty(items)) {
            return null;
        }
        return buildFingerprint(supplierId, items.stream()
                .map(item -> fingerprintPart(item.getProductId(), item.getCount(),
                        item.getProductPrice(), item.getTaxPercent()))
                .toList());
    }

    private String buildOrderFingerprint(Long supplierId, List<ErpPurchaseOrderItemDO> items) {
        if (supplierId == null || CollUtil.isEmpty(items)) {
            return null;
        }
        return buildFingerprint(supplierId, items.stream()
                .map(item -> fingerprintPart(item.getProductId(), item.getCount(),
                        item.getProductPrice(), item.getTaxPercent()))
                .toList());
    }

    private String buildFingerprint(Long supplierId, List<String> parts) {
        return supplierId + "|" + parts.stream().sorted().collect(java.util.stream.Collectors.joining(","));
    }

    private String fingerprintPart(Long productId, BigDecimal count, BigDecimal productPrice,
                                   BigDecimal taxPercent) {
        return String.join(":", String.valueOf(productId), normalizeNumber(count),
                normalizeNumber(productPrice), normalizeNumber(taxPercent));
    }

    private String normalizeNumber(BigDecimal value) {
        return value == null ? "" : value.stripTrailingZeros().toPlainString();
    }

    private boolean numberEquals(BigDecimal left, BigDecimal right) {
        if (left == null) {
            return right == null;
        }
        return right != null && left.compareTo(right) == 0;
    }

    private boolean hasLinkedRequestItem(List<ErpPurchaseOrderItemDO> orderItems) {
        return CollUtil.isNotEmpty(orderItems)
                && orderItems.stream().anyMatch(item -> item.getRequestItemId() != null);
    }

    /**
     * 校验采购申请审批分类和流程定义是否存在
     */
    private void validatePurchaseRequestApproveCategoryAndProcessDefinition() {
@@ -447,6 +859,22 @@
        return null;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void resetPurchaseRequestStatus(Long id) {
        ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
        Integer status = purchaseRequest.getStatus();
        // 兼容数据不一致：BPM 已驳回但业务表 status 未更新（仍为审批中）
        if (!ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)
                && !ErpPurchaseRequestStatusEnum.PROCESS.getStatus().equals(status)) {
            throw exception(PURCHASE_REQUEST_RESET_FAIL_NOT_REJECT);
        }
        purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
                .setId(id)
                .setStatus(ErpPurchaseRequestStatusEnum.DRAFT.getStatus())
                .setProcessInstanceId(""));
    }

    private ErpPurchaseRequestDO validatePurchaseRequestExists(Long id) {
        ErpPurchaseRequestDO purchaseRequest = purchaseRequestMapper.selectById(id);
        if (purchaseRequest == null) {
@@ -455,9 +883,11 @@
        return purchaseRequest;
    }

    private ErpPurchaseRequestDO validatePurchaseRequestExistsAndDraft(Long id) {
    private ErpPurchaseRequestDO validatePurchaseRequestCanModify(Long id) {
        ErpPurchaseRequestDO purchaseRequest = validatePurchaseRequestExists(id);
        if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(purchaseRequest.getStatus())) {
        Integer status = purchaseRequest.getStatus();
        if (!ErpPurchaseRequestStatusEnum.DRAFT.getStatus().equals(status)
                && !ErpPurchaseRequestStatusEnum.REJECT.getStatus().equals(status)) {
            throw exception(PURCHASE_REQUEST_UPDATE_FAIL_NOT_DRAFT, purchaseRequest.getNo());
        }
        return purchaseRequest;