From fdf7bb595ee00e5fef7b4e110fbe32f637c069f6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 18 八月 2025 08:38:46 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WMSServices/WIDESEA_SystemService/Sys_DictionaryService.cs | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 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 114d968..87935d4 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"
@@ -35,16 +35,14 @@
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, ISupplierInfoRepository supplierInfoRepository) : base(BaseDal)
+ public Sys_DictionaryService(ISys_DictionaryRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, IBasicRepository basicRepository, ISys_RoleDataPermissionRepository roleDataPermissionRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_cacheService = cacheService;
_basicRepository = basicRepository;
_roleDataPermissionRepository = roleDataPermissionRepository;
- _supplierInfoRepository = supplierInfoRepository;
}
public ISys_DictionaryRepository Repository => BaseDal;
@@ -187,23 +185,6 @@
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++;
}
}
@@ -1103,17 +1084,43 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
- case "customerOutRuleEnum":
+ case "agvStationAreaEnum":
{
List<object> data = new List<object>();
{
- Type type = typeof(CustomerOutRuleEnum);
- List<int> enums = Enum.GetValues(typeof(CustomerOutRuleEnum)).Cast<int>().ToList();
+ Type type = typeof(AGVStationAreaEnum);
+ List<int> enums = Enum.GetValues(typeof(AGVStationAreaEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(CustomerOutRuleEnum).GetField(((CustomerOutRuleEnum)item).ToString());
+ FieldInfo? fieldInfo = typeof(AGVStationAreaEnum).GetField(((AGVStationAreaEnum)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 "materielInvOrgEnum":
+ {
+ List<object> data = new List<object>();
+ {
+ Type type = typeof(MaterielInvOrgEnum);
+ List<int> enums = Enum.GetValues(typeof(MaterielInvOrgEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(MaterielInvOrgEnum).GetField(((MaterielInvOrgEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
--
Gitblit v1.9.3