Various S640 related changes, ver. 2.27.1778

This commit is contained in:
Milan Hanajik 2021-10-19 12:07:05 +02:00
parent f3a889eed8
commit 5b599c2ecd
8 changed files with 336 additions and 145 deletions

View File

@ -43,8 +43,8 @@ namespace Results.Entities
{
public virtual int Id { get; protected set; }
public virtual string SerialNr { get; set; } /// S/N _or_ S/N of the main meter of a compound meter _or_ PCB Number of an iPerl water meter
public virtual string SerialNrAux { get; set; } /// S/N of the aux. meter of a compound meter _or_ a complete assigned S/N of an iPerl water meter
public virtual long RadioAddress { get; set; }
public virtual string SerialNrAux { get; set; } /// S/N of the aux. meter of a compound meter _or_ eRegister PCB Number of a 640 water meter
public virtual string RadioAddress { get; set; }
public virtual string PurchaseOrder { get; set; }
public virtual int YearOfProduction { get; set; }
public virtual int WMPosition { get; set; } /// 1-based water meter position
@ -77,7 +77,6 @@ namespace Results.Entities
/// <summary>
/// Data from a production test bench (in case of tests on iPerl special)
/// </summary>
public virtual string RadioAddress { get; set; }
public virtual int PaletteNr { get; set; }
public virtual int UmkartonNr { get; set; }
public virtual string ProdTestBench { get; set; }
@ -94,6 +93,7 @@ namespace Results.Entities
public virtual string Prefix { get; set; }
public virtual string Suffix { get; set; }
public virtual string CompleteSerialNr { get; set; }
public virtual string OriRadioAddress { get; set; } /// Not mapped to DB !!! Original radio address of a 640 water meter (albatrosID)
public virtual int WMTypeRevision { get; set; }
public virtual int Pruefindex { get; set; } /// >= 1 ... pruefindex
public virtual int HydrPruefung { get; set; }

View File

@ -44,7 +44,6 @@ namespace Results.Mappings
Map(x => x.FWVersion);
#endif
#if TURA_SPECIAL
Map(x => x.RadioAddress);
Map(x => x.PaletteNr);
Map(x => x.UmkartonNr);
Map(x => x.ProdTestBench);
@ -61,6 +60,7 @@ namespace Results.Mappings
Map(x => x.Prefix);
Map(x => x.Suffix);
Map(x => x.CompleteSerialNr);
Map(x => x.OriRadioAddress);
Map(x => x.Pruefindex);
Map(x => x.HydrPruefung);
Map(x => x.WMTypeRevision);

View File

@ -368,7 +368,7 @@ namespace Results
/// Water meters results
AllItems.Add(new WMeterRsltItemSpec(ItemID.Serial_Nr, Strings.sn, Strings.Tooltip_sn, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.SerialNr)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.RadioAddress, Strings.Radio_address, Strings.Tooltip_RA, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress.ToString())));
AllItems.Add(new WMeterRsltItemSpec(ItemID.RadioAddress, Strings.Radio_address, Strings.Tooltip_RA, Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.RadioAddress)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Purchase_order, Strings.PO, Quantity.String, ItemCategory.Other, (w, t, u, f, p) => FormatStr(f, w.PurchaseOrder)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.Year_of_production, Strings.Year, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.YearOfProduction)));
AllItems.Add(new WMeterRsltItemSpec(ItemID.WM_Position, Strings.Pos, Quantity.Number, ItemCategory.Other, (w, t, u, f, p) => FormatInt(f, w.WMPosition)));

View File

@ -1230,50 +1230,54 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
if (dbCfg.DebugLevel == DebugMode.Normal)
{
OracleCommand cmd = new OracleCommand("UPDATE vt_zaehler_pd " +
"SET max_pruefindex=:1, vt_identnummer=:2, auftragsnummer=:3, vt_baugruppen_nr=:4, mbus_adr=:5, liegenschafts_nr=:6," +
" sekundaere_adr=:7, hydr_pruefung=:8, mark_date=:9, baujahr=:10, eich_jahr=:11, umkarton_nr=:12," +
" palette_nr=:13, zaehlernummer=:14, prefix=:15, suffix=:16, z_nr_komplett=:17, id_benutzer=:18 " +
"WHERE vt_fernum = :19 AND anbid = :20", conn);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = max_Pruefindex }); /// 1 max_pruefindex
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = vt_identnummer }); /// 2 vt_identnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.PurchaseOrder }); /// 3 auftragsnummer
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNrAux }); /// 4 vt_baugruppen_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 5 mbus_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 6 liegenschafts_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Convert.ToInt32(wm.RadioAddress) }); /// 7 sekundaere_adr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung }); /// 8
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.TimeStamp, Value = wm.Batch.EndTime }); /// 9
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 10
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 12 umkarton_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 13 palette_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 14
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Prefix }); /// 15
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Suffix }); /// 16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.CompleteSerialNr }); /// 17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = idBenutzer }); /// 18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.SerialNr }); /// 19
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer }); /// 20
"SET max_pruefindex=:3, vt_identnummer=:4, auftragsnummer=:5, vt_baugruppen_nr=:6, mbus_adr=:7, liegenschafts_nr=:8," +
" sekundaere_adr=:9, hydr_pruefung=:10, mark_date=:11, baujahr=:12, eich_jahr=:13, umkarton_nr=:14," +
" palette_nr=:15, zaehlernummer=:16, prefix=:17, suffix=:18, z_nr_komplett=:19, id_benutzer=:20," +
" albatrosid=:21, vt_modul_snr=:22 " +
"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.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.TimeStamp, Value = wm.Batch.EndTime }); /// 11
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 12
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = YearOfManufacture }); /// 13
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 14 umkarton_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 }); /// 15 palette_nr
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.AssignedSerialNr }); /// 16
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Prefix }); /// 17
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.Suffix }); /// 18
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = wm.CompleteSerialNr }); /// 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
int updatedRows = cmd.ExecuteNonQuery();
int insertedRows = 0;
if (updatedRows == 0)
{
cmd = new OracleCommand("INSERT INTO vt_zaehler_pd(vt_fernum, max_pruefindex, vt_identnummer, auftragsnummer, vt_baugruppen_nr," +
" mbus_adr, liegenschafts_nr, sekundaere_adr, hydr_pruefung, mark_date, baujahr, eich_jahr," +
" umkarton_nr, palette_nr, zaehlernummer, prefix, suffix, z_nr_komplett, anbid, id_benutzer) " +
"VALUES (:1, :2, :3, :4, :5, :6, :7, :8, :9, :10, :11, :12, :13, :14, :15, :16, :17, :18, :19, :20)", conn);
" mbus_adr, liegenschafts_nr, sekundaere_adr, hydr_pruefung, mark_date, baujahr, eich_jahr, umkarton_nr," +
" 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
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 = Convert.ToInt32(wm.RadioAddress) }); /// 8 sekundaere_adr
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
@ -1286,6 +1290,8 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
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
insertedRows = cmd.ExecuteNonQuery();
@ -1445,99 +1451,50 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
{
connection.Open();
/// STATUS='NEU'
OracleCommand cmd = new OracleCommand("SELECT auftragsnummer, sollstueck, variantencode, erste_zaehlernr, " +
"prefix, suffix, zaehlwerk, erfasst_am, sollende, zusatztext " +
"FROM vt_auftrag_pd " +
"WHERE produktion_anbid=:1 AND status='NEU' AND produktion_usestate=0", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
OracleDataReader dr = cmd.ExecuteReader();
while (dr.Read())
foreach (string status in new string[] { "NEU", "AKTIV" })
{
string order = dr.GetString(0);
/// STATUS='NEU'
OracleCommand cmd = new OracleCommand("SELECT auftragsnummer, sollstueck, variantencode, erste_zaehlernr, prefix, " +
"suffix, zaehlwerk, erfasst_am, sollende, zusatztext, znrlaenge, modul_param " +
"FROM vt_auftrag_pd " +
"WHERE produktion_anbid=:1 AND status=:2 AND produktion_usestate=0", connection);
int sollStueck; try { sollStueck = dr.GetInt32(1); }
catch { sollStueck = 0; }
string variantenCode; try { variantenCode = dr.GetString(2); }
catch { variantenCode = string.Empty; }
int esrsteZaehlerNr; try { esrsteZaehlerNr = dr.GetInt32(3); }
catch { esrsteZaehlerNr = 1; }
//string prefix; try { prefix = dr.GetString (4); } catch { prefix = string.Empty; }
//string suffix; try { suffix = dr.GetString (5); } catch { suffix = string.Empty; }
int zaehlwerk; try { zaehlwerk = dr.GetInt32(6); }
catch { zaehlwerk = 0; }
DateTime created; try { created = dr.GetDateTime(7); }
catch { created = DateTime.Now; }
DateTime dueDate; try { dueDate = dr.GetDateTime(8); }
catch { dueDate = DateTime.Now; }
//string remark; try { remark = dr.GetString (9); } catch { remark = string.Empty; }
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Varchar2, Value = status });
var ai = new OrderDetails
OracleDataReader dr = cmd.ExecuteReader();
while (dr.Read())
{
AuftragsNummer = order,
SollStueck = sollStueck,
VariantenCode = variantenCode,
EsrsteZaehlerNr = esrsteZaehlerNr,
//Prefix = prefix,
//Suffix = suffix,
Zaehlwerk = zaehlwerk,
Created = created,
DueDate = dueDate,
//Remark = remark,
};
int i = 0;
string order = dr.GetString(i++);
int sollStueck; try { sollStueck = dr.GetInt32(i++); } catch { sollStueck = 0; }
string variantenCode; try { variantenCode = dr.GetString(i++); } catch { variantenCode = string.Empty; }
int esrsteZaehlerNr; try { esrsteZaehlerNr = dr.GetInt32(i++); } catch { esrsteZaehlerNr = 1; }
string prefix; try { prefix = dr.GetString(i++); } catch { prefix = string.Empty; }
string suffix; try { suffix = dr.GetString(i++); } catch { suffix = string.Empty; }
int zaehlwerk; try { zaehlwerk = dr.GetInt32(i++); } catch { zaehlwerk = 0; }
DateTime created; try { created = dr.GetDateTime(i++); } catch { created = DateTime.Now; }
DateTime dueDate; try { dueDate = dr.GetDateTime(i++); } catch { dueDate = DateTime.Now; }
string remark; try { remark = dr.GetString (i++); } catch { remark = string.Empty; }
int znrLaenge = dr.GetInt32(i++);
string moduleParam; try { moduleParam = dr.GetString(i++); } catch { moduleParam = string.Empty; }
orders.Add(ai);
orders.Add(new OrderDetails { AuftragsNummer = order,
SollStueck = sollStueck,
VariantenCode = variantenCode,
EsrsteZaehlerNr = esrsteZaehlerNr,
Prefix = prefix,
Suffix = suffix,
Zaehlwerk = zaehlwerk,
Created = created,
DueDate = dueDate,
Remark = remark,
SNLength = znrLaenge,
ModuleParameter = moduleParam });
}
dr.Close();
}
dr.Close();
/// STATUS='AKTIV'
cmd = new OracleCommand("SELECT auftragsnummer, sollstueck, variantencode, erste_zaehlernr, " +
"prefix, suffix, zaehlwerk, erfasst_am, sollende, zusatztext " +
"FROM vt_auftrag_pd " +
"WHERE produktion_anbid=:1 AND status='AKTIV' AND produktion_usestate=0", connection);
cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = Anbid_Producer });
dr = cmd.ExecuteReader();
while (dr.Read())
{
string order = dr.GetString(0);
int sollStueck; try { sollStueck = dr.GetInt32(1); }
catch { sollStueck = 0; }
string variantenCode; try { variantenCode = dr.GetString(2); }
catch { variantenCode = string.Empty; }
int esrsteZaehlerNr; try { esrsteZaehlerNr = dr.GetInt32(3); }
catch { esrsteZaehlerNr = 1; }
//string prefix; try { prefix = dr.GetString (4); } catch { prefix = string.Empty; }
//string suffix; try { suffix = dr.GetString (5); } catch { suffix = string.Empty; }
int zaehlwerk; try { zaehlwerk = dr.GetInt32(6); }
catch { zaehlwerk = 0; }
DateTime created; try { created = dr.GetDateTime(7); }
catch { created = DateTime.Now; }
DateTime dueDate; try { dueDate = dr.GetDateTime(8); }
catch { dueDate = DateTime.Now; }
//string remark; try { remark = dr.GetString (9); } catch { remark = string.Empty; }
var ai = new OrderDetails
{
AuftragsNummer = order,
SollStueck = sollStueck,
VariantenCode = variantenCode,
EsrsteZaehlerNr = esrsteZaehlerNr,
//Prefix = prefix,
//Suffix = suffix,
Zaehlwerk = zaehlwerk,
Created = created,
DueDate = dueDate,
//Remark = remark,
};
orders.Add(ai);
}
dr.Close();
log.InfoFormat("Oracle DB query SELECT auftragsnummer, sollstueck FROM vt_auftrag_pd WHERE ... successful. {0} order numbers read", orders.Count);
}
@ -1616,5 +1573,48 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
return false;
}
}
/// <summary>
/// Read a list of valid purchase orders.
/// </summary>
/// <param name="connection">Oracle DB connection</param>
/// <returns>List of active purchase orders</returns>
public int UpdateOrderDetails(OrderDetails auftrag)
{
if (dbCfg.DebugLevel == DebugMode.Normal)
{
OracleConnection connection = ProductionDB;
try
{
connection.Open();
OracleCommand cmd = new OracleCommand("UPDATE vt_auft_zaehlernr_pd SET akt_nummer=:1, akt_adresse=:2 " +
"WHERE auftragsnummer=:3 AND anbid=:4", connection);
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 });
int updatedRows = cmd.ExecuteNonQuery();
connection.Close();
return updatedRows;
}
catch (Exception exc)
{
log.ErrorFormat("ERROR: Oracle DB query SELECT ... FROM vt_auft_zaehlernr_pd WHERE auftragsnummer={0} failed: {1}",
auftrag.AuftragsNummer, exc.Message);
if (connection != null) connection.Close();
return 0;
}
}
else
{
return 0;
}
}
}
}

View File

@ -17,6 +17,8 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
public DateTime Created;
public DateTime DueDate;
public string Remark;
public int SNLength;
public string ModuleParameter;
public int FirstSerialNr;
public int LastSerialNr;
public int CurrentSerialNr;
@ -31,6 +33,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
Prefix = string.Empty;
Suffix = string.Empty;
Remark = string.Empty;
ModuleParameter = string.Empty;
RadioAddressPrefix = string.Empty;
RadioAddressSuffix = string.Empty;
}

View File

@ -50,6 +50,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
/// End
EnterSNs,
ConfirmSNsAndRadioAddresses,
SaveEndePro,
AwaitResponseToEndePro,
ConfirmError,
@ -103,6 +104,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
///
Step step;
DateTime savedTimestamp;
bool areNewSNsAndRadioAddressesAssigned;
System.Windows.Forms.Timer timer;
@ -229,6 +231,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
enabledInConfiguration[i] = (optoHeads[i] != null) && ((Program.LocalSettings.OptoHeadsEnabled & (1L << i)) != 0L);
}
areNewSNsAndRadioAddressesAssigned = false;
formCompleted = false;
StartForceCloseHandler();
}
@ -371,7 +374,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
startTime = DateTime.Now;
activityLabel.Text = activities[acIx].ToString();
currentActivityIx = acIx;
step = (activities[acIx] == S640Activity.Start) ? Step.WatchOptoHeads : enterSerialNumbers ? Step.EnterSNs : Step.SaveEndePro;
step = (activities[acIx] == S640Activity.Start) ? Step.WatchOptoHeads : enterSerialNumbers ? Step.EnterSNs : Step.ConfirmSNsAndRadioAddresses;
closeButton.Visible = false;
retryButton.Visible = false;
@ -426,7 +429,6 @@ namespace TBF.BenchControl.TestMethods.S640Communication
{
/// Opto head was disabled by the user
pictures[i].BackColor = DisabledColor;
messages[i].Text = Strings.Head_was_disabled_by_the_user;
}
else
{
@ -469,8 +471,11 @@ namespace TBF.BenchControl.TestMethods.S640Communication
if ((optoHeadsConfig & (1L << i)) != 0 && checkBoxes[i].Checked && optoHeads[i] != null)
{
/// Save PCB Number of the water meter
ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNrAux = optoHeads[i].PcbNumber.ToString(); /// PCB number (640)
ProcessData.BatchRslts.Batch.WaterMeters[i].RadioAddress = optoHeads[i].RadioAddress; /// Radio address (640)
ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNrAux = optoHeads[i].PcbNumber.ToString(); /// PCB number (640)
#if ORACLE_DB
ProcessData.BatchRslts.Batch.WaterMeters[i].OriRadioAddress = /// Original radio address (640)
#endif
ProcessData.BatchRslts.Batch.WaterMeters[i].RadioAddress = optoHeads[i].RadioAddress.ToString(); /// New radio address (640)
}
else
{
@ -478,6 +483,8 @@ namespace TBF.BenchControl.TestMethods.S640Communication
ProcessData.BatchRslts.Batch.WaterMeters[i].Disabled = true;
}
}
checkBoxes[i].Enabled = false;
}
step = Step.SaveStartPro;
@ -576,6 +583,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
else
{
progressBar1.Visible = false;
closeButton.Text = Strings.CloseBtnText;
closeButton.Visible = true;
retryButton.Visible = true;
}
@ -586,6 +594,16 @@ namespace TBF.BenchControl.TestMethods.S640Communication
/// Don't do anything, move to the next step in closeButton_Click(...)
}
///--------------------------------------------------------------------------
else if (step == Step.ConfirmSNsAndRadioAddresses)
{
if (!areNewSNsAndRadioAddressesAssigned)
{
AssignNewSNsAndRadioAddresses(optoHeads);
closeButton.Visible = true;
closeButton.Text = Strings.Continue;
}
}
///--------------------------------------------------------------------------
else if (step == Step.SaveEndePro)
{
activityLabel.Text = string.Format("End: SIRT Communication");
@ -606,6 +624,11 @@ namespace TBF.BenchControl.TestMethods.S640Communication
progressBar1.Maximum = Math.Max(fileExchangeTimeout, 1);
progressBar1.Value = 0;
if (ProcessData.OracleDB != null && ProcessData.OrderDetails != null)
{
int updatedCount = ProcessData.OracleDB.UpdateOrderDetails(ProcessData.OrderDetails);
}
step = Step.AwaitResponseToEndePro;
}
///--------------------------------------------------------------------------
@ -642,7 +665,10 @@ namespace TBF.BenchControl.TestMethods.S640Communication
}
else
{
progressBar1.Visible = false;
closeButton.Text = Strings.CloseBtnText;
closeButton.Visible = true;
retryButton.Visible = true;
}
}
///--------------------------------------------------------------------------
@ -667,13 +693,80 @@ namespace TBF.BenchControl.TestMethods.S640Communication
}
void SaveProFile(string filename, S640Activity activity, IList<RegisterReaders.S640Stream.S640Stream> optoHeads)
bool AssignNewSNsAndRadioAddresses(RegisterReaders.S640Stream.S640Stream[] optoHeads)
{
string variant = string.IsNullOrEmpty(ProcessData.BatchRslts.Batch.WatermetersStr) ? string.Empty : ProcessData.BatchRslts.Batch.WatermetersStr;
TBF.BenchControl.Output.DB.SensusOracle.OrderDetails ord = ProcessData.OrderDetails;
///
if (ProcessData.OracleDB == null || ord == null || !ProcessData.OracleDB.ReadOrderDetails(ref ord))
{
return false;
}
if (ord.CurrentSerialNr < ord.FirstSerialNr)
{
ord.CurrentSerialNr = ord.FirstSerialNr - 1;
}
for (int i = 0; i < optoHeads.Length; i++)
{
int currentSerialNr = (ord.CurrentSerialNr < ord.FirstSerialNr)
? ord.FirstSerialNr
: ord.CurrentSerialNr + 1;
int currentRadioAddress = (ord.CurrentRadioAddress < ord.FirstRadioAddress)
? ord.FirstRadioAddress
: ord.CurrentSerialNr + 1;
Results.Entities.WaterMeter wm = ProcessData.BatchRslts.Batch.WaterMeters[i];
if (optoHeads[i] != null && optoHeads[i].PcbNumber != 0 && wm != null)
{
if (wm.PassedFromTests())
{
/// Assign numbers
wm.RadioAddress = string.Format("{0}{1}{2}", ord.RadioAddressPrefix, currentRadioAddress.ToString("D9"), ord.RadioAddressSuffix);
#if ORACLE_DB
wm.AssignedSerialNr = currentSerialNr;
string assingedSNStr = currentSerialNr.ToString(string.Format("D{0}", ord.SNLength));
wm.Prefix = ord.Prefix;
wm.Suffix = ord.Suffix;
wm.CompleteSerialNr = string.Format("{0}{1}{2}", wm.Prefix, assingedSNStr, wm.Suffix);
messages[i].Text = string.Format("pcb={0} radio={1}->{2} s/n={3}", wm.SerialNrAux, wm.OriRadioAddress, wm.RadioAddress, assingedSNStr);
#endif
ord.CurrentSerialNr = currentSerialNr;
ord.CurrentRadioAddress = currentRadioAddress;
}
else
{
/// Red background
messages[i].BackColor = Color.Pink;
}
}
}
areNewSNsAndRadioAddressesAssigned = true;
return true;
}
void SaveProFile(string filename, S640Activity activity, RegisterReaders.S640Stream.S640Stream[] optoHeads)
{
/// Variant: 1.from OrderDetails, 2.from Procedure.WatermetersStr, 3.empty
string variant = (ProcessData.OrderDetails != null && !string.IsNullOrEmpty(ProcessData.OrderDetails.VariantenCode))
? ProcessData.OrderDetails.VariantenCode /// 1
: !string.IsNullOrEmpty(ProcessData.BatchRslts.Batch.WatermetersStr)
? ProcessData.BatchRslts.Batch.WatermetersStr /// 2
: string.Empty; /// 3
/// Module parameter
string moduleParam = (pPars.ModuleParameter.ToLower().Contains("vt_auftrag_pd") && ProcessData.OrderDetails != null)
? ProcessData.OrderDetails.ModuleParameter
: pPars.ModuleParameter;
/// Purchase order and water meters count
int count = 0;
string purchaseOrder = null;
for (int i = 0; i < optoHeads.Count; i++)
for (int i = 0; i < optoHeads.Length; i++)
{
if (optoHeads[i] != null && optoHeads[i].PcbNumber != 0 && ProcessData.BatchRslts.Batch.WaterMeters[i] != null)
{
@ -685,6 +778,10 @@ namespace TBF.BenchControl.TestMethods.S640Communication
}
}
}
if (ProcessData.OrderDetails != null)
{
purchaseOrder = ProcessData.OrderDetails.AuftragsNummer;
}
using (StreamWriter file = new StreamWriter(filename))
{
@ -697,26 +794,32 @@ namespace TBF.BenchControl.TestMethods.S640Communication
ProcessData.BenchInfo.TestBenchId,
ProcessData.BenchInfo.TestBenchName,
"SensusKey"));
file.WriteLine(string.Format(" <OrderData Variantencode=\"{0}\" OrderNo=\"{1}\" ModulParameter=\"{2}\" />",
variant, (purchaseOrder != null) ? purchaseOrder : string.Empty, pPars.ModuleParameter));
variant, (purchaseOrder != null) ? purchaseOrder : string.Empty, moduleParam));
file.WriteLine(" <Meters>");
for (int i = 0; i < optoHeads.Count; i++)
for (int i = 0; i < optoHeads.Length; i++)
{
if (optoHeads[i] != null && optoHeads[i].PcbNumber != 0 && ProcessData.BatchRslts.Batch.WaterMeters[i] != null)
{
Results.Entities.WaterMeter wm = ProcessData.BatchRslts.Batch.WaterMeters[i];
if (activity == S640Activity.Start)
{
file.WriteLine(string.Format(" <Meter RadioAddress=\"{0}\" MeterNumber=\"{0}\" CustomerText=\"\" NewRadioAddress=\"{0}\" PCBNumber=\"{1}\" EncyptionKey=\"\" />",
optoHeads[i].RadioAddress.ToString(),
optoHeads[i].PcbNumber.ToString()));
wm.RadioAddress,
wm.SerialNrAux));
}
else if (activity == S640Activity.End)
{
file.WriteLine(string.Format(" <Meter RadioAddress=\"{0}\" MeterNumber=\"{1}\" CustomerText=\"{1}\" NewRadioAddress=\"{2}\" PCBNumber=\"{3}\" EncyptionKey=\"\" />",
optoHeads[i].RadioAddress.ToString(),
optoHeads[i].RadioAddress.ToString(), /// TODO: Here should be the assigned serial number
optoHeads[i].RadioAddress.ToString(), /// TODO: Here should be the new radio address
optoHeads[i].PcbNumber.ToString()));
#if ORACLE_DB
file.WriteLine(string.Format(" <Meter RadioAddress=\"{0}\" MeterNumber=\"{1}\" CustomerText=\"{2}\" NewRadioAddress=\"{3}\" PCBNumber=\"{4}\" EncyptionKey=\"\" />",
wm.OriRadioAddress,
wm.AssignedSerialNr.ToString(),
wm.AssignedSerialNr.ToString(),
wm.RadioAddress,
wm.SerialNrAux));
#endif
}
}
}
@ -738,7 +841,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
file.WriteLine(string.Format(" <OpticalTeleg Enable=\"{0}\" Minutes=\"{1}\" />", B2S(pPars.OpticalTelegramEnable), pPars.OpticalTelegramMinutes));
file.WriteLine(string.Format(" <ChangeRadio Enable=\"{0}\" />", B2S(pPars.ChangeRadioEnable)));
file.WriteLine(string.Format(" <ChangeMeterID Enable=\"{0}\" />", B2S(pPars.ChangeMeterIDEnable)));
file.WriteLine(string.Format(" <SoftSeal Enable=\"false\" />", B2S(pPars.SoftSealEnable)));
file.WriteLine(string.Format(" <SoftSeal Enable=\"{0}\" />", B2S(pPars.SoftSealEnable)));
file.WriteLine(string.Format(" <GoToSleep Enable=\"{0}\" />", B2S(pPars.GoToSleepEnable)));
file.WriteLine(string.Format(" <SaveDB Enable=\"{0}\" />", B2S(pPars.SaveDBEnable)));
file.WriteLine("</Batch>");
@ -832,6 +935,11 @@ namespace TBF.BenchControl.TestMethods.S640Communication
else if (step == Step.EnterSNs)
{
UpdateSerialNumbers();
step = Step.ConfirmSNsAndRadioAddresses;
closeButton.Visible = false;
}
else if (step == Step.ConfirmSNsAndRadioAddresses)
{
step = Step.SaveEndePro;
closeButton.Visible = false;
}
@ -849,15 +957,14 @@ namespace TBF.BenchControl.TestMethods.S640Communication
/// Update water meter properties
for (int i = 0; i < textBoxesCount; i++)
{
serialNumbers[i].Enabled = false;
if (i < ProcessData.BatchRslts.Batch.WaterMeters.Count &&
ProcessData.BatchRslts.Batch.WaterMeters[i] != null &&
!ProcessData.BatchRslts.Batch.WaterMeters[i].Disabled &&
enabledInConfiguration[i])
serialNumbers[i].Visible)
{
/// Save brass water meter body serial number
ProcessData.BatchRslts.Batch.WaterMeters[i].SerialNr = serialNumbers[i].Text;
serialNumbers[i].Enabled = false;
}
}
}
@ -978,7 +1085,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
{
nextIx = (++nextIx) % textBoxesCount;
}
while (!enabledInConfiguration[nextIx]);
while (!serialNumbers[nextIx].Visible);
/// Change focus to the next enabled text box
serialNumbers[nextIx].Focus();
@ -987,5 +1094,46 @@ namespace TBF.BenchControl.TestMethods.S640Communication
}
}
}
private void checkBoxImage1_Click(object sender, EventArgs e) { fromOptoTextBox1.Text = (textBox1.Visible = checkBoxImage1.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage2_Click(object sender, EventArgs e) { fromOptoTextBox2.Text = (textBox2.Visible = checkBoxImage2.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage3_Click(object sender, EventArgs e) { fromOptoTextBox3.Text = (textBox3.Visible = checkBoxImage3.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage4_Click(object sender, EventArgs e) { fromOptoTextBox4.Text = (textBox4.Visible = checkBoxImage4.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage5_Click(object sender, EventArgs e) { fromOptoTextBox5.Text = (textBox5.Visible = checkBoxImage5.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage6_Click(object sender, EventArgs e) { fromOptoTextBox6.Text = (textBox6.Visible = checkBoxImage6.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage7_Click(object sender, EventArgs e) { fromOptoTextBox7.Text = (textBox7.Visible = checkBoxImage7.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage8_Click(object sender, EventArgs e) { fromOptoTextBox8.Text = (textBox8.Visible = checkBoxImage8.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage9_Click(object sender, EventArgs e) { fromOptoTextBox9.Text = (textBox9.Visible = checkBoxImage9.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage10_Click(object sender, EventArgs e) { fromOptoTextBox10.Text = (textBox10.Visible = checkBoxImage10.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage11_Click(object sender, EventArgs e) { fromOptoTextBox11.Text = (textBox11.Visible = checkBoxImage11.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage12_Click(object sender, EventArgs e) { fromOptoTextBox12.Text = (textBox12.Visible = checkBoxImage12.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage13_Click(object sender, EventArgs e) { fromOptoTextBox13.Text = (textBox13.Visible = checkBoxImage13.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage14_Click(object sender, EventArgs e) { fromOptoTextBox14.Text = (textBox14.Visible = checkBoxImage14.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage15_Click(object sender, EventArgs e) { fromOptoTextBox15.Text = (textBox15.Visible = checkBoxImage15.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage16_Click(object sender, EventArgs e) { fromOptoTextBox16.Text = (textBox16.Visible = checkBoxImage16.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage17_Click(object sender, EventArgs e) { fromOptoTextBox17.Text = (textBox17.Visible = checkBoxImage17.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage18_Click(object sender, EventArgs e) { fromOptoTextBox18.Text = (textBox18.Visible = checkBoxImage18.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage19_Click(object sender, EventArgs e) { fromOptoTextBox19.Text = (textBox19.Visible = checkBoxImage19.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage20_Click(object sender, EventArgs e) { fromOptoTextBox20.Text = (textBox20.Visible = checkBoxImage20.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage21_Click(object sender, EventArgs e) { fromOptoTextBox21.Text = (textBox21.Visible = checkBoxImage21.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage22_Click(object sender, EventArgs e) { fromOptoTextBox22.Text = (textBox22.Visible = checkBoxImage22.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage23_Click(object sender, EventArgs e) { fromOptoTextBox23.Text = (textBox23.Visible = checkBoxImage23.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage24_Click(object sender, EventArgs e) { fromOptoTextBox24.Text = (textBox24.Visible = checkBoxImage24.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage25_Click(object sender, EventArgs e) { fromOptoTextBox25.Text = (textBox25.Visible = checkBoxImage25.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage26_Click(object sender, EventArgs e) { fromOptoTextBox26.Text = (textBox26.Visible = checkBoxImage26.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage27_Click(object sender, EventArgs e) { fromOptoTextBox27.Text = (textBox27.Visible = checkBoxImage27.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage28_Click(object sender, EventArgs e) { fromOptoTextBox28.Text = (textBox28.Visible = checkBoxImage28.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage29_Click(object sender, EventArgs e) { fromOptoTextBox29.Text = (textBox29.Visible = checkBoxImage29.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage30_Click(object sender, EventArgs e) { fromOptoTextBox30.Text = (textBox30.Visible = checkBoxImage30.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage31_Click(object sender, EventArgs e) { fromOptoTextBox31.Text = (textBox31.Visible = checkBoxImage31.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage32_Click(object sender, EventArgs e) { fromOptoTextBox32.Text = (textBox32.Visible = checkBoxImage32.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage33_Click(object sender, EventArgs e) { fromOptoTextBox33.Text = (textBox33.Visible = checkBoxImage33.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage34_Click(object sender, EventArgs e) { fromOptoTextBox34.Text = (textBox34.Visible = checkBoxImage34.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage35_Click(object sender, EventArgs e) { fromOptoTextBox35.Text = (textBox35.Visible = checkBoxImage35.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage36_Click(object sender, EventArgs e) { fromOptoTextBox36.Text = (textBox36.Visible = checkBoxImage36.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage37_Click(object sender, EventArgs e) { fromOptoTextBox37.Text = (textBox37.Visible = checkBoxImage37.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage38_Click(object sender, EventArgs e) { fromOptoTextBox38.Text = (textBox38.Visible = checkBoxImage38.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage39_Click(object sender, EventArgs e) { fromOptoTextBox39.Text = (textBox39.Visible = checkBoxImage39.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
private void checkBoxImage40_Click(object sender, EventArgs e) { fromOptoTextBox40.Text = (textBox40.Visible = checkBoxImage40.Checked) ? string.Empty : Strings.Head_was_disabled_by_the_user; }
}
}

View File

@ -2028,6 +2028,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage40.TabIndex = 281;
this.checkBoxImage40.TabStop = false;
this.checkBoxImage40.Visible = false;
this.checkBoxImage40.Click += new System.EventHandler(this.checkBoxImage40_Click);
//
// checkBoxImage39
//
@ -2040,6 +2041,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage39.TabIndex = 280;
this.checkBoxImage39.TabStop = false;
this.checkBoxImage39.Visible = false;
this.checkBoxImage39.Click += new System.EventHandler(this.checkBoxImage39_Click);
//
// checkBoxImage38
//
@ -2052,6 +2054,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage38.TabIndex = 279;
this.checkBoxImage38.TabStop = false;
this.checkBoxImage38.Visible = false;
this.checkBoxImage38.Click += new System.EventHandler(this.checkBoxImage38_Click);
//
// checkBoxImage37
//
@ -2064,6 +2067,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage37.TabIndex = 278;
this.checkBoxImage37.TabStop = false;
this.checkBoxImage37.Visible = false;
this.checkBoxImage37.Click += new System.EventHandler(this.checkBoxImage37_Click);
//
// checkBoxImage36
//
@ -2076,6 +2080,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage36.TabIndex = 277;
this.checkBoxImage36.TabStop = false;
this.checkBoxImage36.Visible = false;
this.checkBoxImage36.Click += new System.EventHandler(this.checkBoxImage36_Click);
//
// checkBoxImage35
//
@ -2088,6 +2093,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage35.TabIndex = 276;
this.checkBoxImage35.TabStop = false;
this.checkBoxImage35.Visible = false;
this.checkBoxImage35.Click += new System.EventHandler(this.checkBoxImage35_Click);
//
// checkBoxImage34
//
@ -2100,6 +2106,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage34.TabIndex = 275;
this.checkBoxImage34.TabStop = false;
this.checkBoxImage34.Visible = false;
this.checkBoxImage34.Click += new System.EventHandler(this.checkBoxImage34_Click);
//
// checkBoxImage33
//
@ -2112,6 +2119,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage33.TabIndex = 274;
this.checkBoxImage33.TabStop = false;
this.checkBoxImage33.Visible = false;
this.checkBoxImage33.Click += new System.EventHandler(this.checkBoxImage33_Click);
//
// checkBoxImage32
//
@ -2124,6 +2132,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage32.TabIndex = 273;
this.checkBoxImage32.TabStop = false;
this.checkBoxImage32.Visible = false;
this.checkBoxImage32.Click += new System.EventHandler(this.checkBoxImage32_Click);
//
// checkBoxImage31
//
@ -2136,6 +2145,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage31.TabIndex = 272;
this.checkBoxImage31.TabStop = false;
this.checkBoxImage31.Visible = false;
this.checkBoxImage31.Click += new System.EventHandler(this.checkBoxImage31_Click);
//
// checkBoxImage30
//
@ -2148,6 +2158,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage30.TabIndex = 271;
this.checkBoxImage30.TabStop = false;
this.checkBoxImage30.Visible = false;
this.checkBoxImage30.Click += new System.EventHandler(this.checkBoxImage30_Click);
//
// checkBoxImage29
//
@ -2160,6 +2171,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage29.TabIndex = 270;
this.checkBoxImage29.TabStop = false;
this.checkBoxImage29.Visible = false;
this.checkBoxImage29.Click += new System.EventHandler(this.checkBoxImage29_Click);
//
// checkBoxImage28
//
@ -2172,6 +2184,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage28.TabIndex = 269;
this.checkBoxImage28.TabStop = false;
this.checkBoxImage28.Visible = false;
this.checkBoxImage28.Click += new System.EventHandler(this.checkBoxImage28_Click);
//
// checkBoxImage27
//
@ -2184,6 +2197,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage27.TabIndex = 268;
this.checkBoxImage27.TabStop = false;
this.checkBoxImage27.Visible = false;
this.checkBoxImage27.Click += new System.EventHandler(this.checkBoxImage27_Click);
//
// checkBoxImage26
//
@ -2196,6 +2210,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage26.TabIndex = 267;
this.checkBoxImage26.TabStop = false;
this.checkBoxImage26.Visible = false;
this.checkBoxImage26.Click += new System.EventHandler(this.checkBoxImage26_Click);
//
// checkBoxImage25
//
@ -2208,6 +2223,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage25.TabIndex = 266;
this.checkBoxImage25.TabStop = false;
this.checkBoxImage25.Visible = false;
this.checkBoxImage25.Click += new System.EventHandler(this.checkBoxImage25_Click);
//
// checkBoxImage24
//
@ -2220,6 +2236,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage24.TabIndex = 265;
this.checkBoxImage24.TabStop = false;
this.checkBoxImage24.Visible = false;
this.checkBoxImage24.Click += new System.EventHandler(this.checkBoxImage24_Click);
//
// checkBoxImage23
//
@ -2232,6 +2249,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage23.TabIndex = 213;
this.checkBoxImage23.TabStop = false;
this.checkBoxImage23.Visible = false;
this.checkBoxImage23.Click += new System.EventHandler(this.checkBoxImage23_Click);
//
// checkBoxImage22
//
@ -2244,6 +2262,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage22.TabIndex = 209;
this.checkBoxImage22.TabStop = false;
this.checkBoxImage22.Visible = false;
this.checkBoxImage22.Click += new System.EventHandler(this.checkBoxImage22_Click);
//
// checkBoxImage21
//
@ -2256,6 +2275,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage21.TabIndex = 205;
this.checkBoxImage21.TabStop = false;
this.checkBoxImage21.Visible = false;
this.checkBoxImage21.Click += new System.EventHandler(this.checkBoxImage21_Click);
//
// checkBoxImage20
//
@ -2268,6 +2288,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage20.TabIndex = 163;
this.checkBoxImage20.TabStop = false;
this.checkBoxImage20.Visible = false;
this.checkBoxImage20.Click += new System.EventHandler(this.checkBoxImage20_Click);
//
// checkBoxImage19
//
@ -2280,6 +2301,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage19.TabIndex = 162;
this.checkBoxImage19.TabStop = false;
this.checkBoxImage19.Visible = false;
this.checkBoxImage19.Click += new System.EventHandler(this.checkBoxImage19_Click);
//
// checkBoxImage18
//
@ -2292,6 +2314,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage18.TabIndex = 161;
this.checkBoxImage18.TabStop = false;
this.checkBoxImage18.Visible = false;
this.checkBoxImage18.Click += new System.EventHandler(this.checkBoxImage18_Click);
//
// checkBoxImage17
//
@ -2304,6 +2327,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage17.TabIndex = 160;
this.checkBoxImage17.TabStop = false;
this.checkBoxImage17.Visible = false;
this.checkBoxImage17.Click += new System.EventHandler(this.checkBoxImage17_Click);
//
// checkBoxImage16
//
@ -2316,6 +2340,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage16.TabIndex = 159;
this.checkBoxImage16.TabStop = false;
this.checkBoxImage16.Visible = false;
this.checkBoxImage16.Click += new System.EventHandler(this.checkBoxImage16_Click);
//
// checkBoxImage15
//
@ -2328,6 +2353,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage15.TabIndex = 158;
this.checkBoxImage15.TabStop = false;
this.checkBoxImage15.Visible = false;
this.checkBoxImage15.Click += new System.EventHandler(this.checkBoxImage15_Click);
//
// checkBoxImage14
//
@ -2340,6 +2366,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage14.TabIndex = 157;
this.checkBoxImage14.TabStop = false;
this.checkBoxImage14.Visible = false;
this.checkBoxImage14.Click += new System.EventHandler(this.checkBoxImage14_Click);
//
// checkBoxImage13
//
@ -2352,6 +2379,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage13.TabIndex = 156;
this.checkBoxImage13.TabStop = false;
this.checkBoxImage13.Visible = false;
this.checkBoxImage13.Click += new System.EventHandler(this.checkBoxImage13_Click);
//
// checkBoxImage12
//
@ -2364,6 +2392,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage12.TabIndex = 155;
this.checkBoxImage12.TabStop = false;
this.checkBoxImage12.Visible = false;
this.checkBoxImage12.Click += new System.EventHandler(this.checkBoxImage12_Click);
//
// checkBoxImage11
//
@ -2376,6 +2405,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage11.TabIndex = 154;
this.checkBoxImage11.TabStop = false;
this.checkBoxImage11.Visible = false;
this.checkBoxImage11.Click += new System.EventHandler(this.checkBoxImage11_Click);
//
// checkBoxImage10
//
@ -2388,6 +2418,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage10.TabIndex = 153;
this.checkBoxImage10.TabStop = false;
this.checkBoxImage10.Visible = false;
this.checkBoxImage10.Click += new System.EventHandler(this.checkBoxImage10_Click);
//
// checkBoxImage9
//
@ -2400,6 +2431,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage9.TabIndex = 152;
this.checkBoxImage9.TabStop = false;
this.checkBoxImage9.Visible = false;
this.checkBoxImage9.Click += new System.EventHandler(this.checkBoxImage9_Click);
//
// checkBoxImage8
//
@ -2412,6 +2444,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage8.TabIndex = 151;
this.checkBoxImage8.TabStop = false;
this.checkBoxImage8.Visible = false;
this.checkBoxImage8.Click += new System.EventHandler(this.checkBoxImage8_Click);
//
// checkBoxImage7
//
@ -2424,6 +2457,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage7.TabIndex = 150;
this.checkBoxImage7.TabStop = false;
this.checkBoxImage7.Visible = false;
this.checkBoxImage7.Click += new System.EventHandler(this.checkBoxImage7_Click);
//
// checkBoxImage6
//
@ -2436,6 +2470,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage6.TabIndex = 149;
this.checkBoxImage6.TabStop = false;
this.checkBoxImage6.Visible = false;
this.checkBoxImage6.Click += new System.EventHandler(this.checkBoxImage6_Click);
//
// checkBoxImage5
//
@ -2448,6 +2483,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage5.TabIndex = 148;
this.checkBoxImage5.TabStop = false;
this.checkBoxImage5.Visible = false;
this.checkBoxImage5.Click += new System.EventHandler(this.checkBoxImage5_Click);
//
// checkBoxImage4
//
@ -2460,6 +2496,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage4.TabIndex = 147;
this.checkBoxImage4.TabStop = false;
this.checkBoxImage4.Visible = false;
this.checkBoxImage4.Click += new System.EventHandler(this.checkBoxImage4_Click);
//
// checkBoxImage3
//
@ -2472,6 +2509,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage3.TabIndex = 146;
this.checkBoxImage3.TabStop = false;
this.checkBoxImage3.Visible = false;
this.checkBoxImage3.Click += new System.EventHandler(this.checkBoxImage3_Click);
//
// checkBoxImage2
//
@ -2484,6 +2522,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage2.TabIndex = 145;
this.checkBoxImage2.TabStop = false;
this.checkBoxImage2.Visible = false;
this.checkBoxImage2.Click += new System.EventHandler(this.checkBoxImage2_Click);
//
// checkBoxImage1
//
@ -2496,6 +2535,7 @@ namespace TBF.BenchControl.TestMethods.S640Communication
this.checkBoxImage1.TabIndex = 144;
this.checkBoxImage1.TabStop = false;
this.checkBoxImage1.Visible = false;
this.checkBoxImage1.Click += new System.EventHandler(this.checkBoxImage1_Click);
//
// S640CommForm
//

View File

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