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

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

@@ -53,6 +53,8 @@
             this.tb_ymwb = new System.Windows.Forms.TextBox();
             this.label8 = new System.Windows.Forms.Label();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.ck_klcc_xsddt = new System.Windows.Forms.CheckBox();
+            this.label111231 = new System.Windows.Forms.Label();
             this.checkBox2 = new System.Windows.Forms.CheckBox();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.label11zxc = new System.Windows.Forms.Label();
@@ -123,8 +125,6 @@
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.label39 = new System.Windows.Forms.Label();
             this.cb_ParticleRange = new System.Windows.Forms.ComboBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.ck_klcc_xsddt = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox6.SuspendLayout();
@@ -381,7 +381,7 @@
             // groupBox4
             // 
             this.groupBox4.Controls.Add(this.ck_klcc_xsddt);
-            this.groupBox4.Controls.Add(this.label11);
+            this.groupBox4.Controls.Add(this.label111231);
             this.groupBox4.Controls.Add(this.checkBox2);
             this.groupBox4.Controls.Add(this.checkBox1);
             this.groupBox4.Controls.Add(this.label11zxc);
@@ -401,6 +401,26 @@
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "颗粒尺寸分析结果";
             // 
+            // ck_klcc_xsddt
+            // 
+            this.ck_klcc_xsddt.AutoSize = true;
+            this.ck_klcc_xsddt.Location = new System.Drawing.Point(224, 50);
+            this.ck_klcc_xsddt.Margin = new System.Windows.Forms.Padding(2);
+            this.ck_klcc_xsddt.Name = "ck_klcc_xsddt";
+            this.ck_klcc_xsddt.Size = new System.Drawing.Size(15, 14);
+            this.ck_klcc_xsddt.TabIndex = 59;
+            this.ck_klcc_xsddt.UseVisualStyleBackColor = true;
+            // 
+            // label111231
+            // 
+            this.label111231.AutoSize = true;
+            this.label111231.Location = new System.Drawing.Point(12, 50);
+            this.label111231.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label111231.Name = "label111231";
+            this.label111231.Size = new System.Drawing.Size(65, 12);
+            this.label111231.TabIndex = 58;
+            this.label111231.Text = "显示堆叠图";
+            // 
             // checkBox2
             // 
             this.checkBox2.AutoSize = true;
@@ -509,7 +529,7 @@
             this.groupBox6.Controls.Add(this.button4);
             this.groupBox6.Controls.Add(this.ck_ysfx_xsmk);
             this.groupBox6.Controls.Add(this.label25);
-            this.groupBox6.Location = new System.Drawing.Point(3, 744);
+            this.groupBox6.Location = new System.Drawing.Point(3, 671);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
@@ -588,7 +608,7 @@
             this.groupBox7.Controls.Add(this.label38);
             this.groupBox7.Controls.Add(this.label33);
             this.groupBox7.Controls.Add(this.label42);
-            this.groupBox7.Location = new System.Drawing.Point(3, 882);
+            this.groupBox7.Location = new System.Drawing.Point(3, 809);
             this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
@@ -698,7 +718,7 @@
             this.groupBox8.Controls.Add(this.groupBox_px);
             this.groupBox8.Controls.Add(this.ck_kllb_xsmk);
             this.groupBox8.Controls.Add(this.label34);
-            this.groupBox8.Location = new System.Drawing.Point(3, 1313);
+            this.groupBox8.Location = new System.Drawing.Point(3, 1240);
             this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
@@ -1060,7 +1080,7 @@
             this.groupBox211.Controls.Add(this.label1311);
             this.groupBox211.Controls.Add(this.label1211);
             this.groupBox211.Controls.Add(this.ck_jzwzb_surface);
-            this.groupBox211.Location = new System.Drawing.Point(3, 1847);
+            this.groupBox211.Location = new System.Drawing.Point(3, 1774);
             this.groupBox211.Name = "groupBox211";
             this.groupBox211.Size = new System.Drawing.Size(263, 81);
             this.groupBox211.TabIndex = 8;
@@ -1107,7 +1127,7 @@
             // groupBZ
             // 
             this.groupBZ.Controls.Add(this.textBox_strBZ);
-            this.groupBZ.Location = new System.Drawing.Point(3, 1934);
+            this.groupBZ.Location = new System.Drawing.Point(3, 1861);
             this.groupBZ.Name = "groupBZ";
             this.groupBZ.Size = new System.Drawing.Size(263, 139);
             this.groupBZ.TabIndex = 7;
@@ -1164,26 +1184,6 @@
             this.cb_ParticleRange.Size = new System.Drawing.Size(121, 20);
             this.cb_ParticleRange.TabIndex = 76;
             // 
-            // label11
-            // 
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(12, 50);
-            this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(65, 12);
-            this.label11.TabIndex = 58;
-            this.label11.Text = "显示堆叠图";
-            // 
-            // ck_klcc_xsddt
-            // 
-            this.ck_klcc_xsddt.AutoSize = true;
-            this.ck_klcc_xsddt.Location = new System.Drawing.Point(224, 50);
-            this.ck_klcc_xsddt.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_klcc_xsddt.Name = "ck_klcc_xsddt";
-            this.ck_klcc_xsddt.Size = new System.Drawing.Size(15, 14);
-            this.ck_klcc_xsddt.TabIndex = 59;
-            this.ck_klcc_xsddt.UseVisualStyleBackColor = true;
-            // 
             // OTSReport_TemplateDesignerRM
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1336,6 +1336,6 @@
         private System.Windows.Forms.Label label11zxc;
         private System.Windows.Forms.Label label1121ad;
         private System.Windows.Forms.CheckBox ck_klcc_xsddt;
-        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label label111231;
     }
 }

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -458,7 +458,14 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 {
                     if (dt2.Rows[i][a].ToString()!="")
                     {
-                        quantity = quantity + Convert.ToDouble(dt2.Rows[i][a].ToString());
+                        //int number=0;
+                        if (double.TryParse(dt2.Rows[i][a].ToString(), out double number))
+                        {
+                            //Console.WriteLine("字符串可以转换为数字");
+
+                            quantity = quantity + number;
+                        }
+                        //quantity = quantity + Convert.ToDouble(dt2.Rows[i][a].ToString());
                     }
                 }