diff --git a/BPASmartClient.CustomResource/Pages/View/DebugLogView.xaml b/BPASmartClient.CustomResource/Pages/View/DebugLogView.xaml index da9f8482..8aacd40e 100644 --- a/BPASmartClient.CustomResource/Pages/View/DebugLogView.xaml +++ b/BPASmartClient.CustomResource/Pages/View/DebugLogView.xaml @@ -24,20 +24,35 @@ - - + + + + + + + + + diff --git a/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml index b67fcafa..488c39c5 100644 --- a/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml +++ b/BPASmartClient.CustomResource/Pages/View/RecipeCompleteView.xaml @@ -312,7 +312,7 @@ Margin="10,0,0,0" HorizontalAlignment="Left" Style="{StaticResource DataTextBlockStyle}" - Text="{Binding RunLogInfo}" /> + Text="{Binding RecipeName}" /> + /// 记录打印时间。 + /// + public DateTime LogTime + { + get { return _logTime; } + set { _logTime = value; } + } + public string LogInfo { get { return _mLogInfo; } set { _mLogInfo = value; OnPropertyChanged(); } } private string _mLogInfo; diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs index 6a8f6c60..569ccdd3 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs +++ b/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs @@ -28,6 +28,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel //ff20aefe var temp = new MessageModel() { + LogTime = DateTime.Now, LogInfo = o, Forground = new SolidColorBrush(Color.FromArgb(255, 32, 174, 254)) }; @@ -45,6 +46,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel //FFF53F62 var temp = new MessageModel() { + LogTime=DateTime.Now, LogInfo = o, Forground = new SolidColorBrush(Color.FromArgb(255, 245, 63, 98)) }; @@ -62,6 +64,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel //ff20aefe var temp = new MessageModel() { + LogTime=DateTime.Now, LogInfo = o, Forground = new SolidColorBrush(Color.FromArgb(255, 32, 174, 254)) }; @@ -78,6 +81,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel //FFF53F62 var temp = new MessageModel() { + LogTime = DateTime.Now, LogInfo = o, Forground = new SolidColorBrush(Color.FromArgb(255, 245, 63, 98)) }; diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs index 3d6540ec..fe3b6596 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs @@ -1025,7 +1025,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model SiemensDevice.Siemens_PLC_S7.WriteClass(RecipeFinishInfo, 2261); MessageNotify.GetInstance.ShowRunLog($"托盘1,配方【{res.RecipeCode}】,配料完成,数据反馈给西门子"); - MessageNotify.GetInstance.ShowRecipeLog(res.RecipeName); + MessageNotify.GetInstance.ShowRecipeLog($"配方名称:【{res.RecipeName}】\t 配方号:【{res.RecipeCode}】"); } else {