michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iPerlSpecial : Bug fixes in results DB changes, reading from Oracle and new result items, ver. 2.18.1126

Browse Source
This commit is contained in:
Milan Hanajik
2019-01-30 10:14:24 +01:00
parent f8ac27ba3c
commit 30df663634
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Entities/WaterMeter.cs
+16 -2
View File
@@ -374,11 +374,25 @@ namespace Results.Entities
Diff2Hz8Hz = src.Diff2Hz8Hz; Diff2Hz8Hz = src.Diff2Hz8Hz;
Hz2CorrectionDone = src.Hz2CorrectionDone; Hz2CorrectionDone = src.Hz2CorrectionDone;
Hz2Correction = src.Hz2Correction; Hz2Correction = src.Hz2Correction;
RadioAddress = src.RadioAddress;
FWVersion = src.FWVersion; FWVersion = src.FWVersion;
#endif #endif
#if TURA_SPECIAL
AssignedSerialNr = src.AssignedSerialNr;
CompleteSerialNr = src.CompleteSerialNr;
RadioAddress = src.RadioAddress;
PaletteNr = src.PaletteNr;
UmkartonNr = src.UmkartonNr;
ProdTestBench = src.ProdTestBench;
ProdWMPosition = src.ProdWMPosition;
ProdUserName = src.ProdUserName;
ProdPurchaseOrder = src.ProdPurchaseOrder;
ProdPassed = src.ProdPassed;
ProdResultCode = src.ProdResultCode;
ProdQ2CorrRL = src.ProdQ2CorrRL;
ProdQ2CorrLR = src.ProdQ2CorrLR;
#endif
#if ORACLE_DB #if ORACLE_DB
Pruefindex = src.Pruefindex; Pruefindex = src.Pruefindex;
HydrPruefung = src.HydrPruefung; HydrPruefung = src.HydrPruefung;
#endif #endif
foreach (var mtr in MeterTestRslts) foreach (var mtr in MeterTestRslts)
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.18.1125.0")] [assembly: AssemblyVersion("2.18.1126.0")]
[assembly: AssemblyFileVersion("2.18.1125.0")] [assembly: AssemblyFileVersion("2.18.1126.0")]
TBF/BenchControl/Output/DB/SensusOracle/Database.cs
+4 -3
View File
@@ -558,6 +558,9 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
/// Copy acquired data to WaterMeter object /// Copy acquired data to WaterMeter object
/// ///
wm.Pruefindex = maxPruefindex; wm.Pruefindex = maxPruefindex;
log.InfoFormat("Data of water meter {0} successfully read from ORACLE database.", wm.SerialNr);
log.DebugFormat(" MaxPruefindex = {0}", wm.Pruefindex);
#if TURA_SPECIAL
wm.AssignedSerialNr = assignedSerialNr; wm.AssignedSerialNr = assignedSerialNr;
wm.CompleteSerialNr = completeSerialNr; wm.CompleteSerialNr = completeSerialNr;
wm.RadioAddress = radioAddress; wm.RadioAddress = radioAddress;
@@ -572,8 +575,6 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
wm.ProdQ2CorrRL = q2CorrectionRL; wm.ProdQ2CorrRL = q2CorrectionRL;
wm.ProdQ2CorrLR = q2CorrectionLR; wm.ProdQ2CorrLR = q2CorrectionLR;
log.InfoFormat("Data of water meter {0} successfully read from ORACLE database.", wm.SerialNr);
log.DebugFormat(" MaxPruefindex = {0}", wm.Pruefindex);
log.DebugFormat(" AssignedSerialNr = {0}", wm.AssignedSerialNr); log.DebugFormat(" AssignedSerialNr = {0}", wm.AssignedSerialNr);
log.DebugFormat(" CompleteSerialNr = {0}", wm.CompleteSerialNr); log.DebugFormat(" CompleteSerialNr = {0}", wm.CompleteSerialNr);
log.DebugFormat(" RadioAddress = {0}", wm.RadioAddress); log.DebugFormat(" RadioAddress = {0}", wm.RadioAddress);
@@ -587,7 +588,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
log.DebugFormat(" ProdResultCode = {0}", wm.ProdResultCode); log.DebugFormat(" ProdResultCode = {0}", wm.ProdResultCode);
log.DebugFormat(" ProdQ2CorrRL = {0}", wm.ProdQ2CorrRL); log.DebugFormat(" ProdQ2CorrRL = {0}", wm.ProdQ2CorrRL);
log.DebugFormat(" ProdQ2CorrLR = {0}", wm.ProdQ2CorrLR); log.DebugFormat(" ProdQ2CorrLR = {0}", wm.ProdQ2CorrLR);
#endif
return Retv.OK; return Retv.OK;
} }
catch (Exception exc) catch (Exception exc)
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.1125.0")] [assembly: AssemblyVersion("2.18.1126.0")]
[assembly: AssemblyFileVersion("2.18.1125.0")] [assembly: AssemblyFileVersion("2.18.1126.0")]