增加提升机可进行一次进俩托物料出入库

huangxiaoqiang

2025-11-29 f9e8a2d52fe52fb2389892a46c12d4d262ee9aaf

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -141,6 +141,8 @@
                            task.Floor = item.Floor;

                            task.AGVSign = "";

                            task.DoubleTray = item.DoubleTray;
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
@@ -187,6 +189,8 @@
                            task.Floor = item.Floor;

                            task.AGVSign = "";

                            task.DoubleTray = item.DoubleTray;
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
@@ -209,7 +213,7 @@
                    {
                        if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.RelocationGroup)
                        {
                            task.TaskState = (int)TaskRelocationStatusEnum.RelocationNew;
                            //task.TaskState = (int)TaskRelocationStatusEnum.RelocationNew;

                            task.CurrentAddress = item.SourceAddress;

@@ -232,6 +236,8 @@
                            task.Floor = item.Floor;

                            task.AGVSign = "";

                            task.DoubleTray = item.DoubleTray;
                        }
                        else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
                        {
@@ -540,6 +546,26 @@
                        _taskHtyRepository.AddData(task_Hty);
                    }
                }
                else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.RelocationGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskRelocationStatusEnum>();

                    task.TaskState = nextStatus;

                    if (task.TaskState == (int)TaskRelocationStatusEnum.SC_RelocationFinish|| task.TaskState == (int)TaskRelocationStatusEnum.AGV_RelocationFinish)
                    {
                        CompletedTask(task.TaskNum);

                        task.ModifyDate = DateTime.Now;
                        task.Modifier = "System";

                        Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
                        task_Hty.TaskId = 0;

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);
                    }
                }
                else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
                {
                    int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAcrossFloorStatusEnum>();
@@ -563,73 +589,19 @@

                    if (task.TaskState == (int)TaskAcrossFloorStatusEnum.FirstCarryFinish)
                    {
                        Dt_StationManager stationManager = new Dt_StationManager();
                        string TaskTemplate = string.Empty;
                        if (task.Floor == "1F")
                        if (task.DoubleTray != 1)
                        {
                            stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "2F");
                            TaskTemplate = "BBB";
                            RequestAcrossFloor(task,0);
                        }
                        else
                        {
                            stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
                            TaskTemplate = "CCC";
                            var taskDouble = BaseDal.QueryFirst(x => x.TaskState == (int)TaskAcrossFloorStatusEnum.FirstCarryFinish);
                            if (taskDouble != null)
                            {
                                RequestAcrossFloor(task,1);
                                RequestAcrossFloor(taskDouble,1);
                            }
                        }

                        var taskDto = new RequestAcrossFloorTaskDto()
                        {
                            NextAddress = task.NextAddress,
                            PalletCode = task.PalletCode,
                            TaskNum = task.TaskNum
                        };

                        // èŽ·å–WMSip地址
                        var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                        var wmsBasez = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;
                        var requestLocation = configz.Where(x => x.ConfigKey == SysConfigKeyConst.AcrossFloorTask).FirstOrDefault()?.ConfigValue;
                        if (wmsBasez == null || requestLocation == null)
                        {
                            throw new InvalidOperationException("WMS IP æœªé…ç½®");
                        }
                        var wmsIpAddrss = wmsBasez + requestLocation;

                        var abc = HttpHelper.PostAsync(wmsIpAddrss, taskDto.ToJsonString()).Result;
                        if (abc == null)
                            return content.Error();
                        content = JsonConvert.DeserializeObject<WebResponseContent>(abc);

                        if (!content.Status)
                        {
                            return content;
                        }

                        // ååºåˆ—化任务数据
                        var taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

                        Dt_Task taskNew = _mapper.Map<Dt_Task>(taskDTO);
                        task.Creater = "WMS";

                        taskNew.CurrentAddress = stationManager.stationChildCode;

                        taskNew.NextAddress = taskDTO.TargetAddress;

                        taskNew.Floor = stationManager.stationFloor;

                        taskNew.AGVSign = "";

                        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;

                        BaseDal.DeleteData(task);
                        _taskHtyRepository.AddData(task_Hty);

                        BaseDal.AddData(taskNew);

                        SendAgvTask(TaskTemplate, taskNew.TaskNum);
                    }
                }
                else
@@ -674,6 +646,80 @@
            return content;
        }

        public WebResponseContent RequestAcrossFloor(Dt_Task task,int DoubleTray)
        {
            WebResponseContent content = new WebResponseContent();
            Dt_StationManager stationManager = new Dt_StationManager();
            string TaskTemplate = string.Empty;
            if (task.Floor == "1F")
            {
                stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "2F");
                TaskTemplate = "BBB";
            }
            else
            {
                stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
                TaskTemplate = "CCC";
            }

            var taskDto = new RequestAcrossFloorTaskDto()
            {
                NextAddress = task.NextAddress,
                PalletCode = task.PalletCode,
                TaskNum = task.TaskNum
            };

            // èŽ·å–WMSip地址
            var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
            var wmsBasez = configz.Where(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE).FirstOrDefault()?.ConfigValue;
            var requestLocation = configz.Where(x => x.ConfigKey == SysConfigKeyConst.AcrossFloorTask).FirstOrDefault()?.ConfigValue;
            if (wmsBasez == null || requestLocation == null)
            {
                throw new InvalidOperationException("WMS IP æœªé…ç½®");
            }
            var wmsIpAddrss = wmsBasez + requestLocation;

            var abc = HttpHelper.PostAsync(wmsIpAddrss, taskDto.ToJsonString()).Result;
            if (abc == null)
                return content.Error();
            content = JsonConvert.DeserializeObject<WebResponseContent>(abc);

            if (!content.Status)
            {
                return content;
            }

            // ååºåˆ—化任务数据
            var taskDTO = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());

            Dt_Task taskNew = _mapper.Map<Dt_Task>(taskDTO);
            task.Creater = "WMS";

            taskNew.CurrentAddress = stationManager.stationChildCode;

            taskNew.NextAddress = taskDTO.TargetAddress;

            taskNew.Floor = stationManager.stationFloor;

            taskNew.AGVSign = "";

            taskNew.DoubleTray = DoubleTray;

            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;

            BaseDal.DeleteData(task);
            _taskHtyRepository.AddData(task_Hty);

            BaseDal.AddData(taskNew);

            return SendAgvTask(TaskTemplate, taskNew.TaskNum);
        }

        public string GetLocation(string palletCode)
        {
            var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);