修改测试未通过不过站

UAS_MES_ZDXW/FunctionCode/Make/Make_GetTestData.cs

@@ -326,28 +326,32 @@ namespace UAS_MES_NEW.Make
                 string reason;
                 bool pass = JudgePass(val1, val2, lower, upper, out reason);
 
-                //9) 过站 SetStepResult(判定结果决定过站OK/NG)
-                string stepResult = pass ? "OK" : "NG";
-                string stepRemark = pass ? "双串口测试通过" : ("测试失败:" + reason);
-
-                if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "电桥测试", stepResult, User.UserCode, out oErrorMessage))
+                //9) 过站: 测试PASS才执行过站, FAIL不过站
+                if (pass)
                 {
-                    //提示正确返回时传递的信息
-                    if (oErrorMessage.Contains("AFTERSUCCESS"))
-                        OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                    //刷新工单计数
-                    LoadCollectedNum();
-                    //记录日志
-                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "电桥测试", stepRemark, sncode.Text, "");
-                    if (pass)
+                    if (LogicHandler.SetStepResult(oMakeCode, User.UserSourceCode, sncode.Text, "电桥测试", "OK", User.UserCode, out oErrorMessage))
+                    {
+                        //提示正确返回时传递的信息
+                        if (oErrorMessage.Contains("AFTERSUCCESS"))
+                            OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                        //刷新工单计数
+                        LoadCollectedNum();
+                        //记录日志
+                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "电桥测试", "双串口测试通过", sncode.Text, "");
                         OperateResult.AppendText("<<" + sncode.Text + "测试PASS(4G-1=" + val1 + " 4G-2=" + val2 + ") 过站成功\n", Color.Green, sncode);
+                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                    }
                     else
-                        OperateResult.AppendText("<<" + sncode.Text + "测试FAIL " + reason + " 过站记录NG\n", Color.Red, sncode);
-                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                    {
+                        OperateResult.AppendText(">>过站失败:" + oErrorMessage + "\n", Color.Red, sncode);
+                    }
                 }
                 else
                 {
-                    OperateResult.AppendText(">>过站失败:" + oErrorMessage + "\n", Color.Red, sncode);
+                    //测试不通过: 不执行过站, 只记录日志和提示
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "电桥测试", "测试失败:" + reason, sncode.Text, "");
+                    OperateResult.AppendText("<<" + sncode.Text + "测试FAIL " + reason + " 未过站\n", Color.Red, sncode);
+                    OperateResult.AppendText(">>请输入SN\n", Color.Black);
                 }
 
                 //清空SN输入框, 准备下一次扫码