Merge branch 'master' of http://pscg.dongkesoft.com:9002/r/mes/hg5020

DK.Service/BarcodePrintService/BarcodePrintLogic.cs

@@ -58,6 +58,7 @@ namespace Dongke.IBOSS.PRD.Service.BarcodePrintService
                 oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
                 oracleTrConn.Connect();
 
+                // 工序打印
                 if (printerID == null)
                 {
                     string sqlPrinterName =

WCF.Service/WCF.Services/PDAModuleService.cs

@@ -14,14 +14,13 @@ 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;
@@ -38,9 +37,9 @@ using Dongke.IBOSS.PRD.WCF.DataModels.PMModule;
 
 namespace Dongke.IBOSS.PRD.WCF.Services
 {
-	// 服务实现类,继承服务声明接口
-	// 该标签声明该服务可以在ASP.NET下运行
-	[AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
+    // 服务实现类,继承服务声明接口
+    // 该标签声明该服务可以在ASP.NET下运行
+    [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
 	[ServiceBehavior(ConfigurationName = "PDAModuleService",
 	InstanceContextMode = InstanceContextMode.PerCall,
 	ConcurrencyMode = ConcurrencyMode.Multiple,
@@ -759,7 +758,19 @@ namespace Dongke.IBOSS.PRD.WCF.Services
 								System.Reflection.MethodBase.GetCurrentMethod().Name,
 								ex.ToString(),
 								LocalPath.LogExePath);
-				actionResult.Status = (int)Constant.PDAResult.Exception;
+                try
+                {
+                    string ss = JsonHelper.ToJson(productionDataEntitys);
+                    OutputLog.TraceLog(LogPriority.Error,
+                                    this.ToString(),
+                                    System.Reflection.MethodBase.GetCurrentMethod().Name,
+                                    $" userCode:{userCode} procedureID:{procedureID} " + ss,
+                                    LocalPath.LogExePath);
+                }
+                catch
+                {
+                }
+                actionResult.Status = (int)Constant.PDAResult.Exception;
 				actionResult.Message = Constant.PDA_RESULT_EXCEPTION;
 			}
 			return actionResult;