Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

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

@@ -102,9 +102,9 @@
     <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
     <str_cb_kllb_sort>Hardness</str_cb_kllb_sort>
     <index_cb_kllb_sort>2</index_cb_kllb_sort>
-    <index_cb_kllb_sort_p1>1</index_cb_kllb_sort_p1>
-    <str_cb_kllb_sort_p2>Area</str_cb_kllb_sort_p2>
-    <index_cb_kllb_sort_p2>0</index_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p1>0</index_cb_kllb_sort_p1>
+    <str_cb_kllb_sort_p2>DMAX</str_cb_kllb_sort_p2>
+    <index_cb_kllb_sort_p2>1</index_cb_kllb_sort_p2>
     <str_cb_kllb_sort_p3>AveGray</str_cb_kllb_sort_p3>
     <index_cb_kllb_sort_p3>2</index_cb_kllb_sort_p3>
     <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
@@ -113,7 +113,7 @@
     <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
     <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>
+    <str_cb_kllb_sort_p1>Area</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
       <YS0>C</YS0>
@@ -139,4 +139,8 @@
     </str_MainPriority>
     <str_SecondaryPriority>Nialloy,Fe-O,Fe-Cr,Fe-alloy</str_SecondaryPriority>
   </whole>
+  <M_DZ>
+    <Notes>
+    </Notes>
+  </M_DZ>
 </XmlConfig>

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

@@ -119,7 +119,11 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             }
             else
             {
-                dt_ParticlesGridDevidePage = dt.Copy();
+                DataView dvs = dt.DefaultView;
+                dvs.Sort = m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + " DESC";
+                dt_ParticlesGridDevidePage = dvs.ToTable();
+
+                //dt_ParticlesGridDevidePage = dt.Copy();
             }
 
             

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Export.cs

@@ -40,7 +40,7 @@ namespace OTSIncAReportApp
         public class c_TemplateClass
         {
             /// <summary>
-            /// 配置文件路径
+            /// 备注信息，及路径
             /// </summary>
             public DZ M_DZ { get; set; }
 
@@ -127,6 +127,10 @@ namespace OTSIncAReportApp
             public class DZ
             {
                 public string route { get; set; }
+                /// <summary>
+                /// 备注
+                /// </summary>
+                public string Notes { get; set; }
             }
 
             #region 首页部份
@@ -1063,7 +1067,9 @@ namespace OTSIncAReportApp
 
             m_mbszclass.M_KLFXJG.b_ck_klcc_dfl = Convert.ToBoolean(xmlutil.Read("M_KLFXJG", "b_ck_klcc_dfl"));
             m_mbszclass.M_KLFXJG.b_ck_klcc_xfl = Convert.ToBoolean(xmlutil.Read("M_KLFXJG", "b_ck_klcc_xfl"));
-           
+
+
+            m_mbszclass.M_DZ.Notes = Convert.ToString(xmlutil.Read("M_DZ", "Notes"));
         }
         #endregion
         private void button7_Click(object sender, EventArgs e)

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

@@ -83,6 +83,9 @@
             this.label7 = new System.Windows.Forms.Label();
             this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.label_StandardLibraryName = new System.Windows.Forms.Label();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -91,6 +94,8 @@
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox4.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.groupBox6.SuspendLayout();
             this.SuspendLayout();
             // 
             // tb_FBT
@@ -131,7 +136,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(815, 580);
+            this.button1.Location = new System.Drawing.Point(821, 667);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(70, 30);
@@ -219,7 +224,7 @@
             // 
             // tb_yjwb
             // 
-            this.tb_yjwb.Location = new System.Drawing.Point(9, 56);
+            this.tb_yjwb.Location = new System.Drawing.Point(9, 65);
             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);
@@ -247,9 +252,6 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.pictureBox7);
-            this.groupBox1.Controls.Add(this.label8312);
-            this.groupBox1.Controls.Add(this.button1217);
             this.groupBox1.Controls.Add(this.ck_ym);
             this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.tb_yjwb);
@@ -258,14 +260,14 @@
             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, 293);
+            this.groupBox1.Size = new System.Drawing.Size(263, 114);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "页脚设置";
             // 
             // pictureBox7
             // 
-            this.pictureBox7.Location = new System.Drawing.Point(9, 137);
+            this.pictureBox7.Location = new System.Drawing.Point(9, 98);
             this.pictureBox7.Name = "pictureBox7";
             this.pictureBox7.Size = new System.Drawing.Size(249, 144);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -275,7 +277,7 @@
             // label8312
             // 
             this.label8312.AutoSize = true;
-            this.label8312.Location = new System.Drawing.Point(10, 108);
+            this.label8312.Location = new System.Drawing.Point(18, 44);
             this.label8312.Name = "label8312";
             this.label8312.Size = new System.Drawing.Size(47, 12);
             this.label8312.TabIndex = 54;
@@ -283,7 +285,7 @@
             // 
             // button1217
             // 
-            this.button1217.Location = new System.Drawing.Point(174, 103);
+            this.button1217.Location = new System.Drawing.Point(182, 39);
             this.button1217.Name = "button1217";
             this.button1217.Size = new System.Drawing.Size(75, 23);
             this.button1217.TabIndex = 53;
@@ -552,7 +554,7 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(741, 580);
+            this.button6.Location = new System.Drawing.Point(747, 667);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(70, 30);
@@ -624,7 +626,7 @@
             this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
             this.groupBox3.Location = new System.Drawing.Point(281, 206);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(684, 369);
+            this.groupBox3.Size = new System.Drawing.Size(684, 349);
             this.groupBox3.TabIndex = 78;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
@@ -640,7 +642,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(889, 580);
+            this.button7.Location = new System.Drawing.Point(895, 667);
             this.button7.Margin = new System.Windows.Forms.Padding(2);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(70, 30);
@@ -685,17 +687,49 @@
             // label_StandardLibraryName
             // 
             this.label_StandardLibraryName.AutoSize = true;
-            this.label_StandardLibraryName.Location = new System.Drawing.Point(21, 598);
+            this.label_StandardLibraryName.Location = new System.Drawing.Point(16, 676);
             this.label_StandardLibraryName.Name = "label_StandardLibraryName";
             this.label_StandardLibraryName.Size = new System.Drawing.Size(41, 12);
             this.label_StandardLibraryName.TabIndex = 69;
             this.label_StandardLibraryName.Text = "label7";
             // 
+            // groupBox5
+            // 
+            this.groupBox5.Controls.Add(this.textBox1);
+            this.groupBox5.Location = new System.Drawing.Point(281, 557);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.Size = new System.Drawing.Size(684, 98);
+            this.groupBox5.TabIndex = 69;
+            this.groupBox5.TabStop = false;
+            this.groupBox5.Text = "备注";
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(4, 20);
+            this.textBox1.Multiline = true;
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(674, 72);
+            this.textBox1.TabIndex = 66;
+            // 
+            // groupBox6
+            // 
+            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(11, 401);
+            this.groupBox6.Name = "groupBox6";
+            this.groupBox6.Size = new System.Drawing.Size(263, 254);
+            this.groupBox6.TabIndex = 80;
+            this.groupBox6.TabStop = false;
+            this.groupBox6.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, 622);
+            this.ClientSize = new System.Drawing.Size(977, 708);
+            this.Controls.Add(this.groupBox5);
+            this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.label_StandardLibraryName);
             this.Controls.Add(this.button7);
             this.Controls.Add(this.button6);
@@ -729,6 +763,10 @@
             this.groupBox3.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox5.PerformLayout();
+            this.groupBox6.ResumeLayout(false);
+            this.groupBox6.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -790,5 +828,8 @@
         private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.Label label_StandardLibraryName;
         private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.GroupBox groupBox6;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -332,11 +332,16 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                
                 
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb, "M_SYXT", "str_cb_syxt_ljb");
+
+                //备注
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_DZ.Notes, "M_DZ", "Notes");
             }
         }
 
         private void SaveTemplateParameters()
         {
+            m_OTSReport_Export.m_mbszclass.M_DZ.Notes = textBox1.Text;
+
             string[] after = tb_ysfx_xsys.Text.Split(new char[] { ',' });
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Clear();
             for (int i = 0; i < after.Length; i++)
@@ -441,6 +446,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             textBox_zypxss.Text = m_OTSReport_Export.m_mbszclass.str_MainPriority;
 
             numericMin.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number.ToString();
+
+
+            textBox1.Text = m_OTSReport_Export.m_mbszclass.M_DZ.Notes;
+
             LoadingIcon();
         }
         private void  LoadingIcon()

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

@@ -86,6 +86,9 @@
             this.label7 = new System.Windows.Forms.Label();
             this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.label_StandardLibraryName = new System.Windows.Forms.Label();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -94,6 +97,8 @@
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
             this.groupBox4.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.groupBox6.SuspendLayout();
             this.SuspendLayout();
             // 
             // tb_FBT
@@ -134,7 +139,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(835, 645);
+            this.button1.Location = new System.Drawing.Point(841, 754);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(70, 30);
@@ -250,9 +255,6 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.pictureBox7);
-            this.groupBox1.Controls.Add(this.label8312);
-            this.groupBox1.Controls.Add(this.button1217);
             this.groupBox1.Controls.Add(this.ck_ym);
             this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.tb_yjwb);
@@ -261,16 +263,16 @@
             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, 301);
+            this.groupBox1.Size = new System.Drawing.Size(263, 138);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "页脚设置";
             // 
             // pictureBox7
             // 
-            this.pictureBox7.Location = new System.Drawing.Point(7, 144);
+            this.pictureBox7.Location = new System.Drawing.Point(8, 84);
             this.pictureBox7.Name = "pictureBox7";
-            this.pictureBox7.Size = new System.Drawing.Size(249, 144);
+            this.pictureBox7.Size = new System.Drawing.Size(249, 154);
             this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox7.TabIndex = 55;
             this.pictureBox7.TabStop = false;
@@ -278,7 +280,7 @@
             // label8312
             // 
             this.label8312.AutoSize = true;
-            this.label8312.Location = new System.Drawing.Point(17, 116);
+            this.label8312.Location = new System.Drawing.Point(18, 43);
             this.label8312.Name = "label8312";
             this.label8312.Size = new System.Drawing.Size(47, 12);
             this.label8312.TabIndex = 54;
@@ -286,7 +288,7 @@
             // 
             // button1217
             // 
-            this.button1217.Location = new System.Drawing.Point(181, 111);
+            this.button1217.Location = new System.Drawing.Point(182, 38);
             this.button1217.Name = "button1217";
             this.button1217.Size = new System.Drawing.Size(75, 23);
             this.button1217.TabIndex = 53;
@@ -570,7 +572,7 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(761, 645);
+            this.button6.Location = new System.Drawing.Point(767, 754);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(70, 30);
@@ -657,7 +659,7 @@
             this.groupBox3.Controls.Add(this.ck_klcc_xsmk);
             this.groupBox3.Location = new System.Drawing.Point(282, 199);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(703, 441);
+            this.groupBox3.Size = new System.Drawing.Size(703, 442);
             this.groupBox3.TabIndex = 78;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
@@ -684,7 +686,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(909, 645);
+            this.button7.Location = new System.Drawing.Point(915, 754);
             this.button7.Margin = new System.Windows.Forms.Padding(2);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(70, 30);
@@ -728,17 +730,49 @@
             // label_StandardLibraryName
             // 
             this.label_StandardLibraryName.AutoSize = true;
-            this.label_StandardLibraryName.Location = new System.Drawing.Point(16, 654);
+            this.label_StandardLibraryName.Location = new System.Drawing.Point(16, 763);
             this.label_StandardLibraryName.Name = "label_StandardLibraryName";
             this.label_StandardLibraryName.Size = new System.Drawing.Size(41, 12);
             this.label_StandardLibraryName.TabIndex = 80;
             this.label_StandardLibraryName.Text = "label7";
             // 
+            // groupBox5
+            // 
+            this.groupBox5.Controls.Add(this.textBox1);
+            this.groupBox5.Location = new System.Drawing.Point(282, 647);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.Size = new System.Drawing.Size(703, 98);
+            this.groupBox5.TabIndex = 68;
+            this.groupBox5.TabStop = false;
+            this.groupBox5.Text = "备注";
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(4, 20);
+            this.textBox1.Multiline = true;
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(693, 72);
+            this.textBox1.TabIndex = 66;
+            // 
+            // groupBox6
+            // 
+            this.groupBox6.Controls.Add(this.pictureBox7);
+            this.groupBox6.Controls.Add(this.label8312);
+            this.groupBox6.Controls.Add(this.button1217);
+            this.groupBox6.Location = new System.Drawing.Point(13, 482);
+            this.groupBox6.Name = "groupBox6";
+            this.groupBox6.Size = new System.Drawing.Size(263, 263);
+            this.groupBox6.TabIndex = 69;
+            this.groupBox6.TabStop = false;
+            this.groupBox6.Text = "图标选择";
+            // 
             // OTSReport_Template_INCA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(995, 687);
+            this.ClientSize = new System.Drawing.Size(995, 795);
+            this.Controls.Add(this.groupBox5);
+            this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.label_StandardLibraryName);
             this.Controls.Add(this.button7);
             this.Controls.Add(this.groupBox4);
@@ -772,6 +806,10 @@
             this.groupBox3.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox5.PerformLayout();
+            this.groupBox6.ResumeLayout(false);
+            this.groupBox6.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -836,5 +874,8 @@
         private System.Windows.Forms.Label label7;
         private System.Windows.Forms.ComboBox comboBox1;
         private System.Windows.Forms.Label label_StandardLibraryName;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.GroupBox groupBox6;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -357,11 +357,16 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 
                 
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb, "M_SYXT", "str_cb_syxt_ljb");
+
+                //备注
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_DZ.Notes, "M_DZ", "Notes");
             }
         }
 
         private void SaveTemplateParameters()
         {
+            m_OTSReport_Export.m_mbszclass.M_DZ.Notes = textBox1.Text;
+
             string[] after = tb_ysfx_xsys.Text.Split(new char[] { ',' });
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Clear();
             for (int i = 0; i < after.Length; i++)
@@ -497,6 +502,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             ck_jzwzb_surface.Checked = m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_surface;//夹杂物占比表
         
             numericMin.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number.ToString();
+
+            textBox1.Text = m_OTSReport_Export.m_mbszclass.M_DZ.Notes;
             LoadingIcon();
         }
         private void  LoadingIcon()

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

@@ -38,6 +38,9 @@ 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.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrChart1 = new DevExpress.XtraReports.UI.XRChart();
             this.xrLabel_size_IconQuestion_Subdivision = new DevExpress.XtraReports.UI.XRLabel();
             this.xrChart_ParticelSizeSubdivision = new DevExpress.XtraReports.UI.XRChart();
@@ -92,6 +95,10 @@ 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.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).BeginInit();
@@ -100,6 +107,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaClass)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // TopMargin
@@ -165,6 +173,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // Detail
             // 
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3,
+            this.xrTable2,
             this.xrChart1,
             this.xrLabel_size_IconQuestion_Subdivision,
             this.xrChart_ParticelSizeSubdivision,
@@ -187,6 +197,35 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Detail.HeightF = 5064.223F;
             this.Detail.Name = "Detail";
             // 
+            // xrTable2
+            // 
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 803.5415F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow8});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(629.3747F, 25F);
+            // 
+            // xrTableRow8
+            // 
+            this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1});
+            this.xrTableRow8.Name = "xrTableRow8";
+            this.xrTableRow8.Weight = 1D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.BackColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold);
+            this.xrTableCell1.Multiline = true;
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.StylePriority.UseBackColor = false;
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UseTextAlignment = false;
+            this.xrTableCell1.Text = "备注";
+            this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell1.Weight = 1D;
+            // 
             // xrChart1
             // 
             this.xrChart1.BorderColor = System.Drawing.Color.Black;
@@ -425,7 +464,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 714.5F);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(29.79177F, 596.7916F);
             this.xrTable1.Name = "xrTable1";
             this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
             this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -698,7 +737,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_bgsj_text_up
             // 
             this.dev_bgsj_text_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_bgsj_text_up.LocationFloat = new DevExpress.Utils.PointFloat(345.4168F, 644.2963F);
+            this.dev_bgsj_text_up.LocationFloat = new DevExpress.Utils.PointFloat(345.4168F, 562.0046F);
             this.dev_bgsj_text_up.Multiline = true;
             this.dev_bgsj_text_up.Name = "dev_bgsj_text_up";
             this.dev_bgsj_text_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -711,7 +750,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_ypbh_text_up
             // 
             this.dev_ypbh_text_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_ypbh_text_up.LocationFloat = new DevExpress.Utils.PointFloat(345.4168F, 609.375F);
+            this.dev_ypbh_text_up.LocationFloat = new DevExpress.Utils.PointFloat(345.4168F, 527.0833F);
             this.dev_ypbh_text_up.Multiline = true;
             this.dev_ypbh_text_up.Name = "dev_ypbh_text_up";
             this.dev_ypbh_text_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -724,7 +763,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_bgsj_up
             // 
             this.dev_bgsj_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_bgsj_up.LocationFloat = new DevExpress.Utils.PointFloat(29.79177F, 644.2963F);
+            this.dev_bgsj_up.LocationFloat = new DevExpress.Utils.PointFloat(29.79177F, 562.0046F);
             this.dev_bgsj_up.Multiline = true;
             this.dev_bgsj_up.Name = "dev_bgsj_up";
             this.dev_bgsj_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -737,7 +776,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_ypbh_up
             // 
             this.dev_ypbh_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_ypbh_up.LocationFloat = new DevExpress.Utils.PointFloat(29.79177F, 609.375F);
+            this.dev_ypbh_up.LocationFloat = new DevExpress.Utils.PointFloat(29.79177F, 527.0833F);
             this.dev_ypbh_up.Multiline = true;
             this.dev_ypbh_up.Name = "dev_ypbh_up";
             this.dev_ypbh_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -773,6 +812,29 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_zbt.Text = "dev_zbt";
             this.dev_zbt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
+            // xrTable3
+            // 
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 828.5415F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow9});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(630.0001F, 90.625F);
+            // 
+            // xrTableRow9
+            // 
+            this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3});
+            this.xrTableRow9.Name = "xrTableRow9";
+            this.xrTableRow9.Weight = 1D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Multiline = true;
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Text = "xrTableCell3";
+            this.xrTableCell3.Weight = 1D;
+            // 
             // OTS_DEVReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -782,6 +844,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Font = new System.Drawing.Font("Arial", 9.75F);
             this.Margins = new System.Drawing.Printing.Margins(77, 85, 73, 67);
             this.Version = "21.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).EndInit();
@@ -790,6 +853,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaClass)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -858,5 +922,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private DevExpress.XtraReports.UI.XRTableCell xrTable_kllb;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow17;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
     }
 }

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

@@ -108,11 +108,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
      
             //夹杂物面积比图
             setXRLabelData(xrLabel_inca_pic_class, GetlanguageData(xrLabel_inca_pic_class.Name.ToString(), languageData));//夹杂物面积比图
-            setXRLabelData(xrLabel_inca_pic_subdivision, GetlanguageData(xrLabel_inca_pic_subdivision.Name.ToString(), languageData));//夹杂物面积比细分图
-            
+            //setXRLabelData(xrTableCell1, GetlanguageData(xrTableCell1.Name.ToString(), languageData));//备注
+            setXRLabelData(xrTableCell1, "Notes");//备注
             //颗粒尺寸表
             //Bitmap bitmap = (Bitmap)Image.FromFile(str3 + "\\Config\\ReportTemplate\\ReportIdentification.bmp");
-            
+            setXRLabelData(xrLabel_inca_pic_class, GetlanguageData(xrLabel_inca_pic_class.Name.ToString(), languageData));
             Bitmap bitmap = (Bitmap)Image.FromFile(System.IO.Directory.GetCurrentDirectory() + "\\Config\\ReportTemplate\\"+ TemplateClass.M_SY.LOGName);
             xrPictureBox1.ImageSource = new ImageSource(bitmap);
             xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
@@ -147,12 +147,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_fbt, TemplateClass.M_SY.str_tb_FBT.ToString());//副标题
             setXRLabelData(dev_ypbh_text_up, TemplateClass.M_SY.str_tb_YPBH.ToString());//样品编号
             setXRLabelData(dev_bgsj_text_up, DateTime.Now.ToShortDateString().ToString());//当前日期
-
+            //setXRLabelData(xrTableCell1, xrTableCell1)
             #endregion
             if (a_isINCA)
                 xrTable1.Rows.Add(AddInclusionIndex(a_languageData, data.Rows[7][1].ToString()));
 
-            
+
+            xrTableCell3.Text = TemplateClass.M_DZ.Notes.ToString();
+            xrTable3.SizeF = new SizeF(630f, 90.62f);
+            xrTable3.Borders = DevExpress.XtraPrinting.BorderSide.All;
+            xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.All;
+
+            if(TemplateClass.M_DZ.Notes.ToString()=="")
+            {
+                xrTable3.Visible = false;
+                xrTable2.Visible = false;
+
+                xrTable1.LocationF = new PointF(30.42f, 721.79f);
+            }
+            //630, 90.62.
+
+
         }
    
         private void add_SetTableS(List<DataTable> CompositeData, DataTable surface_dt2)

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

@@ -299,7 +299,8 @@ namespace OTSIncAReportApp.ReportTemplate
             setXRLabelData(GB_dev_sczs_text, tb.Rows.Count.ToString());
             setXRLabelData(GB_dev_flfa_text, str_FLFA);
             setXRLabelData(GB_dev_yjctz_text, str_YJCTZ);
-            setXRLabelData(GB_dev_scmj_text, str_SCMJ);
+
+            setXRLabelData(GB_dev_scmj_text, (tb.Rows.Count*0.5).ToString());
             setXRLabelData(GB_dev_ckbz_text, "GB30834");
         }
     }