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

guoyujie

2025-09-05 b0c60452329a61c32db74a1c7d7753d383d6310a

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

@@ -34,7 +34,7 @@

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

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

    List<Map<String, String>> productionScheduleMp(String orderId);

@@ -122,6 +122,12 @@

    List<WorkInProgressCombinationDTO> exportWorkInProgressCombination(String process, String laminating, String inputVal);

    List<Map<String, String>> processCardProgressCollectMp(String orderId);

    List<Map<String, String>> processCardProgressReportMp(String orderId);

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


//    Map<String, Integer> getWorkInProgressTotal(
//                                                @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,