SVN r615
SVN-Revision: r615
This commit is contained in:
@@ -466,6 +466,7 @@ namespace Lskj.PubBill
|
||||
}));
|
||||
Task<Hashtable> sourcesTask = cachesDic.AddTask(this, "Sources", new Task<Hashtable>(() =>
|
||||
{
|
||||
DataRow menuConfigRow = menuConfigTabTask.Result;
|
||||
return BillImpl.GetSources(dynamicModel.ModuleCode, billModel.BillSourceIds);//获取单据来源
|
||||
}));
|
||||
cachesDic.AddTask(tb_buttom, "DynamicModel", dynamicModelTask);
|
||||
@@ -1114,7 +1115,7 @@ namespace Lskj.PubBill
|
||||
{
|
||||
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)
|
||||
{
|
||||
string billNo = this.lblOrderNo.Text;
|
||||
this.gcMain.GridView.DataSourceChanged -= OnGcMainDataSourceChanged;
|
||||
this.gcMain.GridControl.DataSourceChanged -= OnGcMainDataSourceChanged;
|
||||
DataTable dataTable = gcMain.GridControl.DataSource as DataTable;
|
||||
if (dataTable != null)
|
||||
{
|
||||
@@ -5326,10 +5327,10 @@ namespace Lskj.PubBill
|
||||
sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
|
||||
DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
|
||||
MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime);
|
||||
gcMain.GridControl.DataSource = null;
|
||||
gcMain.GridControl.DataSource = dataTable;
|
||||
this.gcMain.GridControl.DataSource = null;
|
||||
this.gcMain.GridControl.DataSource = dataTable;
|
||||
}
|
||||
this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged;
|
||||
this.gcMain.GridControl.DataSourceChanged += OnGcMainDataSourceChanged;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user