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

guoyuji

2025-03-05 28ade00fd79eb601de0bc7404cc85d7eb51ffe27

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -351,6 +351,12 @@
        return map;
    }

    public Map<String, Object> orderReportingWorks(Date selectTime1, Date selectTime2, Report report) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", reportMapper.orderReportingWorks(selectTime1, selectTime2, report));
        return map;
    }

    public Map<String, Object> rawMaterialRequisitionSv(Date selectTime1, Date selectTime2, Report report) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", reportMapper.rawMaterialRequisitionMp(selectTime1, selectTime2, report));