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


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


    </select>




    <select id="SelectWorkBasicTeamsMp">


        select * from erp_user_info.`user` WHERE address=#{process}


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


    </select>




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


@@ -298,8 +298,8 @@




    <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


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




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


    <select id="selectByReportingWorkId" >


        select


        select * from(select


            a.reporting_work_id,


            d.order_number,


            d.glass_child,


@@ -422,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', -- 破损数


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


@@ -512,6 +513,7 @@


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


@@ -540,8 +542,8 @@




            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


@@ -552,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}


@@ -1035,8 +1038,8 @@


        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