Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

helongyang

7 小时以前 dc06f58d8ed537555fd529551180f43a0586ec3f

 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/AGV/CTU_AGVController .cs

@@ -255,7 +255,8 @@
                                WebResponseContent content = _taskService.AgvBoxApplyPass(boxApplyPassDTO);
                                if (content.Status && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                                {
                                    _taskService.UpdateTask(task, TaskStatusEnum.AGV_Executing);
                                    task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
                                    _taskRepository.UpdateData(task);
                                }
                                else
                                {
@@ -332,7 +333,8 @@
                            WebResponseContent content = _taskService.AgvBoxApplyPass(boxApplyPassDTO);
                            if (content.Status && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                            {
                                _taskService.UpdateTask(task, TaskStatusEnum.AGV_Executing);
                                task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
                                _taskRepository.UpdateData(task);
                            }
                            else
                            {
@@ -356,7 +358,8 @@
                        }
                        else if(task.TaskType == TaskTypeEnum.OutProduct.ObjToInt())
                        {
                            _taskService.UpdateTask(task, TaskStatusEnum.AGV_Executing);
                            task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
                            _taskRepository.UpdateData(task);
                        }
                        break;
                    default: