|
|
@@ -1511,7 +1511,7 @@ namespace TeamAAS_VP.Core
|
|
|
//List<Task<(bool IsSucceed, ICogImage[] Images, string Message, int cameraIndex, Guid procedureId)>> _ImageTaskList = new List<Task<(bool IsSucceed, ICogImage[] Images, string Message, int cameraIndex, Guid procedureId)>>();
|
|
|
|
|
|
private readonly object _stateLock = new object();
|
|
|
- // private SharedSpeedFileHelper _speedFileHelper = new SharedSpeedFileHelper();
|
|
|
+ // private SharedSpeedFileHelper _speedFileHelper = new SharedSpeedFileHelper();
|
|
|
/// <summary>
|
|
|
/// PLC命令触发时S
|
|
|
/// </summary>
|
|
|
@@ -1795,7 +1795,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
LogHelper.WriteLogMes($"【mes结束QUERY】");
|
|
|
SendTaskMessage($"mes结束QUERY", MessageLevel.Info);
|
|
|
@@ -2288,7 +2288,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- SendTaskMessage($"扫码失败", MessageLevel.Alarm);
|
|
|
+ SendTaskMessage($"扫码失败", MessageLevel.Alarm);
|
|
|
await plc.WriteNodeAsync(addressConfig.Out_FixedCameraPickStatus.Address, (Int16)3);
|
|
|
}
|
|
|
return;
|
|
|
@@ -2455,7 +2455,7 @@ namespace TeamAAS_VP.Core
|
|
|
LogHelper.WriteLogMes($"【mes结束QUERY】");
|
|
|
SendTaskMessage($"mes结束QUERY", MessageLevel.Info);
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
await plc.WriteNodeAsync(addressConfig.Out_FixedCameraPickStatus.Address, (Int16)1);
|
|
|
return;
|
|
|
@@ -2604,7 +2604,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
foreach (var item in AllResult)
|
|
|
{
|
|
|
if (!item)
|
|
|
@@ -2835,63 +2835,6 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- //读取写入PLC速度
|
|
|
- //else if (addressConfig.WorkSpeed.Address.Contains(tuple.nodeId))
|
|
|
- //{
|
|
|
- // if (tuple.value is Int16 state)
|
|
|
- // {
|
|
|
- // if (_Lastworkspeed != state)
|
|
|
- // {
|
|
|
- // _Lastworkspeed = state;
|
|
|
- // }
|
|
|
- // else
|
|
|
- // {
|
|
|
- // return;
|
|
|
- // }
|
|
|
- // if (state==1)
|
|
|
- // {
|
|
|
- // try
|
|
|
- // {
|
|
|
- // // 1. 从PLC读取速度
|
|
|
- // string speed = plc.ReadNode<string>(string.Format(addressConfig.In_ReadSpeed.Address));
|
|
|
- // SendTaskMessage($"读取PLC速度:{speed}", MessageLevel.Info);
|
|
|
-
|
|
|
- // // 2. 写入共享文件
|
|
|
- // _speedFileHelper.WriteSpeedData(speed, state);
|
|
|
- // SendTaskMessage($"速度数据已写入共享文件", MessageLevel.Info);
|
|
|
- // }
|
|
|
- // catch (Exception ex)
|
|
|
- // {
|
|
|
- // SendTaskMessage($"读取PLC速度或写入文件失败: {ex.Message}", MessageLevel.Error);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // else if(state == 2)
|
|
|
- // {
|
|
|
- // try
|
|
|
- // {
|
|
|
- // // 1. 从共享文件读取速度数据
|
|
|
- // var speedData = _speedFileHelper.ReadSpeedData();
|
|
|
-
|
|
|
- // if (speedData != null && !string.IsNullOrEmpty(speedData.SpeedValue))
|
|
|
- // {
|
|
|
- // // 2. 写入PLC
|
|
|
- // string address = string.Format(addressConfig.In_WriteSpeed.Address);
|
|
|
- // plc.WriteNode<string>(address, speedData.SpeedValue);
|
|
|
-
|
|
|
- // SendTaskMessage($"从文件读取速度:{speedData.SpeedValue}, 已写入PLC", MessageLevel.Info);
|
|
|
- // }
|
|
|
- // else
|
|
|
- // {
|
|
|
- // SendTaskMessage("共享文件中没有有效的速度数据", MessageLevel.Alarm);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // catch (Exception ex)
|
|
|
- // {
|
|
|
- // SendTaskMessage($"读取文件或写入PLC失败: {ex.Message}", MessageLevel.Error);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
- //}
|
|
|
// 过站检查
|
|
|
else
|
|
|
{
|
|
|
@@ -2997,7 +2940,7 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
|
if (i == 0)
|
|
|
{
|
|
|
- ProductMainSN = snItem.Replace("sn=", "").Trim();
|
|
|
+ ProductMainSN = snItem.Replace("sn=", "").Trim();
|
|
|
_productService.CurrentProductCode = ProductMainSN;
|
|
|
}
|
|
|
SendTaskMessage($"产品主sn:{ProductMainSN}", MessageLevel.Info);
|
|
|
@@ -3178,7 +3121,7 @@ namespace TeamAAS_VP.Core
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
LogHelper.WriteLogMes($"【mes开始ADD】");
|
|
|
SendTaskMessage($"mes开始ADD", MessageLevel.Info);
|
|
|
@@ -3188,7 +3131,7 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
|
if (item.PhotoPassed == "NG")
|
|
|
{
|
|
|
- submitDataError.Append(item.PhotoName + "_Fail,");
|
|
|
+ submitDataError.Append(item.PhotoName + "_" + item.ResultData + "_Fail,");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -3997,7 +3940,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
}
|
|
|
catch (Exception ex)
|