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

chenlu

2024-08-15 b1c49ce18f24c7cf89c2b938f2737dba611d30ee

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

@@ -12,7 +12,7 @@
public interface ReportingWorkMapper extends BaseMapper<ReportingWork> {


    ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr,String previousProcess,String nextProcess,String process);
    ReportingWork AddSelectLastWorkMp(String processIdStr, String technologyStr, String previousProcess, String nextProcess, String process, String reportType);

    List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);

@@ -22,9 +22,9 @@

    String SelectWorkTechnologyMp(String processIdStr);

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

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

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

@@ -78,4 +78,6 @@
    Integer selectLayerByReportingWorkId(String reportingWorkId);

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

    String getPatchConditionMp(String reportingWorkId);
}