ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVSignal.cs
@@ -92,74 +92,21 @@
                {
                    if (task.TaskState == (int)TaskAcrossFloorStatusEnum.FirstCarry)
                    {
                        Dt_StationManager stationManager = new Dt_StationManager();
                        string TaskTemplate = string.Empty;
                        if (task.Floor == "1F")
                        {
                            stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "2F");
                            elevator.SetValue(ElevatorDBName.OneLayerPutFinish, 1);
                            TaskTemplate = "BBB";
                            //请求WMS跨楼层2任务
                        }
                        else
                        {
                            stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
                            elevator.SetValue(ElevatorDBName.TwoLayerPutFinish, 1);
                            //请求WMS跨楼层2任务
                            TaskTemplate = "CCC";
                        }
                        task.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarryFinish;
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";
                        Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                        task_Hty.TaskId = 0;
                        _taskRepository.DeleteData(task);
                        _taskhtyRepository.AddData(task_Hty);
                        Random random = new Random();
                        int randomNumber = random.Next(1000, 10000);
                        WMSTaskDTO taskDTO = new WMSTaskDTO()
                        {
                            Id = 1,
                            TaskNum = randomNumber,
                            RoadWay = "AGV",
                            TaskType = (int)TaskAcrossFloorTypeEnum.AcrossFloorCarry,
                            TaskState = (int)TaskAcrossFloorStatusEnum.SecondCarry,
                            PalletCode = task.PalletCode,
                            SourceAddress = stationManager.stationChildCode,
                            TargetAddress = task.TargetAddress,
                            Grade = 1,
                            AGVTaskNum = GenerateUniqueId()
                        };
                        Dt_Task SecondCarry =  _mapper.Map<Dt_Task>(taskDTO);
                        task.Creater = "WMS";
                        SecondCarry.CurrentAddress = stationManager.stationChildCode;
                        SecondCarry.NextAddress = task.TargetAddress;
                        SecondCarry.Floor = stationManager.stationFloor;
                        SecondCarry.AGVSign = "";
                        _taskRepository.AddData(SecondCarry);
                        _taskService.SendAgvTask(TaskTemplate, SecondCarry.TaskNum);
                        _taskService.UpdateTaskStatusToNext(task.TaskNum);
                        content.OK();
                    }
                    else if (task.TaskState == (int)TaskAcrossFloorStatusEnum.SecondCarry)
                    else if (task.TaskState == (int)TaskAcrossFloorStatusEnum.EndAddressExecuting)
                    {
                        task.TaskState = (int)TaskAcrossFloorStatusEnum.SecondCarryFinish;
                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";
                        Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                        task_Hty.TaskId = 0;
                        _taskRepository.DeleteData(task);
                        _taskhtyRepository.AddData(task_Hty);
                        _taskService.UpdateTaskStatusToNext(task.TaskNum);
                        content.OK();
                    }
                }
                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)