Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-07-25 a9ffa322f0cf794a7da8182e1be4ca34f5ea19b6

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

@@ -169,6 +169,7 @@
               b.glass_child,
               d.order_type,
               concat(c.process_id, '/', c.technology_number) as process_id,
               c.order_id,
               c.order_number,
               c.technology_number,
               b.child_width,
@@ -193,7 +194,9 @@
               if(c.technology_number=1,ifnull(dd.quantity, 0) ,0)                          as shippedQuantity,


               ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
               ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
               b.`group`

        from pp.flow_card as c
                 left join
             sd.order_detail as a
@@ -2684,7 +2687,7 @@
        e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
        (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
                       from (SELECT a.order_id,
                                    a.project,
                                   if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
                                    C.product_id,
                                    b.order_number,
                                    b.process_id,