1

zhang

昨天 60edff747d52eb42aadb036e3fbd580252de4c05

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java

@@ -134,6 +134,29 @@
    }

    @Override
    @Transactional
    public Boolean cancelCheckTaskSts(Long taskId, Long userId) {
        Task task = this.getById(taskId);
        if (null == task) {
            return Boolean.FALSE;
        }
       if ( task.getTaskSts() >= TaskStsType.ASSIGN.val()){
           throw new BusinessException("任务已分配或执行，不能取消");
       }

        this.maintainLocSts(task, Boolean.FALSE);

        task.setTaskSts(TaskStsType.CANCEL.val());
        task.setUpdateTime(new Date());
        task.setUpdateBy(userId);
        if (!this.updateById(task)) {
            throw new CoolException(BaseRes.ERROR);
        }
        busService.checkoutComplete(task.getBusId());
        return Boolean.TRUE;
    }

    @Override
    public Lane checkoutOriginLane(Task task) {
        Long codeId = null;
        TaskTypeType typeType = TaskTypeType.get(task.getTaskTypeEl());