blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-08-19 1d193f2cc23f54634ef8ed73c11436fbe76bb575 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -63,6 +63,8 @@


        <result column="project" property="order.project"/>


        <result column="order_id" property="order.orderId"/>


        <result column="glass_child" property="orderGlassDetail.glassChild"/>


        <result column="process_id" property="reportingWork.processId"/>


        <result column="code" property="code"/>


    </resultMap>






@@ -101,6 +103,7 @@


        <result column="breakage_reason" property="breakageReason"/>


        <result column="personnel" property="personnel"/>


        <result column="glass_child" property="glassChild"/>


        <result column="glassNumber" property="glassNumber"/>


    </resultMap>




    <resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">


@@ -165,7 +168,8 @@


               e.broken_num,


               ifnull(f.inventory, 0)                         as inventory,


               round(ifnull(f.inventory, 0) * a.area, 2)      as inventoryArea,


               ifnull(dd.quantity, 0)                         as shippedQuantity


               ifnull(dd.quantity, 0)                         as shippedQuantity,


               JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber


        from flow_card as c


                 left join


             sd.order_detail as a


@@ -218,15 +222,15 @@


               o.project,


               o.order_id,


               ogd.glass_child,


               rw.this_process


        from damage_details as dd


                 left join reporting_work as rw


                           on rw.reporting_work_id = dd.reporting_work_id


                 left join sd.order as o


                           on rw.order_id = o.order_id


                 left join sd.order_glass_detail as ogd


                           on ogd.order_id = o.order_id and ogd.order_number = dd.order_number


                               and ogd.technology_number and dd.technology_number


               rw.this_process,


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


               CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id


        from


            sd.`order` as o left join sd.order_detail as od on o.order_id=od.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 reporting_work as rw on rw.order_id=o.order_id


                             left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number


            and dd.technology_number=ogd.technology_number


        where date(rw.reporting_work_time) >= #{startDate}


          and date(rw.reporting_work_time) &lt;= #{endDate}


          and rw.this_worn_quantity > 0


@@ -481,7 +485,8 @@


        dd.breakage_quantity,


        round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,


        IFNULL(dd.responsible_personnel,'') as personnel,


        ogd.glass_child


        ogd.glass_child,


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


        FROM


        sd.ORDER AS o


        LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id


@@ -489,6 +494,7 @@


        LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id


        AND dd.order_number = ogd.order_number


        AND dd.technology_number = ogd.technology_number


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


        WHERE


        rw.reporting_work_time between #{selectTime1} and #{selectTime2}


        AND dd.available = 0


@@ -1203,8 +1209,8 @@


        if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,


        sum( pd.thickness ) as thickness,


        od.edging_type,


        rwd.completed_quantity,


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


        opd.reporting_work_num as completed_quantity,


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


        od.product_name,


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


        FROM


@@ -1226,10 +1232,13 @@


        sd.product_detail


        WHERE


        detail_type = "glass"


        ) AS pd ON pd.prod_id = od.product_id


        AND pd.glass_sort = rwd.technology_number


        where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}


        and rw.this_process=#{selectProcesses}


        ) AS pd ON pd.prod_id = od.product_id AND pd.glass_sort = rwd.technology_number


        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 = ogd.order_number


        AND opd.technology_number = ogd.technology_number


        where opd.reporting_work_num > 0 and rw.reviewed_state=1 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}


        </if>


@@ -1250,23 +1259,36 @@


        </if>




        GROUP BY


        rwd.order_number,


        rw.this_process,


        rw.teams_groups_name,


        rw.process_id,


        rw.reporting_work_id


        rwd.order_number


        ORDER BY


        rw.this_process,


        rw.process_id,


        rwd.order_number,


        rw.reporting_work_time,


        rw.teams_groups_name,


        rw.process_id


        rw.teams_groups_name


        limit #{offset},#{pageSize};


    </select>




    <select id="teamOutputPageTotal">


    <select id="exportTeamOutputMp">


        SELECT


        CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',


        count(distinct rw.reporting_work_id) as 'total'


        rw.reporting_work_time,


        rw.this_process,


        rw.teams_groups_name,


        o.project,


        rw.process_id,


        rwd.order_number,


        MAX( ogd.child_width ) as width,


        MAX( ogd.child_height ) as height,


        if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,


        sum( pd.thickness ) as thickness,


        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,


        od.product_name,


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


        FROM


        reporting_work AS rw


        LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id


@@ -1286,10 +1308,58 @@


        sd.product_detail


        WHERE


        detail_type = "glass"


        ) AS pd ON pd.prod_id = od.product_id


        AND pd.glass_sort = rwd.technology_number


        where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}


        and rw.this_process=#{selectProcesses}


        ) AS pd ON pd.prod_id = od.product_id AND pd.glass_sort = rwd.technology_number


        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 = ogd.order_number


        AND opd.technology_number = ogd.technology_number


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


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


        rw.teams_groups_name,


        rw.process_id,


        rwd.order_number


        ORDER BY


        rw.this_process,


        rw.process_id,


        rwd.order_number,


        rw.reporting_work_time,


        rw.teams_groups_name


    </select>




    <select id="teamOutputPageTotal">


        SELECT


        CEILING(count(rwd.id)/#{pageSize}) as 'pageTotal',


        count(distinct rwd.id) as 'total'


        FROM


        reporting_work AS rw


        LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id


        LEFT JOIN sd.`order` AS o ON o.order_id = rw.order_id


        LEFT JOIN sd.order_detail AS od ON od.order_id = o.order_id


        AND od.order_number = rwd.order_number


        LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id


        AND ogd.order_number = rwd.order_number


        AND ogd.technology_number = rwd.technology_number


        AND ogd.order_number = od.order_number


        LEFT JOIN (


        SELECT


        prod_id,


        glass_sort,


        REPLACE ( JSON_UNQUOTE( JSON_EXTRACT( separation, '$.thickness' )), 'mm', '' ) AS thickness


        FROM


        sd.product_detail


        WHERE


        detail_type = "glass"


        ) AS pd ON pd.prod_id = od.product_id AND pd.glass_sort = rwd.technology_number


        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 = ogd.order_number


        AND opd.technology_number = ogd.technology_number


        where opd.reporting_work_num > 0 and rw.reviewed_state=1 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}


        </if>