S640CommForm Start/Ende.pro fixed, OriRadioAddress added to results, OrderInfo.Clone9) fixed, ver. 3.1.1833

TBF/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.1831.0")]
-[assembly: AssemblyFileVersion("3.1.1831.0")]
+[assembly: AssemblyVersion("3.1.1833.0")]
+[assembly: AssemblyFileVersion("3.1.1833.0")]

TBF/Rig/TestMethods/S640Communication/S640CommForm.cs

@@ -745,7 +745,7 @@ namespace TBF.Rig.TestMethods.S640Communication
                 }
                 SaveProFile(Path.Combine(Constants.SirtLogDir,
                                          string.Format("{0:yyMMdd-HHmmss}-b{1}-{2}", DateTime.Now, ProcessData.BatchRslts.Batch.BatchNr, EndFileName)),
-                            S640Activity.Start, optoHeads);
+                            S640Activity.End, optoHeads);
 
                 savedTimestamp = DateTime.Now;
 
@@ -998,9 +998,10 @@ namespace TBF.Rig.TestMethods.S640Communication
                            : string.Empty;                                      /// 3
 
             /// Module parameter
-            string moduleParam = (pPars.ModuleParameter.ToLower().Contains("vt_auftrag_pd") && ProcessData.OrderInfo != null)
-                               ? ProcessData.OrderInfo.ModuleParam
-                               : pPars.ModuleParameter;
+            string moduleParam = ((pPars.ModuleParameter.ToLower().Contains("order") || pPars.ModuleParameter.ToLower().Contains("auftrag")) &&
+								  ProcessData.OrderInfo != null && !string.IsNullOrEmpty(ProcessData.OrderInfo.ModuleParam))
+                                   ? ProcessData.OrderInfo.ModuleParam
+                                   : pPars.ModuleParameter;
 
             /// Purchase order and water meters count
             int count = 0;