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

1、优化停止命令为暂停。

Browse Source 
2、增加流程结束命令。
3、设备状态变化上报给中控。
4 、版本号: 3.20.24.55
develop
lhiven 7 months ago
parent 397650075e
commit 8820f982ea
4 changed files with 122 additions and 39 deletions
Show Stats Download Patch File Download Diff File

4
Rs.SkyLine/Commom/Scheduling.cs
Unescape Escape View File

@ -1145,6 +1145,10 @@ namespace Rs.MotionPlat.Commom
/// </summary> /// </summary>
EndInput, EndInput,
/// <summary> /// <summary>
/// 流程结束, 发送<see cref="Scheduling"/> 回复<see cref="SchedulingResult"/>
/// </summary>
EndFlow,
/// <summary>
/// 取料失败, 排料机发送<see cref="SchedulingTakingError"/> 回复<see cref="SchedulingTakingError"/>, <see cref="SchedulingTakingError.Handle"/>里提供接下来该做的处理方式 /// 取料失败, 排料机发送<see cref="SchedulingTakingError"/> 回复<see cref="SchedulingTakingError"/>, <see cref="SchedulingTakingError.Handle"/>里提供接下来该做的处理方式
/// </summary> /// </summary>
TakingError, TakingError,

38
Rs.SkyLine/Flow/MachineManage.cs
Unescape Escape View File

@ -96,15 +96,41 @@ namespace Rs.MotionPlat.Flow
/// </summary> /// </summary>
private ERunStatus RunStatus { get; set; } = ERunStatus.Stopped; private ERunStatus RunStatus { get; set; } = ERunStatus.Stopped;
private ERunMode _RunMode = ERunMode.Manual;
/// <summary> /// <summary>
/// 运行模式(Manual,Automatic) /// 运行模式(Manual,Automatic)
/// </summary> /// </summary>
public ERunMode RunMode { get; set; } = ERunMode.Manual; public ERunMode RunMode
{
get
{
return _RunMode;
}
set
{
if (_RunMode != value)
{
_RunMode = value;
TestCenter.Instance.ReportStatusToCenter(SchedulingStatusInfo.InfoType.RunMode);
}
}
}
private EInitializeState _InitializeState = EInitializeState.Uninitialized;
/// <summary> /// <summary>
/// 初始化状态（Uninitialized，Initializing，Initialized） /// 初始化状态（Uninitialized，Initializing，Initialized）
/// </summary> /// </summary>
public EInitializeState InitializeState { get; set; } = EInitializeState.Uninitialized; public EInitializeState InitializeState
{
get { return _InitializeState; }
set {
if(_InitializeState != value)
{
_InitializeState = value;
TestCenter.Instance.ReportStatusToCenter(SchedulingStatusInfo.InfoType.InitializeState);
}
}
}
/// <summary> /// <summary>
/// 测试机状态 /// 测试机状态
@ -124,7 +150,13 @@ namespace Rs.MotionPlat.Flow
/// <param name="status"></param> /// <param name="status"></param>
public void SetCenterMachineStatus(ERunStatus status) public void SetCenterMachineStatus(ERunStatus status)
{ {
RunStatus= status; if(RunStatus!=status)
{
RunStatus = status;
//send to center
TestCenter.Instance.ReportStatusToCenter(SchedulingStatusInfo.InfoType.RunStatus);
}
} }
public void SetTesterState(TesterInfo _testerInfo) public void SetTesterState(TesterInfo _testerInfo)

117
Rs.SkyLine/Flow/TestCenter.cs
Unescape Escape View File

@ -26,7 +26,7 @@ namespace Rs.MotionPlat.Flow
public class TestCenter public class TestCenter
{ {
TcpClientHelper client = new TcpClientHelper("127.0.0.1",2048); TcpClientHelper client = new TcpClientHelper("127.0.0.1",2048);
//TcpClientHelper client = new TcpClientHelper("192.168.31.120", 2048); //TcpClientHelper client = new TcpClientHelper("192.168.110.162", 2048);
SchedulingResult schedulResult = new SchedulingResult(); SchedulingResult schedulResult = new SchedulingResult();
SchedulingMaterial sm; SchedulingMaterial sm;
Dictionary<int, AlarmItem> alarmInfos = new Dictionary<int, AlarmItem>(); Dictionary<int, AlarmItem> alarmInfos = new Dictionary<int, AlarmItem>();
@ -72,41 +72,13 @@ namespace Rs.MotionPlat.Flow
} }
else if(ssi.Info== "Stopped") else if(ssi.Info== "Stopped")
{ {
MessageQueue.Instance.Insert("收到中控停止命令,等待各个料盘就绪"); MessageQueue.Instance.Insert($"收到中控停止命令：{ssi.Info}");
Task.Run(() => { Ops.Stop();
while(true)
{
bool bInput = (StockManager.Instance.GetStock(ETrayType.Input).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Input).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Input).Status == EStockTrayStatus.Empty);
bool bOk = (StockManager.Instance.GetStock(ETrayType.Ok).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Ok).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Ok).Status == EStockTrayStatus.Empty);
bool bNg = (StockManager.Instance.GetStock(ETrayType.Ng).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Ng).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Ng).Status == EStockTrayStatus.Empty);
bool bMulti = (StockManager.Instance.GetStock(ETrayType.Multi).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Multi).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Multi).Status == EStockTrayStatus.Empty);
bool bEmpty2 = (StockManager.Instance.GetStock(ETrayType.Empty2).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Empty2).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Empty2).Status == EStockTrayStatus.Empty);
if (bInput && bOk && bNg && bMulti && bEmpty2)
{
DischargeFlow.Instance.ResetScanNum();
Ops.Stop();
MessageQueue.Instance.Insert("料仓已全部就绪，设备停止运行");
break;
}
Thread.Sleep(100);
}
});
} }
//else if(ssi.Info== "EndFlow")//Stopped
//{
//}
//WorkEnvironment.Instance.Ready(); //WorkEnvironment.Instance.Ready();
//Task.Run(() => { //Task.Run(() => {
// if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne()) // if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne())
@ -156,6 +128,10 @@ namespace Rs.MotionPlat.Flow
} }
switch (eInstructioneInstruction) switch (eInstructioneInstruction)
{ {
case EInstruction.EndFlow:
MessageQueue.Instance.Insert("收到中控停止命令:EndFlow,等待各个料盘就绪");
EndFlow();
break;
case EInstruction.CheckTray: case EInstruction.CheckTray:
MachineManage.Instance.SetLoadUnloadStatus(ERunState.Busying); MachineManage.Instance.SetLoadUnloadStatus(ERunState.Busying);
ReportToTestCenter(schedule); ReportToTestCenter(schedule);
@ -702,6 +678,46 @@ namespace Rs.MotionPlat.Flow
Send(content, Encoding.ASCII); Send(content, Encoding.ASCII);
} }
public void EndFlow()
{
Task.Run(() => {
while (true)
{
bool bInput = (StockManager.Instance.GetStock(ETrayType.Input).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Input).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Input).Status == EStockTrayStatus.Empty);
bool bOk = (StockManager.Instance.GetStock(ETrayType.Ok).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Ok).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Ok).Status == EStockTrayStatus.Empty);
bool bNg = (StockManager.Instance.GetStock(ETrayType.Ng).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Ng).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Ng).Status == EStockTrayStatus.Empty);
bool bMulti = (StockManager.Instance.GetStock(ETrayType.Multi).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Multi).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Multi).Status == EStockTrayStatus.Empty);
bool bEmpty2 = (StockManager.Instance.GetStock(ETrayType.Empty2).Status == EStockTrayStatus.Loaded
|| StockManager.Instance.GetStock(ETrayType.Empty2).Status == EStockTrayStatus.Unloaded
|| StockManager.Instance.GetStock(ETrayType.Empty2).Status == EStockTrayStatus.Empty);
if (bInput && bOk && bNg && bMulti && bEmpty2)
{
DischargeFlow.Instance.ResetScanNum();
Ops.Stop();
MessageQueue.Instance.Insert("料仓已全部就绪，设备停止运行");
break;
}
Thread.Sleep(100);
}
});
}
public void ShowMsgBox(SchedulingMessageBox msgBox) public void ShowMsgBox(SchedulingMessageBox msgBox)
{ {
@ -753,5 +769,36 @@ namespace Rs.MotionPlat.Flow
} }
ReportToTestCenter(tray); ReportToTestCenter(tray);
} }
public void ReportStatusToCenter(SchedulingStatusInfo.InfoType intoType)
{
SchedulingStatusInfo statusInto = new SchedulingStatusInfo();
statusInto.Type=intoType;
statusInto.Instruction = EInstruction.InquireStatus;
switch (intoType)
{
case SchedulingStatusInfo.InfoType.State:
statusInto.Info = MachineManage.Instance.GetLoadUnloadStatus().ToString();// ERunState.Waiting.ToString();
break;
case SchedulingStatusInfo.InfoType.RunStatus:
statusInto.Info = MachineManage.Instance.GetCenterRunStatus().ToString();// ERunStatus.Started.ToString();
break;
case SchedulingStatusInfo.InfoType.RunMode:
statusInto.Info = MachineManage.Instance.RunMode.ToString();
break;
case SchedulingStatusInfo.InfoType.InitializeState:
statusInto.Info = MachineManage.Instance.InitializeState.ToString();// EInitializeState.Initialized.ToString();
break;
case SchedulingStatusInfo.InfoType.AssignMode:
statusInto.Info = EAssignMode.Normal.ToString();
break;
case SchedulingStatusInfo.InfoType.TesterState:
statusInto.Info = JsonConvert.SerializeObject(MachineManage.Instance.GetTesterInfo());//.ToString();
break;
default:
break;
}
ReportToTestCenter(statusInto);
}
} }
} }

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

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
// //
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
[assembly: AssemblyVersion("3.20.24.54")] [assembly: AssemblyVersion("3.20.24.55")]
//[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