优化导出颗粒列表，更改区间范围，统计数量重新计算

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/ParticleAnalysis.cs

@@ -158,16 +158,19 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 
                 DataRow row = Dt.NewRow();
                 row["Name"] = "";
-                row["total"] = CalculationTableColumn(DBData[i], "con");
+                //row["total"] = CalculationTableColumn(DBData[i], "con");
 				row["TypeId"] = "";
                 row["Class"] = ClassName[i];
                 int ie = 0;
+				int in_ct = 0;
                 for (int a = 4; a < Dt.Columns.Count; a++)
                 {
                     row[a] = CalculationTableColumn(DBData[i], DtName.Rows[0][ie].ToString());
-                    ie++;
+					in_ct = in_ct + Convert.ToInt32(CalculationTableColumn(DBData[i], DtName.Rows[0][ie].ToString()));
+					ie++;
 				}
-                Dt.Rows.Add(row);
+				row["total"] = in_ct;
+				Dt.Rows.Add(row);
 
 				for (int a = 0; a < DBData[i].Rows.Count; a++)
                 {
@@ -181,20 +184,28 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 
 					DataRow row1= Dt.NewRow();
                     row1["Name"] = DBData[i].Rows[a]["TypeName"];
-                    row1["total"] = DBData[i].Rows[a]["con"];
+                    //row1["total"] = DBData[i].Rows[a]["con"];
 					row1["TypeId"] = DBData[i].Rows[a]["TypeId"];
 					//row1["Class"] = DBData[i].Rows[a]["Class"];
 					row1["Class"] = "";
 
 
 					int ii = 4;
-                    for (int j = 7; j < DBData[i].Columns.Count; j++)
+
+					int in_count = 0;
+
+					for (int j = 7; j < DBData[i].Columns.Count; j++)
                     {
 						row1[ii]= DBData[i].Rows[a][j];
 						dataRow1[ii] = DBData[i].Rows[a][j];
+
+						in_count = in_count + Convert.ToInt32(DBData[i].Rows[a][j]);
 						ii++;
 					}
-                    Dt.Rows.Add(row1);
+
+					row1["total"] = in_count;
+
+					Dt.Rows.Add(row1);
                     statisticalQuantity.Rows.Add(dataRow1);
 				}
             }

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -282,8 +282,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[2], GetlanguageData("dev_quantity",  "数量"));//数量
 
 
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable",  "颗粒尺寸分析结果"));//颗粒尺寸分析结果
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2",  "尺寸计算基于"));//尺寸计算基于:
+            //setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable",  "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+			setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], "颗粒尺寸分析结果");//颗粒尺寸分析结果
+			setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2",  "尺寸计算基于"));//尺寸计算基于:
 
             //dev_classify.Text = "分类";
             xrTa_ParticleSizeTable.Rows[2].Cells[0].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[0].Font.Size);
@@ -833,8 +834,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", "分类"));//二级分类（子分类）
             setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[1], GetlanguageData("dev_quantity", "数量"));//数量
 
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable",  "颗粒尺寸分析结果"));//颗粒尺寸分析结果
-            setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2",  "尺寸计算基于:"));//尺寸计算基于:
+            //setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable",  "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+			setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], "颗粒尺寸分析结果");//颗粒尺寸分析结果
+			setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2",  "尺寸计算基于:"));//尺寸计算基于:
 
            //dev_subdivision.Text = "子分类";
             xrTa_ParticleSizeTable.Rows[2].Cells[0].Font = new Font(Schriftart_chinese, xrTa_ParticleSizeTable.Rows[2].Cells[0].Font.Size);
@@ -1156,7 +1158,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 			setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[0], GetlanguageData("dev_classify", "分类"));//二级分类（子分类）
 			setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[1], GetlanguageData("dev_quantity", "数量"));//数量
 
-			setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable", "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+			//setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable", "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+			setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], "颗粒尺寸分析结果");//颗粒尺寸分析结果
 			setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2", "尺寸计算基于:"));//尺寸计算基于:
 
 			//dev_subdivision.Text = "子分类";
@@ -1339,7 +1342,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 			setXRLabelData(xrTa_ParticleSizeTable.Rows[2].Cells[2], GetlanguageData("dev_quantity", "数量"));//数量
 
 
-			setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable", "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+			//setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], GetlanguageData("dev_dimensiontable", "颗粒尺寸分析结果"));//颗粒尺寸分析结果
+			setXRLabelData(xrTa_ParticleSizeTable.Rows[0].Cells[0], "颗粒尺寸分析结果");//颗粒尺寸分析结果
 			setXRLabelData(xrTa_ParticleSizeTable.Rows[1].Cells[0], GetlanguageData("dev_dimensiontable_2", "尺寸计算基于"));//尺寸计算基于:
 
 			//dev_classify.Text = "分类";