parent: be95a7b7 | 补丁 | 提交 | ignore whitespace
guoyujie
2025-05-13 40b55a632aa5384579f7a1d62915bb7095f29770 
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
3个文件已修改
83 ■■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/Report.xml 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java


@@ -68,7 +68,7 @@




    List<TeamOutputDTO> teamOutputMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);




    Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);


    Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);




    List<Map<String, String>> workInProgressOrderMp(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);




@@ -94,7 +94,7 @@




    Map<String,Float> damageReportFootSum(Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);




    Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);


    Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);




    String getLaminating(String selectProcesses);






 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java


@@ -433,8 +433,8 @@


        String laminating = reportMapper.getLaminating(selectProcesses);


        map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));


        map.put("process", productionSchedulingMapper.selectProcess());


        map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));


        map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses, teamOutputDTO));


        map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));


        map.put("footSum" ,reportMapper.teamOutputFootSum(selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));


        return map;


    }






 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -1368,12 +1368,25 @@


            and od.edging_type regexp #{teamOutputDTO.edgingType}


        </if>




        GROUP BY


        rw.reporting_work_id,


        rw.process_id,


        rw.this_process,


        rw.teams_groups_name,


        rwd.order_number


        <choose>


            <when test="laminating != 'laminating'">


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number,


                rwd.technology_number


            </when>


            <otherwise>


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number


            </otherwise>


        </choose>


        ORDER BY


        rw.this_process,


        rw.process_id,


@@ -1468,12 +1481,25 @@


            and od.edging_type regexp #{teamOutputDTO.edgingType}


        </if>




        GROUP BY


        rw.reporting_work_id,


        rw.process_id,


        rw.this_process,


        rw.teams_groups_name,


        rwd.order_number


        <choose>


            <when test="laminating != 'laminating'">


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number,


                rwd.technology_number


            </when>


            <otherwise>


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number


            </otherwise>


        </choose>


        ORDER BY


        rw.this_process,


        rw.process_id,


@@ -2070,12 +2096,25 @@


        <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">


            and od.edging_type regexp #{teamOutputDTO.edgingType}


        </if>


        GROUP BY


        rw.reporting_work_id,


        rw.process_id,


        rw.this_process,


        rw.teams_groups_name,


        rwd.order_number


        <choose>


            <when test="laminating != 'laminating'">


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number,


                rwd.technology_number


            </when>


            <otherwise>


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number


            </otherwise>


        </choose>


        ORDER BY


        rw.this_process,


        rw.process_id,