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

廖井涛

2025-03-25 768e16999a8ce4bb500490ee76c659aa61ea1783

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

@@ -24,7 +24,7 @@

    List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);

    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess);
    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);

    List<Map<String,String>> SelectProcessMp();

@@ -75,7 +75,7 @@

    List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);

    Integer selectLayerByReportingWorkId(String reportingWorkId);
    String selectLayerByReportingWorkId(String reportingWorkId);

    Boolean ReviewReportingWorkMp(String substring, String process, String result, String userName);

@@ -95,5 +95,11 @@

    List<Map<String,String>> getSelectProcessDuoqu();

    List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess);
    List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess, String laminating);

    String getProcessLaminating(String process);

    String selectOrderid(String processIdStr);

    Map<String,Float> getFootSum(Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
}