diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index 0c5e23a..81d64ec 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -202,8 +202,11 @@ namespace SunlightAggregationManager.UserClass } if (Command == "SysData")//回复请求的信息 { - // data_.Add("SysData", MainWindowViewModel.MachineVer); - // data_.Add("ChemicalStatistics", MainWindowViewModel.ChemicalStatistics.ToJsonString()); + ret = JsonSerializer.Serialize(data_); + } + if (Command == "ChemicalStatistics")//回复请求的信息 + { + data_.Add("ChemicalStatistics", Newtonsoft.Json.JsonConvert.SerializeObject(MainWindowViewModel.ChemicalStatistics)); ret = JsonSerializer.Serialize(data_); } if (Command == "Info")//回复info请求的信息 diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index e7c81b9..9f84f1a 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -155,7 +155,7 @@ namespace SunlightAggregationManager.ViewModel Service.EndInit(); - _timer = new Timer(EXTask, null, TimeSpan.FromSeconds(60), TimeSpan.FromMinutes(30)); + _timer = new Timer(EXTask, null, TimeSpan.FromSeconds(5), TimeSpan.FromMinutes(30)); } //Machines操作数据库 @@ -390,10 +390,10 @@ namespace SunlightAggregationManager.ViewModel try { string DyelotsBulkedRecipe_sql = "SELECT [ProductCode],[ProductName],SUM(DispenseGrams)/1000 " + - "as TotalDispenseGrams,COUNT(*) as PrescriptionCount FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] " + + "as TotalDispenseGrams FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] " + "where DispenseEndTime > '" + DateTime.Now.ToString("yyyy-MM-dd") + "' AND DispenseEndTime < '" + - DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") + "'AND DispenseGrams IS NOT NULL" + " GROUP BY " + - "[ProductCode],[ProductName] ORDER BY TotalDispenseGrams DESC "; + DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") + "' GROUP BY [ProductCode],[ProductName] " + + "ORDER BY TotalDispenseGrams DESC "; string Dye_sql = "SELECT [Dyelot],[ReDye],[StepNumber] FROM [BatchDyeingCentral].[dbo].[DyelotsBulkedRecipe] " + "where ((DispenseEndTime >= '" + DateTime.Now.ToString("yyyy-MM-dd") + "' AND DispenseEndTime < '" +