Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-12 40c71665c39423120973349edfd76d07ab27a15e

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

@@ -57,6 +57,27 @@

    List<WorkInProgressDTO> exportWorkInProgressMp(List<LocalDate> date, String process, String inputVal, String project);

    List<TaskCompletionStatusDTO> exportTaskCompletionStatusMp(Map<String, Object> dates);

    List<RawMaterialRequisitionDTO> exportRawMaterialRequisitionMp(List<LocalDate> dates);

    List<QualityReportDTO> exportQualityReportSv(List<LocalDate> dates);

    List<YieldDTO> exportYieldMp(List<LocalDate> date, String process);

    List<TeamOutputDTO> teamOutputMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);

    Map<String, Integer> teamOutputPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO);

    List<Map<String, String>> workInProgressOrderMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);

    List<Map<String, String>> workInProgressProcessMp(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report);

    List<ScheduleProductionScheduleDTO> scheduleProductionScheduleMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String processes, ScheduleProductionScheduleDTO scheduleProductionScheduleDTO);

    Map<String, Integer> getScheduleProductionScheduleTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String processes, ScheduleProductionScheduleDTO scheduleProductionScheduleDTO);

    List<ScheduleProductionScheduleDTO> exportScheduleReportMp(List<LocalDate> date, String process);


//    Map<String, Integer> getWorkInProgressTotal(