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

chenlu

8 天以前 aece48b253b2e0b814bbdf5ee3d474e8cf697122

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

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


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

    List<BasicDataProduce> SelectWorkBasicDeviceMp(String process);

@@ -44,7 +49,7 @@

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

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

    String selectNextProcess(String reportingWorkId);