cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r615

Browse Source 
SVN-Revision: r615
This commit is contained in:
wyf
2025-05-21 09:52:29 +00:00
parent 87e2638111
commit 4eea773241
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+6 -5
View File
@@ -466,6 +466,7 @@ namespace Lskj.PubBill
})); }));
Task<Hashtable> sourcesTask = cachesDic.AddTask(this, "Sources", new Task<Hashtable>(() => Task<Hashtable> sourcesTask = cachesDic.AddTask(this, "Sources", new Task<Hashtable>(() =>
{ {
DataRow menuConfigRow = menuConfigTabTask.Result;
return BillImpl.GetSources(dynamicModel.ModuleCode, billModel.BillSourceIds);//获取单据来源 return BillImpl.GetSources(dynamicModel.ModuleCode, billModel.BillSourceIds);//获取单据来源
})); }));
cachesDic.AddTask(tb_buttom, "DynamicModel", dynamicModelTask); cachesDic.AddTask(tb_buttom, "DynamicModel", dynamicModelTask);
@@ -1114,7 +1115,7 @@ namespace Lskj.PubBill
{ {
this.gcMain.GridView.RowCellClick += OngcMainRowCellClick; this.gcMain.GridView.RowCellClick += OngcMainRowCellClick;
} }
this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged; this.gcMain.GridControl.DataSourceChanged += OnGcMainDataSourceChanged;
} }
@@ -5317,7 +5318,7 @@ namespace Lskj.PubBill
if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime) if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime)
{ {
string billNo = this.lblOrderNo.Text; string billNo = this.lblOrderNo.Text;
this.gcMain.GridView.DataSourceChanged -= OnGcMainDataSourceChanged; this.gcMain.GridControl.DataSourceChanged -= OnGcMainDataSourceChanged;
DataTable dataTable = gcMain.GridControl.DataSource as DataTable; DataTable dataTable = gcMain.GridControl.DataSource as DataTable;
if (dataTable != null) if (dataTable != null)
{ {
@@ -5326,10 +5327,10 @@ namespace Lskj.PubBill
sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime); MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime);
gcMain.GridControl.DataSource = null; this.gcMain.GridControl.DataSource = null;
gcMain.GridControl.DataSource = dataTable; this.gcMain.GridControl.DataSource = dataTable;
} }
this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged; this.gcMain.GridControl.DataSourceChanged += OnGcMainDataSourceChanged;
} }
} }