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

廖井涛

2024-09-06 10a26b9b670efef0a2adba675c794c539846aa3c

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

@@ -249,6 +249,7 @@
               p.thickness,
               od.weight,
               od.remarks,
               od.bend_radius,
               ods.S01,
               ods.S02,
               ods.S03,
@@ -509,12 +510,10 @@
                                          ogds.child_height
                                   from sd.order_glass_detail as ogds
                                   where ogds.order_id = #{orderId}
                                   GROUP BY order_id, order_number, ogds.glass_child, process, ogds.child_width,
                                            ogds.child_height) as ogdss
                                   GROUP BY order_id, order_number, ogds.glass_child, process) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part, ogdss.child_width,
                        ogdss.child_height
               GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part
               order by fc.process_id, ogdss.technology_number)

              UNION