diff --git a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj index a4a39d03..afffdecb 100644 --- a/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj +++ b/Aucma.Core.BoxFoam/Aucma.Core.BoxFoam.csproj @@ -1,7 +1,7 @@  - Exe + WinExe net6.0-windows enable true diff --git a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs index ade2ece5..3a4fddb7 100644 --- a/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs +++ b/Aucma.Core.BoxFoam/ViewModels/FoamMonitorPageViewModel.cs @@ -84,6 +84,10 @@ namespace Aucma.Core.BoxFoam.ViewModels { try { + if (ProductionHourList!=null && ProductionHourList.Count>0) + { + ProductionHourList.Clear(); + } ProductionHourList = new List(); List listTime = _baseBomInfoServices.getWorkTime().Result; foreach (WorkTime time in listTime) diff --git a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml index 67291c47..99713ea6 100644 --- a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml @@ -405,18 +405,21 @@ + + - + + - + - + @@ -433,15 +436,15 @@ - + - + - + diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml index 84f8e8fb..6877ed3a 100644 --- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml +++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml @@ -144,9 +144,9 @@ - + - + diff --git a/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml b/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml index 219b3920..0ee1b008 100644 --- a/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml +++ b/Aucma.Core.DoorFoam/Views/RealTimePageView.xaml @@ -181,7 +181,7 @@ - + diff --git a/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs b/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs index 30f2560e..8a9a8b7a 100644 --- a/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs +++ b/Aucma.Core.ProductOffLine/Business/offLineBusiness.cs @@ -111,7 +111,7 @@ namespace Aucma.Core.ProductOffLine.Business Task.Run(() => { Thread.Sleep(5000); - MaterialBarScanEvent("32160030000000910780", "192.168.1.19"); + MaterialBarScan("32160030000000910780", "192.168.1.19"); // Thread.Sleep(1000); // MaterialBarScanEvent("33160030000000910780", "192.168.1.20"); }); @@ -122,7 +122,7 @@ namespace Aucma.Core.ProductOffLine.Business /// /// /// 扫码器IP - public void MaterialBarScanEvent(string code,string scannerIp) + public void MaterialBarScan(string code,string scannerIp) { int ScannerNo = scannerIp == Appsettings.app("Middleware", "Scanner1", "Ip") ? 1 : 2; // 确定是哪个扫码器 log.Info("扫码器ip:" + scannerIp +"编号:["+ScannerNo+ "]扫描到条码:" + code); diff --git a/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs b/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs index dec35083..63add936 100644 --- a/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs @@ -355,7 +355,8 @@ namespace Aucma.Core.ProductOffLine.ViewModels column2.DataLabels = true; column2.Title = "产量"; column2.Values = achievement2; - column2.Foreground = Brushes.White; + column2.Foreground = Brushes.White; + // Achievement.Clear(); //Achievement.Add(column2); if (Achievement.Count > 0) @@ -390,6 +391,7 @@ namespace Aucma.Core.ProductOffLine.ViewModels column.Title = "型号"; column.Values = achievement; column.Foreground = Brushes.White; + // x轴 MaterialNameList = null; MaterialNameList = nameList; diff --git a/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml b/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml index 8a46850b..2a6ea514 100644 --- a/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml +++ b/Aucma.Core.ProductOffLine/Views/IndexPageView.xaml @@ -244,7 +244,7 @@ - + @@ -255,9 +255,9 @@ - + - + @@ -287,9 +287,9 @@ - + - +