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

liyong

2026-03-07 408bab8b1c0c10514b8395cff92e47751e4dcdcd

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

@@ -91,7 +91,7 @@
        FROM
        sales_ledger_scheduling T2
        LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
        left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
        left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id and slp.type = 1
        <where>
            t3.type = 1
            <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">