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

SVN r385

Browse Source 
SVN-Revision: r385
This commit is contained in:
cyf
2025-03-25 06:34:44 +00:00
parent 27919c40f5
commit c3d755e5bb
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+11 -7
View File
@@ -2878,6 +2878,7 @@ namespace Lskj.PubBill
AddDataColumns();
}
UpdateDynamicColumns(dateTime);
OnGcMainDataSourceChanged(gcMain.GridView, null);//手动刷新日期合计数据源
}
}
/// <summary>
@@ -5059,13 +5060,16 @@ namespace Lskj.PubBill
string billNo = this.lblOrderNo.Text;
this.gcMain.GridView.DataSourceChanged -= OnGcMainDataSourceChanged;
DataTable dataTable = gcMain.GridControl.DataSource as DataTable;
//DataTable dataMain = dataTable.Copy();
string sqlValue = "select * from RD_worktimetab where 1 = 1";
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;
if (dataTable != null)
{
//DataTable dataMain = dataTable.Copy();
string sqlValue = "select * from RD_worktimetab where 1 = 1";
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.GridView.DataSourceChanged += OnGcMainDataSourceChanged;
}
}