From 9ce6731460179c71f0f2c636b2a1598324d5194e Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 20 九月 2025 15:16:48 +0800 Subject: [PATCH] 最新代码更新 --- 项目代码/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs | 82 +++++++++++++--------------------------- 1 files changed, 27 insertions(+), 55 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs" index 25e77a2..9bb8716 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs" @@ -109,22 +109,6 @@ } vueDictionaryDTOs.AddRange(selectDics); } - - //object GetSourceData(string dicNo, string dbSql, object data) - //{ - // if (string.IsNullOrEmpty(dbSql)) - // { - // return data; - // } - // return BaseDal.QueryObjectDataBySql(dbSql, null); - //} - //List<VueDictionaryDTO> vueDictionaryDTOs = dicConfig.Select(item => new VueDictionaryDTO - //{ - // DicNo = item.dicNo, - // Config = item.config, - // Data = GetSourceData(item.dicNo, item.dbSql, item.list) - //}).ToList(); - try { List<string> dicList = dicNos.ToList(); @@ -427,26 +411,6 @@ { List<object> data = new List<object>(); - //{ - // Type type = typeof(TaskTypeEnum); - // List<int> enums = Enum.GetValues(typeof(TaskTypeEnum)).Cast<int>().ToList(); - // int index = 0; - // foreach (var item in enums) - // { - // FieldInfo? fieldInfo = typeof(TaskTypeEnum).GetField(((TaskTypeEnum)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++; - // } - //} - result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data }; } break; @@ -474,25 +438,6 @@ } } - //{ - // Type type = typeof(TaskStatusEnum); - // List<int> enums = Enum.GetValues(typeof(TaskStatusEnum)).Cast<int>().ToList(); - // int index = 0; - // foreach (var item in enums) - // { - // FieldInfo? fieldInfo = typeof(TaskStatusEnum).GetField(((TaskStatusEnum)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++; - // } - //} result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data }; } break; @@ -690,6 +635,33 @@ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data }; } break; + case "materielUnitEnum": + { + List<object> data = new List<object>(); + + { + Type type = typeof(MaterielUnitEnum); + List<string> enumNames = Enum.GetNames(typeof(MaterielUnitEnum)).ToList(); + int index = 0; + foreach (var item in enumNames) + { + FieldInfo? fieldInfo = typeof(MaterielUnitEnum).GetField((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++; + } + } + + result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data }; + } + break; case "agvStationAreaEnum": { List<object> data = new List<object>(); -- Gitblit v1.9.3