From 084201e1437dc26ace65b8c0a2d02fcaa013961a Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 18 三月 2026 16:22:06 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 bec86f6..ff08f05 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"
@@ -76,20 +76,31 @@
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵hIKROBOT.robotTaskCode}銆�");
switch (hIKROBOT.extra.values.method)
{
- case "end":
- TaskCompleted(task, deviceTypeEnum);
- break;
- case "outbin":
- TaskFromCompleted(task, deviceTypeEnum);
- break;
case "start":
task.TaskState = (int)TaskStatusEnum.Takeing;
TaskFeedback(task, 1);
break;
- default:
- task.TaskState = ReturnTaskStatus(hIKROBOT.extra.values.method, deviceTypeEnum);
- BaseDal.UpdateData(task);
+ case "outbin":
+ {
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskFromCompleted(task, deviceTypeEnum);
+ }
break;
+ case "into"://鐢宠杩涘叆鎻愬崌鏈�
+ break;
+ case "wait"://鎵爜绛夊緟
+ break;
+ case "end":
+ {
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskCompleted(task, deviceTypeEnum);
+ }
+ break;
+ default:
+ throw new Exception("鏈畾涔夌殑鏂规硶鍚嶏紒");
+ //task.TaskState = ReturnTaskStatus(hIKROBOT.extra.values.method, deviceTypeEnum);
+ //BaseDal.UpdateData(task);
+ //break;
}
}
else //鍥涘悜杞�
@@ -167,12 +178,12 @@
}
else if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Puting)
{
- if (!string.IsNullOrEmpty(task.ExceptionMessage))
+ if (!string.IsNullOrEmpty(task.ExceptionMessage) && !task.ExceptionMessage.Contains("鐢变簬鐩爣璁＄畻鏈虹Н鏋佹嫆缁濓紝鏃犳硶杩炴帴"))
ErrorTaskFeedback(task, true/*!task.ExceptionMessage.Contains("澶栨澶辫触")*/);
else
TaskCompleted(task, deviceTypeEnum);
}
- else if (task.TaskType == (int)TaskTypeEnum.CPOutbound )//鍑哄簱瀹屾垚
+ else if (task.TaskType == (int)TaskTypeEnum.CPOutbound)//鍑哄簱瀹屾垚
{
TaskCompleted(task, deviceTypeEnum);
}
--
Gitblit v1.9.3