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

guoyujie

2025-08-11 e51e45f2cabcc4628ce93e55c7c3806b1b760161

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

@@ -38,7 +38,7 @@

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

    List<Map<String, String>> taskCompletionStatusMp(Date selectTime1, Date selectTime2);
    List<Map<String, String>> taskCompletionStatusMp(Date selectTime1, Date selectTime2, String orderId);

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

@@ -98,7 +98,7 @@

    String getLaminating(String selectProcesses);

    List<WorkInProgressDTO> workInProgressMpdataList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);
    List<WorkInProgressDTO> workInProgressMpdataList1(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, String laminating, WorkInProgressDTO workInProgressDTO);

    List<WorkInProgressDTO> workInProgressMpdataList2(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);

@@ -118,6 +118,12 @@

    List<String> selectProcess();

    Map<String,Object> getWorkInProgressCombinationFootSum(String process, String laminating, String optionVal);

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

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


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