|
@@ -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;
|
|
|
}
|
|
|
}
|
|
|
|