print

DK.Service/BarcodePrintService/BarcodePrintLogic.cs

@@ -31,7 +31,7 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
     public static class BarcodePrintLogic
     {
         /// <summary>
-        /// 打印条码
+        /// 打印条码（扫描工序时自动打印、或经过打印工序后补打）
         /// </summary>
         /// <param name="barcode">条码</param>
         /// <param name="copies">打印份数</param>
@@ -345,26 +345,28 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
         /// </summary>
         /// <param name="sUserInfo"></param>
         /// <returns></returns>
-        public static DataSet GetBarcodePrinter(SUserInfo sUserInfo)
+        public static DataSet GetBarcodePrinter(SUserInfo sUserInfo, int printType=0)
         {
             IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(Basics.DataAccess.DataBaseType.ORACLE, DataManager.ConnectionString);
             try
             {
                 //获取系统参数管理的数据
 
-                string sqlString = "SELECT bp.printerid, bp.printername\n" +
+                string sqlString = "SELECT bp.printerid, bp.printername, bp.PRINTTYPE\n" +
                 "  FROM tp_mst_barcodeprinter bp\n" +
                 "  LEFT JOIN tp_mst_user u\n" +
                 "    ON u.userid = :userid\n" +
                 "   AND u.barcodeprinterid = bp.printerid\n" +
                 " WHERE bp.valueflag = '1'\n" +
                 "   AND bp.accountid = :accountid\n" +
+                //"   AND (:PRINTTYPE = 0 or bp.PRINTTYPE = :PRINTTYPE)\n" +
                 " ORDER BY nvl2(u.userid, 0, 1), bp.displayno";
 
                 Oracle.ManagedDataAccess.Client.OracleParameter[] oracleParameter = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
                 {
                     new Oracle.ManagedDataAccess.Client.OracleParameter(":userid",sUserInfo.UserID),
                     new Oracle.ManagedDataAccess.Client.OracleParameter(":accountid",sUserInfo.AccountID),
+                    //new Oracle.ManagedDataAccess.Client.OracleParameter(":PRINTTYPE",printType),
                 };
                 oracleConn.Open();
                 DataSet result = oracleConn.GetSqlResultToDs(sqlString, oracleParameter);

DLL/Curtain.DataAccess.xml

@@ -64,6 +64,18 @@
             参数（列=参数）
             </summary>
         </member>
+        <member name="M:Curtain.DataAccess.CDASqlStrParameter.ToString">
+            <summary>
+            返回表示当前的 System.String。
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Curtain.DataAccess.CDASqlStrParameter.ToLogString">
+            <summary>
+            输出到日志文件中的文本
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:Curtain.DataAccess.DataAccessBase">
             <summary>
             数据库操作类
@@ -686,6 +698,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Curtain.DataAccess.CDAParameter.ToLogString">
+            <summary>
+            输出到日志文件中的文本
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:Curtain.DataAccess.DataType">
             <summary>
             数据类型
@@ -6642,24 +6660,27 @@
             <param name="parameters"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.PostgreSQL.ToSqlParameters(Curtain.DataAccess.CDAParameter[],System.String@)">
+        <member name="M:Curtain.DataAccess.PostgreSQL.ToSqlParameters(System.Data.CommandType,Curtain.DataAccess.CDAParameter[],System.String@)">
             <summary>
             转换Sql参数
             </summary>
+            <param name="commandType"></param>
             <param name="parameters"></param>
             <param name="sql"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.PostgreSQL.ToSqlParameter(Curtain.DataAccess.CDAParameter,System.String@)">
+        <member name="M:Curtain.DataAccess.PostgreSQL.ToSqlParameter(Curtain.DataAccess.CDAParameter)">
             <summary>
             获取PostgreSQL参数
             </summary>
+            <param name="parameter"></param>
             <returns></returns>
         </member>
         <member name="M:Curtain.DataAccess.PostgreSQL.ToDBType(Curtain.DataAccess.DataType)">
             <summary>
             获取NpgsqlDbType
             </summary>
+            <param name="dataType"></param>
             <returns>NpgsqlDbType</returns>
         </member>
         <member name="T:Curtain.DataAccess.MySql">
@@ -6793,24 +6814,27 @@
             <param name="parameters"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.MySql.ToSqlParameters(Curtain.DataAccess.CDAParameter[],System.String@)">
+        <member name="M:Curtain.DataAccess.MySql.ToSqlParameters(System.Data.CommandType,Curtain.DataAccess.CDAParameter[],System.String@)">
             <summary>
             转换Sql参数
             </summary>
+            <param name="commandType"></param>
             <param name="parameters"></param>
             <param name="sql"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.MySql.ToSqlParameter(Curtain.DataAccess.CDAParameter,System.String@)">
+        <member name="M:Curtain.DataAccess.MySql.ToSqlParameter(Curtain.DataAccess.CDAParameter)">
             <summary>
             获取MySql参数
             </summary>
+            <param name="parameter"></param>
             <returns></returns>
         </member>
         <member name="M:Curtain.DataAccess.MySql.ToDBType(Curtain.DataAccess.DataType)">
             <summary>
             获取MySqlDbType
             </summary>
+            <param name="dataType"></param>
             <returns>MySqlDbType</returns>
         </member>
         <member name="T:Curtain.DataAccess.MySqlDBType">
@@ -7179,24 +7203,27 @@
             <param name="parameters"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.Oracle.ToSqlParameters(Curtain.DataAccess.CDAParameter[],System.String@)">
+        <member name="M:Curtain.DataAccess.Oracle.ToSqlParameters(System.Data.CommandType,Curtain.DataAccess.CDAParameter[],System.String@)">
             <summary>
             转换Oracle参数
             </summary>
+            <param name="commandType"></param>
             <param name="parameters"></param>
             <param name="sql"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.Oracle.ToSqlParameter(Curtain.DataAccess.CDAParameter,System.String@)">
+        <member name="M:Curtain.DataAccess.Oracle.ToSqlParameter(Curtain.DataAccess.CDAParameter)">
             <summary>
             获取Oracle参数
             </summary>
+            <param name="parameter"></param>
             <returns></returns>
         </member>
         <member name="M:Curtain.DataAccess.Oracle.ToDBType(Curtain.DataAccess.DataType)">
             <summary>
             获取OracleDbType
             </summary>
+            <param name="dataType"></param>
             <returns>OracleDbType</returns>
         </member>
         <member name="T:Curtain.DataAccess.OracleDBType">
@@ -7332,24 +7359,27 @@
             <param name="parameters"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.SQLite.ToSqlParameters(Curtain.DataAccess.CDAParameter[],System.String@)">
+        <member name="M:Curtain.DataAccess.SQLite.ToSqlParameters(System.Data.CommandType,Curtain.DataAccess.CDAParameter[],System.String@)">
             <summary>
             转换SQLite参数
             </summary>
+            <param name="commandType"></param>
             <param name="parameters"></param>
             <param name="sql"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.SQLite.ToSqlParameter(Curtain.DataAccess.CDAParameter,System.String@)">
+        <member name="M:Curtain.DataAccess.SQLite.ToSqlParameter(Curtain.DataAccess.CDAParameter)">
             <summary>
             获取SQLite参数
             </summary>
+            <param name="parameter"></param>
             <returns></returns>
         </member>
         <member name="M:Curtain.DataAccess.SQLite.ToDBType(Curtain.DataAccess.DataType)">
             <summary>
             获取SQLiteDbType
             </summary>
+            <param name="dataType"></param>
             <returns>SQLiteDbType</returns>
         </member>
         <member name="M:Curtain.DataAccess.SQLite.ChangePassword(System.String)">
@@ -7501,24 +7531,27 @@
             <param name="parameters"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.SQLServer.ToSqlParameters(Curtain.DataAccess.CDAParameter[],System.String@)">
+        <member name="M:Curtain.DataAccess.SQLServer.ToSqlParameters(System.Data.CommandType,Curtain.DataAccess.CDAParameter[],System.String@)">
             <summary>
             转换Sql参数
             </summary>
+            <param name="commandType"></param>
             <param name="parameters"></param>
             <param name="sql"></param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.DataAccess.SQLServer.ToSqlParameter(Curtain.DataAccess.CDAParameter,System.String@)">
+        <member name="M:Curtain.DataAccess.SQLServer.ToSqlParameter(Curtain.DataAccess.CDAParameter)">
             <summary>
             获取SQLServer参数
             </summary>
+            <param name="parameter"></param>
             <returns></returns>
         </member>
         <member name="M:Curtain.DataAccess.SQLServer.ToDBType(Curtain.DataAccess.DataType)">
             <summary>
             获取SqlDbType
             </summary>
+            <param name="dataType"></param>
             <returns>SqlDbType</returns>
         </member>
         <member name="M:Curtain.DataAccess.INIHelper.Write(System.String,System.String,System.String,System.String)">

WCF.Service/WCF.Contracts/IPDAModule.cs

@@ -2072,7 +2072,7 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         [WebInvoke(BodyStyle = WebMessageBodyStyle.WrappedRequest
             , ResponseFormat = WebMessageFormat.Json
             , RequestFormat = WebMessageFormat.Json)]
-        ActionResult GetBarcodePrinter(string accountCode, string userCode, string userPassword, string sessionKey);
+        ActionResult GetBarcodePrinter(string accountCode, string userCode, string userPassword, string sessionKey, int printType = 0);
 
         /// <summary>
         /// 打印条码样式

WCF.Service/WCF.Contracts/IPDAModuleGet.cs

@@ -2071,7 +2071,7 @@ namespace Dongke.IBOSS.PRD.WCF.Contracts
         [WebGet(BodyStyle = WebMessageBodyStyle.WrappedRequest
             , ResponseFormat = WebMessageFormat.Json
             , RequestFormat = WebMessageFormat.Json)]
-        ActionResult GetBarcodePrinterGet(string accountCode, string userCode, string userPassword, string sessionKey);
+        ActionResult GetBarcodePrinterGet(string accountCode, string userCode, string userPassword, string sessionKey, int printtype=0);
 
         /// <summary>
         /// 打印条码样式

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -7717,7 +7717,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 		/// <param name="userPassword"></param>
 		/// <param name="sessionKey"></param>
 		/// <returns></returns>
-		public ActionResult GetBarcodePrinter(string accountCode, string userCode, string userPassword, string sessionKey)
+		public ActionResult GetBarcodePrinter(string accountCode, string userCode, string userPassword, string sessionKey, int printType=0)
 		{
 			ActionResult actionResult = new ActionResult();
 			try
@@ -7731,7 +7731,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 					return actionResult;
 				}
 
-				DataSet resultEntity = BarcodePrintLogic.GetBarcodePrinter(sUserInfo);
+				DataSet resultEntity = BarcodePrintLogic.GetBarcodePrinter(sUserInfo, printType);
 
 				actionResult.Result = JsonHelper.ToJson(resultEntity.Tables[0]);
 				actionResult.Status = (int)Constant.PDAResult.Success;

WCF.Service/WCF.Services/PDAModuleServiceGet.cs

@@ -17,16 +17,13 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
-using System.ServiceModel;
-using System.ServiceModel.Activation;
+
 using Dongke.IBOSS.PRD.Basics.BaseResources;
-using Dongke.IBOSS.PRD.Basics.DataAccess;
 using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.BarcodePrintService;
 using Dongke.IBOSS.PRD.Service.CommonModuleLogic;
 using Dongke.IBOSS.PRD.Service.DataModels;
 using Dongke.IBOSS.PRD.Service.DKIBOSSPRDLogic;
-using Dongke.IBOSS.PRD.Service.HRModuleLogic;
 using Dongke.IBOSS.PRD.Service.PCModuleLogic;
 using Dongke.IBOSS.PRD.Service.PDAModuleLogic;
 using Dongke.IBOSS.PRD.Service.PMModuleLogic;
@@ -43,9 +40,9 @@ using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
 
 namespace Dongke.IBOSS.PRD.WCF.Services
 {
-	// 服务实现类,继承服务声明接口
-	// 该标签声明该服务可以在ASP.NET下运行
-	public partial class PDAModuleService : IPDAModule
+    // 服务实现类,继承服务声明接口
+    // 该标签声明该服务可以在ASP.NET下运行
+    public partial class PDAModuleService : IPDAModule
 	{
 		#region 验证
 		/// <summary>
@@ -7680,7 +7677,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 		/// <param name="userPassword"></param>
 		/// <param name="sessionKey"></param>
 		/// <returns></returns>
-		public ActionResult GetBarcodePrinterGet(string accountCode, string userCode, string userPassword, string sessionKey)
+		public ActionResult GetBarcodePrinterGet(string accountCode, string userCode, string userPassword, string sessionKey, int printType = 0)
 		{
 			ActionResult actionResult = new ActionResult();
 			try
@@ -7694,7 +7691,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 					return actionResult;
 				}
 
-				DataSet resultEntity = BarcodePrintLogic.GetBarcodePrinter(sUserInfo);
+				DataSet resultEntity = BarcodePrintLogic.GetBarcodePrinter(sUserInfo, printType);
 
 				actionResult.Result = JsonHelper.ToJson(resultEntity.Tables[0]);
 				actionResult.Status = (int)Constant.PDAResult.Success;