|
@@ -690,12 +690,14 @@ namespace UAS_DeviceMonitor.DataOperate
|
|
|
return SerialNum;
|
|
return SerialNum;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public void SaveDataTable(DataTable dt, string TableName, string ID, params string[] sql)
|
|
|
|
|
|
|
+ public void SaveDataTable(DataTable dt, string TableName, string ID, out string[] SavedID, params string[] sql)
|
|
|
{
|
|
{
|
|
|
if (dt == null)
|
|
if (dt == null)
|
|
|
{
|
|
{
|
|
|
|
|
+ SavedID = new string[0];
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
StringBuilder sb = new StringBuilder();
|
|
StringBuilder sb = new StringBuilder();
|
|
|
//预防插入的DataTable中存在不属于该表的列,在进行下一步操作之前全部剔除
|
|
//预防插入的DataTable中存在不属于该表的列,在进行下一步操作之前全部剔除
|
|
|
DataTable data = (DataTable)ExecuteSql("select Column_Name,Data_Type from cols where TABLE_name=upper('" + TableName + "')", "select");
|
|
DataTable data = (DataTable)ExecuteSql("select Column_Name,Data_Type from cols where TABLE_name=upper('" + TableName + "')", "select");
|
|
@@ -760,6 +762,7 @@ namespace UAS_DeviceMonitor.DataOperate
|
|
|
sb.Append("update " + TableName + " set ");
|
|
sb.Append("update " + TableName + " set ");
|
|
|
int ColumnCount = dt.Columns.Count;
|
|
int ColumnCount = dt.Columns.Count;
|
|
|
int RowCount = dt.Rows.Count;
|
|
int RowCount = dt.Rows.Count;
|
|
|
|
|
+ SavedID = new string[RowCount];
|
|
|
//存数据的参数
|
|
//存数据的参数
|
|
|
List<string[]> Parameter = new List<string[]>();
|
|
List<string[]> Parameter = new List<string[]>();
|
|
|
//存参数名的参数
|
|
//存参数名的参数
|
|
@@ -782,6 +785,7 @@ namespace UAS_DeviceMonitor.DataOperate
|
|
|
for (int j = 0; j < RowCount; j++)
|
|
for (int j = 0; j < RowCount; j++)
|
|
|
{
|
|
{
|
|
|
par[j] = dt.Rows[j][i].ToString();
|
|
par[j] = dt.Rows[j][i].ToString();
|
|
|
|
|
+ SavedID[j] = dt.Rows[j][ID].ToString();
|
|
|
}
|
|
}
|
|
|
Parameter.Add(par);
|
|
Parameter.Add(par);
|
|
|
}
|
|
}
|
|
@@ -966,7 +970,7 @@ namespace UAS_DeviceMonitor.DataOperate
|
|
|
{
|
|
{
|
|
|
foreach (string sql in SQL)
|
|
foreach (string sql in SQL)
|
|
|
{
|
|
{
|
|
|
-
|
|
|
|
|
|
|
+ Console.WriteLine(sql);
|
|
|
if (!String.IsNullOrEmpty(sql))
|
|
if (!String.IsNullOrEmpty(sql))
|
|
|
{
|
|
{
|
|
|
command.CommandText = sql;
|
|
command.CommandText = sql;
|