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

guoyujie

2025-05-06 413a7e27886bcc87bbd8aaf995f09dbe82cb17e7

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

@@ -865,7 +865,8 @@
               od.bend_radius,
               ifnull(od.order_number,0) as heat_layout_id,
               ifnull(a.id,0) as heat_layout_sort,
               od.product_name
               od.product_name,
               opd.process_id
        from pp.optimize_detail opd
                 left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
                 left join sd.order_detail od
@@ -901,7 +902,8 @@
               od.bend_radius,
               opd.heat_layout_id,
               opd.heat_layout_sort,
               od.product_name
               od.product_name,
               opd.process_id
        from pp.optimize_detail opd
                 left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
                 left join sd.order_detail od
@@ -2453,7 +2455,7 @@
                              ogd.technology_number = fc.technology_number
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
        group by od.order_number, width, height
        group by fc.process_id,od.order_number, width, height
        order by fc.process_id
    </select>