diff --git a/SlnMesnac.WPF/App.xaml.cs b/SlnMesnac.WPF/App.xaml.cs index 052b3db..09d82d0 100644 --- a/SlnMesnac.WPF/App.xaml.cs +++ b/SlnMesnac.WPF/App.xaml.cs @@ -13,6 +13,7 @@ using SlnMesnac.WPF.Attribute; using SlnMesnac.WPF.Page.Login; using Prism.Events; using SlnMesnac.WPF.Event; +using AduSkin.Controls.Metro; namespace SlnMesnac.WPF { @@ -57,6 +58,9 @@ namespace SlnMesnac.WPF // 配置Serilog和其他扩展 ServiceProvider.UseSerilogExtensions(); + //通知弹窗 + NoticeManager.Initialize(); + var appConfig = ServiceProvider.GetService(); Log.Information($"系统初始化完成,日志存放路径：{appConfig?.logPath}"); diff --git a/SlnMesnac.WPF/Icon.png b/SlnMesnac.WPF/Icon.png new file mode 100644 index 0000000..3c05196 Binary files /dev/null and b/SlnMesnac.WPF/Icon.png differ diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml index 1610f81..63e83bd 100644 --- a/SlnMesnac.WPF/MainWindow.xaml +++ b/SlnMesnac.WPF/MainWindow.xaml @@ -5,8 +5,8 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:SlnMesnac.WPF" mc:Ignorable="d" - Title="MainWindow" Height="1080" Width="1920" - WindowState="Maximized" Topmost="False" Background="#ECF5F8"> + Title="工业高频RFID" Height="1080" Width="1920" + WindowState="Maximized" Topmost="False" Background="#ECF5F8" Icon="/Icon.png" > diff --git a/SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml b/SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml index a9d0f3d..416c393 100644 --- a/SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml +++ b/SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml @@ -94,7 +94,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -132,7 +132,7 @@ - + diff --git a/SlnMesnac.WPF/SlnMesnac.WPF.csproj b/SlnMesnac.WPF/SlnMesnac.WPF.csproj index ad496ca..8bb157c 100644 --- a/SlnMesnac.WPF/SlnMesnac.WPF.csproj +++ b/SlnMesnac.WPF/SlnMesnac.WPF.csproj @@ -10,6 +10,7 @@ + @@ -40,6 +41,7 @@ + @@ -52,6 +54,7 @@ + Never diff --git a/SlnMesnac.WPF/Templates/icon/Icon.png b/SlnMesnac.WPF/Templates/icon/Icon.png index 1560465..3c05196 100644 Binary files a/SlnMesnac.WPF/Templates/icon/Icon.png and b/SlnMesnac.WPF/Templates/icon/Icon.png differ diff --git a/SlnMesnac.WPF/ViewModel/ProductDetails/ProductDetailsEditViewModel.cs b/SlnMesnac.WPF/ViewModel/ProductDetails/ProductDetailsEditViewModel.cs index ca1acfa..5d2c59e 100644 --- a/SlnMesnac.WPF/ViewModel/ProductDetails/ProductDetailsEditViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/ProductDetails/ProductDetailsEditViewModel.cs @@ -1,4 +1,6 @@ -using CommunityToolkit.Mvvm.ComponentModel; +using AduSkin.Controls.Metro; +using AduSkin.Controls; +using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Prism.Events; using SlnMesnac.Model.domain; @@ -12,6 +14,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Forms; using static MaterialDesignThemes.Wpf.Theme.ToolBar; namespace SlnMesnac.WPF.ViewModel.ProductDetails @@ -150,62 +153,108 @@ namespace SlnMesnac.WPF.ViewModel.ProductDetails [RelayCommand] private void SavePrdouctInfo() { - var info = ProductInfo; - - if(info != null) + NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel() { - info.productImage = productImage; - info.featureImage = featureImage; - info.analyzeImage = analyzeImage; - info.sizeLeftImage = sizeLeftImage; - info.sizeRightImage = sizeRightImage; - _product_infoServices.Update(info); + Title = "通知", + Content = $"保存产品信息", + NotifiactionType = EnumPromptType.Success + }); - var productFeatureInfo = ProductFeature.ToList(); - //productFeatureInfo.ToList().ForEach(x => x.productCode = info.productCode); - - foreach(var item in productFeatureInfo) + try + { + Task.Run(() => { - item.productCode = info.productCode; - if (item.objid != 0) + var info = ProductInfo; + + if (info != null) { - _product_featureServices.Update(item); + info.productImage = productImage; + info.featureImage = featureImage; + info.analyzeImage = analyzeImage; + info.sizeLeftImage = sizeLeftImage; + info.sizeRightImage = sizeRightImage; + _product_infoServices.Update(info); + + var productFeatureInfo = ProductFeature.ToList(); + //productFeatureInfo.ToList().ForEach(x => x.productCode = info.productCode); + + foreach (var item in productFeatureInfo) + { + item.productCode = info.productCode; + if (item.objid != 0) + { + _product_featureServices.Update(item); + } + else + { + _product_featureServices.Insert(item); + } + } + + var productDescribeInfo = ProductDescribe.ToList(); + //productDescribeInfo.ToList().ForEach(x => x.productCode = info.productCode); + foreach (var item in productDescribeInfo) + { + item.productCode = info.productCode; + if (item.objid != 0) + { + _product_describeServices.Update(item); + } + else + { + _product_describeServices.Insert(item); + } + } + + var productParamsInfo = ProductParams.ToList(); + //productParamsInfo.ToList().ForEach(x => x.productCode = info.productCode); + foreach (var item in productParamsInfo) + { + item.productCode = info.productCode; + if (item.objid != 0) + { + _product_paramServices.Update(item); + } + else + { + _product_paramServices.Insert(item); + } + } + + App.Current.Dispatcher.Invoke(() => + { + NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel() + { + Title = "通知", + Content = $"{info.productName}产品信息更新完成", + NotifiactionType = EnumPromptType.Success + }); + }); + } else { - _product_featureServices.Insert(item); + App.Current.Dispatcher.Invoke(() => + { + NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel() + { + Title = "通知", + Content = $"产品信息保存失败，基本信息为空", + NotifiactionType = EnumPromptType.Error + }); + }); } - } + }); - var productDescribeInfo = ProductDescribe.ToList(); - //productDescribeInfo.ToList().ForEach(x => x.productCode = info.productCode); - foreach (var item in productDescribeInfo) + + }catch(Exception ex) + { + NoticeManager.NotifiactionShow.AddNotifiaction(new NotifiactionModel() { - item.productCode = info.productCode; - if (item.objid != 0) - { - _product_describeServices.Update(item); - } - else - { - _product_describeServices.Insert(item); - } - } - - var productParamsInfo = ProductParams.ToList(); - //productParamsInfo.ToList().ForEach(x => x.productCode = info.productCode); - foreach (var item in productParamsInfo) - { - item.productCode = info.productCode; - if (item.objid != 0) - { - _product_paramServices.Update(item); - } - else - { - _product_paramServices.Insert(item); - } - } + Title = "通知", + Content = $"产品信息保存异常：{ex.Message}", + NotifiactionType = EnumPromptType.Error + }); }