更新报告模板

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -436,19 +436,19 @@
 	<Control name="tcleannessa" text="加载VDA19模块" />
 	<Control name="tcleannessa_fail" text="VDA19模块加载失败！" />
 	
-	<Control name="dev_bgsj_up" text="报告时间:" />
+	<Control name="dev_bgsj_up" text="测量人员:" />
 	<Control name="dev_jcjgwj_up" text="测量结果文件:" />
 	<Control name="dev_ckbz_up" text="参考标准:" />
 	<Control name="dev_ypsm" text="样品说明" />
 	<Control name="dev_jcjgwj" text="测量结果名称:" />
 	<Control name="dev_cljggk" text="测量结果概况" />
-	<Control name="dev_yxsj" text="运行时间:" />
+	<Control name="dev_yxsj" text="测量时间:" />
 	<Control name="dev_sczs" text="视场总数:" />
 	<Control name="dev_flfa" text="分类方案:" />
 	<Control name="dev_ckbz" text="参考标准:" />
-	<Control name="dev_yjctz" text="已检查特征:" />
+	<Control name="dev_yjctz" text="特征数量:" />
 	<Control name="dev_scmj" text="检测面积：" />
-	<Control name="dev_bgsj" text="报告时间:" />
+	<Control name="dev_bgsj" text="测量人员:" />
 	<Control name="dev_fdbs" text="测量放大倍数:" />
 	<Control name="xrlabel_size_iconquestion_class" text="颗粒分类图" />
 	<Control name="xrlabel_size_iconquestion_subdivision" text="颗粒二级分类图" />

OTSIncAReportApp/1-UI/OTSReportExport/Cleanness/OTSReport_Template_CleannessA.Designer.cs

@@ -86,6 +86,8 @@
 			this.groupBox5 = new System.Windows.Forms.GroupBox();
 			this.textBox1 = new System.Windows.Forms.TextBox();
 			this.groupBox6 = new System.Windows.Forms.GroupBox();
+			this.tbSurveyor = new System.Windows.Forms.TextBox();
+			this.leSurveyor = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
 			this.groupBox_px.SuspendLayout();
@@ -134,7 +136,7 @@
 			// 
 			// button1
 			// 
-			this.button1.Location = new System.Drawing.Point(822, 638);
+			this.button1.Location = new System.Drawing.Point(825, 677);
 			this.button1.Margin = new System.Windows.Forms.Padding(2);
 			this.button1.Name = "button1";
 			this.button1.Size = new System.Drawing.Size(70, 30);
@@ -157,7 +159,7 @@
 			// label1a
 			// 
 			this.label1a.AutoSize = true;
-			this.label1a.Location = new System.Drawing.Point(6, 171);
+			this.label1a.Location = new System.Drawing.Point(6, 231);
 			this.label1a.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 			this.label1a.Name = "label1a";
 			this.label1a.Size = new System.Drawing.Size(53, 12);
@@ -166,7 +168,7 @@
 			// 
 			// tb_YPBH
 			// 
-			this.tb_YPBH.Location = new System.Drawing.Point(5, 187);
+			this.tb_YPBH.Location = new System.Drawing.Point(5, 247);
 			this.tb_YPBH.Margin = new System.Windows.Forms.Padding(2);
 			this.tb_YPBH.Name = "tb_YPBH";
 			this.tb_YPBH.Size = new System.Drawing.Size(252, 21);
@@ -175,7 +177,7 @@
 			// label4
 			// 
 			this.label4.AutoSize = true;
-			this.label4.Location = new System.Drawing.Point(6, 221);
+			this.label4.Location = new System.Drawing.Point(6, 281);
 			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);
@@ -184,7 +186,7 @@
 			// 
 			// tb_CKBZ
 			// 
-			this.tb_CKBZ.Location = new System.Drawing.Point(5, 238);
+			this.tb_CKBZ.Location = new System.Drawing.Point(5, 298);
 			this.tb_CKBZ.Margin = new System.Windows.Forms.Padding(2);
 			this.tb_CKBZ.Name = "tb_CKBZ";
 			this.tb_CKBZ.Size = new System.Drawing.Size(252, 21);
@@ -212,7 +214,7 @@
 			// 
 			// tb_yjwb
 			// 
-			this.tb_yjwb.Location = new System.Drawing.Point(5, 391);
+			this.tb_yjwb.Location = new System.Drawing.Point(5, 451);
 			this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2);
 			this.tb_yjwb.Name = "tb_yjwb";
 			this.tb_yjwb.Size = new System.Drawing.Size(250, 21);
@@ -249,7 +251,7 @@
 			// ck_klcc_xsddt
 			// 
 			this.ck_klcc_xsddt.AutoSize = true;
-			this.ck_klcc_xsddt.Location = new System.Drawing.Point(42, 106);
+			this.ck_klcc_xsddt.Location = new System.Drawing.Point(42, 108);
 			this.ck_klcc_xsddt.Margin = new System.Windows.Forms.Padding(2);
 			this.ck_klcc_xsddt.Name = "ck_klcc_xsddt";
 			this.ck_klcc_xsddt.Size = new System.Drawing.Size(84, 16);
@@ -260,7 +262,7 @@
 			// checkBox2
 			// 
 			this.checkBox2.AutoSize = true;
-			this.checkBox2.Location = new System.Drawing.Point(276, 106);
+			this.checkBox2.Location = new System.Drawing.Point(276, 108);
 			this.checkBox2.Margin = new System.Windows.Forms.Padding(2);
 			this.checkBox2.Name = "checkBox2";
 			this.checkBox2.Size = new System.Drawing.Size(84, 16);
@@ -272,7 +274,7 @@
 			// checkBox1
 			// 
 			this.checkBox1.AutoSize = true;
-			this.checkBox1.Location = new System.Drawing.Point(159, 106);
+			this.checkBox1.Location = new System.Drawing.Point(159, 108);
 			this.checkBox1.Margin = new System.Windows.Forms.Padding(2);
 			this.checkBox1.Name = "checkBox1";
 			this.checkBox1.Size = new System.Drawing.Size(84, 16);
@@ -284,7 +286,7 @@
 			// ck_klcc_xsmk
 			// 
 			this.ck_klcc_xsmk.AutoSize = true;
-			this.ck_klcc_xsmk.Location = new System.Drawing.Point(18, 64);
+			this.ck_klcc_xsmk.Location = new System.Drawing.Point(18, 66);
 			this.ck_klcc_xsmk.Margin = new System.Windows.Forms.Padding(2);
 			this.ck_klcc_xsmk.Name = "ck_klcc_xsmk";
 			this.ck_klcc_xsmk.Size = new System.Drawing.Size(72, 16);
@@ -295,7 +297,7 @@
 			// 
 			// tb_ysfx_xsys
 			// 
-			this.tb_ysfx_xsys.Location = new System.Drawing.Point(223, 144);
+			this.tb_ysfx_xsys.Location = new System.Drawing.Point(223, 157);
 			this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
 			this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
 			this.tb_ysfx_xsys.ReadOnly = true;
@@ -304,7 +306,7 @@
 			// 
 			// button4
 			// 
-			this.button4.Location = new System.Drawing.Point(565, 144);
+			this.button4.Location = new System.Drawing.Point(565, 157);
 			this.button4.Margin = new System.Windows.Forms.Padding(2);
 			this.button4.Name = "button4";
 			this.button4.Size = new System.Drawing.Size(72, 20);
@@ -316,7 +318,7 @@
 			// ck_ysfx_xsmk
 			// 
 			this.ck_ysfx_xsmk.AutoSize = true;
-			this.ck_ysfx_xsmk.Location = new System.Drawing.Point(18, 146);
+			this.ck_ysfx_xsmk.Location = new System.Drawing.Point(18, 159);
 			this.ck_ysfx_xsmk.Margin = new System.Windows.Forms.Padding(2);
 			this.ck_ysfx_xsmk.Name = "ck_ysfx_xsmk";
 			this.ck_ysfx_xsmk.Size = new System.Drawing.Size(72, 16);
@@ -358,7 +360,7 @@
 			// ck_kllb_fjzt
 			// 
 			this.ck_kllb_fjzt.AutoSize = true;
-			this.ck_kllb_fjzt.Location = new System.Drawing.Point(18, 329);
+			this.ck_kllb_fjzt.Location = new System.Drawing.Point(18, 354);
 			this.ck_kllb_fjzt.Name = "ck_kllb_fjzt";
 			this.ck_kllb_fjzt.Size = new System.Drawing.Size(96, 16);
 			this.ck_kllb_fjzt.TabIndex = 57;
@@ -379,7 +381,7 @@
 			this.groupBox_px.Controls.Add(this.ParticleList_2);
 			this.groupBox_px.Controls.Add(this.ParticleList_1);
 			this.groupBox_px.Controls.Add(this.comboBox_p1);
-			this.groupBox_px.Location = new System.Drawing.Point(135, 204);
+			this.groupBox_px.Location = new System.Drawing.Point(135, 214);
 			this.groupBox_px.Name = "groupBox_px";
 			this.groupBox_px.Size = new System.Drawing.Size(513, 125);
 			this.groupBox_px.TabIndex = 54;
@@ -479,7 +481,7 @@
 			// ck_kllb_xsmk
 			// 
 			this.ck_kllb_xsmk.AutoSize = true;
-			this.ck_kllb_xsmk.Location = new System.Drawing.Point(18, 195);
+			this.ck_kllb_xsmk.Location = new System.Drawing.Point(18, 214);
 			this.ck_kllb_xsmk.Margin = new System.Windows.Forms.Padding(2);
 			this.ck_kllb_xsmk.Name = "ck_kllb_xsmk";
 			this.ck_kllb_xsmk.Size = new System.Drawing.Size(72, 16);
@@ -490,7 +492,7 @@
 			// 
 			// button6
 			// 
-			this.button6.Location = new System.Drawing.Point(748, 638);
+			this.button6.Location = new System.Drawing.Point(751, 677);
 			this.button6.Margin = new System.Windows.Forms.Padding(2);
 			this.button6.Name = "button6";
 			this.button6.Size = new System.Drawing.Size(70, 30);
@@ -501,6 +503,8 @@
 			// 
 			// groupBox9
 			// 
+			this.groupBox9.Controls.Add(this.tbSurveyor);
+			this.groupBox9.Controls.Add(this.leSurveyor);
 			this.groupBox9.Controls.Add(this.tb_ypmc);
 			this.groupBox9.Controls.Add(this.label11);
 			this.groupBox9.Controls.Add(this.label9);
@@ -521,14 +525,14 @@
 			this.groupBox9.Controls.Add(this.label3);
 			this.groupBox9.Location = new System.Drawing.Point(13, 12);
 			this.groupBox9.Name = "groupBox9";
-			this.groupBox9.Size = new System.Drawing.Size(263, 422);
+			this.groupBox9.Size = new System.Drawing.Size(263, 496);
 			this.groupBox9.TabIndex = 1;
 			this.groupBox9.TabStop = false;
 			this.groupBox9.Text = "首页设置";
 			// 
 			// tb_ypmc
 			// 
-			this.tb_ypmc.Location = new System.Drawing.Point(5, 136);
+			this.tb_ypmc.Location = new System.Drawing.Point(5, 196);
 			this.tb_ypmc.Margin = new System.Windows.Forms.Padding(2);
 			this.tb_ypmc.Name = "tb_ypmc";
 			this.tb_ypmc.Size = new System.Drawing.Size(252, 21);
@@ -537,7 +541,7 @@
 			// label11
 			// 
 			this.label11.AutoSize = true;
-			this.label11.Location = new System.Drawing.Point(6, 121);
+			this.label11.Location = new System.Drawing.Point(6, 181);
 			this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
 			this.label11.Name = "label11";
 			this.label11.Size = new System.Drawing.Size(53, 12);
@@ -547,7 +551,7 @@
 			// label9
 			// 
 			this.label9.AutoSize = true;
-			this.label9.Location = new System.Drawing.Point(6, 374);
+			this.label9.Location = new System.Drawing.Point(6, 434);
 			this.label9.Name = "label9";
 			this.label9.Size = new System.Drawing.Size(53, 12);
 			this.label9.TabIndex = 60;
@@ -555,7 +559,7 @@
 			// 
 			// tb_npsb
 			// 
-			this.tb_npsb.Location = new System.Drawing.Point(5, 340);
+			this.tb_npsb.Location = new System.Drawing.Point(5, 400);
 			this.tb_npsb.Margin = new System.Windows.Forms.Padding(2);
 			this.tb_npsb.Name = "tb_npsb";
 			this.tb_npsb.Size = new System.Drawing.Size(252, 21);
@@ -564,7 +568,7 @@
 			// label8
 			// 
 			this.label8.AutoSize = true;
-			this.label8.Location = new System.Drawing.Point(6, 323);
+			this.label8.Location = new System.Drawing.Point(6, 383);
 			this.label8.Name = "label8";
 			this.label8.Size = new System.Drawing.Size(53, 12);
 			this.label8.TabIndex = 58;
@@ -572,7 +576,7 @@
 			// 
 			// tb_djsb
 			// 
-			this.tb_djsb.Location = new System.Drawing.Point(5, 289);
+			this.tb_djsb.Location = new System.Drawing.Point(5, 349);
 			this.tb_djsb.Margin = new System.Windows.Forms.Padding(2);
 			this.tb_djsb.Name = "tb_djsb";
 			this.tb_djsb.Size = new System.Drawing.Size(252, 21);
@@ -581,7 +585,7 @@
 			// labas
 			// 
 			this.labas.AutoSize = true;
-			this.labas.Location = new System.Drawing.Point(6, 273);
+			this.labas.Location = new System.Drawing.Point(6, 333);
 			this.labas.Name = "labas";
 			this.labas.Size = new System.Drawing.Size(53, 12);
 			this.labas.TabIndex = 56;
@@ -593,7 +597,7 @@
 			this.textBox_zypxss.Multiline = true;
 			this.textBox_zypxss.Name = "textBox_zypxss";
 			this.textBox_zypxss.ReadOnly = true;
-			this.textBox_zypxss.Size = new System.Drawing.Size(672, 80);
+			this.textBox_zypxss.Size = new System.Drawing.Size(672, 94);
 			this.textBox_zypxss.TabIndex = 65;
 			// 
 			// groupBox3
@@ -611,9 +615,9 @@
 			this.groupBox3.Controls.Add(this.ck_ysfx_xsmk);
 			this.groupBox3.Controls.Add(this.ck_kllb_fjzt);
 			this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
-			this.groupBox3.Location = new System.Drawing.Point(285, 149);
+			this.groupBox3.Location = new System.Drawing.Point(285, 166);
 			this.groupBox3.Name = "groupBox3";
-			this.groupBox3.Size = new System.Drawing.Size(684, 380);
+			this.groupBox3.Size = new System.Drawing.Size(684, 402);
 			this.groupBox3.TabIndex = 78;
 			this.groupBox3.TabStop = false;
 			this.groupBox3.Text = "模块设定";
@@ -621,7 +625,7 @@
 			// comboBox2
 			// 
 			this.comboBox2.FormattingEnabled = true;
-			this.comboBox2.Location = new System.Drawing.Point(404, 104);
+			this.comboBox2.Location = new System.Drawing.Point(404, 106);
 			this.comboBox2.Name = "comboBox2";
 			this.comboBox2.Size = new System.Drawing.Size(121, 20);
 			this.comboBox2.TabIndex = 72;
@@ -640,7 +644,7 @@
 			// label2
 			// 
 			this.label2.AutoSize = true;
-			this.label2.Location = new System.Drawing.Point(133, 147);
+			this.label2.Location = new System.Drawing.Point(133, 160);
 			this.label2.Name = "label2";
 			this.label2.Size = new System.Drawing.Size(83, 12);
 			this.label2.TabIndex = 68;
@@ -648,7 +652,7 @@
 			// 
 			// button7
 			// 
-			this.button7.Location = new System.Drawing.Point(896, 638);
+			this.button7.Location = new System.Drawing.Point(899, 677);
 			this.button7.Margin = new System.Windows.Forms.Padding(2);
 			this.button7.Name = "button7";
 			this.button7.Size = new System.Drawing.Size(70, 30);
@@ -663,7 +667,7 @@
 			this.groupBox4.Controls.Add(this.textBox_zypxss);
 			this.groupBox4.Location = new System.Drawing.Point(285, 15);
 			this.groupBox4.Name = "groupBox4";
-			this.groupBox4.Size = new System.Drawing.Size(684, 128);
+			this.groupBox4.Size = new System.Drawing.Size(684, 145);
 			this.groupBox4.TabIndex = 79;
 			this.groupBox4.TabStop = false;
 			this.groupBox4.Text = "物质分类显示";
@@ -671,7 +675,7 @@
 			// 
 			// button8
 			// 
-			this.button8.Location = new System.Drawing.Point(603, 105);
+			this.button8.Location = new System.Drawing.Point(603, 114);
 			this.button8.Name = "button8";
 			this.button8.Size = new System.Drawing.Size(75, 23);
 			this.button8.TabIndex = 71;
@@ -682,7 +686,7 @@
 			// label_StandardLibraryName
 			// 
 			this.label_StandardLibraryName.AutoSize = true;
-			this.label_StandardLibraryName.Location = new System.Drawing.Point(16, 647);
+			this.label_StandardLibraryName.Location = new System.Drawing.Point(283, 686);
 			this.label_StandardLibraryName.Name = "label_StandardLibraryName";
 			this.label_StandardLibraryName.Size = new System.Drawing.Size(41, 12);
 			this.label_StandardLibraryName.TabIndex = 69;
@@ -691,7 +695,7 @@
 			// groupBox5
 			// 
 			this.groupBox5.Controls.Add(this.textBox1);
-			this.groupBox5.Location = new System.Drawing.Point(285, 535);
+			this.groupBox5.Location = new System.Drawing.Point(285, 574);
 			this.groupBox5.Name = "groupBox5";
 			this.groupBox5.Size = new System.Drawing.Size(684, 98);
 			this.groupBox5.TabIndex = 69;
@@ -711,18 +715,36 @@
 			this.groupBox6.Controls.Add(this.pictureBox7);
 			this.groupBox6.Controls.Add(this.button1217);
 			this.groupBox6.Controls.Add(this.label8312);
-			this.groupBox6.Location = new System.Drawing.Point(13, 440);
+			this.groupBox6.Location = new System.Drawing.Point(13, 514);
 			this.groupBox6.Name = "groupBox6";
 			this.groupBox6.Size = new System.Drawing.Size(263, 193);
 			this.groupBox6.TabIndex = 80;
 			this.groupBox6.TabStop = false;
 			this.groupBox6.Text = "图标选择";
 			// 
+			// tbSurveyor
+			// 
+			this.tbSurveyor.Location = new System.Drawing.Point(6, 139);
+			this.tbSurveyor.Margin = new System.Windows.Forms.Padding(2);
+			this.tbSurveyor.Name = "tbSurveyor";
+			this.tbSurveyor.Size = new System.Drawing.Size(252, 21);
+			this.tbSurveyor.TabIndex = 64;
+			// 
+			// leSurveyor
+			// 
+			this.leSurveyor.AutoSize = true;
+			this.leSurveyor.Location = new System.Drawing.Point(6, 122);
+			this.leSurveyor.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+			this.leSurveyor.Name = "leSurveyor";
+			this.leSurveyor.Size = new System.Drawing.Size(53, 12);
+			this.leSurveyor.TabIndex = 63;
+			this.leSurveyor.Text = "测量人员";
+			// 
 			// OTSReport_Template_CleannessA
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(977, 679);
+			this.ClientSize = new System.Drawing.Size(977, 718);
 			this.Controls.Add(this.groupBox5);
 			this.Controls.Add(this.groupBox6);
 			this.Controls.Add(this.label_StandardLibraryName);
@@ -820,5 +842,7 @@
         private System.Windows.Forms.Label label11;
         private System.Windows.Forms.TextBox tb_ypmc;
 		private System.Windows.Forms.Button button8;
+		private System.Windows.Forms.TextBox tbSurveyor;
+		private System.Windows.Forms.Label leSurveyor;
 	}
 }

OTSIncAReportApp/1-UI/OTSReportExport/Cleanness/OTSReport_Template_CleannessA.cs

@@ -73,7 +73,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 			string strResultLibraryName = result[0] + ".db";
 
 			StandardLibraryName= result[0] + ".db";
-			label_StandardLibraryName.Text= table["standardlibrary"].ToString() + m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
+			//label_StandardLibraryName.Text= table["standardlibrary"].ToString() + m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
    
             for (int i = 0; i < m_OTSReport_Export.LibraryName.Count; i++)
             {
@@ -182,7 +182,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_FBT.ToString(), "M_SY", "str_tb_FBT");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_YPBH.ToString(), "M_SY", "str_tb_YPBH");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_SampleName.ToString(), "M_SY", "str_tb_SampleName");
-                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ.ToString(), "M_SY", "str_tb_CKBZ");
+				xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_Surveyor.ToString(), "M_SY", "tbSurveyor");
+
+				xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ.ToString(), "M_SY", "str_tb_CKBZ");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.b_ck_ypsm.ToString(), "M_SY", "b_ck_ypsm");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.LOGName.ToString(), "M_SY", "LOGName");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName.ToString(), "M_SY", "StandardLibraryName");
@@ -415,7 +417,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_FBT = tb_FBT.Text;
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_YPBH = tb_YPBH.Text;
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_SampleName=tb_ypmc.Text;
-            m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ = tb_CKBZ.Text;
+			m_OTSReport_Export.m_mbszclass.M_SY.str_tb_Surveyor = tbSurveyor.Text;
+			m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ = tb_CKBZ.Text;
             m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb = tb_yjwb.Text;
             //ResultFile resfile = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_OTSReport_Export.m_ReportApp.m_rstDataMgr.getSelectedIndex()];
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb = tb_djsb.Text;
@@ -476,7 +479,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             tb_FBT.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_FBT;
             tb_YPBH.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_YPBH;
             tb_ypmc.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_SampleName;
-            tb_CKBZ.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ;
+            tbSurveyor.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_Surveyor;
+			tb_CKBZ.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ;
             ck_ypsm.Checked = m_OTSReport_Export.m_mbszclass.M_SY.b_ck_ypsm;
             //ck_ym.Checked = m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym;
             tb_yjwb.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb;

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

@@ -22,7 +22,8 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             Dictionary<string, string> keyValues_ResultGrid = ls_resultgrid.GetData_ResultGrid_Report();
             //------------------加载模块,获取数据结束----------------------------------------------
             keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col1"].ToString(), out string str_CLJGMC);//测量结果名称
-            keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col4"].ToString(), out string str_YXSJ);//运行时间
+			keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col4"].ToString(), out string str_YXSJ);//运行时间
+			keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col2"].ToString(), out string str_YXKS);//运行开始时间
             keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col5"].ToString(), out string str_SCZS);//视场总数
             keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col6"].ToString(), out string str_FLFA);//分类方案
             keyValues_ResultGrid.TryGetValue(ls_resultgrid.table["col7"].ToString(), out string str_YJCTZ);//已检测特征
@@ -39,7 +40,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             data.Columns.Add("Name");
             data.Columns.Add("Data");
             data.Rows.Add("测量结果名称", str_CLJGMC);
-            data.Rows.Add("运行时间", str_YXSJ);
+            data.Rows.Add("运行开始", str_YXKS);
             data.Rows.Add("视场总数", str_SCZS);
             data.Rows.Add("分类方案", str_FLFA);
             data.Rows.Add("已检测特征", str_YJCTZ);

OTSIncAReportApp/1-UI/OTSReportExport/INCA/OTSReport_Template_INCA.cs

@@ -163,6 +163,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_FBT.ToString(), "M_SY", "str_tb_FBT");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_YPBH.ToString(), "M_SY", "str_tb_YPBH");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_SampleName.ToString(), "M_SY", "str_tb_SampleName");
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_Surveyor.ToString(), "M_SY", "tbSurveyor");
+
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ.ToString(), "M_SY", "str_tb_CKBZ");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.b_ck_ypsm.ToString(), "M_SY", "b_ck_ypsm");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.LOGName.ToString(), "M_SY", "LOGName");
@@ -402,7 +404,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_FBT = tb_FBT.Text;
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_YPBH = tb_YPBH.Text;
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_SampleName = tb_ypmc.Text;
-            m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ = tb_CKBZ.Text;
+
+			m_OTSReport_Export.m_mbszclass.M_SY.str_tb_Surveyor= tbSurveyor.Text;
+            
+
+			m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ = tb_CKBZ.Text;
             m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb = tb_yjwb.Text;
 
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb = tb_djsb.Text;
@@ -458,7 +464,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             tb_FBT.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_FBT;
             tb_YPBH.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_YPBH;
             tb_ypmc.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_SampleName;
-            tb_CKBZ.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ;
+			tbSurveyor.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_Surveyor;
+
+			tb_CKBZ.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_CKBZ;
             ck_ypsm.Checked = m_OTSReport_Export.m_mbszclass.M_SY.b_ck_ypsm;
             //ck_ym.Checked = m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym;
             tb_yjwb.Text = m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb;

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -209,9 +209,13 @@ namespace OTSIncAReportApp
                 /// </summary>
                 public string str_tb_SampleName { get; set; }
                 /// <summary>
-                /// 样品编号
+                /// 测量人员
                 /// </summary>
-                public string str_tb_YPBH { get; set; }
+                public string str_tb_Surveyor { get; set; }
+				/// <summary>
+				/// 样品编号
+				/// </summary>
+				public string str_tb_YPBH { get; set; }
 
                 /// <summary>
                 /// 参考标准
@@ -971,7 +975,10 @@ namespace OTSIncAReportApp
             m_mbszclass.M_SY.str_tb_FBT = xmlutil.Read("M_SY", "str_tb_FBT");
             m_mbszclass.M_SY.str_tb_YPBH = xmlutil.Read("M_SY", "str_tb_YPBH");
             m_mbszclass.M_SY.str_tb_SampleName = xmlutil.Read("M_SY", "str_tb_SampleName");
-            m_mbszclass.M_SY.str_tb_CKBZ = xmlutil.Read("M_SY", "str_tb_CKBZ");
+			m_mbszclass.M_SY.str_tb_Surveyor = xmlutil.Read("M_SY", "tbSurveyor");
+
+
+			m_mbszclass.M_SY.str_tb_CKBZ = xmlutil.Read("M_SY", "str_tb_CKBZ");
             m_mbszclass.M_SY.b_ck_ypsm = Convert.ToBoolean(xmlutil.Read("M_SY", "b_ck_ypsm"));
           
             m_mbszclass.M_SY.LOGName = xmlutil.Read("M_SY", "LOGName");

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

@@ -1453,7 +1453,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 			this.dev_yxsj.Multiline = true;
 			this.dev_yxsj.Name = "dev_yxsj";
 			this.dev_yxsj.StylePriority.UseTextAlignment = false;
-			this.dev_yxsj.Text = "运行时间:";
+			this.dev_yxsj.Text = "测量时间:";
 			this.dev_yxsj.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
 			this.dev_yxsj.Weight = 1D;
 			// 
@@ -1517,7 +1517,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 			this.dev_yjctz.Multiline = true;
 			this.dev_yjctz.Name = "dev_yjctz";
 			this.dev_yjctz.StylePriority.UseTextAlignment = false;
-			this.dev_yjctz.Text = "已检查特征:";
+			this.dev_yjctz.Text = "特征数量:";
 			this.dev_yjctz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
 			this.dev_yjctz.Weight = 1D;
 			// 
@@ -1591,7 +1591,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 			this.dev_bgsj.Multiline = true;
 			this.dev_bgsj.Name = "dev_bgsj";
 			this.dev_bgsj.StylePriority.UseTextAlignment = false;
-			this.dev_bgsj.Text = "报告时间:";
+			this.dev_bgsj.Text = "测量人员:";
 			this.dev_bgsj.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
 			this.dev_bgsj.Weight = 1D;
 			// 

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

@@ -4,6 +4,7 @@ using DevExpress.XtraPrinting.Drawing;
 using DevExpress.XtraReports.UI;
 using NPOI.Util;
 using OTSCommon;
+using OTSCommon.DBOperate.Model;
 using OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration;
 using OTSIncAReportApp._1_UI.OTSReportExport.Template;
 using OTSIncAReportApp.OTSRstMgrFunction;
@@ -140,6 +141,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_jcjgwj, GetlanguageData("dev_jcjgwj", dev_jcjgwj.Text));//表中测量结果名称
             setXRLabelData(dev_cljggk, GetlanguageData("dev_cljggk", dev_cljggk.Text));//表中测量结果概况
             setXRLabelData(dev_yxsj, GetlanguageData("dev_yxsj", dev_yxsj.Text));//表中运行时间
+
             setXRLabelData(dev_sczs, GetlanguageData("dev_sczs", dev_sczs.Text));//表中视场总数
             setXRLabelData(dev_flfa, GetlanguageData("dev_flfa", dev_flfa.Text));//表中分类方案
             setXRLabelData(dev_ckbz, GetlanguageData("dev_ckbz", dev_ckbz.Text));//表中参考标准
@@ -180,8 +182,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_yjctz_text, data.Rows[4][1].ToString());//已检测特征
             setXRLabelData(dev_scmj_text, data.Rows[5][1].ToString() + "mm²");//视场面积
             setXRLabelData(dev_fdbs_text, data.Rows[6][1].ToString()+"X");//放大倍数
-            setXRLabelData(dev_bgsj_text, DateTime.Now.ToShortDateString().ToString());//报告时间:
-            setXRLabelData(dev_ckbz_text, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
+            //setXRLabelData(dev_bgsj_text, DateTime.Now.ToShortDateString().ToString());//报告时间:
+			setXRLabelData(dev_bgsj_text, TemplateClass.M_SY.str_tb_Surveyor.ToString());//测量人员:
+			setXRLabelData(dev_ckbz_text, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
             FieldOfViewArea= HeaderData.filedsArea.ToString();
             //FieldOfViewArea = data.Rows[5][1].ToString();
             #endregion
@@ -191,9 +194,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_fbt, TemplateClass.M_SY.str_tb_FBT.ToString());//副标题
             setXRLabelData(dev_ypmc_text_up, TemplateClass.M_SY.str_tb_SampleName.ToString());
             setXRLabelData(dev_ypbh_text_up, TemplateClass.M_SY.str_tb_YPBH.ToString());//样品编号
-            setXRLabelData(dev_bgsj_text_up, DateTime.Now.ToShortDateString().ToString());//当前日期
-
-            setXRLabelData(dev_sb_text, TemplateClass.M_SY.str_tb_djsb.ToString());//电镜设备名称
+            //setXRLabelData(dev_bgsj_text_up, DateTime.Now.ToShortDateString().ToString());//当前日期
+			setXRLabelData(dev_bgsj_text_up, TemplateClass.M_SY.str_tb_Surveyor.ToString());//测量人员
+			setXRLabelData(dev_sb_text, TemplateClass.M_SY.str_tb_djsb.ToString());//电镜设备名称
             setXRLabelData(dev_np_text, TemplateClass.M_SY.str_tb_npsb.ToString());//能谱设备名称
 
 
@@ -1173,7 +1176,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             DataTable statisticalAuantity = new DataTable();
 			List<DataTable> CompositeData = particleList.GetClassificationConsolidationTable(m_otsreport_export,basicData,out statisticalAuantity);
             DataTable classData = particleList.GetLargeClassification(m_otsreport_export,basicData);
-            DataTable subdivdeData = particleList.GetSubClassification(basicData);
+            int TotalParticleCount = 0;
+            for (int i = 0; i < classData.Rows.Count; i++)
+            {
+                if (classData.Rows[i]["total"].ToString() != "")
+                {
+                    TotalParticleCount = TotalParticleCount + Convert.ToInt32(classData.Rows[i]["total"]);
+				}
+            }
+
+			DataTable subdivdeData = particleList.GetSubClassification(basicData);
             if (m_mbszclass.M_VDA19.IsVDA19)
             {
                 add_Set_VDA19_TableS(CompositeData, statisticalAuantity);
@@ -1313,7 +1325,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             #endregion
             #endregion
-        }
+
+            dev_yjctz_text.Text = TotalParticleCount.ToString();
+
+		}
 
         private void HistogramChart(ParticleAnalysis particleList, BasicData basicData)
         {