blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
huang
2025-01-14 93109c8a43cceb99ce39e1ccfdbd560ac2547422 
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml


@@ -213,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="process == '夹胶' or (process == '打胶和粘框' and previousProcess=='夹胶')">


        <if test="process == '夹胶' or (process == '打胶和粘框')">


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


                               from sd.order_glass_detail


                               where order_id = ogd.order_id


@@ -343,10 +343,10 @@


    </select>


    <select id="selectGlassProcessNum" resultType="java.lang.Integer">


        select


        if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,


        ifnull(if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,


           0,


           (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)


            )


            ),0)


        from flow_card as a


        left join sd.order_process_detail as b


        on


@@ -533,7 +533,8 @@


                           on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and


                              rwd.technology_number = ogd.technology_number


        where rw.reviewed_state != 2


          and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


          and rw.reporting_work_time >= #{selectTime1}


    AND rw.reporting_work_time &lt;  #{selectTime2}


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


          and rw.reviewed_state!=-1


          and o.create_order>0


@@ -576,7 +577,8 @@


                           on rwd.reporting_work_id = rw.reporting_work_id and rwd.order_number = ogd.order_number and


                              rwd.technology_number = ogd.technology_number


        where rw.reviewed_state != 2


          and DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)


          and rw.reporting_work_time >= #{selectTime1}


        AND rw.reporting_work_time &lt;  #{selectTime2} and position(#{orderId} in rw.order_id)


          and rw.reviewed_state!=-1


          and o.create_order>0


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


@@ -943,7 +945,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="process == '夹胶' or (process == '打胶和粘框' and previousProcess=='夹胶')">


        <if test="process == '夹胶' or (process == '打胶和粘框')">


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


            from sd.order_glass_detail


            where order_id = ogd.order_id


@@ -1004,4 +1006,8 @@


    <select id="getProcessLaminating">


        select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{process}


    </select>




    <select id="selectOrderid">


        select order_id from  pp.flow_card where process_id=#{processIdStr} group by order_id


    </select>


</mapper>