HuaYiZhongHeng/ZhongHeLiTiKu.git

			@@ -25,11 +25,13 @@
			{
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly ICacheService _cacheService;
			private readonly ISys_RoleService _sys_RoleService;

			public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService) : base(BaseDal)
			public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_RoleService sys_RoleService) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_cacheService = cacheService;
			_sys_RoleService = sys_RoleService;
			}

			public ISys_DictionaryRepository Repository => BaseDal;
			@@ -54,6 +56,29 @@
			List<VueDictionaryDTO> vueDictionaryDTOs = new List<VueDictionaryDTO>();

			List<string> cacheDicNos = new List<string>();
			#region 鏌ヨ鏁版嵁搴撲笅鎷夋鏁版嵁
			if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
			{
			var selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x)), _sys_RoleService.GetAllChildren(App.User.RoleId));

			foreach (var item in selectDics)
			{
			if (!_cacheService.Exists(item.DicNo))
			{
			vueDictionaryDTOs.Add(item);
			}
			else
			{
			VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(_cacheService.Get(item.DicNo));
			if (vueDictionary != null && vueDictionary.Data.ToJson() != item.Data.ToJson())
			{
			vueDictionaryDTOs.Add(item);
			_cacheService.AddOrUpdate(item.DicNo, item.Serialize());
			}
			}
			}
			}
			#endregion
			foreach (string n in dicNos)
			{
			string str = _cacheService.Get(n);
			@@ -61,52 +86,18 @@
			{
			VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str);

			if (vueDictionary != null)
			if (vueDictionary != null && vueDictionaryDTOs.Where(x => x.DicNo == vueDictionary.DicNo).FirstOrDefault() == null)
			{
			vueDictionaryDTOs.Add(vueDictionary);
			cacheDicNos.Add(n);
			}
			}
			}
			if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
			{
			List<VueDictionaryDTO> selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x))).Select(s => new VueDictionaryDTO
			{
			DicNo = s.DicNo,
			Config = s.Config,
			//dbSql = s.Sql,
			Data = s.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName })
			}).ToList();

			foreach (var item in selectDics)
			{
			if (!_cacheService.Exists(item.DicNo))
			{
			_cacheService.Add(item.DicNo, item.Serialize());
			}
			}
			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();
			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))
			@@ -115,10 +106,10 @@

			List<string> dics = str.Split(",").ToList();

			foreach (var item in dics)
			foreach (var item in dicList)
			{
			dicList.Remove(item);
			cusDics.Add(item);
			if (dics.Contains(item))
			cusDics.Add(item);
			}

			foreach (var item in cusDics)
			@@ -486,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;
			@@ -532,6 +543,54 @@
			result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
			}
			break;
			case "stockChangeType":
			{
			List<object> data = new List<object>();
			Type type = typeof(StockChangeType);
			List<int> enums = Enum.GetValues(typeof(StockChangeType)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(StockChangeType).GetField(((StockChangeType)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 "outStockStatus":
			{
			List<object> data = new List<object>();
			Type type = typeof(OutStockStatus);
			List<int> enums = Enum.GetValues(typeof(OutStockStatus)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(OutStockStatus).GetField(((OutStockStatus)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;
			}
			return result;
			}