feat(mes): 新增ERP销售订单生产状态枚举及MES工艺路线优化

云

2026-10-26 0857cf1830039d60ce73005f386f284cf575e511

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java

@@ -8,17 +8,22 @@
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.returnissue.vo.MesWmReturnIssueImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueService;
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 +31,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;
@@ -48,6 +54,8 @@
    private MesMdWorkstationService workstationService;
    @Resource
    private MesProWorkOrderService workOrderService;
    @Resource
    private MesProTaskService taskService;

    @PostMapping("/create")
    @Operation(summary = "创建生产退料单")
@@ -142,6 +150,34 @@
        return success(true);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得生产退料单导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesWmReturnIssueImportExcelVO> list = Collections.singletonList(
                MesWmReturnIssueImportExcelVO.builder()
                        .code("RI001").name("示例生产退料单").type(1)
                        .returnDate(java.time.LocalDateTime.now())
                        .remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "生产退料单导入模板.xls", "生产退料单列表", MesWmReturnIssueImportExcelVO.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-return-issue:import')")
    public CommonResult<MesWmReturnIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                                  @RequestParam(value = "updateSupport", required = false,
                                                                          defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesWmReturnIssueImportExcelVO> list = ExcelUtils.read(file, MesWmReturnIssueImportExcelVO.class);
        return success(issueService.importReturnIssueList(list, updateSupport));
    }

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

    private List<MesWmReturnIssueRespVO> buildRespVOList(List<MesWmReturnIssueDO> list) {
@@ -153,10 +189,14 @@
                convertSet(list, MesWmReturnIssueDO::getWorkstationId));
        Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
                convertSet(list, MesWmReturnIssueDO::getWorkOrderId));
        Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
                convertSet(list, MesWmReturnIssueDO::getTaskId));
        // 2. 构建结果
        return BeanUtils.toBean(list, MesWmReturnIssueRespVO.class, vo -> {
            MapUtils.findAndThen(workstationMap, vo.getWorkstationId(),
                    workstation -> vo.setWorkstationName(workstation.getName()));
            MapUtils.findAndThen(taskMap, vo.getTaskId(), task ->
                    vo.setTaskCode(task.getCode()).setTaskName(task.getName()));
            MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(),
                    workOrder -> vo.setWorkOrderCode(workOrder.getCode()));
        });