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

zss

2 天以前 cf989c194af04a6a5705abac40fad0cc8cb56301

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

@@ -68,7 +68,7 @@
        '%'
        ) as output_rate
        FROM sales_ledger_production_accounting slpa
        LEFT JOIN production_product_main ppm ON slpa.sales_ledger_work_id = ppm.id
        LEFT JOIN production_product_main ppm ON slpa.product_main_id = ppm.id
        LEFT JOIN production_product_output ppout ON ppm.id = ppout.product_main_id
        <where>
            <if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">