diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 8939547..3360975 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -113,16 +113,17 @@ namespace DyeingComputer.UserClass //WorkOrder_dat.GetValue("WorkOrder"); object i = MainWindow.SQLiteHelpers.ExecuteScalar("select * from WorkOrder where WorkOrder = " + WorkOrder_dat.GetValue("WorkOrder").ToString(), null); - + Dictionary Step_new = new Dictionary();//缓存函数 + Step_new.Add("WorkOrder", WorkOrder_dat.GetValue("WorkOrder").ToString()); + Step_new.Add("ReDye", WorkOrder_dat.GetValue("ReDye").ToString()); if (i != null) { - client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" + - WorkOrder_dat.GetValue("WorkOrder").ToString()); + client.SendAsync("SC910" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString()); } else { - client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" + - WorkOrder_dat.GetValue("WorkOrder").ToString()); MainWindowViewModel.TX++; + client.SendAsync("SC810" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString()); + MainWindowViewModel.TX++; } MainWindow.SQLiteHelpers.InsertData("WorkOrder", WorkOrder_dat); @@ -145,15 +146,16 @@ namespace DyeingComputer.UserClass DataTable WorkOrder_dat; WorkOrder_dat = SerializeConvert.JsonDeserializeFromString(SYSDAT); bool dat_w = SQLDATA.WorkOderStep(WorkOrder_dat); + Dictionary Step_new = new Dictionary();//缓存函数 + Step_new.Add("WorkOrder", WorkOrder_dat.Select().First().Field("WorkOrder")); + Step_new.Add("ReDye", WorkOrder_dat.Select().First().Field("ReDye")); if (!dat_w) { - client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" + - WorkOrder_dat.Select().First().Field("WorkOrder")); + client.SendAsync("SC911" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString()); } else { - client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" + - WorkOrder_dat.Select().First().Field("WorkOrder")); + client.SendAsync("SC811" + "[" + MainWindowViewModel.S01 + "]" + Step_new.ToJsonString()); MainWindowViewModel.TX++; } APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令