diff --git a/DATA/800COMPUTER.db b/DATA/800COMPUTER.db index e04885a..ed269cd 100644 Binary files a/DATA/800COMPUTER.db and b/DATA/800COMPUTER.db differ diff --git a/DATA/Chart.db b/DATA/Chart.db index ff71e21..93304a5 100644 Binary files a/DATA/Chart.db and b/DATA/Chart.db differ diff --git a/DATA/LOG.db b/DATA/LOG.db index 5f9337e..0955b2e 100644 Binary files a/DATA/LOG.db and b/DATA/LOG.db differ diff --git a/UserClass/APILog.cs b/UserClass/APILog.cs index 398c71c..58f788c 100644 --- a/UserClass/APILog.cs +++ b/UserClass/APILog.cs @@ -30,7 +30,7 @@ namespace DyeingComputer.UserClass API_LOG.Add("MESSAGE", MESSAGE); API_LOG.Add("TIME", MainWindowViewModel.SYSTime); - SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + SQLiteHelpers = new SQLiteHelper(LOGAddress); //数据库连接路径 SQLiteHelpers.Open(); //打开数据库 SQLiteHelpers.InsertData("SERVER", API_LOG);//行插入 SQLiteHelpers.Close(); //关闭连接 diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 1a119f7..1af4933 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -409,20 +409,16 @@ namespace DyeingComputer.UserClass { Dictionary dat_829; dat_829 = SerializeConvert.JsonDeserializeFromString>(SYSDAT); - if (dat_829.GetValue("LOCK").ToString() == "TRUE") + if (dat_829.GetValue("LOCK").ToString() == "True") { MainWindowViewModel._Lock_bool = true; client.SendAsync("SC829" + SYSKEY + SYSDAT); } - else if (dat_829.GetValue("LOCK").ToString() == "FALSE") + else { MainWindowViewModel._Lock_bool = false; client.SendAsync("SC829" + SYSKEY + SYSDAT); } - else - { - client.SendAsync("SC829" + "[NOT]"); - } MainWindowViewModel.TX++; APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令 } @@ -437,6 +433,7 @@ namespace DyeingComputer.UserClass try { Dictionary Chart_new = new Dictionary();//缓存函数 + Chart_new.Add("LOCK", MainWindowViewModel._Lock_bool); Chart_new.Add("Status", MainWindowViewModel.StatusStr); Chart_new.Add("Machine", MainWindowViewModel.S01); Chart_new.Add("WorkNumder", MainWindowViewModel.WorkNumder); diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index b4df971..82ad859 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -446,6 +446,7 @@ namespace DyeingComputer.ViewModel if (Selet_dtd("2016")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-3", "ERR104-3"); } //加料泵 else { ERRinf.ERRinf_d(errTabler, "ERR100"); } } + uint TX_t; void Tick_Event_5S()//Tick_Event周期执行事件5S { @@ -561,7 +562,7 @@ namespace DyeingComputer.ViewModel if (LINK_OK) IO_data(); } - + void Chart() { Dictionary Chart_new = new Dictionary();//缓存函数