钣金详细计划-导出功能 第1个车间后插入“焊接件齐套开始时间”

zhanghl

2025-04-25 8e12f6f56ea0d153613fdef966f1a1be945a0135

钣金详细计划-导出功能 第1个车间后插入“焊接件齐套开始时间”

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

@@ -394,8 +394,23 @@



            int i1 = 17;
            for (int i = 0; i < shopNames.size(); i++) {
            int i1 = 18;

            String firstShopName = shopNames.get(0);
            SXSSFCell firstShopBeginDateTitle = rowTitle.createCell(17);
            firstShopBeginDateTitle.setCellValue(firstShopName+"开工时间");
            firstShopBeginDateTitle.setCellStyle(title);
            SXSSFCell firstShopEndDateTitle = rowTitle.createCell(18);
            firstShopEndDateTitle.setCellValue(firstShopName+"完工时间");
            firstShopEndDateTitle.setCellStyle(title);

            /*焊接件齐套*/
            SXSSFCell hanJieQiTaoTitle= rowTitle.createCell(19);
            hanJieQiTaoTitle.setCellValue("焊接件齐套开始时间");
            hanJieQiTaoTitle.setCellStyle(title);


            for (int i = 1; i < shopNames.size(); i++) {
                String shopName = shopNames.get(i);
                SXSSFCell beginDateCell = rowTitle.createCell(i * 2 + i1);
                SXSSFCell endDateCell = rowTitle.createCell(i * 2 + i1+1);
@@ -478,7 +493,22 @@
                SXSSFCell planEndDayCell = dataRow.createCell(16);
                planEndDayCell.setCellValue(dateFormat.format(plan.getPlanEndDay()));

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



                SXSSFCell firstShopBeginDateCell = dataRow.createCell(17);
                SXSSFCell firstShopEndDateCell = dataRow.createCell(18);

                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);
                hanJieQiTaoCell.setCellValue("");


                for (int j = 1; j< shopNames.size(); j++) {
                    String shopName = shopNames.get(j);
                    SXSSFCell beginDateCell = dataRow.createCell(j * 2 + i1);
                    SXSSFCell endDateCell = dataRow.createCell(j * 2 + i1+1);

 aps-modules/aps-core/src/main/resources/mapper/core/ApsShopMapper.xml

@@ -29,6 +29,7 @@
            <if test="status != null  and status != ''"> and status = #{status}</if>
             and status='1'
        </where>
        order by id asc
    </select>
    
    <select id="selectApsShopById" parameterType="String" resultMap="ApsShopResult">