fix(mes): 隔离设备物料并支持销售产品映射

liu

2 天以前 381e02b9eccbe953b31d09f2af1c2ce77c816140

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

@@ -5,6 +5,9 @@
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;
@@ -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;
@@ -78,7 +85,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得装箱单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
    public CommonResult<MesWmPackageRespVO> getPackage(@RequestParam("id") Long id) {
        MesWmPackageDO packageDO = packageService.getPackage(id);
        if (packageDO == null) {
@@ -89,7 +95,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得装箱单分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
    public CommonResult<PageResult<MesWmPackageRespVO>> getPackagePage(
            @Valid MesWmPackagePageReqVO pageReqVO) {
        PageResult<MesWmPackageDO> pageResult = packageService.getPackagePage(pageReqVO);
@@ -153,4 +158,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.writeTemplate(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));
    }

}