Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

9 天以前 2d03ec79e1892248b520cf097e8a58dd82a4892f

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

@@ -22,6 +22,7 @@
        pm.model as productModelName,
        ppo.quantity,
        ppo.scrap_qty,
        ppo.add_qty,
        pm.unit,
        sl.sales_contract_no salesContractNo
        from
@@ -83,7 +84,10 @@
        IFNULL(
        TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
        0
        ) AS work_minutes
        ) AS work_minutes,
        ppo.add_qty,
        ppo.scrap_qty,
        ppo.replenish_qty
        FROM
        production_product_main ppm
        LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id