diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index c422af7..10d8396 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -400,6 +400,22 @@ namespace DyeingComputer.UserClass } else { client.SendAsync("SC999"); } }//启停跳步指令 + else if (SYSAPI == "SC827") + { + if (SYSKEY == MainWindowViewModel.SYSKEY) + { + try + { + client.SendAsync("SC827" + "[" + MainWindowViewModel.S01 + "]" + + MainWindowViewModel.Dyelot_dat.ToJsonString()); + + MainWindowViewModel.TX++; + APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令 + } + catch (Exception ex) { client.SendAsync("SC927" + "[" + MainWindowViewModel.S01 + "]" + ex); } + } + else { client.SendAsync("SC999"); } + }//输送信息指令 else if (SYSAPI == "SC828") { if (SYSKEY == MainWindowViewModel.SYSKEY) @@ -423,13 +439,16 @@ namespace DyeingComputer.UserClass + "' AND Step ='"+ drEmployee.Field("Step") + "' AND ProductCode='"+ drEmployee.Field("ProductCode") + "'", null); Product_data.Clear(); - + MainWindowViewModel.Dyelot_dat = SQLiteHelpers.ExecuteDataSet( + "select * from Dyelot where WorkOrder = '" + + MainWindowViewModel.WorkNumder + "'", null).Tables[0]; int dt = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where Dyelot='" + drEmployee.Field("Dyelot") + "' AND State ='" + drEmployee.Field("State") + "'", null).Tables[0].Rows.Count; if (dt == 0) MainWindowViewModel.CALL_FR = false; } SQLiteHelpers.Close(); //关闭连接 + client.SendAsync("SC828" + SYSKEY + SYSDAT); MainWindowViewModel.TX++; APILog.DBlog(client.IP, SYSKEY, SYSAPI, SYSDAT);//记录指令 @@ -437,7 +456,7 @@ namespace DyeingComputer.UserClass catch (Exception ex) { client.SendAsync("SC928" + "[" + MainWindowViewModel.S01 + "]" + ex); } } else { client.SendAsync("SC999"); } - }//输送信息指令 + }//输送状态指令 else if (SYSAPI == "SC829") { if (SYSKEY == MainWindowViewModel.SYSKEY) diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs index 59b0f81..d6ce33a 100644 --- a/View/TechnologicalProcessView.xaml.cs +++ b/View/TechnologicalProcessView.xaml.cs @@ -261,7 +261,6 @@ namespace DyeingComputer.View Parameter_set.Visibility = Visibility.Visible; Receip.Visibility = Visibility.Collapsed; } - DataTable tblDatas = new DataTable("Datas"); public static object workName; public static SQLiteHelper SQLiteHelpers = null; //定义数据库 diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs index 358af6e..35a0ff5 100644 --- a/View/WorkOrderView.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -369,7 +369,8 @@ namespace DyeingComputer.View updata_temp.Clear(); //使用前清缓存 updata_temp.Add("State", 205); SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); - + MainWindowViewModel.Dyelot_dat = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + + WorkOrder_Numder + "'", null).Tables[0]; WorkorderSteps = SQLiteHelpers.ExecuteDataSet( "select * from WorkorderSteps where WorkOrder='" + WorkOrder_Numder + "'", null).Tables[0]; //读取表写入缓存 MainWindowViewModel.ProgramName = Process_Name; diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 5fba54b..b52140f 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -237,6 +237,11 @@ namespace DyeingComputer.ViewModel ); WORK_RUN = 2; + SQLiteHelpers = new SQLiteHelper(DBAddress); + SQLiteHelpers.Open(); + Dyelot_dat = SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + + drEmployee.Field("WorkOrder") + "'", null).Tables[0]; + SQLiteHelpers.Close(); } else { @@ -2843,7 +2848,7 @@ namespace DyeingComputer.ViewModel public static bool CALL_FR = false;//呼叫状态 void FeedingRecords(string WorkOrder,string Dyelot,int TANK,int STEP,int Type) //呼叫输送 { - CALL_FR = true; + CALL_FR = true; int SQLI = 0; Dictionary dat_FR = new Dictionary(); dat_FR.Add("State", "201");