|
@@ -11,10 +11,22 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
|
|
|
{
|
|
|
public DataTable ParticleSizeStatistician(BasicData basicData,string strName)
|
|
|
{
|
|
|
- //DataTable data = basicData.GetDBData();
|
|
|
- DataTable data = new DataTable();
|
|
|
- //获取粒级表
|
|
|
- List<string> colid = basicData.GetParticlesizeTable();
|
|
|
+ List<DataTable> datalist = basicData.GetDBData();
|
|
|
+ if (datalist.Count == 0)
|
|
|
+ {
|
|
|
+ return new DataTable();
|
|
|
+ }
|
|
|
+
|
|
|
+ DataTable data = datalist[0].Clone();
|
|
|
+ for (int i = 0; i < datalist.Count; i++)
|
|
|
+ {
|
|
|
+ for (int a = 0; a < datalist[i].Rows.Count; a++)
|
|
|
+ {
|
|
|
+ data.Rows.Add(datalist[i].Rows[a].ItemArray);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //获取粒级表
|
|
|
+ List<string> colid = basicData.GetParticlesizeTable();
|
|
|
DataTable ls_partsize_dt = new DataTable();
|
|
|
ls_partsize_dt.TableName = "PartSize";
|
|
|
ls_partsize_dt.Columns.Add("c1");
|