blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-11-21 c34a7dd22602a6b1fba2b3de663957bd0b428074 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -251,7 +251,7 @@


                           on e.process_id = c.process_id


                               and e.technology_number = c.technology_number


                               and e.order_number = c.order_number


        where a.order_id = #{orderId} and d.create_order>0 and c.quantity-ifnull(c.termination_quantity,0)>0


        where a.order_id = #{orderId} and d.create_order>0 


        group by c.order_number,


                 c.technology_number,


                 c.process_id


@@ -1516,7 +1516,9 @@


          and position(#{process} in odpd.process)


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


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




        <if test="terminationVals != '1' and terminationVals != 1">


            and fc.termination_status !=1


        </if>


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


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


    </select>


@@ -1731,7 +1733,7 @@


            AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}


        </if>


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


            AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}


            and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')


        </if>


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


            AND o.project REGEXP #{teamOutputDTO.project}


@@ -1884,7 +1886,7 @@


            and rw.this_process regexp #{teamOutputDTO.thisProcess}


        </if>


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


            and rw.teams_groups_name regexp #{teamOutputDTO.teamsGroupsName}


            and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')


        </if>


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


            and o.project regexp #{teamOutputDTO.project}


@@ -2379,6 +2381,9 @@


        and position(#{selectProcesses} in d.process)


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


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


        <if test="terminationVals != '1' and terminationVals != 1">


            and fc.termination_status !=1


        </if>


        <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">


            and o.customer_name regexp #{workInProgressDTO.customerName}


        </if>


@@ -2565,7 +2570,7 @@


            AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}


        </if>


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


            AND rw.teams_groups_name REGEXP #{teamOutputDTO.teamsGroupsName}


            and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')


        </if>


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


            AND o.project REGEXP #{teamOutputDTO.project}


@@ -2702,6 +2707,9 @@


        and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)


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


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


        <if test="terminationVals != '1' and terminationVals != 1">


            and fc.termination_status !=1


        </if>


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


            and d.process regexp #{workInProgressDTO.thisProcess}


        </if>


@@ -3157,8 +3165,13 @@


                                        ) AS cb ON cb.process_id = b.process_id


                                        AND cb.order_sort = b.order_number


                                        AND cb.technology_number = b.technology_number


                             left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number


                                       and fc.technology_number = d.technology_number


                             where a.processing_card>0


                               and a.warehousing!=2


                          <if test=" terminationVal != '1' and terminationVal != 1">


                               and termination_status !=1


                            </if>


                             GROUP BY  b.process_id, b.order_number,


                                 b.technology_number) as f


                                LEFT JOIN sd.order_process_detail as e


@@ -3247,8 +3260,13 @@


        ) AS cb ON cb.process_id = b.process_id


        AND cb.order_sort = b.order_number


        AND cb.technology_number = b.technology_number


        left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number


        and fc.technology_number = d.technology_number


        where a.processing_card>0


        and a.warehousing!=2


        <if test="terminationVal != '1' and terminationVal != 1">


            and termination_status !=1


        </if>


        GROUP BY  b.process_id, b.order_number,


        b.technology_number) as f


        LEFT JOIN sd.order_process_detail as e


@@ -3333,8 +3351,13 @@


        ) AS cb ON cb.process_id = b.process_id


        AND cb.order_sort = b.order_number


        AND cb.technology_number = b.technology_number


        left join pp.flow_card as fc on fc.order_id= d.order_id and fc.order_number = d.order_number


        and fc.technology_number = d.technology_number


        where a.processing_card>0


        and a.warehousing!=2


        <if test="terminationVal != '1' and terminationVal != 1">


            and termination_status !=1


        </if>


        and (c.quantity-b.reporting_work_num_count)>0


        GROUP BY  b.process_id, b.order_number,


        b.technology_number) as f