|
@@ -206,7 +206,7 @@ namespace MOKA_Factory_Tools.BLL
|
|
|
{
|
|
|
// 赋新值;
|
|
|
model.Test01 = model.FinalTest = TestResult ? "PASS" : "FAIL";
|
|
|
- model.Test02 = "NULL";
|
|
|
+ model.Test02 = "null";
|
|
|
model.ReDo = "0";
|
|
|
ResultType = model.ResultType = TestResult ? "OncePass" : "RealFail";
|
|
|
if (!TestResult)
|
|
@@ -459,7 +459,8 @@ namespace MOKA_Factory_Tools.BLL
|
|
|
{
|
|
|
// 赋新值;
|
|
|
model.Test01 = model.FinalTest = TestResult ? "PASS" : "FAIL";
|
|
|
- model.Test02 = "NULL";
|
|
|
+ model.Test02 = "null";
|
|
|
+ model.Test03 = "null";
|
|
|
model.ReDo = "0";
|
|
|
ResultType = model.ResultType = TestResult ? "OncePass" : "RealFail";
|
|
|
if (!TestResult)
|
|
@@ -538,7 +539,7 @@ namespace MOKA_Factory_Tools.BLL
|
|
|
}
|
|
|
#endregion
|
|
|
#region 测试第3次
|
|
|
- if (redo0Model.Test02.ToLower() != "null" && redo0Model.Test03.ToLower() == "null")
|
|
|
+ else if (redo0Model.Test02.ToLower() != "null" && redo0Model.Test03.ToLower() == "null")
|
|
|
{
|
|
|
if ( redo0Model.Test01.ToLower().Equals("pass") && redo0Model.Test01.ToLower().Equals("pass") )
|
|
|
{
|
|
@@ -592,7 +593,7 @@ namespace MOKA_Factory_Tools.BLL
|
|
|
}
|
|
|
#endregion
|
|
|
#region 测试第4次;
|
|
|
- if ( redo0Model.Test03.ToLower() != "null" )
|
|
|
+ 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")
|
|
|
{
|