chenlu
2025-07-03 b8202fa27280e1fc0ff962c874e94e625abeb7b8
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -104,7 +104,8 @@
    <select id="getOrderList">
       select * from (select
            o.*,
        ifnull(sum(fgi.quantity_available),0) as goodsQuantity
        ifnull(sum(fgi.quantity_available),0) as goodsQuantity,
        if(DATEDIFF(o.delivery_date, CURDATE()) &lt; 3  and o.delivery &lt; 2, 'timeOut','' ) as timeOut
        from
            sd.`order` as o
        left join mm.finished_goods_inventory as  fgi
@@ -396,7 +397,10 @@
               concat(a.width," * " , a.height) as size,
               b.area,
               b.glass_child as glassChild,
               d.product_name as productName
               d.product_name as productName,
               d.building_number as buildingNumber,
               d.remarks as remarks,
               d.processing_note as processingNote
        from pp.optimize_heat_detail as a
        left join sd.order_glass_detail as b
            on b.order_number = a.order_sort