guoyujie
2025-07-24 4135cb0f17ddb84af8ac907129bf6af3e83feec9
north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -173,25 +173,26 @@
               c.technology_number,
               b.child_width,
               b.child_height,
#               if(c.technology_number=1,c.quantity,0) as quantity,
               c.quantity,
              if(c.technology_number=1,c.quantity,0) as quantity,
#                c.quantity,
               c.quantity as thisQuantity,/*用于判断是否改变颜色*/
               e.reportWorkQuantity,
               e.reportWorkQuantityCount,
               e.reportWorkTime,
               e.broken_num,
               c.quantity as glassQuantity,
               c.quantity*a.area as gross_area,
               ifnull(f.inventory, 0) as inventory,
               round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
               ifnull(dd.quantity, 0) as shippedQuantity,
#                c.quantity*a.area as gross_area,
#                ifnull(f.inventory, 0) as inventory,
#                round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
#                ifnull(dd.quantity, 0) as shippedQuantity,
#                if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
#                if(c.technology_number=1,ifnull(f.inventory, 0) ,0)                        as inventory,
#                if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.area, 2),0)      as inventoryArea,
#                if(c.technology_number=1,ifnull(dd.quantity, 0) ,0)                          as shippedQuantity,
               if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
               if(c.technology_number=1,ifnull(f.inventory, 0) ,0)                        as inventory,
               if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.area, 2),0)      as inventoryArea,
               if(c.technology_number=1,ifnull(dd.quantity, 0) ,0)                          as shippedQuantity,
               ifnull(dd.quantity, 0)  as shippedQuantity,
               ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
        from pp.flow_card as c
                 left join