Permalink
Browse files

Merge remote-tracking branch 'weiyunbing/Develop'

Conflicts:
	Application/Program.cs
	Application/WorkStation.csproj
	Application/frmMain.cs
  • Loading branch information...
hefangli committed Oct 29, 2012
2 parents a2a8604 + ebae449 commit 09d0f4922379969997822b9fed47c2a9468c7854
Showing with 9,684 additions and 1,534 deletions.
  1. +22 −0 Application/Code/CommonClass.cs.orig
  2. +16 −25 Application/Code/SqlHelper.cs
  3. +4,772 −0 Application/Code/SqlHelper.cs.orig
  4. +0 −271 Application/Main.Designer.cs
  5. +0 −20 Application/Main.cs
  6. +0 −208 Application/Main.resx
  7. +1 −1 Application/Program.cs
  8. +1 −2 Application/Program.cs.orig
  9. +37 −1 Application/Properties/Settings.Designer.cs
  10. +45 −25 Application/Properties/Settings.Designer.cs.orig
  11. +10 −1 Application/Properties/Settings.settings
  12. +37 −0 Application/Properties/Settings.settings.orig
  13. +27 −35 Application/WorkStation.csproj
  14. +271 −9 Application/WorkStation.csproj.orig
  15. +18 −1 Application/app.config
  16. +35 −0 Application/app.config.orig
  17. +0 −1 Application/frmAddCard.cs
  18. +271 −234 Application/frmAddItem.Designer.cs
  19. +186 −1 Application/frmAddItem.cs
  20. +232 −0 Application/frmAddItem.cs.orig
  21. +125 −119 Application/frmAddItem.resx
  22. +198 −0 Application/frmAddMachine.Designer.cs
  23. +136 −0 Application/frmAddMachine.cs
  24. +123 −0 Application/frmAddMachine.resx
  25. +82 −54 Application/frmAddPoint.Designer.cs
  26. +213 −0 Application/frmAddPoint.Designer.cs.orig
  27. +123 −2 Application/frmAddPoint.cs
  28. +178 −0 Application/frmAddPoint.cs.orig
  29. +125 −119 Application/frmAddPoint.resx
  30. +169 −0 Application/frmAddRoutName.Designer.cs
  31. +99 −0 Application/frmAddRoutName.cs
  32. +122 −0 Application/frmAddRoutName.cs.orig
  33. +120 −0 Application/frmAddRoutName.resx
  34. +284 −144 Application/frmAddRoute.Designer.cs
  35. +487 −0 Application/frmAddRoute.Designer.cs.orig
  36. +486 −19 Application/frmAddRoute.cs
  37. +490 −0 Application/frmAddRoute.cs.orig
  38. +122 −119 Application/frmAddRoute.resx
  39. +0 −19 Application/frmAddTask.Designer.cs
  40. +1 −94 Application/frmAddTask.cs
  41. +0 −1 Application/frmEditOrDeleteTask.Designer.cs
  42. +0 −4 Application/frmEditOrDeleteTask.cs
  43. +6 −2 Application/{frmain.Designer.cs → frmMain.Designer.cs}
  44. +14 −3 Application/{frmain.cs → frmMain.cs}
  45. 0 Application/{frmain.resx → frmMain.resx}
  46. 0 提交.txt
  47. 0 新建 文本文档.txt
@@ -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;
+ }
+ }
+}
@@ -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);
Oops, something went wrong.

0 comments on commit 09d0f49

Please sign in to comment.