From 4492293132bb8f2020d89730dc894426ed7d5eb9 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 27 二月 2026 18:15:29 +0800
Subject: [PATCH] 优化四向车任务

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
index 6241caf..7036521 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
@@ -18,7 +18,7 @@
         /// <summary>
         /// 涓嬪彂浠诲姟
         /// </summary>
-        public void SendTask()
+        public void SendNewTask()
         {
             try
             {
@@ -31,8 +31,10 @@
                     #endregion
 
                     #region 鏌ユ壘RGV浠诲姟
-                    Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound || x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
-                    if (Tasks.Count > 0) SendRGVTask(Tasks);
+                    Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound).ToList();
+                    if (Tasks.Count > 0) SendRGVInTask(Tasks);
+                    Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).ToList();
+                    if (Tasks.Count > 0) IsMoveTask(Tasks);
                     #endregion
 
                     #region 鏌ユ壘娴峰悍AGV浠诲姟
@@ -57,7 +59,7 @@
             try
             {
                 #region 涓嬪彂澶栧舰妫�娴嬮�氳繃鐨勫洓鍚戣溅浠诲姟
-                var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk).ToList();
+                var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.CheckShapeingOk && x.ExceptionMessage.IsNullOrEmpty()).ToList();
                 if (Tasks.Count > 0) SendCheckShapeingOkTask(Tasks);
                 #endregion
 
@@ -68,9 +70,19 @@
                 if (Tasks.Count > 0) SendCheckShapeingNGTask(Tasks);
                 #endregion
 
-                #region 涓嬪彂寰呯Щ搴撳悗鍥涘悜杞﹀嚭搴撲换鍔�
+                #region 涓嬪彂鍥涘悜杞︽壒閲忕Щ搴撲换鍔�
+                Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_NewMoveTask).ToList();
+                if (Tasks.Count > 0) SendMoveTasks(Tasks); 
+                #endregion
+
+                #region 澶勭悊寰呯Щ搴撳悗鍥涘悜杞﹀嚭搴撲换鍔�
                 Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitMoveToExecute).ToList();
-                if (Tasks.Count > 0) SendMoveToExecuteTask(Tasks);
+                if (Tasks.Count > 0) MoveToExecuteTask(Tasks);
+                #endregion
+
+                #region 涓嬪彂鍥涘悜杞﹀嚭搴撲换鍔�
+                Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.RGV_WaitSend).ToList();
+                if (Tasks.Count > 0) SendOutTask(Tasks);
                 #endregion
 
                 #region 涓嬪彂鎵樼洏纭鐨勬捣搴稟GV浠诲姟

--
Gitblit v1.9.3