优化试产NTF第4次测试时的判断方法

BLL/NTFBLL.cs

@@ -599,18 +599,25 @@ namespace MOKA_Factory_Tools.BLL
             #region 测试第4次;
             else if ( redo0Model.Test03.ToLower() != "null" )
             {
-                if ( redo0Model.Test01.ToLower() == "pass" && redo0Model.Test02.ToLower() == "fail" && redo0Model.Test03.ToLower() == "pass" && redo0Model.FinalTest.ToLower() == "pass" && redo0Model.ResultType.ToLower() == "ntf")
+                if (redo0Model.FinalTest.ToLower() == "pass" && redo0Model.ResultType.ToLower() == "ntf")
                 {
-                    if (TestResult)
+                    if (!TestResult)
                     {
-                        Log.WriteInfoLog("连接2次Fail，测试锁定");
+                        redo0Model.FinalTest = "FAIL";
+                        redo0Model.ResultType = "RealFail";
                     }
-                    else
+                }
+                else if (redo0Model.FinalTest.ToLower() == "pass" && redo0Model.ResultType.ToLower() == "oncepass")
+                {// 异常测试;
+                    if (!TestResult)
                     {
                         redo0Model.FinalTest = "FAIL";
                         redo0Model.ResultType = "RealFail";
                     }
                 }
+                else {
+                    Log.WriteErrorLog("异常测试，超过3次测试次数");
+                }
             }
             #endregion
             if (!TestResult)