From 92b129a783ff748a4e5365803aa862888fa4470e Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 16 一月 2024 14:27:10 +0800
Subject: [PATCH] WMS
---
代码管理/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs"
index 2c01d13..0fe5aeb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_System/Services/System/Partial/Sys_DictionaryService.cs"
@@ -31,17 +31,18 @@
get { return DictionaryManager.Dictionaries; }
}
- public object GetVueDictionary(string[] dicNos)
+ public async Task<object> GetVueDictionary(string[] dicNos)
{
if (dicNos == null || dicNos.Count() == 0) return new string[] { };
- var dicConfig = DictionaryManager.GetDictionaries(dicNos, false).Select(s => new
- {
- dicNo = s.DicNo,
- config = s.Config,
- dbSql = s.DbSql,
- list = s.Sys_DictionaryList.OrderByDescending(o => o.OrderNo)
- .Select(list => new { key = list.DicValue, value = list.DicName })
- }).ToList();
+ var dicConfig = await Task.FromResult(
+ DictionaryManager.GetDictionaries(dicNos, false).Select(s => new
+ {
+ dicNo = s.DicNo,
+ config = s.Config,
+ dbSql = s.DbSql,
+ list = s.Sys_DictionaryList.OrderByDescending(o => o.OrderNo)
+ .Select(list => new { key = list.DicValue, value = list.DicName })
+ }).ToList());
object GetSourceData(string dicNo, string dbSql, object data)
{
@@ -61,6 +62,36 @@
}).ToList();
}
+ //public object GetVueDictionary(string[] dicNos)
+ //{
+ // if (dicNos == null || dicNos.Count() == 0) return new string[] { };
+ // var dicConfig = DictionaryManager.GetDictionaries(dicNos, false).Select(s => new
+ // {
+ // dicNo = s.DicNo,
+ // config = s.Config,
+ // dbSql = s.DbSql,
+ // list = s.Sys_DictionaryList.OrderByDescending(o => o.OrderNo)
+ // .Select(list => new { key = list.DicValue, value = list.DicName })
+ // }).ToList();
+
+ // object GetSourceData(string dicNo, string dbSql, object data)
+ // {
+ // // 2020.05.01澧炲姞鏍规嵁鐢ㄦ埛淇℃伅鍔犺浇瀛楀吀鏁版嵁婧恠ql
+ // dbSql = DictionaryHandler.GetCustomDBSql(dicNo, dbSql);
+ // if (string.IsNullOrEmpty(dbSql))
+ // {
+ // return data as object;
+ // }
+ // return repository.DapperContext.QueryList<object>(dbSql, null);
+ // }
+ // return dicConfig.Select(item => new
+ // {
+ // item.dicNo,
+ // item.config,
+ // data = GetSourceData(item.dicNo, item.dbSql, item.list)
+ // }).ToList();
+ //}
+
/// <summary>
/// 閫氳繃杩滅▼鎼滅储
--
Gitblit v1.9.3