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

chenlu

1 天以前 43322d13c1876b1705f8ba1eb2ef32e7a433cacc

 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);
@@ -67,9 +72,9 @@

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

    List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
    List<ReportingWork> selectQualityTestingMp(Integer offset, Integer pageSize, String selectTime1, String selectTime2, Integer state, String processId, ReportingWork reportingWork);

    Map<String, Integer> getQualityPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, Integer state, String processId, ReportingWork reportingWork);
    Map<String, Integer> getQualityPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, Integer state, String processId, ReportingWork reportingWork);

    Boolean updateQualityStatusMp(String reportingWorkId,String username);

@@ -106,4 +111,8 @@
    Integer selectReviewedState(String reportingWorkId);

    List<ReportingWork> qualityReviewSearchMp();

    List<BasicDataProduce> mesSelectWorkBasicDeviceMp();

    List<Map<String,String>> mesSelectWorkBasicTeamsMp();
}