Merge branch 'Release2.3' into Release2.31

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -309,6 +309,7 @@ namespace OTSIncAReportApp
                     //粒级表
 
                     var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
+                    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
                     list.Add(sampleData_partsizefile);
 
                     //粒级
@@ -367,6 +368,7 @@ namespace OTSIncAReportApp
                         //粒级表
 
                         var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
+                        m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
                         list.Add(sampleData_partsizefile);
 
 
@@ -396,6 +398,7 @@ namespace OTSIncAReportApp
                     //粒级表
 
                     var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
+                    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile= sampleData_partsizefile.itemDisplayVal.ToString();
                     list.Add(sampleData_partsizefile);
 
                     //尺寸计算方法
@@ -457,6 +460,7 @@ namespace OTSIncAReportApp
                     //粒级表
 
                     var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
+                    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
                     list.Add(sampleData_partsizefile);
 
                     //尺寸计算方法
@@ -477,6 +481,7 @@ namespace OTSIncAReportApp
                     //粒级表
 
                     var sampleData_partsizefile = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.GRAIN_SIZE_CLASS_TABLE];
+                    m_ReportApp.m_rstDataMgr.m_RptConfigFile.PartSizeFile = sampleData_partsizefile.itemDisplayVal.ToString();
                     list.Add(sampleData_partsizefile);
 
                     //尺寸计算方法

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -64,6 +64,8 @@
             this.label22 = new System.Windows.Forms.Label();
             this.cb_yscf_xstx = new System.Windows.Forms.ComboBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.tb_ysfx_xsys = new System.Windows.Forms.TextBox();
+            this.button4 = new System.Windows.Forms.Button();
             this.ck_ysfx_xsmk = new System.Windows.Forms.CheckBox();
             this.label25 = new System.Windows.Forms.Label();
             this.groupBox7 = new System.Windows.Forms.GroupBox();
@@ -102,8 +104,6 @@
             this.panel3 = new System.Windows.Forms.Panel();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.label39 = new System.Windows.Forms.Label();
-            this.button4 = new System.Windows.Forms.Button();
-            this.tb_ysfx_xsys = new System.Windows.Forms.TextBox();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox5.SuspendLayout();
@@ -498,6 +498,25 @@
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "元素分析表";
             // 
+            // tb_ysfx_xsys
+            // 
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 66);
+            this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
+            this.tb_ysfx_xsys.Size = new System.Drawing.Size(173, 21);
+            this.tb_ysfx_xsys.TabIndex = 58;
+            // 
+            // button4
+            // 
+            this.button4.Location = new System.Drawing.Point(213, 66);
+            this.button4.Margin = new System.Windows.Forms.Padding(2);
+            this.button4.Name = "button4";
+            this.button4.Size = new System.Drawing.Size(37, 19);
+            this.button4.TabIndex = 57;
+            this.button4.Text = "...";
+            this.button4.UseVisualStyleBackColor = true;
+            this.button4.Click += new System.EventHandler(this.button4_Click);
+            // 
             // ck_ysfx_xsmk
             // 
             this.ck_ysfx_xsmk.AutoSize = true;
@@ -927,26 +946,6 @@
             this.label39.TabIndex = 75;
             this.label39.Text = "模板设置";
             // 
-            // button4
-            // 
-            this.button4.Location = new System.Drawing.Point(213, 66);
-            this.button4.Margin = new System.Windows.Forms.Padding(2);
-            this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(37, 19);
-            this.button4.TabIndex = 57;
-            this.button4.Text = "...";
-            this.button4.UseVisualStyleBackColor = true;
-            this.button4.Click += new System.EventHandler(this.button4_Click);
-            // 
-            // tb_ysfx_xsys
-            // 
-            this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 66);
-            this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
-            this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
-            this.tb_ysfx_xsys.ReadOnly = true;
-            this.tb_ysfx_xsys.Size = new System.Drawing.Size(173, 21);
-            this.tb_ysfx_xsys.TabIndex = 58;
-            // 
             // OTSReport_TemplateDesignerRM
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);