Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-03-07 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7

 north-glass-erp/src/main/resources/mapper/pp/Report.xml

@@ -917,6 +917,16 @@
        GROUP BY o.order_id
    </select>

    <select id="orderReportingWorks">
        SELECT *
        from sd.order_process_detail opd left join sd.`order` o on o.order_id=opd.order_id
        where    o.create_time >= #{selectTime1}
          and o.create_time &lt;  #{selectTime2}
        and opd.reporting_work_num_count>0
        group by opd.order_id
        order by opd.order_id
    </select>

    <select id="rawMaterialRequisitionMp">
        SELECT fc.project_no,
               modl.material_name,