diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 9819efe6..fee41874 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index 4669c853..47e17642 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache index d4d7456d..6c9bbf5c 100644 Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/App.xaml.cs b/Aucma.Scada.UI/App.xaml.cs index cf76507a..2cd1e104 100644 --- a/Aucma.Scada.UI/App.xaml.cs +++ b/Aucma.Scada.UI/App.xaml.cs @@ -34,7 +34,7 @@ namespace Aucma.Scada.UI mutex = new System.Threading.Mutex(true, System.Diagnostics.Process.GetCurrentProcess().ProcessName, out ret); if (!ret) { - MessageBox.Show("应用程序已开启，禁止重复运行"); + MessageBox.Show("应用程序已开启，禁止重复运行", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); Environment.Exit(0); } else diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 0f31c8c6..ea906fcc 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb index 0b87ad08..da49b7cd 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 72458b35..c779a317 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index 0f31c8c6..ea906fcc 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb index 0b87ad08..da49b7cd 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index 1148d094..f0482835 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -268,12 +268,12 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan PlanCode = string.Empty; ProductModel = string.Empty; BeginTime = string.Empty; - MessageBox.Show("执行计划删除成功"); + MessageBox.Show("执行计划删除成功","提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } else { - MessageBox.Show("执行计划删除失败"); + MessageBox.Show("执行计划删除失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -286,7 +286,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan string info = obj as string; if (info == planCode) { - MessageBox.Show("该计划正在执行中，请勿重复下传"); + MessageBox.Show("该计划正在执行中，请勿重复下传", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } else { @@ -294,11 +294,11 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan if (result != null) { RefreshPlanExecute(result); - MessageBox.Show("执行计划已下达"); + MessageBox.Show("执行计划已下达", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } else { - MessageBox.Show("执行计划下达失败"); + MessageBox.Show("执行计划下达失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs index 613ada1f..444e1cc9 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs @@ -212,7 +212,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan bool result = assemblyPlanBusiness.PlanTransmitByProductPlan(_ProductPlanCode, _TransmitAmount); if (result) { - MessageBox.Show("执行计划维护成功"); + MessageBox.Show("执行计划维护成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs index 0c5ab676..1050180b 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs @@ -67,20 +67,20 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan bool shellResult = assemblyPlanBusiness.JudgmentStock(productPlanInfo, Convert.ToInt32(_TransmitAmount), appConfig.foamMaterialType, appConfig.foamStoreCode); if (!shellResult) { - MessageBox.Show("计划下达失败，箱体物料库存不足"); + MessageBox.Show("计划下达失败，箱体物料库存不足","提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); return; } } else { - MessageBox.Show("生产计划获取失败，加载为空"); + MessageBox.Show("生产计划获取失败，加载为空", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); return; } bool result = assemblyPlanBusiness.PlanTransmitByProductPlan(_PlanInfo.planCode, Convert.ToInt32(_TransmitAmount)); if (result) { - MessageBox.Show("执行计划维护成功"); + MessageBox.Show("执行计划维护成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs index 4b577888..6684ddec 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs @@ -154,7 +154,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道入库状态修改失败"); + MessageBox.Show("货道入库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -173,7 +173,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道出库状态修改失败"); + MessageBox.Show("货道出库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -192,7 +192,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道异常标识修改失败"); + MessageBox.Show("货道异常标识修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -211,7 +211,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道状态修改失败"); + MessageBox.Show("货道状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -264,7 +264,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("出库任务创建失败"); + MessageBox.Show("出库任务创建失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } } diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs index 003e8679..86230323 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs @@ -130,7 +130,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道入库状态修改失败"); + MessageBox.Show("货道入库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -149,7 +149,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道出库状态修改失败"); + MessageBox.Show("货道出库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -168,7 +168,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道异常标识修改失败"); + MessageBox.Show("货道异常标识修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -187,7 +187,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道状态修改失败"); + MessageBox.Show("货道状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -240,7 +240,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("出库任务创建失败"); + MessageBox.Show("出库任务创建失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } } diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs index 10f6d242..266e70ce 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs @@ -130,7 +130,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道入库状态修改失败"); + MessageBox.Show("货道入库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -149,7 +149,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道出库状态修改失败"); + MessageBox.Show("货道出库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -168,7 +168,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道异常标识修改失败"); + MessageBox.Show("货道异常标识修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -187,7 +187,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("货道状态修改失败"); + MessageBox.Show("货道状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } @@ -240,7 +240,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } else { - MessageBox.Show("出库任务创建失败"); + MessageBox.Show("出库任务创建失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } } diff --git a/Aucma.Scada.UI/viewModel/MainViewModel.cs b/Aucma.Scada.UI/viewModel/MainViewModel.cs index 16b783f8..6fbb4e90 100644 --- a/Aucma.Scada.UI/viewModel/MainViewModel.cs +++ b/Aucma.Scada.UI/viewModel/MainViewModel.cs @@ -138,7 +138,7 @@ namespace Aucma.Scada.UI.viewModel { try { - MessageBox.Show("打开系统键盘"); + MessageBox.Show("打开系统键盘", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } catch (Exception ex) { diff --git a/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs index 42664ae2..61097735 100644 --- a/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs @@ -295,12 +295,12 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo if (outStoreBusiness.DeleteTaskInfoByTaskCode(taskCode)) { - MessageBox.Show("任务删除成功"); + MessageBox.Show("任务删除成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); Query(); } else { - MessageBox.Show("任务删除失败"); + MessageBox.Show("任务删除失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly); } } diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index a5af8322..4afcc5e7 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index d9a1f485..324a962b 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 007b820a..4a1b03d0 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index bccbb370..9af9e9fa 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index a5f83cb7..d2c8491a 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 6e9af682..7d90b6fd 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ