From 73a9951bb6a5919ec481fa6fef37d5aa338b31db Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 20 四月 2026 10:03:15 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WCSServer/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs | 65 ++------------------------------
1 files changed, 4 insertions(+), 61 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
index e83e71f..6aec555 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Common/TaskEnum/TaskEnumHelper.cs"
@@ -18,29 +18,9 @@
public static TaskTypeGroup GetTaskTypeGroup(this int taskType)
{
- if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(taskType.ToString()).ToString(), out int result))
- {
- return TaskTypeGroup.OutbondGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(taskType.ToString()).ToString(), out result))
- {
- return TaskTypeGroup.InboundGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(taskType.ToString()).ToString(), out result))
- {
- return TaskTypeGroup.RelocationGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(taskType.ToString()).ToString(), out result))
- {
- return TaskTypeGroup.OtherGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskAGVCarryTypeEnum>(taskType.ToString()).ToString(), out result))
+ if (!int.TryParse(Enum.Parse<TaskAGVCarryTypeEnum>(taskType.ToString()).ToString(), out int result))
{
return TaskTypeGroup.CarryGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskAcrossFloorTypeEnum>(taskType.ToString()).ToString(), out result))
- {
- return TaskTypeGroup.AcrossFloorGroup;
}
else
{
@@ -50,29 +30,9 @@
public static TaskStateGroup GetTaskStateGroup(this int taskState)
{
- if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
- {
- return TaskStateGroup.OutbondGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result))
- {
- return TaskStateGroup.InboundGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskRelocationStatusEnum>(taskState.ToString()).ToString(), out result))
- {
- return TaskStateGroup.RelocationGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskOtherStateEnum>(taskState.ToString()).ToString(), out result))
- {
- return TaskStateGroup.OtherGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskAGVCarryStatusEnum>(taskState.ToString()).ToString(), out result))
+ if (!int.TryParse(Enum.Parse<TaskAGVCarryStatusEnum>(taskState.ToString()).ToString(), out int result))
{
return TaskStateGroup.CarryGroup;
- }
- else if (!int.TryParse(Enum.Parse<TaskAcrossFloorStatusEnum>(taskState.ToString()).ToString(), out result))
- {
- return TaskStateGroup.AcrossFloorGroup;
}
else
{
@@ -85,26 +45,9 @@
Type type = typeof(T);
if (type is null) throw new ArgumentNullException();
if (!type.IsEnum) return 0;
- if (type == typeof(TaskInStatusEnum))
+ if (type == typeof(TaskAGVCarryStatusEnum))
{
- List<int> taskInboundTypes = type.GetEnumIndexList();
- return taskInboundTypes.Where(x => x > currentStatus && x < (int)TaskInStatusEnum.InFinish).OrderBy(x => x).FirstOrDefault();
- }
- else if (type == typeof(TaskOutStatusEnum))
- {
- return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskOutStatusEnum.OutFinish).OrderBy(x => x).FirstOrDefault();
- }
- else if (type == typeof(TaskRelocationStatusEnum))
- {
- return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskRelocationStatusEnum.RelocationFinish).OrderBy(x => x).FirstOrDefault();
- }
- else if (type == typeof(TaskAGVCarryStatusEnum))
- {
- return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskAGVCarryStatusEnum.CarryFinish).OrderBy(x => x).FirstOrDefault();
- }
- else if (type == typeof(TaskAcrossFloorStatusEnum))
- {
- return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskAcrossFloorStatusEnum.CarryFinish).OrderBy(x => x).FirstOrDefault();
+ return type.GetEnumIndexList().Where(x => x > currentStatus && x < (int)TaskAGVCarryStatusEnum.AGV_CarryFinish).OrderBy(x => x).FirstOrDefault();
}
else
{
--
Gitblit v1.9.3