diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index ecbf762..624574c 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -105,23 +105,25 @@ namespace DyeingComputer.UserClass { Dictionary WorkOrder_dat; WorkOrder_dat = SerializeConvert.JsonDeserializeFromString>(SYSDAT); - //WorkOrder_dat.GetValue("WorkOrder"); - bool dat_w = SQLDATA.WorkOrder( - WorkOrder_dat.GetValue("WorkOrder").ToString(), - WorkOrder_dat.GetValue("ProcessName").ToString(), - WorkOrder_dat.GetValue("StartTime").ToString(), - WorkOrder_dat.GetValue("EndTime").ToString(), - WorkOrder_dat.GetValue("Time").ToString(), - WorkOrder_dat.GetValue("Remark").ToString(), - WorkOrder_dat.GetValue("lock").ToString(), - WorkOrder_dat.GetValue("State").ToString(), - WorkOrder_dat.GetValue("ProcessID").ToString()); + //WorkOrder_dat.GetValue("WorkOrder"); + bool dat_w = SQLDATA.WorkOrder( + WorkOrder_dat.GetValue("WorkOrder").ToString(), + WorkOrder_dat.GetValue("ProgramName").ToString(), + WorkOrder_dat.GetValue("StartTime").ToString(), + WorkOrder_dat.GetValue("EndTime").ToString(), + WorkOrder_dat.GetValue("Time").ToString(), + WorkOrder_dat.GetValue("Remark").ToString(), + WorkOrder_dat.GetValue("lock").ToString(), + WorkOrder_dat.GetValue("State").ToString(), + WorkOrder_dat.GetValue("ProgramID").ToString(), + WorkOrder_dat.GetValue("color").ToString(), + WorkOrder_dat.GetValue("Dyelot").ToString()); if (!dat_w) { client.SendAsync("SC910"); } else { client.SendAsync("SC810" + SYSKEY + SYSDAT); MainWindowViewModel.TX++; } } - catch + catch(Exception ex) { - client.SendAsync("SC990"); + client.SendAsync("SC990"+ex); } } else { client.SendAsync("SC999"); } diff --git a/UserClass/SQLDATA.cs b/UserClass/SQLDATA.cs index 100d78c..a0a233e 100644 --- a/UserClass/SQLDATA.cs +++ b/UserClass/SQLDATA.cs @@ -18,7 +18,7 @@ namespace DyeingComputer.UserClass private static SQLiteHelper SQLiteHelpers = null; //定义数据库 private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径 //WorkOrder表检查写入 - public static bool WorkOrder(string WorkOrder, string ProcessName,string StartTime, string EndTime, string Time, string Remark,string lock_,string state,string ProcessID) + public static bool WorkOrder(string WorkOrder, string ProgramName, string StartTime, string EndTime, string Time, string Remark,string lock_,string state,string ProgramID, string color,string dyelot) { SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 SQLiteHelpers.Open(); //打开数据库 @@ -30,14 +30,16 @@ namespace DyeingComputer.UserClass } Dictionary WorkOrder_new = new Dictionary();//缓存函数 WorkOrder_new.Add("WorkOrder", WorkOrder); - WorkOrder_new.Add("ProcessName", ProcessName); + WorkOrder_new.Add("ProgramName", ProgramName); WorkOrder_new.Add("StartTime", StartTime); WorkOrder_new.Add("EndTime", EndTime); WorkOrder_new.Add("Time", Time); WorkOrder_new.Add("Remark", Remark); WorkOrder_new.Add("lock", Convert.ToInt16(lock_)); WorkOrder_new.Add("state", Convert.ToInt16(state)); - WorkOrder_new.Add("ProcessID", ProcessID); + WorkOrder_new.Add("ProgramID", ProgramID); + WorkOrder_new.Add("color", color); + WorkOrder_new.Add("Dyelot", dyelot); SQLiteHelpers.InsertData("WorkOrder", WorkOrder_new); SQLiteHelpers.Close(); return true;