Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-22 eb196866b6b82289fa4fbb90639e23616dcfb82f

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

@@ -122,6 +122,10 @@

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

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

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


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