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

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java

@@ -5,13 +5,16 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackagePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.MesWmPackageSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;

import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageDO;
import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;

import cn.iocoder.yudao.module.mes.service.wm.packages.MesWmPackageService;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
@@ -20,13 +23,17 @@
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -44,7 +51,7 @@
    @Resource
    private MesWmPackageService packageService;
    @Resource
    private MesMdClientService clientService;
    private CrmCustomerApi customerApi;
    @Resource
    private MdmUnitMeasureApi mdmUnitMeasureApi;

@@ -131,7 +138,7 @@
            return Collections.emptyList();
        }
        // 批量查询客户
        Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
        Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
                convertSet(list, MesWmPackageDO::getClientId));
        // 批量查询计量单位（尺寸 + 重量）
        Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
@@ -143,8 +150,7 @@
        // 构建返回结果
        return BeanUtils.toBean(list, MesWmPackageRespVO.class, vo -> {
            MapUtils.findAndThen(clientMap, vo.getClientId(),
                    client -> vo.setClientCode(client.getCode()).setClientName(client.getName())
                            .setClientNickname(client.getNickname()));
                    client -> vo.setClientName(client.getName()));
            MapUtils.findAndThen(unitMeasureMap, vo.getSizeUnitId(),
                    unit -> vo.setSizeUnitName(unit.getName()));
            MapUtils.findAndThen(unitMeasureMap, vo.getWeightUnitId(),
@@ -154,4 +160,34 @@
        });
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得装箱单导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesWmPackageImportExcelVO> list = Collections.singletonList(
                MesWmPackageImportExcelVO.builder()
                        .code("PKG20260307001")
                        .packageDate(java.time.LocalDateTime.of(2026, 3, 7, 10, 0, 0))
                        .salesOrderCode("SO20260301")
                        .invoiceCode("INV20260301")
                        .width(new java.math.BigDecimal("40.00")).remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "装箱单导入模板.xls", "装箱单列表", MesWmPackageImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入装箱单")
    @Parameters({
            @Parameter(name = "file", description = "Excel 文件", required = true),
            @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true")
    })
    @PreAuthorize("@ss.hasPermission('mes:wm-package:import')")
    public CommonResult<MesWmPackageImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                              @RequestParam(value = "updateSupport", required = false,
                                                                      defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesWmPackageImportExcelVO> list = ExcelUtils.read(file, MesWmPackageImportExcelVO.class);
        return success(packageService.importPackageList(list, updateSupport));
    }

}