diff --git a/UserClass/AsyncTcpClient.cs b/UserClass/AsyncTcpClient.cs index dd473a5..21da3eb 100644 --- a/UserClass/AsyncTcpClient.cs +++ b/UserClass/AsyncTcpClient.cs @@ -186,7 +186,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass drEmployee["WaterLevel"] = _new.GetValue("MTL"); drEmployee["Process"] = _new.GetValue("Process"); drEmployee["Step"] = _new.GetValue("Step"); - if (_new.GetValue("UserButton").ToString()!="900") drEmployee["UserButton"] = _new.GetValue("UserButton"); + drEmployee["UserButton"] = _new.GetValue("UserButton"); + if (_new.GetValue("UserInfoStart").ToString() != "900") + { drEmployee["UserInfoStart"] = _new.GetValue("UserInfoStart"); } drEmployee["UserInfo"] = _new.GetValue("UserInfo"); drEmployee["WORK_RUN"] = _new.GetValue("WORK_RUN"); drEmployee["RUN_STEPID"] = _new.GetValue("RUN_STEPID"); diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index fdc89ab..55c5bc5 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -318,16 +318,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel /**染机用户信息**/ try { - if (Selet_Machines(Machines, "UserButton", "ID='" + i + "'").ToString() == "901") + if (Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'").ToString() == "901") { MainWindow.InfData.Rows.Add(new object[] { Selet_Machines(Machines, "Name", "ID='" + i + "'"), Properties.Resources.Pequest + Selet_Machines(Machines, "UserInfo", "ID='" + i + "'"), Selet_Machines(Machines, "SYSKEY", "ID='" + i + "'"), Selet_Machines(Machines, "ID", "ID='" + i + "'")}); - Updata_Machines(Machines, "UserButton", "ID='" + i + "'", "900"); + Updata_Machines(Machines, "UserInfoStart", "ID='" + i + "'", "900"); } - if (Selet_Machines(Machines, "UserButton", "ID='" + i + "'").ToString() == "902") + if (Selet_Machines(Machines, "UserInfoStart", "ID='" + i + "'").ToString() == "902") { MainWindow.InfData.Select("ID='" + i + "'").First().Delete(); } @@ -370,7 +370,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel Updata_Machines(Machines, "WaterLevel", "ID='" + Convert.ToInt16(dt["ID"]) + "'", "0"); Updata_Machines(Machines, "WORK_RUN", "ID='" + Convert.ToInt16(dt["ID"]) + "'", "-1"); Updata_Machines(Machines, "ERR", "ID='" + Convert.ToInt16(dt["ID"]) + "'", "False"); - Updata_Machines(Machines, "UserButton", "ID='" + Convert.ToInt16(dt["ID"]) + "'", "900"); + Updata_Machines(Machines, "UserInfoStart", "ID='" + Convert.ToInt16(dt["ID"]) + "'", "900"); _ = AsyncTcpClient.TcpClient(MachiensTcpClient[i] //建立tcp连接 , Selet_Machines(Machines, "IP", "ID='" + Convert.ToInt16(dt["ID"]) + "'").ToString() , Selet_Machines(Machines, "PORT", "ID='" + Convert.ToInt16(dt["ID"]) + "'").ToString());