|
@@ -686,7 +686,7 @@ namespace MOKA_Factory_Tools
|
|
ClientTypeText.Text = midListNow.clienttype;
|
|
ClientTypeText.Text = midListNow.clienttype;
|
|
SVText.Text = midListNow.version;
|
|
SVText.Text = midListNow.version;
|
|
ProjectIDText.Text = midListNow.projectid;
|
|
ProjectIDText.Text = midListNow.projectid;
|
|
- UpdateKeys(midListNow.keytype, false);
|
|
|
|
|
|
+ UpdateKeysOnline(midListNow.keytype, false);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -4707,7 +4707,7 @@ namespace MOKA_Factory_Tools
|
|
Log.WriteGetKeyLog("Order:" + orderNow + " host is null,scanning sn:" + SN);
|
|
Log.WriteGetKeyLog("Order:" + orderNow + " host is null,scanning sn:" + SN);
|
|
TestResult = 1;
|
|
TestResult = 1;
|
|
UploadCopyCount();
|
|
UploadCopyCount();
|
|
- UpdateKeys(midListNow.keytype, false);
|
|
|
|
|
|
+ UpdateKeysOnline(midListNow.keytype, false);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{// 在线抄写;
|
|
{// 在线抄写;
|
|
@@ -4721,7 +4721,7 @@ namespace MOKA_Factory_Tools
|
|
UploadCopyCount();
|
|
UploadCopyCount();
|
|
ErrMsg = "上报结果到MID系统失败";
|
|
ErrMsg = "上报结果到MID系统失败";
|
|
Log.WriteErrorLog(ErrMsg);
|
|
Log.WriteErrorLog(ErrMsg);
|
|
- UpdateKeys(midListNow.keytype, false);
|
|
|
|
|
|
+ UpdateKeysOnline(midListNow.keytype, false);
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -4738,7 +4738,7 @@ namespace MOKA_Factory_Tools
|
|
UploadCopyCount();
|
|
UploadCopyCount();
|
|
ErrMsg = "上报结果到MID系统失败";
|
|
ErrMsg = "上报结果到MID系统失败";
|
|
Log.WriteErrorLog(ErrMsg);
|
|
Log.WriteErrorLog(ErrMsg);
|
|
- UpdateKeys(midListNow.keytype, false);
|
|
|
|
|
|
+ UpdateKeysOnline(midListNow.keytype, false);
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -4761,7 +4761,7 @@ namespace MOKA_Factory_Tools
|
|
// 上报完成后,更新本地数据库Key的数量;
|
|
// 上报完成后,更新本地数据库Key的数量;
|
|
UploadCopyCount();
|
|
UploadCopyCount();
|
|
// 同时,在线更新Key数量;
|
|
// 同时,在线更新Key数量;
|
|
- UpdateKeys(midListNow.keytype, false);
|
|
|
|
|
|
+ UpdateKeysOnline(midListNow.keytype, false);
|
|
}
|
|
}
|
|
|
|
|
|
if (FunctionSettingNow.ExportSNACASID)
|
|
if (FunctionSettingNow.ExportSNACASID)
|
|
@@ -4923,8 +4923,9 @@ namespace MOKA_Factory_Tools
|
|
/// </summary>
|
|
/// </summary>
|
|
/// <param name="keys">GetMIDInfo的keytype字典</param>
|
|
/// <param name="keys">GetMIDInfo的keytype字典</param>
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
- public bool UpdateKeys(Dictionary<string, string> keys, bool autokey)
|
|
|
|
|
|
+ public bool UpdateKeysOnline(Dictionary<string, string> keys, bool autokey)
|
|
{
|
|
{
|
|
|
|
+ return true;
|
|
GetOrderRemainKeyCount(orderNow);
|
|
GetOrderRemainKeyCount(orderNow);
|
|
if (keys.ContainsKey("DeviceID"))
|
|
if (keys.ContainsKey("DeviceID"))
|
|
{
|
|
{
|
|
@@ -5184,7 +5185,7 @@ namespace MOKA_Factory_Tools
|
|
|
|
|
|
preloadresult = true;
|
|
preloadresult = true;
|
|
timer1.Start();
|
|
timer1.Start();
|
|
- UpdateKeys(midListNow.keytype, true);
|
|
|
|
|
|
+ UpdateKeysOnline(midListNow.keytype, true);
|
|
WritekeyThread = new Thread(Writekey);
|
|
WritekeyThread = new Thread(Writekey);
|
|
WritekeyThread.Start();
|
|
WritekeyThread.Start();
|
|
if (!preloadresult)
|
|
if (!preloadresult)
|