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

guoyujie

2025-05-13 40b55a632aa5384579f7a1d62915bb7095f29770

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

@@ -1,12 +1,13 @@
package com.example.erp.mapper.pp;


import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.dto.pp.*;
import com.example.erp.entity.pp.Report;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.sql.Date;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

@@ -14,4 +15,92 @@
public interface ReportMapper {

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

    List<CrossProcessBreakingDTO> getProcessBreaking(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);

    Map<String, Integer> getProcessBreakingTotal(Integer offset, Integer pageSize, String startDate, String endDate, CrossProcessBreakingDTO crossProcessBreakingDTO);

    List<Map<String, String>> workInProgressMp(
            Integer offset, Integer pageSize,
            @Param("orderId") String orderId, @Param("inputProject") String inputProject,
            @Param("selectProcesses") String selectProcesses, WorkInProgressDTO workInProgressDTO);

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

    List<DamageReportDTO> selectDamageReportMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);

    List<Map<String, String>> splittingDetailsOutsideMp(String orderId, Report report);

    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>> productionScheduleMp(String orderId);

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

    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);

    Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);

    List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);

    List<OrderPlanDecompositionDTO> exportOrderPlanDecompositionMp(List<LocalDate> dates);

    List<ProcessToBeCompletedDTO> exportProcessToBeCompletedMp(List<LocalDate> date, String process, String inputVal, String project);

    List<WorkInProgressDTO> exportWorkInProgressMp( 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, String laminating, TeamOutputDTO teamOutputDTO);

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

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

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

    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> workInProgressOrderTotal(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);

    Map<String, Integer> workInProgressProcessTotal(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);

    Map<String, Integer> workInProgressTotal(Integer offset, Integer pageSize, String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);

    List<TeamOutputDTO> exportTeamOutputMp(List<LocalDate> date, String process);

    Map<String,Float> workInProgressOrderFootSum(String orderId, String inputProject, String selectProcesses, WorkInProgressDTO workInProgressDTO);

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

    Map<String,Float> damageReportFootSum(Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);

    Map<String,Float> teamOutputFootSum(Date selectTime1, Date selectTime2, String selectProcesses, String laminating, TeamOutputDTO teamOutputDTO);

    String getLaminating(String selectProcesses);


//    Map<String, Integer> getWorkInProgressTotal(
//                                                @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,
//                                                @Param("orderId") String orderId, @Param("inputProject") String inputProject,
//                                                @Param("selectProcesses") String selectProcesses, Report report);
}