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

guoyuji

2025-03-10 363383cf6266286ce1bd31a78dc01fdaca2de3de

 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,
@@ -989,8 +999,8 @@
                 LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
            AND dd.order_number = ogd.order_number
            AND dd.technology_number = ogd.technology_number
        WHERE date(rw.reporting_work_time) >= #{dates[0]}
          and date(rw.reporting_work_time) &lt;= #{dates[1]}
        WHERE rw.reporting_work_time >= #{dates[0]}
          and rw.reporting_work_time &lt;= #{dates[1]}
          AND dd.available = 0
        GROUP BY dd.id
    </select>
@@ -1968,7 +1978,7 @@
        WHERE
            rw.reporting_work_time >= #{selectTime1}
          AND rw.reporting_work_time &lt;  #{selectTime2}
          AND dd.available = 0;
          AND dd.available = 0
        <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
            and o.order_id regexp #{damageReportDTO.orderId}
        </if>