3#条码打印

DK.Service/BarcodePrintService/BarcodePrintLogic.cs

@@ -846,7 +846,7 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                 if (status < 0)
                 {
                     sre.Status = Constant.ServiceResultStatus.Other;
-                    sre.Message = parameters[6].Value.ToString();
+                    sre.Message = parameters[5].Value.ToString();
                     return sre;
                 }
 
@@ -867,10 +867,18 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                 }
 
                 // 打印机ID 类型 TODO
-                string sql = "";
-
-                parameters.Clear();
-                parameters.Add(new OracleParameter(":ws_id", OracleDbType.NVarchar2, barcode, ParameterDirection.Input));
+                string sql ="SELECT bp.printerid\n" +
+							"      ,bp.printtype\n" +
+							"      ,bp.printername\n" +
+							"  FROM tp_mst_barcodeprinter bp\n" +
+							" WHERE EXISTS (SELECT 1\n" +
+							"          FROM tp_mst_workstationprinter wsp\n" +
+							"         WHERE wsp.printerid = bp.printerid\n" +
+							"           AND wsp.valueflag = '1'\n" +
+							"           AND wsp.workstationid = :ws_id)";
+
+				parameters.Clear();
+                parameters.Add(new OracleParameter(":ws_id", ws_id));
 
                 DataTable dataPrinter = oracleTrConn.GetSqlResultToDt(sql, parameters.ToArray());
                 if (dataPrinter == null || dataPrinter.Rows.Count == 0)

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -6828,7 +6828,34 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 		}
 		#endregion
 
-		#region 3#条码补打
+		#region 3#条码打印
+		/// <summary>
+		/// 3#条码打印（PDA用）
+		/// </summary>
+		/// <param name="cre"></param>
+		/// <param name="sUserInfo"></param>
+		/// <returns></returns>
+		public static ServiceResultEntity PrintBarcode_3BL(ClientRequestEntity cre, SUserInfo sUserInfo)
+		{
+			IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+			try
+			{
+				ServiceResultEntity sre = BarcodePrintLogic.PrintBarcode_3BL(
+					cre.Properties["Barcode"] + "", Convert.ToInt32(cre.Properties["WorkStationID"]), sUserInfo);
+
+				return sre;
+			}
+			catch (Exception ex)
+			{
+				if (oracleTrConn.ConnState == ConnectionState.Open)
+				{
+					oracleTrConn.Rollback();
+					oracleTrConn.Disconnect();
+				}
+				throw ex;
+			}
+		}
+
 		/// <summary>
 		/// 补打3#条码（PDA用）
 		/// </summary>

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -11128,7 +11128,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 				#endregion
 
 				#region 3#条码打印机（PDA用）
-				// 配置工位打印机
+				// 3#配置工位打印机
 				else if (module == "01070804")
 				{
 					// 获取3#条码打印机配置（PDA用）
@@ -11177,7 +11177,7 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 						return actionResult;
 					}
 				}
-				// 补打条码
+				// 3#条码打印
 				else if (module == "01070805")
 				{
 					// 获取3#条码打印机配置（PDA用）
@@ -11195,6 +11195,53 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 						}
 						return actionResult;
 					}
+					// 条码打印（PDA用）
+					else if (action == "PrintBarcode_3BL")
+					{
+						ClientRequestEntity cre = new ClientRequestEntity();
+						cre.Properties["Barcode"] = data["Barcode"];
+						cre.Properties["WorkStationID"] = data["WorkStationID"];
+
+						ServiceResultEntity sre = SystemModuleLogic.PrintBarcode_3BL(cre, sUserInfo);
+
+						if (sre.Status == Constant.ServiceResultStatus.Success)
+						{
+							if (sre.Result != null)
+							{
+								actionResult.Status = (int)Constant.PDAResult.Success;
+							}
+							else
+							{
+								actionResult.Status = (int)Constant.PDAResult.Fail;
+								actionResult.Message = sre.Message;
+							}
+						}
+						else
+						{
+							actionResult.Status = (int)Constant.PDAResult.Fail;
+							actionResult.Message = sre.Message;
+						}
+						return actionResult;
+					}
+				}
+				// 3#条码补打
+				else if (module == "01070806")
+				{
+					// 获取3#条码打印机配置（PDA用）
+					if (action == "GetWorkStationPrinter3")
+					{
+						ServiceResultEntity sre = SystemModuleLogic.GetWorkStationPrinter3(sUserInfo);
+						if (sre.Data != null && sre.Data.Tables.Count > 0)
+						{
+							actionResult.Status = (int)Constant.PDAResult.Success;
+							actionResult.Result = JsonHelper.ToJson(sre.Data);
+						}
+						else
+						{
+							actionResult.Status = (int)Constant.PDAResult.Fail;
+						}
+						return actionResult;
+					}
 					// 补打3#条码（PDA用）
 					else if (action == "PrintBarcode_3BL_B")
 					{