From 4ec6acde8f8d92c8b2237b844534c173e5d487ef Mon Sep 17 00:00:00 2001 From: Tyrone CT Date: Thu, 9 Apr 2026 21:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CapMachine.Wpf/App.xaml.cs | 9 ++++++ CapMachine.Wpf/CapMachine.Wpf.csproj | 3 ++ .../Services/NavigationMenuService.cs | 2 +- CapMachine.Wpf/Services/PPCService.cs | 28 +++++++++---------- build-errors-sln-release.txt | 6 ++++ build-errors-sln.txt | 6 ++++ build-errors.txt | 13 +++++++++ 7 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 build-errors-sln-release.txt create mode 100644 build-errors-sln.txt create mode 100644 build-errors.txt diff --git a/CapMachine.Wpf/App.xaml.cs b/CapMachine.Wpf/App.xaml.cs index 4dbe27e..d44c3dc 100644 --- a/CapMachine.Wpf/App.xaml.cs +++ b/CapMachine.Wpf/App.xaml.cs @@ -133,10 +133,13 @@ namespace CapMachine.Wpf containerRegistry.RegisterSingleton(); containerRegistry.RegisterSingleton(); + containerRegistry.RegisterSingleton(); + containerRegistry.RegisterSingleton(); containerRegistry.RegisterSingleton(); containerRegistry.RegisterSingleton(); containerRegistry.RegisterSingleton(); //containerRegistry.RegisterSingleton(); + containerRegistry.RegisterSingleton(); containerRegistry.RegisterSingleton(); containerRegistry.RegisterSingleton(); @@ -187,6 +190,8 @@ namespace CapMachine.Wpf containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); //注册Dialog视图时绑定VM @@ -200,13 +205,17 @@ namespace CapMachine.Wpf containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); + containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); containerRegistry.RegisterDialog(); diff --git a/CapMachine.Wpf/CapMachine.Wpf.csproj b/CapMachine.Wpf/CapMachine.Wpf.csproj index 1fcae89..6ebc24b 100644 --- a/CapMachine.Wpf/CapMachine.Wpf.csproj +++ b/CapMachine.Wpf/CapMachine.Wpf.csproj @@ -746,6 +746,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/CapMachine.Wpf/Services/NavigationMenuService.cs b/CapMachine.Wpf/Services/NavigationMenuService.cs index 3e9aca6..e6b5523 100644 --- a/CapMachine.Wpf/Services/NavigationMenuService.cs +++ b/CapMachine.Wpf/Services/NavigationMenuService.cs @@ -77,7 +77,7 @@ namespace CapMachine.Wpf.Services //})); MenuItems.Add(new NavigationItem("", "工艺过程", "MonitorView")); MenuItems.Add(new NavigationItem("", "CAN配置", "CANConfigView")); - //MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView")); + MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView")); MenuItems.Add(new NavigationItem("", "LIN配置", "LINConfigView")); //MenuItems.Add(new NavigationItem("", "ZLG CAN配置", "ZlgCanDriveConfigView")); //MenuItems.Add(new NavigationItem("", "ZLG LIN配置", "ZlgLinDriveConfigView")); diff --git a/CapMachine.Wpf/Services/PPCService.cs b/CapMachine.Wpf/Services/PPCService.cs index de5ce05..f004db8 100644 --- a/CapMachine.Wpf/Services/PPCService.cs +++ b/CapMachine.Wpf/Services/PPCService.cs @@ -448,20 +448,20 @@ namespace CapMachine.Wpf.Services // 处理 err2 } - if (TryUpdateThermodynamicSixResults(out var thermoErr)) - { - if (!string.IsNullOrWhiteSpace(thermoErr)) - { - Logger?.Error($"六个物性结果计算警告: {thermoErr}"); - } - } - else - { - if (!string.IsNullOrWhiteSpace(thermoErr)) - { - Logger?.Error($"六个物性结果计算失败: {thermoErr}"); - } - } + //if (TryUpdateThermodynamicSixResults(out var thermoErr)) + //{ + // if (!string.IsNullOrWhiteSpace(thermoErr)) + // { + // Logger?.Error($"六个物性结果计算警告: {thermoErr}"); + // } + //} + //else + //{ + // if (!string.IsNullOrWhiteSpace(thermoErr)) + // { + // Logger?.Error($"六个物性结果计算失败: {thermoErr}"); + // } + //} } catch (Exception ex) diff --git a/build-errors-sln-release.txt b/build-errors-sln-release.txt new file mode 100644 index 0000000..d92e990 --- /dev/null +++ b/build-errors-sln-release.txt @@ -0,0 +1,6 @@ + +宸叉垚鍔熺敓鎴愩€? + 2541 涓鍛? + 0 涓敊璇? + +宸茬敤鏃堕棿 00:00:15.76 diff --git a/build-errors-sln.txt b/build-errors-sln.txt new file mode 100644 index 0000000..52f8ec3 --- /dev/null +++ b/build-errors-sln.txt @@ -0,0 +1,6 @@ + +宸叉垚鍔熺敓鎴愩€? + 6 涓鍛? + 0 涓敊璇? + +宸茬敤鏃堕棿 00:00:01.52 diff --git a/build-errors.txt b/build-errors.txt new file mode 100644 index 0000000..554e4b3 --- /dev/null +++ b/build-errors.txt @@ -0,0 +1,13 @@ +E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\App.xaml.cs(214,46): error CS0246: 鏈兘鎵惧埌绫诲瀷鎴栧懡鍚嶇┖闂村悕鈥淒ialogCANFdSchConfigView鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj] +E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\App.xaml.cs(214,72): error CS0246: 鏈兘鎵惧埌绫诲瀷鎴栧懡鍚嶇┖闂村悕鈥淒ialogCANFdSchConfigViewModel鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj] +E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(530,65): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淟oadCmdDataToDrive鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淟oadCmdDataToDrive鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj] +E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(752,49): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淯pdateSchDataByCmdDataChanged鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淯pdateSchDataByCmdDataChanged鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj] +E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(1021,49): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淪chEnable鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淪chEnable鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj] +E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(1181,57): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淪chEnable鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淪chEnable鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj] +E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(1183,39): error CS1061: 鈥淐anFdDriveService鈥濇湭鍖呭惈鈥淟istCANFdScheduleConfig鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淐anFdDriveService鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淟istCANFdScheduleConfig鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj] + +鐢熸垚澶辫触銆? + 1233 涓鍛? + 7 涓敊璇? + +宸茬敤鏃堕棿 00:00:06.42