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

SensusOracle : Automatic WZ_TYPE_ID assignment and creation OK, ver. 3.1.1815

Browse Source
This commit is contained in:
Milan Hanajik 2021-11-30 06:53:20 +01:00
parent e324de985f
commit cd84c82475
11 changed files with 638 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.1.1814.0")]
[assembly: AssemblyFileVersion("3.1.1814.0")]
[assembly: AssemblyVersion("3.1.1815.0")]
[assembly: AssemblyFileVersion("3.1.1815.0")]

14
TBF/Rig/DataEntry/S620/FormForMechanicalMeters.cs
View File

@ -719,10 +719,11 @@ namespace TBF.Rig.DataEntry.S620
OracleCommand cmd = new OracleCommand("SELECT sollstueck, erste_zaehlernr, prefix, suffix, znrlaenge FROM vt_auftrag_pd" +
" WHERE produktion_anbid=:1 AND status=:2 AND produktion_usestate=:3 AND auftragsnummer=:4", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer }); ///:1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = status }); ///:2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); ///:3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:4
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = Output.DB.SensusOracle.Database.ProducerAnbid }); ///:1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = status }); ///:2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); ///:3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:4
OracleDataReader dr = cmd.ExecuteReader();
while (dr.Read())
@ -750,8 +751,9 @@ namespace TBF.Rig.DataEntry.S620
OracleCommand cmd2 = new OracleCommand("SELECT vt_fernum, zaehlernummer, hydr_pruefung FROM vt_zaehler_pd" +
" WHERE anbid=:1 AND auftragsnummer=:2 ORDER BY zaehlernummer ASC", connection);
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer }); ///:1
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:2
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = Output.DB.SensusOracle.Database.ProducerAnbid }); ///:1
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:2
OracleDataReader dr2 = cmd2.ExecuteReader();
while (dr2.Read())

14
TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs
View File

@ -1229,10 +1229,11 @@ namespace TBF.Rig.DataEntry.S620
OracleCommand cmd = new OracleCommand("SELECT sollstueck, erste_zaehlernr, prefix, suffix, znrlaenge FROM vt_auftrag_pd" +
" WHERE produktion_anbid=:1 AND status=:2 AND produktion_usestate=:3 AND auftragsnummer=:4", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer }); ///:1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = status }); ///:2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); ///:3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:4
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = Output.DB.SensusOracle.Database.ProducerAnbid }); ///:1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = status }); ///:2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); ///:3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:4
OracleDataReader dr = cmd.ExecuteReader();
while (dr.Read())
@ -1260,8 +1261,9 @@ namespace TBF.Rig.DataEntry.S620
OracleCommand cmd2 = new OracleCommand("SELECT vt_fernum, zaehlernummer, hydr_pruefung FROM vt_zaehler_pd" +
" WHERE anbid=:1 AND auftragsnummer=:2 ORDER BY zaehlernummer ASC", connection);
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer }); ///:1
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:2
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = Output.DB.SensusOracle.Database.ProducerAnbid }); ///:1
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = orderNr }); ///:2
OracleDataReader dr2 = cmd2.ExecuteReader();
while (dr2.Read())

575
TBF/Rig/Output/DB/SensusOracle/Database.cs
View File

@ -57,14 +57,15 @@ namespace TBF.Rig.Output.DB.SensusOracle
private static readonly ILog log = LogManager.GetLogger(typeof(Database));
public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
public static int ProducerAnbid;
DatabaseCfg dbCfg;
public int Anbid_Producer { get { return dbCfg.ProducerId; } }
public DBUsed DBUsed { get { return (dbCfg == null || dbCfg.ProcParams == null) ? DBUsed.None : dbCfg.ProcParams.DBUsed; } }
public WMKind WMKind { get { return (dbCfg == null || dbCfg.ProcParams == null) ? WMKind.iPERL : dbCfg.ProcParams.WMKind; } }
public int WMTypeId { get { return (dbCfg == null || dbCfg.ProcParams == null) ? 0 : Math.Max(0, dbCfg.ProcParams.WMTypeId); } } /// >= 0
public bool IsAutoWMType { get { return (dbCfg == null || dbCfg.ProcParams == null) ? false : (dbCfg.ProcParams.WMTypeId == -1); } }
public bool CreateWztypEntryIfMissing { get { return (dbCfg == null || dbCfg.ProcParams == null) ? false : dbCfg.ProcParams.CreateWztypEntryIfMissing; } }
public bool CreateWztypIfMissing { get { return (dbCfg == null || dbCfg.ProcParams == null) ? false : dbCfg.ProcParams.CreateWztypIfMissing; } }
public int YearOfManufacture { get { return (dbCfg == null || dbCfg.ProcParams == null) ? DateTime.Now.Year : dbCfg.ProcParams.YearOfManufacture; } }
public bool SaveResults { get { return (dbCfg == null || dbCfg.ProcParams == null) ? false : dbCfg.ProcParams.SaveResults; } }
public bool ReadStartInfo { get { return (dbCfg == null || dbCfg.ProcParams == null) ? true : dbCfg.ProcParams.ReadStartInfo; } }
@ -135,7 +136,8 @@ namespace TBF.Rig.Output.DB.SensusOracle
: base(cfg)
{
dbCfg = cfg as DatabaseCfg;
}
ProducerAnbid = (dbCfg != null) ? dbCfg.ProducerId : 4;
}
public override void Initialize()
{
@ -163,7 +165,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
string producer = "none";
string plant = "nowhere";
OracleCommand cmd = new OracleCommand("SELECT hersteller, standort FROM anbieter_sd WHERE anbid = :1", ProductionDB);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
OracleDataReader dr = cmd.ExecuteReader();
if (dr.Read())
{
@ -173,7 +175,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
dr.Close();
/// Get VT_WZTYP_SD content
vtWztypSdList = ReadVtWztypSd(SelectedDB);
vtWztypSdList = VtWztypSd.Read(SelectedDB);
SelectedDB.Close();
@ -216,7 +218,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
if (found.ListOfTests == null)
{
found.ListOfTests = ReadVtPruefpunktSollSd(conn, wmTypeId, found.RevWztyp);
found.ListOfTests = VtPruefpunktSollSd.Read(conn, wmTypeId, found.RevWztyp);
}
if (found.ListOfTests == null || found.ListOfTests.Count == 0) return null;
@ -496,7 +498,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
"FROM vt_zaehler_pd " +
"WHERE vt_fernum = :1 AND anbid = :2", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
dr = cmd.ExecuteReader();
if (dr.Read())
{
@ -530,7 +532,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
"FROM vt_zaehler_pindex_pd " +
"WHERE vt_fernum = :1 AND anbid = :2", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
dr = cmd.ExecuteReader();
while (dr.Read())
{
@ -554,7 +556,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
"FROM vt_ip_zaehler_pindex_pd " +
"WHERE vt_fernum = :1 AND anbid = :2", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
dr = cmd.ExecuteReader();
while (dr.Read())
{
@ -578,7 +580,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
"WHERE vt_fernum = :1 AND pruefindex = :2 AND anbid = :3", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 100 * testBenchID + maxPruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
dr = cmd.ExecuteReader();
while (dr.Read())
@ -680,9 +682,10 @@ namespace TBF.Rig.Output.DB.SensusOracle
try
{
VtWztypSd record = GetCompleteTestInfo(conn, batch);
VtWztypSd toBeInserted2vtVtWztypSdList;
VtWztypSd record = GetCompleteTestInfo(conn, batch, out toBeInserted2vtVtWztypSdList);
if (oracleTestInfo == null || completeTestInfo == null || wmTypeId == 0 || wmTypeRevision == 0)
if (record == null && (oracleTestInfo == null || completeTestInfo == null || wmTypeId == 0 || wmTypeRevision == 0))
{
throw new Exception("No matching test infos found");
}
@ -695,16 +698,23 @@ namespace TBF.Rig.Output.DB.SensusOracle
if ((wMtr.ErrorFlags & ((int)ErrorFlagMask.E26 | (int)ErrorFlagMask.E27 | (int)ErrorFlagMask.E28)) == 0)
{
/// No production error => write the result of testing to Oracle DB
SaveIperlToDB(conn, wMtr, safeMode);
SaveIperlToDB(conn, wMtr, record, safeMode);
}
}
else if (wmKind == WMKind.Mechanical)
{
SaveMechanicalMeterToDB(conn, wMtr, safeMode);
SaveMechanicalMeterToDB(conn, wMtr, record, safeMode);
}
}
transaction.Commit();
/// When this point is reached it is certain a new record can be inserted to 'vtWztypSdList'
if (toBeInserted2vtVtWztypSdList != null)
{
vtWztypSdList.Insert(0, toBeInserted2vtVtWztypSdList);
}
conn.Close();
log.ErrorFormat("Results of batch {0} correctly written to ORACLE DB", batch.BatchNr);
return Retv.OK;
@ -732,7 +742,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
{
OracleCommand cmd = new OracleCommand("SELECT pruefindex FROM vt_zaehler_pindex_pd WHERE vt_fernum = :1 AND anbid = :2", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
using (OracleDataReader dr = cmd.ExecuteReader())
{
@ -747,7 +757,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
"WHERE vt_fernum = :1 AND anbid = :2", conn);
/// PCB number Producer ID
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
using (OracleDataReader dr = cmd.ExecuteReader())
{
@ -767,12 +777,20 @@ namespace TBF.Rig.Output.DB.SensusOracle
}
VtWztypSd GetCompleteTestInfo(OracleConnection conn, Results.Entities.Batch b)
/// <summary>
/// Either returns VtWztypSd record (guaranteed that it's written to the DB)
/// or updates SensusTestInfo[] completeTestInfo.
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="b">Batch results</param>
/// <returns>VtWztypSd record</returns>
VtWztypSd GetCompleteTestInfo(OracleConnection conn, Results.Entities.Batch b, out VtWztypSd toBeInserted2vtWztypSdList)
{
if (IsAutoWMType && CreateWztypEntryIfMissing)
toBeInserted2vtWztypSdList = null;
if (IsAutoWMType && CreateWztypIfMissing)
{
int idBenutzer = (Anbid_Producer == 4) ? 6 : 365;
int idBenutzer = (ProducerAnbid== 4) ? 6 : 365;
VtWztypSd recordFromBatch = VtWztypSd.FromBatch(b, idBenutzer);
VtWztypSd existingRecord = vtWztypSdList.FirstOrDefault(x => VtWztypSd.AreEqual(x, recordFromBatch, this, conn));
@ -787,7 +805,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
/// Make record with the same name inactive
OracleCommand cmd = new OracleCommand("UPDATE vt_wztyp_pd SET aktiv=:4 " +
"WHERE anbid=:1 AND id_wztyp=:2 AND rev_wztyp=:3", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid}); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = sameNameRecord.IdWztyp }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = sameNameRecord.RevWztyp }); /// :3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// :4
@ -811,14 +829,40 @@ namespace TBF.Rig.Output.DB.SensusOracle
}
/// Save the new record
WriteVtWztypSd(conn, recordFromBatch);
vtWztypSdList.Insert(0, recordFromBatch);
recordFromBatch.Write(conn);
toBeInserted2vtWztypSdList = recordFromBatch;
new VtPruefstandWztypSd
{
IdPruefstand = dbCfg.TestBenchGroupId + b.TestBenchId,
IdWztyp = recordFromBatch.IdWztyp,
RevPruefstandWztyp = 1,
Bemerkung = recordFromBatch.Wztyp,
IdBenutzer = idBenutzer,
Aenderungsdatum = DateTime.Now,
Aktiv = true,
}.Write(conn);
}
else
{
/// Appropriate record exists
recordFromBatch.IdWztyp = existingRecord.IdWztyp;
recordFromBatch.RevWztyp = existingRecord.RevWztyp;
var list = VtPruefstandWztypSd.Read(conn, dbCfg.TestBenchGroupId + b.TestBenchId, existingRecord.IdWztyp);
if (list == null || list.Count == 0)
{
new VtPruefstandWztypSd
{
IdPruefstand = dbCfg.TestBenchGroupId + b.TestBenchId,
IdWztyp = existingRecord.IdWztyp,
RevPruefstandWztyp = 1,
Bemerkung = recordFromBatch.Wztyp,
IdBenutzer = idBenutzer,
Aenderungsdatum = DateTime.Now,
Aktiv = true,
}.Write(conn);
}
}
return recordFromBatch;
@ -882,11 +926,13 @@ namespace TBF.Rig.Output.DB.SensusOracle
" druckentwaessern, spueldurchflussist, programmversion) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + b.TestBenchId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = b.BatchNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = b.WaterMeters[0].WaterMeterData.WMTypeId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wmTypeRevision });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = (record != null) ? record.IdWztyp : b.WaterMeters[0].WaterMeterData.WMTypeId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = (record != null) ? record.RevWztyp : wmTypeRevision });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 1 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = b.StartTime });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = b.EndTime });
@ -901,11 +947,17 @@ namespace TBF.Rig.Output.DB.SensusOracle
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = string.Format("TBF v.{0}", b.ProgramVersion) });
cmd.ExecuteNonQuery(); /// Returns nr. of updated rows
log.InfoFormat("VT_PRUEFREIHE_PD inserted, BatchNr={0}, TypeId={1}, TypeRev={2}, Start={3}", b.BatchNr, b.WaterMeters[0].WaterMeterData.WMTypeId, wmTypeRevision, b.StartTime);
log.InfoFormat("VT_PRUEFREIHE_PD inserted, BatchNr={0}, TypeId={1}, TypeRev={2}, Start={3}", b.BatchNr,
(record != null) ? record.IdWztyp : b.WaterMeters[0].WaterMeterData.WMTypeId,
(record != null) ? record.RevWztyp : wmTypeRevision,
b.StartTime);
}
else
{
log.WarnFormat("SIM: VT_PRUEFREIHE_PD inserted, BatchNr={0}, TypeId={1}, TypeRev={2}, Start={3}", b.BatchNr, b.WaterMeters[0].WaterMeterData.WMTypeId, wmTypeRevision, b.StartTime);
log.WarnFormat("SIM: VT_PRUEFREIHE_PD inserted, BatchNr={0}, TypeId={1}, TypeRev={2}, Start={3}", b.BatchNr,
(record != null) ? record.IdWztyp : b.WaterMeters[0].WaterMeterData.WMTypeId,
(record != null) ? record.RevWztyp : wmTypeRevision,
b.StartTime);
}
int testsCount = (record != null) ? record.ListOfTests.Count : completeTestInfo.Length;
@ -931,7 +983,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
" beginndruck_hinten, enddruck_vorne, enddruck_hinten, tvwz, ivwz, verwendeter_vz, beginngewicht, endgewicht) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20, :21, :22, :23)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + b.TestBenchId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = b.BatchNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = pruefungsnr });
@ -961,38 +1013,40 @@ namespace TBF.Rig.Output.DB.SensusOracle
" drehzahl, beginndruck_vorne, beginndruck_hinten, enddruck_vorne, enddruck_hinten," +
" tvwz, ivwz, verwendeter_vz, beginngewicht, endgewicht) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20, :21, :22, :23)", conn);
OracleParameter parm;
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); ///:1
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + b.TestBenchId }); ///:2
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = b.BatchNr }); ///:3
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = pruefungsnr }); ///:4
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.l, tr.VolumeCTV) }); ///:5
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.kg, tr.MassEnd - tr.MassStart) }); ///:6
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, tr.FlowMin) }); ///:7
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, tr.FlowMax) }); ///:8
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, Q_ist) }); ///:9
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = tr.ConstMaster }); ///:10
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, tr.FlowVolume) }); ///:11
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = tr.ErrorMaster }); ///:12
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = (double)tr.FlowSetTime }); ///:13
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 /* TODO */ }); ///:14
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressUpStart) }); ///:15
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressDownStart) }); ///:16
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressUpEnd) }); ///:17
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressDownEnd) }); ///:18
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = tr.TestTime }); ///:19
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = tr.PulsesMaster }); ///:20
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 /* TODO */ }); ///:21
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.kg, tr.MassStart) }); ///:22
parm = cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.kg, tr.MassEnd) }); ///:23
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid}); ///:1
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + b.TestBenchId }); ///:2
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = b.BatchNr }); ///:3
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = pruefungsnr }); ///:4
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.l, tr.VolumeCTV) }); ///:5
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.kg, tr.MassEnd - tr.MassStart) }); ///:6
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, tr.FlowMin) }); ///:7
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, tr.FlowMax) }); ///:8
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, Q_ist) }); ///:9
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = tr.ConstMaster }); ///:10
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.lph, tr.FlowVolume) }); ///:11
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = tr.ErrorMaster }); ///:12
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = (double)tr.FlowSetTime }); ///:13
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 /* TODO */ }); ///:14
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressUpStart) }); ///:15
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressDownStart) }); ///:16
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressUpEnd) }); ///:17
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.bar, tr.PressDownEnd) }); ///:18
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = tr.TestTime }); ///:19
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = tr.PulsesMaster }); ///:20
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 /* TODO */ }); ///:21
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.kg, tr.MassStart) }); ///:22
cmd2.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Units.ConvertTo(Unit.kg, tr.MassEnd) }); ///:23
///
cmd2.ExecuteNonQuery(); /// Returns nr. of updated rows
log.InfoFormat("VT_PRUEFDURCHFLUSS_PD inserted ({0}, {1}, {2}, {3}, {4} ...)", Anbid_Producer, dbCfg.TestBenchGroupId + b.TestBenchId, b.BatchNr, pruefungsnr, Q_ist);
log.InfoFormat("VT_PRUEFDURCHFLUSS_PD inserted ({0}, {1}, {2}, {3}, {4} ...)",
ProducerAnbid, dbCfg.TestBenchGroupId + b.TestBenchId, b.BatchNr, pruefungsnr, Q_ist);
#endif
}
else
{
log.WarnFormat("SIM: VT_PRUEFDURCHFLUSS_PD inserted ({0}, {1}, {2}, {3}, {4} ...)", Anbid_Producer, dbCfg.TestBenchGroupId + b.TestBenchId, b.BatchNr, pruefungsnr, Q_ist);
log.WarnFormat("SIM: VT_PRUEFDURCHFLUSS_PD inserted ({0}, {1}, {2}, {3}, {4} ...)",
ProducerAnbid, dbCfg.TestBenchGroupId + b.TestBenchId, b.BatchNr, pruefungsnr, Q_ist);
}
}
}
@ -1006,7 +1060,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
/// </summary>
/// <param name="wmNr">0-based water meter number</param>
/// <param name="results">Sorted list of results to save</param>
void SaveIperlToDB(OracleConnection conn, Results.Entities.WaterMeter wm, bool safeMode)
void SaveIperlToDB(OracleConnection conn, Results.Entities.WaterMeter wm, VtWztypSd record, bool safeMode)
{
if (safeMode && !wm.Passed) return;
@ -1035,13 +1089,13 @@ namespace TBF.Rig.Output.DB.SensusOracle
wm.Pruefindex = MAX_Pruefindex;
wm.HydrPruefung = Hydr_Pruefung;
SaveOrUpdateIperl(conn, wm, MAX_Pruefindex, Hydr_Pruefung);
SaveOrUpdateIperl(conn, wm, MAX_Pruefindex, Hydr_Pruefung, record);
}
void SaveOrUpdateIperl(OracleConnection conn, Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung)
void SaveOrUpdateIperl(OracleConnection conn, Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung, VtWztypSd record)
{
int sekundaere_Adr = wm.Passed ? 1 : 0;
int idBenutzer = (Anbid_Producer == 4) ? 6 : 365; /// TODO: wm.Batch.UserNumber;
int idBenutzer = (ProducerAnbid== 4) ? 6 : 365; /// TODO: wm.Batch.UserNumber;
if (dbCfg.DebugLevel == DebugMode.Normal)
{
@ -1051,12 +1105,12 @@ namespace TBF.Rig.Output.DB.SensusOracle
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.PurchaseOrder });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = "IPBATMXX" });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
int updatedRows = cmd.ExecuteNonQuery();
int insertedRows = 0;
@ -1070,13 +1124,13 @@ namespace TBF.Rig.Output.DB.SensusOracle
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.PurchaseOrder });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = "IPBATMXX" });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = -1 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = sekundaere_Adr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = -1 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = sekundaere_Adr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture });
insertedRows = cmd.ExecuteNonQuery();
@ -1109,11 +1163,11 @@ namespace TBF.Rig.Output.DB.SensusOracle
"VALUES (:1, :2, :3, :4, :5, :6, 0, 0, 0, :7, 0, :8, 0, :9, :10, :11, :12)", conn); /// ReedKontakt = ReedKontaktOK = ReedKontaktZeit = FestWertWZ = Zaehlerstand = 0
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + wm.Batch.TestBenchId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Batch.BatchNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + wm.Batch.TestBenchId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Batch.BatchNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
#if IPERL
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.OrigCalibFactor });
#else
@ -1134,20 +1188,24 @@ namespace TBF.Rig.Output.DB.SensusOracle
}
foreach (var testInfo in completeTestInfo)
int testsCount = (record != null) ? record.ListOfTests.Count : completeTestInfo.Length;
for (int j = 0; j < testsCount; j++)
{
if ((testInfo.PruefungsNrDB != 0) && (-20 <= testInfo.PruefungsNrDB) && (testInfo.PruefungsNrDB <= 20)) /// LU PruefungsNr-s are nonzero and between -20 and 20
int pruefungsnr = (record != null) ? record.ListOfTests[j].Pruefungsnr : completeTestInfo[j].PruefungsNrDB;
string testName = (record != null) ? record.ListOfTests[j].Qbezeichnung : completeTestInfo[j].TestName;
if (pruefungsnr != 0 && -20 <= pruefungsnr && pruefungsnr <= 20) /// LU PruefungsNr-s are nonzero and between -20 and 20
{
Results.Entities.TestData tData = wm.GetTestData(testInfo.TestName);
Results.Entities.TestData tData = wm.GetTestData(testName);
Results.Entities.MeterTestRslt mtr;
if (tData == null)
{
throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo.TestName, wm.WMPosition));
throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testName, wm.WMPosition));
}
else if (tData.Repeats == 1)
{
mtr = wm.GetMeterTestRslt(testInfo.TestName);
if (mtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo.TestName, wm.WMPosition));
mtr = wm.GetMeterTestRslt(testName);
if (mtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testName, wm.WMPosition));
}
else
{
@ -1172,7 +1230,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
mtr.Error = Formulas.ErrorFromVolumes(mtr.VolumeMeter, mtr.VolumeRef);
}
SaveMeterTestResult(conn, mtr, testInfo.PruefungsNrDB, max_Pruefindex, wmTypeRevision);
SaveMeterTestResult(conn, mtr, pruefungsnr, max_Pruefindex, record);
}
}
@ -1188,7 +1246,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Hz2CorrectionDone ? 1 : 0 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.Hz2Correction });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Min(99.0, Math.Max(-99.0, wm.Diff2Hz8Hz)) });
@ -1214,7 +1272,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
/// </summary>
/// <param name="wmNr">0-based water meter number</param>
/// <param name="results">Sorted list of results to save</param>
void SaveMechanicalMeterToDB(OracleConnection conn, Results.Entities.WaterMeter wm, bool safeMode)
void SaveMechanicalMeterToDB(OracleConnection conn, Results.Entities.WaterMeter wm, VtWztypSd record, bool safeMode)
{
if (safeMode && !wm.Passed) return;
@ -1243,12 +1301,12 @@ namespace TBF.Rig.Output.DB.SensusOracle
wm.Pruefindex = MAX_Pruefindex;
wm.HydrPruefung = Hydr_Pruefung;
SaveOrUpdateMechanicalMeter(conn, wm, MAX_Pruefindex, Hydr_Pruefung);
SaveOrUpdateMechanicalMeter(conn, wm, MAX_Pruefindex, Hydr_Pruefung, record);
}
void SaveOrUpdateMechanicalMeter(OracleConnection conn, Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung)
void SaveOrUpdateMechanicalMeter(OracleConnection conn, Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung, VtWztypSd record)
{
int idBenutzer = (Anbid_Producer == 4) ? 6 : 365; /// TODO: wm.Batch.UserNumber;
int idBenutzer = (ProducerAnbid== 4) ? 6 : 365; /// TODO: wm.Batch.UserNumber;
string vt_identnummer = wm.SerialNr.Length > 8 ? wm.SerialNr.Substring(0, 8) : wm.SerialNr;
if (dbCfg.DebugLevel == DebugMode.Normal)
@ -1267,26 +1325,26 @@ namespace TBF.Rig.Output.DB.SensusOracle
"WHERE vt_fernum = :1 AND anbid = :2", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr }); /// 1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// 2
///
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex }); /// 3 max_pruefindex
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid}); /// 2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex }); /// 3 max_pruefindex
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = vt_identnummer }); /// 4 vt_identnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.PurchaseOrder }); /// 5 auftragsnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNrAux }); /// 6 vt_baugruppen_nr = PCB number of 640 meter
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 7 mbus_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 8 liegenschafts_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 9 sekundaere_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung }); /// 10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 7 mbus_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 8 liegenschafts_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 9 sekundaere_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung }); /// 10
//cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = wm.Batch.EndTime });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 13 umkarton_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 14 palette_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 13 umkarton_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 14 palette_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Prefix }); /// 16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Suffix }); /// 17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.CompleteSerialNr }); /// 18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer }); /// 19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer }); /// 19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.OriRadioAddress }); /// 20 albatrosid = original radio address
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.RadioAddress }); /// 21 vt_modul_snr = new radio address
@ -1300,28 +1358,28 @@ namespace TBF.Rig.Output.DB.SensusOracle
" palette_nr, zaehlernummer, prefix, suffix, z_nr_komplett, anbid, id_benutzer, albatrosid, vt_modul_snr) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20, :21, :22)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr }); /// 1 vt_fernum
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex }); /// 2 max_pruefindex
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = vt_identnummer }); /// 3 vt_identnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.PurchaseOrder }); /// 4 auftragsnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNrAux }); /// 5 vt_baugruppen_nr = PCB number of 640 meter
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 6 mbus_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 7 liegenschafts_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 8 sekundaere_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung }); /// 9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = wm.Batch.EndTime }); /// 10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 13 umkarton_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 14 palette_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Prefix }); /// 16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Suffix }); /// 17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.CompleteSerialNr }); /// 18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// 19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer }); /// 20
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.OriRadioAddress }); /// 21 albatrosid = original radio address
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.RadioAddress }); /// 22 vt_modul_snr = new radio address
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr }); /// 1 vt_fernum
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex }); /// 2 max_pruefindex
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = vt_identnummer }); /// 3 vt_identnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.PurchaseOrder }); /// 4 auftragsnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNrAux }); /// 5 vt_baugruppen_nr = PCB number of 640 meter
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 6 mbus_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 7 liegenschafts_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 8 sekundaere_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung }); /// 9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = wm.Batch.EndTime }); /// 10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 13 umkarton_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 14 palette_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Prefix }); /// 16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Suffix }); /// 17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.CompleteSerialNr }); /// 18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid}); /// 19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer }); /// 20
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.OriRadioAddress }); /// 21 albatrosid = original radio address
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.RadioAddress }); /// 22 vt_modul_snr = new radio address
insertedRows = cmd.ExecuteNonQuery();
@ -1353,21 +1411,21 @@ namespace TBF.Rig.Output.DB.SensusOracle
"VALUES (:1, :2, :3, :4, :5, :6, 0, 0, 0, :7, 0, :8, 0, :9, :10, :11, :12)", conn); /// ReedKontakt = ReedKontaktOK = ReedKontaktZeit = FestWertWZ = Zaehlerstand = 0
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + wm.Batch.TestBenchId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Batch.BatchNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid});
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + wm.Batch.TestBenchId });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Batch.BatchNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
#if IPERL
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.OrigCalibFactor });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.OrigCalibFactor });
#else
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = 0 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = 0 });
#endif
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// TODO
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.WMPosition });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Passed ? 1 : 0 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 3 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// TODO
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.WMPosition });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Passed ? 1 : 0 });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 3 });
cmd.ExecuteNonQuery();
log.InfoFormat("VT_ZAEHLER_PINDEX_PD inserted, PcbNr={0}, pos={1}, pruefix={2}", wm.SerialNr, wm.WMPosition, max_Pruefindex % 100);
@ -1378,20 +1436,24 @@ namespace TBF.Rig.Output.DB.SensusOracle
}
foreach (var testInfo in completeTestInfo)
int testsCount = (record != null) ? record.ListOfTests.Count : completeTestInfo.Length;
for (int j = 0; j < testsCount; j++)
{
if ((testInfo.PruefungsNrDB != 0) && (-20 <= testInfo.PruefungsNrDB) && (testInfo.PruefungsNrDB <= 20)) /// LU PruefungsNr-s are nonzero and between -20 and 20
int pruefungsnr = (record != null) ? record.ListOfTests[j].Pruefungsnr : completeTestInfo[j].PruefungsNrDB;
string testName = (record != null) ? record.ListOfTests[j].Qbezeichnung : completeTestInfo[j].TestName;
if (pruefungsnr != 0 && -20 <= pruefungsnr && pruefungsnr <= 20) /// LU PruefungsNr-s are nonzero and between -20 and 20
{
Results.Entities.TestData tData = wm.GetTestData(testInfo.TestName);
Results.Entities.TestData tData = wm.GetTestData(testName);
Results.Entities.MeterTestRslt mtr;
if (tData == null)
{
throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo.TestName, wm.WMPosition));
throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testName, wm.WMPosition));
}
else if (tData.Repeats == 1)
{
mtr = wm.GetMeterTestRslt(testInfo.TestName);
if (mtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testInfo.TestName, wm.WMPosition));
mtr = wm.GetMeterTestRslt(testName);
if (mtr == null) throw new Exception(string.Format("'{0}' test results missing, watermeter {1}", testName, wm.WMPosition));
}
else
{
@ -1416,7 +1478,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
mtr.Error = Formulas.ErrorFromVolumes(mtr.VolumeMeter, mtr.VolumeRef);
}
SaveMeterTestResult(conn, mtr, testInfo.PruefungsNrDB, max_Pruefindex, wmTypeRevision);
SaveMeterTestResult(conn, mtr, pruefungsnr, max_Pruefindex, record);
}
}
}
@ -1427,7 +1489,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
/// </summary>
/// <param name="q">q = 0, 1, 2 or 3 (Adj., Q1, Q2, Q3)</param>
/// <returns>Nr. of rows updated</returns>
int SaveMeterTestResult(OracleConnection conn, Results.Entities.MeterTestRslt mtr, int pruefungsNr, int max_Pruefindex, int wmTypeRevision)
int SaveMeterTestResult(OracleConnection conn, Results.Entities.MeterTestRslt mtr, int pruefungsNr, int max_Pruefindex, VtWztypSd record)
{
if (dbCfg.DebugLevel == DebugMode.Normal)
{
@ -1437,18 +1499,20 @@ namespace TBF.Rig.Output.DB.SensusOracle
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, 0, :14, 0, :15, 0, 0)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = mtr.WaterMeter.SerialNr }); /// :1 vt_fernum
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex }); /// :2 pruefindex
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = pruefungsNr }); /// :3 pruefungsnr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// :4 anbid
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = mtr.WaterMeter.WaterMeterData.WMTypeId }); /// :5 id_wztyp
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wmTypeRevision }); /// :6 rev_wztyp
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 1 }); /// :7 rev_wzpruefpunkt
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = (mtr.VolumeRef > float.Epsilon)
? 1000 * mtr.TestRslt.FlowVolume * mtr.VolumeMeter / mtr.VolumeRef
: 0 }); /// :8 q_wz
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex }); /// :2 pruefindex
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = pruefungsNr }); /// :3 pruefungsnr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid}); /// :4 anbid
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = (record != null) ? record.IdWztyp : mtr.WaterMeter.WaterMeterData.WMTypeId }); /// :5 id_wztyp
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32,
Value = (record != null) ? record.RevWztyp : wmTypeRevision }); /// :6 rev_wztyp
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 1 }); /// :7 rev_wzpruefpunkt
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double,
Value = (mtr.VolumeRef > float.Epsilon) ? 1000 * mtr.TestRslt.FlowVolume * mtr.VolumeMeter / mtr.VolumeRef
: 0 }); /// :8 q_wz
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Min(100.0, Math.Max(-100.0, mtr.Error)) }); /// :9 q_fehler
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = mtr.Passed ? 1 : 0 }); /// :10 q_best
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// :11 niz
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = mtr.Passed ? 1 : 0 }); /// :10 q_best
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// :11 niz
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Max(-99999.999, Math.Min(mtr.VolumeStart, 99999.999)) }); /// :12 anfangzstand
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Max(-99999.999, Math.Min(mtr.VolumeEnd, 99999.999)) }); /// :13 endzstand
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Math.Min(100.0, Math.Max(-100.0, mtr.ErrorBC)) }); /// :14 korrerrq
@ -1493,7 +1557,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
"FROM vt_auftrag_pd " +
"WHERE produktion_anbid=:1 AND status=:2 AND produktion_usestate=0", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = status });
OracleDataReader dr = cmd.ExecuteReader();
@ -1570,7 +1634,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
OracleCommand cmd = new OracleCommand("SELECT iststueck FROM vt_auftrag_pd WHERE auftragsnummer=:1 AND anbid=:2", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
OracleDataReader dr = cmd.ExecuteReader();
if (dr.Read())
{
@ -1584,7 +1648,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
"FROM vt_auft_zaehlernr_pd " +
"WHERE auftragsnummer=:1 AND anbid=:2", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
dr = cmd.ExecuteReader();
if (dr.Read())
{
@ -1638,7 +1702,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
OracleCommand cmd = new OracleCommand("UPDATE vt_auftrag_pd SET iststueck=:1 WHERE auftragsnummer=:2 AND anbid=:3", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentPcsCount });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
int updatedRows = cmd.ExecuteNonQuery();
@ -1647,7 +1711,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentSerialNr });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = auftrag.CurrentRadioAddress });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = auftrag.AuftragsNummer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = ProducerAnbid });
updatedRows = Math.Min(cmd.ExecuteNonQuery(), updatedRows);
@ -1667,198 +1731,5 @@ namespace TBF.Rig.Output.DB.SensusOracle
return 0;
}
}
/// <summary>
/// Get VT_WZTYP_SD content
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="aktiv">Active flag</param>
/// <returns>List of VtWztypSd records</returns>
public IList<VtWztypSd> ReadVtWztypSd(OracleConnection conn, bool aktiv = true)
{
var cmd = new OracleCommand("SELECT id_wztyp, rev_wztyp, wztyp, art, metrolklasse, zulasszeichen, impulsrate," +
" kontaktwert, warmpruefen, optikaufsetzen, formatausdruck, formatetikett, formatnetzwerk," +
" formatzaehlernr, id_wzgruppe, anzahlpruefungen, materialnr, qmax, pruefart, zaehlerflag," +
" korrekturwert, id_benutzer, aenderungsdatum, bemerkung, verwendet " +
"FROM vt_wztyp_sd " +
"WHERE anbid=:1 AND aktiv=:2 ORDER BY rev_wztyp DESC", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = aktiv ? 1 : 0 }); /// :2
///
var dr = cmd.ExecuteReader();
var list = new List<VtWztypSd>();
while (dr.Read())
{
var proc = new VtWztypSd();
int i = 0;
try { proc.IdWztyp = dr.GetInt32(i++); } catch { proc.IdWztyp = 0; }
try { proc.RevWztyp = dr.GetInt32(i++); } catch { proc.RevWztyp = 0; }
try { proc.Wztyp = dr.GetString(i++); } catch { proc.Wztyp = string.Empty; }
try { proc.Art = dr.GetString(i++); } catch { proc.Art = string.Empty; }
try { proc.Metrolklasse = dr.GetString(i++); } catch { proc.Metrolklasse = string.Empty; }
try { proc.Zulasszeichen = dr.GetString(i++); } catch { proc.Zulasszeichen = string.Empty; }
try { proc.Impulsrate = dr.GetDouble(i++); } catch { proc.Impulsrate = 0; }
try { proc.Kontaktwert = dr.GetDouble(i++); } catch { proc.Kontaktwert = 0; }
try { proc.Warmpruefen = dr.GetBoolean(i++); } catch { proc.Warmpruefen = false; }
try { proc.Optikaufsetzen = dr.GetBoolean(i++); } catch { proc.Optikaufsetzen = false; }
try { proc.Formatausdruck = dr.GetString(i++); } catch { proc.Formatausdruck = string.Empty; }
try { proc.Formatetikett = dr.GetString(i++); } catch { proc.Formatetikett = string.Empty; }
try { proc.Formatnetzwerk = dr.GetString(i++); } catch { proc.Formatnetzwerk = string.Empty; }
try { proc.Formatzaehlernr = dr.GetString(i++); } catch { proc.Formatzaehlernr = string.Empty; }
try { proc.IdWzgruppe = dr.GetInt32(i++); } catch { proc.IdWzgruppe = 0; }
try { proc.Anzahlpruefungen = dr.GetInt32(i++); } catch { proc.Anzahlpruefungen = 0; }
try { proc.Materialnr = dr.GetString(i++); } catch { proc.Materialnr = string.Empty; }
try { proc.Qmax = dr.GetFloat(i++); } catch { proc.Qmax = 0; }
try { proc.Pruefart = dr.GetByte(i++); } catch { proc.Pruefart = 0; }
try { proc.Zaehlerflag = dr.GetByte(i++); } catch { proc.Zaehlerflag = 0; }
try { proc.Korrekturwert = dr.GetDouble(i++); } catch { proc.Korrekturwert = 0; }
try { proc.IdBenutzer = dr.GetInt32(i++); } catch { proc.IdBenutzer = 0; }
try { proc.Aenderungsdatum = dr.GetDateTime(i++); } catch { proc.Aenderungsdatum = DateTime.Now; }
try { proc.Bemerkung = dr.GetString(i++); } catch { proc.Bemerkung = string.Empty; }
try { proc.Verwendet = dr.GetBoolean(i++); } catch { proc.Verwendet = false; }
list.Add(proc);
}
dr.Close();
return list;
}
/// <summary>
/// Insert a record to VT_WZTYP_SD
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="aktiv">Active flag</param>
/// <returns>List of VtWztypSd records</returns>
public void WriteVtWztypSd(OracleConnection conn, VtWztypSd record, bool aktiv = true)
{
var cmd = new OracleCommand("INSERT INTO vt_wztyp_sd(anbid, id_wztyp, rev_wztyp, wztyp, art, metrolklasse, zulasszeichen," +
" impulsrate, kontaktwert, warmpruefen, optikaufsetzen, formatausdruck, formatetikett," +
" formatnetzwerk, formatzaehlernr, id_wzgruppe, anzahlpruefungen, materialnr, qmax, pruefart," +
" zaehlerflag, korrekturwert, id_benutzer, aenderungsdatum, bemerkung, verwendet, aktiv) " +
"FROM vt_wztyp_sd " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20," +
" :21, :22, :23, :24, :25, :26, :27)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.IdWztyp }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.RevWztyp }); /// :3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Wztyp }); /// :4
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Art }); /// :5
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Metrolklasse }); /// :6
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Zulasszeichen }); /// :7
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = record.Impulsrate }); /// :8
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = record.Kontaktwert }); /// :9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Warmpruefen ? 1 : 0 }); /// :10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Optikaufsetzen ? 1 : 0 }); /// :11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Formatausdruck }); /// :12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Formatetikett }); /// :13
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Formatnetzwerk }); /// :14
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Formatzaehlernr }); /// :15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.IdWzgruppe }); /// :16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Anzahlpruefungen }); /// :17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Materialnr }); /// :18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Qmax }); /// :19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Pruefart }); /// :20
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Zaehlerflag }); /// :21
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = record.Korrekturwert }); /// :22
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.IdBenutzer }); /// :23
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = record.Aenderungsdatum }); /// :24
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Bemerkung }); /// :25
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Verwendet ? 1 : 0 }); /// :26
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = aktiv ? 1 : 0 }); /// :27
///
var rowsUpdated = cmd.ExecuteNonQuery();
if (rowsUpdated == 1)
{
foreach (var test in record.ListOfTests)
{
WriteVtPruefpunktSollSd(conn, test, record.IdWztyp, record.RevWztyp);
}
}
}
/// <summary>
/// Get VT_PRUEFPUNKT_SOLL_SD content
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="aktiv">WM type Id</param>
/// <param name="aktiv">WM type revision</param>
/// <returns>List of VtWztypSd records</returns>
public IList<VtPruefpunktSollSd> ReadVtPruefpunktSollSd(OracleConnection conn, int id_wztyp, int rev_wztyp)
{
var cmd = new OracleCommand("SELECT pruefungsnr, q_soll, pruefzeit, posfehlerkalt, negfehlerkalt," +
" posfehlerwarm, negfehlerwarm, pruefbereichmin, pruefbereichmax," +
" qbezeichnung, mindruck, fkorrektur, maxdruck " +
"FROM vt_pruefpunkt_soll_sd " +
"WHERE anbid=:1 AND id_wztyp=:2 AND rev_wztyp=:3 ORDER BY pruefungsnr DESC", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = id_wztyp }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = rev_wztyp }); /// :3
///
var dr = cmd.ExecuteReader();
var list = new List<VtPruefpunktSollSd>();
while (dr.Read())
{
var tst = new VtPruefpunktSollSd();
int i = 0;
try { tst.Pruefungsnr = dr.GetInt32(i++); } catch { tst.Pruefungsnr = 0; }
try { tst.Q_soll = dr.GetFloat(i++); } catch { tst.Q_soll = 0; }
try { tst.Pruefzeit = dr.GetFloat(i++); } catch { tst.Pruefzeit = 0; }
try { tst.Posfehlerkalt = dr.GetFloat(i++); } catch { tst.Posfehlerkalt = 0; }
try { tst.Negfehlerkalt = dr.GetFloat(i++); } catch { tst.Negfehlerkalt = 0; }
try { tst.Posfehlerwarm = dr.GetFloat(i++); } catch { tst.Posfehlerwarm = 0; }
try { tst.Negfehlerwarm = dr.GetFloat(i++); } catch { tst.Negfehlerwarm = 0; }
try { tst.Pruefbereichmin = dr.GetInt32(i++); } catch { tst.Pruefbereichmin = 0; }
try { tst.Pruefbereichmax = dr.GetInt32(i++); } catch { tst.Pruefbereichmax = 0; }
try { tst.Qbezeichnung = dr.GetString(i++); } catch { tst.Qbezeichnung = string.Empty; }
try { tst.Mindruck = dr.GetFloat(i++); } catch { tst.Mindruck = 0; }
try { tst.Fkorrektur = dr.GetFloat(i++); } catch { tst.Fkorrektur = 0; }
try { tst.Maxdruck = dr.GetFloat(i++); } catch { tst.Maxdruck = 0; }
if (tst.Pruefungsnr >= 0)
list.Add(tst);
else
list.Insert(0, tst);
}
return list;
}
/// <summary>
/// Insert a record to VT_PRUEFPUNKT_SOLL_SD
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="record">Record to be written</param>
/// <param name="aktiv">WM type Id</param>
/// <param name="aktiv">WM type revision</param>
/// <returns>List of VtWztypSd records</returns>
public void WriteVtPruefpunktSollSd(OracleConnection conn, VtPruefpunktSollSd record, int id_wztyp, int rev_wztyp)
{
var cmd = new OracleCommand("INSERT INTO vt_pruefpunkt_soll_sd(anbid, id_wztyp, rev_wztyp, pruefungsnr, q_soll, pruefzeit," +
" posfehlerkalt, negfehlerkalt, posfehlerwarm, negfehlerwarm, pruefbereichmin, pruefbereichmax," +
" qbezeichnung, mindruck, fkorrektur, maxdruck) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = id_wztyp }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = rev_wztyp }); /// :3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Pruefungsnr }); /// :4
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Q_soll }); /// :5
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Pruefzeit }); /// :6
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Posfehlerkalt }); /// :7
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Negfehlerkalt }); /// :8
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Posfehlerwarm }); /// :9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Negfehlerwarm }); /// :10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Pruefbereichmin }); /// :11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = record.Pruefbereichmax }); /// :12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = record.Qbezeichnung }); /// :13
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Mindruck }); /// :14
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Fkorrektur }); /// :15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = record.Maxdruck }); /// :16
///
var rowsUpdated = cmd.ExecuteNonQuery();
}
}
}

28
TBF/Rig/Output/DB/SensusOracle/ProcedureParams.cs
View File

@ -22,23 +22,23 @@ namespace TBF.Rig.Output.DB.SensusOracle
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ProcedureParams) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public DBUsed DBUsed; /// 0
public WMKind WMKind; /// 1
public int WMTypeId; /// 2 (0 = none, -1 = automatic)
public bool CreateWztypEntryIfMissing; /// 3
public int YearOfManufacture; /// 4
public bool SaveResults; /// 5
public bool ReadStartInfo; /// 6
public bool StartInfoIsRequired; /// 7
public DesigMode DesigMode; /// 8
public Results.Output.LogType DesigType; /// 9
public DBUsed DBUsed; /// 0
public WMKind WMKind; /// 1
public int WMTypeId; /// 2 (0 = none, -1 = automatic)
public bool CreateWztypIfMissing; /// 3
public int YearOfManufacture; /// 4
public bool SaveResults; /// 5
public bool ReadStartInfo; /// 6
public bool StartInfoIsRequired; /// 7
public DesigMode DesigMode; /// 8
public Results.Output.LogType DesigType; /// 9
public override void InitializeAll()
{
DBUsed = DBUsed.Production; /// 0
WMKind = WMKind.iPERL; /// 1
WMTypeId = 2; /// 2
CreateWztypEntryIfMissing = false; /// 3
CreateWztypIfMissing = false; /// 3
YearOfManufacture = DateTime.Now.Year; /// 4
#if TURA_SPECIAL
SaveResults = false; /// 5
@ -112,7 +112,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
case 0: return DBUsed.ToString();
case 1: return WMKind.ToString();
case 2: return (WMTypeId == -1) ? "auto" : WMTypeId.ToString();
case 3: return CreateWztypEntryIfMissing ? Strings.yes : Strings.no;
case 3: return CreateWztypIfMissing ? Strings.yes : Strings.no;
case 4: return YearOfManufacture.ToString();
case 5: return SaveResults ? Strings.yes : Strings.no;
case 6: return ReadStartInfo ? Strings.yes : Strings.no;
@ -151,7 +151,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
break;
case 2: WMTypeId = str.ToLower().Contains("auto") ? -1 : int.Parse(str); break;
case 3: CreateWztypEntryIfMissing = (str == Strings.yes); break;
case 3: CreateWztypIfMissing = (str == Strings.yes); break;
case 4: YearOfManufacture = int.Parse(str); break;
case 5: SaveResults = (str == Strings.yes); break;
case 6: ReadStartInfo = (str == Strings.yes); break;
@ -251,7 +251,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
prms.DBUsed = DBUsed;
prms.WMKind = WMKind;
prms.WMTypeId = WMTypeId;
prms.CreateWztypEntryIfMissing = CreateWztypEntryIfMissing;
prms.CreateWztypIfMissing = CreateWztypIfMissing;
prms.YearOfManufacture = YearOfManufacture;
prms.SaveResults = SaveResults;
prms.ReadStartInfo = ReadStartInfo;

101
TBF/Rig/Output/DB/SensusOracle/VtPruefpunktSollSd.cs
View File

@ -2,7 +2,14 @@
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Linq;
using log4net;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
namespace TBF.Rig.Output.DB.SensusOracle
@ -49,8 +56,8 @@ namespace TBF.Rig.Output.DB.SensusOracle
Pruefungsnr = pruefungsnr,
Q_soll = (float)Units.ConvertTo(Unit.lph, isQ3orQ4 ? tr.Qto() : tr.Qfrom()),
Pruefzeit = (float)tr.TargetTime(),
Posfehlerkalt = (float)tr.ErrLimHi(),
Negfehlerkalt = (float)tr.ErrLimLo(),
Posfehlerkalt = (float)(tr.ErrLimHi() - tr.ErrLimMargin()),
Negfehlerkalt = (float)(tr.ErrLimLo() + tr.ErrLimMargin()),
Posfehlerwarm = 0,
Negfehlerwarm = 0,
Pruefbereichmin = isQ3orQ4 ? 90 : 100,
@ -100,11 +107,86 @@ namespace TBF.Rig.Output.DB.SensusOracle
return rslt;
}
public override string ToString()
/// <summary>
/// Insert a record to VT_PRUEFPUNKT_SOLL_SD
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="record">Record to be written</param>
/// <param name="aktiv">WM type Id</param>
/// <param name="aktiv">WM type revision</param>
/// <returns>List of VtWztypSd records</returns>
public void Write(OracleConnection conn, VtPruefpunktSollSd record, int id_wztyp, int rev_wztyp)
{
return string.Format("{0} {1} {2}l/h time={3}s Elo={4}% Ehi={5}% Rlo={6} Rhi={7}",
Pruefungsnr, Qbezeichnung, Q_soll, Pruefzeit,
Negfehlerkalt, Posfehlerkalt, Pruefbereichmin, Pruefbereichmax);
var cmd = new OracleCommand("INSERT INTO vt_pruefpunkt_soll_sd(anbid, id_wztyp, rev_wztyp, pruefungsnr, q_soll, pruefzeit," +
" posfehlerkalt, negfehlerkalt, posfehlerwarm, negfehlerwarm, pruefbereichmin, pruefbereichmax," +
" qbezeichnung, mindruck, fkorrektur, maxdruck) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = id_wztyp }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = rev_wztyp }); /// :3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Pruefungsnr }); /// :4
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Q_soll }); /// :5
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Pruefzeit }); /// :6
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Posfehlerkalt }); /// :7
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Negfehlerkalt }); /// :8
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Posfehlerwarm }); /// :9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Negfehlerwarm }); /// :10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Pruefbereichmin }); /// :11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Pruefbereichmax }); /// :12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Qbezeichnung }); /// :13
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Mindruck }); /// :14
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Fkorrektur }); /// :15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Maxdruck }); /// :16
///
var rowsUpdated = cmd.ExecuteNonQuery();
}
/// <summary>
/// Get VT_PRUEFPUNKT_SOLL_SD content
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="aktiv">WM type Id</param>
/// <param name="aktiv">WM type revision</param>
/// <returns>List of VtWztypSd records</returns>
public static IList<VtPruefpunktSollSd> Read(OracleConnection conn, int id_wztyp, int rev_wztyp)
{
var cmd = new OracleCommand("SELECT pruefungsnr, q_soll, pruefzeit, posfehlerkalt, negfehlerkalt," +
" posfehlerwarm, negfehlerwarm, pruefbereichmin, pruefbereichmax," +
" qbezeichnung, mindruck, fkorrektur, maxdruck " +
"FROM vt_pruefpunkt_soll_sd " +
"WHERE anbid=:1 AND id_wztyp=:2 AND rev_wztyp=:3 ORDER BY pruefungsnr DESC", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = id_wztyp }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = rev_wztyp }); /// :3
///
var dr = cmd.ExecuteReader();
var list = new List<VtPruefpunktSollSd>();
while (dr.Read())
{
var tst = new VtPruefpunktSollSd();
int i = 0;
try { tst.Pruefungsnr = dr.GetInt32(i++); } catch { tst.Pruefungsnr = 0; }
try { tst.Q_soll = dr.GetFloat(i++); } catch { tst.Q_soll = 0; }
try { tst.Pruefzeit = dr.GetFloat(i++); } catch { tst.Pruefzeit = 0; }
try { tst.Posfehlerkalt = dr.GetFloat(i++); } catch { tst.Posfehlerkalt = 0; }
try { tst.Negfehlerkalt = dr.GetFloat(i++); } catch { tst.Negfehlerkalt = 0; }
try { tst.Posfehlerwarm = dr.GetFloat(i++); } catch { tst.Posfehlerwarm = 0; }
try { tst.Negfehlerwarm = dr.GetFloat(i++); } catch { tst.Negfehlerwarm = 0; }
try { tst.Pruefbereichmin = dr.GetInt32(i++); } catch { tst.Pruefbereichmin = 0; }
try { tst.Pruefbereichmax = dr.GetInt32(i++); } catch { tst.Pruefbereichmax = 0; }
try { tst.Qbezeichnung = dr.GetString(i++); } catch { tst.Qbezeichnung = string.Empty; }
try { tst.Mindruck = dr.GetFloat(i++); } catch { tst.Mindruck = 0; }
try { tst.Fkorrektur = dr.GetFloat(i++); } catch { tst.Fkorrektur = 0; }
try { tst.Maxdruck = dr.GetFloat(i++); } catch { tst.Maxdruck = 0; }
if (tst.Pruefungsnr >= 0)
list.Add(tst);
else
list.Insert(0, tst);
}
return list;
}
/// <summary>
@ -133,5 +215,12 @@ namespace TBF.Rig.Output.DB.SensusOracle
((t1.Maxdruck == 0 && t2.Maxdruck == 0) || 2 * Math.Abs(t1.Maxdruck - t2.Maxdruck) / (t1.Maxdruck + t2.Maxdruck) < 0.001) &&
t1.Fkorrektur == t2.Fkorrektur;
}
public override string ToString()
{
return string.Format("{0} {1} {2}l/h time={3}s Elo={4}% Ehi={5}% Rlo={6} Rhi={7}",
Pruefungsnr, Qbezeichnung, Q_soll, Pruefzeit,
Negfehlerkalt, Posfehlerkalt, Pruefbereichmin, Pruefbereichmax);
}
}
}

150
TBF/Rig/Output/DB/SensusOracle/VtPruefstandWztypSd.cs Normal file
View File

@ -0,0 +1,150 @@
///
/// Copyright (c) 2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Linq;
using log4net;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
namespace TBF.Rig.Output.DB.SensusOracle
{
public class VtPruefstandWztypSd
{
private static readonly ILog log = LogManager.GetLogger(typeof(VtWztypSd));
public int IdPruefstand; /// Nummer des Prüfstandes
public int IdWztyp; /// Eindeutige ID des Wasserzählers
public int RevPruefstandWztyp; /// Revisionsnummer
public int Fuellzeit; /// Zeit zum füllen
public int Evakuierzeitvorne; /// Zeit zum Evakuieren vorne
public int Evakuierzeithinten; /// Zeit zum Evakuieren hinten
public int Spuelzeit; /// Zeit zum Spülen
public double Spueldurchfluss; /// Durchfluss beim Spülen
public int Abpresszeit; /// Zeit zum Abpressen
public float Abpressdruck; /// Mindestdruck beim Abpressen
public int Entwaesserzeit; /// Zeit zum Entwässern
public int Belueftenzeit; /// Zeit zum Belüften
public int Entwaessernmitbelueften; /// Wird belüftet?
public int Wirdjustiert; /// Wird justiert?
public int Mittelwerttiefe; /// Anzahl der Werte für Mittelwert des Durchflusses beim Justieren
public int Endkriterium; /// Erforderliche Gutmessung beim Justieren
public string Bemerkung; /// Bemerkung zum Datensatz
public int IdBenutzer; /// ID des Benutzers (Personalnummer)
public DateTime Aenderungsdatum; /// Datum der Änderung des Datensatzes
public bool Verwendet; /// Dieser Datensatz ist bereits für eine Prüfung verwendet worden
public bool Aktiv; /// Datensatz aktiviert?
/// <summary>
/// Default constructor
/// </summary>
public VtPruefstandWztypSd()
{
}
public int Write(OracleConnection conn, bool aktiv = true)
{
var cmd = new OracleCommand("INSERT INTO vt_pruefstand_wztyp_sd(anbid, id_pruefstand, id_wztyp, rev_pruefstand_wztyp," +
" fuellzeit, evakuierzeitvorne, evakuierzeithinten, spuelzeit, spueldurchfluss," +
" abpresszeit, abpressdruck, entwaesserzeit, belueftenzeit, entwaessernmitbelueften," +
" wirdjustiert, mittelwerttiefe, endkriterium, bemerkung, id_benutzer," +
" aenderungsdatum, verwendet, aktiv) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20, :21, :22)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = IdPruefstand }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = IdWztyp }); /// :3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = RevPruefstandWztyp }); /// :4
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Fuellzeit }); /// :5
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Evakuierzeitvorne }); /// :6
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Evakuierzeithinten }); /// :7
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Spuelzeit }); /// :8
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Spueldurchfluss }); /// :9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Abpresszeit }); /// :10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Abpressdruck }); /// :11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Entwaesserzeit }); /// :12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Belueftenzeit }); /// :13
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Entwaessernmitbelueften }); /// :14
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Wirdjustiert }); /// :15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Mittelwerttiefe }); /// :16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Endkriterium }); /// :17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Bemerkung }); /// :18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = IdBenutzer }); /// :19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = Aenderungsdatum }); /// :20
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Verwendet ? 1 : 0 }); /// :21
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = aktiv ? 1 : 0 }); /// :22
///
return cmd.ExecuteNonQuery(); /// returns updated rows count
}
public static IList<VtPruefstandWztypSd> Read(OracleConnection conn, int idPruefstand, int idWztyp)
{
var cmd = new OracleCommand("SELECT rev_pruefstand_wztyp, fuellzeit, evakuierzeitvorne, evakuierzeithinten, spuelzeit," +
" spueldurchfluss, abpresszeit, abpressdruck, entwaesserzeit, belueftenzeit, entwaessernmitbelueften," +
" wirdjustiert, mittelwerttiefe, endkriterium, bemerkung, id_benutzer, aenderungsdatum, verwendet, aktiv " +
"FROM vt_pruefstand_wztyp_sd " +
"WHERE anbid=:1 AND id_pruefstand=:2 AND id_wztyp=:3", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idPruefstand }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idWztyp }); /// :3
///
var dr = cmd.ExecuteReader();
var list = new List<VtPruefstandWztypSd>();
while (dr.Read())
{
var record = new VtPruefstandWztypSd();
int i = 0;
try { record.RevPruefstandWztyp = dr.GetInt32(i++); } catch { record.RevPruefstandWztyp = 0; }
try { record.Fuellzeit = dr.GetInt32(i++); } catch { record.Fuellzeit = 0; }
try { record.Evakuierzeitvorne = dr.GetInt32(i++); } catch { record.Evakuierzeitvorne = 0; }
try { record.Evakuierzeithinten = dr.GetInt32(i++); } catch { record.Evakuierzeithinten = 0; }
try { record.Spuelzeit = dr.GetInt32(i++); } catch { record.Spuelzeit = 0; }
try { record.Spueldurchfluss = dr.GetDouble(i++); } catch { record.Spueldurchfluss = 0; }
try { record.Abpresszeit = dr.GetInt32(i++); } catch { record.Abpresszeit = 0; }
try { record.Abpressdruck = dr.GetFloat(i++); } catch { record.Abpressdruck = 0; }
try { record.Entwaesserzeit = dr.GetInt32(i++); } catch { record.Entwaesserzeit = 0; }
try { record.Belueftenzeit = dr.GetInt32(i++); } catch { record.Belueftenzeit = 0; }
try { record.Entwaessernmitbelueften = dr.GetInt32(i++); } catch { record.Entwaessernmitbelueften = 0; }
try { record.Wirdjustiert = dr.GetInt32(i++); } catch { record.Wirdjustiert = 0; }
try { record.Mittelwerttiefe = dr.GetInt32(i++); } catch { record.Mittelwerttiefe = 0; }
try { record.Endkriterium = dr.GetInt32(i++); } catch { record.Endkriterium = 0; }
try { record.Bemerkung = dr.GetString(i++); } catch { record.Bemerkung = string.Empty; }
try { record.IdBenutzer = dr.GetInt32(i++); } catch { record.IdBenutzer = 0; }
try { record.Aenderungsdatum = dr.GetDateTime(i++); } catch { record.Aenderungsdatum = DateTime.Now; }
try { record.Verwendet = dr.GetBoolean(i++); } catch { record.Verwendet = false; }
try { record.Aktiv = dr.GetBoolean(i++); } catch { record.Aktiv = false; }
list.Add(record);
}
dr.Close();
return list;
}
}
}

136
TBF/Rig/Output/DB/SensusOracle/VtWztypSd.cs
View File

@ -92,24 +92,24 @@ namespace TBF.Rig.Output.DB.SensusOracle
Art = "VT",
Metrolklasse = wmData.MetrologicalClass,
Zulasszeichen = wmData.ApprovalInfo,
Impulsrate = 0, // TODO
Kontaktwert = 0, // TODO
Impulsrate = 0, // TODO
Kontaktwert = 0, // TODO
Warmpruefen = false,
Optikaufsetzen = true,
Formatausdruck = string.Empty, // TODO
Formatetikett = string.Empty, // TODO
Formatnetzwerk = string.Empty, // TODO
Formatzaehlernr = string.Empty, // TODO
IdWzgruppe = 0,
Formatausdruck = "Normal", // TODO
Formatetikett = string.Empty, // TODO
Formatnetzwerk = "Halle1-Format", // TODO
Formatzaehlernr = "nur Ziffern", // TODO
IdWzgruppe = batch.ProcedureName.Contains("640") ? 35 : 29, /// 640...35, 620...29
Anzahlpruefungen = listOfTests.Count,
Materialnr = string.Empty, // TODO
Materialnr = batch.WatermetersStr, // TODO
Qmax = (float)wmData.Q3_Qn,
Pruefart = 0,
Zaehlerflag = 0,
Korrekturwert = 0,
IdBenutzer = idBenutzer,
Aenderungsdatum = DateTime.Now,
Bemerkung = string.Empty, // TODO
Bemerkung = batch.Remark, // TODO
Verwendet = true,
ListOfTests = listOfTests,
};
@ -119,9 +119,110 @@ namespace TBF.Rig.Output.DB.SensusOracle
return rslt;
}
public override string ToString()
public int Write(OracleConnection conn, bool aktiv = true)
{
return string.Format("Id={0} Rev={1} Q3={2} metro={3}", IdWztyp, RevWztyp, Qmax, Metrolklasse);
var cmd = new OracleCommand("INSERT INTO vt_wztyp_sd(anbid, id_wztyp, rev_wztyp, wztyp, art, metrolklasse, zulasszeichen," +
" impulsrate, kontaktwert, warmpruefen, optikaufsetzen, formatausdruck, formatetikett," +
" formatnetzwerk, formatzaehlernr, id_wzgruppe, anzahlpruefungen, materialnr, qmax, pruefart," +
" zaehlerflag, korrekturwert, id_benutzer, aenderungsdatum, bemerkung, verwendet, aktiv) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20," +
" :21, :22, :23, :24, :25, :26, :27)", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = IdWztyp }); /// :2
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = RevWztyp }); /// :3
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Wztyp }); /// :4
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Art }); /// :5
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Metrolklasse }); /// :6
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Zulasszeichen }); /// :7
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Impulsrate }); /// :8
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Kontaktwert }); /// :9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Warmpruefen ? 1 : 0 }); /// :10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Optikaufsetzen ? 1 : 0 }); /// :11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Formatausdruck }); /// :12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Formatetikett }); /// :13
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Formatnetzwerk }); /// :14
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Formatzaehlernr }); /// :15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = IdWzgruppe }); /// :16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anzahlpruefungen }); /// :17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Materialnr }); /// :18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Single, Value = Qmax }); /// :19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Pruefart }); /// :20
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Zaehlerflag }); /// :21
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = Korrekturwert }); /// :22
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = IdBenutzer }); /// :23
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = Aenderungsdatum }); /// :24
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = Bemerkung }); /// :25
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Verwendet ? 1 : 0 }); /// :26
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = aktiv ? 1 : 0 }); /// :27
///
var rowsUpdated = cmd.ExecuteNonQuery();
if (rowsUpdated == 1)
{
foreach (var test in ListOfTests)
{
test.Write(conn, test, IdWztyp, RevWztyp);
}
}
return rowsUpdated;
}
/// <summary>
/// Get VT_WZTYP_SD content
/// </summary>
/// <param name="conn">Oracle connection</param>
/// <param name="aktiv">Active flag</param>
/// <returns>List of VtWztypSd records</returns>
public static IList<VtWztypSd> Read(OracleConnection conn, bool aktiv = true)
{
var cmd = new OracleCommand("SELECT id_wztyp, rev_wztyp, wztyp, art, metrolklasse, zulasszeichen, impulsrate," +
" kontaktwert, warmpruefen, optikaufsetzen, formatausdruck, formatetikett, formatnetzwerk," +
" formatzaehlernr, id_wzgruppe, anzahlpruefungen, materialnr, qmax, pruefart, zaehlerflag," +
" korrekturwert, id_benutzer, aenderungsdatum, bemerkung, verwendet " +
"FROM vt_wztyp_sd " +
"WHERE anbid=:1 AND aktiv=:2 ORDER BY rev_wztyp DESC", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid }); /// :1
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = aktiv ? 1 : 0 }); /// :2
///
var dr = cmd.ExecuteReader();
var list = new List<VtWztypSd>();
while (dr.Read())
{
var proc = new VtWztypSd();
int i = 0;
try { proc.IdWztyp = dr.GetInt32(i++); } catch { proc.IdWztyp = 0; }
try { proc.RevWztyp = dr.GetInt32(i++); } catch { proc.RevWztyp = 0; }
try { proc.Wztyp = dr.GetString(i++); } catch { proc.Wztyp = string.Empty; }
try { proc.Art = dr.GetString(i++); } catch { proc.Art = string.Empty; }
try { proc.Metrolklasse = dr.GetString(i++); } catch { proc.Metrolklasse = string.Empty; }
try { proc.Zulasszeichen = dr.GetString(i++); } catch { proc.Zulasszeichen = string.Empty; }
try { proc.Impulsrate = dr.GetDouble(i++); } catch { proc.Impulsrate = 0; }
try { proc.Kontaktwert = dr.GetDouble(i++); } catch { proc.Kontaktwert = 0; }
try { proc.Warmpruefen = dr.GetBoolean(i++); } catch { proc.Warmpruefen = false; }
try { proc.Optikaufsetzen = dr.GetBoolean(i++); } catch { proc.Optikaufsetzen = false; }
try { proc.Formatausdruck = dr.GetString(i++); } catch { proc.Formatausdruck = string.Empty; }
try { proc.Formatetikett = dr.GetString(i++); } catch { proc.Formatetikett = string.Empty; }
try { proc.Formatnetzwerk = dr.GetString(i++); } catch { proc.Formatnetzwerk = string.Empty; }
try { proc.Formatzaehlernr = dr.GetString(i++); } catch { proc.Formatzaehlernr = string.Empty; }
try { proc.IdWzgruppe = dr.GetInt32(i++); } catch { proc.IdWzgruppe = 0; }
try { proc.Anzahlpruefungen = dr.GetInt32(i++); } catch { proc.Anzahlpruefungen = 0; }
try { proc.Materialnr = dr.GetString(i++); } catch { proc.Materialnr = string.Empty; }
try { proc.Qmax = dr.GetFloat(i++); } catch { proc.Qmax = 0; }
try { proc.Pruefart = dr.GetByte(i++); } catch { proc.Pruefart = 0; }
try { proc.Zaehlerflag = dr.GetByte(i++); } catch { proc.Zaehlerflag = 0; }
try { proc.Korrekturwert = dr.GetDouble(i++); } catch { proc.Korrekturwert = 0; }
try { proc.IdBenutzer = dr.GetInt32(i++); } catch { proc.IdBenutzer = 0; }
try { proc.Aenderungsdatum = dr.GetDateTime(i++); } catch { proc.Aenderungsdatum = DateTime.Now; }
try { proc.Bemerkung = dr.GetString(i++); } catch { proc.Bemerkung = string.Empty; }
try { proc.Verwendet = dr.GetBoolean(i++); } catch { proc.Verwendet = false; }
list.Add(proc);
}
dr.Close();
return list;
}
/// <summary>
@ -177,14 +278,14 @@ namespace TBF.Rig.Output.DB.SensusOracle
if (p1.ListOfTests == null && p1.IdWztyp > 0 && p1.RevWztyp > 0)
{
p1.ListOfTests = db.ReadVtPruefpunktSollSd(conn, p1.IdWztyp, p1.RevWztyp);
p1.ListOfTests = VtPruefpunktSollSd.Read(conn, p1.IdWztyp, p1.RevWztyp);
}
if (p2.ListOfTests == null && p2.IdWztyp > 0 && p2.RevWztyp > 0)
{
p2.ListOfTests = db.ReadVtPruefpunktSollSd(conn, p2.IdWztyp, p2.RevWztyp);
p2.ListOfTests = VtPruefpunktSollSd.Read(conn, p2.IdWztyp, p2.RevWztyp);
}
conn.Close();
}
catch (Exception exc)
@ -218,5 +319,10 @@ namespace TBF.Rig.Output.DB.SensusOracle
return true; /// Two procedures are equal
}
public override string ToString()
{
return string.Format("Id={0} Rev={1} Q3={2} metro={3}", IdWztyp, RevWztyp, Qmax, Metrolklasse);
}
}
}

1
TBF/TBF.csproj
View File

@ -886,6 +886,7 @@
<Compile Include="Rig\Output\DB\SensusOracle\Factory.cs" />
<Compile Include="Rig\Output\DB\SensusOracle\ProcedureParams.cs" />
<Compile Include="Rig\Output\DB\SensusOracle\VtPruefpunktSollSd.cs" />
<Compile Include="Rig\Output\DB\SensusOracle\VtPruefstandWztypSd.cs" />
<Compile Include="Rig\Output\DB\SensusOracle\VtWztypSd.cs" />
<Compile Include="Rig\Output\Enums.cs" />
<Compile Include="Rig\Output\EventTriggers\Iperl\Factory.cs" />

24
TBF/UI/ResultsMI/DeleteFromOracleForm.cs
View File

@ -157,7 +157,7 @@ namespace TBF.UI.ResultsMI
cmd = new OracleCommand("SELECT pruefungsnr " +
"FROM vt_pruefdurchfluss_pd " +
"WHERE anbid = :1 AND id_pruefstand = :2 AND id_wzpruefreihe = :3", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Int32, Value = 18000 + testBenchId });
cmd.Parameters.Add(new OracleParameter { ParameterName = "3", OracleDbType = OracleDbType.Int32, Value = batchNr });
///
@ -191,7 +191,7 @@ namespace TBF.UI.ResultsMI
{
cmd = new OracleCommand("DELETE FROM vt_pruefreihe_ist_pd " +
"WHERE anbid = :1 AND vt_fernum = :2 AND pruefungsnr = :3 AND pruefindex = :4", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
cmd.Parameters.Add(new OracleParameter { ParameterName = "3", OracleDbType = OracleDbType.Int32, Value = pruefungsnr });
cmd.Parameters.Add(new OracleParameter { ParameterName = "4", OracleDbType = OracleDbType.Int32, Value = 100 * testBenchId + pruefindex });
@ -204,7 +204,7 @@ namespace TBF.UI.ResultsMI
{
cmd = new OracleCommand("DELETE FROM vt_ip_zaehler_pindex_pd " +
"WHERE anbid = :1 AND vt_fernum = :2 AND pruefindex = :3", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
cmd.Parameters.Add(new OracleParameter { ParameterName = "3", OracleDbType = OracleDbType.Int32, Value = 100 * testBenchId + pruefindex });
///
@ -215,7 +215,7 @@ namespace TBF.UI.ResultsMI
cmd = new OracleCommand("DELETE FROM vt_zaehler_pindex_pd " +
"WHERE anbid = :1 AND vt_fernum = :2 AND pruefindex = :3", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
cmd.Parameters.Add(new OracleParameter { ParameterName = "3", OracleDbType = OracleDbType.Int32, Value = 100 * testBenchId + pruefindex });
///
@ -225,7 +225,7 @@ namespace TBF.UI.ResultsMI
cmd = new OracleCommand("DELETE FROM vt_zaehler_pd " +
"WHERE anbid = :1 AND vt_fernum = :2", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
///
deletedRows = cmd.ExecuteNonQuery();
@ -237,7 +237,7 @@ namespace TBF.UI.ResultsMI
///
cmd = new OracleCommand("DELETE FROM vt_pruefdurchfluss_pd " +
"WHERE anbid = :1 AND id_pruefstand = :2 AND id_wzpruefreihe = :3", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Int32, Value = 18000 + testBenchId });
cmd.Parameters.Add(new OracleParameter { ParameterName = "3", OracleDbType = OracleDbType.Int32, Value = batchNr });
///
@ -247,7 +247,7 @@ namespace TBF.UI.ResultsMI
cmd = new OracleCommand("DELETE FROM vt_pruefreihe_pd " +
"WHERE anbid = :1 AND id_pruefstand = :2 AND id_wzpruefreihe = :3", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Int32, Value = 18000 + testBenchId });
cmd.Parameters.Add(new OracleParameter { ParameterName = "3", OracleDbType = OracleDbType.Int32, Value = batchNr });
///
@ -280,7 +280,7 @@ namespace TBF.UI.ResultsMI
cmd = new OracleCommand("SELECT vt_fernum, pruefindex " +
"FROM vt_zaehler_pindex_pd " +
"WHERE anbid = :1 AND id_pruefstand = :2 AND id_wzpruefreihe = :3", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Int32, Value = 18000 + testBenchId });
cmd.Parameters.Add(new OracleParameter { ParameterName = "3", OracleDbType = OracleDbType.Int32, Value = batchNr });
@ -333,7 +333,7 @@ namespace TBF.UI.ResultsMI
///
cmd = new OracleCommand("DELETE FROM vt_pruefreihe_ist_pd " +
"WHERE anbid = :1 AND vt_fernum = :2", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
///
deletedRows = cmd.ExecuteNonQuery();
@ -344,7 +344,7 @@ namespace TBF.UI.ResultsMI
{
cmd = new OracleCommand("DELETE FROM vt_ip_zaehler_pindex_pd " +
"WHERE anbid = :1 AND vt_fernum = :2", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
///
deletedRows = cmd.ExecuteNonQuery();
@ -354,7 +354,7 @@ namespace TBF.UI.ResultsMI
cmd = new OracleCommand("DELETE FROM vt_zaehler_pindex_pd " +
"WHERE anbid = :1 AND vt_fernum = :2", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
///
deletedRows = cmd.ExecuteNonQuery();
@ -363,7 +363,7 @@ namespace TBF.UI.ResultsMI
cmd = new OracleCommand("DELETE FROM vt_zaehler_pd " +
"WHERE anbid = :1 AND vt_fernum = :2", conn);
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = ProcessData.OracleDB.Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { ParameterName = "1", OracleDbType = OracleDbType.Int32, Value = Database.ProducerAnbid });
cmd.Parameters.Add(new OracleParameter { ParameterName = "2", OracleDbType = OracleDbType.Varchar2, Value = pcbNr });
///
deletedRows = cmd.ExecuteNonQuery();

4
TBF/UI/ResultsMI/SendAgainDBAndWMSelectionForm.cs
View File

@ -26,7 +26,11 @@ namespace TBF.UI.ResultsMI
waterMetersComboBox.Items.Add(WMKind.iPERL);
waterMetersComboBox.Items.Add(WMKind.Mechanical);
#if IPERL
waterMetersComboBox.Text = waterMetersComboBox.Items[0].ToString();
#else
waterMetersComboBox.Text = waterMetersComboBox.Items[1].ToString();
#endif
}
void Localize()