Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 src/main/resources/mapper/production/ProductOrderMapper.xml

@@ -22,7 +22,8 @@
        ppr.process_route_code,
        pb.bom_no,
        ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
        DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff
        DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff,
        sl.delivery_date
        from product_order po
        left join sales_ledger sl on po.sales_ledger_id = sl.id
        left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id