Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
779208046a
3 files changed
+13
-7
No files matched your search
@@ -62,7 +62,7 @@ namespace DyeingComputer.View
|
||||
if (sql != null) sql.Clear(); //清空缓存
|
||||
sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取表写入缓存
|
||||
Program_Name = SQLiteHelpers.ExecuteScalar("select ProgramName from WorkOrder where ProgramID = '" + workName + "'", null).ToString();
|
||||
if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
|
||||
if (sql != null) dt_TP = sql.Tables[0]; //转换显示计划表
|
||||
|
||||
SQLiteHelpers.Delete("RUN", null, null); //删除run信息
|
||||
DataTable data_t = new DataTable();
|
||||
@@ -96,7 +96,7 @@ namespace DyeingComputer.View
|
||||
MainWindowViewModel.WorkNumder = SQLiteHelpers.ExecuteScalar("select DYELOT from RUN where Step = '1'", null).ToString();
|
||||
SQLiteHelpers.Close(); //关闭连接
|
||||
|
||||
if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
|
||||
if (sql != null) dt_TP = sql.Tables[0]; //转换显示计划表
|
||||
}
|
||||
|
||||
private void UserControl_Loaded(object sender, RoutedEventArgs e)
|
||||
@@ -162,7 +162,7 @@ namespace DyeingComputer.View
|
||||
dr["Parameter5"] = e.P5;
|
||||
dr.EndEdit();
|
||||
|
||||
Grid.ItemsSource = sql.Tables[0].DefaultView;
|
||||
dt_TP = sql.Tables[0];
|
||||
Grid.SelectedIndex = -1;
|
||||
|
||||
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||
@@ -236,7 +236,7 @@ namespace DyeingComputer.View
|
||||
}
|
||||
|
||||
SQLiteHelpers.Close(); //关闭连接
|
||||
Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
|
||||
dt_TP = sql.Tables[0]; //转换显示计划表
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user