blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
guoyuji
2024-07-17 fc8525d494c7fbb204a04a300865c47b789cf084 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -288,7 +288,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{selectProcesses}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -299,7 +299,6 @@


          and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -


              odpd.broken_num != 0


          and odpd.process = #{selectProcesses}


          and o.create_time between #{selectTime1} and #{selectTime2}


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


          and position(#{inputProject} in o.project)




@@ -990,7 +989,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{process}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -1315,7 +1314,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{selectProcesses}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -1326,7 +1325,6 @@


          and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -


              odpd.broken_num != 0


          and odpd.process = #{selectProcesses}


          and o.create_time between #{selectTime1} and #{selectTime2}


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


          and position(#{inputProject} in o.project)




@@ -1377,7 +1375,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{selectProcesses}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -1388,7 +1386,6 @@


          and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -


              odpd.broken_num != 0


          and odpd.process = #{selectProcesses}


          and o.create_time between #{selectTime1} and #{selectTime2}


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


          and position(#{inputProject} in o.project)