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

廖井涛

2025-03-03 aa3bd3741b94f50f0c1d7e3a137bb681d7421294

 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,9 +75,29 @@

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

    String getPatchConditionMp(String reportingWorkId);

    Integer getFirstStep(String processId, String orderSort, Integer technologyNumber, String interceptProcess);

    Boolean updateReplenishWorkProcess(String processId, String orderSort, Integer technologyNumber, Integer patchNum, String patchProcesses);

    Boolean updateRWPatchNum(String reportingWorkId, Integer patchNum);

    Boolean updateRWDPatchNum(String reportingWorkId, String orderSort, Integer technologyNumber, Integer patchNum);

    String selectUserProcess(String userId);

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

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

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

    String getProcessLaminating(String process);

    String selectOrderid(String processIdStr);
}