Browse Source

只要是三华账号,都对接MES。而只有配置了.ExportSNACASID才上传数据。

JeffWang 2 years ago
parent
commit
c1f502df0c
2 changed files with 14 additions and 11 deletions
  1. 1 1
      FactoryTool_CShare/Views/Login.cs
  2. 13 10
      FactoryTool_CShare/Views/OperationPanel.cs

+ 1 - 1
FactoryTool_CShare/Views/Login.cs

@@ -175,7 +175,7 @@ namespace MOKA_Factory_Tools
             }
 
             #region 三华MES登录数据
-            if (ExportSNACASID)
+            if (CommonMethod.GetLoginAccout().Equals("Sanhua", StringComparison.OrdinalIgnoreCase))
             {
                 SanhuaMES sanhuaMES = new SanhuaMES();
                 if ( sanhuaMES.ShowDialog() != DialogResult.OK )

+ 13 - 10
FactoryTool_CShare/Views/OperationPanel.cs

@@ -831,7 +831,7 @@ namespace MOKA_Factory_Tools
                 }
                 #endregion
 
-                if ( FunctionSettingNow.ExportSNACASID )
+                if (CommonMethod.GetLoginAccout().Equals("Sanhua", StringComparison.OrdinalIgnoreCase))
                 {
                     string message = string.Empty;
                     if ( !SanhuaMethod.ProductRouteCheck(SN, out message) )
@@ -4737,16 +4737,19 @@ namespace MOKA_Factory_Tools
                         ErrMsg = string.Format("{0}  UploadIdcData fail! {1}", SN, error);
                         Log.WriteErrorLog(ErrMsg);
                         goto end;
-                    }
+                    }                    
+                }
+            }
 
-                    // 由于抄写成功才会输出ACASID,所以result参数在此固定为OK/PASS
-                    if (!SanhuaMethod.ProductMoveNext(SN, "OK", "", out error))
-                    {
-                        TestResult = 0;
-                        ErrMsg = string.Format("{0}  ProductMoveNext fail! {1}", SN, error);
-                        Log.WriteErrorLog(ErrMsg);
-                        goto end;
-                    }
+            if (CommonMethod.GetLoginAccout().Equals("Sanhua", StringComparison.OrdinalIgnoreCase))
+            {
+                // 由于抄写成功才会输出ACASID,所以result参数在此固定为OK/PASS
+                if (!SanhuaMethod.ProductMoveNext(SN, "OK", "", out error))
+                {
+                    TestResult = 0;
+                    ErrMsg = string.Format("{0}  ProductMoveNext fail! {1}", SN, error);
+                    Log.WriteErrorLog(ErrMsg);
+                    goto end;
                 }
             }