修复计算AMYields表Total字段、YieldRate字段值不正确的Bug。

BLL/NTFBLL.cs

@@ -212,7 +212,7 @@ namespace MOKA_Factory_Tools.BLL
                     redo0Model.FinalTest = "FAIL";
                     redo0Model.ResultType = "RealFail";
                 }
-            } 
+            }
             else if (redo0Model.Test01.ToLower() == "fail" && redo0Model.Test02.ToLower() == "null" && redo0Model.FinalTest.ToLower() == "fail")
             {// 2.resulttype=realfail;
                 if (TestResult)
@@ -268,7 +268,7 @@ namespace MOKA_Factory_Tools.BLL
             #region 已经累计出现2次fail了，不允许继续测试，也不允许修改记录;
             else if (redo0Model.Test01.ToLower() == "fail" && redo0Model.Test02.ToLower() == "fail" && redo0Model.FinalTest.ToLower() == "fail")
             {// 5.resulttype=realfail; 已经累计出现2次fail了，不允许继续测试，也不允许修改记录;
-                Log.WriteInfoLog(string.Format("5.resulttype=realfail; Test01={0},Test02={1},已经累计出现2次fail了，不允许继续测试，也不允许修改记录", redo0Model.Test01,redo0Model.Test02));
+                Log.WriteInfoLog(string.Format("5.resulttype=realfail; Test01={0},Test02={1},已经累计出现2次fail了，不允许继续测试，也不允许修改记录", redo0Model.Test01, redo0Model.Test02));
             }
             #endregion
 
@@ -325,7 +325,7 @@ namespace MOKA_Factory_Tools.BLL
                 yields.Model = model.Model;
             }
 
-            yields.Total = hourlydata.TotalZeroCount;
+            yields.Total = hourlydata.TotalAllCount;
             yields.OncePass = hourlydata.OncePassZeroCount;
             //yields.TwiceFail = hourlydata.TwiceFailCount;
             yields.NTF = hourlydata.NTFZeroCount;
@@ -350,7 +350,7 @@ namespace MOKA_Factory_Tools.BLL
                 yields.FPY = (oncepassAll / (double)totalAll).ToString("P");
                 yields.SPY = ((oncepassAll + ntfAll) / (double)totalAll).ToString("P");
                 yields.RPY = ((oncepassAll + ntfAll) / (double)totalAll).ToString("P");
-                yields.YieldRate = (oncepassZero / (double)totalZero).ToString("P");
+                yields.YieldRate = ((oncepassZero + ntfZero) / (double)totalZero).ToString("P");
             }
             catch
             {
@@ -433,9 +433,9 @@ namespace MOKA_Factory_Tools.BLL
         public bool UpdateReDo0AMResult(AMResult_TR redo0Model, bool TestResult, string strErrMsg)
         {
             #region 测试第2次
-            if ( redo0Model.Test02.ToLower() == "null" && redo0Model.Test03.ToLower() == "null" )
+            if (redo0Model.Test02.ToLower() == "null" && redo0Model.Test03.ToLower() == "null")
             {
-                if ( redo0Model.Test01.ToLower() == "pass" )
+                if (redo0Model.Test01.ToLower() == "pass")
                 {
                     if (TestResult)
                     {
@@ -450,7 +450,7 @@ namespace MOKA_Factory_Tools.BLL
                         redo0Model.ResultType = "RealFail";
                     }
                 }
-                else if ( redo0Model.Test01.ToLower() =="fail")
+                else if (redo0Model.Test01.ToLower() == "fail")
                 {
                     if (TestResult)
                     {
@@ -470,7 +470,7 @@ namespace MOKA_Factory_Tools.BLL
             #region 测试第3次
             else if (redo0Model.Test02.ToLower() != "null" && redo0Model.Test03.ToLower() == "null")
             {
-                if ( redo0Model.Test01.ToLower().Equals("pass") && redo0Model.Test02.ToLower().Equals("pass") )
+                if (redo0Model.Test01.ToLower().Equals("pass") && redo0Model.Test02.ToLower().Equals("pass"))
                 {
                     if (TestResult)
                     {
@@ -485,7 +485,7 @@ namespace MOKA_Factory_Tools.BLL
                         redo0Model.ResultType = "RealFail";
                     }
                 }
-                else if (redo0Model.Test01.ToLower().Equals("pass") && redo0Model.Test02.ToLower().Equals("fail") )
+                else if (redo0Model.Test01.ToLower().Equals("pass") && redo0Model.Test02.ToLower().Equals("fail"))
                 {
                     if (TestResult)
                     {
@@ -522,7 +522,7 @@ namespace MOKA_Factory_Tools.BLL
             }
             #endregion
             #region 测试第4次;
-            else if ( redo0Model.Test03.ToLower() != "null" )
+            else if (redo0Model.Test03.ToLower() != "null")
             {
                 if (redo0Model.FinalTest.ToLower() == "pass" && redo0Model.ResultType.ToLower() == "ntf")
                 {
@@ -540,7 +540,8 @@ namespace MOKA_Factory_Tools.BLL
                         redo0Model.ResultType = "RealFail";
                     }
                 }
-                else {
+                else
+                {
                     Log.WriteErrorLog("异常测试，超过3次测试次数");
                 }
             }
@@ -582,7 +583,7 @@ namespace MOKA_Factory_Tools.BLL
                 yields.Model = model.Model;
             }
 
-            yields.Total = hourlydata.TotalZeroCount;
+            yields.Total = hourlydata.TotalAllCount;
             yields.OncePass = hourlydata.OncePassZeroCount;
             //yields.TwiceFail = hourlydata.TwiceFailCount;
             yields.NTF = hourlydata.NTFZeroCount;
@@ -607,7 +608,7 @@ namespace MOKA_Factory_Tools.BLL
                 yields.FPY = (oncepassAll / (double)totalAll).ToString("P");
                 yields.SPY = ((oncepassAll + ntfAll) / (double)totalAll).ToString("P");
                 yields.RPY = ((oncepassAll + ntfAll) / (double)totalAll).ToString("P");
-                yields.YieldRate = (oncepassZero / (double)totalZero).ToString("P");
+                yields.YieldRate = ((oncepassZero + ntfZero) / (double)totalZero).ToString("P");
             }
             catch
             {