Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

UserClass/AsyncTcpClient.cs

@@ -59,6 +59,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "' AND port='" + client.Port + "'").First();
                 drEmployee.BeginEdit();
                 drEmployee["State"] = "899";
+                drEmployee["WorkOrder"] = "------";
+                drEmployee["Dyelot"] = "";
+                drEmployee["Temperature"] = "---.-";
+                drEmployee["WaterLevel"] = "----";
+                drEmployee["Process"] = "";
+                drEmployee["Step"] = "";
+                drEmployee["Message"] = "";
                 drEmployee.EndEdit();
                 drEmployee.AcceptChanges();
                 drEmployee.ClearErrors();
@@ -71,6 +78,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "' AND port='" + client.Port + "'").First();
                 drEmployee.BeginEdit();
                 drEmployee["State"] = "899";
+                drEmployee["WorkOrder"] = "------";
+                drEmployee["Dyelot"] = "";
+                drEmployee["Temperature"] = "---.-";
+                drEmployee["WaterLevel"] = "----";
+                drEmployee["Process"] = "";
+                drEmployee["Step"] = "";
+                drEmployee["Message"] = "";
                 drEmployee.EndEdit();
                 drEmployee.AcceptChanges();
                 drEmployee.ClearErrors();

ViewModel/MainWindowViewModel.cs

@@ -287,7 +287,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 catch (Exception) { }
                 try
                 {
-                    if (dt_TP.Rows.Count > 0)
+                    if (dt_TP.Rows.Count >= 0)
                     {
                        if(TechnologicalProcess_bool) TechnologicalProcess_View = ToObservableCollection<TechnologicalP>(dt_TP);
                         Sys_machine = MachineLOG;