Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2 小时以前 c255a17d7ef4fabb37c1ac84b212768e73c42915

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java

@@ -19,9 +19,11 @@
//    R completeTask(String id);
     void completeTask(List<Task> task) throws Exception;

    R removeTask(Long[] ids);
    R removeTask(Long[] ids, Long loginUserId);

    Task pickTask(Long id) throws Exception;
    Task pickOrCheckTask(Long id, String oType) throws Exception;

    void complateInTask(List<Task> tasks) throws Exception;

    Task taskToTop(Long id) throws Exception;
}