From 83743fe4641fcfad9effc2b6104c8dedefcbdcb5 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 08 四月 2026 00:57:54 +0800
Subject: [PATCH] Merge branch 'dev'
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
index 3ac5a02..7296558 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
@@ -267,6 +267,28 @@
}
#endregion
+ #region RobotTaskTypeEnum
+ {
+ Type type = typeof(RobotTaskTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(RobotTaskTypeEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(RobotTaskTypeEnum).GetField(((RobotTaskTypeEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+ #endregion
+
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
@@ -318,6 +340,28 @@
}
#endregion
+ #region TaskRobotStatusEnum
+
+ {
+ Type type = typeof(TaskRobotStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskRobotStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(TaskRobotStatusEnum).GetField(((TaskRobotStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
+ #endregion
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
@@ -369,7 +413,7 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
- case "dispatchId":
+ case "dispatchId":
{
Type type = typeof(IJob);
var basePath = AppContext.BaseDirectory;
@@ -403,4 +447,4 @@
}
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3