lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

料仓满料报警、料盘未放下报警改为多语言

Browse Source
develop
lhiven 11 months ago
parent a14911c64d
commit 5122e85e81
4 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File

22
Rs.SkyLine/Flow/AlarmConstID.cs
Unescape Escape View File

@ -416,6 +416,23 @@ namespace Rs.MotionPlat.Flow
/// </summary> /// </summary>
public const int 离子风扇报警 = 1095; public const int 离子风扇报警 = 1095;
/// <summary>
/// 料盘未放下报警
/// </summary>
public const int 料盘未放下报警 = 1096;
/// <summary> /// <summary>
/// Empty1满料报警 /// Empty1满料报警
/// </summary> /// </summary>
@ -469,10 +486,7 @@ namespace Rs.MotionPlat.Flow
/// 上下气缸异常报警 /// 上下气缸异常报警
/// </summary> /// </summary>
public const int UpDownCylinderExceptionAlarm = 19; public const int UpDownCylinderExceptionAlarm = 19;
/// <summary>
/// 料仓满料报警
/// </summary>
public const int StockFullTrayAlarm = 20;
/// <summary> /// <summary>
/// 料仓缺料盘报警 /// 料仓缺料盘报警

20
Rs.SkyLine/Flow/NormalFlow/StockTrayFlow.cs
Unescape Escape View File

@ -292,9 +292,10 @@ namespace Rs.AutoDischarge.V3.Flow
logInfo = GetClassName()+ $"已运动到{GetTrayName()}料仓上料接料盘位,cz={Ops.GetCurPosition(StockZ)}"; logInfo = GetClassName()+ $"已运动到{GetTrayName()}料仓上料接料盘位,cz={Ops.GetCurPosition(StockZ)}";
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
Ops.Off($"{(int)m_stockType}号料仓托盘气缸"); Ops.Off($"{(int)m_stockType}号料仓托盘气缸");
Thread.Sleep(GlobalVar.TrayCylinderRetractionDelay);
logInfo = GetClassName() + $"{(int)m_stockType}号料仓托盘气缸 off"; logInfo = GetClassName() + $"{(int)m_stockType}号料仓托盘气缸 off";
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
Thread.Sleep(500);
loadStep = EStockTrayLoadFlowStep.上料下降到托料盘位; loadStep = EStockTrayLoadFlowStep.上料下降到托料盘位;
} }
break; break;
@ -322,7 +323,7 @@ namespace Rs.AutoDischarge.V3.Flow
logInfo = GetClassName() + $"已下降到{GetTrayName()}料仓Z托料盘位，cz:{Ops.GetCurPosition(StockZ)}"; logInfo = GetClassName() + $"已下降到{GetTrayName()}料仓Z托料盘位，cz:{Ops.GetCurPosition(StockZ)}";
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
Ops.On($"{(int)m_stockType}号料仓托盘气缸"); Ops.On($"{(int)m_stockType}号料仓托盘气缸");
Thread.Sleep(500); Thread.Sleep(GlobalVar.TrayCylinderExtensionDelay);
logInfo = GetClassName() + $"{(int)m_stockType}号料仓托盘气缸 on"; logInfo = GetClassName() + $"{(int)m_stockType}号料仓托盘气缸 on";
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
loadStep = EStockTrayLoadFlowStep.到起始位; loadStep = EStockTrayLoadFlowStep.到起始位;
@ -578,9 +579,12 @@ namespace Rs.AutoDischarge.V3.Flow
else else
{ {
//弹框报警，料仓已经满料，提醒人工取走，然后流程继续 //弹框报警，料仓已经满料，提醒人工取走，然后流程继续
logInfo = $"{m_stockType}料仓已经满料,请先把料盘取走"; //logInfo = $"{m_stockType}料仓已经满料,请先把料盘取走";
TestCenterMessageBox.Show(AlarmConstID.StockFullTrayAlarm, logInfo, ETipButton.Ok); alarmEntity = AlarmCollection.Get(AlarmConstID.料仓满料报警).Transform(m_stockType);
msgBox = TestCenterMessageBox.WaitResult(AlarmConstID.StockFullTrayAlarm); MessageQueue.Instance.Warn(GetClassName() + alarmEntity.CN);
AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Ok, null);
//TestCenterMessageBox.Show(AlarmConstID.StockFullTrayAlarm, logInfo, ETipButton.Ok);
//msgBox = TestCenterMessageBox.WaitResult(AlarmConstID.StockFullTrayAlarm);
} }
break; break;
case EStockTrayUnloadFlowStep.回退到异常处理位: case EStockTrayUnloadFlowStep.回退到异常处理位:
@ -749,7 +753,8 @@ namespace Rs.AutoDischarge.V3.Flow
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
VirtualAxisSleep(); VirtualAxisSleep();
Ops.Off($"{(int)m_stockType}号料仓托盘气缸"); Ops.Off($"{(int)m_stockType}号料仓托盘气缸");
Thread.Sleep(200); //Thread.Sleep(200);
Thread.Sleep(GlobalVar.TrayCylinderRetractionDelay);
logInfo = GetClassName() + $"{GetTrayName()}料仓{(int)m_stockType}号料仓托盘气缸 off"; logInfo = GetClassName() + $"{GetTrayName()}料仓{(int)m_stockType}号料仓托盘气缸 off";
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
unloadStep = EStockTrayUnloadFlowStep.顶起托盘; unloadStep = EStockTrayUnloadFlowStep.顶起托盘;
@ -779,7 +784,8 @@ namespace Rs.AutoDischarge.V3.Flow
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
VirtualAxisSleep(); VirtualAxisSleep();
Ops.On($"{(int)m_stockType}号料仓托盘气缸"); Ops.On($"{(int)m_stockType}号料仓托盘气缸");
Thread.Sleep(200); Thread.Sleep(GlobalVar.TrayCylinderExtensionDelay);
logInfo = GetClassName() + $"{GetTrayName()}料仓{(int)m_stockType}号料仓托盘气缸 on"; logInfo = GetClassName() + $"{GetTrayName()}料仓{(int)m_stockType}号料仓托盘气缸 on";
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
unloadStep = EStockTrayUnloadFlowStep.下料完成到起始位; unloadStep = EStockTrayUnloadFlowStep.下料完成到起始位;

11
Rs.SkyLine/Flow/NormalFlow/TakeTrayFlow.cs
Unescape Escape View File

@ -584,10 +584,13 @@ namespace Rs.MotionPlat.Flow
else else
{ {
//粘料盘 //粘料盘
logInfo = "检测到料盘未放下，请处理后点击确定重放"; //logInfo = "检测到料盘未放下，请处理后点击确定重放";
MessageQueue.Instance.Warn(GetClassName()+ logInfo); //MessageQueue.Instance.Warn(GetClassName()+ logInfo);
TestCenterMessageBox.Show(AlarmConstID.UpDownCylinderExceptionAlarm, logInfo, ETipButton.Ok); //TestCenterMessageBox.Show(AlarmConstID.UpDownCylinderExceptionAlarm, logInfo, ETipButton.Ok);
TestCenterMessageBox.WaitResult(AlarmConstID.UpDownCylinderExceptionAlarm); //TestCenterMessageBox.WaitResult(AlarmConstID.UpDownCylinderExceptionAlarm);
alarmEntity = AlarmCollection.Get(AlarmConstID.料盘未放下报警);
MessageQueue.Instance.Warn(GetClassName() + alarmEntity.CN);
AlarmMessageBox.ShowDialog(alarmEntity, ETipButton.Ok, null);
step = ETakeTrayFlowStep.到放料盘上方; step = ETakeTrayFlowStep.到放料盘上方;
} }
break; break;

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
// //
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
[assembly: AssemblyVersion("3.20.24.29")] [assembly: AssemblyVersion("3.20.24.30")]
//[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]

Write Preview
Loading…
Cancel
Save