diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs index 9064f84..349577a 100644 --- a/View/WorkOrderView.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -46,12 +46,13 @@ namespace DyeingComputer.View SQLiteHelpers.Open(); //打开数据库 string S09 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S09'", null).ToString(); //读取 string S10 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S10'", null).ToString(); - string S11 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S11'", null).ToString(); + string S11 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S11'", null).ToString(); + string S18 = SQLiteHelpers.ExecuteScalar("select value from system where ParameterID = 'S18'", null).ToString(); SQLiteHelpers.Close(); if (S09 == "0") WorkOrderView_new.IsEnabled = false;//禁止用户新建 if (S10 == "0") WorkOrderView_del.IsEnabled = false; if (S11 == "0") WorkOrderView_redy.IsEnabled = false; - + if (S18 == "0") WorkOrderView_lock.IsEnabled = false; TEMPTable.Columns.Add("Time", Type.GetType("System.String")); TEMPTable.Columns.Add("MST", Type.GetType("System.Double")); @@ -291,12 +292,16 @@ namespace DyeingComputer.View dr.EndEdit(); data_t.Rows.InsertAt(dr, 0); //行转换 - SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 + SQLiteHelpers.InsertData("RUN", SQLiteHelpers.DataTableToDictionary(data_t));//行插入 } + updata_temp.Clear(); //使用前清缓存 + updata_temp.Add("RUN", 1); + SQLiteHelpers.Update("RUN", updata_temp, "Step=1", null); + SQLiteHelpers.Close(); //关闭连接 - /* if (Process_id != null) //选定工艺有效跳转准备 + if (Process_id != null) //选定工艺有效跳转准备 { MainWindowViewModel.WorkNumder = WorkOrder_Numder; TechnologicalProcessView.workName = Process_id; @@ -305,7 +310,7 @@ namespace DyeingComputer.View MainWindowViewModel.ViewID = 1; var _mainWindow = Application.Current.Windows.Cast().FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面 _mainWindow.container.Content = new TechnologicalProcessView();//获取控件 - }*/ + } } private void inf_Click(object sender, RoutedEventArgs e)//信息 { diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index d8322e3..71688c2 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -199,11 +199,10 @@ namespace DyeingComputer.ViewModel S03 = Selet_sys("S03");// S05 = Selet_sys("S05");// S06 = Selet_sys("S06");// + S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息 MI01 = Convert.ToInt16(Selet_sys("MI01"));//工作信息 MI02 = Convert.ToInt16(Selet_sys("MI02"));//工作信息 MI03 = Convert.ToInt16(Selet_sys("MI03"));//工作信息 - S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息 - S17 = Convert.ToInt16(Selet_sys("S17"));// SM01 = Convert.ToInt16(Selet_sys("SM01"));//FG SM02 = Convert.ToInt16(Selet_sys("SM02"));//FG