blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-10-12 b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -257,6 +257,12 @@


        <if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">


            and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}


        </if>


        <if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">


            and o.project regexp #{crossProcessBreakingDTO.project}


        </if>


        <if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">


            and o.order_id regexp #{crossProcessBreakingDTO.orderId}


        </if>


        GROUP BY dd.id


        order by dd.id desc


        limit #{offset},#{pageSize}


@@ -279,6 +285,33 @@


          and dd.available = 0


          and reviewed_state != 2


          and rw.this_process != dd.responsible_process


        <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">


            and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}


        </if>


        <if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">


            and rw.process_id regexp #{crossProcessBreakingDTO.processId}


        </if>


        <if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">


            and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}


        </if>


        <if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">


            and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}


        </if>


        <if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">


            and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}


        </if>


        <if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">


            and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}


        </if>


        <if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">


            and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}


        </if>


        <if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">


            and o.project regexp #{crossProcessBreakingDTO.project}


        </if>


        <if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">


            and o.order_id regexp #{crossProcessBreakingDTO.orderId}


        </if>


        order by dd.id desc


    </select>




@@ -451,14 +484,14 @@


               ogd.glass_child,


               ogd.child_width,


               ogd.child_height,


               od.quantity,


               fc.quantity,


               ROUND(ogd.child_width * ogd.child_height / 1000000, 2)               as childArea,


               ROUND(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as actualArea,


               ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as actualArea,


               odpd.reporting_work_num                                              as completeNum,


               ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,


                     2)                                                             as completeArea,


               od.quantity - odpd.reporting_work_num                                as incompleteNum,


               ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,


               fc.quantity - odpd.reporting_work_num                                as incompleteNum,


               ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num) / 1000000,


                     2)                                                             as incompleteArea,


               od.product_name




@@ -483,7 +516,7 @@


          and o.create_time between #{selectTime1} and #{selectTime2}


          and position(#{orderId} in od.order_id)


          and position(#{inputProject} in o.project)


          and od.quantity > odpd.reporting_work_num


          and fc.quantity - odpd.reporting_work_num>0




        group by fc.process_id, fc.order_number, fc.technology_number


        order by fc.process_id, fc.order_number, fc.technology_number


@@ -1075,8 +1108,6 @@


          and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -


              odpd.broken_num != 0


          and odpd.process = #{process}


          and date(o.create_time) >= #{date[0]}


          and date(o.create_time) &lt;= #{date[1]}


          and position(ifnull(#{inputVal}, '') in od.order_id)


          and position(ifnull(#{project}, '') in o.project)




@@ -1246,8 +1277,7 @@


        left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number


        left join sd.order_detail as od  on od.order_id=ogd.order_id and od.order_number=ogd.order_number


        left join sd.`order` as o on o.order_id=od.order_id


        left join sd.product_detail as pd   on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"


        where o.create_order>0 and rw.reviewed_state>=0 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}


        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}


        and position(#{selectProcesses} in rw.this_process)


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


            and rw.this_process regexp #{teamOutputDTO.thisProcess}


@@ -1266,16 +1296,15 @@


        </if>




        GROUP BY


        rw.order_id,


        rw.reporting_work_id,


        rw.process_id,


        rw.this_process,


        rw.teams_groups_name,


        rw.process_id,


        rwd.order_number


        ORDER BY


        rw.this_process,


        rw.process_id,


        fc.order_number,


        rwd.order_number,


        rw.reporting_work_time,


        rw.teams_groups_name


        limit #{offset},#{pageSize};


@@ -1292,31 +1321,30 @@


        MAX( ogd.child_width ) as width,


        MAX( ogd.child_height ) as height,


        od.edging_type,


        opd.reporting_work_num as completed_quantity,


        ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,


        rwd.completed_quantity as completed_quantity,


        ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,


        od.product_name,


        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code


        FROM


        sd.`order` as o left join sd.order_detail as od  on od.order_id=o.order_id


        left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number


        left join flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number


        left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id


        left join sd.order_process_detail as opd on opd.order_id = o.order_id  AND opd.process_id = rw.process_id


        AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process


        left join sd.product_detail as pd   on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"


        where opd.reporting_work_num > 0 and rw.reviewed_state=1


          and  date(rw.reporting_work_time) >= #{date[0]}


        reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id


        left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id  and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number


        left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number


        left join sd.order_detail as od  on od.order_id=ogd.order_id and od.order_number=ogd.order_number


        left join sd.`order` as o on o.order_id=od.order_id


        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0


          and date(rw.reporting_work_time) >= #{date[0]}


          and date(rw.reporting_work_time) &lt;= #{date[1]}


        and position(#{process} in rw.this_process)


        GROUP BY


        rw.reporting_work_id,


        rw.process_id,


        rw.this_process,


        rw.teams_groups_name,


        rw.process_id,


        fc.order_number


        rwd.order_number


        ORDER BY


        rw.this_process,


        rw.process_id,


        fc.order_number,


        rwd.order_number,


        rw.reporting_work_time,


        rw.teams_groups_name


    </select>


@@ -1337,19 +1365,17 @@


        MAX( ogd.child_width ) as width,


        MAX( ogd.child_height ) as height,


        od.edging_type,


        opd.reporting_work_num as completed_quantity,


        ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,


        rwd.completed_quantity as completed_quantity,


        ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,


        od.product_name,


        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code


        FROM


        sd.`order` as o left join sd.order_detail as od  on od.order_id=o.order_id


        left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number


        left join flow_card as fc on fc.order_id=ogd.order_id and fc.order_number=ogd.order_number and fc.technology_number=ogd.technology_number


        left join reporting_work as rw on rw.order_id=od.order_id and rw.process_id=fc.process_id


        left join sd.order_process_detail as opd on opd.order_id = o.order_id  AND opd.process_id = rw.process_id


        AND opd.order_number = fc.order_number AND opd.technology_number = fc.technology_number and opd.process=rw.this_process


        left join sd.product_detail as pd   on pd.prod_id = od.product_id and pd.glass_sort = fc.technology_number and detail_type = "glass"


        where opd.reporting_work_num > 0 and rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}


        reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id


        left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id  and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number


        left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number


        left join sd.order_detail as od  on od.order_id=ogd.order_id and od.order_number=ogd.order_number


        left join sd.`order` as o on o.order_id=od.order_id


        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}


        and position(#{selectProcesses} in rw.this_process)


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


            and rw.this_process regexp #{teamOutputDTO.thisProcess}


@@ -1366,15 +1392,17 @@


        <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,


        rw.process_id,


        fc.order_number


        rwd.order_number


        ORDER BY


        rw.this_process,


        rw.process_id,


        fc.order_number,


        rwd.order_number,


        rw.reporting_work_time,


        rw.teams_groups_name


        ) as page_toal