From 29cd467ba62b2bdf49c6546e78ae3ec809c4a723 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 19 六月 2025 17:50:28 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index bc930a9..9b01901 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -96,8 +96,8 @@
try
{
- List<string> dicList = dicNos.ToList();
- if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
+ List<string> dicList = dicNos.Where(x => !cacheDicNos.Contains(x)).ToList();
+ if (dicList.Count() > 0)
{
string str = AppSettings.Configuration["dics"];
if (!string.IsNullOrEmpty(str))
@@ -106,11 +106,10 @@
List<string> dics = str.Split(",").ToList();
- foreach (var item in dics)
+ foreach (var item in dicList)
{
- if (dicList.Contains(item))
+ if (dics.Contains(item))
cusDics.Add(item);
- dicList.Remove(item);
}
foreach (var item in cusDics)
@@ -478,6 +477,26 @@
}
{
+ Type type = typeof(RelocationTaskStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(RelocationTaskStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(RelocationTaskStatusEnum).GetField(((RelocationTaskStatusEnum)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++;
+ }
+ }
+
+ {
Type type = typeof(AGVTaskStatusEnum);
List<int> enums = Enum.GetValues(typeof(AGVTaskStatusEnum)).Cast<int>().ToList();
int index = 0;
--
Gitblit v1.9.3