|
|
@@ -1743,7 +1743,7 @@ namespace TeamAAS_VP.Core
|
|
|
|
|
|
//这里缺少上传MES的本站数据结果及开始和结束时间，需要补充
|
|
|
//从服务器中获取当前时间
|
|
|
- var serverTimeResult = await _mesService.GetServerTimeAsync(code, 2);
|
|
|
+ var serverTimeResult = await _mesService.GetServerTimeAsync(ProductMainSN, 2);
|
|
|
|
|
|
double ct = serverTimeResult.Now.Subtract(_LastMesCheckTime[i]).TotalSeconds;
|
|
|
if (i == 0)
|
|
|
@@ -1765,7 +1765,7 @@ namespace TeamAAS_VP.Core
|
|
|
await _systemDatabaseService.RecordProductionAsync(new ProductionRecord()
|
|
|
{
|
|
|
ProductName = currentProduct.Name,
|
|
|
- ProductCode = code,
|
|
|
+ ProductCode = ProductMainSN,
|
|
|
DeviceId = i,
|
|
|
DeviceName = "",
|
|
|
Category = resultIndex == 1 ? "OK" : "NG",
|
|
|
@@ -1788,13 +1788,11 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
|
LogHelper.WriteLogMes($"上传mes成功");
|
|
|
SendTaskMessage($"上传mes成功", MessageLevel.Debug);
|
|
|
- //ProductMainSN = "";
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
LogHelper.WriteLogMes($"上传mes失败");
|
|
|
SendTaskMessage($"上传mes失败", MessageLevel.Error);
|
|
|
- //ProductMainSN = "";
|
|
|
}
|
|
|
await plc.WriteNodeAsync(string.Format(addressConfig.Out_MesStatus.Address, i), (Int16)3);
|
|
|
|
