Merge remote-tracking branch 'weiyunbing/Develop'

Conflicts: Application/Program.cs Application/WorkStation.csproj Application/frmMain.cs
katway · Oct 29, 2012 · 09d0f49 · 09d0f49
2 parents a2a8604 + ebae449
commit 09d0f49
Show file tree

Hide file tree

Showing 47 changed files with 9,684 additions and 1,534 deletions.
diff --git a/Application/Code/CommonClass.cs.orig b/Application/Code/CommonClass.cs.orig
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WorkStation
+{
+    public class CommonClass
+    {
+    }
+    public class BoxItem
+    {
+        private string _text = null;
+        private object _value = null;
+        public string Text { get { return this._text; } set { this._text = value; } }
+        public object Value { get { return this._value; } set { this._value = value; } }
+        public override string ToString()
+        {
+            return this._text;
+        }
+    }
+}
diff --git a/Application/Code/SqlHelper.cs b/Application/Code/SqlHelper.cs
@@ -175,7 +175,7 @@ private static void PrepareCommand(SqlCommand command, SqlConnection connection,
         /// <returns></returns>
         public static int ExecuteNonQuery(string commandText)
         {
-            return ExecuteNonQuery(sqlConnectionStr,CommandType.Text,commandText);
+            return ExecuteNonQuery(sqlConnectionStr,CommandType.Text,commandText,(SqlParameter[])null);
         }
         /// <summary>
         /// 执行但参数的sql数据
@@ -187,21 +187,19 @@ public static int ExecuteNonQuery(string commandText, params SqlParameter[] comm
         {
             return ExecuteNonQuery(sqlConnectionStr, CommandType.Text, commandText,commandParameters);
         }
+
         /// <summary>
-        /// 执行指定连接字符串,类型的SqlCommand.
+        /// 执行存储过程
         /// </summary>
-        /// <remarks>
-        /// 示例:  
-        ///  int result = ExecuteNonQuery(connString, CommandType.StoredProcedure, "PublishOrders");
-        /// </remarks>
-        /// <param name="connectionString">一个有效的数据库连接字符串</param>
-        /// <param name="commandType">命令类型 (存储过程,命令文本, 其它.)</param>
-        /// <param name="commandText">存储过程名称或SQL语句</param>
-        /// <returns>返回命令影响的行数</returns>
-        public static int ExecuteNonQuery(string connectionString, CommandType commandType, string commandText)
+        /// <param name="spName"></param>
+        /// <param name="commandType"></param>
+        /// <param name="parameterValues"></param>
+        /// <returns></returns>
+        public static int ExecuteNonQuery(string spName, CommandType commandType, params SqlParameter[] parameterValues)
         {
-            return ExecuteNonQuery(connectionString, commandType, commandText, (SqlParameter[])null);
-        }
+            return ExecuteNonQuery(sqlConnectionStr, CommandType.StoredProcedure, spName, parameterValues);
+        } 
+
 
         /// <summary>
         /// 执行指定连接字符串,类型的SqlCommand.如果没有提供参数,不返回结果.
@@ -225,16 +223,13 @@ public static int ExecuteNonQuery(string connectionString, CommandType commandTy
             }
         }
 
+
+
         /// <summary>
-        /// 执行指定连接字符串的存储过程,将对象数组的值赋给存储过程参数,
+        ///执行指定连接字符串的存储过程,将对象数组的值赋给存储过程参数,
         /// 此方法需要在参数缓存方法中探索参数并生成参数.
         /// </summary>
-        /// <remarks>
-        /// 这个方法没有提供访问输出参数和返回值.
-        /// 示例:  
-        ///  int result = ExecuteNonQuery(connString, "PublishOrders", 24, 36);
-        /// </remarks>
-        /// <param name="connectionString">一个有效的数据库连接字符串/param>
+        /// <param name="connectionString">一个有效的数据库连接字符串</param>
         /// <param name="spName">存储过程名称</param>
         /// <param name="parameterValues">分配到存储过程输入参数的对象数组</param>
         /// <returns>返回受影响的行数</returns>
@@ -338,14 +333,10 @@ public static int ExecuteNonQuery(SqlConnection connection, string spName, param
         /// <summary>
         /// 执行带事务的SqlCommand.
         /// </summary>
-        /// <remarks>
-        /// 示例.:  
-        ///  int result = ExecuteNonQuery(trans, CommandType.StoredProcedure, "PublishOrders");
-        /// </remarks>
         /// <param name="transaction">一个有效的数据库连接对象</param>
         /// <param name="commandType">命令类型(存储过程,命令文本或其它.)</param>
         /// <param name="commandText">存储过程名称或T-SQL语句</param>
-        /// <returns>返回影响的行数/returns>
+        /// <returns>返回影响的行数</returns>
         public static int ExecuteNonQuery(SqlTransaction transaction, CommandType commandType, string commandText)
         {
             return ExecuteNonQuery(transaction, commandType, commandText, (SqlParameter[])null);