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

chenlu

2024-03-15 e7b89d449afc3912c21a64d59bafd7737f7376fd

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

@@ -44,8 +44,7 @@

    int selectFlowCardNum(String orderNumber, String technologyNumber, String processId, String thisProcess);

    List<ReportingWork> selectReportingWorkMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

    List<Map<String,Object>> selectByReportingWorkId(String reportingWorkId,String nextProcess);
    Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

    String selectNextProcess(String reportingWorkId);