|
@@ -1765,6 +1765,7 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ string strACASID="";
|
|
|
// 如果是要导出ACASID+SN,先判断ACASID是否等于20位长度;
|
|
|
if (FunctionSettingNow.ExportSNACASID)
|
|
|
{
|
|
@@ -1786,6 +1787,9 @@ namespace MOKA_Factory_Tools
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|
|
|
+
|
|
|
+ //strACASID=data.ToString();
|
|
|
+ strACASID = Encoding.ASCII.GetString(data);
|
|
|
}
|
|
|
|
|
|
//获取key
|
|
@@ -4749,22 +4753,12 @@ namespace MOKA_Factory_Tools
|
|
|
|
|
|
if (FunctionSettingNow.ExportSNACASID)
|
|
|
{// 只有抄写成功,才输出ACASID;
|
|
|
- if (SerialCMD.ReadJapaneseACASID(TVPort, out result, out data, out error, SerailDelay))
|
|
|
- {
|
|
|
- CommonMethod.ExportSNACASID(orderNow, SN, Encoding.ASCII.GetString(data));
|
|
|
+ CommonMethod.ExportSNACASID(orderNow, SN, strACASID);
|
|
|
|
|
|
- if (!SanhuaMethod.UploadIdcData(SN, Encoding.ASCII.GetString(data), out error))
|
|
|
- {
|
|
|
- TestResult = 0;
|
|
|
- ErrMsg = string.Format("{0} UploadIdcData fail! {1}", SN, error);
|
|
|
- Log.WriteErrorLog(ErrMsg);
|
|
|
- goto end;
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
+ if (!SanhuaMethod.UploadIdcData(SN, strACASID, out error))
|
|
|
{
|
|
|
TestResult = 0;
|
|
|
- ErrMsg = string.Format("{0} Read ACAS ID fail! {1}", SN, error);
|
|
|
+ ErrMsg = string.Format("{0} UploadIdcData fail! {1}", SN, error);
|
|
|
Log.WriteErrorLog(ErrMsg);
|
|
|
goto end;
|
|
|
}
|