零件统计数据查询

bluejay

2025-04-12 a40d3116690c0584e933b2f76ea2951e528c297d

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java

@@ -1,10 +1,12 @@
package com.aps.core.service.impl;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;

import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.core.web.domain.AjaxResult;
@@ -29,6 +31,7 @@
{
    @Autowired
    private ApsPartRouteStatMapper apsPartRouteStatMapper;
    @Autowired
    private ApsResourceGroupMapper resourceGroupMapper;

    /**
@@ -109,13 +112,13 @@
    /**
     * 查询零件工序并更新计划开工日期
     * */
    @Override
    public void updatePartRoutPlanDate() {
        List<ApsPartRouteStat> tempList = apsPartRouteStatMapper.selectPartRoutStat();
        /*对tempList 按照 workOrderNo 进行分组*/
        Map<String, List<ApsPartRouteStat>> groupByWorkOrderNo = tempList.stream().collect(groupingBy(ApsPartRouteStat::getWorkOrderNo));
        /*本次计算批次号*/
        String batchNum = IdUtils.fastSimpleUUID();
        apsPartRouteStatMapper.deleteLastBatch(batchNum);
        for (Map.Entry<String, List<ApsPartRouteStat>> entry : groupByWorkOrderNo.entrySet()) {
            /*取出每个零件工单的工艺路线信息*/
            List<ApsPartRouteStat> apsPartRouteStatList = entry.getValue();
@@ -124,7 +127,7 @@
            /*临时保存 上一道工序的工序总工时*/
            ApsPartRouteStat last=null;
            for (int i = 0; i <apsPartRouteStatList.size(); i++) {
                ApsPartRouteStat stat = apsPartRouteStatList.get(0);
                ApsPartRouteStat stat = apsPartRouteStatList.get(i);
                /*判断当前工序 当前工序只有一条*/
                if (stat.getCurrentProcessNumber().equals(stat.getRoadProcessNumber())) {
                    /* 对 stat.getProcessPlanStartDay() 和当前日期 进行对比，只对比到日，不用管十分秒*/
@@ -133,7 +136,7 @@
                    }
                }
                /*未开工工序的计划开工日=上一道工序的计划开工日+上一道工序的工序总工时。*/
                if (stat.getCurrentProcessNumber().compareTo(stat.getRoadProcessNumber()) > 0) {
                if (stat.getCurrentProcessNumber().compareTo(stat.getRoadProcessNumber()) < 0) {
                    if (last != null) {
                        stat.setProcessPlanStartDay(last.getProcessPlanStartDay().plusHours(last.getProcessTotalTime()));
                    }
@@ -152,38 +155,58 @@
    @Override
    public AjaxResult selectResourceDateStat() {
        /*查出所有统计的数据*/
        AjaxResult result = new AjaxResult(200, "生成成功");
        List<ApsResourceDateStat> list = apsPartRouteStatMapper.selectResourceDateStat();
        /*求出计划的最大时间，没有 设置为当前时间+15天*/
        ApsResourceDateStat apsResourceDateStat = list.stream().max(Comparator.comparing(ApsResourceDateStat::getPlanDay)).orElse(null);
        LocalDate maxPlanDay = LocalDate.now().plus(15, ChronoUnit.DAYS);
        if(apsResourceDateStat!=null){
            maxPlanDay=apsResourceDateStat.getPlanDay();
        }
        /*组织出日期表头*/
        List<String> planDays = new ArrayList<>();
        LocalDate startDay = LocalDate.now();
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        while (startDay .isBefore( maxPlanDay)){
            planDays.add(startDay.format(formatter));
            startDay=startDay.plus(1,ChronoUnit.DAYS);
        }
        /*根据日期表头的顺序，组织出每个日期下的统计项目*/
        List<ApsResourceDateStat> targetList = new ArrayList<>();
        for (String planDay : planDays) {
            ApsResourceDateStat apsResourceDateStat1 = list.stream()
                    .filter(item -> item.getPlanDay().equals(LocalDate.parse(planDay, formatter)))
                    .findFirst().orElse(null);
            if(apsResourceDateStat1!=null){
                targetList.add(apsResourceDateStat1);
            }else{
                ApsResourceDateStat apsResourceDateStat2 = new ApsResourceDateStat();
                apsResourceDateStat2.setPlanDay( LocalDate.parse(planDay, formatter));
                targetList.add(apsResourceDateStat2);
        if (!list.isEmpty()) {
            /*求出计划的最大时间，没有 设置为当前时间+15天*/
            ApsResourceDateStat apsResourceDateStat = list.stream().max(Comparator.comparing(ApsResourceDateStat::getPlanDay)).orElse(null);
            LocalDate maxPlanDay = LocalDate.now().plus(15, ChronoUnit.DAYS);
            if (apsResourceDateStat != null) {
                maxPlanDay = apsResourceDateStat.getPlanDay();
            }
            /*组织出日期表头*/
            List<String> planDays = new ArrayList<>();
            LocalDate startDay = LocalDate.now();
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
            while (!startDay.isAfter(maxPlanDay)) {
                planDays.add(startDay.format(formatter));
                startDay = startDay.plus(1, ChronoUnit.DAYS);
            }
            /*组织出列头数据*/
            List<String> resourceNames =list.stream().map(ApsResourceDateStat::getResourceName).distinct().toList();
            /*准备资源组信息*/
            List<Map<String, List<ApsResourceDateStat>>> targetList = new ArrayList<>();
            resourceNames.forEach(resourceName -> {
                        /*根据日期表头的顺序，组织出每个日期下的统计项目*/
                Map<String, List<ApsResourceDateStat>> maps = new HashMap<>(Map.of());
                List<ApsResourceDateStat> currentDaysResouces=new ArrayList<>();
                for (String planDay : planDays) {
                    /*查找当前计划日期下的所有资源组的数据*/
                    Optional<ApsResourceDateStat> first = list.stream()
                            .filter(item ->
                                    item.getPlanDay().equals(LocalDate.parse(planDay, formatter))
                                 && item.getResourceGroupName().equals(resourceName)
                            ).collect(Collectors.toList()).stream().findFirst();
                    if(first.isPresent()){
                        currentDaysResouces.add(first.get());
                    }
                    else {
                        ApsResourceDateStat empty = new ApsResourceDateStat();
                        empty.setPlanDay(LocalDate.parse(planDay, formatter));
                        empty.setDesignTimes(0);
                        empty.setRequireTimes(0);
                        empty.setResourceName(resourceName);
                        empty.setResourceGroupName(resourceName);
                        empty.setCapacityLoad(BigDecimal.ZERO);
                        currentDaysResouces.add(empty);
                    }
                };
                maps.put(resourceName, currentDaysResouces);
                targetList.add(maps);
            });
            result.put("planTitle", planDays);
            result.put("planTable", targetList);
        }
        AjaxResult result=new AjaxResult(200,"生成成功")
                .put("planTitle",planDays)
                .put("planTable",targetList);
        return result;
    }