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

优化中控发过来的信息处理

Browse Source
master
lhiven 2 years ago
parent a5cfa49d1c
commit 5783f57b2b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -37,7 +37,8 @@ namespace Rs.MotionPlat.Flow
case SchedulingStatusInfo.InfoType.State: case SchedulingStatusInfo.InfoType.State:
break; break;
case SchedulingStatusInfo.InfoType.RunStatus: case SchedulingStatusInfo.InfoType.RunStatus:
WorkFlow.Instance.Stop();
TurnoverFlow.Instance.Stop();
WorkEnvironment.Instance.Ready(); WorkEnvironment.Instance.Ready();
Task.Run(() => { Task.Run(() => {
if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne()) if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne())
@ -84,11 +85,11 @@ namespace Rs.MotionPlat.Flow
SchedulingConnectionInfo info = JsonConvert.DeserializeObject<SchedulingConnectionInfo>(json); SchedulingConnectionInfo info = JsonConvert.DeserializeObject<SchedulingConnectionInfo>(json);
info.Type = SchedulingConnectionInfo.EType.Scheduling; info.Type = SchedulingConnectionInfo.EType.Scheduling;
client.Send(info.ToString()); client.Send(info.ToString());
LogHelper.Debug(info.ToString()); //LogHelper.Debug(info.ToString());
ReplayTaskEvent?.Invoke(info.ToString()); ReplayTaskEvent?.Invoke(info.ToString());
break; break;
case EInstruction.LoadAndUnload: case EInstruction.LoadAndUnload:
LogHelper.Debug("接收:" + json); LogHelper.Debug("recive:" + json);
MachineManage.Instance.RunState = ERunState.Busying; MachineManage.Instance.RunState = ERunState.Busying;
sm = JsonConvert.DeserializeObject<SchedulingMaterial>(json); sm = JsonConvert.DeserializeObject<SchedulingMaterial>(json);
schedulResult = new SchedulingResult() { Instruction = sm.Instruction, State = ERunState.Busying, GroupID = sm.GroupID, TurnoverID = sm.TurnoverID }; schedulResult = new SchedulingResult() { Instruction = sm.Instruction, State = ERunState.Busying, GroupID = sm.GroupID, TurnoverID = sm.TurnoverID };
@ -131,7 +132,7 @@ namespace Rs.MotionPlat.Flow
break; break;
} }
client.Send(statusInto.ToString()); client.Send(statusInto.ToString());
LogHelper.Debug(statusInto.ToString()); //LogHelper.Debug(statusInto.ToString());
ReplayTaskEvent?.Invoke(statusInto.ToString()); ReplayTaskEvent?.Invoke(statusInto.ToString());
break; break;
case EInstruction.SwitchStatus: case EInstruction.SwitchStatus:
@ -170,6 +171,7 @@ namespace Rs.MotionPlat.Flow
break; break;
case EInstruction.CloseMessage: case EInstruction.CloseMessage:
SchedulingMessageBox mbox = JsonConvert.DeserializeObject<SchedulingMessageBox>(json); SchedulingMessageBox mbox = JsonConvert.DeserializeObject<SchedulingMessageBox>(json);
TestCenterMessageBoxManager.GetMsgbox(mbox.ID)?.Recived(mbox);
break; break;
case EInstruction.MachineButtonDown: case EInstruction.MachineButtonDown:
break; break;
@ -287,5 +289,12 @@ namespace Rs.MotionPlat.Flow
string content = JsonConvert.SerializeObject(s, new StringEnumConverter()); string content = JsonConvert.SerializeObject(s, new StringEnumConverter());
client.Send(content); client.Send(content);
} }
public void ShowMsgBox(SchedulingMessageBox msgBox)
{
string content = JsonConvert.SerializeObject(msgBox, new StringEnumConverter());
client.Send(content,Encoding.UTF8);
}
} }
} }

Write Preview
Loading…
Cancel
Save