Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
c6b48d3054
2 files changed
+15
-1
No files matched your search
@@ -59,6 +59,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
|
|||||||
DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "' AND port='" + client.Port + "'").First();
|
DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "' AND port='" + client.Port + "'").First();
|
||||||
drEmployee.BeginEdit();
|
drEmployee.BeginEdit();
|
||||||
drEmployee["State"] = "899";
|
drEmployee["State"] = "899";
|
||||||
|
drEmployee["WorkOrder"] = "------";
|
||||||
|
drEmployee["Dyelot"] = "";
|
||||||
|
drEmployee["Temperature"] = "---.-";
|
||||||
|
drEmployee["WaterLevel"] = "----";
|
||||||
|
drEmployee["Process"] = "";
|
||||||
|
drEmployee["Step"] = "";
|
||||||
|
drEmployee["Message"] = "";
|
||||||
drEmployee.EndEdit();
|
drEmployee.EndEdit();
|
||||||
drEmployee.AcceptChanges();
|
drEmployee.AcceptChanges();
|
||||||
drEmployee.ClearErrors();
|
drEmployee.ClearErrors();
|
||||||
@@ -71,6 +78,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
|
|||||||
DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "' AND port='" + client.Port + "'").First();
|
DataRow drEmployee = MainWindowViewModel.Machines.Select("IP='" + client.IP + "' AND port='" + client.Port + "'").First();
|
||||||
drEmployee.BeginEdit();
|
drEmployee.BeginEdit();
|
||||||
drEmployee["State"] = "899";
|
drEmployee["State"] = "899";
|
||||||
|
drEmployee["WorkOrder"] = "------";
|
||||||
|
drEmployee["Dyelot"] = "";
|
||||||
|
drEmployee["Temperature"] = "---.-";
|
||||||
|
drEmployee["WaterLevel"] = "----";
|
||||||
|
drEmployee["Process"] = "";
|
||||||
|
drEmployee["Step"] = "";
|
||||||
|
drEmployee["Message"] = "";
|
||||||
drEmployee.EndEdit();
|
drEmployee.EndEdit();
|
||||||
drEmployee.AcceptChanges();
|
drEmployee.AcceptChanges();
|
||||||
drEmployee.ClearErrors();
|
drEmployee.ClearErrors();
|
||||||
|
|||||||
@@ -287,7 +287,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
|
|||||||
catch (Exception) { }
|
catch (Exception) { }
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (dt_TP.Rows.Count > 0)
|
if (dt_TP.Rows.Count >= 0)
|
||||||
{
|
{
|
||||||
if(TechnologicalProcess_bool) TechnologicalProcess_View = ToObservableCollection<TechnologicalP>(dt_TP);
|
if(TechnologicalProcess_bool) TechnologicalProcess_View = ToObservableCollection<TechnologicalP>(dt_TP);
|
||||||
Sys_machine = MachineLOG;
|
Sys_machine = MachineLOG;
|
||||||
|
|||||||
Reference in new issue
Block a user