Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

22 小时以前 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java

@@ -4,10 +4,9 @@
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.domain.PageResult;
import com.zy.acs.manager.core.domain.Lane;
import com.zy.acs.manager.core.domain.LaneDto;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.system.entity.User;

import java.util.List;
import java.util.Map;
@@ -20,7 +19,7 @@

    Task pick(TaskStsType taskStsType);

    Task selectByUuid(String uuid);
    Task selectBySeqNum(Long busId, String seqNum);

    List<Task> selectBySts(TaskStsType taskStsType);

@@ -28,13 +27,13 @@

    List<Map<String, Object>> selectStatByLastSevenDays();

    Boolean complete(Long taskId, Long userId);
    Boolean complete(Long taskId, Long userId, String from);

    Boolean cancel(Long taskId, Long userId);
    Boolean cancel(Long taskId, Long userId, String from);

    Lane checkoutOriginLane(Task task);
    LaneDto checkoutOriginLane(Task task);

    Lane checkoutDestinationLane(Task task);
    LaneDto checkoutDestinationLane(Task task);

    List<Task> findRunningTasksByLaneHash(String laneHash);

@@ -44,4 +43,6 @@

    Task findLatestTask(Long agvId, TaskStsType taskSts);

    void maintainLocAndSta(Task task);

}