From f7686c71ac53f0d1bbd439bc0c898c86f7d68e34 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 10 十一月 2025 16:39:10 +0800
Subject: [PATCH] 优化代码

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs"
index c3db50e..7ac045c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/PartialTaskService_StackCrane.cs"
@@ -17,6 +17,20 @@
     public partial class TaskService
     {
 
+        public WebResponseContent ToWMSCompletedTask(Dt_Task task)
+        {
+            WebResponseContent content = new WebResponseContent();
+            try
+            {
+                WMSTaskDTO WMStask = _mapper.Map<WMSTaskDTO>(task);
+                HttpHelper.PostAsync(WMSInterfaceAddress.UpdateTaskStatus, WMStask.ToJson(), headers: new Dictionary<string, string>());
+                return content.OK();
+            }
+            catch (Exception ex)
+            {
+                return WebResponseContent.Instance.Error(ex.Message);
+            }
+        }
         /// <summary>
         /// 鍫嗗灈鏈轰换鍔″畬鎴�
         /// </summary>
@@ -30,7 +44,7 @@
                 Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                 if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
 
-                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
+                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutGetFinish)
                 {
                     List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
                     if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");
@@ -84,7 +98,7 @@
                     if (task.TargetIsPickPlace)
                     {
                         task.TaskState = (int)TaskRelocationStatusEnum.RelocationFinish;
-                        WMStask.TaskState = task.TaskState;
+                        //WMStask.TaskState = task.TaskState;
                         AddTask_Hty(task, TaskOperateTypeEnum.AutoComplete);
                     }
                     else
@@ -108,7 +122,7 @@
                         BaseDal.UpdateData(task);
                         _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ杞﹀畬鎴�");
                     }
-                    else if (task.TaskState == (int)CarChargingTaskEnum.SC_CarExecuting)
+                    else if (task.TaskState == (int)CarChargingTaskEnum.CarChargingSC_CarExecuting)
                     {
                         int nextStatus = task.TaskState.GetNextNotCompletedStatus<CarChargingTaskEnum>();
                         task.TaskState = nextStatus;

--
Gitblit v1.9.3