From a81858ee9fbf82c8463092d3a48ccf6cd64cc3e5 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 3 Apr 2021 16:38:37 +0200 Subject: [PATCH] Changes for iPERL, builds OK when TURA_IPERL;IPERL;ORACLE_DB are defined in Config, Results and TBF projects. --- Results/Entities/WaterMeter.cs | 45 +++++++++++++++++++------------ Results/Mappings/WaterMeterMap.cs | 7 +++-- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 3c4b6137c..d154b91c1 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -59,7 +59,7 @@ namespace Results.Entities public virtual string Remark { get; set; } #if IPERL - public virtual double OrigCalibFactor { get; set; } /// Original iPerl calibration factor used during the test + public virtual double OrigCalibFactor { get; set; } /// Original iPerl calibration factor used during the test public virtual double CalibFactor { get; set; } /// iPerl calibration factor used during the test public virtual double OrigCalibFactorLNA{ get; set; } /// Original iPerl LNA calibration factor used during the test public virtual double CalibFactorLNA { get; set; } /// iPerl LNA calibration factor used during the test @@ -76,8 +76,6 @@ namespace Results.Entities /// /// Data from a production test bench (in case of tests on iPerl special) /// - public virtual int AssignedSerialNr { get; set; } - public virtual string CompleteSerialNr { get; set; } public virtual string RadioAddress { get; set; } public virtual int PaletteNr { get; set; } public virtual int UmkartonNr { get; set; } @@ -91,13 +89,17 @@ namespace Results.Entities public virtual int ProdQ2CorrLR { get; set; } /// iPerl Q2 correction for the L-flow written to iPerl #endif #if ORACLE_DB - public virtual int Pruefindex { get; set; } /// >= 1 ... pruefindex + public virtual int AssignedSerialNr { get; set; } + public virtual string Prefix { get; set; } + public virtual string Suffix { get; set; } + public virtual string CompleteSerialNr { get; set; } + public virtual int WMTypeRevision { get; set; } + public virtual int Pruefindex { get; set; } /// >= 1 ... pruefindex public virtual int HydrPruefung { get; set; } - public virtual int WMTypeRevision { get; set; } /// Not mapped to DB !!! public virtual object RawTestInfos { get; set; } /// IList fetched from Oracle at the beginning of the cycle, not mapped to DB !!! public virtual object CompleteTestInfos { get; set; } /// SensusTestInfo[] obtained as a best match at the beginning of the cycle, not mapped to DB !!! #endif - public virtual int ProcessId { get; set; } /// Not mapped to DB !!! Tracing DB Process ID + public virtual int ProcessId { get; set; } /// Not mapped to DB !!! Tracing DB Process ID public virtual int SessionId { get; set; } /// Not mapped to DB !!! 1 (regular tracing DB session) or 2 (alternative tracing DB session) public virtual bool LastRecordIsNok { get; set; } /// Not mapped to DB !!! Previous record verification result @@ -419,9 +421,13 @@ namespace Results.Entities { MeterTestRslts = new List(); #if ORACLE_DB + AssignedSerialNr = 0; + Prefix = string.Empty; + Suffix = string.Empty; + CompleteSerialNr = string.Empty; + WMTypeRevision = 0; Pruefindex = 1; HydrPruefung = 0; - WMTypeRevision = 0; RawTestInfos = null; CompleteTestInfos = null; #endif @@ -439,7 +445,6 @@ namespace Results.Entities ArchivePath = string.Empty; Remark = string.Empty; #if TURA_SPECIAL - CompleteSerialNr = string.Empty; RadioAddress = string.Empty; ProdUserName = string.Empty; ProdPurchaseOrder = string.Empty; @@ -483,8 +488,6 @@ namespace Results.Entities FWVersion = src.FWVersion; #endif #if TURA_SPECIAL - AssignedSerialNr = src.AssignedSerialNr; - CompleteSerialNr = src.CompleteSerialNr; RadioAddress = src.RadioAddress; PaletteNr = src.PaletteNr; UmkartonNr = src.UmkartonNr; @@ -498,9 +501,13 @@ namespace Results.Entities ProdQ2CorrLR = src.ProdQ2CorrLR; #endif #if ORACLE_DB + AssignedSerialNr = src.AssignedSerialNr; + Prefix = src.Prefix; + Suffix = src.Suffix; + CompleteSerialNr = src.CompleteSerialNr; + WMTypeRevision = src.WMTypeRevision; Pruefindex = src.Pruefindex; HydrPruefung = src.HydrPruefung; - WMTypeRevision = src.WMTypeRevision; RawTestInfos = src.RawTestInfos; CompleteTestInfos = src.CompleteTestInfos; #endif @@ -662,8 +669,6 @@ namespace Results.Entities writer.Write((FWVersion != null) ? FWVersion : string.Empty); #endif #if TURA_SPECIAL - writer.Write(AssignedSerialNr); - writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty); writer.Write((RadioAddress != null) ? RadioAddress : string.Empty); writer.Write(PaletteNr); writer.Write(UmkartonNr); @@ -677,9 +682,13 @@ namespace Results.Entities writer.Write(ProdQ2CorrLR); #endif #if ORACLE_DB + writer.Write(AssignedSerialNr); + writer.Write((Prefix != null) ? Prefix : string.Empty); + writer.Write((Suffix != null) ? Suffix : string.Empty); + writer.Write((CompleteSerialNr != null) ? CompleteSerialNr : string.Empty); + writer.Write(WMTypeRevision); writer.Write(Pruefindex); writer.Write(HydrPruefung); - writer.Write(WMTypeRevision); /// Write RawTestInfos IList rawTestInfos = RawTestInfos as IList; @@ -755,8 +764,6 @@ namespace Results.Entities FWVersion = reader.ReadString(); #endif #if TURA_SPECIAL - AssignedSerialNr = reader.ReadInt32(); - CompleteSerialNr = reader.ReadString(); RadioAddress = reader.ReadString(); PaletteNr = reader.ReadInt32(); UmkartonNr = reader.ReadInt32(); @@ -770,9 +777,13 @@ namespace Results.Entities ProdQ2CorrLR = reader.ReadInt32(); #endif #if ORACLE_DB + AssignedSerialNr = reader.ReadInt32(); + Prefix = reader.ReadString(); + Suffix = reader.ReadString(); + CompleteSerialNr = reader.ReadString(); + WMTypeRevision = reader.ReadInt32(); Pruefindex = reader.ReadInt32(); HydrPruefung = reader.ReadInt32(); - WMTypeRevision = reader.ReadInt32(); /// Read RawTestInfos int rawTestInfosCount = reader.ReadInt32(); diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs index 7116921a4..f6af4fa25 100644 --- a/Results/Mappings/WaterMeterMap.cs +++ b/Results/Mappings/WaterMeterMap.cs @@ -43,8 +43,6 @@ namespace Results.Mappings Map(x => x.FWVersion); #endif #if TURA_SPECIAL - Map(x => x.AssignedSerialNr); - Map(x => x.CompleteSerialNr); Map(x => x.RadioAddress); Map(x => x.PaletteNr); Map(x => x.UmkartonNr); @@ -58,8 +56,13 @@ namespace Results.Mappings Map(x => x.ProdQ2CorrLR); #endif #if ORACLE_DB + Map(x => x.AssignedSerialNr); + Map(x => x.Prefix); + Map(x => x.Suffix); + Map(x => x.CompleteSerialNr); Map(x => x.Pruefindex); Map(x => x.HydrPruefung); + Map(x => x.WMTypeRevision); #endif References(x => x.WaterMeterData); References(x => x.Batch);