blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2025-02-07 82685a4ec94db01c564561582141c03054012ea3 
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml


@@ -91,6 +91,7 @@


        where fc.process_id = #{processIdStr}


          and POSITION(fc.technology_number in #{technologyStr})


          and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')


        and o.create_order>0


        GROUP BY fc.process_id


    </select>




@@ -179,6 +180,7 @@


          AND  POSITION(fc.technology_number in #{technologyStr})


          AND odpd.process = #{process}


          and if(#{reportType}=1,o.order_type!='样品订单',o.order_id!='')


        and o.create_order>0


        group by fc.order_number,


                 ogd.technology_number


        order by fc.order_number


@@ -533,7 +535,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 +579,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 != ''">


@@ -1004,4 +1008,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>