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

chenlu

2025-03-07 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java

@@ -43,6 +43,8 @@

    List<Map<String, String>> orderPlanDecompositionMp(Date selectTime1, Date selectTime2, Report report);

    List<Map<String, String>> orderReportingWorks(Date selectTime1, Date selectTime2, Report report);

    List<Map<String, String>> rawMaterialRequisitionMp(Date selectTime1, Date selectTime2, Report report);

    List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);