feat(technology): 用TechnologyOperation替换ProductProcess改进BOM处理

zss

4 天以前 c92915b999f52f5e986e158a51a1c68d5849d17c

feat(technology): 用TechnologyOperation替换ProductProcess改进BOM处理

 src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java

@@ -25,9 +25,11 @@
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.pojo.TechnologyBom;
import com.ruoyi.technology.pojo.TechnologyBomStructure;
import com.ruoyi.technology.pojo.TechnologyOperation;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.service.TechnologyBomService;
import com.ruoyi.technology.service.TechnologyBomStructureService;
import com.ruoyi.technology.service.TechnologyOperationService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -45,6 +47,7 @@

    private final TechnologyBomMapper technologyBomMapper;
    private final IProductModelService productModelService;
    private final TechnologyOperationService technologyOperationService;
    private final TechnologyBomStructureService technologyBomStructureService;
    private final TechnologyRoutingMapper technologyRoutingMapper;
    private final IProductService productService;
@@ -194,8 +197,8 @@
            dto.setChildSpec(clean(dto.getChildSpec()));
        });
        handleProcess(list);
//        Map<String, Long> processMap = productProcessService.list().stream()
//                .collect(Collectors.toMap(ProductProcess::getName, ProductProcess::getId, (k1, k2) -> k1));
        Map<String, Long> processMap = technologyOperationService.list().stream()
                .collect(Collectors.toMap(TechnologyOperation::getName, TechnologyOperation::getId, (k1, k2) -> k1));

        //  创建 BOM 数据
        BomImportDto first = list.get(0);
@@ -247,9 +250,9 @@
            node.setProductModelId(childModel.getId());
            node.setUnitQuantity(dto.getUnitQty());
            node.setUnit(childModel.getUnit());
//            if (processMap.containsKey(dto.getProcess())) {
//                node.setProcessId(processMap.get(dto.getProcess()));
//            }
            if (processMap.containsKey(dto.getProcess())) {
                node.setOperationId(processMap.get(dto.getProcess()));
            }
            technologyBomStructureService.save(node);

            //  把当前子项记录到 Map,作为以后更深层级的父项查找依据