Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
c25b8ffe61
1 file changed
+7
-3
@@ -31,7 +31,6 @@ namespace DyeingComputer.View
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static object workName;
|
public static object workName;
|
||||||
|
|
||||||
private SQLiteHelper SQLiteHelpers = null; //定义数据库
|
private SQLiteHelper SQLiteHelpers = null; //定义数据库
|
||||||
private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
|
private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
|
||||||
DataSet sql; //内存数据缓存
|
DataSet sql; //内存数据缓存
|
||||||
@@ -48,10 +47,10 @@ namespace DyeingComputer.View
|
|||||||
name.Text = SQLiteHelpers.ExecuteScalar("select ProgramName from ProgramName where ProgramID = '" + workName + "'", null).ToString();
|
name.Text = SQLiteHelpers.ExecuteScalar("select ProgramName from ProgramName where ProgramID = '" + workName + "'", null).ToString();
|
||||||
if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
|
if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
|
||||||
|
|
||||||
SQLiteHelpers.Delete("RUN",null,null);
|
SQLiteHelpers.Delete("RUN",null,null); //删除run信息
|
||||||
DataTable data_t = new DataTable();
|
DataTable data_t = new DataTable();
|
||||||
data_t = sql.Tables[0].Clone();
|
data_t = sql.Tables[0].Clone();
|
||||||
data_t.Columns.Add("DYELOT",typeof(string));
|
data_t.Columns.Add("DYELOT",typeof(string)); //添加列
|
||||||
int a = sql.Tables[0].Rows.Count;
|
int a = sql.Tables[0].Rows.Count;
|
||||||
for (int i = 0; i < a; i++)
|
for (int i = 0; i < a; i++)
|
||||||
{
|
{
|
||||||
@@ -73,6 +72,11 @@ namespace DyeingComputer.View
|
|||||||
{
|
{
|
||||||
if(workName !=null) TechnologicalProcess_sql();
|
if(workName !=null) TechnologicalProcess_sql();
|
||||||
//Grid.SelectedIndex = 0;
|
//Grid.SelectedIndex = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user