Răsfoiți Sursa

修复试产NTF第一次Fail时,不提示的问题,同时不提示试产ResultType=NTF时的提示消息框。

sat23 3 ani în urmă
părinte
comite
bb9ca13db0
1 a modificat fișierele cu 13 adăugiri și 1 ștergeri
  1. 13 1
      Views/OperationPanel.cs

+ 13 - 1
Views/OperationPanel.cs

@@ -4678,6 +4678,9 @@ namespace MOKA_Factory_Tools
             SetsuccessStatus(ResultStatus);
             Thread.Sleep(FunctionSettingNow.Wait_after_completion);
         end:
+#if DEBUG
+            TestResult = 1;
+#endif
             #region 只有惠州工厂才启用G客户防呆措施;
             if (CommonMethod.GetLoginAccout().Equals("Huizhou", StringComparison.OrdinalIgnoreCase))
             {
@@ -4712,6 +4715,14 @@ namespace MOKA_Factory_Tools
                     CommonMethod.WriteProfileString("MOKAFactoryTools", "GFailCount", TestResult == 0 ? "1" : "0");
                     // 更新抄写状态;
                     CommonMethod.WriteProfileString("MOKAFactoryTools", "LastGResult", TestResult != 0 ? "1" : "0");
+
+                    // 如果是试产NTF,且第一次测试就Fail,提示再测试多一次;
+                    if (TestResult == 0 && nOrderType == 0)
+                    {
+                        ErrMsg = "试产订单:请再测试一次\r\n第一次测试为FAIL,请再测试确认结果!";
+                        Log.WriteErrorLog(ErrMsg);
+                        ShowVerifyDelegate(ErrMsg);
+                    }
                 }
 
                 if (strLastResult.ToString().Equals("0") && (TestResult == 1) && (nOrderType == 0) )
@@ -4733,8 +4744,9 @@ namespace MOKA_Factory_Tools
                 }
                 else
                 {
-                    if ((TestResult != 0) && ntfBLL.ResultType.Equals("NTF", StringComparison.OrdinalIgnoreCase))
+                    if ((TestResult == 1) && ntfBLL.ResultType.Equals("NTF", StringComparison.OrdinalIgnoreCase))
                     {
+                        // TestResut == 0 && TestResut == 2时,也不提示NTF;
                         ErrMsg = string.Format("结果类型为NTF,请将产品做好NTF标记:{0}", SN);
                         ShowVerifyDelegate(ErrMsg);
                     }