Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
21270ad539
1 file changed
+9
-6
@@ -156,10 +156,10 @@ namespace DyeingComputer.View
|
|||||||
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||||
SQLiteHelpers.Open(); //打开数据库
|
SQLiteHelpers.Open(); //打开数据库
|
||||||
string sql_script = "select * from ProgramName where ProgramID = '" + Process_id + "'";
|
string sql_script = "select * from ProgramName where ProgramID = '" + Process_id + "'";
|
||||||
int i = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].Rows.Count; //读取计划表写入缓存
|
int i = SQLiteHelpers.ExecuteDataSet(sql_script, null).Tables[0].Rows.Count; //读取工艺表返回0工艺不存在
|
||||||
SQLiteHelpers.Close(); //关闭连接
|
SQLiteHelpers.Close(); //关闭连接
|
||||||
|
|
||||||
if(i == 0)
|
if(i == 0) //工艺不存在提示
|
||||||
{
|
{
|
||||||
WorkOrder_Numder = null;
|
WorkOrder_Numder = null;
|
||||||
Process_id = null;
|
Process_id = null;
|
||||||
@@ -172,11 +172,14 @@ namespace DyeingComputer.View
|
|||||||
{
|
{
|
||||||
if (e.Key == Key.K)
|
if (e.Key == Key.K)
|
||||||
{
|
{
|
||||||
MainWindowViewModel.WorkNumder = WorkOrder_Numder;
|
if (Process_id != null)
|
||||||
TechnologicalProcessView.workName = Process_id;
|
{
|
||||||
|
MainWindowViewModel.WorkNumder = WorkOrder_Numder;
|
||||||
|
TechnologicalProcessView.workName = Process_id;
|
||||||
|
|
||||||
var _mainWindow = Application.Current.Windows .Cast<Window>() .FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面
|
var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面
|
||||||
_mainWindow.container.Content = new TechnologicalProcessView();//获取控件
|
_mainWindow.container.Content = new TechnologicalProcessView();//获取控件
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user