From 0128fce75a5e7cc9afc4bd89ce1966eb2231b69f Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 31 三月 2026 10:55:33 +0800
Subject: [PATCH] 编写海康跨楼层接口

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs |   39 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 34 insertions(+), 5 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index b035582..6241af5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -78,13 +78,20 @@
                     switch (hIKROBOT.extra.values.method)
                     {
                         case "start":
-                            task.TaskState = (int)TaskStatusEnum.Takeing;
-                            TaskFeedback(task, 1);
+                            if (task.TaskState==(int)TaskStatusEnum.CallingHKtransportation&& task.TaskType == (int)TaskTypeEnum.Move)
+                            {
+                                task.TaskState = (int)TaskStatusEnum.HktransportIng;
+                            }
+                            else
+                            {
+                                task.TaskState = (int)TaskStatusEnum.Takeing;
+                                TaskFeedback(task, 1);
+                            }
                             break;
                         case "outbin"://绂诲紑璧风偣
                             {
                                 ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
-                                TaskFromCompleted(task, deviceTypeEnum);
+                                TaskFromCompleted(task, deviceTypeEnum); //浠诲姟鐘朵綋鏀逛负3鍙栬揣瀹屾垚锛屾洿鏂拌捣鐐硅揣浣嶇姸鎬侊紝骞跺弽棣圵MS璧风偣瀹屾垚
                             }
                             break;
                         case "finish"://绂诲紑鎻愬崌鏈�
@@ -145,6 +152,19 @@
                                             task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
                                     }
                                 }
+                                else if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt() || task.TaskType == TaskTypeEnum.Q3CK.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+                                {
+                                    if (task.TaskType == TaskTypeEnum.Q3RK.ObjToInt())
+                                    {
+                                        //濡傛灉鏄叚妤煎埌涓�妤煎氨鍐欎竴涓俊鍙风粰1妤紁lc鍛婅瘔浠栨垜鏉ュ叆搴撲簡
+
+                                    }
+                                    else
+                                    {
+                                        //杩欎釜灏卞啓涓�涓浣嶇姸鎬侊紝鍛婅瘔瀹冩垜鍑哄簱浜�
+
+                                    }
+                                }
                             }
                             break;
                         case "into"://鐢宠杩涘叆鎻愬崌鏈�
@@ -161,8 +181,17 @@
                             break;
                         case "end"://浠诲姟瀹屾垚閫氱煡
                             {
-                                ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
-                                TaskCompleted(task, deviceTypeEnum);
+                                if (task.TaskType==(int)TaskTypeEnum.Move &&task.TaskState==(int)TaskStatusEnum.HkTransportCompleted)
+                                {
+                                    task.TaskState = TaskStatusEnum.Finish.ObjToInt();
+                                    TaskFeedback(task, 2);
+                                    BaseDal.DeleteAndMoveIntoHty(task,OperateTypeEnum.鑷姩瀹屾垚);
+                                }
+                                else
+                                {
+                                    ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+                                    TaskCompleted(task, deviceTypeEnum);
+                                }
                             }
                             break;
                         default:

--
Gitblit v1.9.3