From bc8d5d9f033b638e97007c8a9cec8a703879fcbe Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 27 二月 2026 18:15:33 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 0b14d18..2c2ef26 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"
@@ -64,9 +64,9 @@
}
catch (Exception ex)
{
- throw new Exception(ex.Message);
+ return WebResponseContent.Instance.Error(ex.Message);
}
- }
+ }
#endregion
#region 浠诲姟鐘舵�佽浆鎹�
@@ -85,6 +85,7 @@
6 => TaskStatusEnum.TaskTypeError,
7 => TaskStatusEnum.ParameterError,
8 => TaskStatusEnum.RCSError,
+ 10 => TaskStatusEnum.Takeing,
13 => TaskStatusEnum.Cancel,
_ => throw new ArgumentOutOfRangeException(
nameof(status),
@@ -107,7 +108,7 @@
{
throw new Exception(ex.Message);
}
- }
+ }
#endregion
#region 浠诲姟璧风偣瀹屾垚
@@ -133,7 +134,7 @@
Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
- }
+ }
#endregion
#region 浠诲姟瀹屾垚
@@ -159,7 +160,7 @@
Db.Ado.RollbackTran();
throw new Exception(ex.Message);
}
- }
+ }
#endregion
#region 鏇存柊璐т綅鐘舵��
@@ -211,7 +212,7 @@
{
throw new Exception(ex.Message);
}
- }
+ }
#endregion
}
}
--
Gitblit v1.9.3