feat: 更新业务、控件及单据功能

This commit is contained in:
cyf
2026-08-10 09:59:46 +08:00
parent c07220bbf0
commit 000a69ce15
29 changed files with 919 additions and 359 deletions
+27 -20
View File
@@ -37,7 +37,7 @@ namespace Lskj.PubModule
InitializeComponent();
}
/// <summary>
/// <para>说明:窗体加载时</para>
@@ -66,7 +66,7 @@ namespace Lskj.PubModule
LogHelper.Instance.WriteError(ex, ResourceKeys.BaseModule);
//MessageUtil.Show(ex.Message + "\r\n" + ex.StackTrace);
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
finally
{
@@ -98,23 +98,30 @@ namespace Lskj.PubModule
ModuleModel sysModel = new ModuleModel(systemDllRowTask.Result);
return sysModel;//系统模块实体对象
}));
//Task<List<GridDetailModel>> detailTask = cachesDic.AddTask(this, "Details", new Task<List<GridDetailModel>>(() =>
//{
// DataTable detailPages = BaseModuleImpl.GetBaseDetailPages(Model.ModuleCode);//根据传入的模块编号获得基础档案底部标签的数据
// List<GridDetailModel> details = new List<GridDetailModel>();//表格明细对象的集合
// foreach (DataRow item in detailPages.Rows)
// {
// GridDetailModel gridDetailModel = new GridDetailModel(item, null, GridCustomColumnStruct.BaseDetailGridView);
// details.Add(gridDetailModel);
// Task<DataTable> addGridColumnsTask = cachesDic.AddTask(gridDetailModel, "GridColumns", new Task<DataTable>(() =>
// {
// DataTable gridColumns = ReportImpl.GetReportDetailColumns(Model.ModuleCode, item["id"] + "");//获取报表明细列
// gridDetailModel.GridColumns = gridColumns;
// return gridColumns;
// }));
// }
// return details;
//}));
Task<List<GridDetailModel>> detailTask = cachesDic.AddTask(this, "Details", new Task<List<GridDetailModel>>(() =>
{
DataTable detailPages = BaseModuleImpl.GetBaseDetailPages(Model.ModuleCode);//根据传入的模块编号获得基础档案底部标签的数据
List<GridDetailModel> details = new List<GridDetailModel>();//表格明细对象的集合
foreach (DataRow item in detailPages.Rows)
{
GridDetailModel gridDetailModel = new GridDetailModel(item, null, GridCustomColumnStruct.BaseDetailGridView);
details.Add(gridDetailModel);
Task<DataTable> addGridColumnsTask = cachesDic.AddTask(gridDetailModel, "GridColumns", new Task<DataTable>(() =>
{
DataTable gridColumns = ReportImpl.GetReportDetailColumns(Model.ModuleCode, item["id"] + "");//获取报表明细列
gridDetailModel.GridColumns = gridColumns;
return gridColumns;
}));
}
return details;
return new List<GridDetailModel>();
}));
Task<int> formTypeTask = cachesDic.AddTask(this, "FormType", new Task<int>(() =>
{
return BaseImpl.GetBaseType(Model.ModuleCode);
@@ -149,7 +156,7 @@ namespace Lskj.PubModule
if (SystemInfo.Instance.EfficientVerification)
{
bool SaveResults = this.mControl.ModuleGridDetailObj.VerificationInterface();
if (!SaveResults)
if (!SaveResults)
{
DialogResult result = MessageUtil.Show(("数据未保存,是否确定关闭?"), MessageBoxButtons.YesNo);
if (result == DialogResult.Yes)
@@ -163,9 +170,9 @@ namespace Lskj.PubModule
e.Cancel = true;
}
}
}
}
#region
@@ -213,7 +220,7 @@ namespace Lskj.PubModule
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
MessageUtil.Show(Message, ex.Message);
}
}