From 5783f57b2b9c5bdbad184ecd2f2ed296b9d6e683 Mon Sep 17 00:00:00 2001 From: lhiven Date: Mon, 25 Sep 2023 14:18:26 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AD=E6=8E=A7=E5=8F=91?= =?UTF-8?q?=E8=BF=87=E6=9D=A5=E7=9A=84=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/TestCenter.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Rs.SkyLine/Flow/TestCenter.cs b/Rs.SkyLine/Flow/TestCenter.cs index 1a5a923..cb52cb2 100644 --- a/Rs.SkyLine/Flow/TestCenter.cs +++ b/Rs.SkyLine/Flow/TestCenter.cs @@ -37,7 +37,8 @@ namespace Rs.MotionPlat.Flow case SchedulingStatusInfo.InfoType.State: break; case SchedulingStatusInfo.InfoType.RunStatus: - + WorkFlow.Instance.Stop(); + TurnoverFlow.Instance.Stop(); WorkEnvironment.Instance.Ready(); Task.Run(() => { if (WorkEnvironment.Instance.EnvReadyOkEvent.WaitOne()) @@ -84,11 +85,11 @@ namespace Rs.MotionPlat.Flow SchedulingConnectionInfo info = JsonConvert.DeserializeObject(json); info.Type = SchedulingConnectionInfo.EType.Scheduling; client.Send(info.ToString()); - LogHelper.Debug(info.ToString()); + //LogHelper.Debug(info.ToString()); ReplayTaskEvent?.Invoke(info.ToString()); break; case EInstruction.LoadAndUnload: - LogHelper.Debug("接收:" + json); + LogHelper.Debug("recive:" + json); MachineManage.Instance.RunState = ERunState.Busying; sm = JsonConvert.DeserializeObject(json); schedulResult = new SchedulingResult() { Instruction = sm.Instruction, State = ERunState.Busying, GroupID = sm.GroupID, TurnoverID = sm.TurnoverID }; @@ -131,7 +132,7 @@ namespace Rs.MotionPlat.Flow break; } client.Send(statusInto.ToString()); - LogHelper.Debug(statusInto.ToString()); + //LogHelper.Debug(statusInto.ToString()); ReplayTaskEvent?.Invoke(statusInto.ToString()); break; case EInstruction.SwitchStatus: @@ -170,6 +171,7 @@ namespace Rs.MotionPlat.Flow break; case EInstruction.CloseMessage: SchedulingMessageBox mbox = JsonConvert.DeserializeObject(json); + TestCenterMessageBoxManager.GetMsgbox(mbox.ID)?.Recived(mbox); break; case EInstruction.MachineButtonDown: break; @@ -287,5 +289,12 @@ namespace Rs.MotionPlat.Flow string content = JsonConvert.SerializeObject(s, new StringEnumConverter()); client.Send(content); } + + + public void ShowMsgBox(SchedulingMessageBox msgBox) + { + string content = JsonConvert.SerializeObject(msgBox, new StringEnumConverter()); + client.Send(content,Encoding.UTF8); + } } }