huangjiayang
2025-04-27 da7ca397f86db83e6113f792ad819adb9f73d9e7
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessShopStatServiceImpl.java
@@ -352,63 +352,68 @@
            departmentTitle.setCellValue("当前工序负责人");
            departmentTitle.setCellStyle(title);
            SXSSFCell nextProcessTitle = rowTitle.createCell(8);
            SXSSFCell crtPcsStsTitle = rowTitle.createCell(8);
            crtPcsStsTitle.setCellValue("当前工序状态");
            crtPcsStsTitle.setCellStyle(title);
            SXSSFCell nextProcessTitle = rowTitle.createCell(9);
            nextProcessTitle.setCellValue("下一工序");
            nextProcessTitle.setCellStyle(title);
            SXSSFCell nextProcessDeparmentTitle = rowTitle.createCell(9);
            SXSSFCell nextProcessDeparmentTitle = rowTitle.createCell(10);
            nextProcessDeparmentTitle.setCellValue("下一工序负责人");
            nextProcessDeparmentTitle.setCellStyle(title);
            SXSSFCell itemNumberTitle = rowTitle.createCell(10);
            SXSSFCell itemNumberTitle = rowTitle.createCell(11);
            itemNumberTitle.setCellValue("料号");
            itemNumberTitle.setCellStyle(title);
            SXSSFCell drawingNoTitle = rowTitle.createCell(11);
            SXSSFCell drawingNoTitle = rowTitle.createCell(12);
            drawingNoTitle.setCellValue("图号");
            drawingNoTitle.setCellStyle(title);
            SXSSFCell versionNumberTitle = rowTitle.createCell(12);
            SXSSFCell versionNumberTitle = rowTitle.createCell(13);
            versionNumberTitle.setCellValue("版本号");
            versionNumberTitle.setCellStyle(title);
            SXSSFCell lowNumTitle = rowTitle.createCell(13);
            SXSSFCell lowNumTitle = rowTitle.createCell(14);
            lowNumTitle.setCellValue("低阶码");
            lowNumTitle.setCellStyle(title);
            SXSSFCell productionQuantityTitle = rowTitle.createCell(14);
            SXSSFCell productionQuantityTitle = rowTitle.createCell(15);
            productionQuantityTitle.setCellValue("生产数量");
            productionQuantityTitle.setCellStyle(title);
            SXSSFCell planSendDateTitle = rowTitle.createCell(15);
            SXSSFCell planSendDateTitle = rowTitle.createCell(16);
            planSendDateTitle.setCellValue("工单计划下发时间");
            planSendDateTitle.setCellStyle(title);
            SXSSFCell planEndDayTitle = rowTitle.createCell(16);
            SXSSFCell planEndDayTitle = rowTitle.createCell(17);
            planEndDayTitle.setCellValue("系统完工时间");
            planEndDayTitle.setCellStyle(title);
            int i1 = 18;
            String firstShopName = shopNames.get(0);
            SXSSFCell firstShopBeginDateTitle = rowTitle.createCell(17);
            SXSSFCell firstShopBeginDateTitle = rowTitle.createCell(18);
            firstShopBeginDateTitle.setCellValue(firstShopName+"开工时间");
            firstShopBeginDateTitle.setCellStyle(title);
            SXSSFCell firstShopEndDateTitle = rowTitle.createCell(18);
            SXSSFCell firstShopEndDateTitle = rowTitle.createCell(19);
            firstShopEndDateTitle.setCellValue(firstShopName+"完工时间");
            firstShopEndDateTitle.setCellStyle(title);
            /*焊接件齐套*/
            SXSSFCell hanJieQiTaoTitle= rowTitle.createCell(19);
            SXSSFCell hanJieQiTaoTitle= rowTitle.createCell(20);
            hanJieQiTaoTitle.setCellValue("焊接件齐套开始时间");
            hanJieQiTaoTitle.setCellStyle(title);
            int i1 = 19;
            for (int i = 1; i < shopNames.size(); i++) {
                String shopName = shopNames.get(i);
@@ -457,54 +462,58 @@
                SXSSFCell departmentCell = dataRow.createCell(7);
                departmentCell.setCellValue(plan.getDepartment());
                SXSSFCell crtPcsStsCell = dataRow.createCell(8);
                crtPcsStsCell.setCellValue("");
                //下一工序
                SXSSFCell nextProcessCell = dataRow.createCell(8);
                SXSSFCell nextProcessCell = dataRow.createCell(9);
                nextProcessCell.setCellValue("");
                //下一工序工序负责人
                SXSSFCell nextProcessDeparmentCell = dataRow.createCell(9);
                SXSSFCell nextProcessDeparmentCell = dataRow.createCell(10);
                nextProcessDeparmentCell.setCellValue(plan.getNextProcessDeparment());
                //料号
                SXSSFCell itemNumberCell = dataRow.createCell(10);
                SXSSFCell itemNumberCell = dataRow.createCell(11);
                itemNumberCell.setCellValue(plan.getItemNumber());
                // 图号
                SXSSFCell drawingNoCell = dataRow.createCell(11);
                SXSSFCell drawingNoCell = dataRow.createCell(12);
                drawingNoCell.setCellValue(plan.getDrawingNo());
               //版本号
                SXSSFCell versionNumberCell = dataRow.createCell(12);
                SXSSFCell versionNumberCell = dataRow.createCell(13);
                versionNumberCell.setCellValue(plan.getVersionNumber());
                //低阶码
                SXSSFCell lowNumCell = dataRow.createCell(13);
                SXSSFCell lowNumCell = dataRow.createCell(14);
                lowNumCell.setCellValue("");
                //生产数量
                SXSSFCell productionQuantityCell = dataRow.createCell(14);
                SXSSFCell productionQuantityCell = dataRow.createCell(15);
                productionQuantityCell.setCellValue(plan.getProductionQuantity().toString());
                //工单计划下发时间
                SXSSFCell planSendDateCell = dataRow.createCell(15);
                SXSSFCell planSendDateCell = dataRow.createCell(16);
                planSendDateCell.setCellValue("");
                //系统完工时间
                SXSSFCell planEndDayCell = dataRow.createCell(16);
                SXSSFCell planEndDayCell = dataRow.createCell(17);
                planEndDayCell.setCellValue(dateFormat.format(plan.getPlanEndDay()));
                SXSSFCell firstShopBeginDateCell = dataRow.createCell(17);
                SXSSFCell firstShopEndDateCell = dataRow.createCell(18);
                SXSSFCell firstShopBeginDateCell = dataRow.createCell(18);
                SXSSFCell firstShopEndDateCell = dataRow.createCell(19);
                plan.getDeptPlans().stream().filter(x->x.getShopName().equals(firstShopName)).findFirst().ifPresent(x->{
                    firstShopBeginDateCell.setCellValue(x.getPlanStartDate());
                    firstShopEndDateCell.setCellValue(x.getPlanEndDate());
                });
                /*焊接件齐套*/
                SXSSFCell hanJieQiTaoCell = dataRow.createCell(19);
                SXSSFCell hanJieQiTaoCell = dataRow.createCell(20);
                hanJieQiTaoCell.setCellValue("");