blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-08-06 547294b0c7a7de8cc84a8a8df297548c7b2f9846 
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml


@@ -102,9 +102,7 @@


    </select>




    <select id="SelectWorkBasicTeamsMp">


        SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM  sd.basic_data as bd left join  `basic_data_produce` as bdp


                                                                                                                          on bd.id=bdp.basic_category


        where bd.basic_category="process" and bdp.basic_type="teamsgroups" and bd.basic_name = #{process}


        select id,login_name,user_name,address from erp_user_info.`user` WHERE address=#{process}


    </select>




    <!--    查询流程卡工艺流程-->


@@ -215,7 +213,7 @@


        LEFT JOIN sd.order_glass_detail AS ogd


        ON od.order_id = ogd.order_id


        AND od.order_number = ogd.order_number


        <if test="laminating == 'stepA'" >


        <if test="laminating == 'stepA' || laminating == 'stepC'" >


            AND ogd.`group` = (select `group`


            from sd.order_glass_detail


            where order_id = ogd.order_id


@@ -300,15 +298,13 @@




    <select id="historyTeamsMp">


        SELECT


            bdp.id,


            bdp.basic_type,


            bd.id,


            bd.basic_type,


            rw.teams  as basic_name,


            bd.basic_name,bd.id AS basic_category,


            rw.process


        FROM


            sd.basic_data AS bd


                LEFT JOIN `basic_data_produce` AS bdp


                          ON bd.id = bdp.basic_category


                right join (


                select distinct process,teams from


                    (   select distinct rw.this_process as  process,rw.teams_groups_name as teams


@@ -317,8 +313,6 @@


                    ) as t


            ) as  rw


                           on rw.process=bd.basic_name


        WHERE


            bdp.basic_type = 'teamsgroups'


        GROUP BY rw.process,rw.teams


    </select>




@@ -328,10 +322,9 @@


            bd.basic_name AS basic_category


        FROM


            sd.basic_data AS bd


                LEFT JOIN `basic_data_produce` AS bdp ON bd.id = bdp.basic_category




        WHERE


            bd.basic_category = 'process'


          AND bdp.basic_type = 'teamsgroups'


          AND POSITION(bd.basic_name in CONCAT(#{historyProcess},#{process}))


    </select>




@@ -418,7 +411,7 @@




<!--查询修改报工明细数据-->


    <select id="selectByReportingWorkId" >


        select


        select * from(select


            a.reporting_work_id,


            d.order_number,


            d.glass_child,


@@ -429,7 +422,7 @@


            d.child_height,


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


            if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,


                c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),


                0,


                ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 可报工数


            ifnull(a.completed_quantity,0) as 'completedQuantity', -- 完工数


            ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 破损数


@@ -444,7 +437,7 @@


                    -ifnull(g.completed_quantity,0))


                    >


                   a.completed_quantity,


                    0,


                a.completed_quantity,


                   (f.completed_quantity


                       -ifnull(g.completed_quantity,0))


                    )  as minQuantity -- 修改最小数


@@ -488,6 +481,7 @@


                       from reporting_work as rw


                       left join  reporting_work_detail  as rwd


                       on rw.reporting_work_id = rwd.reporting_work_id


              where rw.reviewed_state>-1


                       group by rw.process_id,


                                rw.this_process,


                                rwd.order_number,


@@ -519,32 +513,37 @@


        </if>


        where b.reporting_work_id = #{reportingWorkId}


        GROUP BY c.order_number,c.technology_number


        order BY c.order_number,c.technology_number) as result


    </select>


<select id="selectReportingWorkMp" resultMap="reportingWorkMap">


        select rw.reporting_work_id,


    select rw.reporting_work_id,


               (rw.reporting_work_time) as reporting_work_time,


               o.order_id,


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


               CONCAT(rw.process_id,'/',rwd.goup) as process_id,


               o.project,


               o.batch,


               rw.this_process,


               rw.this_completed_quantity,


               round(ogd.child_width*ogd.child_height * rw.this_completed_quantity/1000000,2) as completedArea,


               rw.this_worn_quantity,


               round(ogd.child_width*ogd.child_height * rw.this_worn_quantity/1000000,2)      as wornArea,


               rw.device_name,


               rw.teams_groups_name,


               rw.reviewed_state,


               rw.notes,


               rw.reviewed


               rw.reviewed,


                round(rwd.completedArea/LENGTH(rwd.goup),2) as completedArea,


                rwd.wornArea


        # (IF(rw.reviewed_state = 0, '未审核', IF(rw.reviewed_state = 1, '审核通过', '审核不通过'))) as reviewed_state


        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_glass_detail as ogd on ogd.order_id=rw.order_id and ogd.order_number=rwd.order_number and ogd.technology_number=rwd.technology_number


            reporting_work as rw


    left join (


    SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2)  as completedArea ,round(sum(cc.wornArea),2)  as wornArea from  (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,


    sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,


    sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea  from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)as rwd on rw.reporting_work_id=rwd.reporting_work_id




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


        where rw.reviewed_state != 2


          and rw.reporting_work_time >= #{selectTime1}


    AND rw.reporting_work_time &lt;  #{selectTime2}


          and date(rw.reporting_work_time) >= date(#{selectTime1})


    AND date(rw.reporting_work_time) &lt;=  date(#{selectTime2})


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


          and rw.reviewed_state!=-1


          and o.create_order>0


@@ -555,7 +554,8 @@


            and o.order_id regexp #{reportingWork.orderId}


        </if>


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


            and rw.process_id regexp #{reportingWork.processId}




            and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')


        </if>


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


            and o.project regexp #{reportingWork.order.project}


@@ -574,7 +574,7 @@


        </if>


        GROUP BY rw.reporting_work_id


        ORDER BY rw.reporting_work_id desc


        limit #{offset},#{pageSize};


        limit #{offset},#{pageSize}


    </select>




    <select id="getPageTotal">


@@ -952,7 +952,7 @@


        LEFT JOIN sd.order_glass_detail AS ogd


        ON od.order_id = ogd.order_id


        AND od.order_number = ogd.order_number


        <if test="laminating == 'stepA'" >


        <if test="laminating == 'stepA' || laminating == 'stepC'" >


            AND ogd.`group` = (select `group`


            from sd.order_glass_detail


            where order_id = ogd.order_id


@@ -1020,21 +1020,26 @@




    <select id="getFootSum">


        SELECT


        SUM(rwd.completed_quantity) AS thisCompletedQuantity,


        ROUND(SUM(ogd.child_width * ogd.child_height * rwd.completed_quantity / 1000000), 2) AS completedArea,


        SUM(rwd.breakage_quantity) AS thisWornQuantity,


        ROUND(SUM(ogd.child_width * ogd.child_height * rwd.breakage_quantity / 1000000), 2) AS wornArea,


        SUM(rw.this_completed_quantity) AS thisCompletedQuantity,


        ROUND(SUM(rwd.completedArea/length(goup)), 2) AS completedArea,


        SUM(rw.this_worn_quantity) AS thisWornQuantity,


        ROUND(SUM(rwd.wornArea), 2) AS wornArea,


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


        count(distinct rw.reporting_work_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_glass_detail AS ogd ON ogd.order_id = rw.order_id


        LEFT JOIN


        (SELECT cc.reporting_work_id,cc.goup,round(sum(cc.completedArea),2)  as completedArea ,round(sum(cc.wornArea),2)  as wornArea from  (SELECT rwds.reporting_work_id, GROUP_CONCAT(distinct rwds.technology_number SEPARATOR '') as goup,


        sum(rwds.child_width*rwds.child_height*completed_quantity/1000000)as completedArea,


        sum(rwds.child_width*rwds.child_height*rwds.breakage_quantity/1000000) as wornArea  from reporting_work_detail as rwds GROUP BY rwds.reporting_work_id,order_number ) as cc GROUP BY cc.reporting_work_id)


            AS rwd


                ON rw.reporting_work_id = rwd.reporting_work_id


        /*LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = rw.order_id


        AND ogd.order_number = rwd.order_number


        AND ogd.technology_number = rwd.technology_number


        AND ogd.technology_number = rwd.technology_number*/


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


        WHERE rw.reviewed_state != 2


        and rw.reporting_work_time >= #{selectTime1}


        AND rw.reporting_work_time &lt;  #{selectTime2}


        and date(rw.reporting_work_time) >= date(#{selectTime1})


        AND date(rw.reporting_work_time) &lt;=  date(#{selectTime2})


        AND position(#{orderId} in rw.order_id)


        AND rw.reviewed_state != -1


        AND o.create_order > 0