Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
b9b100d36b
2 files changed
+1
-10
No files matched your search
@@ -88,7 +88,7 @@ namespace DyeingComputer.UserClass
|
||||
Chart_new.Add("GROUP", MainWindowViewModel.S05);
|
||||
Chart_new.Add("SYSKEY", MainWindowViewModel.SYSKEY);
|
||||
Chart_new.Add("TIME", MainWindowViewModel.SYSTime);
|
||||
client.SendAsync("[" + MainWindowViewModel.S01 + "]" +"SC800"+ Chart_new.ToJsonString());
|
||||
client.SendAsync("SC800" + "[" + MainWindowViewModel.S01 + "]" + Chart_new.ToJsonString());
|
||||
}
|
||||
else if (SYSAPI == "SC810")
|
||||
{
|
||||
|
||||
@@ -1569,15 +1569,6 @@ namespace DyeingComputer.ViewModel
|
||||
dt_a = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='AI' OR type='AO' order by ID", null).Tables[0];
|
||||
dt_m = SQLiteHelpers.ExecuteDataSet("select * from IOName where type='M' order by ID", null).Tables[0];
|
||||
SQLiteHelpers.Close();
|
||||
dt_d.Columns.Remove("AIO");
|
||||
dt_d.Columns.Remove("Value");
|
||||
// dt_d.Columns.Remove("type");
|
||||
dt_a.Columns.Remove("DIO");
|
||||
dt_a.Columns.Remove("Value");
|
||||
// dt_a.Columns.Remove("type");
|
||||
dt_m.Columns.Remove("AIO");
|
||||
dt_m.Columns.Remove("DIO");
|
||||
// dt_m.Columns.Remove("type");
|
||||
//创建dt_d主建
|
||||
DataColumn[] dt_dcols =new DataColumn[] { dt_d.Columns["ID"] };
|
||||
dt_d.PrimaryKey = dt_dcols;
|
||||
|
||||
Reference in new issue
Block a user