diff --git a/UserClass/SqliteHelper.cs b/UserClass/SqliteHelper.cs
index 4fcf7fa..e057a50 100644
--- a/UserClass/SqliteHelper.cs
+++ b/UserClass/SqliteHelper.cs
@@ -655,8 +655,32 @@ namespace DyeingComputer.UserClass
return buf.ToString();
}
- #endregion
+ ///
+ /// 将 DataTable 转换为 Dictionary 类型数据
+ ///
+ public Dictionary DataTableToDictionary(DataTable dataTable)
+ {
+ Dictionary result = new Dictionary();
+ if (dataTable != null)
+ {
+ foreach (DataRow dataRow in dataTable.Rows)
+ {
+ foreach (DataColumn dataColumn in dataTable.Columns)
+ {
+ result.Add(dataColumn.ColumnName, dataRow[dataColumn].ToString());
+ //result = Console.WriteLine(dataRow[dataColumn].ToString());
+ //result.Add(dataColumn.ColumnName, dataRow[dataColumn].ToString())(new RepeatDictionaryComparer());
+ }
+ }
+ }
+ else
+ {
+ result = null;
+ }
+ return result;
+ }
+
}
-
+ #endregion
}
}
diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs
index 72be778..5216bbf 100644
--- a/View/ProgramstepsView .xaml.cs
+++ b/View/ProgramstepsView .xaml.cs
@@ -4,9 +4,12 @@ using formula_manage.UserClass;
using System;
using System.Collections.Generic;
using System.Data;
+using System.Data.Entity;
+using System.Data.SQLite;
using System.Diagnostics.Eventing.Reader;
using System.Linq;
using System.Net;
+using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -51,7 +54,7 @@ namespace DyeingComputer.View
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
SQLiteHelpers.Open(); //打开数据库
- string sql_script = "select * from ProgramSteps where ProgramID='"+ ProgramID + "' order by Step desc";
+ string sql_script = "select * from ProgramSteps where ProgramID='" + ProgramID + "' order by Step desc";
if (sql != null) sql.Clear(); //清空缓存
sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存
@@ -70,13 +73,13 @@ namespace DyeingComputer.View
public void Dat()//行号刷新
{
- int a = sql.Tables[0].Rows.Count;
- for(int i = 0; i