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

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/unit/MdmUnitMeasureServiceImpl.java

@@ -2,8 +2,14 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportExcelVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
@@ -11,17 +17,19 @@
import cn.iocoder.yudao.module.mdm.dal.mysql.unit.MdmUnitMeasureMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.util.*;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.module.mdm.enums.ErrorCodeConstants.*;

/**
 * MDM 计量单位 Service 实现类
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Service
@Validated
@@ -32,6 +40,53 @@

    @Resource
    private MdmItemMapper itemMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public MdmUnitMeasureImportRespVO importUnitMeasureList(List<MdmUnitMeasureImportExcelVO> importUnits,
                                                            MdmUnitMeasureImportReqVO importReqVO) {
        // 1. 校验非空（以单位编码作为导入主键）
        importUnits = filterList(importUnits, item -> StrUtil.isNotBlank(item.getCode()));
        if (CollUtil.isEmpty(importUnits)) {
            throw exception(MDM_UNIT_MEASURE_IMPORT_LIST_IS_EMPTY);
        }

        // 2. 逐条处理
        MdmUnitMeasureImportRespVO respVO = MdmUnitMeasureImportRespVO.builder()
                .createUnitCodes(new ArrayList<>())
                .updateUnitCodes(new ArrayList<>())
                .failureUnitCodes(new LinkedHashMap<>())
                .build();
        importUnits.forEach(importUnit -> {
            try {
                // 2.1 判断是否存在（按编码唯一）
                MdmUnitMeasureDO existUnit = unitMeasureMapper.selectByCode(importUnit.getCode());
                if (existUnit == null) {
                    // 2.1.1 新增
                    MdmUnitMeasureDO unit = BeanUtils.toBean(importUnit, MdmUnitMeasureDO.class);
                    if (unit.getStatus() == null) {
                        unit.setStatus(CommonStatusEnum.ENABLE.getStatus());
                    }
                    unitMeasureMapper.insert(unit);
                    respVO.getCreateUnitCodes().add(importUnit.getCode());
                    return;
                }
                // 2.1.2 已存在，判断是否允许更新
                if (!importReqVO.getUpdateSupport()) {
                    respVO.getFailureUnitCodes().put(importUnit.getCode(),
                            StrUtil.format(MDM_UNIT_MEASURE_CODE_EXISTS.getMsg(), importUnit.getCode()));
                    return;
                }
                MdmUnitMeasureDO updateUnit = BeanUtils.toBean(importUnit, MdmUnitMeasureDO.class)
                        .setId(existUnit.getId());
                unitMeasureMapper.updateById(updateUnit);
                respVO.getUpdateUnitCodes().add(importUnit.getCode());
            } catch (ServiceException ex) {
                respVO.getFailureUnitCodes().put(importUnit.getCode(), ex.getMessage());
            }
        });
        return respVO;
    }

    @Override
    public Long createUnitMeasure(MdmUnitMeasureSaveReqVO createReqVO) {
@@ -65,13 +120,16 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteUnitMeasure(Long id) {
        // 校验存在
        validateUnitMeasureExists(id);
        MdmUnitMeasureDO unitMeasure = validateUnitMeasureExists(id);
        // 校验是否被物料使用（直接使用 Mapper 避免循环依赖）
        if (itemMapper.selectCountByUnitMeasureId(id) > 0) {
            throw exception(MDM_UNIT_MEASURE_EXISTS_ITEM);
        }
        // 先清理同编码的已软删除脏数据，避免当前记录软删时触发唯一键冲突
        unitMeasureMapper.physicalDeleteByCode(unitMeasure.getCode());
        // 删除
        unitMeasureMapper.deleteById(id);
    }