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

liu

昨天 381e02b9eccbe953b31d09f2af1c2ce77c816140

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java

@@ -7,6 +7,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.miscissue.vo.MesWmMiscIssueAuditReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO;
@@ -14,6 +17,7 @@
import cn.iocoder.yudao.module.mes.service.wm.miscissue.MesWmMiscIssueService;
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;
@@ -21,10 +25,12 @@
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;
import java.util.List;
import java.util.Set;

import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -65,7 +71,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得杂项出库单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')")
    public CommonResult<MesWmMiscIssueRespVO> getMiscIssue(@RequestParam("id") Long id) {
        MesWmMiscIssueDO issue = miscIssueService.getMiscIssue(id);
        if (issue == null) {
@@ -76,7 +81,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得杂项出库单分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')")
    public CommonResult<PageResult<MesWmMiscIssueRespVO>> getMiscIssuePage(
            @Valid MesWmMiscIssuePageReqVO pageReqVO) {
        PageResult<MesWmMiscIssueDO> pageResult = miscIssueService.getMiscIssuePage(pageReqVO);
@@ -96,21 +100,26 @@
    }

    @PutMapping("/submit")
    @Operation(summary = "提交杂项出库单审批")
    @Operation(summary = "提交杂项出库单审批（草稿→审批中），审核人由审批配置统一指定")
    @Parameter(name = "id", description = "编号", required = true)
    @Parameter(name = "processDefinitionKey", description = "流程定义 Key", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:update')")
    public CommonResult<Boolean> submitMiscIssue(@RequestParam("id") Long id,
                                                  @RequestParam("processDefinitionKey") String processDefinitionKey) {
        miscIssueService.submitMiscIssueApproval(id, processDefinitionKey);
    public CommonResult<Boolean> submitMiscIssue(@RequestParam("id") Long id) {
        miscIssueService.submitMiscIssueApproval(id);
        return success(true);
    }

    @GetMapping("/approval-process-list")
    @Operation(summary = "获得杂项出库审批流程定义列表")
    @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')")
    public CommonResult<List<java.util.Map<String, Object>>> getApprovalProcessList() {
        return success(miscIssueService.getMiscIssueApprovalProcessDefinitionList());
    @PutMapping("/audit")
    @Operation(summary = "审核杂项出库单（审批中→待执行出库/草稿），仅审批人本人可操作")
    @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:audit')")
    public CommonResult<Boolean> auditMiscIssue(@Valid @RequestBody MesWmMiscIssueAuditReqVO auditReqVO) {
        miscIssueService.auditMiscIssue(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
        return success(true);
    }

    @GetMapping("/approver-ids")
    @Operation(summary = "获得杂项出库单的审核人编号集合，供前端判断是否展示审核按钮")
    public CommonResult<Set<Long>> getApproverUserIds() {
        return success(miscIssueService.getMiscIssueApproverUserIds());
    }

    @PutMapping("/finish")
@@ -131,6 +140,34 @@
        return success(true);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得杂项出库单导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesWmMiscIssueImportExcelVO> list = Collections.singletonList(
                MesWmMiscIssueImportExcelVO.builder()
                        .code("MI20260302001").name("示例杂项出库单").type(1)
                        .issueDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
                        .sourceDocType("").sourceDocCode("").remark("").build()
        );
        // 输出
        ExcelUtils.writeTemplate(response, "杂项出库单导入模板.xls", "杂项出库单列表", MesWmMiscIssueImportExcelVO.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-misc-issue:import')")
    public CommonResult<MesWmMiscIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                                @RequestParam(value = "updateSupport", required = false,
                                                                        defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesWmMiscIssueImportExcelVO> list = ExcelUtils.read(file, MesWmMiscIssueImportExcelVO.class);
        return success(miscIssueService.importMiscIssueList(list, updateSupport));
    }

    // ==================== 拼接 VO ====================

    private List<MesWmMiscIssueRespVO> buildRespVOList(List<MesWmMiscIssueDO> list) {