报告程序导出显示优化

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Oxford" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -3,7 +3,8 @@
     <str_tb_ZBT>夹杂物报告</str_tb_ZBT>
     <str_tb_FBT>
     </str_tb_FBT>
-    <str_tb_YPBH>21</str_tb_YPBH>
+    <str_tb_YPBH>
+    </str_tb_YPBH>
     <str_tb_CKBZ>
     </str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
@@ -15,9 +16,12 @@
     <LOGName>ReportIdentification.bmp</LOGName>
     <StandardLibraryName>
     </StandardLibraryName>
-    <str_tb_djsb>a</str_tb_djsb>
+    <str_tb_djsb>
+    </str_tb_djsb>
     <str_tb_npsb>
     </str_tb_npsb>
+    <str_tb_SampleName>
+    </str_tb_SampleName>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -138,8 +142,6 @@
     </list_str_kllb_DeleteClass>
     <list_int_kllb_number>20</list_int_kllb_number>
     <list_str_kllb_DeleteClass_Serial>
-      <YS0>20001</YS0>
-      <YS1>20002</YS1>
     </list_str_kllb_DeleteClass_Serial>
   </M_KLLBXX>
   <M_address>

Bin/x64/Debug/Config/ReportTemplate/TCleannessA_Template/ReportTemplateConfig.xml

@@ -13,6 +13,12 @@
     <int_xzkl>0</int_xzkl>
     <LOGName>ReportIdentification.bmp</LOGName>
     <StandardLibraryName>OTSCleanlinessSTD1.db</StandardLibraryName>
+    <str_tb_SampleName>
+    </str_tb_SampleName>
+    <str_tb_djsb>
+    </str_tb_djsb>
+    <str_tb_npsb>
+    </str_tb_npsb>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -31,15 +37,15 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>DMAX</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
+    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
-    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
+    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
     <str_cb_klcc_ljb>j4.psf</str_cb_klcc_ljb>
     <ParticleSizeGraphicSelection>0</ParticleSizeGraphicSelection>
     <INCAGraphicSelection>0</INCAGraphicSelection>
   </M_KLFXJG>
   <M_YSFXJG>
-    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
+    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
     <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
@@ -84,7 +90,7 @@
     </str_cb_syxt_ljb>
   </M_SYXT>
   <M_KLLBXX>
-    <b_ck_kllb_xsmk>True</b_ck_kllb_xsmk>
+    <b_ck_kllb_xsmk>False</b_ck_kllb_xsmk>
     <index_cb_kllb_jsfs>0</index_cb_kllb_jsfs>
     <index_cb_kllb_klfw>0</index_cb_kllb_klfw>
     <int_tb_kllb_ylsx>1</int_tb_kllb_ylsx>
@@ -116,7 +122,7 @@
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
     <index_cb_kllb_chartSort_p3>2</index_cb_kllb_chartSort_p3>
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
-    <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
+    <b_ck_kllb_fjzt>False</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
     </list_str_kllb_qcys>
     <str_kllb_qcys>

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="IncA">
+<XMLData RunMode="ProfessionalMode" SysType="TCCleannessA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" EngineType="0:InclustionEngine" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="MineralSpectrumSTDLib" SteelTechnology="0" />
   <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="0:AUTO" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="50" start="0" />

Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData systype="IncA">
+<XMLData systype="TCCleannessA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -171,6 +171,10 @@ namespace OTSIncAReportApp
                 /// </summary>
                 public string str_tb_FBT { get; set; }
 
+                /// <summary>
+                /// 样品名称
+                /// </summary>
+                public string str_tb_SampleName { get; set; }
                 /// <summary>
                 /// 样品编号
                 /// </summary>
@@ -216,10 +220,10 @@ namespace OTSIncAReportApp
                 /// </summary>
                 public string str_tb_KHH { get; set; }
 
-                /// <summary>
-                /// 是否显示页码
-                /// </summary>
-                public bool b_ck_ym { get; set; }
+                ///// <summary>
+                ///// 是否显示页码
+                ///// </summary>
+                //public bool b_ck_ym { get; set; }
 
                 /// <summary>
                 /// 页脚文本
@@ -953,6 +957,7 @@ namespace OTSIncAReportApp
             m_mbszclass.M_SY.str_tb_ZBT = xmlutil.Read("M_SY", "str_tb_ZBT");
             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.b_ck_ypsm = Convert.ToBoolean(xmlutil.Read("M_SY", "b_ck_ypsm"));
           
@@ -968,7 +973,7 @@ namespace OTSIncAReportApp
             //页眉页脚
             m_mbszclass.M_YMYJ.str_tb_ymwb = xmlutil.Read("M_YMYJ", "str_tb_ymwb");
             m_mbszclass.M_YMYJ.str_tb_KHH = xmlutil.Read("M_YMYJ", "str_tb_KHH");
-            m_mbszclass.M_YMYJ.b_ck_ym = Convert.ToBoolean(xmlutil.Read("M_YMYJ", "b_ck_ym"));
+            //m_mbszclass.M_YMYJ.b_ck_ym = Convert.ToBoolean(xmlutil.Read("M_YMYJ", "b_ck_ym"));
             m_mbszclass.M_YMYJ.str_tb_yjwb = xmlutil.Read("M_YMYJ", "str_tb_yjwb");
             //颗粒分析结果
             m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = Convert.ToBoolean(xmlutil.Read("M_KLFXJG", "b_ck_klcc_xsmk"));//是否显示模块

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

@@ -34,16 +34,13 @@
             this.label3 = new System.Windows.Forms.Label();
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
+            this.label1a = new System.Windows.Forms.Label();
             this.tb_YPBH = new System.Windows.Forms.TextBox();
             this.label4 = new System.Windows.Forms.Label();
             this.tb_CKBZ = new System.Windows.Forms.TextBox();
             this.ck_ypsm = new System.Windows.Forms.CheckBox();
             this.label6 = new System.Windows.Forms.Label();
-            this.ck_ym = new System.Windows.Forms.CheckBox();
             this.tb_yjwb = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.pictureBox7 = new System.Windows.Forms.PictureBox();
             this.label8312 = new System.Windows.Forms.Label();
             this.button1217 = new System.Windows.Forms.Button();
@@ -70,6 +67,10 @@
             this.ck_kllb_xsmk = new System.Windows.Forms.CheckBox();
             this.button6 = new System.Windows.Forms.Button();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
+            this.tb_npsb = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.tb_djsb = new System.Windows.Forms.TextBox();
+            this.labas = new System.Windows.Forms.Label();
             this.button3 = new System.Windows.Forms.Button();
             this.textBox_zypxss = new System.Windows.Forms.TextBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
@@ -84,11 +85,9 @@
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
-            this.tb_npsb = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.tb_djsb = new System.Windows.Forms.TextBox();
-            this.label10 = new System.Windows.Forms.Label();
-            this.groupBox1.SuspendLayout();
+            this.label9 = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.tb_ypmc = new System.Windows.Forms.TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
             this.groupBox_px.SuspendLayout();
@@ -101,7 +100,7 @@
             // 
             // tb_FBT
             // 
-            this.tb_FBT.Location = new System.Drawing.Point(5, 93);
+            this.tb_FBT.Location = new System.Drawing.Point(5, 85);
             this.tb_FBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_FBT.Name = "tb_FBT";
             this.tb_FBT.Size = new System.Drawing.Size(252, 21);
@@ -118,7 +117,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(5, 79);
+            this.label5.Location = new System.Drawing.Point(6, 69);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(41, 12);
@@ -128,7 +127,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(5, 20);
+            this.label3.Location = new System.Drawing.Point(6, 20);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(41, 12);
@@ -157,19 +156,19 @@
             this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
-            // label1
+            // label1a
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(5, 138);
-            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 = 0;
-            this.label1.Text = "样品编号";
+            this.label1a.AutoSize = true;
+            this.label1a.Location = new System.Drawing.Point(6, 171);
+            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);
+            this.label1a.TabIndex = 0;
+            this.label1a.Text = "产品型号";
             // 
             // tb_YPBH
             // 
-            this.tb_YPBH.Location = new System.Drawing.Point(5, 152);
+            this.tb_YPBH.Location = new System.Drawing.Point(5, 187);
             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);
@@ -178,7 +177,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(5, 197);
+            this.label4.Location = new System.Drawing.Point(6, 221);
             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);
@@ -187,7 +186,7 @@
             // 
             // tb_CKBZ
             // 
-            this.tb_CKBZ.Location = new System.Drawing.Point(5, 211);
+            this.tb_CKBZ.Location = new System.Drawing.Point(5, 238);
             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);
@@ -213,51 +212,17 @@
             this.label6.TabIndex = 0;
             this.label6.Text = "显示样品说明";
             // 
-            // ck_ym
-            // 
-            this.ck_ym.AutoSize = true;
-            this.ck_ym.Location = new System.Drawing.Point(409, 89);
-            this.ck_ym.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_ym.Name = "ck_ym";
-            this.ck_ym.Size = new System.Drawing.Size(15, 14);
-            this.ck_ym.TabIndex = 52;
-            this.ck_ym.UseVisualStyleBackColor = true;
-            // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(9, 18);
+            this.tb_yjwb.Location = new System.Drawing.Point(5, 391);
             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);
             this.tb_yjwb.TabIndex = 42;
             // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(360, 89);
-            this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(29, 12);
-            this.label9.TabIndex = 41;
-            this.label9.Text = "页码";
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.ck_ym);
-            this.groupBox1.Controls.Add(this.label9);
-            this.groupBox1.Controls.Add(this.tb_yjwb);
-            this.groupBox1.Location = new System.Drawing.Point(13, 386);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(263, 49);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "页脚设置";
-            // 
             // pictureBox7
             // 
-            this.pictureBox7.Location = new System.Drawing.Point(10, 40);
+            this.pictureBox7.Location = new System.Drawing.Point(6, 44);
             this.pictureBox7.Name = "pictureBox7";
             this.pictureBox7.Size = new System.Drawing.Size(249, 144);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -538,10 +503,14 @@
             // 
             // groupBox9
             // 
+            this.groupBox9.Controls.Add(this.tb_ypmc);
+            this.groupBox9.Controls.Add(this.label11);
+            this.groupBox9.Controls.Add(this.label9);
             this.groupBox9.Controls.Add(this.tb_npsb);
             this.groupBox9.Controls.Add(this.label8);
+            this.groupBox9.Controls.Add(this.tb_yjwb);
             this.groupBox9.Controls.Add(this.tb_djsb);
-            this.groupBox9.Controls.Add(this.label10);
+            this.groupBox9.Controls.Add(this.labas);
             this.groupBox9.Controls.Add(this.tb_YPBH);
             this.groupBox9.Controls.Add(this.ck_ypsm);
             this.groupBox9.Controls.Add(this.label4);
@@ -550,15 +519,49 @@
             this.groupBox9.Controls.Add(this.label5);
             this.groupBox9.Controls.Add(this.tb_CKBZ);
             this.groupBox9.Controls.Add(this.tb_FBT);
-            this.groupBox9.Controls.Add(this.label1);
+            this.groupBox9.Controls.Add(this.label1a);
             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, 369);
+            this.groupBox9.Size = new System.Drawing.Size(263, 422);
             this.groupBox9.TabIndex = 1;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "首页设置";
             // 
+            // tb_npsb
+            // 
+            this.tb_npsb.Location = new System.Drawing.Point(5, 340);
+            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);
+            this.tb_npsb.TabIndex = 59;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(6, 323);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(53, 12);
+            this.label8.TabIndex = 58;
+            this.label8.Text = "能谱设备";
+            // 
+            // tb_djsb
+            // 
+            this.tb_djsb.Location = new System.Drawing.Point(5, 289);
+            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);
+            this.tb_djsb.TabIndex = 57;
+            // 
+            // labas
+            // 
+            this.labas.AutoSize = true;
+            this.labas.Location = new System.Drawing.Point(6, 273);
+            this.labas.Name = "labas";
+            this.labas.Size = new System.Drawing.Size(53, 12);
+            this.labas.TabIndex = 56;
+            this.labas.Text = "电镜设备";
+            // 
             // button3
             // 
             this.button3.Location = new System.Drawing.Point(582, 100);
@@ -712,39 +715,32 @@
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "图标选择";
             // 
-            // tb_npsb
-            // 
-            this.tb_npsb.Location = new System.Drawing.Point(5, 329);
-            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);
-            this.tb_npsb.TabIndex = 59;
-            // 
-            // label8
+            // label9
             // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(5, 315);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(53, 12);
-            this.label8.TabIndex = 58;
-            this.label8.Text = "能谱设备";
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(6, 374);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(53, 12);
+            this.label9.TabIndex = 60;
+            this.label9.Text = "页脚设置";
             // 
-            // tb_djsb
+            // label11
             // 
-            this.tb_djsb.Location = new System.Drawing.Point(5, 270);
-            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);
-            this.tb_djsb.TabIndex = 57;
+            this.label11.AutoSize = true;
+            this.label11.Location = new System.Drawing.Point(6, 121);
+            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);
+            this.label11.TabIndex = 61;
+            this.label11.Text = "产品名称";
             // 
-            // label10
+            // tb_ypmc
             // 
-            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(5, 256);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(53, 12);
-            this.label10.TabIndex = 56;
-            this.label10.Text = "电镜设备";
+            this.tb_ypmc.Location = new System.Drawing.Point(5, 136);
+            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);
+            this.tb_ypmc.TabIndex = 62;
             // 
             // OTSReport_Template_CleannessA
             // 
@@ -760,7 +756,6 @@
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.groupBox9);
-            this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.button2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Margin = new System.Windows.Forms.Padding(2);
@@ -771,8 +766,6 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "模板设置";
             this.Load += new System.EventHandler(this.OTSReport_TemplateDesignerRM_Load);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).EndInit();
             this.groupBox_px.ResumeLayout(false);
@@ -799,19 +792,16 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.TextBox tb_FBT;
         private System.Windows.Forms.TextBox tb_ZBT;
-        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label1a;
         private System.Windows.Forms.TextBox tb_YPBH;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.TextBox tb_CKBZ;
         private System.Windows.Forms.CheckBox ck_ypsm;
         private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.TextBox tb_yjwb;
-        private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
         private System.Windows.Forms.CheckBox ck_ysfx_xsmk;
         private System.Windows.Forms.CheckBox ck_kllb_xsmk;
-        private System.Windows.Forms.CheckBox ck_ym;
         private System.Windows.Forms.Button button6;
         private System.Windows.Forms.GroupBox groupBox9;
         private System.Windows.Forms.TextBox tb_ysfx_xsys;
@@ -852,6 +842,9 @@
         private System.Windows.Forms.TextBox tb_npsb;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox tb_djsb;
-        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label labas;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.TextBox tb_ypmc;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -161,6 +161,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT.ToString(), "M_SY", "str_tb_ZBT");
                 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.b_ck_ypsm.ToString(), "M_SY", "b_ck_ypsm");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.LOGName.ToString(), "M_SY", "LOGName");
@@ -173,7 +174,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 //页眉页脚
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb.ToString(), "M_YMYJ", "str_tb_ymwb");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_KHH.ToString(), "M_YMYJ", "str_tb_KHH");
-                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym.ToString(), "M_YMYJ", "b_ck_ym");
+                //xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym.ToString(), "M_YMYJ", "b_ck_ym");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb.ToString(), "M_YMYJ", "str_tb_yjwb");
 
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_VDA19.IsVDA19.ToString(), "M_VDA19", "IsVDA19");
@@ -389,6 +390,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT = tb_ZBT.Text;
             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_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()];
@@ -445,9 +447,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             tb_ZBT.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT;
             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;
             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;
+            //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;
 
             tb_djsb.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb;

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

@@ -40,10 +40,7 @@
             this.tb_CKBZ = new System.Windows.Forms.TextBox();
             this.ck_ypsm = new System.Windows.Forms.CheckBox();
             this.label6 = new System.Windows.Forms.Label();
-            this.ck_ym = new System.Windows.Forms.CheckBox();
             this.tb_yjwb = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.pictureBox7 = new System.Windows.Forms.PictureBox();
             this.label8312 = new System.Windows.Forms.Label();
             this.button1217 = new System.Windows.Forms.Button();
@@ -72,6 +69,10 @@
             this.button6 = new System.Windows.Forms.Button();
             this.ck_jzwzb_surface = new System.Windows.Forms.CheckBox();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
+            this.tb_npsb = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.tb_djsb = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.comboBox2 = new System.Windows.Forms.ComboBox();
             this.comboBox1 = new System.Windows.Forms.ComboBox();
@@ -87,11 +88,9 @@
             this.button3 = new System.Windows.Forms.Button();
             this.label_delete_Class = new System.Windows.Forms.Label();
             this.delete_Class = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.tb_djsb = new System.Windows.Forms.TextBox();
-            this.label8 = new System.Windows.Forms.Label();
-            this.tb_npsb = new System.Windows.Forms.TextBox();
-            this.groupBox1.SuspendLayout();
+            this.label9 = new System.Windows.Forms.Label();
+            this.lname = new System.Windows.Forms.Label();
+            this.tb_ypmc = new System.Windows.Forms.TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
             this.groupBox_px.SuspendLayout();
@@ -104,7 +103,7 @@
             // 
             // tb_FBT
             // 
-            this.tb_FBT.Location = new System.Drawing.Point(5, 97);
+            this.tb_FBT.Location = new System.Drawing.Point(6, 92);
             this.tb_FBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_FBT.Name = "tb_FBT";
             this.tb_FBT.Size = new System.Drawing.Size(252, 21);
@@ -112,7 +111,7 @@
             // 
             // tb_ZBT
             // 
-            this.tb_ZBT.Location = new System.Drawing.Point(5, 40);
+            this.tb_ZBT.Location = new System.Drawing.Point(6, 40);
             this.tb_ZBT.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ZBT.Name = "tb_ZBT";
             this.tb_ZBT.Size = new System.Drawing.Size(252, 21);
@@ -121,7 +120,7 @@
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(5, 80);
+            this.label5.Location = new System.Drawing.Point(6, 75);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(41, 12);
@@ -131,7 +130,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(5, 23);
+            this.label3.Location = new System.Drawing.Point(6, 23);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(41, 12);
@@ -163,7 +162,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(5, 137);
+            this.label1.Location = new System.Drawing.Point(6, 179);
             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);
@@ -172,7 +171,7 @@
             // 
             // tb_YPBH
             // 
-            this.tb_YPBH.Location = new System.Drawing.Point(5, 154);
+            this.tb_YPBH.Location = new System.Drawing.Point(6, 196);
             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);
@@ -181,7 +180,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(5, 194);
+            this.label4.Location = new System.Drawing.Point(6, 231);
             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);
@@ -190,7 +189,7 @@
             // 
             // tb_CKBZ
             // 
-            this.tb_CKBZ.Location = new System.Drawing.Point(5, 211);
+            this.tb_CKBZ.Location = new System.Drawing.Point(6, 248);
             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);
@@ -216,48 +215,14 @@
             this.label6.TabIndex = 0;
             this.label6.Text = "显示样品说明";
             // 
-            // ck_ym
-            // 
-            this.ck_ym.AutoSize = true;
-            this.ck_ym.Location = new System.Drawing.Point(409, 89);
-            this.ck_ym.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_ym.Name = "ck_ym";
-            this.ck_ym.Size = new System.Drawing.Size(15, 14);
-            this.ck_ym.TabIndex = 52;
-            this.ck_ym.UseVisualStyleBackColor = true;
-            // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(5, 28);
+            this.tb_yjwb.Location = new System.Drawing.Point(6, 404);
             this.tb_yjwb.Margin = new System.Windows.Forms.Padding(2);
             this.tb_yjwb.Name = "tb_yjwb";
             this.tb_yjwb.Size = new System.Drawing.Size(252, 21);
             this.tb_yjwb.TabIndex = 42;
             // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(360, 89);
-            this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(29, 12);
-            this.label9.TabIndex = 41;
-            this.label9.Text = "页码";
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.ck_ym);
-            this.groupBox1.Controls.Add(this.label9);
-            this.groupBox1.Controls.Add(this.tb_yjwb);
-            this.groupBox1.Location = new System.Drawing.Point(13, 382);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(263, 65);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "页脚设置";
-            // 
             // pictureBox7
             // 
             this.pictureBox7.Location = new System.Drawing.Point(8, 48);
@@ -567,7 +532,11 @@
             // 
             // groupBox9
             // 
+            this.groupBox9.Controls.Add(this.tb_ypmc);
+            this.groupBox9.Controls.Add(this.lname);
+            this.groupBox9.Controls.Add(this.label9);
             this.groupBox9.Controls.Add(this.tb_npsb);
+            this.groupBox9.Controls.Add(this.tb_yjwb);
             this.groupBox9.Controls.Add(this.label8);
             this.groupBox9.Controls.Add(this.tb_djsb);
             this.groupBox9.Controls.Add(this.label7);
@@ -583,11 +552,45 @@
             this.groupBox9.Controls.Add(this.label3);
             this.groupBox9.Location = new System.Drawing.Point(13, 13);
             this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Size = new System.Drawing.Size(263, 364);
+            this.groupBox9.Size = new System.Drawing.Size(263, 433);
             this.groupBox9.TabIndex = 1;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "首页设置";
             // 
+            // tb_npsb
+            // 
+            this.tb_npsb.Location = new System.Drawing.Point(6, 352);
+            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);
+            this.tb_npsb.TabIndex = 55;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(6, 335);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(53, 12);
+            this.label8.TabIndex = 54;
+            this.label8.Text = "能谱设备";
+            // 
+            // tb_djsb
+            // 
+            this.tb_djsb.Location = new System.Drawing.Point(6, 300);
+            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);
+            this.tb_djsb.TabIndex = 53;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(6, 283);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(53, 12);
+            this.label7.TabIndex = 52;
+            this.label7.Text = "电镜设备";
+            // 
             // groupBox3
             // 
             this.groupBox3.Controls.Add(this.comboBox2);
@@ -753,39 +756,32 @@
             this.delete_Class.Size = new System.Drawing.Size(691, 49);
             this.delete_Class.TabIndex = 62;
             // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(5, 251);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(53, 12);
-            this.label7.TabIndex = 52;
-            this.label7.Text = "电镜设备";
-            // 
-            // tb_djsb
+            // label9
             // 
-            this.tb_djsb.Location = new System.Drawing.Point(5, 268);
-            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);
-            this.tb_djsb.TabIndex = 53;
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(6, 387);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(53, 12);
+            this.label9.TabIndex = 56;
+            this.label9.Text = "页脚设置";
             // 
-            // label8
+            // lname
             // 
-            this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(5, 308);
-            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(53, 12);
-            this.label8.TabIndex = 54;
-            this.label8.Text = "能谱设备";
+            this.lname.AutoSize = true;
+            this.lname.Location = new System.Drawing.Point(6, 127);
+            this.lname.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.lname.Name = "lname";
+            this.lname.Size = new System.Drawing.Size(53, 12);
+            this.lname.TabIndex = 57;
+            this.lname.Text = "样品名称";
             // 
-            // tb_npsb
+            // tb_ypmc
             // 
-            this.tb_npsb.Location = new System.Drawing.Point(5, 325);
-            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);
-            this.tb_npsb.TabIndex = 55;
+            this.tb_ypmc.Location = new System.Drawing.Point(6, 144);
+            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);
+            this.tb_ypmc.TabIndex = 58;
             // 
             // OTSReport_Template_INCA
             // 
@@ -799,7 +795,6 @@
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox9);
             this.Controls.Add(this.button6);
-            this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.button2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -811,8 +806,6 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "模板设置";
             this.Load += new System.EventHandler(this.OTSReport_TemplateDesignerRM_Load);
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).EndInit();
             this.groupBox_px.ResumeLayout(false);
@@ -844,13 +837,10 @@
         private System.Windows.Forms.TextBox tb_CKBZ;
         private System.Windows.Forms.CheckBox ck_ypsm;
         private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.TextBox tb_yjwb;
-        private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox ck_klcc_xsmk;
         private System.Windows.Forms.CheckBox ck_ysfx_xsmk;
         private System.Windows.Forms.CheckBox ck_kllb_xsmk;
-        private System.Windows.Forms.CheckBox ck_ym;
         private System.Windows.Forms.Label label33;
         private System.Windows.Forms.ListView lbv_syxt_mblb;
         private System.Windows.Forms.Button button6;
@@ -895,5 +885,8 @@
         private System.Windows.Forms.TextBox tb_djsb;
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.TextBox tb_npsb;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.TextBox tb_ypmc;
+        private System.Windows.Forms.Label lname;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -49,8 +49,14 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             BindControl();
             //读取默认值
             LoadControls();
-            fielddata = new ParticleData(m_OTSReport_Export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_OTSReport_Export.m_ReportApp.m_rstDataMgr.GetWorkingResultId()].FilePath);
-            DeleteClass_Serial = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial;
+            try
+            {
+                fielddata = new ParticleData(m_OTSReport_Export.m_ReportApp.m_rstDataMgr.ResultFilesList[m_OTSReport_Export.m_ReportApp.m_rstDataMgr.GetWorkingResultId()].FilePath);
+            }catch
+            {
+
+            }
+             DeleteClass_Serial = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial;
         }
 
         /// <summary>
@@ -155,6 +161,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT.ToString(), "M_SY", "str_tb_ZBT");
                 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.b_ck_ypsm.ToString(), "M_SY", "b_ck_ypsm");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.LOGName.ToString(), "M_SY", "LOGName");
@@ -165,7 +172,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 //页眉页脚
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_ymwb.ToString(), "M_YMYJ", "str_tb_ymwb");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_KHH.ToString(), "M_YMYJ", "str_tb_KHH");
-                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym.ToString(), "M_YMYJ", "b_ck_ym");
+                //xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.b_ck_ym.ToString(), "M_YMYJ", "b_ck_ym");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YMYJ.str_tb_yjwb.ToString(), "M_YMYJ", "str_tb_yjwb");
                 //颗粒分析结果
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk.ToString(), "M_KLFXJG", "b_ck_klcc_xsmk");//是否显示模块
@@ -385,6 +392,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT = tb_ZBT.Text;
             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_YMYJ.str_tb_yjwb = tb_yjwb.Text;
 
@@ -440,9 +448,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             tb_ZBT.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT;
             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;
             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;
+            //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;
 
             tb_djsb.Text = m_OTSReport_Export.m_mbszclass.M_SY.str_tb_djsb;
@@ -843,48 +852,57 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         private void button3_Click(object sender, EventArgs e)
         {
-            DataTable fieldData = fielddata.GetAreaByAllIncA("");
-
-            DataTable data = new DataTable();
-            data.Columns.Add("STDId");
-            data.Columns.Add("StrName");
-            for (int i=0;i< fieldData.Rows.Count;i++)
+            try
             {
-                if(Convert.ToInt32(fieldData.Rows[i]["TypeId"])>10)
-                {
-                    DataRow dr = data.NewRow();
-                    dr["STDId"] = fieldData.Rows[i]["TypeId"];
-                    dr["StrName"] = fieldData.Rows[i]["TypeName"];
-                    data.Rows.Add(dr);
-                }
-            }
-            Category category = new Category(DeleteClass_Serial, data, true);
-            category.ShowDialog();
-            if(category.IsModify)
-            {
-                //List<string> ls = category.OutElementList;
-                DeleteClass_Serial = category.vs.Copy();
-                var MainPriority = category.OutElementList.Copy();
-
-                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Clear();
-                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial= DeleteClass_Serial.Copy();
-                
-                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass = MainPriority.Copy();
-                string str = "";
-                for (int i = 0; i < MainPriority.Count; i++)
+                DataTable fieldData = fielddata.GetAreaByAllIncA("");
+
+                DataTable data = new DataTable();
+                data.Columns.Add("STDId");
+                data.Columns.Add("StrName");
+                for (int i = 0; i < fieldData.Rows.Count; i++)
                 {
-                    if (str == "")
+                    if (Convert.ToInt32(fieldData.Rows[i]["TypeId"]) > 10)
                     {
-                        str = str + MainPriority[i];
+                        DataRow dr = data.NewRow();
+                        dr["STDId"] = fieldData.Rows[i]["TypeId"];
+                        dr["StrName"] = fieldData.Rows[i]["TypeName"];
+                        data.Rows.Add(dr);
                     }
-                    else
+                }
+                Category category = new Category(DeleteClass_Serial, data, true);
+                category.ShowDialog();
+                if (category.IsModify)
+                {
+                    //List<string> ls = category.OutElementList;
+                    DeleteClass_Serial = category.vs.Copy();
+                    var MainPriority = category.OutElementList.Copy();
+
+                    m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Clear();
+                    m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial = DeleteClass_Serial.Copy();
+
+                    m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass = MainPriority.Copy();
+                    string str = "";
+                    for (int i = 0; i < MainPriority.Count; i++)
                     {
-                        str = str + "," + MainPriority[i];
+                        if (str == "")
+                        {
+                            str = str + MainPriority[i];
+                        }
+                        else
+                        {
+                            str = str + "," + MainPriority[i];
+                        }
                     }
-                }
 
-                delete_Class.Text = str;
+                    delete_Class.Text = str;
+                }
+            }
+            catch
+            { 
             }
+
+
+         
       
         }
     }

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

@@ -39,6 +39,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
             this.dev_yj = new DevExpress.XtraReports.UI.XRLabel();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.dev_ypmc_text_up = new DevExpress.XtraReports.UI.XRLabel();
+            this.dev_ypmc_up = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
@@ -158,6 +160,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_bgsj_text = new DevExpress.XtraReports.UI.XRTableCell();
             this.dev_fdbs = new DevExpress.XtraReports.UI.XRTableCell();
             this.dev_fdbs_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.dev_sb_text = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.dev_np_text = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrPageBreak1 = new DevExpress.XtraReports.UI.XRPageBreak();
             this.dev_bgsj_text_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_ypbh_text_up = new DevExpress.XtraReports.UI.XRLabel();
@@ -165,11 +172,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_ypbh_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_fbt = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_zbt = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.dev_sb_text = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.dev_np_text = new DevExpress.XtraReports.UI.XRTableCell();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xt_TCleannessA)).BeginInit();
@@ -249,6 +251,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // Detail
             // 
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.dev_ypmc_text_up,
+            this.dev_ypmc_up,
             this.xrLabel11,
             this.xrLabel10,
             this.xrLabel9,
@@ -290,6 +294,32 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Detail.HeightF = 5064.223F;
             this.Detail.Name = "Detail";
             // 
+            // dev_ypmc_text_up
+            // 
+            this.dev_ypmc_text_up.Font = new DevExpress.Drawing.DXFont("宋体", 9.75F);
+            this.dev_ypmc_text_up.LocationFloat = new DevExpress.Utils.PointFloat(346.0421F, 489.1667F);
+            this.dev_ypmc_text_up.Multiline = true;
+            this.dev_ypmc_text_up.Name = "dev_ypmc_text_up";
+            this.dev_ypmc_text_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.dev_ypmc_text_up.SizeF = new System.Drawing.SizeF(314.3748F, 23F);
+            this.dev_ypmc_text_up.StylePriority.UseFont = false;
+            this.dev_ypmc_text_up.StylePriority.UseTextAlignment = false;
+            this.dev_ypmc_text_up.Text = "dev_ypbh_text_up";
+            this.dev_ypmc_text_up.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // dev_ypmc_up
+            // 
+            this.dev_ypmc_up.Font = new DevExpress.Drawing.DXFont("宋体", 9.75F);
+            this.dev_ypmc_up.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 489.1667F);
+            this.dev_ypmc_up.Multiline = true;
+            this.dev_ypmc_up.Name = "dev_ypmc_up";
+            this.dev_ypmc_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.dev_ypmc_up.SizeF = new System.Drawing.SizeF(315.625F, 23F);
+            this.dev_ypmc_up.StylePriority.UseFont = false;
+            this.dev_ypmc_up.StylePriority.UseTextAlignment = false;
+            this.dev_ypmc_up.Text = "样品名称:";
+            this.dev_ypmc_up.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            // 
             // xrLabel11
             // 
             this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(83.60291F, 1460.75F);
@@ -1608,6 +1638,52 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_fdbs_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.dev_fdbs_text.Weight = 1D;
             // 
+            // xrTableRow19
+            // 
+            this.xrTableRow19.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell48,
+            this.dev_sb_text,
+            this.xrTableCell50,
+            this.dev_np_text});
+            this.xrTableRow19.Name = "xrTableRow19";
+            this.xrTableRow19.Weight = 1D;
+            // 
+            // xrTableCell48
+            // 
+            this.xrTableCell48.Multiline = true;
+            this.xrTableCell48.Name = "xrTableCell48";
+            this.xrTableCell48.StylePriority.UseTextAlignment = false;
+            this.xrTableCell48.Text = "电镜型号:";
+            this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell48.Weight = 1D;
+            // 
+            // dev_sb_text
+            // 
+            this.dev_sb_text.Multiline = true;
+            this.dev_sb_text.Name = "dev_sb_text";
+            this.dev_sb_text.StylePriority.UseTextAlignment = false;
+            this.dev_sb_text.Text = "dev_sb_text";
+            this.dev_sb_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.dev_sb_text.Weight = 1D;
+            // 
+            // xrTableCell50
+            // 
+            this.xrTableCell50.Multiline = true;
+            this.xrTableCell50.Name = "xrTableCell50";
+            this.xrTableCell50.StylePriority.UseTextAlignment = false;
+            this.xrTableCell50.Text = "能谱型号:";
+            this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell50.Weight = 1D;
+            // 
+            // dev_np_text
+            // 
+            this.dev_np_text.Multiline = true;
+            this.dev_np_text.Name = "dev_np_text";
+            this.dev_np_text.StylePriority.UseTextAlignment = false;
+            this.dev_np_text.Text = "dev_np_text";
+            this.dev_np_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.dev_np_text.Weight = 1D;
+            // 
             // xrPageBreak1
             // 
             this.xrPageBreak1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2003.542F);
@@ -1669,11 +1745,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_fbt
             // 
             this.dev_fbt.Font = new DevExpress.Drawing.DXFont("宋体", 18F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.dev_fbt.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 188.5416F);
+            this.dev_fbt.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 169.7916F);
             this.dev_fbt.Multiline = true;
             this.dev_fbt.Name = "dev_fbt";
             this.dev_fbt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.dev_fbt.SizeF = new System.Drawing.SizeF(629.9998F, 42.79169F);
+            this.dev_fbt.SizeF = new System.Drawing.SizeF(687.9998F, 107.375F);
             this.dev_fbt.StylePriority.UseFont = false;
             this.dev_fbt.StylePriority.UseTextAlignment = false;
             this.dev_fbt.Text = "dev_fbt";
@@ -1692,52 +1768,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_zbt.Text = "dev_zbt";
             this.dev_zbt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
-            // xrTableRow19
-            // 
-            this.xrTableRow19.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell48,
-            this.dev_sb_text,
-            this.xrTableCell50,
-            this.dev_np_text});
-            this.xrTableRow19.Name = "xrTableRow19";
-            this.xrTableRow19.Weight = 1D;
-            // 
-            // xrTableCell48
-            // 
-            this.xrTableCell48.Multiline = true;
-            this.xrTableCell48.Name = "xrTableCell48";
-            this.xrTableCell48.StylePriority.UseTextAlignment = false;
-            this.xrTableCell48.Text = "电镜型号:";
-            this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell48.Weight = 1D;
-            // 
-            // dev_sb_text
-            // 
-            this.dev_sb_text.Multiline = true;
-            this.dev_sb_text.Name = "dev_sb_text";
-            this.dev_sb_text.StylePriority.UseTextAlignment = false;
-            this.dev_sb_text.Text = "dev_sb_text";
-            this.dev_sb_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_sb_text.Weight = 1D;
-            // 
-            // xrTableCell50
-            // 
-            this.xrTableCell50.Multiline = true;
-            this.xrTableCell50.Name = "xrTableCell50";
-            this.xrTableCell50.StylePriority.UseTextAlignment = false;
-            this.xrTableCell50.Text = "能谱型号:";
-            this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell50.Weight = 1D;
-            // 
-            // dev_np_text
-            // 
-            this.dev_np_text.Multiline = true;
-            this.dev_np_text.Name = "dev_np_text";
-            this.dev_np_text.StylePriority.UseTextAlignment = false;
-            this.dev_np_text.Text = "dev_np_text";
-            this.dev_np_text.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_np_text.Weight = 1D;
-            // 
             // OTS_DEVReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1909,5 +1939,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private DevExpress.XtraReports.UI.XRTableCell dev_sb_text;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
         private DevExpress.XtraReports.UI.XRTableCell dev_np_text;
+        private DevExpress.XtraReports.UI.XRLabel dev_ypmc_text_up;
+        private DevExpress.XtraReports.UI.XRLabel dev_ypmc_up;
     }
 }

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

@@ -131,8 +131,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             basicData.IsThereAMajorClassification();
             basicData.IsResultFilesList(m_otsreport_export);
             basicData.IsFilePath(m_otsreport_export);
-
-            setXRLabelData(dev_ypbh_up, GetlanguageData("dev_ypbh_up",  dev_ypbh_up.Text));//样品编号（中间的）
+            setXRLabelData(dev_ypmc_up, "样品名称:");
+            setXRLabelData(dev_ypbh_up, "样品编号:");//样品编号（中间的）
+            //setXRLabelData(dev_ypmc_up, GetlanguageData("dev_ypmc_up", dev_ypmc_up.Text));
+            //setXRLabelData(dev_ypbh_up, GetlanguageData("dev_ypbh_up", dev_ypbh_up.Text));//样品编号（中间的）
             setXRLabelData(dev_bgsj_up, GetlanguageData("dev_bgsj_up", dev_bgsj_up.Text));//报告时间（中间的）
   
             setXRLabelData(dev_ypsm, GetlanguageData("dev_ypsm", dev_ypsm.Text));//表中样品说明
@@ -184,7 +186,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_flfa_text, data.Rows[3][1].ToString());//分类方案
             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());//放大倍数
+            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());//参考标准
             FieldOfViewArea= HeaderData.filedsArea.ToString();
@@ -194,6 +196,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_yj, TemplateClass.M_YMYJ.str_tb_yjwb.ToString());//页脚
             setXRLabelData(dev_zbt, TemplateClass.M_SY.str_tb_ZBT.ToString());//主标题
             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());//当前日期
 
@@ -249,7 +252,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 {
                     if (llstr[i].Count <= a)
                     {
-                        strings.Add("0");
+                        strings.Add("");
                     }
                     else
                     {
@@ -429,7 +432,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 {
                     if (llstr[i].Count <= a)
                     {
-                        strings.Add("0");
+                        //strings.Add("0");
+                        strings.Add("");
                     }
                     else
                     {

SpectrumSTDEditor/SpectrumSTDEditor.csproj

@@ -54,7 +54,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OTS.WinFormsUI.Docking">
-      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\WordApiDll\OTS.WinFormsUI.Docking.dll</HintPath>
+      <HintPath>..\OpenDll\WordApiDll\OTS.WinFormsUI.Docking.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="OTSClrInterface, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
@@ -63,7 +63,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="SourceGrid">
-      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\WordApiDll\SourceGrid.dll</HintPath>
+      <HintPath>..\OpenDll\WordApiDll\SourceGrid.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System">
@@ -77,7 +77,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Windows.Forms.Ribbon">
-      <HintPath>..\..\..\OTS2_7\OTS2_0\OpenDll\WordApiDll\System.Windows.Forms.Ribbon.dll</HintPath>
+      <HintPath>..\OpenDll\WordApiDll\System.Windows.Forms.Ribbon.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Xml.Linq">