补充关联不到工艺路线的料号保存至气体异常料号报表

hongjli

2025-05-23 7c1e701b523bc54dc2decffac6e8f5a0e3987b98

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java

@@ -21,6 +21,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * 气体管路产能规划Controller
@@ -43,7 +44,7 @@
     * 查询气体管路产能规划列表
     */
    @Operation(summary = "查询气体管路产能规划列表", description = "分页查询")
    @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
//    @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan) {
//        startPage();
@@ -57,11 +58,20 @@
                ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
                apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
                apsGasPipelineCapacityPlanTemp.setOrgCode(apsStandardProcessTemp.getPlant());
                apsGasPipelineCapacityPlanTemp.setWorkshop(apsStandardProcessTemp.getWorkShop());
                list.add(apsGasPipelineCapacityPlanTemp);
            }
        } else {
            list.forEach(item -> {
                processList.stream().filter(p -> Objects.equals(p.getPlant(), item.getOrgCode()))
                        .filter(p -> Objects.equals(p.getProcessName(), item.getProcessName()))
                        .findFirst().ifPresent(p -> {
                            item.setWorkshop(p.getWorkShop());
                        });
            });
        }
        if (processList.size() > list.size()) {
            List<String> newProcess = new ArrayList<>();
            List<ApsStandardProcess> newProcess = new ArrayList<>();
            for (ApsStandardProcess apsStandardProcessTemp : processList) {
                boolean flag = true;
                for (ApsGasPipelineCapacityPlan temp : list) {
@@ -71,12 +81,14 @@
                    }
                }
                if (flag) {
                    newProcess.add(apsStandardProcessTemp.getProcessName());
                    newProcess.add(apsStandardProcessTemp);
                }
            }
            for (String processName : newProcess) {
            for (ApsStandardProcess processName : newProcess) {
                ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlanTemp = new ApsGasPipelineCapacityPlan();
                apsGasPipelineCapacityPlanTemp.setProcessName(processName);
                apsGasPipelineCapacityPlanTemp.setProcessName(processName.getProcessName());
                apsGasPipelineCapacityPlanTemp.setOrgCode(processName.getPlant());
                apsGasPipelineCapacityPlanTemp.setWorkshop(processName.getWorkShop());
                list.add(apsGasPipelineCapacityPlanTemp);
            }
        }
@@ -109,11 +121,12 @@
            // 格式：yyyy-MM
            @RequestParam String date,
            @RequestParam String factory,
            @RequestParam String major,
            // 格式：yyyy-MM
            @RequestParam String toStart,
            // 格式：yyyy-MM
            @RequestParam String toEnd) {
        apsGasPipelineCapacityPlanService.copyPlan(date, factory, toStart, toEnd);
        apsGasPipelineCapacityPlanService.copyPlan(date, factory, major, toStart, toEnd);
        return success();
    }