From 5200b8b5a92b707ae7f115c7fd07cb7afc109980 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期四, 03 七月 2025 15:44:03 +0800 Subject: [PATCH] 更新配置和扩展功能,优化代码结构 修改 `http.js` 中的 `axios.defaults.baseURL` 配置,调整开发环境 URL。 - 在 `Dt_BillGroupStock_Hty.jsx` 和 `Dt_OutTime.jsx` 中添加作者信息和文档链接,增强组件扩展功能。 - 新增 `tables.js` 中的路由配置,包含 `Dt_BillGroupStock_Hty` 的路径。 - 在 `Dt_BillGroupStock_Hty.vue` 和 `Dt_OutTime.vue` 中定义表格列、编辑和搜索表单字段。 - 新增 `IStockInfoHtyRepository.cs` 和 `IStockInfoHtyService.cs` 接口定义。 - 在 `StockInfoHtyRepository.cs` 和 `StockInfoHtyService.cs` 中实现分页查询和批量删除功能。 - 更新 `appsettings.json` 中的数据库连接字符串,修改数据库名称。 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs | 66 ++++++++------------------------ 1 files changed, 17 insertions(+), 49 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs index ee6f4d9..e28b372 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_DictionaryService.cs @@ -35,62 +35,30 @@ public List<VueDictionaryDTO> GetVueDictionary(string[] dicNos) { if (dicNos == null || dicNos.Count() == 0) return new List<VueDictionaryDTO>(); - List<VueDictionaryDTO> vueDictionaryDTOs = new List<VueDictionaryDTO>(); - List<string> cacheDicNos = new List<string>(); - foreach (string n in dicNos) + var dicConfig = BaseDal.GetDictionaries(dicNos, false).Select(s => new { - string str = _cacheService.Get(n); - if (!string.IsNullOrEmpty(str)) - { - VueDictionaryDTO? vueDictionary = JsonConvert.DeserializeObject<VueDictionaryDTO>(str); + dicNo = s.DicNo, + config = s.Config, + dbSql = s.DBSql, + list = s.DicList.OrderByDescending(o => o.OrderNo).Select(list => new { key = list.DicValue, value = list.DicName }) + }).ToList(); - if (vueDictionary != null) - { - vueDictionaryDTOs.Add(vueDictionary); - cacheDicNos.Add(n); - } - } - } - if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0) + object GetSourceData(string dicNo, string dbSql, object data) { - List<VueDictionaryDTO> selectDics = BaseDal.GetDictionaries(dicNos.Where(x => !cacheDicNos.Contains(x))).Select(s => new VueDictionaryDTO + if (string.IsNullOrEmpty(dbSql)) { - 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()); - } + return data; } - vueDictionaryDTOs.AddRange(selectDics); + return BaseDal.QueryObjectDataBySql(dbSql, null); } - - //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(); - - - return vueDictionaryDTOs; + var x = dicConfig.Select(item => new VueDictionaryDTO + { + DicNo = item.dicNo, + Config = item.config, + Data = GetSourceData(item.dicNo, item.dbSql, item.list) + }).ToList(); + return x; } - - } } -- Gitblit v1.9.3