From 80f2457f459b32054543b05d7856c40e4c51e664 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 06 三月 2026 20:05:45 +0800
Subject: [PATCH] 优化成品库外检失败任务

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs |  176 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 125 insertions(+), 51 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
index 9ca6eda..e2377e1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs"
@@ -62,7 +62,7 @@
                         }
                         //FOURBOTnewMovePodTaskResponseData fOURBO = fOURBOTReturn.data as FOURBOTnewMovePodTaskResponseData ?? throw new Exception("鏈幏鍙栧埌鍥涘悜杞﹁繑鍥炵殑浠诲姟ID");
                         item.RGVTaskId = fOURBO.taskID;
-                        item.TaskState = (int)TaskStatusEnum.Execut;
+                        item.TaskState = (int)TaskStatusEnum.TakeFinish;
                     }
                 }
                 _taskService.UpdateData(tasks);
@@ -169,7 +169,8 @@
                 var locationsToUpdate = new List<Dt_RGVLocationInfo>();
                 var stationsToUpdate = new List<Dt_StationManger>();
                 #region 浠诲姟涓嬪彂
-                foreach (var item in tasks)
+                var item = tasks.FirstOrDefault();
+                if (item != null)
                 {
                     try
                     {
@@ -178,55 +179,58 @@
                         if (rGVLocationInfo == null)
                         {
                             item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
-                            continue;
                         }
                         #endregion
-                        fOURBOTnewMovePodTask = new FOURBOTnewMovePodTask
-                        {
-                            priority = item.Grade,
-                            podID = item.PalletCode,
-                            desStorageID = rGVLocationInfo.LocationCode,
-                            //destination = rGVLocationInfo.LocationCode,
-                            desExt = new { unload = 1 }, // 鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
-                            desType = 2
-                        };
-                        fOURBOTnewMovePodTask.taskExt = new
-                        {
-                            autoToRest = 1
-                        };
-                        item.CurrentAddress = item.NextAddress;
-                        item.NextAddress = rGVLocationInfo.LocationCode;
-                        item.TargetAddress = rGVLocationInfo.LocationCode;
-                        item.Roadway = rGVLocationInfo.RoadwayNo;
-
-                        string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
-                        var fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
-                        content.Data = fOURBOTReturn;
-                        if (fOURBOTReturn.returnCode == 0)
-                        {
-                            var data = fOURBOTReturn.data.ToString();
-                            var fOURBO = data.DeserializeObject<FOURBOTnewMovePodTaskResponseData>();
-                            item.RGVTaskId = fOURBO.taskID;
-                            item.TaskState = (int)TaskStatusEnum.Puting;
-
-                            rGVLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
-                            locationsToUpdate.Add(rGVLocationInfo);
-
-                            #region 閲婃斁鍏ュ簱绔欏彴
-                            var stationManger = _stationMangerService.GetInStationInfo(item.SourceAddress);
-                            if (stationManger != null)
-                            {
-                                stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
-                                stationsToUpdate.Add(stationManger);
-                            }
-                            content.OK();
-                            #endregion
-                        }
                         else
                         {
-                            item.ExceptionMessage = $"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{fOURBOTReturn.returnMsg}";
-                            // 璁板綍澶辫触鐨勪换鍔�
-                            content.Error($"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{fOURBOTReturn.returnMsg}");
+                            fOURBOTnewMovePodTask = new FOURBOTnewMovePodTask
+                            {
+                                priority = item.Grade,
+                                podID = item.PalletCode,
+                                desStorageID = rGVLocationInfo.LocationCode,
+                                //destination = rGVLocationInfo.LocationCode,
+                                desExt = new { unload = 1 }, // 鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+                                desType = 2
+                            };
+                            fOURBOTnewMovePodTask.taskExt = new
+                            {
+                                autoToRest = 1
+                            };
+                            item.CurrentAddress = item.NextAddress;
+                            item.NextAddress = rGVLocationInfo.LocationCode;
+                            item.TargetAddress = rGVLocationInfo.LocationCode;
+                            item.Roadway = rGVLocationInfo.RoadwayNo;
+
+                            string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
+                            var fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+                            content.Data = fOURBOTReturn;
+                            if (fOURBOTReturn.returnCode == 0)
+                            {
+                                var data = fOURBOTReturn.data.ToString();
+                                var fOURBO = data.DeserializeObject<FOURBOTnewMovePodTaskResponseData>();
+                                item.RGVTaskId = fOURBO.taskID;
+                                item.TaskState = (int)TaskStatusEnum.Puting;
+
+                                rGVLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
+                                locationsToUpdate.Add(rGVLocationInfo);
+
+                                #region 閲婃斁鍏ュ簱绔欏彴
+                                var stationManger = _stationMangerService.GetInStationInfo(item.SourceAddress);
+                                if (stationManger != null)
+                                {
+                                    stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+                                    stationsToUpdate.Add(stationManger);
+                                }
+                                content.OK();
+                                #endregion
+                            }
+                            else
+                            {
+                                item.ExceptionMessage = $"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{fOURBOTReturn.returnMsg}";
+                                // 璁板綍澶辫触鐨勪换鍔�
+                                content.Error($"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{fOURBOTReturn.returnMsg}");
+                            }
+                            tasksToUpdate.Add(item);
                         }
                     }
                     catch (Exception ex)
@@ -235,8 +239,77 @@
                         //WriteError($"{nameof(TaskJob)}-{item.TaskId}", ex.Message, ex);
                         content.Error($"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{ex.Message}");
                     }
-                    tasksToUpdate.Add(item);
                 }
+                #region MyRegion
+                //foreach (var item in tasks)
+                //{
+                //    try
+                //    {
+                //        #region 鑾峰彇璐т綅
+                //        var rGVLocationInfo = _rGVLocationInfoService.GetFreeLocationInfo(item.Roadway);
+                //        if (rGVLocationInfo == null)
+                //        {
+                //            item.ExceptionMessage = $"鏈壘鍒扮粓鐐瑰簱鍖恒�恵item.Roadway}銆戝彲鐢ㄧ┖璐т綅锛�";
+                //            continue;
+                //        }
+                //        #endregion
+                //        fOURBOTnewMovePodTask = new FOURBOTnewMovePodTask
+                //        {
+                //            priority = item.Grade,
+                //            podID = item.PalletCode,
+                //            desStorageID = rGVLocationInfo.LocationCode,
+                //            //destination = rGVLocationInfo.LocationCode,
+                //            desExt = new { unload = 1 }, // 鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
+                //            desType = 2
+                //        };
+                //        fOURBOTnewMovePodTask.taskExt = new
+                //        {
+                //            autoToRest = 1
+                //        };
+                //        item.CurrentAddress = item.NextAddress;
+                //        item.NextAddress = rGVLocationInfo.LocationCode;
+                //        item.TargetAddress = rGVLocationInfo.LocationCode;
+                //        item.Roadway = rGVLocationInfo.RoadwayNo;
+
+                //        string response = HttpHelper.Post(apiInfo.ApiAddress, fOURBOTnewMovePodTask.Serialize());
+                //        var fOURBOTReturn = response.DeserializeObject<FOURBOTReturn>();
+                //        content.Data = fOURBOTReturn;
+                //        if (fOURBOTReturn.returnCode == 0)
+                //        {
+                //            var data = fOURBOTReturn.data.ToString();
+                //            var fOURBO = data.DeserializeObject<FOURBOTnewMovePodTaskResponseData>();
+                //            item.RGVTaskId = fOURBO.taskID;
+                //            item.TaskState = (int)TaskStatusEnum.Puting;
+
+                //            rGVLocationInfo.LocationStatus = LocationStatusEnum.InLock.ObjToInt();
+                //            locationsToUpdate.Add(rGVLocationInfo);
+
+                //            #region 閲婃斁鍏ュ簱绔欏彴
+                //            var stationManger = _stationMangerService.GetInStationInfo(item.SourceAddress);
+                //            if (stationManger != null)
+                //            {
+                //                stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
+                //                stationsToUpdate.Add(stationManger);
+                //            }
+                //            content.OK();
+                //            #endregion
+                //        }
+                //        else
+                //        {
+                //            item.ExceptionMessage = $"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{fOURBOTReturn.returnMsg}";
+                //            // 璁板綍澶辫触鐨勪换鍔�
+                //            content.Error($"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{fOURBOTReturn.returnMsg}");
+                //        }
+                //    }
+                //    catch (Exception ex)
+                //    {
+                //        item.ExceptionMessage = $"澶勭悊浠诲姟寮傚父锛歿ex.Message}";
+                //        //WriteError($"{nameof(TaskJob)}-{item.TaskId}", ex.Message, ex);
+                //        content.Error($"鍥涘悜杞︽帴鍙h繑鍥為敊璇細{ex.Message}");
+                //    }
+                //    tasksToUpdate.Add(item);
+                //} 
+                #endregion
                 #endregion
                 #region 鏇存柊鏁版嵁
                 // 濡傛灉鏈夐渶瑕佹洿鏂扮殑鏁版嵁锛屾墠鎵ц浜嬪姟
@@ -290,7 +363,8 @@
                     item.NextAddress = stationManger.StationCode;
                     fOURBOTnewMovePodTask.priority = item.Grade;
                     fOURBOTnewMovePodTask.podID = item.PalletCode;
-                    fOURBOTnewMovePodTask.destination = item.NextAddress;
+                    //fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
+                    fOURBOTnewMovePodTask.desStationCodes = item.NextAddress;
                     fOURBOTnewMovePodTask.desExt = new
                     {
                         unload = 1//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�
@@ -342,7 +416,7 @@
                 if (FreeLocationInfos.Count < 1) throw new Exception($"鎴愬搧搴撳垱寤虹Щ搴撲换鍔℃棤鍙敤绌鸿揣浣�");
                 foreach (var item in rGVLocationInfos)
                 {
-                    Dt_RGVLocationInfo? rGVLocationInfo = FreeLocationInfos.Where(x => x.Layer == item.Layer).OrderBy(n => Math.Abs(n.Row - item.Row)).FirstOrDefault();
+                    Dt_RGVLocationInfo? rGVLocationInfo = FreeLocationInfos.Where(x => x.Layer == item.Layer && x.RoadwayNo != item.RoadwayNo).OrderBy(n => Math.Abs(n.Row - item.Row)).FirstOrDefault();
                     rGVLocationInfo ??= FreeLocationInfos.First();
                     Dt_Task dt_Task = new()
                     {
@@ -471,7 +545,7 @@
                     #region 涓嬪彂鍑哄簱浠诲姟
                     fOURBOTnewMovePodTask.priority = item.Grade;
                     fOURBOTnewMovePodTask.podID = item.PalletCode;
-                    fOURBOTnewMovePodTask.destination = item.NextAddress;
+                    fOURBOTnewMovePodTask.desNodeID = item.NextAddress;
                     fOURBOTnewMovePodTask.desExt = new
                     {
                         unload = 0//鏄惁鏀句笅瀹瑰櫒,0鍚�1鏄�

--
Gitblit v1.9.3