MeiRuiAn/HuaiAn.git

			@@ -10,6 +10,7 @@
			using System.Threading.Tasks;
			using WIDESEA_Common.CommonEnum;
			using WIDESEA_Common.LocationEnum;
			using WIDESEA_Common.MaterielEnum;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Common.StockEnum;
			using WIDESEA_Common.TaskEnum;
			@@ -34,14 +35,16 @@
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly ICacheService _cacheService;
			private readonly IBasicRepository _basicRepository;
			private readonly ISupplierInfoRepository _supplierInfoRepository;
			private readonly ISys_RoleDataPermissionRepository _roleDataPermissionRepository;

			public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, IBasicRepository basicRepository, ISys_RoleDataPermissionRepository roleDataPermissionRepository) : base(BaseDal)
			public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, IBasicRepository basicRepository, ISys_RoleDataPermissionRepository roleDataPermissionRepository, ISupplierInfoRepository supplierInfoRepository) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_cacheService = cacheService;
			_basicRepository = basicRepository;
			_roleDataPermissionRepository = roleDataPermissionRepository;
			_supplierInfoRepository = supplierInfoRepository;
			}

			public ISys_DictionaryRepository Repository => BaseDal;
			@@ -174,6 +177,136 @@
			{
			switch (key)
			{
			case "warehouses":
			{
			List<object> data = new List<object>();

			{
			List<Dt_Warehouse> warehouses = _basicRepository.WarehouseRepository.QueryData();
			int index = 0;
			foreach (var item in warehouses)
			{
			data.Add(new { key = item.WarehouseId, value = item.WarehouseName });
			index++;
			}
			}

			result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
			}
			break;
			case "suppliers":
			{
			List<object> data = new List<object>();

			{
			List<Dt_SupplierInfo> supplierInfos = _supplierInfoRepository.QueryData();
			int index = 0;
			foreach (var item in supplierInfos)
			{
			data.Add(new { key = item.SupplierCode, value = item.SupplierCode });
			index++;
			}
			}

			result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
			}
			break;
			case "materials":
			{
			{
			List<object> data = new List<object>();

			{
			List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData();
			int index = 0;
			foreach (var item in materielInfos)
			{
			data.Add(new { key = item.MaterielCode, value = item.MaterielCode });
			index++;
			}
			}

			result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
			}
			}
			break;
			case "returnStatus":
			{
			List<object> data = new List<object>();
			Type type = typeof(ReturnOrderStatusEnum);
			List<int> enums = Enum.GetValues(typeof(ReturnOrderStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(ReturnOrderStatusEnum).GetField(((ReturnOrderStatusEnum)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 "returnType":
			{
			List<object> data = new List<object>();
			Type type = typeof(ReturnOrderTypeEnum);
			List<int> enums = Enum.GetValues(typeof(ReturnOrderTypeEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(ReturnOrderTypeEnum).GetField(((ReturnOrderTypeEnum)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 "taskType":
			{
			List<object> data = new List<object>();

			#region TaskTypeEnum
			{
			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++;
			}
			}
			#endregion

			result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
			}
			break;
			case "inboundState":
			{
			List<object> data = new List<object>();
			@@ -207,6 +340,31 @@
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(OutOrderStatusEnum).GetField(((OutOrderStatusEnum)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 "outLockStockStatusEnum":
			{
			List<object> data = new List<object>();
			Type type = typeof(OutLockStockStatusEnum);
			List<int> enums = Enum.GetValues(typeof(OutLockStockStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(OutLockStockStatusEnum).GetField(((OutLockStockStatusEnum)item).ToString());
			DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
			if (description != null)
			{
			@@ -470,12 +628,12 @@
			List<object> data = new List<object>();

			{
			Type type = typeof(TaskInStatusEnum);
			List<int> enums = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().ToList();
			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(TaskInStatusEnum).GetField(((TaskInStatusEnum)item).ToString());
			FieldInfo? fieldInfo = typeof(TaskStatusEnum).GetField(((TaskStatusEnum)item).ToString());
			DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
			if (description != null)
			{
			@@ -489,25 +647,25 @@
			}
			}

			{
			Type type = typeof(TaskOutStatusEnum);
			List<int> enums = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)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(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;
			@@ -675,6 +833,409 @@
			result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
			}
			break;
			case "receiveStatus":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(ReceiveOrderStatusEnum);
			List<int> enums = Enum.GetValues(typeof(ReceiveOrderStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(ReceiveOrderStatusEnum).GetField(((ReceiveOrderStatusEnum)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 "purchaseType":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(PurchaseOrderTypeEnum);
			List<string> enums = Enum.GetValues(typeof(PurchaseOrderTypeEnum)).Cast<string>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			//FieldInfo? fieldInfo = typeof(PurchaseOrderTypeEnum).GetField(((PurchaseOrderTypeEnum)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 "purchaseOrderStatus":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(PurchaseOrderStatusEnum);
			List<int> enums = Enum.GetValues(typeof(PurchaseOrderStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(PurchaseOrderStatusEnum).GetField(((PurchaseOrderStatusEnum)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 "printStatus":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(PrintStatusEnum);
			List<int> enums = Enum.GetValues(typeof(PrintStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(PrintStatusEnum).GetField(((PrintStatusEnum)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 "checkOrderStatusEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(CheckOrderStatusEnum);
			List<int> enums = Enum.GetValues(typeof(CheckOrderStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(CheckOrderStatusEnum).GetField(((CheckOrderStatusEnum)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 "checkAcceptEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(CheckAcceptEnum);
			List<string> enumNames = Enum.GetNames(typeof(CheckAcceptEnum)).ToList();
			int index = 0;
			foreach (var item in enumNames)
			{
			FieldInfo? fieldInfo = typeof(CheckAcceptEnum).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 "checkUploadEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(CheckUploadEnum);
			List<int> enums = Enum.GetValues(typeof(CheckUploadEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(CheckUploadEnum).GetField(((CheckUploadEnum)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 "proStockAttributeEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(ProStockAttributeEnum);
			List<int> enums = Enum.GetValues(typeof(ProStockAttributeEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(ProStockAttributeEnum).GetField(((ProStockAttributeEnum)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 "materielSourceTypeEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(MaterielSourceTypeEnum);
			List<int> enums = Enum.GetValues(typeof(MaterielSourceTypeEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(MaterielSourceTypeEnum).GetField(((MaterielSourceTypeEnum)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 "materielTypeEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(MaterielTypeEnum);
			List<int> enums = Enum.GetValues(typeof(MaterielTypeEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(MaterielTypeEnum).GetField(((MaterielTypeEnum)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 "customerOutRuleEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(CustomerOutRuleEnum);
			List<int> enums = Enum.GetValues(typeof(CustomerOutRuleEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(CustomerOutRuleEnum).GetField(((CustomerOutRuleEnum)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 "proScrapStatusEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(ProScrapSheetStatusEnum);
			List<int> enums = Enum.GetValues(typeof(ProScrapSheetStatusEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(ProScrapSheetStatusEnum).GetField(((ProScrapSheetStatusEnum)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 "checkTypeEnum":
			{
			List<object> data = new List<object>();

			{
			Type type = typeof(CheckTypeEnum);
			List<int> enums = Enum.GetValues(typeof(CheckTypeEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(CheckTypeEnum).GetField(((CheckTypeEnum)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 "inspectAcceptEnum":
			{
			List<object> data = new List<object>();
			{
			Type type = typeof(InspectAcceptEnum);
			List<int> enums = Enum.GetValues(typeof(InspectAcceptEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(InspectAcceptEnum).GetField(((InspectAcceptEnum)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 "inspectResultEnum":
			{
			List<object> data = new List<object>();
			{
			Type type = typeof(InspectResultEnum);
			List<int> enums = Enum.GetValues(typeof(InspectResultEnum)).Cast<int>().ToList();
			int index = 0;
			foreach (var item in enums)
			{
			FieldInfo? fieldInfo = typeof(InspectResultEnum).GetField(((InspectResultEnum)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;
			}