Explorar o código

优化报告生产加建议功能

zhangjiaxin hai 5 meses
pai
achega
90f9633cdf

+ 71 - 56
OTSIncAReportApp/1-UI/GBCalculate/ASTMStandardABCDDS.cs

@@ -55,6 +55,8 @@ namespace OTSIncAReportGB
         private int m_oneresult_columnscount_D = 3;
         private int m_oneresult_columnscount_DS = 3;
 
+
+        string str_result = "";
         #endregion
 
         #region 自定义方法
@@ -287,7 +289,10 @@ namespace OTSIncAReportGB
             log_2.Text = "";
             log_3.Text = "";
             log_4.Text = "";
-            log_5.Text = "";
+            log_1_1.Text = "";
+            log_2_1.Text = "";
+            log_3_1.Text = "";
+            log_4_1.Text = "";
         }
 
         private void ASTMStandardABCDDS_Load(object sender, EventArgs e)
@@ -402,51 +407,78 @@ namespace OTSIncAReportGB
                 Gview_gzD.Width = panel1.Width;
                 Gview_gzDS.Width = panel1.Width;
                 int it = 0;
-                it = DetermineWhetherImprovementIsNeeded("A类", m_dt_A,  it);
-                it = DetermineWhetherImprovementIsNeeded("B类", m_dt_B,  it);
-                it = DetermineWhetherImprovementIsNeeded("C类", m_dt_C,  it);
-                it = DetermineWhetherImprovementIsNeeded("D类", m_dt_D,  it);
-
-                bool bl = false;
-                if (log_1.Text!=""|| log_2.Text != "" || log_3.Text != "" || log_4.Text != "" )
+                if (DetermineWhetherImprovementIsNeeded("A类", m_dt_A))
                 {
-                    bl = true;
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的MnS或硫化物夹杂物控制不够理想。" +
+                       "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
                 }
-                if(bl)
+                if (DetermineWhetherImprovementIsNeeded("B类", m_dt_B))
                 {
-                    if (it == 0)
-                    {
-                        log_1.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 1)
-                    {
-                        log_2.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 2)
-                    {
-                        log_3.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 3)
-                    {
-                        log_4.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 4)
-                    {
-                        log_5.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的不连续串(条)氧化物夹杂物控制不够理想。" +
+                    "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
+                }
+                if (DetermineWhetherImprovementIsNeeded("C类", m_dt_C))
+                {
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的串(条)状氧化物夹杂物控制不够理想。" +
+                      "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
+                }
+                if (DetermineWhetherImprovementIsNeeded("D类", m_dt_D))
+                {
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的单颗粒球状氧化物夹杂物控制不够理想。" +
+                     "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
                 }
             }
 
             Invalidate();
 
         }
-        private int  DetermineWhetherImprovementIsNeeded(string str, DataTable data, int it)
+        private void LabelAssignment(int it)
         {
-            
-            string Thin = ""; string  Thick = ""; string  OverSize = "";
-            for (int i=6;i< data.Columns.Count;i++)
+            if (it == 0)
+            {
+                log_1.Text = str_result;
+                log_1_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+             "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 1)
             {
-                if (Convert.ToInt32(data.Rows[0][i])>0)
+                log_2.Text = str_result;
+                log_2_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 2)
+            {
+                log_3.Text = str_result;
+                log_3_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 3)
+            {
+                log_4.Text = str_result;
+                log_4_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+        }
+        private bool DetermineWhetherImprovementIsNeeded(string str, DataTable data)
+        {
+
+            string Thin = ""; string Thick = ""; string OverSize = "";
+            for (int i = 6; i < data.Columns.Count; i++)
+            {
+                if (Convert.ToInt32(data.Rows[0][i]) > 0)
                 {
                     Thin = "细系";
                 }
@@ -459,31 +491,14 @@ namespace OTSIncAReportGB
                     OverSize = "超尺寸";
                 }
             }
-            string str_result = "";
+
             if (Thin != "" || Thick != "" || OverSize != "")
             {
-                str_result = str + "的" + Thin + Thick + OverSize + "指标超过国标2.0,则存在优化的空间。"/*如需了解更多详情,请咨询我司专业的售后专家服务系统。"*/;
-
-                if (it == 0)
-                {
-                    log_1.Text = str_result;
-                }else if(it == 1)
-                {
-                    log_2.Text = str_result;
-                }
-                else if (it == 2)
-                {
-                    log_3.Text = str_result;
-                }
-                else if (it == 3)
-                {
-                    log_4.Text = str_result;
-                }
+                str_result = str + "的" + Thin + Thick + OverSize;
+                return true;
 
-                it++;
-               
             }
-            return it;
+            return false;
         }
 
         #endregion

+ 98 - 46
OTSIncAReportApp/1-UI/GBCalculate/ASTMStandardABCDDS.designer.cs

@@ -65,12 +65,15 @@
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.pictureBox5 = new System.Windows.Forms.PictureBox();
-            this.log_1 = new System.Windows.Forms.Label();
-            this.log_2 = new System.Windows.Forms.Label();
-            this.log_3 = new System.Windows.Forms.Label();
             this.log_4 = new System.Windows.Forms.Label();
-            this.log_5 = new System.Windows.Forms.Label();
+            this.log_3 = new System.Windows.Forms.Label();
+            this.log_2 = new System.Windows.Forms.Label();
+            this.log_1 = new System.Windows.Forms.Label();
+            this.pictureBox5 = new System.Windows.Forms.PictureBox();
+            this.log_4_1 = new System.Windows.Forms.Label();
+            this.log_3_1 = new System.Windows.Forms.Label();
+            this.log_2_1 = new System.Windows.Forms.Label();
+            this.log_1_1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzA)).BeginInit();
             this.contextMenuStrip_A.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzB)).BeginInit();
@@ -414,7 +417,10 @@
             // 
             this.panel1.AutoScroll = true;
             this.panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.panel1.Controls.Add(this.log_5);
+            this.panel1.Controls.Add(this.log_4_1);
+            this.panel1.Controls.Add(this.log_3_1);
+            this.panel1.Controls.Add(this.log_2_1);
+            this.panel1.Controls.Add(this.log_1_1);
             this.panel1.Controls.Add(this.log_4);
             this.panel1.Controls.Add(this.log_3);
             this.panel1.Controls.Add(this.log_2);
@@ -434,61 +440,104 @@
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Margin = new System.Windows.Forms.Padding(2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1054, 930);
+            this.panel1.Size = new System.Drawing.Size(1054, 996);
             this.panel1.TabIndex = 12;
             // 
-            // pictureBox5
+            // log_4
             // 
-            this.pictureBox5.Location = new System.Drawing.Point(1235, 774);
-            this.pictureBox5.Name = "pictureBox5";
-            this.pictureBox5.Size = new System.Drawing.Size(169, 31);
-            this.pictureBox5.TabIndex = 11;
-            this.pictureBox5.TabStop = false;
+            this.log_4.AutoSize = true;
+            this.log_4.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_4.ForeColor = System.Drawing.Color.Red;
+            this.log_4.Location = new System.Drawing.Point(51, 930);
+            this.log_4.Name = "log_4";
+            this.log_4.Size = new System.Drawing.Size(56, 16);
+            this.log_4.TabIndex = 15;
+            this.log_4.Text = "label9";
             // 
-            // log_1
+            // log_3
             // 
-            this.log_1.AutoSize = true;
-            this.log_1.Location = new System.Drawing.Point(51, 804);
-            this.log_1.Name = "log_1";
-            this.log_1.Size = new System.Drawing.Size(41, 12);
-            this.log_1.TabIndex = 12;
-            this.log_1.Text = "label6";
+            this.log_3.AutoSize = true;
+            this.log_3.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_3.ForeColor = System.Drawing.Color.Red;
+            this.log_3.Location = new System.Drawing.Point(51, 888);
+            this.log_3.Name = "log_3";
+            this.log_3.Size = new System.Drawing.Size(56, 16);
+            this.log_3.TabIndex = 14;
+            this.log_3.Text = "label8";
             // 
             // log_2
             // 
             this.log_2.AutoSize = true;
-            this.log_2.Location = new System.Drawing.Point(51, 824);
+            this.log_2.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_2.ForeColor = System.Drawing.Color.Red;
+            this.log_2.Location = new System.Drawing.Point(51, 846);
             this.log_2.Name = "log_2";
-            this.log_2.Size = new System.Drawing.Size(41, 12);
+            this.log_2.Size = new System.Drawing.Size(56, 16);
             this.log_2.TabIndex = 13;
             this.log_2.Text = "label7";
             // 
-            // log_3
-            // 
-            this.log_3.AutoSize = true;
-            this.log_3.Location = new System.Drawing.Point(51, 844);
-            this.log_3.Name = "log_3";
-            this.log_3.Size = new System.Drawing.Size(41, 12);
-            this.log_3.TabIndex = 14;
-            this.log_3.Text = "label8";
+            // log_1
             // 
-            // log_4
+            this.log_1.AutoSize = true;
+            this.log_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_1.ForeColor = System.Drawing.Color.Red;
+            this.log_1.Location = new System.Drawing.Point(51, 804);
+            this.log_1.Name = "log_1";
+            this.log_1.Size = new System.Drawing.Size(56, 16);
+            this.log_1.TabIndex = 12;
+            this.log_1.Text = "label6";
             // 
-            this.log_4.AutoSize = true;
-            this.log_4.Location = new System.Drawing.Point(51, 864);
-            this.log_4.Name = "log_4";
-            this.log_4.Size = new System.Drawing.Size(41, 12);
-            this.log_4.TabIndex = 15;
-            this.log_4.Text = "label9";
+            // pictureBox5
             // 
-            // log_5
+            this.pictureBox5.Location = new System.Drawing.Point(1235, 774);
+            this.pictureBox5.Name = "pictureBox5";
+            this.pictureBox5.Size = new System.Drawing.Size(169, 31);
+            this.pictureBox5.TabIndex = 11;
+            this.pictureBox5.TabStop = false;
             // 
-            this.log_5.AutoSize = true;
-            this.log_5.Location = new System.Drawing.Point(51, 884);
-            this.log_5.Name = "log_5";
-            this.log_5.Size = new System.Drawing.Size(41, 12);
-            this.log_5.TabIndex = 16;
-            this.log_5.Text = "label6";
+            // log_4_1
+            // 
+            this.log_4_1.AutoSize = true;
+            this.log_4_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_4_1.ForeColor = System.Drawing.Color.Red;
+            this.log_4_1.Location = new System.Drawing.Point(51, 951);
+            this.log_4_1.Name = "log_4_1";
+            this.log_4_1.Size = new System.Drawing.Size(56, 16);
+            this.log_4_1.TabIndex = 20;
+            this.log_4_1.Text = "label9";
+            // 
+            // log_3_1
+            // 
+            this.log_3_1.AutoSize = true;
+            this.log_3_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_3_1.ForeColor = System.Drawing.Color.Red;
+            this.log_3_1.Location = new System.Drawing.Point(51, 909);
+            this.log_3_1.Name = "log_3_1";
+            this.log_3_1.Size = new System.Drawing.Size(56, 16);
+            this.log_3_1.TabIndex = 19;
+            this.log_3_1.Text = "label8";
+            // 
+            // log_2_1
+            // 
+            this.log_2_1.AutoSize = true;
+            this.log_2_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_2_1.ForeColor = System.Drawing.Color.Red;
+            this.log_2_1.Location = new System.Drawing.Point(51, 867);
+            this.log_2_1.Name = "log_2_1";
+            this.log_2_1.Size = new System.Drawing.Size(56, 16);
+            this.log_2_1.TabIndex = 18;
+            this.log_2_1.Text = "label7";
+            // 
+            // log_1_1
+            // 
+            this.log_1_1.AutoSize = true;
+            this.log_1_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_1_1.ForeColor = System.Drawing.Color.Red;
+            this.log_1_1.Location = new System.Drawing.Point(51, 825);
+            this.log_1_1.Name = "log_1_1";
+            this.log_1_1.Size = new System.Drawing.Size(56, 16);
+            this.log_1_1.TabIndex = 17;
+            this.log_1_1.Text = "label6";
             // 
             // ASTMStandardABCDDS
             // 
@@ -497,7 +546,7 @@
             this.Controls.Add(this.panel1);
             this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "ASTMStandardABCDDS";
-            this.Size = new System.Drawing.Size(1054, 930);
+            this.Size = new System.Drawing.Size(1054, 996);
             this.Load += new System.EventHandler(this.ASTMStandardABCDDS_Load);
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzA)).EndInit();
             this.contextMenuStrip_A.ResumeLayout(false);
@@ -559,6 +608,9 @@
         private System.Windows.Forms.Label log_3;
         private System.Windows.Forms.Label log_2;
         private System.Windows.Forms.Label log_1;
-        private System.Windows.Forms.Label log_5;
+        private System.Windows.Forms.Label log_4_1;
+        private System.Windows.Forms.Label log_3_1;
+        private System.Windows.Forms.Label log_2_1;
+        private System.Windows.Forms.Label log_1_1;
     }
 }

+ 69 - 52
OTSIncAReportApp/1-UI/GBCalculate/ChineseStandardABCDDS.cs

@@ -56,6 +56,8 @@ namespace OTSIncAReportGB
         private int m_oneresult_columnscount_D = 3;
         private int m_oneresult_columnscount_DS = 3;
 
+
+        string str_result = "";
         #endregion
 
         #region 自定义方法
@@ -288,6 +290,11 @@ namespace OTSIncAReportGB
             log_3.Text = "";
             log_4.Text = "";
             log_5.Text = "";
+            log_1_1.Text = "";
+            log_2_1.Text = "";
+            log_3_1.Text = "";
+            log_4_1.Text = "";
+            log_5_1.Text = "";
         }
 
         private void ChineseStandardABCDDS_Load(object sender, EventArgs e)
@@ -406,45 +413,73 @@ namespace OTSIncAReportGB
                 Gview_gzD.Width = panel1.Width;
                 Gview_gzDS.Width = panel1.Width;
                 int it = 0;
-                it = DetermineWhetherImprovementIsNeeded("A类", m_dt_A, it);
-                it = DetermineWhetherImprovementIsNeeded("B类", m_dt_B, it);
-                it = DetermineWhetherImprovementIsNeeded("C类", m_dt_C, it);
-                it = DetermineWhetherImprovementIsNeeded("D类", m_dt_D, it);
+                if(DetermineWhetherImprovementIsNeeded("A类", m_dt_A))
+                {
+                    str_result = str_result+ "夹杂物评级达到2.0:表明钢中的MnS或硫化物夹杂物控制不够理想。" +
+                        "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
+                }
 
-                bool bl = false;
-                if (log_1.Text != "" || log_2.Text != "" || log_3.Text != "" || log_4.Text != "")
+                if(DetermineWhetherImprovementIsNeeded("B类", m_dt_B))
                 {
-                    bl = true;
+                    str_result = str_result+"夹杂物评级达到2.0:表明钢中的不连续串(条)氧化物夹杂物控制不够理想。" +
+                       "针对这一问题,我们建议您在相关工艺上进行优化和改进。" ;
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
                 }
-                if (bl)
+                if(DetermineWhetherImprovementIsNeeded("C类", m_dt_C))
                 {
-                    if (it == 0)
-                    {
-                        log_1.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 1)
-                    {
-                        log_2.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 2)
-                    {
-                        log_3.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 3)
-                    {
-                        log_4.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 4)
-                    {
-                        log_5.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
+                    str_result = str_result+"夹杂物评级达到2.0:表明钢中的串(条)状氧化物夹杂物控制不够理想。" +
+                     "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
+                }
+                if(DetermineWhetherImprovementIsNeeded("D类", m_dt_D))
+                {
+                    str_result = str_result+"夹杂物评级达到2.0:表明钢中的单颗粒球状氧化物夹杂物控制不够理想。" +
+                     "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
                 }
             }
 
             Invalidate();
 
         }
-        private int DetermineWhetherImprovementIsNeeded(string str, DataTable data, int it)
+        private void  LabelAssignment(int it)
+        {
+            if (it == 0)
+            {
+                log_1.Text = str_result;
+                log_1_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+             "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 1)
+            {
+                log_2.Text = str_result;
+                log_2_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 2)
+            {
+                log_3.Text = str_result;
+                log_3_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 3)
+            {
+                log_4.Text = str_result;
+                log_4_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+        }
+        private bool DetermineWhetherImprovementIsNeeded(string str, DataTable data)
         {
 
             string Thin = ""; string Thick = ""; string OverSize = "";
@@ -463,32 +498,14 @@ namespace OTSIncAReportGB
                     OverSize = "超尺寸";
                 }
             }
-            string str_result = "";
+            
             if (Thin != "" || Thick != "" || OverSize != "")
             {
-                str_result = str + "的" + Thin + Thick + OverSize + "指标超过国标2.0,则存在优化的空间。"/*如需了解更多详情,请咨询我司专业的售后专家服务系统。"*/;
-
-                if (it == 0)
-                {
-                    log_1.Text = str_result;
-                }
-                else if (it == 1)
-                {
-                    log_2.Text = str_result;
-                }
-                else if (it == 2)
-                {
-                    log_3.Text = str_result;
-                }
-                else if (it == 3)
-                {
-                    log_4.Text = str_result;
-                }
-
-                it++;
-
+                str_result = str + "的" + Thin + Thick + OverSize ;
+                return true;
+              
             }
-            return it;
+            return false;
         }
         #endregion
 

+ 110 - 30
OTSIncAReportApp/1-UI/GBCalculate/ChineseStandardABCDDS.designer.cs

@@ -66,12 +66,17 @@
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.pictureBox5 = new System.Windows.Forms.PictureBox();
-            this.log_5 = new System.Windows.Forms.Label();
             this.log_4 = new System.Windows.Forms.Label();
             this.log_3 = new System.Windows.Forms.Label();
             this.log_2 = new System.Windows.Forms.Label();
             this.log_1 = new System.Windows.Forms.Label();
+            this.pictureBox5 = new System.Windows.Forms.PictureBox();
+            this.log_5 = new System.Windows.Forms.Label();
+            this.log_1_1 = new System.Windows.Forms.Label();
+            this.log_2_1 = new System.Windows.Forms.Label();
+            this.log_3_1 = new System.Windows.Forms.Label();
+            this.log_4_1 = new System.Windows.Forms.Label();
+            this.log_5_1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzA)).BeginInit();
             this.contextMenuStrip_A.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzB)).BeginInit();
@@ -415,6 +420,11 @@
             // 
             this.panel1.AutoScroll = true;
             this.panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.panel1.Controls.Add(this.log_5_1);
+            this.panel1.Controls.Add(this.log_4_1);
+            this.panel1.Controls.Add(this.log_3_1);
+            this.panel1.Controls.Add(this.log_2_1);
+            this.panel1.Controls.Add(this.log_1_1);
             this.panel1.Controls.Add(this.log_5);
             this.panel1.Controls.Add(this.log_4);
             this.panel1.Controls.Add(this.log_3);
@@ -435,63 +445,128 @@
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Margin = new System.Windows.Forms.Padding(2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1054, 922);
+            this.panel1.Size = new System.Drawing.Size(1054, 1010);
             this.panel1.TabIndex = 12;
             // 
-            // pictureBox5
-            // 
-            this.pictureBox5.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox5.BackgroundImage")));
-            this.pictureBox5.Location = new System.Drawing.Point(1235, 774);
-            this.pictureBox5.Name = "pictureBox5";
-            this.pictureBox5.Size = new System.Drawing.Size(169, 31);
-            this.pictureBox5.TabIndex = 11;
-            this.pictureBox5.TabStop = false;
-            // 
-            // log_5
-            // 
-            this.log_5.AutoSize = true;
-            this.log_5.Location = new System.Drawing.Point(51, 878);
-            this.log_5.Name = "log_5";
-            this.log_5.Size = new System.Drawing.Size(41, 12);
-            this.log_5.TabIndex = 21;
-            this.log_5.Text = "label6";
-            // 
             // log_4
             // 
             this.log_4.AutoSize = true;
-            this.log_4.Location = new System.Drawing.Point(51, 858);
+            this.log_4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_4.ForeColor = System.Drawing.Color.Red;
+            this.log_4.Location = new System.Drawing.Point(51, 906);
             this.log_4.Name = "log_4";
-            this.log_4.Size = new System.Drawing.Size(41, 12);
+            this.log_4.Size = new System.Drawing.Size(56, 16);
             this.log_4.TabIndex = 20;
             this.log_4.Text = "label9";
             // 
             // log_3
             // 
             this.log_3.AutoSize = true;
-            this.log_3.Location = new System.Drawing.Point(51, 838);
+            this.log_3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_3.ForeColor = System.Drawing.Color.Red;
+            this.log_3.Location = new System.Drawing.Point(51, 870);
             this.log_3.Name = "log_3";
-            this.log_3.Size = new System.Drawing.Size(41, 12);
+            this.log_3.Size = new System.Drawing.Size(56, 16);
             this.log_3.TabIndex = 19;
             this.log_3.Text = "label8";
             // 
             // log_2
             // 
             this.log_2.AutoSize = true;
-            this.log_2.Location = new System.Drawing.Point(51, 818);
+            this.log_2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_2.ForeColor = System.Drawing.Color.Red;
+            this.log_2.Location = new System.Drawing.Point(51, 834);
             this.log_2.Name = "log_2";
-            this.log_2.Size = new System.Drawing.Size(41, 12);
+            this.log_2.Size = new System.Drawing.Size(56, 16);
             this.log_2.TabIndex = 18;
             this.log_2.Text = "label7";
             // 
             // log_1
             // 
             this.log_1.AutoSize = true;
+            this.log_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_1.ForeColor = System.Drawing.Color.Red;
             this.log_1.Location = new System.Drawing.Point(51, 798);
             this.log_1.Name = "log_1";
-            this.log_1.Size = new System.Drawing.Size(41, 12);
+            this.log_1.Size = new System.Drawing.Size(56, 16);
             this.log_1.TabIndex = 17;
             this.log_1.Text = "label6";
             // 
+            // pictureBox5
+            // 
+            this.pictureBox5.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox5.BackgroundImage")));
+            this.pictureBox5.Location = new System.Drawing.Point(1235, 774);
+            this.pictureBox5.Name = "pictureBox5";
+            this.pictureBox5.Size = new System.Drawing.Size(169, 31);
+            this.pictureBox5.TabIndex = 11;
+            this.pictureBox5.TabStop = false;
+            // 
+            // log_5
+            // 
+            this.log_5.AutoSize = true;
+            this.log_5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_5.ForeColor = System.Drawing.Color.Red;
+            this.log_5.Location = new System.Drawing.Point(51, 942);
+            this.log_5.Name = "log_5";
+            this.log_5.Size = new System.Drawing.Size(56, 16);
+            this.log_5.TabIndex = 21;
+            this.log_5.Text = "label9";
+            // 
+            // log_1_1
+            // 
+            this.log_1_1.AutoSize = true;
+            this.log_1_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_1_1.ForeColor = System.Drawing.Color.Red;
+            this.log_1_1.Location = new System.Drawing.Point(51, 816);
+            this.log_1_1.Name = "log_1_1";
+            this.log_1_1.Size = new System.Drawing.Size(56, 16);
+            this.log_1_1.TabIndex = 22;
+            this.log_1_1.Text = "label6";
+            // 
+            // log_2_1
+            // 
+            this.log_2_1.AutoSize = true;
+            this.log_2_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_2_1.ForeColor = System.Drawing.Color.Red;
+            this.log_2_1.Location = new System.Drawing.Point(51, 852);
+            this.log_2_1.Name = "log_2_1";
+            this.log_2_1.Size = new System.Drawing.Size(56, 16);
+            this.log_2_1.TabIndex = 23;
+            this.log_2_1.Text = "label7";
+            // 
+            // log_3_1
+            // 
+            this.log_3_1.AutoSize = true;
+            this.log_3_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_3_1.ForeColor = System.Drawing.Color.Red;
+            this.log_3_1.Location = new System.Drawing.Point(51, 888);
+            this.log_3_1.Name = "log_3_1";
+            this.log_3_1.Size = new System.Drawing.Size(56, 16);
+            this.log_3_1.TabIndex = 24;
+            this.log_3_1.Text = "label8";
+            // 
+            // log_4_1
+            // 
+            this.log_4_1.AutoSize = true;
+            this.log_4_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_4_1.ForeColor = System.Drawing.Color.Red;
+            this.log_4_1.Location = new System.Drawing.Point(51, 924);
+            this.log_4_1.Name = "log_4_1";
+            this.log_4_1.Size = new System.Drawing.Size(56, 16);
+            this.log_4_1.TabIndex = 25;
+            this.log_4_1.Text = "label9";
+            // 
+            // log_5_1
+            // 
+            this.log_5_1.AutoSize = true;
+            this.log_5_1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.log_5_1.ForeColor = System.Drawing.Color.Red;
+            this.log_5_1.Location = new System.Drawing.Point(51, 960);
+            this.log_5_1.Name = "log_5_1";
+            this.log_5_1.Size = new System.Drawing.Size(56, 16);
+            this.log_5_1.TabIndex = 26;
+            this.log_5_1.Text = "label9";
+            // 
             // ChineseStandardABCDDS
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -499,7 +574,7 @@
             this.Controls.Add(this.panel1);
             this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "ChineseStandardABCDDS";
-            this.Size = new System.Drawing.Size(1054, 922);
+            this.Size = new System.Drawing.Size(1054, 1010);
             this.Load += new System.EventHandler(this.ChineseStandardABCDDS_Load);
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzA)).EndInit();
             this.contextMenuStrip_A.ResumeLayout(false);
@@ -557,10 +632,15 @@
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem15;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.PictureBox pictureBox5;
-        private System.Windows.Forms.Label log_5;
         private System.Windows.Forms.Label log_4;
         private System.Windows.Forms.Label log_3;
         private System.Windows.Forms.Label log_2;
         private System.Windows.Forms.Label log_1;
+        private System.Windows.Forms.Label log_5;
+        private System.Windows.Forms.Label log_5_1;
+        private System.Windows.Forms.Label log_4_1;
+        private System.Windows.Forms.Label log_3_1;
+        private System.Windows.Forms.Label log_2_1;
+        private System.Windows.Forms.Label log_1_1;
     }
 }

+ 84 - 62
OTSIncAReportApp/1-UI/GBCalculate/NationalStandardMethodTwo.cs

@@ -60,6 +60,8 @@ namespace OTSIncAReportGB
         private int m_oneresult_columnscount_sulfide = 3;
         private int m_oneresult_columnscount_DS = 3;
 
+
+        string str_result = "";
         #endregion
 
         #region 自定义方法
@@ -302,7 +304,13 @@ namespace OTSIncAReportGB
             log_3.Text = "";
             log_4.Text = "";
             log_5.Text = "";
-            log_6.Text = "";
+            //log_6.Text = "";
+            log_1_1.Text = "";
+            log_2_1.Text = "";
+            log_3_1.Text = "";
+            log_4_1.Text = "";
+            log_5_1.Text = "";
+            //log_6_1.Text = "";
         }
 
         private void NationalStandardMethodTwo_Load(object sender, EventArgs e)
@@ -440,51 +448,87 @@ namespace OTSIncAReportGB
 
 
                 int it = 0;
-                it = DetermineWhetherImprovementIsNeeded("A类", m_dt_A, it);
-                it = DetermineWhetherImprovementIsNeeded("B类", m_dt_B, it);
-                it = DetermineWhetherImprovementIsNeeded("C类", m_dt_C, it);
-                it = DetermineWhetherImprovementIsNeeded("D类", m_dt_D, it);
-                it = DetermineWhetherImprovementIsNeeded("D硫化物类", m_dt_sulfide, it);
-                bool bl = false;
-                if (log_1.Text != "" || log_2.Text != "" || log_3.Text != "" || log_4.Text != "")
+                if(DetermineWhetherImprovementIsNeeded("A类", m_dt_A))
                 {
-                    bl = true;
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的MnS或硫化物夹杂物控制不够理想。" +
+                        "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
                 }
-                if (bl)
+                if(DetermineWhetherImprovementIsNeeded("B类", m_dt_B))
                 {
-                    if (it == 0)
-                    {
-                        log_1.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 1)
-                    {
-                        log_2.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 2)
-                    {
-                        log_3.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 3)
-                    {
-                        log_4.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 4)
-                    {
-                        log_5.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
-                    else if (it == 5)
-                    {
-                        log_6.Text = "如需了解更多详情,请咨询我司专业的售后专家服务系统。";
-                    }
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的铝酸盐或其他不变形氧化物夹杂物控制不够理想。" +
+                        "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
+                }
+                if(DetermineWhetherImprovementIsNeeded("C类", m_dt_C))
+                {
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的硅酸盐过其他可变性氧化物夹杂物控制不够理想。" +
+                        "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
                 }
+                if (DetermineWhetherImprovementIsNeeded("D类", m_dt_D))
+                {
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的单颗粒球状氧化物夹杂物控制不够理想。" +
+                        "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
+                }
+                if (DetermineWhetherImprovementIsNeeded("D硫化物类", m_dt_sulfide))
+                {
+                    str_result = str_result + "夹杂物评级达到2.0:表明钢中的球状硫化物夹杂物控制不够理想。" +
+                        "针对这一问题,我们建议您在相关工艺上进行优化和改进。";
+                    LabelAssignment(it);
+                    it++;
+                    str_result = "";
+                }
+              
 
             }
 
             Invalidate();
 
         }
-
-        private int DetermineWhetherImprovementIsNeeded(string str, DataTable data, int it)
+        private void LabelAssignment(int it)
+        {
+            if (it == 0)
+            {
+                log_1.Text = str_result;
+                log_1_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+             "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 1)
+            {
+                log_2.Text = str_result;
+                log_2_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 2)
+            {
+                log_3.Text = str_result;
+                log_3_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 3)
+            {
+                log_4.Text = str_result;
+                log_4_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+            else if (it == 4)
+            {
+                log_5.Text = str_result;
+                log_5_1.Text = "为了获取更具体的改进措施,您可以随时联系我们公司的软件售后服务团队," +
+            "我们的炼钢工艺专家将为您提供专业的建议和支持。";
+            }
+        }
+        private bool DetermineWhetherImprovementIsNeeded(string str, DataTable data)
         {
 
             string Thin = ""; string Thick = ""; string OverSize = "";
@@ -503,36 +547,14 @@ namespace OTSIncAReportGB
                     OverSize = "超尺寸";
                 }
             }
-            string str_result = "";
+
             if (Thin != "" || Thick != "" || OverSize != "")
             {
-                str_result = str + "的" + Thin + Thick + OverSize + "指标超过国标2.0,则存在优化的空间。"/*如需了解更多详情,请咨询我司专业的售后专家服务系统。"*/;
-
-                if (it == 0)
-                {
-                    log_1.Text = str_result;
-                }
-                else if (it == 1)
-                {
-                    log_2.Text = str_result;
-                }
-                else if (it == 2)
-                {
-                    log_3.Text = str_result;
-                }
-                else if (it == 3)
-                {
-                    log_4.Text = str_result;
-                }
-                else if (it == 4)
-                {
-                    log_5.Text = str_result;
-                }
-
-                it++;
+                str_result = str + "的" + Thin + Thick + OverSize;
+                return true;
 
             }
-            return it;
+            return false;
         }
         #endregion
 

+ 131 - 63
OTSIncAReportApp/1-UI/GBCalculate/NationalStandardMethodTwo.designer.cs

@@ -30,6 +30,11 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NationalStandardMethodTwo));
             this.panel1 = new System.Windows.Forms.Panel();
+            this.log_5 = new System.Windows.Forms.Label();
+            this.log_4 = new System.Windows.Forms.Label();
+            this.log_3 = new System.Windows.Forms.Label();
+            this.log_2 = new System.Windows.Forms.Label();
+            this.log_1 = new System.Windows.Forms.Label();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.Gview_gzDS = new System.Windows.Forms.DataGridView();
             this.sulfide = new System.Windows.Forms.DataGridView();
@@ -43,12 +48,11 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.Gview_gzA = new System.Windows.Forms.DataGridView();
-            this.log_5 = new System.Windows.Forms.Label();
-            this.log_4 = new System.Windows.Forms.Label();
-            this.log_3 = new System.Windows.Forms.Label();
-            this.log_2 = new System.Windows.Forms.Label();
-            this.log_1 = new System.Windows.Forms.Label();
-            this.log_6 = new System.Windows.Forms.Label();
+            this.log_5_1 = new System.Windows.Forms.Label();
+            this.log_4_1 = new System.Windows.Forms.Label();
+            this.log_3_1 = new System.Windows.Forms.Label();
+            this.log_2_1 = new System.Windows.Forms.Label();
+            this.log_1_1 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Gview_gzDS)).BeginInit();
@@ -63,7 +67,11 @@
             // 
             this.panel1.AutoScroll = true;
             this.panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.panel1.Controls.Add(this.log_6);
+            this.panel1.Controls.Add(this.log_5_1);
+            this.panel1.Controls.Add(this.log_4_1);
+            this.panel1.Controls.Add(this.log_3_1);
+            this.panel1.Controls.Add(this.log_2_1);
+            this.panel1.Controls.Add(this.log_1_1);
             this.panel1.Controls.Add(this.log_5);
             this.panel1.Controls.Add(this.log_4);
             this.panel1.Controls.Add(this.log_3);
@@ -85,9 +93,64 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1009, 1088);
+            this.panel1.Size = new System.Drawing.Size(1009, 1147);
             this.panel1.TabIndex = 0;
             // 
+            // log_5
+            // 
+            this.log_5.AutoSize = true;
+            this.log_5.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_5.ForeColor = System.Drawing.Color.Red;
+            this.log_5.Location = new System.Drawing.Point(86, 1088);
+            this.log_5.Name = "log_5";
+            this.log_5.Size = new System.Drawing.Size(56, 16);
+            this.log_5.TabIndex = 21;
+            this.log_5.Text = "label6";
+            // 
+            // log_4
+            // 
+            this.log_4.AutoSize = true;
+            this.log_4.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_4.ForeColor = System.Drawing.Color.Red;
+            this.log_4.Location = new System.Drawing.Point(86, 1052);
+            this.log_4.Name = "log_4";
+            this.log_4.Size = new System.Drawing.Size(56, 16);
+            this.log_4.TabIndex = 20;
+            this.log_4.Text = "label9";
+            // 
+            // log_3
+            // 
+            this.log_3.AutoSize = true;
+            this.log_3.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_3.ForeColor = System.Drawing.Color.Red;
+            this.log_3.Location = new System.Drawing.Point(86, 1016);
+            this.log_3.Name = "log_3";
+            this.log_3.Size = new System.Drawing.Size(56, 16);
+            this.log_3.TabIndex = 19;
+            this.log_3.Text = "label8";
+            // 
+            // log_2
+            // 
+            this.log_2.AutoSize = true;
+            this.log_2.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_2.ForeColor = System.Drawing.Color.Red;
+            this.log_2.Location = new System.Drawing.Point(86, 980);
+            this.log_2.Name = "log_2";
+            this.log_2.Size = new System.Drawing.Size(56, 16);
+            this.log_2.TabIndex = 18;
+            this.log_2.Text = "label7";
+            // 
+            // log_1
+            // 
+            this.log_1.AutoSize = true;
+            this.log_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_1.ForeColor = System.Drawing.Color.Red;
+            this.log_1.Location = new System.Drawing.Point(86, 944);
+            this.log_1.Name = "log_1";
+            this.log_1.Size = new System.Drawing.Size(56, 16);
+            this.log_1.TabIndex = 17;
+            this.log_1.Text = "label6";
+            // 
             // pictureBox1
             // 
             this.pictureBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.BackgroundImage")));
@@ -217,59 +280,60 @@
             this.Gview_gzA.Size = new System.Drawing.Size(918, 137);
             this.Gview_gzA.TabIndex = 0;
             // 
-            // log_5
-            // 
-            this.log_5.AutoSize = true;
-            this.log_5.Location = new System.Drawing.Point(86, 1024);
-            this.log_5.Name = "log_5";
-            this.log_5.Size = new System.Drawing.Size(41, 12);
-            this.log_5.TabIndex = 21;
-            this.log_5.Text = "label6";
-            // 
-            // log_4
-            // 
-            this.log_4.AutoSize = true;
-            this.log_4.Location = new System.Drawing.Point(86, 1004);
-            this.log_4.Name = "log_4";
-            this.log_4.Size = new System.Drawing.Size(41, 12);
-            this.log_4.TabIndex = 20;
-            this.log_4.Text = "label9";
-            // 
-            // log_3
-            // 
-            this.log_3.AutoSize = true;
-            this.log_3.Location = new System.Drawing.Point(86, 984);
-            this.log_3.Name = "log_3";
-            this.log_3.Size = new System.Drawing.Size(41, 12);
-            this.log_3.TabIndex = 19;
-            this.log_3.Text = "label8";
-            // 
-            // log_2
-            // 
-            this.log_2.AutoSize = true;
-            this.log_2.Location = new System.Drawing.Point(86, 964);
-            this.log_2.Name = "log_2";
-            this.log_2.Size = new System.Drawing.Size(41, 12);
-            this.log_2.TabIndex = 18;
-            this.log_2.Text = "label7";
-            // 
-            // log_1
-            // 
-            this.log_1.AutoSize = true;
-            this.log_1.Location = new System.Drawing.Point(86, 944);
-            this.log_1.Name = "log_1";
-            this.log_1.Size = new System.Drawing.Size(41, 12);
-            this.log_1.TabIndex = 17;
-            this.log_1.Text = "label6";
-            // 
-            // log_6
-            // 
-            this.log_6.AutoSize = true;
-            this.log_6.Location = new System.Drawing.Point(86, 1044);
-            this.log_6.Name = "log_6";
-            this.log_6.Size = new System.Drawing.Size(41, 12);
-            this.log_6.TabIndex = 22;
-            this.log_6.Text = "label7";
+            // log_5_1
+            // 
+            this.log_5_1.AutoSize = true;
+            this.log_5_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_5_1.ForeColor = System.Drawing.Color.Red;
+            this.log_5_1.Location = new System.Drawing.Point(86, 1106);
+            this.log_5_1.Name = "log_5_1";
+            this.log_5_1.Size = new System.Drawing.Size(56, 16);
+            this.log_5_1.TabIndex = 27;
+            this.log_5_1.Text = "label6";
+            // 
+            // log_4_1
+            // 
+            this.log_4_1.AutoSize = true;
+            this.log_4_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_4_1.ForeColor = System.Drawing.Color.Red;
+            this.log_4_1.Location = new System.Drawing.Point(86, 1070);
+            this.log_4_1.Name = "log_4_1";
+            this.log_4_1.Size = new System.Drawing.Size(56, 16);
+            this.log_4_1.TabIndex = 26;
+            this.log_4_1.Text = "label9";
+            // 
+            // log_3_1
+            // 
+            this.log_3_1.AutoSize = true;
+            this.log_3_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_3_1.ForeColor = System.Drawing.Color.Red;
+            this.log_3_1.Location = new System.Drawing.Point(86, 1034);
+            this.log_3_1.Name = "log_3_1";
+            this.log_3_1.Size = new System.Drawing.Size(56, 16);
+            this.log_3_1.TabIndex = 25;
+            this.log_3_1.Text = "label8";
+            // 
+            // log_2_1
+            // 
+            this.log_2_1.AutoSize = true;
+            this.log_2_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_2_1.ForeColor = System.Drawing.Color.Red;
+            this.log_2_1.Location = new System.Drawing.Point(86, 998);
+            this.log_2_1.Name = "log_2_1";
+            this.log_2_1.Size = new System.Drawing.Size(56, 16);
+            this.log_2_1.TabIndex = 24;
+            this.log_2_1.Text = "label7";
+            // 
+            // log_1_1
+            // 
+            this.log_1_1.AutoSize = true;
+            this.log_1_1.Font = new System.Drawing.Font("宋体", 12F);
+            this.log_1_1.ForeColor = System.Drawing.Color.Red;
+            this.log_1_1.Location = new System.Drawing.Point(86, 962);
+            this.log_1_1.Name = "log_1_1";
+            this.log_1_1.Size = new System.Drawing.Size(56, 16);
+            this.log_1_1.TabIndex = 23;
+            this.log_1_1.Text = "label6";
             // 
             // NationalStandardMethodTwo
             // 
@@ -278,7 +342,7 @@
             this.AutoScroll = true;
             this.Controls.Add(this.panel1);
             this.Name = "NationalStandardMethodTwo";
-            this.Size = new System.Drawing.Size(1009, 1088);
+            this.Size = new System.Drawing.Size(1009, 1147);
             this.Load += new System.EventHandler(this.NationalStandardMethodTwo_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
@@ -314,6 +378,10 @@
         private System.Windows.Forms.Label log_3;
         private System.Windows.Forms.Label log_2;
         private System.Windows.Forms.Label log_1;
-        private System.Windows.Forms.Label log_6;
+        private System.Windows.Forms.Label log_5_1;
+        private System.Windows.Forms.Label log_4_1;
+        private System.Windows.Forms.Label log_3_1;
+        private System.Windows.Forms.Label log_2_1;
+        private System.Windows.Forms.Label log_1_1;
     }
 }

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

@@ -106,7 +106,7 @@ namespace OTSIncAReportApp.ReportTemplate
             }
             if (listStr.Count==0)
             {
-                xrTable1.Rows.Add(GB_fpt(GBName+":此样品不需要优化冶炼工艺"));
+                xrTable1.Rows.Add(GB_fpt(GBName+":此样品所以指标低于国标2.0,不需要优化冶炼工艺"));
             }
             else
             {
@@ -115,7 +115,7 @@ namespace OTSIncAReportApp.ReportTemplate
                 {
                     str = str + listStr[i];
                 }
-                str = str + "指标超过国标2.0,则存在优化的空间。如需了解更多详情,请咨询我司专业的售后专家服务系统。";
+                str = str + "指标超过国标2.0:钢中夹杂物控制不佳,可尝试在工艺上改进。具体改进措施可以咨询我公司软件售后服务炼钢工艺专家团队。";
                 xrTable1.Rows.Add(GB_fpt(str));
             }