diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index ee4e2b7..c0bb28f 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -309,26 +309,26 @@ namespace SunlightAggregationManager.UserClass f_ + " FROM [dbo].[DyeSolutionHistory] WHERE DispenseStartTime >'" + DateTime.Now.AddDays(-3)+ "' and DispenseMachine='" + m_ + "'"); data_.Add("Type", "80"); - data_.Add("InfoMachine", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); + data_.Add("InfoMachineHistory", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); } else if (t_ == "82") { DataTable resultTable = await MainWindowViewModel.dataBase.ExecuteQueryAsync("SELECT " + f_ + " FROM [dbo].[inOutRecords] WHERE Createtime >'" + DateTime.Now.AddDays(-3)+"'"); data_.Add("Type", "82"); - data_.Add("InfoMachine", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); + data_.Add("InfoMachineHistory", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); } else if (t_ == "90") { DataTable resultTable = await MainWindowViewModel.dataBase.ExecuteQueryAsync("SELECT " + f_ + " FROM [dbo].[DyeSolutionHistory] WHERE DispenseStartTime >'" + DateTime.Now.AddDays(-3) + "' and DispenseMachine='" + m_ + "'"); - data_.Add("Type", "20"); - data_.Add("InfoMachine", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); + data_.Add("Type", "90"); + data_.Add("InfoMachineHistory", Newtonsoft.Json.JsonConvert.SerializeObject(resultTable)); } else { - data_.Add("InfoMachine", ""); + data_.Add("InfoMachineHistory", ""); } //格式化返回信息