From f5642a2676c67f51e8aee33f44d27d344805d06b Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 8 Jan 2016 10:23:36 +0100 Subject: [PATCH] OracleDB modified for new Results, other changes and fixes, version 2.1.172. --- Config/Properties/AssemblyInfo.cs | 4 +- Results/Entities/WaterMeter.cs | 2 + Results/Mappings/WaterMeterMap.cs | 4 +- Results/Properties/AssemblyInfo.cs | 4 +- Results/Results.csproj | 2 +- ResultsBrowser/Properties/AssemblyInfo.cs | 4 +- .../BenchControl/DB/SensusOracle/Database.cs | 463 ++++++++---------- .../DataEntry/Standard24/EntryForm.cs | 2 +- .../BenchControl/DataEntry/iPerl/EntryForm.cs | 29 +- .../ResultsWriters/Basic/Writer.cs | 20 +- .../BenchControl/Sequences/MainSeq.cs | 2 +- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +- 12 files changed, 256 insertions(+), 284 deletions(-) diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs index 6eef8eb14..572280b8d 100644 --- a/Config/Properties/AssemblyInfo.cs +++ b/Config/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.171.0")] -[assembly: AssemblyFileVersion("2.1.171.0")] +[assembly: AssemblyVersion("2.1.172.0")] +[assembly: AssemblyFileVersion("2.1.172.0")] diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index cefb83876..5460d0e7c 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -22,8 +22,10 @@ namespace Results.Entities #if IPERLST public virtual double OrigCalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!! public virtual double CalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!! + public virtual double Q2ErrWOCorrection { get; set; } public virtual bool Q2CorrectionDone { get; set; } /// true = iPerl Q2 correction was done public virtual double Q2Correction { get; set; } /// iPerl Q2 correction used during the test - Not mapped to DB !!! + public virtual int Q2CorrFlowRight { get; set; } /// 1 = right to left #endif public virtual WaterMeterData WaterMeterData { get; set; } public virtual Batch Batch { get; set; } diff --git a/Results/Mappings/WaterMeterMap.cs b/Results/Mappings/WaterMeterMap.cs index f544a9567..5a9230b08 100644 --- a/Results/Mappings/WaterMeterMap.cs +++ b/Results/Mappings/WaterMeterMap.cs @@ -24,8 +24,10 @@ namespace Results.Mappings #if IPERLST Map(x => x.OrigCalibFactor); Map(x => x.CalibFactor); - Map(x =? x.Q2CorrectionDone); + Map(x => x.Q2ErrWOCorrection); + Map(x => x.Q2CorrectionDone); Map(x => x.Q2Correction); + Map(x => x.Q2CorrFlowRight); #endif References(x => x.WaterMeterData); References(x => x.Batch); diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 0024818cc..913078b0d 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.171.0")] -[assembly: AssemblyFileVersion("2.1.171.0")] +[assembly: AssemblyVersion("2.1.172.0")] +[assembly: AssemblyFileVersion("2.1.172.0")] diff --git a/Results/Results.csproj b/Results/Results.csproj index 87a97eba0..962ff2198 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;MUNICH prompt 4 x86 diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index ca95f9111..321c5c30d 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.171.0")] -[assembly: AssemblyFileVersion("2.1.171.0")] +[assembly: AssemblyVersion("2.1.172.0")] +[assembly: AssemblyFileVersion("2.1.172.0")] diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs index 48827b379..668ec40cc 100644 --- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs +++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs @@ -13,7 +13,7 @@ using TBF.Resources; namespace TBF.BenchControl.DB.SensusOracle { - enum Retv + public enum Retv { OK, Error, @@ -56,21 +56,11 @@ namespace TBF.BenchControl.DB.SensusOracle switch (cfg.Separator) { default: - case Separator.None: - separatorStr = string.Empty; - break; - case Separator.Space: - separatorStr = " "; - break; - case Separator.Tabulator: - separatorStr = "\t"; - break; - case Separator.Comma: - separatorStr = ","; - break; - case Separator.Semicolon: - separatorStr = ";"; - break; + case Separator.None: separatorStr = string.Empty; break; + case Separator.Space: separatorStr = " "; break; + case Separator.Tabulator: separatorStr = "\t"; break; + case Separator.Comma: separatorStr = ","; break; + case Separator.Semicolon: separatorStr = ";"; break; } log.Debug(this.ToString()); @@ -217,10 +207,13 @@ namespace TBF.BenchControl.DB.SensusOracle /// Event.ResultsWritten or Event.Error public Event Run() { - bool anyError = false; - if (WriteResultsToDisk() == Retv.Error) anyError = true; - if (WriteResultsToDatabase() == Retv.Error) anyError = true; + if (batch.WaterMeters.Count == 0) return Event.ResultsWritten; + bool anyError = false; + if (WriteResultsToDisk(batch) == Retv.Error) anyError = true; +#if IPERLST + if (WriteResultsToDatabase(batch) == Retv.Error) anyError = true; +#endif if (anyError) { return Event.Error; @@ -237,7 +230,7 @@ namespace TBF.BenchControl.DB.SensusOracle } - Retv WriteResultsToDisk() + public Retv WriteResultsToDisk(Results.Entities.Batch batch) { if (writer == null) return Retv.Error; @@ -293,7 +286,7 @@ namespace TBF.BenchControl.DB.SensusOracle ///-------- /// Body ///-------- - foreach (var wm in batch.WaterMeters) WriteWM(wm); + foreach (var wMtr in batch.WaterMeters) WriteWM(wMtr); /// Close the file writer.Close(); @@ -444,37 +437,35 @@ namespace TBF.BenchControl.DB.SensusOracle } - Retv WriteResultsToDatabase() +#if IPERLST + public Retv WriteResultsToDatabase(Results.Entities.Batch batch) { - batchDataSaved = false; + conn.Open(); /// Open the Oracle database + + OracleTransaction transaction = conn.BeginTransaction(); + try + { + SaveBatchData(batch); - if (!combined) + foreach (var wMtr in batch.WaterMeters) + { + SaveSingleWM2DB(wMtr); + } + + transaction.Commit(); + } + catch (Exception exc) { - try - { - /// Open the Oracle database - conn.Open(); + transaction.Rollback(); - for (int wmNr = 0; wmNr < Config.Data.WMsCount; wmNr++) /// wmNr is 0-based - { - WaterMeters.iPerl.WaterMeter wMtr = (waterMeters != null && waterMeters.Count > wmNr) ? waterMeters[wmNr] as WaterMeters.iPerl.WaterMeter : null; - if (!unsortedResults[0].Meters[wmNr].Disabled && wMtr != null) - { - IList results = Utils.GetSortedTestResults(procedure, unsortedResults, Utils.PartNr(wmNr + 1, combined)); - SaveSingleWM2DB(wmNr, wMtr, results); - } - } + log.ErrorFormat("Results of batch {0} not writen to ORACLE database: {1}", + batch.BatchNr, exc.Message); - /// Close the Oracle database - conn.Close(); - } - catch (Exception exc) - { - log.ErrorFormat("Results not writen to ORACLE database: {0}", exc.Message); - return Retv.Error; - } + conn.Close(); + return Retv.Error; } + conn.Close(); return Retv.OK; } @@ -484,13 +475,10 @@ namespace TBF.BenchControl.DB.SensusOracle /// /// 0-based water meter number /// Sorted list of results to save - void SaveSingleWM2DB(int wmNr, WaterMeters.iPerl.WaterMeter wMtr, IList results) + void SaveSingleWM2DB(Results.Entities.WaterMeter wm) { - if (string.IsNullOrEmpty(unsortedResults[0].Meters[wmNr].SerialNr)) return; /// No database activity possible w/o PCB number + if (string.IsNullOrEmpty(wm.SerialNr)) return; /// No database activity possible w/o PCB number - - string pcbNr = unsortedResults[0].Meters[wmNr].SerialNr; - /// /// Read a list of all prufindexes for a given PCB Number /// @@ -498,7 +486,7 @@ namespace TBF.BenchControl.DB.SensusOracle { OracleParameter parm = new OracleParameter(); parm.OracleDbType = OracleDbType.Varchar2; - parm.Value = pcbNr; + parm.Value = wm.SerialNr; OracleCommand cmd1 = new OracleCommand("SELECT MAX_Pruefindex FROM VT_ZAEHLER_PD WHERE VT_Fernum = :1 AND ANBID = 4", conn); cmd1.Parameters.Add(parm); @@ -522,231 +510,194 @@ namespace TBF.BenchControl.DB.SensusOracle int MAX_Pruefindex = 100 * dbCfg.TestBenchId + maxpruefindexLowPart + 1; - bool passed = true; - int Sekundaere_Adr; int Hydr_Pruefung; - - foreach (var r in results) - { - if (!r.DoNotEvaluate && !r.Meters[wmNr].Passed) passed = false; - } - - if (!passed) - { - /// Failed - Sekundaere_Adr = 0; - Hydr_Pruefung = 97; /// Hydr. test failed, Pressure test passed - } - else + if (wm.Passed) { /// Passed - Sekundaere_Adr = 1; if (maxpruefindexLowPart == 0) Hydr_Pruefung = 96; else Hydr_Pruefung = 224; } - - string pOrder = string.IsNullOrEmpty(unsortedResults[0].PurchaseOrder) ? string.Empty : unsortedResults[0].PurchaseOrder; - - if (MAX_Pruefindex % 100 == 1) - { - OracleCommand cmd = new OracleCommand("INSERT INTO VT_ZAEHLER_PD(Auftragsnummer, VT_Identnummer, VT_Fernum, Max_Pruefindex, Zaehlernummer, Sekundaere_Adr, Hydr_Pruefung, ID_Benutzer, ANBID, Baujahr) VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10)", conn); - - OracleParameter parm; - parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = pOrder; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = pcbNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = MAX_Pruefindex; cmd.Parameters.Add(parm); - parm = new OracleParameter("Zaehlernummer", OracleDbType.Int32); parm.Value = -1; cmd.Parameters.Add(parm); - parm = new OracleParameter("Sekundaere_Adr", OracleDbType.Int32); parm.Value = Sekundaere_Adr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = Hydr_Pruefung; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); - parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = dbCfg.Baujahr; cmd.Parameters.Add(parm); - - int rowsUpdated = cmd.ExecuteNonQuery(); - } else { - OracleCommand cmd = new OracleCommand("UPDATE VT_ZAEHLER_PD SET Auftragsnummer = :1, VT_Identnummer = :2, Max_Pruefindex = :3, Hydr_Pruefung= :4, ID_Benutzer= :5, Baujahr= :6 WHERE VT_Fernum = :7 and ANBID = :8", conn); - - OracleParameter parm; - parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = pOrder; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); - parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = MAX_Pruefindex; cmd.Parameters.Add(parm); - parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = Hydr_Pruefung; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); - parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = dbCfg.Baujahr; cmd.Parameters.Add(parm); - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = pcbNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); - - int rowsUpdated = cmd.ExecuteNonQuery(); + /// Failed + Hydr_Pruefung = 97; /// Hydr. test failed, Pressure test passed } - OracleTransaction transaction = conn.BeginTransaction(); - try - { - if (!batchDataSaved) - { - /// - /// Batch data - /// - DateTime start = results[0].TimeStart; - DateTime end = results[0].TimeEnd; - foreach (var rslt in results) - { - if (rslt.TimeStart < start) start = rslt.TimeStart; - if (rslt.TimeEnd > end) end = rslt.TimeEnd; - } - - OracleCommand cmd = new OracleCommand("INSERT INTO VT_PRUEFREIHE_PD(" + - "ANBID, ID_Pruefstand, ID_WzPruefreihe, ID_WZTyp, Rev_WZTyp, Rev_Pruefstand_WZTyp, " + - "StartDatumZeit, EndDatumZeit, Betriebsart, QVzKontakt, " + - "FuellenBegDruck, DruckEvakVorne, DruckEvakHinten, DruckBeiAbpressen, " + - "Druckentwaessern, SpuelDurchflussIst, ProgrammVersion)" + - " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17)", conn); - OracleParameter parm; - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:1 - parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + dbCfg.TestBenchId; cmd.Parameters.Add(parm); ///:2 - parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = results[0].BatchNr; cmd.Parameters.Add(parm); ///:3 - parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = wMtr.WMType_ID; cmd.Parameters.Add(parm); ///:4 - parm = new OracleParameter("Rev_WZTyp", OracleDbType.Int32); parm.Value = wMtr.WMType_Rev; cmd.Parameters.Add(parm); ///:5 - parm = new OracleParameter("Rev_Pruefstand_WZTyp", OracleDbType.Int32); parm.Value = 1; cmd.Parameters.Add(parm); ///:6 - parm = new OracleParameter("StartDatumZeit", OracleDbType.TimeStamp); parm.Value = start; cmd.Parameters.Add(parm); ///:7 - parm = new OracleParameter("EndDatumZeit", OracleDbType.TimeStamp); parm.Value = end; cmd.Parameters.Add(parm); ///:8 - parm = new OracleParameter("Betriebsart", OracleDbType.Varchar2); parm.Value = ""; cmd.Parameters.Add(parm); ///:9 - parm = new OracleParameter("QVzKontakt", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:10 - parm = new OracleParameter("FuellenBegDruck", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:11 - parm = new OracleParameter("DruckEvakVorne", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:12 - parm = new OracleParameter("DruckEvakHinten", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:13 - parm = new OracleParameter("DruckBeiAbpressen", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:14 - parm = new OracleParameter("Druckentwaessern", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:15 - parm = new OracleParameter("SpuelDurchflussIst", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:16 - parm = new OracleParameter("ProgrammVersion", OracleDbType.Varchar2); parm.Value = "TBF v."+Program.Version; cmd.Parameters.Add(parm); ///:17 - - int rowsUpdated = cmd.ExecuteNonQuery(); - - batchDataSaved = true; - } - - { - OracleCommand cmd = new OracleCommand("INSERT INTO VT_ZAEHLER_PINDEX_PD(" + - "VT_Fernum, Pruefindex, ANBID, ID_Pruefstand, ID_WzPruefreihe, Hydr_Pruefung, " + - "ReedKontakt, ReedKontaktOK, ReedKontaktZeit, KorrImprate, FestWertWZ, PtestOK, " + - "Zaehlerstand, WT_Platz_NR, WZgut, ID_Benutzer, AnzahlPruefungen)" + - " VALUES (:1, :2, :3, :4, :5, :6, 0, 0, 0, :7, 0, :8, 0, :9, :10, :11, :12)", conn); - OracleParameter parm; - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = pcbNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = MAX_Pruefindex % 100; cmd.Parameters.Add(parm); - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + dbCfg.TestBenchId; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = results[0].BatchNr; cmd.Parameters.Add(parm); - parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = Hydr_Pruefung; cmd.Parameters.Add(parm); - // ReedKontakt - // ReedKontaktOK - // ReedKontaktZeit - parm = new OracleParameter("KorrImprate", OracleDbType.Double); parm.Value = wMtr.OriginalCalibFactor; cmd.Parameters.Add(parm); - // FestWertWZ - parm = new OracleParameter("PtestOK", OracleDbType.Int32); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); - // Zaehlerstand - parm = new OracleParameter("WT_Platz_NR", OracleDbType.Int32); parm.Value = wmNr + 1; cmd.Parameters.Add(parm); - parm = new OracleParameter("WZgut", OracleDbType.Int32); parm.Value = passed ? 1 : 0; cmd.Parameters.Add(parm); - parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); - parm = new OracleParameter("AnzahlPruefungen", OracleDbType.Int32); parm.Value = 3; cmd.Parameters.Add(parm); - - int rowsUpdated = cmd.ExecuteNonQuery(); - } - - for (int q = 1; q <= 3; q++) - { - string testName = string.Format("Q{0}", q); - double Q_wm = 0; - double Err_wm = 0; - double testTime = 0; - bool wm_Passed = true; - /// - foreach (var rslt in results) - { - if (rslt.TestName.Equals(testName)) - { - testTime = rslt.Meters[wmNr].Time; - if (testTime > 1E-10) Q_wm = 3600.0 * rslt.Meters[wmNr].VolumeMeter / testTime; - Err_wm = rslt.Meters[wmNr].VolumeErrorPct; - wm_Passed = rslt.Meters[wmNr].Passed; - } - } + SaveOrUpdateWM(wm, MAX_Pruefindex, Hydr_Pruefung); + } - int qq = (q == 0) ? -1 : ((q == 3 && dbCfg.DBUsed == DBUsed.Test) ? 5 : q); + /// + /// Save common batch data + /// + /// Batch + int SaveBatchData(Results.Entities.Batch b) + { + OracleCommand cmd = new OracleCommand("INSERT INTO VT_PRUEFREIHE_PD(" + + "ANBID, ID_Pruefstand, ID_WzPruefreihe, ID_WZTyp, Rev_WZTyp, Rev_Pruefstand_WZTyp, " + + "StartDatumZeit, EndDatumZeit, Betriebsart, QVzKontakt, " + + "FuellenBegDruck, DruckEvakVorne, DruckEvakHinten, DruckBeiAbpressen, " + + "Druckentwaessern, SpuelDurchflussIst, ProgrammVersion)" + + " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17)", conn); + OracleParameter parm; + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:1 + parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + b.TestBenchId; cmd.Parameters.Add(parm); ///:2 + parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = b.BatchNr; cmd.Parameters.Add(parm); ///:3 + parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = b.WaterMeters[0].WaterMeterData.WMTypeId; cmd.Parameters.Add(parm); ///:4 + parm = new OracleParameter("Rev_WZTyp", OracleDbType.Int32); parm.Value = b.WaterMeters[0].WaterMeterData.WMTypeRev; cmd.Parameters.Add(parm); ///:5 + parm = new OracleParameter("Rev_Pruefstand_WZTyp", OracleDbType.Int32); parm.Value = 1; cmd.Parameters.Add(parm); ///:6 + parm = new OracleParameter("StartDatumZeit", OracleDbType.TimeStamp); parm.Value = b.StartTime; cmd.Parameters.Add(parm); ///:7 + parm = new OracleParameter("EndDatumZeit", OracleDbType.TimeStamp); parm.Value = b.EndTime; cmd.Parameters.Add(parm); ///:8 + parm = new OracleParameter("Betriebsart", OracleDbType.Varchar2); parm.Value = ""; cmd.Parameters.Add(parm); ///:9 + parm = new OracleParameter("QVzKontakt", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:10 + parm = new OracleParameter("FuellenBegDruck", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:11 + parm = new OracleParameter("DruckEvakVorne", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:12 + parm = new OracleParameter("DruckEvakHinten", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:13 + parm = new OracleParameter("DruckBeiAbpressen", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:14 + parm = new OracleParameter("Druckentwaessern", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:15 + parm = new OracleParameter("SpuelDurchflussIst", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:16 + parm = new OracleParameter("ProgrammVersion", OracleDbType.Varchar2); parm.Value = "TBF v." + b.ProgramVersion; cmd.Parameters.Add(parm); ///:17 - OracleCommand cmd = new OracleCommand("INSERT INTO VT_PRUEFREIHE_IST_PD(" + - "VT_Fernum, Pruefindex, PruefungsNr, ANBID, ID_WZTyp, Rev_WZTyp, Rev_WZPruefpunkt, " + - "Q_WZ, Q_Fehler, Q_Best, NIZ, AnfangZStand, EndZStand, " + - "KorrErrQok, KorrErrQ, KorrQWz, TIZ, Vol_WZ_US, TempMittel_US)" + - " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, 0, 0, 0, :14, 0, 0)", conn); - OracleParameter parm; - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = pcbNr; cmd.Parameters.Add(parm); ///:1 - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = MAX_Pruefindex % 100; cmd.Parameters.Add(parm); ///:2 - parm = new OracleParameter("PruefungsNr", OracleDbType.Int32); parm.Value = qq; cmd.Parameters.Add(parm); ///:3 - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:4 - parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = wMtr.WMType_ID; cmd.Parameters.Add(parm); ///:5 - parm = new OracleParameter("Rev_WZTyp", OracleDbType.Int32); parm.Value = wMtr.WMType_Rev; cmd.Parameters.Add(parm); ///:6 - parm = new OracleParameter("Rev_WZPruefpunkt", OracleDbType.Int32); parm.Value = 1; cmd.Parameters.Add(parm); ///:7 - parm = new OracleParameter("Q_WZ", OracleDbType.Double); parm.Value = Q_wm; cmd.Parameters.Add(parm); ///:8 - parm = new OracleParameter("Q_Fehler", OracleDbType.Double); parm.Value = Err_wm; cmd.Parameters.Add(parm); ///:9 - parm = new OracleParameter("Q_Best", OracleDbType.Int32); parm.Value = wm_Passed ? 1 : 0; cmd.Parameters.Add(parm); ///:10 - parm = new OracleParameter("NIZ", OracleDbType.Int32); parm.Value = 0; cmd.Parameters.Add(parm); ///:11 - parm = new OracleParameter("AnfangZStand", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:12 - parm = new OracleParameter("EndZStand", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:13 - /// KorrErrQok - /// KorrErrQ - /// KorrQWz - parm = new OracleParameter("TIZ", OracleDbType.Double); parm.Value = testTime; cmd.Parameters.Add(parm); - /// Vol_WZ_US - /// TempMittel_US + return cmd.ExecuteNonQuery(); /// Returns nr. of updated rows + } - int rowsUpdated = cmd.ExecuteNonQuery(); - } - { - int Q2CorrFlowRight; - if (wMtr.CalibrationStruct.FlowArrow == WaterMeters.iPerl.FlowArrow.Left) - { - Q2CorrFlowRight = wMtr.PositiveCounting ? 1 : 2; - } - else - { - Q2CorrFlowRight = wMtr.PositiveCounting ? 2 : 1; - } + int SaveOrUpdateWM(Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung) + { + int sekundaere_Adr = wm.Passed ? 1 : 0; - OracleCommand cmd = new OracleCommand("INSERT INTO VT_IP_ZAEHLER_PINDEX_PD(" + - "VT_Fernum, Pruefindex, ANBID, WITHCORRECTION2HZ, CORRECTION2HZ, DIFF2HZ8HZ, " + - "WITHQ2CORRECTION, ERRQ2, Q2CORRECTIONFLOWRIGHT, Q2CORRECTIONLEFT, Q2CORRECTIONRIGHT)" + - " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11)", conn); - OracleParameter parm; - parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = pcbNr; cmd.Parameters.Add(parm); ///:1 - parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = MAX_Pruefindex % 100; cmd.Parameters.Add(parm); ///:2 - parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:3 - parm = new OracleParameter("WITHCORRECTION2HZ", OracleDbType.Int32); parm.Value = 0; cmd.Parameters.Add(parm); ///:4 - parm = new OracleParameter("CORRECTION2HZ", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:5 - parm = new OracleParameter("DIFF2HZ8HZ", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:6 - parm = new OracleParameter("WITHQ2CORRECTION", OracleDbType.Int32); parm.Value = wMtr.Q2CorrectionDone ? 1 : 0; cmd.Parameters.Add(parm); ///:7 - parm = new OracleParameter("ERRQ2", OracleDbType.Double); parm.Value = wMtr.Q2ErrorWOCorrection; cmd.Parameters.Add(parm); ///:8 - parm = new OracleParameter("Q2CORRECTIONFLOWRIGHT", OracleDbType.Int32); parm.Value = Q2CorrFlowRight;/*1=right to left*/ cmd.Parameters.Add(parm); ///:9 - parm = new OracleParameter("Q2CORRECTIONLEFT", OracleDbType.Int32); parm.Value = (int)Math.Round(wMtr.CurrentQ2Correction); cmd.Parameters.Add(parm); ///:10 - parm = new OracleParameter("Q2CORRECTIONRIGHT", OracleDbType.Int32); parm.Value = (int)Math.Round(wMtr.CurrentQ2Correction / 2); cmd.Parameters.Add(parm); ///:11 - - int rowsUpdated = cmd.ExecuteNonQuery(); - } - - transaction.Commit(); - } - catch (Exception exc) + if (max_Pruefindex % 100 == 1) { - log.ErrorFormat("Exception in SaveSingleWM2DB(), data not saved!, pcbNr={0}, msg={1}", pcbNr, exc.Message); - transaction.Rollback(); + OracleCommand cmd = new OracleCommand("INSERT INTO VT_ZAEHLER_PD(Auftragsnummer, VT_Identnummer, VT_Fernum, Max_Pruefindex, Zaehlernummer, Sekundaere_Adr, Hydr_Pruefung, ID_Benutzer, ANBID, Baujahr) VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10)", conn); + + OracleParameter parm; + parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = wm.PurchaseOrder; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); + parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); + parm = new OracleParameter("Zaehlernummer", OracleDbType.Int32); parm.Value = -1; cmd.Parameters.Add(parm); + parm = new OracleParameter("Sekundaere_Adr", OracleDbType.Int32); parm.Value = sekundaere_Adr; cmd.Parameters.Add(parm); + parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); + parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); + parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = dbCfg.Baujahr; cmd.Parameters.Add(parm); + + cmd.ExecuteNonQuery(); + } + else + { + OracleCommand cmd = new OracleCommand("UPDATE VT_ZAEHLER_PD SET Auftragsnummer = :1, VT_Identnummer = :2, Max_Pruefindex = :3, Hydr_Pruefung= :4, ID_Benutzer= :5, Baujahr= :6 WHERE VT_Fernum = :7 and ANBID = :8", conn); + + OracleParameter parm; + parm = new OracleParameter("Auftragsnummer", OracleDbType.Varchar2); parm.Value = wm.PurchaseOrder; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm); + parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm); + parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); + parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); + parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = dbCfg.Baujahr; cmd.Parameters.Add(parm); + parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); + + cmd.ExecuteNonQuery(); + } + + { + OracleCommand cmd = new OracleCommand("INSERT INTO VT_ZAEHLER_PINDEX_PD(" + + "VT_Fernum, Pruefindex, ANBID, ID_Pruefstand, ID_WzPruefreihe, Hydr_Pruefung, " + + "ReedKontakt, ReedKontaktOK, ReedKontaktZeit, KorrImprate, FestWertWZ, PtestOK, " + + "Zaehlerstand, WT_Platz_NR, WZgut, ID_Benutzer, AnzahlPruefungen)" + + " VALUES (:1, :2, :3, :4, :5, :6, 0, 0, 0, :7, 0, :8, 0, :9, :10, :11, :12)", conn); + OracleParameter parm; + parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); + parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex % 100; cmd.Parameters.Add(parm); + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); + parm = new OracleParameter("ID_Pruefstand", OracleDbType.Int32); parm.Value = 18000 + wm.Batch.TestBenchId; cmd.Parameters.Add(parm); + parm = new OracleParameter("ID_WzPruefreihe", OracleDbType.Int32); parm.Value = wm.Batch.BatchNr; cmd.Parameters.Add(parm); + parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm); + // ReedKontakt + // ReedKontaktOK + // ReedKontaktZeit + parm = new OracleParameter("KorrImprate", OracleDbType.Double); parm.Value = wm.OrigCalibFactor; cmd.Parameters.Add(parm); + // FestWertWZ + parm = new OracleParameter("PtestOK", OracleDbType.Int32); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); + // Zaehlerstand + parm = new OracleParameter("WT_Platz_NR", OracleDbType.Int32); parm.Value = wm.WMPosition; cmd.Parameters.Add(parm); + parm = new OracleParameter("WZgut", OracleDbType.Int32); parm.Value = wm.Passed ? 1 : 0; cmd.Parameters.Add(parm); + parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm); + parm = new OracleParameter("AnzahlPruefungen", OracleDbType.Int32); parm.Value = 3; cmd.Parameters.Add(parm); + + cmd.ExecuteNonQuery(); + } + + for (int q = 1; q <= 3; q++) + { + Results.Entities.MeterTestRslt mtr = wm.GetMeterTestRslt(string.Format("Q{0}", q)); + SaveMeterTestResult(mtr, q, max_Pruefindex); + } + + { + OracleCommand cmd = new OracleCommand("INSERT INTO VT_IP_ZAEHLER_PINDEX_PD(" + + "VT_Fernum, Pruefindex, ANBID, WITHCORRECTION2HZ, CORRECTION2HZ, DIFF2HZ8HZ, " + + "WITHQ2CORRECTION, ERRQ2, Q2CORRECTIONFLOWRIGHT, Q2CORRECTIONLEFT, Q2CORRECTIONRIGHT)" + + " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11)", conn); + OracleParameter parm; + parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm); ///:1 + parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex % 100; cmd.Parameters.Add(parm); ///:2 + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:3 + parm = new OracleParameter("WITHCORRECTION2HZ", OracleDbType.Int32); parm.Value = 0; cmd.Parameters.Add(parm); ///:4 + parm = new OracleParameter("CORRECTION2HZ", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:5 + parm = new OracleParameter("DIFF2HZ8HZ", OracleDbType.Double); parm.Value = 0; cmd.Parameters.Add(parm); ///:6 + parm = new OracleParameter("WITHQ2CORRECTION", OracleDbType.Int32); parm.Value = wm.Q2CorrectionDone ? 1 : 0; cmd.Parameters.Add(parm); ///:7 + parm = new OracleParameter("ERRQ2", OracleDbType.Double); parm.Value = wm.Q2ErrWOCorrection; cmd.Parameters.Add(parm); ///:8 + parm = new OracleParameter("Q2CORRECTIONFLOWRIGHT", OracleDbType.Int32);parm.Value = Q2CorrFlowRight;/*1=right to left*/ cmd.Parameters.Add(parm); ///:9 + parm = new OracleParameter("Q2CORRECTIONLEFT", OracleDbType.Int32); parm.Value = (int)Math.Round(wm.Q2Correction); cmd.Parameters.Add(parm); ///:10 + parm = new OracleParameter("Q2CORRECTIONRIGHT", OracleDbType.Int32); parm.Value = (int)Math.Round(wm.Q2Correction / 2); cmd.Parameters.Add(parm); ///:11 + + int rowsUpdated = cmd.ExecuteNonQuery(); } } + + + /// + /// Saves a water meter result of a single test + /// + /// q = 0, 1, 2 or 3 (Adj., Q1, Q2, Q3) + /// Nr. of rows updated + int SaveMeterTestResult(Results.Entities.MeterTestRslt mtr, int q, int max_Pruefindex) /// + { + double Q_wm = 3600.0 * mtr.VolumeMeter / mtr.TestTime; /// in [l/hour] + int qq = (q == 0) ? -1 : ((q == 3 && dbCfg.DBUsed == DBUsed.Test) ? 5 : q); + + OracleCommand cmd = new OracleCommand("INSERT INTO VT_PRUEFREIHE_IST_PD(" + + "VT_Fernum, Pruefindex, PruefungsNr, ANBID, ID_WZTyp, Rev_WZTyp, Rev_WZPruefpunkt, " + + "Q_WZ, Q_Fehler, Q_Best, NIZ, AnfangZStand, EndZStand, " + + "KorrErrQok, KorrErrQ, KorrQWz, TIZ, Vol_WZ_US, TempMittel_US)" + + " VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, 0, 0, 0, :14, 0, 0)", conn); + OracleParameter parm; + parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = mtr.WaterMeter.SerialNr; cmd.Parameters.Add(parm); ///:1 + parm = new OracleParameter("Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex % 100; cmd.Parameters.Add(parm); ///:2 + parm = new OracleParameter("PruefungsNr", OracleDbType.Int32); parm.Value = qq; cmd.Parameters.Add(parm); ///:3 + parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm); ///:4 + parm = new OracleParameter("ID_WZTyp", OracleDbType.Int32); parm.Value = mtr.WaterMeter.WaterMeterData.WMTypeId; cmd.Parameters.Add(parm); ///:5 + parm = new OracleParameter("Rev_WZTyp", OracleDbType.Int32); parm.Value = mtr.WaterMeter.WaterMeterData.WMTypeRev; cmd.Parameters.Add(parm); ///:6 + parm = new OracleParameter("Rev_WZPruefpunkt", OracleDbType.Int32); parm.Value = 1; cmd.Parameters.Add(parm); ///:7 + parm = new OracleParameter("Q_WZ", OracleDbType.Double); parm.Value = Q_wm; cmd.Parameters.Add(parm); ///:8 + parm = new OracleParameter("Q_Fehler", OracleDbType.Double); parm.Value = mtr.Error; cmd.Parameters.Add(parm); ///:9 + parm = new OracleParameter("Q_Best", OracleDbType.Int32); parm.Value = mtr.Passed ? 1 : 0; cmd.Parameters.Add(parm); ///:10 + parm = new OracleParameter("NIZ", OracleDbType.Int32); parm.Value = 0; cmd.Parameters.Add(parm); ///:11 + parm = new OracleParameter("AnfangZStand", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:12 + parm = new OracleParameter("EndZStand", OracleDbType.Double); parm.Value = 0;/*TODO*/ cmd.Parameters.Add(parm); ///:13 + /// KorrErrQok + /// KorrErrQ + /// KorrQWz + parm = new OracleParameter("TIZ", OracleDbType.Double); parm.Value = mtr.TestTime; cmd.Parameters.Add(parm); + /// Vol_WZ_US + /// TempMittel_US + + return cmd.ExecuteNonQuery(); + } +#endif } } diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs index 4548f8add..c8f1d9977 100644 --- a/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs @@ -201,7 +201,7 @@ namespace TBF.BenchControl.DataEntry.Standard24 else if (currentOp == CurrentOp.ShowFormAtCycleEnd) { CycleEndForm dlg = (modelessDlg as CycleEndForm); - int count = waterMeters.Count; + int count = waterMeters.Length; if ((dlg != null) && (count > dlg.WaterMetersCount)) count = dlg.WaterMetersCount; for (int i = 0; i < count; i++) diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs index f811706df..04cd2a203 100644 --- a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs +++ b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs @@ -225,7 +225,34 @@ namespace TBF.BenchControl.DataEntry.iPerl { foreach (var wm in batchResults.WaterMeters) { - if (wm != null) wm.PurchaseOrder = PurchaseOrder; + if (wm != null && !wm.Disabled) + { + wm.PurchaseOrder = PurchaseOrder; + + if (Sequences.SequenceBase.WaterMeters != null && + Sequences.SequenceBase.WaterMeters.Count > wm.WMPosition) + { + WaterMeters.iPerl.WaterMeter iPerl = Sequences.SequenceBase.WaterMeters[wm.WMPosition] as WaterMeters.iPerl.WaterMeter; + if (iPerl != null) + { +#if IPERLST + wm.OrigCalibFactor = iPerl.OriginalCalibFactor; + wm.CalibFactor = iPerl.CalibrationFactor; + wm.Q2ErrWOCorrection = iPerl.Q2ErrorWOCorrection; + wm.Q2CorrectionDone = iPerl.Q2CorrectionDone; + wm.Q2Correction = iPerl.CurrentQ2Correction; + if (iPerl.CalibrationStruct.FlowArrow == WaterMeters.iPerl.FlowArrow.Left) + { + wm.Q2CorrFlowRight = iPerl.PositiveCounting ? 1 : 2; + } + else + { + wm.Q2CorrFlowRight = iPerl.PositiveCounting ? 2 : 1; + } +#endif + } + } + } } } } diff --git a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs index 33a5a9bc4..fe39f3f82 100644 --- a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs +++ b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs @@ -42,21 +42,11 @@ namespace TBF.BenchControl.ResultsWriters.Basic switch (cfg.Separator) { default: - case Separator.None: - separatorStr = string.Empty; - break; - case Separator.Space: - separatorStr = " "; - break; - case Separator.Tabulator: - separatorStr = "\t"; - break; - case Separator.Comma: - separatorStr = ","; - break; - case Separator.Semicolon: - separatorStr = ";"; - break; + case Separator.None: separatorStr = string.Empty; break; + case Separator.Space: separatorStr = " "; break; + case Separator.Tabulator: separatorStr = "\t"; break; + case Separator.Comma: separatorStr = ","; break; + case Separator.Semicolon: separatorStr = ";"; break; } log.Debug(this.ToString()); diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index 2e1ac27cd..ea5c9d448 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -635,7 +635,7 @@ namespace TBF.BenchControl.Sequences { protocolTitle = (dataEntryCmpnt as IHasProtocolTitle).ProtocolTitle; } - + dataEntryCmpnt.UpdateTestResults(BatchRslts); } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 05c167f85..299ce203c 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.1.171.1")] -[assembly: AssemblyFileVersion("2.1.171.1")] +[assembly: AssemblyVersion("2.1.172.1")] +[assembly: AssemblyFileVersion("2.1.172.1")]