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

廖井涛

2025-03-28 1f97acdb370414caa5303563f6c653a70a0e542b

 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