From 6499ace32d8e40ad6b31f5c633d7de762c4ce749 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 四月 2026 16:41:28 +0800
Subject: [PATCH] 优化成品出库任务判断是否需要移库逻辑,优化WMS调用容器流动请求接口逻辑

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/RGVTaskExtend.cs |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 14 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 aff1ab6..cdd43c3 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"
@@ -164,7 +164,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 +221,59 @@
                         _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;
                             }
                             else
                             {
                                 task.TaskState = (int)TaskStatusEnum.RGV_WaitSend;
-                                dt_Tasks.Add(task);
                             }
                         }
+                        else task.ExceptionMessage = $"RCS鏈弽棣堛�恵task.PalletCode}銆戝彲鍑哄簱鎵樼洏淇℃伅,璇︽儏璇锋煡鐪嬫壒閲忚幏鍙栭樆纰嶆墭鐩樺叧绯绘帴鍙f棩蹇楋紒";
                     }
-                    _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();
                 }
             }

--
Gitblit v1.9.3