Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-09-03 f25c0e53a507f9e435429242e9b1c974aaae29bc

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -389,14 +389,14 @@
                                   and b.order_id = SUBSTR(#{processId} from 1 for 10)
                                   and b.process = #{thisProcess}
                                   and b.process_id = a.process_id
                 left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
                 left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id,patch_processes
                            from patch_log
                            group by order_sort,technology_number) as c
                            group by process_id,order_sort,technology_number,patch_processes) as c
                           on
                                       c.process_id = a.process_id
                                   and c.order_sort = a.order_number
                                   and c.technology_number = a.technology_number

                                   and c.patch_processes= #{thisProcess}
        where
            a.process_id=SUBSTR(#{processId} from 1 for 14)
          and a.order_number = #{orderNumber}