颗粒尺寸表每个组数量进行统计显示

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

@@ -277,21 +277,11 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 					}
 					Measurements.Add(table);
 				}
-
-				
-
 				return;
 
 
 			}
 
-
-
-				//         if (m_otsreport_export.m_ReportApp.m_RptConfigFile.Systype == OTS_SysType_ID.IncA)
-				//         {
-				//	BData = m_bt_DBData.Copy();
-				//	return;
-				//}
 				#region 判断是否使用指定选择组和规则
 				bool bl1 = false;
 			for (int i = 0; i < m_otsreport_export.m_mbszclass.RuleGroup.Rows.Count; i++)

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

@@ -158,8 +158,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 
                 DataRow row = Dt.NewRow();
                 row["Name"] = "";
-                row["total"] = 0;
-                row["TypeId"] = "";
+                row["total"] = CalculationTableColumn(DBData[i], "con");
+				row["TypeId"] = "";
                 row["Class"] = ClassName[i];
                 int ie = 0;
                 for (int a = 4; a < Dt.Columns.Count; a++)

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.Designer.cs

@@ -28,209 +28,209 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OTSReport_Export));
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.btn_exit = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.tb_lj = new System.Windows.Forms.TextBox();
-            this.tb_mblj = new System.Windows.Forms.TextBox();
-            this.btn_openfilepath = new System.Windows.Forms.Button();
-            this.btn_TempDes = new System.Windows.Forms.Button();
-            this.label4 = new System.Windows.Forms.Label();
-            this.cbo_sjy = new System.Windows.Forms.ComboBox();
-            this.panel_container = new System.Windows.Forms.Panel();
-            this.btn_preview = new System.Windows.Forms.Button();
-            this.button7 = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Location = new System.Drawing.Point(13, 53);
-            this.richTextBox1.Margin = new System.Windows.Forms.Padding(2);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(455, 231);
-            this.richTextBox1.TabIndex = 60;
-            this.richTextBox1.Text = "";
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Location = new System.Drawing.Point(93, 293);
-            this.progressBar1.Margin = new System.Windows.Forms.Padding(2);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(374, 15);
-            this.progressBar1.TabIndex = 70;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(5, 293);
-            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(77, 12);
-            this.label2.TabIndex = 1004;
-            this.label2.Text = "当前导出进度";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(11, 9);
-            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(53, 12);
-            this.label3.TabIndex = 1001;
-            this.label3.Text = "选择模板";
-            // 
-            // btn_exit
-            // 
-            this.btn_exit.Location = new System.Drawing.Point(389, 319);
-            this.btn_exit.Margin = new System.Windows.Forms.Padding(2);
-            this.btn_exit.Name = "btn_exit";
-            this.btn_exit.Size = new System.Drawing.Size(73, 27);
-            this.btn_exit.TabIndex = 90;
-            this.btn_exit.Text = "退  出";
-            this.btn_exit.UseVisualStyleBackColor = true;
-            this.btn_exit.Click += new System.EventHandler(this.button2_Click);
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(11, 33);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 12);
-            this.label1.TabIndex = 1002;
-            this.label1.Text = "保存路径";
-            this.label1.Visible = false;
-            // 
-            // tb_lj
-            // 
-            this.tb_lj.Location = new System.Drawing.Point(68, 30);
-            this.tb_lj.Margin = new System.Windows.Forms.Padding(2);
-            this.tb_lj.Name = "tb_lj";
-            this.tb_lj.ReadOnly = true;
-            this.tb_lj.Size = new System.Drawing.Size(285, 21);
-            this.tb_lj.TabIndex = 30;
-            this.tb_lj.Visible = false;
-            // 
-            // tb_mblj
-            // 
-            this.tb_mblj.Location = new System.Drawing.Point(68, 6);
-            this.tb_mblj.Margin = new System.Windows.Forms.Padding(2);
-            this.tb_mblj.Name = "tb_mblj";
-            this.tb_mblj.ReadOnly = true;
-            this.tb_mblj.Size = new System.Drawing.Size(285, 21);
-            this.tb_mblj.TabIndex = 0;
-            // 
-            // btn_openfilepath
-            // 
-            this.btn_openfilepath.Location = new System.Drawing.Point(356, 4);
-            this.btn_openfilepath.Margin = new System.Windows.Forms.Padding(2);
-            this.btn_openfilepath.Name = "btn_openfilepath";
-            this.btn_openfilepath.Size = new System.Drawing.Size(47, 20);
-            this.btn_openfilepath.TabIndex = 10;
-            this.btn_openfilepath.Text = "...";
-            this.btn_openfilepath.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btn_openfilepath.UseVisualStyleBackColor = true;
-            this.btn_openfilepath.Click += new System.EventHandler(this.btn_openfilepath_Click);
-            // 
-            // btn_TempDes
-            // 
-            this.btn_TempDes.Location = new System.Drawing.Point(407, 4);
-            this.btn_TempDes.Margin = new System.Windows.Forms.Padding(2);
-            this.btn_TempDes.Name = "btn_TempDes";
-            this.btn_TempDes.Size = new System.Drawing.Size(65, 20);
-            this.btn_TempDes.TabIndex = 20;
-            this.btn_TempDes.Text = "摸板设置";
-            this.btn_TempDes.UseVisualStyleBackColor = true;
-            this.btn_TempDes.Click += new System.EventHandler(this.btn_TempDes_Click);
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(11, 33);
-            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(53, 12);
-            this.label4.TabIndex = 1003;
-            this.label4.Text = "数 据 源";
-            // 
-            // cbo_sjy
-            // 
-            this.cbo_sjy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbo_sjy.FormattingEnabled = true;
-            this.cbo_sjy.Location = new System.Drawing.Point(68, 31);
-            this.cbo_sjy.Margin = new System.Windows.Forms.Padding(2);
-            this.cbo_sjy.Name = "cbo_sjy";
-            this.cbo_sjy.Size = new System.Drawing.Size(285, 20);
-            this.cbo_sjy.TabIndex = 50;
-            // 
-            // panel_container
-            // 
-            this.panel_container.Location = new System.Drawing.Point(66, 188);
-            this.panel_container.Margin = new System.Windows.Forms.Padding(2);
-            this.panel_container.Name = "panel_container";
-            this.panel_container.Size = new System.Drawing.Size(17, 21);
-            this.panel_container.TabIndex = 5;
-            // 
-            // btn_preview
-            // 
-            this.btn_preview.Location = new System.Drawing.Point(312, 319);
-            this.btn_preview.Margin = new System.Windows.Forms.Padding(2);
-            this.btn_preview.Name = "btn_preview";
-            this.btn_preview.Size = new System.Drawing.Size(73, 27);
-            this.btn_preview.TabIndex = 80;
-            this.btn_preview.Text = "打开报表";
-            this.btn_preview.UseVisualStyleBackColor = true;
-            this.btn_preview.Click += new System.EventHandler(this.btn_preview_Click);
-            // 
-            // button7
-            // 
-            this.button7.Location = new System.Drawing.Point(234, 319);
-            this.button7.Name = "button7";
-            this.button7.Size = new System.Drawing.Size(73, 27);
-            this.button7.TabIndex = 1008;
-            this.button7.Text = "国标导出";
-            this.button7.UseVisualStyleBackColor = true;
-            this.button7.Click += new System.EventHandler(this.button7_Click);
-            // 
-            // OTSReport_Export
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(473, 349);
-            this.ControlBox = false;
-            this.Controls.Add(this.button7);
-            this.Controls.Add(this.cbo_sjy);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.btn_TempDes);
-            this.Controls.Add(this.btn_openfilepath);
-            this.Controls.Add(this.tb_mblj);
-            this.Controls.Add(this.tb_lj);
-            this.Controls.Add(this.btn_exit);
-            this.Controls.Add(this.btn_preview);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.progressBar1);
-            this.Controls.Add(this.richTextBox1);
-            this.Controls.Add(this.panel_container);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(2);
-            this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(489, 388);
-            this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(489, 388);
-            this.Name = "OTSReport_Export";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "报告程序输出界面";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.OTSReport_Export_FormClosed);
-            this.Load += new System.EventHandler(this.OTSReport_Export_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OTSReport_Export));
+			this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+			this.progressBar1 = new System.Windows.Forms.ProgressBar();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.btn_exit = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.tb_lj = new System.Windows.Forms.TextBox();
+			this.tb_mblj = new System.Windows.Forms.TextBox();
+			this.btn_openfilepath = new System.Windows.Forms.Button();
+			this.btn_TempDes = new System.Windows.Forms.Button();
+			this.label4 = new System.Windows.Forms.Label();
+			this.cbo_sjy = new System.Windows.Forms.ComboBox();
+			this.panel_container = new System.Windows.Forms.Panel();
+			this.btn_preview = new System.Windows.Forms.Button();
+			this.button7 = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// richTextBox1
+			// 
+			this.richTextBox1.Location = new System.Drawing.Point(13, 53);
+			this.richTextBox1.Margin = new System.Windows.Forms.Padding(2);
+			this.richTextBox1.Name = "richTextBox1";
+			this.richTextBox1.Size = new System.Drawing.Size(455, 231);
+			this.richTextBox1.TabIndex = 60;
+			this.richTextBox1.Text = "";
+			// 
+			// progressBar1
+			// 
+			this.progressBar1.Location = new System.Drawing.Point(93, 293);
+			this.progressBar1.Margin = new System.Windows.Forms.Padding(2);
+			this.progressBar1.Name = "progressBar1";
+			this.progressBar1.Size = new System.Drawing.Size(374, 15);
+			this.progressBar1.TabIndex = 70;
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(5, 293);
+			this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(77, 12);
+			this.label2.TabIndex = 1004;
+			this.label2.Text = "当前导出进度";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(11, 9);
+			this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(53, 12);
+			this.label3.TabIndex = 1001;
+			this.label3.Text = "选择模板";
+			// 
+			// btn_exit
+			// 
+			this.btn_exit.Location = new System.Drawing.Point(389, 319);
+			this.btn_exit.Margin = new System.Windows.Forms.Padding(2);
+			this.btn_exit.Name = "btn_exit";
+			this.btn_exit.Size = new System.Drawing.Size(73, 27);
+			this.btn_exit.TabIndex = 90;
+			this.btn_exit.Text = "退  出";
+			this.btn_exit.UseVisualStyleBackColor = true;
+			this.btn_exit.Click += new System.EventHandler(this.button2_Click);
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Location = new System.Drawing.Point(11, 33);
+			this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(53, 12);
+			this.label1.TabIndex = 1002;
+			this.label1.Text = "保存路径";
+			this.label1.Visible = false;
+			// 
+			// tb_lj
+			// 
+			this.tb_lj.Location = new System.Drawing.Point(68, 30);
+			this.tb_lj.Margin = new System.Windows.Forms.Padding(2);
+			this.tb_lj.Name = "tb_lj";
+			this.tb_lj.ReadOnly = true;
+			this.tb_lj.Size = new System.Drawing.Size(285, 21);
+			this.tb_lj.TabIndex = 30;
+			this.tb_lj.Visible = false;
+			// 
+			// tb_mblj
+			// 
+			this.tb_mblj.Location = new System.Drawing.Point(68, 6);
+			this.tb_mblj.Margin = new System.Windows.Forms.Padding(2);
+			this.tb_mblj.Name = "tb_mblj";
+			this.tb_mblj.ReadOnly = true;
+			this.tb_mblj.Size = new System.Drawing.Size(285, 21);
+			this.tb_mblj.TabIndex = 0;
+			// 
+			// btn_openfilepath
+			// 
+			this.btn_openfilepath.Location = new System.Drawing.Point(356, 4);
+			this.btn_openfilepath.Margin = new System.Windows.Forms.Padding(2);
+			this.btn_openfilepath.Name = "btn_openfilepath";
+			this.btn_openfilepath.Size = new System.Drawing.Size(47, 20);
+			this.btn_openfilepath.TabIndex = 10;
+			this.btn_openfilepath.Text = "...";
+			this.btn_openfilepath.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.btn_openfilepath.UseVisualStyleBackColor = true;
+			this.btn_openfilepath.Click += new System.EventHandler(this.btn_openfilepath_Click);
+			// 
+			// btn_TempDes
+			// 
+			this.btn_TempDes.Location = new System.Drawing.Point(407, 4);
+			this.btn_TempDes.Margin = new System.Windows.Forms.Padding(2);
+			this.btn_TempDes.Name = "btn_TempDes";
+			this.btn_TempDes.Size = new System.Drawing.Size(65, 20);
+			this.btn_TempDes.TabIndex = 20;
+			this.btn_TempDes.Text = "摸板设置";
+			this.btn_TempDes.UseVisualStyleBackColor = true;
+			this.btn_TempDes.Click += new System.EventHandler(this.btn_TempDes_Click);
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(11, 33);
+			this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(53, 12);
+			this.label4.TabIndex = 1003;
+			this.label4.Text = "数 据 源";
+			// 
+			// cbo_sjy
+			// 
+			this.cbo_sjy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cbo_sjy.FormattingEnabled = true;
+			this.cbo_sjy.Location = new System.Drawing.Point(68, 31);
+			this.cbo_sjy.Margin = new System.Windows.Forms.Padding(2);
+			this.cbo_sjy.Name = "cbo_sjy";
+			this.cbo_sjy.Size = new System.Drawing.Size(285, 20);
+			this.cbo_sjy.TabIndex = 50;
+			// 
+			// panel_container
+			// 
+			this.panel_container.Location = new System.Drawing.Point(66, 188);
+			this.panel_container.Margin = new System.Windows.Forms.Padding(2);
+			this.panel_container.Name = "panel_container";
+			this.panel_container.Size = new System.Drawing.Size(17, 21);
+			this.panel_container.TabIndex = 5;
+			// 
+			// btn_preview
+			// 
+			this.btn_preview.Location = new System.Drawing.Point(312, 319);
+			this.btn_preview.Margin = new System.Windows.Forms.Padding(2);
+			this.btn_preview.Name = "btn_preview";
+			this.btn_preview.Size = new System.Drawing.Size(73, 27);
+			this.btn_preview.TabIndex = 80;
+			this.btn_preview.Text = "生成预览";
+			this.btn_preview.UseVisualStyleBackColor = true;
+			this.btn_preview.Click += new System.EventHandler(this.btn_preview_Click);
+			// 
+			// button7
+			// 
+			this.button7.Location = new System.Drawing.Point(234, 319);
+			this.button7.Name = "button7";
+			this.button7.Size = new System.Drawing.Size(73, 27);
+			this.button7.TabIndex = 1008;
+			this.button7.Text = "国标导出";
+			this.button7.UseVisualStyleBackColor = true;
+			this.button7.Click += new System.EventHandler(this.button7_Click);
+			// 
+			// OTSReport_Export
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(473, 349);
+			this.ControlBox = false;
+			this.Controls.Add(this.button7);
+			this.Controls.Add(this.cbo_sjy);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.btn_TempDes);
+			this.Controls.Add(this.btn_openfilepath);
+			this.Controls.Add(this.tb_mblj);
+			this.Controls.Add(this.tb_lj);
+			this.Controls.Add(this.btn_exit);
+			this.Controls.Add(this.btn_preview);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.progressBar1);
+			this.Controls.Add(this.richTextBox1);
+			this.Controls.Add(this.panel_container);
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.Margin = new System.Windows.Forms.Padding(2);
+			this.MaximizeBox = false;
+			this.MaximumSize = new System.Drawing.Size(489, 388);
+			this.MinimizeBox = false;
+			this.MinimumSize = new System.Drawing.Size(489, 388);
+			this.Name = "OTSReport_Export";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			this.Text = "报告程序输出界面";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.OTSReport_Export_FormClosed);
+			this.Load += new System.EventHandler(this.OTSReport_Export_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
         }