修改仓储物料报表导出

廖井涛

2025-09-23 73843a051c097ddf612ae7264d9ca064720fd4f0

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -1152,12 +1152,55 @@
    </select>


    <select id="exportMaterialLogReport">
        select * from mm.material_log ml
    <select id="exportMaterialLogReport" >
        select *
        from mm.material_log ml left join mm.material_outbound mo on mo.material_outbound_id=ml.operation_order_number
        where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}

    </select>

    <select id="exportMaterialLogReports" >
        select *
        from mm.material_log ml
        where  date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type=#{type}

    </select>

    <select id="exportMaterialLogOptimizeOutboundReport">
        SELECT
        ml.id,
        ml.operate_type,
        ml.operation_order_number,
        ml.project_no,
        ml.producer,
        ml.inventory_area,
        ml.remarks,
        ml.inventory_id,
        ml.material_code,
        ml.material_name,
        ml.unit,
        ml.width,
        ml.height,
        ml.thickness,
        ml.quantity,
        round(ml.width*ml.height*ml.quantity/1000000,2) as area,
        ou.use_count,
        ou.not_use_count,
        ml.operator,
        ml.operate_time,
        ml.project_no,
        ml.operation_number

        FROM
        mm.material_log AS ml
        LEFT JOIN pp.optimize_use AS ou ON ou.project_no = ml.project_no
        AND ou.raw_stock_code = ml.inventory_id
        WHERE
        ou.project_no IS NOT NULL
        AND date(ml.operate_time)>=#{dates[0]} and date(ml.operate_time) &lt;= #{dates[1]} and ml.operate_type='物料出库'
        order by ml.id desc
    </select>

    <select id="deleteMaterialInventory">
        delete from
        mm.material_inventory mi