帷幄君成-富创-后端代码
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
sfd
2025-05-26 2a64b537e8e3bce9ce030585a3da17d48379c0ad 
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java


@@ -3,6 +3,7 @@


import java.math.BigDecimal;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.ZoneId;


import java.time.format.DateTimeFormatter;


import java.time.temporal.ChronoUnit;


import java.util.*;


@@ -14,12 +15,16 @@


import com.aps.core.domain.ApsPartPlan;


import com.aps.core.domain.ApsResourceDateStat;


import com.aps.core.domain.ApsResourceGroup;


import com.aps.core.mapper.ApsAbnormalProcessAnalysisMapper;


import com.aps.core.mapper.ApsResourceGroupMapper;


import com.aps.core.service.IApsAbnormalProcessAnalysisService;


import jakarta.annotation.Resource;


import jakarta.servlet.http.HttpServletResponse;


import lombok.extern.slf4j.Slf4j;


import org.apache.poi.ss.usermodel.*;


import org.apache.poi.ss.util.CellRangeAddress;


import org.apache.poi.util.IOUtils;


import org.apache.poi.util.Removal;


import org.apache.poi.xssf.streaming.SXSSFCell;


import org.apache.poi.xssf.streaming.SXSSFRow;


import org.apache.poi.xssf.streaming.SXSSFSheet;


@@ -50,6 +55,9 @@


    private ApsResourceGroupMapper resourceGroupMapper;


    @Autowired


    private ApsResourceGroupMapper apsResourceGroupMapper;




    @Resource


    private IApsAbnormalProcessAnalysisService analysisService;




    /**


     * 查询零件统计表


@@ -149,24 +157,32 @@


                /*判断当前工序 当前工序只有一条*/


                if (stat.getCurrentProcessNumber().equals(stat.getRoadProcessNumber())) {


                    /* 对 stat.getProcessPlanStartDay() 和当前日期 进行对比，只对比到日，不用管十分秒*/


                    if (stat.getProcessPlanStartDay().toLocalDate().isBefore(LocalDateTime.now().toLocalDate())) {


                        stat.setProcessPlanStartDay(LocalDateTime.now());


                    LocalDate startLocalDate = LocalDate.ofInstant(stat.getProcessPlanStartDay().toInstant(), ZoneId.systemDefault());


                    LocalDate nowLocalDate = LocalDate.now();


                    if (startLocalDate.isBefore(nowLocalDate)) {


                        stat.setProcessPlanStartDay(new Date());


                    }


                }


                /*未开工工序的计划开工日=上一道工序的计划开工日+上一道工序的工序总工时。*/


                if (stat.getCurrentProcessNumber().compareTo(stat.getRoadProcessNumber()) < 0) {


                    if (last != null) {


                        stat.setProcessPlanStartDay(last.getProcessPlanStartDay().plusHours(last.getProcessTotalTime()));


                        LocalDateTime lastStartDate = LocalDateTime.ofInstant(last.getProcessPlanStartDay().toInstant(), ZoneId.systemDefault());


                        long seconds = last.getProcessTotalTime().multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();


                        LocalDateTime currentStartDate = lastStartDate.plusSeconds(seconds);


                        stat.setProcessPlanStartDay(Date.from(currentStartDate.atZone(ZoneId.systemDefault()).toInstant()));


                    }


                }


                /*保存上一步计算的 开工日*/


                last = stat;


                stat.setId(IdUtils.fastUUID().toString());


                stat.setBatchNumber(batchNum);


                stat.setDelFlag("0");


                apsPartRouteStatMapper.insertApsPartRouteStat(stat);


            }


        }


        apsPartRouteStatMapper.deleteLastBatch(batchNum);


        /*计算并保存 工序异常信息*/


        analysisService.batchSaveAbnormalInfo();


    }


    /** 查询资源日历表


     */


@@ -213,8 +229,9 @@


                    else {


                        ApsResourceDateStat empty = new ApsResourceDateStat();


                        empty.setPlanDay(LocalDate.parse(planDay, formatter));


                        empty.setDesignTimes(resourceGroup.getDevicesQuantity().intValue()*resourceGroup.getTheoryHours().intValue());


                        empty.setRequireTimes(0);


                      //  empty.setDesignTimes(resourceGroup.getDevicesQuantity().intValue()*resourceGroup.getTheoryHours().intValue());


                        empty.setDesignTimes(resourceGroup.getTheoryHours().multiply(BigDecimal.valueOf( resourceGroup.getDevicesQuantity())));


                        empty.setRequireTimes(BigDecimal.ZERO);


                        empty.setResourceName(resourceName);


                        empty.setResourceGroupName(resourceName);


                        empty.setCapacityLoad(BigDecimal.ZERO);


@@ -286,8 +303,8 @@


                    dataRow.createCell(0).setCellValue(resourceName);


                    for (int j = 0; j < resourceDateStats.size(); j++) {


                        ApsResourceDateStat apsResourceDateStat = resourceDateStats.get(j);


                        dataRow.createCell(j*3+1).setCellValue(apsResourceDateStat.getDesignTimes());


                        dataRow.createCell(j*3+2).setCellValue(apsResourceDateStat.getRequireTimes());


                        dataRow.createCell(j*3+1).setCellValue(apsResourceDateStat.getDesignTimes().doubleValue());


                        dataRow.createCell(j*3+2).setCellValue(apsResourceDateStat.getRequireTimes().doubleValue());


                        dataRow.createCell(j*3+3).setCellValue(apsResourceDateStat.getCapacityLoad().doubleValue()+"%");


                    }


                }