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

liu

昨天 381e02b9eccbe953b31d09f2af1c2ce77c816140

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java

@@ -8,17 +8,20 @@
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.outsourceissue.vo.MesWmOutsourceIssueImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueSaveReqVO;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourceissue.MesWmOutsourceIssueDO;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.outsourceissue.MesWmOutsourceIssueService;
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;
@@ -26,6 +29,7 @@
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.Collections;
@@ -45,7 +49,7 @@
    @Resource
    private MesWmOutsourceIssueService outsourceIssueService;
    @Resource
    private ErpSupplierApi supplierApi;
    private SrmSupplierApi srmSupplierApi;
    @Resource
    private MesProWorkOrderService workOrderService;

@@ -76,7 +80,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得外协发料单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
    public CommonResult<MesWmOutsourceIssueRespVO> getOutsourceIssue(@RequestParam("id") Long id) {
        MesWmOutsourceIssueDO issue = outsourceIssueService.getOutsourceIssue(id);
        if (issue == null) {
@@ -87,7 +90,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得外协发料单分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
    public CommonResult<PageResult<MesWmOutsourceIssueRespVO>> getOutsourceIssuePage(
            @Valid MesWmOutsourceIssuePageReqVO pageReqVO) {
        PageResult<MesWmOutsourceIssueDO> pageResult = outsourceIssueService.getOutsourceIssuePage(pageReqVO);
@@ -145,9 +147,36 @@
    @GetMapping("/check-quantity")
    @Operation(summary = "校验外协发料单数量", description = "校验每行明细数量之和是否等于行发料数量")
    @Parameter(name = "id", description = "编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
    public CommonResult<Boolean> checkOutsourceIssueQuantity(@RequestParam("id") Long id) {
        return success(outsourceIssueService.checkOutsourceIssueQuantity(id));
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得外协发料单导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesWmOutsourceIssueImportExcelVO> list = Collections.singletonList(
                MesWmOutsourceIssueImportExcelVO.builder()
                        .code("WOS20260302001").name("示例外协发料单")
                        .issueDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
                        .remark("").build()
        );
        // 输出
        ExcelUtils.writeTemplate(response, "外协发料单导入模板.xls", "外协发料单列表", MesWmOutsourceIssueImportExcelVO.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-outsource-issue:import')")
    public CommonResult<MesWmOutsourceIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                                     @RequestParam(value = "updateSupport", required = false,
                                                                             defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesWmOutsourceIssueImportExcelVO> list = ExcelUtils.read(file, MesWmOutsourceIssueImportExcelVO.class);
        return success(outsourceIssueService.importOutsourceIssueList(list, updateSupport));
    }

    // ==================== 拼接 VO ====================
@@ -157,9 +186,9 @@
            return Collections.emptyList();
        }
        // 1. 获得关联数据
        Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
        Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
                convertSet(list, MesWmOutsourceIssueDO::getVendorId)).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
                .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
        Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
                convertSet(list, MesWmOutsourceIssueDO::getWorkOrderId));
        // 2. 构建结果