|
@@ -61,7 +61,6 @@ namespace UAS_MES.DataOperate
|
|
|
Reconnect(command);
|
|
Reconnect(command);
|
|
|
OracleDataAdapter ad = new OracleDataAdapter();
|
|
OracleDataAdapter ad = new OracleDataAdapter();
|
|
|
ad.SelectCommand = command;
|
|
ad.SelectCommand = command;
|
|
|
- Console.WriteLine(sql);
|
|
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
ad.Fill(dt);
|
|
ad.Fill(dt);
|
|
@@ -256,7 +255,7 @@ namespace UAS_MES.DataOperate
|
|
|
string sql = "select ";
|
|
string sql = "select ";
|
|
|
sql += AddField(Fields);
|
|
sql += AddField(Fields);
|
|
|
sql += " from " + TableName + " where " + Condition;
|
|
sql += " from " + TableName + " where " + Condition;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
command = new OracleCommand(sql, connection);
|
|
command = new OracleCommand(sql, connection);
|
|
|
Reconnect(command);
|
|
Reconnect(command);
|
|
|
OracleDataAdapter ad = new OracleDataAdapter(command);
|
|
OracleDataAdapter ad = new OracleDataAdapter(command);
|
|
@@ -480,7 +479,7 @@ namespace UAS_MES.DataOperate
|
|
|
{
|
|
{
|
|
|
string sql = "select count(1) from " + TableName + " where " + Condition;
|
|
string sql = "select count(1) from " + TableName + " where " + Condition;
|
|
|
command = new OracleCommand(sql, connection);
|
|
command = new OracleCommand(sql, connection);
|
|
|
- Console.WriteLine(sql);
|
|
|
|
|
|
|
+
|
|
|
Reconnect(command);
|
|
Reconnect(command);
|
|
|
OracleDataAdapter ad = new OracleDataAdapter(command);
|
|
OracleDataAdapter ad = new OracleDataAdapter(command);
|
|
|
DataTable dt = new DataTable();
|
|
DataTable dt = new DataTable();
|
|
@@ -514,7 +513,7 @@ namespace UAS_MES.DataOperate
|
|
|
addpar[i] = new StringBuilder();
|
|
addpar[i] = new StringBuilder();
|
|
|
for (int j = 0; j < c.Length; j++)
|
|
for (int j = 0; j < c.Length; j++)
|
|
|
{
|
|
{
|
|
|
- if (c[j] != ' ' && c[j] != ',')
|
|
|
|
|
|
|
+ if (c[j] != ' ' && c[j] != ',' && c[j] != ')')
|
|
|
{
|
|
{
|
|
|
addpar[i].Append(c[j]);
|
|
addpar[i].Append(c[j]);
|
|
|
}
|
|
}
|
|
@@ -527,7 +526,7 @@ namespace UAS_MES.DataOperate
|
|
|
for (int i = 0; i < addpar.Length; i++)
|
|
for (int i = 0; i < addpar.Length; i++)
|
|
|
command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
|
|
command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
|
|
|
}
|
|
}
|
|
|
- Console.WriteLine(SQL);
|
|
|
|
|
|
|
+
|
|
|
switch (Type.ToUpper())
|
|
switch (Type.ToUpper())
|
|
|
{
|
|
{
|
|
|
case "SELECT":
|
|
case "SELECT":
|
|
@@ -681,10 +680,10 @@ namespace UAS_MES.DataOperate
|
|
|
/// </summary>
|
|
/// </summary>
|
|
|
/// <param name="SeqName"></param>
|
|
/// <param name="SeqName"></param>
|
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
|
- public string[] GetSEQ(string SeqName,string TableName, int Num)
|
|
|
|
|
|
|
+ public string[] GetSEQ(string SeqName, string TableName, int Num)
|
|
|
{
|
|
{
|
|
|
DataTable dt = new DataTable();
|
|
DataTable dt = new DataTable();
|
|
|
- dt = (DataTable)ExecuteSql("select " + SeqName + ".nextval from (select 1 from "+ TableName + " where rownum<" + (Num + 1) + ")", "select");
|
|
|
|
|
|
|
+ dt = (DataTable)ExecuteSql("select " + SeqName + ".nextval from (select 1 from " + TableName + " where rownum<" + (Num + 1) + ")", "select");
|
|
|
string[] SerialNum = new string[dt.Rows.Count];
|
|
string[] SerialNum = new string[dt.Rows.Count];
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
{
|
|
{
|
|
@@ -802,7 +801,7 @@ namespace UAS_MES.DataOperate
|
|
|
command = new OracleCommand(sql, connection);
|
|
command = new OracleCommand(sql, connection);
|
|
|
Reconnect(command);
|
|
Reconnect(command);
|
|
|
command.ArrayBindCount = names[1].Length;
|
|
command.ArrayBindCount = names[1].Length;
|
|
|
- Console.WriteLine(sql);
|
|
|
|
|
|
|
+
|
|
|
//因为第一个数组保存的是参数的名称,所以循环从1而不是0开始
|
|
//因为第一个数组保存的是参数的名称,所以循环从1而不是0开始
|
|
|
//将第一个数组的下标固定为0作为循环添加的参数的名称
|
|
//将第一个数组的下标固定为0作为循环添加的参数的名称
|
|
|
for (int i = 1; i <= names[0].Length; i++)
|
|
for (int i = 1; i <= names[0].Length; i++)
|
|
@@ -912,7 +911,7 @@ namespace UAS_MES.DataOperate
|
|
|
{
|
|
{
|
|
|
string sql = "update " + TableName + " set " + update + " where " + condition;
|
|
string sql = "update " + TableName + " set " + update + " where " + condition;
|
|
|
command = new OracleCommand(sql, connection);
|
|
command = new OracleCommand(sql, connection);
|
|
|
- Console.WriteLine(sql);
|
|
|
|
|
|
|
+
|
|
|
Reconnect(command);
|
|
Reconnect(command);
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
@@ -971,6 +970,7 @@ namespace UAS_MES.DataOperate
|
|
|
{
|
|
{
|
|
|
foreach (string sql in SQL)
|
|
foreach (string sql in SQL)
|
|
|
{
|
|
{
|
|
|
|
|
+
|
|
|
if (!String.IsNullOrEmpty(sql))
|
|
if (!String.IsNullOrEmpty(sql))
|
|
|
{
|
|
{
|
|
|
command.CommandText = sql;
|
|
command.CommandText = sql;
|