From 61a7d9eb8c0bb672fdd3a0da2b7f48dc8cfef389 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 31 三月 2026 10:48:39 +0800
Subject: [PATCH] Merge branch 'zheng'
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs
index 6ea2329..cd86fc7 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs
@@ -46,6 +46,10 @@
{
return TaskTypeGroup.OtherGroup;
}
+ else if(!int.TryParse(Enum.Parse<RobotTaskTypeEnum>(taskTypeStr).ToString(), out result))
+ {
+ return TaskTypeGroup.OtherGroup;
+ }
// 濡傛灉浠ヤ笂杞崲閮戒笉鎴愬姛锛屾姏鍑篘otImplementedException寮傚父
else
{
@@ -76,6 +80,18 @@
// 鑾峰彇TaskOutStatusEnum鏋氫妇绫诲瀷鐨勭储寮曞垪琛�
return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskOutStatusEnum.OutFinish).OrderBy(x => x).FirstOrDefault();
}
+ // 濡傛灉type鏄疶askRobotStatusEnum鏋氫妇绫诲瀷
+ else if (type == typeof(TaskRobotStatusEnum))
+ {
+ // 鑾峰彇TaskOutStatusEnum鏋氫妇绫诲瀷鐨勭储寮曞垪琛�
+ return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskRobotStatusEnum.RobotFinish).OrderBy(x => x).FirstOrDefault();
+ }
+ // 濡傛灉type鏄疶askRobotStatusEnum鏋氫妇绫诲瀷
+ else if (type == typeof(TaskRelocationStatusEnum))
+ {
+ // 鑾峰彇TaskOutStatusEnum鏋氫妇绫诲瀷鐨勭储寮曞垪琛�
+ return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskRelocationStatusEnum.RelocationFinish).OrderBy(x => x).FirstOrDefault();
+ }
// 濡傛灉浠ヤ笂鏉′欢閮戒笉婊¤冻锛屾姏鍑篘otImplementedException寮傚父
else
{
--
Gitblit v1.9.3