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

Output.DB.SensusOracle cleaned up : CheckBarcodeScanningOp removed, ver. 2.18.1161

Browse Source
This commit is contained in:
Milan Hanajik
2019-03-08 07:24:51 +01:00
parent 2e76d595c0
commit 5f6c1fe70a
3 changed files with 21 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Output/DB/SensusOracle/Database.cs
+11 -76
View File
@@ -31,9 +31,8 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
enum CurrentOp
{
None,
CheckBarcodeScanning,
WriteResults,
ReadStartInfo,
WriteResults,
}
CurrentOp currentOp;
bool opCompleted;
@@ -258,18 +257,6 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
}
}
public IOperation CheckBarcodeScanningOp(GenericDevices.IRegisterReader[] iperlHeads)
{
if (currentOp != CurrentOp.None)
{
throw new Exception("Sequence error");
}
currentOp = CurrentOp.CheckBarcodeScanning;
this.iperlHeads = iperlHeads;
return this;
}
/// <summary>Start this operation</summary>
public void Start()
@@ -286,13 +273,15 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
{
if (!opCompleted)
{
if ( waterMeters.Length == 0) return Event.ResultsWritten;
#if ORACLE_DB
if (waterMeters.Length == 0) return Event.ResultsWritten;
if ((dbCfg.DebugLevel == DebugMode.Normal) && (connection != null))
{
log.WarnFormat("{0} : Run() : currentOp = {1}", Name, currentOp);
#if ORACLE_DB
if (ReadStartInfoFromDB(connection) == Retv.Error) anyError = true;
}
#endif
}
opCompleted = true;
}
@@ -303,32 +292,19 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
if (!opCompleted)
{
if (batch.WaterMeters.Count == 0) return Event.ResultsWritten;
#if ORACLE_DB
if ((dbCfg.DebugLevel == DebugMode.Normal) && (connection != null))
{
log.WarnFormat("{0} : Run() : currentOp = {1}", Name, currentOp);
#if ORACLE_DB
if (WriteResultsToDB(connection, batch, false) == Retv.Error) anyError = true;
}
#endif
}
opCompleted = true;
}
return anyError ? Event.ResultsNotWritten : Event.ResultsWritten;
}
else if (currentOp == CurrentOp.CheckBarcodeScanning)
{
if (!opCompleted)
{
#if ORACLE_DB
if ((dbCfg.DebugLevel == DebugMode.Normal) && (connection != null))
{
if (CheckBarcodeScanning(connection, iperlHeads) == Retv.Error) anyError = true; ;
}
#endif
opCompleted = true;
}
return anyError ? Event.CheckNotDone : Event.CheckDone;
}
else
{
return Event.None;
@@ -341,49 +317,8 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
currentOp = CurrentOp.None;
}
#if ORACLE_DB
public Retv CheckBarcodeScanning(OracleConnection conn, GenericDevices.IRegisterReader[] iPerlHeads)
{
try
{
conn.Open(); /// Open the Oracle database
foreach (var rr in iPerlHeads)
{
//WaterMeters.iPerl.WaterMeter iPerlHead = rr as WaterMeters.iPerl.WaterMeter;
//if (iPerlHead != null)
//{
// OracleCommand cmd = new OracleCommand("select * from IP_ENDTEST_PD where PCBNUMBER = :1 and TESTSTATIONNAME = :2", conn);
// OracleParameter param;
// param = new OracleParameter("PCBNUMBER", OracleDbType.Varchar2); param.Value = iPerlHead.SerialNr; cmd.Parameters.Add(param);
// param = new OracleParameter("TESTSTATIONNAME", OracleDbType.Varchar2); param.Value = "STAWL001"; cmd.Parameters.Add(param);
// bool exists = false; /// true = RF_Power record exists
// OracleDataReader dr1 = cmd.ExecuteReader();
// if (dr1.Read()) { exists = true; }
// dr1.Close();
// if (!exists)
// {
// iPerlHead.CommFailed = true;
// }
//}
}
}
catch (Exception exc)
{
log.ErrorFormat("Barcode scanning records were not checked: {1}", exc.Message);
conn.Close();
return Retv.Error;
}
conn.Close();
return Retv.OK;
}
public Retv ReadStartInfoFromDB(OracleConnection conn)
{
bool anyError = false;
TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfgCtrl.cs
+8 -20
View File
@@ -8,7 +8,7 @@ using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.SensusOracle
{
public partial class DatabaseCfgCtrl : UserControl, IComponentCfgCtrl
public partial class DatabaseCfgCtrl : Configs.ConfigCtrlUtils, IComponentCfgCtrl
{
public bool ShowMore { get { return false; } }
@@ -100,21 +100,21 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
if (config.Name != nameTextBox.Text)
{
config.Name = nameTextBox.Text;
flags = CfgUpdateFlags.RestartRqrd;
flags |= CfgUpdateFlags.RestartRqrd;
}
int benchId = int.Parse(benchIdTextBox.Text);
if (config.TestBenchId != benchId)
{
config.TestBenchId = benchId;
flags = CfgUpdateFlags.RestartRqrd;
flags |= CfgUpdateFlags.RestartRqrd;
}
int baujahr = int.Parse(baujahrTextBox.Text);
if (config.Baujahr != baujahr)
{
config.Baujahr = baujahr;
flags = CfgUpdateFlags.RestartRqrd;
flags |= CfgUpdateFlags.RestartRqrd;
}
for (int i = 0; i < (int)DBUsed.Count; i++)
@@ -122,26 +122,14 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
if (((DBUsed)i).ToString().Equals(dbUsedComboBox.Text) && (config.DBUsed != (DBUsed)i))
{
config.DBUsed = (DBUsed)i;
flags = CfgUpdateFlags.RestartRqrd;
flags |= CfgUpdateFlags.RestartRqrd;
break;
}
}
if (readStartInfoCheckBox.Checked != config.ReadStartInfo)
{
config.ReadStartInfo = readStartInfoCheckBox.Checked;
flags = CfgUpdateFlags.RestartRqrd;
}
if (saveResultsCheckBox.Checked != config.SaveResults)
{
config.SaveResults = saveResultsCheckBox.Checked;
flags = CfgUpdateFlags.RestartRqrd;
}
if (startInfoIsRequiredCheckBox.Checked != config.StartInfoIsRequired)
{
config.StartInfoIsRequired = startInfoIsRequiredCheckBox.Checked;
flags = CfgUpdateFlags.RestartRqrd;
}
flags |= UpdateDifferent(ref config.ReadStartInfo, readStartInfoCheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
flags |= UpdateDifferent(ref config.SaveResults, saveResultsCheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
flags |= UpdateDifferent(ref config.StartInfoIsRequired, startInfoIsRequiredCheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
return flags;
}