feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

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

@@ -3,25 +3,39 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
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;
import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
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;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpAccountMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
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.mysql.purchase.ErpSupplierMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.api.arrivalnotice.MesArrivalNoticeApi;
import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
@@ -62,6 +76,11 @@
     */
    private static final String PURCHASE_ORDER_APPROVE_BIZ_TYPE = "erp_purchase_order_approve";

    /**
     * 采购订单审批的 BPM 流程定义 Key
     */
    private static final String PURCHASE_ORDER_PROCESS_KEY = "purchase_approve";

    @Resource
    private ErpPurchaseOrderMapper purchaseOrderMapper;
    @Resource
@@ -74,9 +93,19 @@
    private ErpSupplierService supplierService;
    @Resource
    private ErpAccountService accountService;
    @Resource
    private ErpSupplierMapper supplierMapper;
    @Resource
    private ErpAccountMapper accountMapper;
    @Resource
    private MdmItemApi mdmItemApi;
    @Resource
    private MdmUnitMeasureApi mdmUnitMeasureApi;

    @Resource
    private ApprovalConfigApi approvalConfigApi;
    @Resource
    private BpmProcessInstanceApi bpmProcessInstanceApi;
    @Resource
    private AdminUserApi adminUserApi;

@@ -222,7 +251,15 @@
        approvalConfigApi.validateApprovalEnabledAndGetApprovers(PURCHASE_ORDER_APPROVE_BIZ_TYPE);

        // 3. 置为审批中，并清空上一轮审核信息，避免驳回原因残留
        purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus());
        if (purchaseOrderMapper.submitAndResetAuditInfo(id, ErpPurchaseOrderStatusEnum.PROCESS.getStatus()) != 1) {
            throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_ALLOWED);
        }

        // 4. 创建 BPM 流程实例，使审批出现在「协同办公 - 我的流程」
        bpmProcessInstanceApi.createProcessInstance(getLoginUserId(),
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(PURCHASE_ORDER_PROCESS_KEY)
                        .setBusinessKey(String.valueOf(id)));
    }

    @Override
@@ -247,14 +284,18 @@
            if (StrUtil.isBlank(reviewRemark)) {
                throw exception(PURCHASE_ORDER_AUDIT_REJECT_REASON_REQUIRED);
            }
            purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark);
            if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.REJECT.getStatus(),
                    userId, getUserNickname(userId), reviewRemark) != 1) {
                throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
            }
            return;
        }

        // 3. 审核通过
        purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark);
        if (purchaseOrderMapper.auditPurchaseOrder(id, ErpPurchaseOrderStatusEnum.APPROVE.getStatus(),
                userId, getUserNickname(userId), reviewRemark) != 1) {
            throw exception(PURCHASE_ORDER_AUDIT_FAIL_NOT_PROCESS);
        }
    }

    /**
@@ -286,12 +327,23 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updatePurchaseOrderAuditStatus(Long id, Integer bpmStatus, String reason) {
        // 1. BPM 审批结果映射为采购订单状态：通过=20 / 不通过=30 / 取消=40
        Integer newStatus = convertBpmResultToAuditStatus(bpmStatus);
        if (newStatus == null) {
            return;
        }
        // 2. 仅当仍处于「审批中」时回写，避免重复覆盖
        if (purchaseOrderMapper.updateAuditStatusByBpm(id, newStatus, reason) != 1) {
            log.warn("[updatePurchaseOrderAuditStatus] 采购订单({}) 不处于审批中状态，忽略 BPM 结果({})", id, bpmStatus);
        }
    }

    /**
     * 转换 BPM 审批结果为审核状态
     *
     * 已废弃：采购订单不再走 BPM 流程，本方法仅为历史代码保留，不再被调用。
     */
    @Deprecated
    private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
            return ErpPurchaseOrderStatusEnum.APPROVE.getStatus();
@@ -384,8 +436,12 @@
            return;
        }
        purchaseOrders.forEach(purchaseOrder -> {
            if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
            if (ErpPurchaseOrderStatusEnum.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
                throw exception(PURCHASE_ORDER_DELETE_FAIL_APPROVE, purchaseOrder.getNo());
            }
            // 审批中禁止删除，需先由审批人「审核不通过」退回
            if (ErpPurchaseOrderStatusEnum.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
                throw exception(PURCHASE_ORDER_UPDATE_FAIL_PROCESS, purchaseOrder.getNo());
            }
        });

@@ -590,4 +646,104 @@
        return arrivalNoticeId;
    }

    @Override
    public ErpPurchaseOrderImportRespVO importPurchaseOrderList(List<ErpPurchaseOrderImportExcelVO> importOrders,
                                                                ErpPurchaseOrderImportReqVO importReqVO) {
        // 1. 校验非空（过滤完全空白的行）
        importOrders = filterList(importOrders, item -> StrUtil.isNotBlank(item.getProductCode()));
        if (CollUtil.isEmpty(importOrders)) {
            throw exception(PURCHASE_ORDER_IMPORT_LIST_IS_EMPTY);
        }
        // 2. 按「单号」分组：相同单号的多行合并成一张采购订单；单号为空时每行各自成一张订单
        List<List<ErpPurchaseOrderImportExcelVO>> groups = new ArrayList<>();
        Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
        int rowIndex = 0;
        for (ErpPurchaseOrderImportExcelVO row : importOrders) {
            rowIndex++;
            String groupKey = StrUtil.isNotBlank(row.getNo()) ? row.getNo() : ("__row_" + rowIndex);
            Integer index = groupIndexMap.get(groupKey);
            if (index == null) {
                index = groups.size();
                groupIndexMap.put(groupKey, index);
                groups.add(new ArrayList<>());
            }
            groups.get(index).add(row);
        }
        // 3. 逐组合并创建采购订单
        ErpPurchaseOrderImportRespVO respVO = ErpPurchaseOrderImportRespVO.builder()
                .createPurchaseOrderNos(new ArrayList<>())
                .failurePurchaseOrderNos(new LinkedHashMap<>())
                .build();
        for (List<ErpPurchaseOrderImportExcelVO> group : groups) {
            String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
                    : "第" + (importOrders.indexOf(group.get(0)) + 1) + "行";
            try {
                ErpPurchaseOrderSaveReqVO createReqVO = buildPurchaseOrderImportSaveReqVO(group);
                Long orderId = createPurchaseOrder(createReqVO);
                respVO.getCreatePurchaseOrderNos().add(purchaseOrderMapper.selectById(orderId).getNo());
            } catch (ServiceException ex) {
                respVO.getFailurePurchaseOrderNos().put(groupKey, ex.getMessage());
            }
        }
        return respVO;
    }

    /**
     * 将同一张采购订单的多行明细转换成创建 Request VO
     */
    private ErpPurchaseOrderSaveReqVO buildPurchaseOrderImportSaveReqVO(List<ErpPurchaseOrderImportExcelVO> group) {
        ErpPurchaseOrderImportExcelVO first = group.get(0);
        // 1. 校验并解析供应商
        if (StrUtil.isBlank(first.getSupplierName())) {
            throw exception(PURCHASE_ORDER_IMPORT_SUPPLIER_NOT_EXISTS, "");
        }
        ErpSupplierDO supplier = supplierMapper.selectByName(first.getSupplierName());
        if (supplier == null) {
            throw exception(PURCHASE_ORDER_IMPORT_SUPPLIER_NOT_EXISTS, first.getSupplierName());
        }
        if (first.getOrderTime() == null) {
            throw exception(PURCHASE_ORDER_IMPORT_ORDER_TIME_REQUIRED);
        }
        // 2. 解析结算账户（可选）
        Long accountId = null;
        if (StrUtil.isNotBlank(first.getAccountName())) {
            ErpAccountDO account = accountMapper.selectByName(first.getAccountName());
            if (account == null) {
                throw exception(PURCHASE_ORDER_IMPORT_ACCOUNT_NOT_EXISTS, first.getAccountName());
            }
            accountId = account.getId();
        }
        // 3. 组装明细
        List<ErpPurchaseOrderSaveReqVO.Item> items = new ArrayList<>();
        for (ErpPurchaseOrderImportExcelVO row : group) {
            MdmItemRespDTO product = mdmItemApi.getItemByCode(row.getProductCode()).getCheckedData();
            if (product == null) {
                throw exception(PURCHASE_ORDER_IMPORT_PRODUCT_NOT_EXISTS, row.getProductCode());
            }
            MdmUnitMeasureRespDTO unit = mdmUnitMeasureApi.getUnitMeasureByCode(row.getProductUnitCode()).getCheckedData();
            if (unit == null) {
                throw exception(PURCHASE_ORDER_IMPORT_UNIT_NOT_EXISTS, row.getProductUnitCode());
            }
            ErpPurchaseOrderSaveReqVO.Item item = new ErpPurchaseOrderSaveReqVO.Item()
                    .setProductId(product.getId())
                    .setProductUnitId(unit.getId())
                    .setProductPrice(row.getProductPrice())
                    .setCount(row.getCount())
                    .setTaxPercent(row.getTaxPercent())
                    .setQcCheckFlag(row.getQcCheckFlag())
                    .setRemark(row.getItemRemark());
            items.add(item);
        }
        // 4. 组装主表
        ErpPurchaseOrderSaveReqVO createReqVO = new ErpPurchaseOrderSaveReqVO()
                .setSupplierId(supplier.getId())
                .setAccountId(accountId)
                .setOrderTime(first.getOrderTime())
                .setDiscountPercent(ObjectUtil.defaultIfNull(first.getDiscountPercent(), BigDecimal.ZERO))
                .setDepositPrice(ObjectUtil.defaultIfNull(first.getDepositPrice(), BigDecimal.ZERO))
                .setRemark(first.getRemark())
                .setItems(items);
        return createReqVO;
    }

}