Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPu...

yanjinhui

10 小时以前 0875bfa35d389e238ae82142ce45b71c9715133b

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs

@@ -4,6 +4,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
@@ -164,7 +165,7 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                List<Dt_Task> dt_Tasks = new List<Dt_Task>();
                //List<Dt_Task> dt_Tasks = new List<Dt_Task>();
                var PalletCodes = tasks.Select(x => x.PalletCode).ToList();
                var request = new GetBlockPodContentListDto
                {
@@ -221,34 +222,69 @@
                        _taskService.UpdateData(tasks);
                        return;
                    }
                    foreach (var Result in getBlockPod.Result)
                    #region åˆ¤æ–­æ˜¯å¦éœ€è¦ç§»åº“
                    foreach (var task in tasks)
                    {
                        foreach (var item in Result.outPods)
                        var item = getBlockPod.Result[0].outPods.FirstOrDefault(x => x.outPod == task.PalletCode);
                        if (item != null)
                        {
                            var task = tasks.First(x => x.PalletCode == item.outPod);
                            if (item.blockPods != null && item.blockPods.Count > 0)
                                item.blockPods = item.blockPods.Except(PalletCodes).ToList();
                            if (item.blockPods != null && item.blockPods.Count > 0)
                            {
                                #region åˆ¤æ–­é˜»ç¢æ‰˜æ˜¯å¦ä¸ºå‡ºåº“任务
                                //var except = item.blockPods.Except(PalletCodes).ToList();
                                #endregion
                                var responseContent = AddMoveTask(item.blockPods, task);//添加移库任务
                                if (!responseContent.Status) task.ExceptionMessage = responseContent.Message;
                                else
                                {
                                    task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
                                }
                                dt_Tasks.Add(task);
                                else task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
                                #region ç§»åº“状态反馈给WMS
                                WMSInOutBoundCompleteFeedback boundCompleteFeedback = new WMSInOutBoundCompleteFeedback();
                                boundCompleteFeedback.taskCode = task.WMSTaskNum;
                                boundCompleteFeedback.containerCode = task.PalletCode;
                                boundCompleteFeedback.fromStationCode = task.SourceAddress;
                                boundCompleteFeedback.toLocationCode = task.TargetAddress;
                                boundCompleteFeedback.status = 5;
                                boundCompleteFeedback.custStatus = "";
                                _apiInfoService.PostInterfaceRequest(nameof(WMSInOutBoundCompleteFeedback), boundCompleteFeedback.Serialize(), "成品出库任务等待移库上报WMS");
                                #endregion
                            }
                            else
                            {
                                task.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
                                dt_Tasks.Add(task);
                            }
                        }
                        else task.ExceptionMessage = $"RCS未反馈【{task.PalletCode}】可出库托盘信息,详情请查看批量获取阻碍托盘关系接口日志！";
                    }
                    _taskService.UpdateData(dt_Tasks);
                    _taskService.Repository.UpdateData(tasks);
                    #endregion
                    #region MyRegion
                    //foreach (var Result in getBlockPod.Result)
                    //{
                    //    foreach (var item in Result.outPods)
                    //    {
                    //        var task = tasks.First(x => x.PalletCode == item.outPod);
                    //        if (item.blockPods != null && item.blockPods.Count > 0)
                    //            item.blockPods = item.blockPods.Except(PalletCodes).ToList();
                    //        if (item.blockPods != null && item.blockPods.Count > 0)
                    //        {
                    //            #region åˆ¤æ–­é˜»ç¢æ‰˜æ˜¯å¦ä¸ºå‡ºåº“任务
                    //            //var except = item.blockPods.Except(PalletCodes).ToList();
                    //            #endregion
                    //            var responseContent = AddMoveTask(item.blockPods, task);//添加移库任务
                    //            if (!responseContent.Status) task.ExceptionMessage = responseContent.Message;
                    //            else
                    //            {
                    //                task.TaskState = (int)TaskStatusEnum.RGV_WaitMoveToExecute;
                    //            }
                    //            dt_Tasks.Add(task);
                    //        }
                    //        else
                    //        {
                    //            task.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
                    //            dt_Tasks.Add(task);
                    //        }
                    //    }
                    //}
                    //_taskService.UpdateData(dt_Tasks); 
                    #endregion
                    content.OK();
                }
            }
@@ -528,6 +564,13 @@
            try
            {
                List<Dt_RGVLocationInfo> rGVLocationInfos = _rGVLocationInfoService.Repository.QueryData(x => blockPods.Contains(x.PalletCode));
                var palletCodes = rGVLocationInfos.Select(x => x.PalletCode).ToList();
                // èŽ·å– blockPods ä¸­å­˜åœ¨ä½† palletCodes ä¸­ä¸å­˜åœ¨çš„托盘码
                var missingPalletCodes = blockPods.Except(palletCodes).ToList();
                if (missingPalletCodes.Any())
                {
                    throw new Exception($"未找到以下阻碍托货位信息：{string.Join(",", missingPalletCodes)}");
                }
                var Items = _rGVLocationInfoService.GetMoveFreeLocationInfo(rGVLocationInfos);

                List<Dt_Task> tasks = Items.Item1;