feat(mes): 新增工艺路线完整导入功能并优化相关验证

云

16 小时以前 3edf8c4fc07f9784e2d04ee7a98692bb457749eb

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java

@@ -14,10 +14,16 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,6 +34,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.stream.Collectors;

import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -46,6 +53,12 @@
    private MesProProcessService processService;
    @Resource
    private MesMdItemService itemService;
    @Resource
    private MesWmWarehouseService warehouseService;
    @Resource
    private MesWmWarehouseLocationService warehouseLocationService;
    @Resource
    private MesWmWarehouseAreaService warehouseAreaService;

    @PostMapping("/create")
    @Operation(summary = "创建工单工序")
@@ -134,11 +147,34 @@
        processIds.addAll(nextProcessIds);
        Map<Long, MesProProcessDO> processMap = CollUtil.isNotEmpty(processIds)
                ? processService.getProcessMap(processIds) : Collections.emptyMap();
        // 获取产出物料
        Set<Long> outputItemIds = convertSet(list, MesProWorkOrderProcessDO::getOutputItemId);
        outputItemIds.removeAll(Collections.singleton(null));
        Map<Long, MesMdItemDO> itemMap = CollUtil.isNotEmpty(outputItemIds)
                ? itemService.getItemMap(outputItemIds) : Collections.emptyMap();
        // 获取产出物料（解析逗号分隔的字符串）
        Set<Long> allOutputItemIds = new HashSet<>();
        Map<Long, List<Long>> voOutputItemIdsMap = new HashMap<>();
        for (int i = 0; i < list.size(); i++) {
            String outputItemIdStr = list.get(i).getOutputItemId();
            if (outputItemIdStr != null && !outputItemIdStr.isBlank()) {
                List<Long> ids = Arrays.stream(outputItemIdStr.split(","))
                        .map(String::trim).filter(s -> !s.isEmpty())
                        .map(Long::valueOf).collect(Collectors.toList());
                voOutputItemIdsMap.put((long) i, ids);
                allOutputItemIds.addAll(ids);
            }
        }
        Map<Long, MesMdItemDO> itemMap = CollUtil.isNotEmpty(allOutputItemIds)
                ? itemService.getItemMap(allOutputItemIds) : Collections.emptyMap();
        // 获取报工仓库/库区/库位
        Set<Long> warehouseIds = convertSet(list, MesProWorkOrderProcessDO::getWarehouseId);
        warehouseIds.removeAll(Collections.singleton(null));
        Set<Long> locationIds = convertSet(list, MesProWorkOrderProcessDO::getLocationId);
        locationIds.removeAll(Collections.singleton(null));
        Set<Long> areaIds = convertSet(list, MesProWorkOrderProcessDO::getAreaId);
        areaIds.removeAll(Collections.singleton(null));
        Map<Long, MesWmWarehouseDO> warehouseMap = CollUtil.isNotEmpty(warehouseIds)
                ? warehouseService.getWarehouseMap(warehouseIds) : Collections.emptyMap();
        Map<Long, MesWmWarehouseLocationDO> locationMap = CollUtil.isNotEmpty(locationIds)
                ? warehouseLocationService.getWarehouseLocationMap(locationIds) : Collections.emptyMap();
        Map<Long, MesWmWarehouseAreaDO> areaMap = CollUtil.isNotEmpty(areaIds)
                ? warehouseAreaService.getWarehouseAreaMap(areaIds) : Collections.emptyMap();

        // 2. 查询投料BOM（按工序分组）
        Set<Long> workOrderIds = convertSet(list, MesProWorkOrderProcessDO::getWorkOrderId);
@@ -165,17 +201,42 @@
        }));

        // 3. 拼接 VO
        List<MesProWorkOrderProcessRespVO> result = BeanUtils.toBean(list, MesProWorkOrderProcessRespVO.class, vo -> {
        List<MesProWorkOrderProcessRespVO> result = BeanUtils.toBean(list, MesProWorkOrderProcessRespVO.class);
        for (int i = 0; i < result.size(); i++) {
            MesProWorkOrderProcessRespVO vo = result.get(i);
            MapUtils.findAndThen(processMap, vo.getProcessId(), process -> {
                vo.setProcessCode(process.getCode()).setProcessName(process.getName());
            });
            MapUtils.findAndThen(processMap, vo.getNextProcessId(), process -> {
                vo.setNextProcessName(process.getName());
            });
            MapUtils.findAndThen(itemMap, vo.getOutputItemId(), item -> {
                vo.setOutputItemCode(item.getCode()).setOutputItemName(item.getName());
            });
        });
            // 报工仓库/库区/库位名称
            MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(),
                    warehouse -> vo.setWarehouseName(warehouse.getName()));
            MapUtils.findAndThen(locationMap, vo.getLocationId(),
                    location -> vo.setLocationName(location.getName()));
            MapUtils.findAndThen(areaMap, vo.getAreaId(),
                    area -> vo.setAreaName(area.getName()));
            // 产出物料（支持多选）
            List<Long> ids = voOutputItemIdsMap.getOrDefault((long) i, Collections.emptyList());
            if (!ids.isEmpty()) {
                vo.setOutputItemIds(ids);
                List<String> names = ids.stream()
                        .map(id -> {
                            MesMdItemDO item = itemMap.get(id);
                            return item != null ? item.getName() : String.valueOf(id);
                        }).collect(Collectors.toList());
                vo.setOutputItemNames(String.join(", ", names));
                // 向后兼容：第一个产出物料
                Long firstId = ids.get(0);
                vo.setOutputItemId(firstId);
                MesMdItemDO firstItem = itemMap.get(firstId);
                if (firstItem != null) {
                    vo.setOutputItemCode(firstItem.getCode());
                    vo.setOutputItemName(firstItem.getName());
                }
            }
        }
        // 设置每个工序各自的投料BOM
        result.forEach(vo -> vo.setBomItems(bomItemsByProcessId.getOrDefault(vo.getProcessId(), Collections.emptyList())));
        return result;