From 07b56c461476f7d580318749b2cd5f752aa38f3a Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 11 十二月 2025 17:22:00 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs | 216 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 168 insertions(+), 48 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
index aab3422..a236b2e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
@@ -24,58 +24,58 @@
public IActionResult GetVueDictionary([FromBody] string[] dicNos)
{
List<VueDictionaryDTO> vueDictionaryDTOs = Service.GetVueDictionary(dicNos);
- try
- {
- List<string> cacheDicNos = new List<string>();
- foreach (string n in dicNos)
- {
- string str = _cacheService.Get(n);
- if (!string.IsNullOrEmpty(str))
- {
- VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);
+ //try
+ //{
+ // List<string> cacheDicNos = new List<string>();
+ // foreach (string n in dicNos)
+ // {
+ // string str = _cacheService.Get(n);
+ // if (!string.IsNullOrEmpty(str))
+ // {
+ // VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);
- if (vueDictionary != null)
- {
- vueDictionaryDTOs.Add(vueDictionary);
- cacheDicNos.Add(n);
- }
- }
- }
- List<string> dicList = dicNos.ToList();
- if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
- {
- string str = AppSettings.Configuration["dics"];
- if (!string.IsNullOrEmpty(str))
- {
- List<string> cusDics = new List<string>();
+ // if (vueDictionary != null)
+ // {
+ // vueDictionaryDTOs.Add(vueDictionary);
+ // cacheDicNos.Add(n);
+ // }
+ // }
+ // }
+ // List<string> dicList = dicNos.ToList();
+ // if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
+ // {
+ // string str = AppSettings.Configuration["dics"];
+ // if (!string.IsNullOrEmpty(str))
+ // {
+ // List<string> cusDics = new List<string>();
- List<string> dics = str.Split(",").ToList();
+ // List<string> dics = str.Split(",").ToList();
- foreach (var item in dics)
- {
- dicList.Remove(item);
- cusDics.Add(item);
- }
+ // foreach (var item in dics)
+ // {
+ // dicList.Remove(item);
+ // cusDics.Add(item);
+ // }
- foreach (var item in cusDics)
- {
- VueDictionaryDTO vueDictionaryDTO = GetVueDictionary(item.Trim());
- if (vueDictionaryDTO != null)
- {
- vueDictionaryDTOs.Add(vueDictionaryDTO);
- if (!_cacheService.Exists(item) && vueDictionaryDTO.SaveCache)
- {
- _cacheService.Add(item, vueDictionaryDTO.Serialize());
- }
- }
- }
- }
- }
- }
- catch
- {
+ // foreach (var item in cusDics)
+ // {
+ // VueDictionaryDTO vueDictionaryDTO = GetVueDictionary(item.Trim());
+ // if (vueDictionaryDTO != null)
+ // {
+ // vueDictionaryDTOs.Add(vueDictionaryDTO);
+ // if (!_cacheService.Exists(item) && vueDictionaryDTO.SaveCache)
+ // {
+ // _cacheService.Add(item, vueDictionaryDTO.Serialize());
+ // }
+ // }
+ // }
+ // }
+ // }
+ //}
+ //catch
+ //{
- }
+ //}
return Json(vueDictionaryDTOs);
}
private VueDictionaryDTO GetVueDictionary(string key)
@@ -486,7 +486,127 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
-
+
+ case "OrderStateEmun":
+ {
+ List<object> data = new List<object>();
+
+ #region OrderStateEmun
+ {
+ Type type = typeof(OrderStateEmun);
+ List<int> enums = Enum.GetValues(typeof(OrderStateEmun)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(OrderStateEmun).GetField(((OrderStateEmun)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;
+
+ case "OrderTypeEmun":
+ {
+ List<object> data = new List<object>();
+
+ #region OrderTypeEmun
+ {
+ Type type = typeof(OrderTypeEmun);
+ List<int> enums = Enum.GetValues(typeof(OrderTypeEmun)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(OrderTypeEmun).GetField(((OrderTypeEmun)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;
+
+ case "OrderCreateTypeEmun":
+ {
+ List<object> data = new List<object>();
+
+ #region OrderCreateTypeEmun
+ {
+ Type type = typeof(OrderCreateTypeEmun);
+ List<int> enums = Enum.GetValues(typeof(OrderCreateTypeEmun)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(OrderCreateTypeEmun).GetField(((OrderCreateTypeEmun)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;
+
+ case "InventoryStatus":
+ {
+ List<object> data = new List<object>();
+
+ #region InventoryStatus
+ {
+ Type type = typeof(InventoryStatus);
+ List<int> enums = Enum.GetValues(typeof(InventoryStatus)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(InventoryStatus).GetField(((InventoryStatus)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;
+
}
return result;
}
--
Gitblit v1.9.3