diff --git a/Rs.DeweyTester/Commom/DevLog.cs b/Rs.DeweyTester/Commom/DevLog.cs index ef1bc87..8c05bf5 100644 --- a/Rs.DeweyTester/Commom/DevLog.cs +++ b/Rs.DeweyTester/Commom/DevLog.cs @@ -33,8 +33,14 @@ namespace Rs.MotionPlat.Commom { File.AppendAllText(filename, csvTitle); } + string loginmode = ""; + if(GlobalUser.UserName!="") + { + loginmode = GlobalUser.UserName; + } + string err = errorcode > 0 ? errorcode.ToString() : ""; string v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString().Replace(".","_"); - string content = $"{v},{GlobalVar.SiteID},{GlobalVar.ProjectID},{GlobalVar.MachineID},{DateTime.Now.ToString("dd/MM/yyyy")},{DateTime.Now.ToString("HH:mm:ss")},{GlobalVar.LotName.Replace("\r\n", "")},OP,{keyword},{errorcode},\"{errormsg}\",{message}\r\n"; + string content = $"{v},{GlobalVar.SiteID},{GlobalVar.ProjectID},{GlobalVar.MachineID},{DateTime.Now.ToString("dd/MM/yyyy")},{DateTime.Now.ToString("HH:mm:ss")},{GlobalVar.LotName.Replace("\r\n", "")},{loginmode},{keyword},{err},\"{errormsg}\",\"{message}\"\r\n"; File.AppendAllText(filename, content); } catch (Exception ex) diff --git a/Rs.DeweyTester/Commom/Msgbox.cs b/Rs.DeweyTester/Commom/Msgbox.cs index f153bc1..da5e70f 100644 --- a/Rs.DeweyTester/Commom/Msgbox.cs +++ b/Rs.DeweyTester/Commom/Msgbox.cs @@ -42,7 +42,7 @@ namespace Rs.MotionPlat.Commom /// public static EButtonType ShowDialog(AlarmEntity alarmInfo, EButtonType buttons, bool warning = false) { - DevLog.EventTracker("ERROR START", alarmInfo.AlarmID, alarmInfo.EN, "WORK"); + DevLog.EventTracker("ERROR START", alarmInfo.AlarmID, alarmInfo.EventTrackerDesc, alarmInfo.EN); //if (!GlobalVar.DisableBuzzer) //{ // Ops.On("蜂鸣器"); @@ -75,7 +75,7 @@ namespace Rs.MotionPlat.Commom //{ // LightManger.Instance.SetStatus(ELightStatus.Green); //} - DevLog.EventTracker("ERROR END", alarmInfo.AlarmID, alarmInfo.EN, "WORK"); + DevLog.EventTracker("ERROR END", alarmInfo.AlarmID, alarmInfo.EventTrackerDesc, alarmInfo.EN); if (warning) { BuzzerManager.Instance.Off(); diff --git a/Rs.DeweyTester/Entitys/TestFixtureManager.cs b/Rs.DeweyTester/Entitys/TestFixtureManager.cs index 88df3c8..37a3864 100644 --- a/Rs.DeweyTester/Entitys/TestFixtureManager.cs +++ b/Rs.DeweyTester/Entitys/TestFixtureManager.cs @@ -600,7 +600,7 @@ namespace Rs.MotionPlat.Entitys case "3": //侧相机测试失败 AlarmEntity alarmInfo = AlarmCollection.Get(AlarmConstID.DUT未放好).Transform(Index); - DevLog.EventTracker("ERROR START", alarmInfo.AlarmID, alarmInfo.EN, "WORK"); + DevLog.EventTracker("ERROR START", alarmInfo.AlarmID, alarmInfo.EventTrackerDesc, alarmInfo.EN); EButtonType sideCameraSelect = Msgbox.ShowTipDialog(EButtonType.Retry | EButtonType.Cancel, $"Please check DUT{Index} is placed ok,ok continue test click retry,stop test click Cancel","warn",true); if(sideCameraSelect== EButtonType.Retry) { @@ -613,7 +613,7 @@ namespace Rs.MotionPlat.Entitys Send(msg); } dataEvent.Set(); - DevLog.EventTracker("ERROR END", alarmInfo.AlarmID, alarmInfo.EN, "WORK"); + DevLog.EventTracker("ERROR END", alarmInfo.AlarmID, alarmInfo.EventTrackerDesc, alarmInfo.EN); break; } break; diff --git a/Rs.DeweyTester/Flow/HomeFlow.cs b/Rs.DeweyTester/Flow/HomeFlow.cs index c5d7d49..ffbdf19 100644 --- a/Rs.DeweyTester/Flow/HomeFlow.cs +++ b/Rs.DeweyTester/Flow/HomeFlow.cs @@ -333,6 +333,7 @@ namespace Rs.MotionPlat.Flow MessageQueue.Instance.Insert("Device home ok"); MachineManage.Instance.MachineStatus = EMachineStatus.Homed; m_bHomed = true; + DevLog.EventTracker("INIT END", 0, "", "HOME"); step = EHomeFlowStep.回原环境检测; } break; @@ -342,7 +343,7 @@ namespace Rs.MotionPlat.Flow } } }); - DevLog.EventTracker("INIT END", 0, "", "HOME"); + } private string CheckCanHome()