diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 29ecc51..0779351 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -231,8 +231,24 @@ namespace DyeingComputer.UserClass { MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0]; - MainWindowViewModel.DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" + - dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0]; + var DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" + + dat_821.GetValue("WorkOrder").ToString() + "'", null).Tables[0].Rows[0]; + MainWindowViewModel.Updata_dtm("1020", DT_Set.Field("PumpSpeed")); + MainWindowViewModel.Updata_dtm("1030", DT_Set.Field("Swing")); + MainWindowViewModel.Updata_dtm("1021", DT_Set.Field("Blower")); + MainWindowViewModel.Updata_dtm("1025", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1026", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1027", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1028", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1029", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1035", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1036", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1037", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1038", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1039", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1040", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1041", DT_Set.Field("ClothWheel")); + client.SendAsync("SC821" + SYSKEY + SYSDAT); } else if (dat_821.GetValue("INSTRUCTION").ToString() == "STOP") diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs index 0f37928..1ead47b 100644 --- a/View/TechnologicalProcessView.xaml.cs +++ b/View/TechnologicalProcessView.xaml.cs @@ -91,8 +91,8 @@ namespace DyeingComputer.View } newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.Swing + " (%)";//摆布速度 - newRow["Value"] = MainWindowViewModel.Selet_dtm("1041"); - newRow["ID"] = "1041"; + newRow["Value"] = MainWindowViewModel.Selet_dtm("1030"); + newRow["ID"] = "1030"; tblDatas.Rows.Add(newRow); newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.ClothWheel + " (M/min)";//布轮速度 @@ -148,48 +148,48 @@ namespace DyeingComputer.View { newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.ClothWheel + "7 (M/min)";//提不论速度 - newRow["Value"] = MainWindowViewModel.Selet_dtm("1037"); - newRow["ID"] = "1037"; + newRow["Value"] = MainWindowViewModel.Selet_dtm("1036"); + newRow["ID"] = "1036"; tblDatas.Rows.Add(newRow); } if (MainWindowViewModel.MT18 >= 8) { newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.ClothWheel + "8 (M/min)";//提不论速度 - newRow["Value"] = MainWindowViewModel.Selet_dtm("1039"); - newRow["ID"] = "1039"; + newRow["Value"] = MainWindowViewModel.Selet_dtm("1037"); + newRow["ID"] = "1037"; tblDatas.Rows.Add(newRow); } if (MainWindowViewModel.MT18 >= 9) { newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.ClothWheel + "9 (M/min)";//提不论速度 - newRow["Value"] = MainWindowViewModel.Selet_dtm("1053"); - newRow["ID"] = "1053"; + newRow["Value"] = MainWindowViewModel.Selet_dtm("1038"); + newRow["ID"] = "1038"; tblDatas.Rows.Add(newRow); } if (MainWindowViewModel.MT18 >= 10) { newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.ClothWheel + "10 (M/min)";//提不论速度 - newRow["Value"] = MainWindowViewModel.Selet_dtm("1055"); - newRow["ID"] = "1055"; + newRow["Value"] = MainWindowViewModel.Selet_dtm("1039"); + newRow["ID"] = "1039"; tblDatas.Rows.Add(newRow); } if (MainWindowViewModel.MT18 >= 11) { newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.ClothWheel + "11 (M/min)";//提不论速度 - newRow["Value"] = MainWindowViewModel.Selet_dtm("1057"); - newRow["ID"] = "1057"; + newRow["Value"] = MainWindowViewModel.Selet_dtm("1040"); + newRow["ID"] = "1040"; tblDatas.Rows.Add(newRow); } if (MainWindowViewModel.MT18 >= 12) { newRow = tblDatas.NewRow(); newRow["ParameterSet"] = Properties.Resources.ClothWheel + "12 (M/min)";//提不论速度 - newRow["Value"] = MainWindowViewModel.Selet_dtm("1059"); - newRow["ID"] = "1059"; + newRow["Value"] = MainWindowViewModel.Selet_dtm("1041"); + newRow["ID"] = "1041"; tblDatas.Rows.Add(newRow); } @@ -271,6 +271,7 @@ 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 98980d8..eb6ef38 100644 --- a/View/WorkOrderView.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; +using System.Data.Entity; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -402,8 +403,23 @@ namespace DyeingComputer.View MainWindow.SQLiteHelpers.Update("WorkOrder", updata_temp, "WorkOrder='" + WorkOrder_Numder + "'", null); MainWindowViewModel.Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + WorkOrder_Numder + "'", null).Tables[0]; - MainWindowViewModel.DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" + - WorkOrder_Numder + "'", null).Tables[0]; + var DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" + + WorkOrder_Numder + "'", null).Tables[0].Rows[0]; + MainWindowViewModel.Updata_dtm("1020", DT_Set.Field("PumpSpeed")); + MainWindowViewModel.Updata_dtm("1030", DT_Set.Field("Swing")); + MainWindowViewModel.Updata_dtm("1021", DT_Set.Field("Blower")); + MainWindowViewModel.Updata_dtm("1025", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1026", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1027", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1028", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1029", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1035", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1036", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1037", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1038", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1039", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1040", DT_Set.Field("ClothWheel")); + MainWindowViewModel.Updata_dtm("1041", DT_Set.Field("ClothWheel")); WorkorderSteps = MainWindow.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 f410c17..c4e30d0 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -81,7 +81,6 @@ namespace DyeingComputer.ViewModel private PID pid = new PID(); public static DataTable errTabler = new DataTable();//错误表 // public static DataTable RUN_DATATABLE = new DataTable();//缓存工作表 - public static DataTable DT_Set = new DataTable();//cssd public static DataTable Dyelot_dat = new DataTable();//物料表 public static string Dyelot; //领料单号 public static int RUN_STEPID;//当前步骤 @@ -244,10 +243,26 @@ namespace DyeingComputer.ViewModel WORK_RUN = 2; //SQLiteHelpers = new SQLiteHelper(DBAddress); //SQLiteHelpers.Open(); - DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" + - drEmployee.Field("WorkOrder") + "'", null).Tables[0]; + Dyelot_dat = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from Dyelot where WorkOrder = '" + drEmployee.Field("WorkOrder") + "'", null).Tables[0]; + var DT_Set = MainWindow.SQLiteHelpers.ExecuteDataSet("select * from WorkOrderSet where WorkOrder = '" + + drEmployee.Field("WorkOrder") + "'", null).Tables[0].Rows[0]; + Updata_dtm("1020", DT_Set.Field("PumpSpeed")); + Updata_dtm("1030", DT_Set.Field("Swing")); + Updata_dtm("1021", DT_Set.Field("Blower")); + Updata_dtm("1025", DT_Set.Field("ClothWheel")); + Updata_dtm("1026", DT_Set.Field("ClothWheel")); + Updata_dtm("1027", DT_Set.Field("ClothWheel")); + Updata_dtm("1028", DT_Set.Field("ClothWheel")); + Updata_dtm("1029", DT_Set.Field("ClothWheel")); + Updata_dtm("1035", DT_Set.Field("ClothWheel")); + Updata_dtm("1036", DT_Set.Field("ClothWheel")); + Updata_dtm("1037", DT_Set.Field("ClothWheel")); + Updata_dtm("1038", DT_Set.Field("ClothWheel")); + Updata_dtm("1039", DT_Set.Field("ClothWheel")); + Updata_dtm("1040", DT_Set.Field("ClothWheel")); + Updata_dtm("1041", DT_Set.Field("ClothWheel")); //SQLiteHelpers.Close(); } else @@ -3394,15 +3409,15 @@ namespace DyeingComputer.ViewModel SYSlog = SYSlog + "\n-------------------------------------------------------"; if (MI03 == 1) { - SYSlog = SYSlog + "\n" + Resources.MasterCylinder + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1042"))) + "Bar"; - SYSlog = SYSlog + " | " + Resources.Nozzle + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1043"))) + "Bar"; - SYSlog = SYSlog + "\n" + Resources.DifferentialPressure + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1044"))) + "%"; + SYSlog = SYSlog + "\n" + Resources.MasterCylinder + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1031"))) + "Bar"; + SYSlog = SYSlog + " | " + Resources.Nozzle + Resources.Pressure + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1032"))) + "Bar"; + SYSlog = SYSlog + "\n" + Resources.DifferentialPressure + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1033"))) + "%"; } //压力 if (MainWindowViewModel.MT17 == 1) { SYSlog = SYSlog + "\n" + Resources.Blower + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1021"))) + "%"; }// SYSlog = SYSlog + "\n" + Resources.GuidingWheel + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1046"))) + "M/min"; - if (MI02 == 2) SYSlog = SYSlog + "\n" + Resources.Nozzle + Resources.Flowmeter + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1045"))) + "L/min";//喷射流量 + if (MI02 == 2) SYSlog = SYSlog + "\n" + Resources.Nozzle + Resources.Flowmeter + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1034"))) + "L/min";//喷射流量 if (MI01 == 1)// { SYSlog = SYSlog + "\n" + Resources.ClothWheel + "M/min"; @@ -3412,12 +3427,12 @@ namespace DyeingComputer.ViewModel if (MT18 >= 4) SYSlog = SYSlog + "\n" + "4 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1028"))); if (MT18 >= 5) SYSlog = SYSlog + " | " + "5 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1029"))); if (MT18 >= 6) SYSlog = SYSlog + " | " + "6 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1035"))); - if (MT18 >= 7) SYSlog = SYSlog + "\n" + "7 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1037"))); - if (MT18 >= 8) SYSlog = SYSlog + " | " + "8 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1039"))); - if (MT18 >= 9) SYSlog = SYSlog + " | " + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1051"))); - if (MT18 >= 10) SYSlog = SYSlog + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1053"))); - if (MT18 >= 11) SYSlog = SYSlog + " | " + "11 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1055"))); - if (MT18 >= 12) SYSlog = SYSlog + " | " + "12 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1057"))); + if (MT18 >= 7) SYSlog = SYSlog + "\n" + "7 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1036"))); + if (MT18 >= 8) SYSlog = SYSlog + " | " + "8 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1037"))); + if (MT18 >= 9) SYSlog = SYSlog + " | " + "9 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1038"))); + if (MT18 >= 10) SYSlog = SYSlog + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1039"))); + if (MT18 >= 11) SYSlog = SYSlog + " | " + "11 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1040"))); + if (MT18 >= 12) SYSlog = SYSlog + " | " + "12 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1041"))); SYSlog = SYSlog + "\n" + Resources.Cycletime + "Sec"; SYSlog = SYSlog + "\n" + "1 : " + string.Format("{0:D3}", Selet_dta("4017")); if (MT18 >= 2) SYSlog = SYSlog + " | " + "2 : " + string.Format("{0:D3}", Selet_dta("4018"));