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

SensusTestInfo : LogType.JustA0_Q3Q2Q1 added, GetBestMatch( ) modified

Browse Source
This commit is contained in:
Milan Hanajik
2022-02-23 16:20:07 +01:00
parent 75c97d99e8
commit 8ef21b3831
3 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Output/DB/SensusOracle/Database.cs
+12 -6
View File
@@ -456,9 +456,12 @@ namespace TBF.Rig.Output.DB.SensusOracle
StringBuilder procedureSignatureSB = new StringBuilder();
foreach (var mtr in wm.RegularMeterTestRslts())
{
wmTestNames.Add(mtr.Name());
procedureSignatureSB.Append(mtr.Name());
procedureSignatureSB.Append("~");
if (mtr.Evaluate())
{
wmTestNames.Add(mtr.Name());
procedureSignatureSB.Append(mtr.Name());
procedureSignatureSB.Append("~");
}
}
if (oracleTestInfo == null || (wmTypeId == 0) || (wmTypeId != wm.WaterMeterData.WMTypeId) || (procedureSignature != procedureSignatureSB.ToString()))
@@ -811,9 +814,12 @@ namespace TBF.Rig.Output.DB.SensusOracle
StringBuilder procedureSignatureSB = new StringBuilder();
foreach (var tr in b.RegularTestRslts())
{
wmTestNames.Add(tr.Name());
procedureSignatureSB.Append(tr.Name());
procedureSignatureSB.Append("~");
if (tr.Evaluate())
{
wmTestNames.Add(tr.Name());
procedureSignatureSB.Append(tr.Name());
procedureSignatureSB.Append("~");
}
}
if ((oracleTestInfo == null) || (wmTypeId != b.WaterMeters[0].WaterMeterData.WMTypeId) || (wmTypeRevision == 0) || (procedureSignature != procedureSignatureSB.ToString()))
TBF/Rig/Sequences/MainSeq.cs
+60 -2
View File
@@ -12,7 +12,6 @@ using Config.Entities;
using Results.Entities;
using TBF.Rig.Operations;
using TBF.Rig.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@@ -328,6 +327,64 @@ namespace TBF.Rig.Sequences
/// This is to load Procedure.Tests and test.MoreParams for each test
int a = 0;
foreach (var test in StateMachine.Procedure.Tests) a += test.MoreParams.Count;
#if false
/// Debugging SensusTestInfo.GetBestMatch()
if (selection == Selection.Cycle && OracleDB != null && OracleDB.ProductionDB != null)
{
try
{
OracleDB.ProductionDB.Open();
int wmTypeId = 170;
/// Prepare procedure signature
IList<string> wmTestNames = new List<string>();
StringBuilder procedureSignatureSB = new StringBuilder();
foreach (var tr in BatchRslts.Batch.RegularTestRslts())
{
if (tr.Evaluate())
{
wmTestNames.Add(tr.Name());
procedureSignatureSB.Append(tr.Name());
procedureSignatureSB.Append("~");
}
}
int wmTypeRev = 0;
string wzTypStr;
string metroKlasse;
string zulasszeichen;
string materialNr;
double q3 = 0;
DateTime timeStamp;
string remark;
IList<Results.Output.SensusTestInfo> ti = OracleDB.GetOracleTestInfo(OracleDB.ProductionDB, wmTypeId,
out wmTypeRev, out wzTypStr, out metroKlasse, out zulasszeichen, out materialNr, out q3, out timeStamp, out remark);
if (ti != null)
{
/// All 5 updated together
string procedureSignature = procedureSignatureSB.ToString();
var completeTestInfo = Results.Output.SensusTestInfo.GetBestMatch(ti, wmTestNames);
foreach (var cti in completeTestInfo)
{
log.WarnFormat("Selected test info : ID={0} Rev={1} Test={2} PrfNrDB={3} QBzDB={4} PrfNrOpto={5} QBzOpto={6} PrfNrLog={7} QBzLog={8} Range={9}",
wmTypeId, wmTypeRev, cti.TestName, cti.PruefungsNrDB, cti.QBezeichnungDB, cti.PruefungsNrOpto,
cti.QBezeichnungOpto, cti.PruefungsNrLog, cti.QBezeichnungLog, cti.Range);
}
}
OracleDB.ProductionDB.Close();
}
catch (Exception exc)
{
string msg = exc.Message;
}
}
#endif
}
}
else
@@ -335,8 +392,9 @@ namespace TBF.Rig.Sequences
StateMachine.Procedure = null;
}
}
catch (Exception)
catch (Exception exc)
{
string msg = exc.Message;
StateMachine.Procedure = null;
}
}