diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 5e14c40e1..35c55adca 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.1.1836.0")] -[assembly: AssemblyFileVersion("3.1.1836.0")] +[assembly: AssemblyVersion("3.1.1839.0")] +[assembly: AssemblyFileVersion("3.1.1839.0")] diff --git a/TBF/Rig/DataEntry/S620/EntryForm.cs b/TBF/Rig/DataEntry/S620/EntryForm.cs index f917527e3..370888f66 100644 --- a/TBF/Rig/DataEntry/S620/EntryForm.cs +++ b/TBF/Rig/DataEntry/S620/EntryForm.cs @@ -8,6 +8,8 @@ using Config.Entities; using TBF.Rig; using TBF.Rig.GenericDevices; using TBF.Rig.Sequences; +using NHibernate; +using Common; namespace TBF.Rig.DataEntry.S620 { @@ -134,8 +136,33 @@ namespace TBF.Rig.DataEntry.S620 { if (entryFormCfg.ProductionTracing) { - string order = ProcessData.SelectedProcedure.OrderInfo.POName; - string workflow = ProcessData.SelectedProcedure.Workflow; + string order; + string workflow; + if (ProcessData.OrderInfo is SharedDatabase.Entities.OrderInfo && ProcessData.TracingDB != null) + { + ProcessData.Workflow = null; + ProcessData.Workstep = null; + + try + { + ISession session = ProcessData.TracingDB.SessionFactory.OpenSession(); + ProcessData.Workflow = ProcessData.TracingDB.GetWorkflowAndWorkstep(ProcessData.OrderInfo, out ProcessData.Workstep, session); + session.Close(); + order = ProcessData.OrderInfo.POName; + workflow = ProcessData.Workflow.Name; + } + catch (Exception exc) + { + order = string.Empty; + workflow = string.Empty; + log.ErrorFormat("Unable to load order, workflow or workstep: {0}", exc.Message); + } + } + else + { + order = string.Empty; + workflow = string.Empty; + } myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, false, true, entryFormCfg.OrdersFromProdTracing, order, workflow); diff --git a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.Designer.cs b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.Designer.cs index 88c181392..409f970c7 100644 --- a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.Designer.cs +++ b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.Designer.cs @@ -1607,7 +1607,7 @@ namespace TBF.Rig.DataEntry.S620 this.Name = "FormForMechanicalMetersWithTracing"; this.TopMost = true; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormForMechanicalMetersWithTracing_FormClosing); - this.Load += new System.EventHandler(this.CycleBeginningForm_Load); + this.Load += new System.EventHandler(this.FormForMechanicalMetersWithTracing_Load); this.Shown += new System.EventHandler(this.FormForMechanicalMetersWithTracing_Shown); this.Paint += new System.Windows.Forms.PaintEventHandler(this.FormForMechanicalMetersWithTracing_Paint); this.orderGroupBox.ResumeLayout(false); diff --git a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs index a1d119f56..5dd8c822b 100644 --- a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs +++ b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs @@ -295,7 +295,7 @@ namespace TBF.Rig.DataEntry.S620 }; } - private void CycleBeginningForm_Load(object sender, EventArgs e) + private void FormForMechanicalMetersWithTracing_Load(object sender, EventArgs e) { Localize(); @@ -408,22 +408,46 @@ namespace TBF.Rig.DataEntry.S620 //clearButton.Text = Strings.ClearBtnText; } - void AssignSerialNumbers() + /// + /// Assign serial numbers + /// + /// true = s/n-s are assigned, false = order information or DB connection + bool AssignSerialNumbers() { assignedSNs.Clear(); + + var order = ProcessData.OrderInfo; + var oraOrder = order as TBF.Rig.Output.DB.SensusOracle.OrderDetails; + /// + if (oraOrder != null && (ProcessData.OracleDB == null || !ProcessData.OracleDB.ReadOrderDetails(ref oraOrder))) + { + return false; + } + + for (int i = 0; i < textBoxesCount; i++) { - if (waterMeters[i].PassedFromTests() && !string.IsNullOrEmpty(bodyNrBoxes[i].Text) && checkBoxes[i].Checked) + bool passed = waterMeters[i].PassedFromTests(); + if (passed && !string.IsNullOrEmpty(bodyNrBoxes[i].Text) && checkBoxes[i].Checked) { - int nextSN = GetNextSerialNr(); - serialNrBoxes[i].Text = (nextSN > 0) ? nextSN.ToString(string.Format("D{0}", snDigits)) : string.Empty; + int currentSerialNr = (order.CurrentSN < order.SNFirst) + ? order.SNFirst + : order.CurrentSN + 1; + + serialNrBoxes[i].Text = currentSerialNr.ToString(string.Format("D{0}", snDigits)); + + order.CurrentSN = currentSerialNr; + order.CurrentPcsCount++; } else { serialNrBoxes[i].Text = string.Empty; } } + Invalidate(rect); + + return true; } private void FormForMechanicalMetersWithTracing_Shown(object sender, EventArgs e) @@ -755,16 +779,19 @@ namespace TBF.Rig.DataEntry.S620 for (int i = 0; i < textBoxesCount; i++) { bodyNrText[i] = bodyNrBoxes[i].Text; - assignedSerialNr[i] = int.TryParse(serialNrBoxes[i].Text, out itmp) ? itmp : 0; - completeSerialNr[i] = string.Format("{0}{1}{2}", - (prefix != null) ? prefix : string.Empty, - assignedSerialNr[i].ToString(string.Format("D{0}", Math.Max(snDigits, 1))), - (suffix != null) ? suffix : string.Empty); + if (atTheEnd) + { + assignedSerialNr[i] = int.TryParse(serialNrBoxes[i].Text, out itmp) ? itmp : 0; + completeSerialNr[i] = string.Format("{0}{1}{2}", + (prefix != null) ? prefix : string.Empty, + assignedSerialNr[i].ToString(string.Format("D{0}", Math.Max(snDigits, 1))), + (suffix != null) ? suffix : string.Empty); + } disabled[i] = !checkBoxes[i].Checked; } purchaseOrder = (preSelectedPurchaseOrder != null) ? preSelectedPurchaseOrder : orderCB.Text; - SaveProductionTracingRecords(); + //SaveProductionTracingRecords(); /// TODO completed = true; Close(); @@ -870,46 +897,46 @@ namespace TBF.Rig.DataEntry.S620 } - private void textBox1_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 0); } - private void textBox2_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 1); } - private void textBox3_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 2); } - private void textBox4_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 3); } - private void textBox5_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 4); } - private void textBox6_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 5); } - private void textBox7_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 6); } - private void textBox8_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 7); } - private void textBox9_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 8); } - private void textBox10_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 9); } - private void textBox11_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 10); } - private void textBox12_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 11); } - private void textBox13_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 12); } - private void textBox14_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 13); } - private void textBox15_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 14); } - private void textBox16_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 15); } - private void textBox17_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 16); } - private void textBox18_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 17); } - private void textBox19_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 18); } - private void textBox20_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 19); } - private void textBox21_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 20); } - private void textBox22_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 21); } - private void textBox23_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 22); } - private void textBox24_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 23); } - private void textBox25_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 24); } - private void textBox26_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 25); } - private void textBox27_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 26); } - private void textBox28_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 27); } - private void textBox29_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 28); } - private void textBox30_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 29); } - private void textBox31_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 30); } - private void textBox32_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 31); } - private void textBox33_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 32); } - private void textBox34_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 33); } - private void textBox35_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 34); } - private void textBox36_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 35); } - private void textBox37_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 36); } - private void textBox38_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 37); } - private void textBox39_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 38); } - private void textBox40_KeyPress(object s, KeyPressEventArgs e) { BodyNoTextBoxKeyPress(s, e, 39); } + private void textBox1_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 0); } + private void textBox2_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 1); } + private void textBox3_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 2); } + private void textBox4_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 3); } + private void textBox5_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 4); } + private void textBox6_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 5); } + private void textBox7_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 6); } + private void textBox8_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 7); } + private void textBox9_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 8); } + private void textBox10_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 9); } + private void textBox11_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 10); } + private void textBox12_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 11); } + private void textBox13_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 12); } + private void textBox14_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 13); } + private void textBox15_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 14); } + private void textBox16_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 15); } + private void textBox17_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 16); } + private void textBox18_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 17); } + private void textBox19_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 18); } + private void textBox20_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 19); } + private void textBox21_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 20); } + private void textBox22_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 21); } + private void textBox23_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 22); } + private void textBox24_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 23); } + private void textBox25_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 24); } + private void textBox26_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 25); } + private void textBox27_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 26); } + private void textBox28_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 27); } + private void textBox29_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 28); } + private void textBox30_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 29); } + private void textBox31_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 30); } + private void textBox32_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 31); } + private void textBox33_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 32); } + private void textBox34_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 33); } + private void textBox35_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 34); } + private void textBox36_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 35); } + private void textBox37_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 36); } + private void textBox38_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 37); } + private void textBox39_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 38); } + private void textBox40_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) BodyNoTextBoxKeyPress(s, e, 39); } /// /// Process a key press within any enabled combo boxe @@ -939,46 +966,46 @@ namespace TBF.Rig.DataEntry.S620 } } - private void textBox41_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 0); } - private void textBox42_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 1); } - private void textBox43_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 2); } - private void textBox44_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 3); } - private void textBox45_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 4); } - private void textBox46_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 5); } - private void textBox47_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 6); } - private void textBox48_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 7); } - private void textBox49_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 8); } - private void textBox50_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 9); } - private void textBox51_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 10); } - private void textBox52_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 11); } - private void textBox53_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 12); } - private void textBox54_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 13); } - private void textBox55_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 14); } - private void textBox56_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 15); } - private void textBox57_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 16); } - private void textBox58_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 17); } - private void textBox59_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 18); } - private void textBox60_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 19); } - private void textBox61_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 20); } - private void textBox62_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 21); } - private void textBox63_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 22); } - private void textBox64_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 23); } - private void textBox65_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 24); } - private void textBox66_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 25); } - private void textBox67_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 26); } - private void textBox68_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 27); } - private void textBox69_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 28); } - private void textBox70_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 29); } - private void textBox71_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 30); } - private void textBox72_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 31); } - private void textBox73_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 32); } - private void textBox74_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 33); } - private void textBox75_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 34); } - private void textBox76_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 35); } - private void textBox77_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 36); } - private void textBox78_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 37); } - private void textBox79_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 38); } - private void textBox80_KeyPress(object s, KeyPressEventArgs e) { SnTextBoxKeyPress(s, e, 39); } + private void textBox41_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 0); } + private void textBox42_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 1); } + private void textBox43_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 2); } + private void textBox44_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 3); } + private void textBox45_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 4); } + private void textBox46_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 5); } + private void textBox47_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 6); } + private void textBox48_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 7); } + private void textBox49_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 8); } + private void textBox50_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 9); } + private void textBox51_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 10); } + private void textBox52_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 11); } + private void textBox53_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 12); } + private void textBox54_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 13); } + private void textBox55_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 14); } + private void textBox56_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 15); } + private void textBox57_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 16); } + private void textBox58_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 17); } + private void textBox59_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 18); } + private void textBox60_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 19); } + private void textBox61_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 20); } + private void textBox62_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 21); } + private void textBox63_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 22); } + private void textBox64_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 23); } + private void textBox65_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 24); } + private void textBox66_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 25); } + private void textBox67_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 26); } + private void textBox68_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 27); } + private void textBox69_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 28); } + private void textBox70_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 29); } + private void textBox71_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 30); } + private void textBox72_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 31); } + private void textBox73_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 32); } + private void textBox74_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 33); } + private void textBox75_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 34); } + private void textBox76_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 35); } + private void textBox77_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 36); } + private void textBox78_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 37); } + private void textBox79_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 38); } + private void textBox80_KeyPress(object s, KeyPressEventArgs e) { if (loadedOnce) SnTextBoxKeyPress(s, e, 39); } /// /// Process a key press within any enabled combo boxe @@ -1001,46 +1028,46 @@ namespace TBF.Rig.DataEntry.S620 } } - private void checkBox1_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 0); } - private void checkBox2_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 1); } - private void checkBox3_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 2); } - private void checkBox4_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 3); } - private void checkBox5_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 4); } - private void checkBox6_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 5); } - private void checkBox7_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 6); } - private void checkBox8_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 7); } - private void checkBox9_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 8); } - private void checkBox10_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 9); } - private void checkBox11_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 10); } - private void checkBox12_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 11); } - private void checkBox13_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 12); } - private void checkBox14_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 13); } - private void checkBox15_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 14); } - private void checkBox16_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 15); } - private void checkBox17_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 16); } - private void checkBox18_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 17); } - private void checkBox19_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 18); } - private void checkBox20_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 19); } - private void checkBox21_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 20); } - private void checkBox22_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 21); } - private void checkBox23_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 22); } - private void checkBox24_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 23); } - private void checkBox25_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 24); } - private void checkBox26_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 25); } - private void checkBox27_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 26); } - private void checkBox28_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 27); } - private void checkBox29_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 28); } - private void checkBox30_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 29); } - private void checkBox31_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 30); } - private void checkBox32_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 31); } - private void checkBox33_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 32); } - private void checkBox34_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 33); } - private void checkBox35_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 34); } - private void checkBox36_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 35); } - private void checkBox37_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 36); } - private void checkBox38_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 37); } - private void checkBox39_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 38); } - private void checkBox40_CheckedChanged(object s, EventArgs e) { ProcessCheckBoxChecked(s, e, 39); } + private void checkBox1_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 0); } + private void checkBox2_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 1); } + private void checkBox3_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 2); } + private void checkBox4_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 3); } + private void checkBox5_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 4); } + private void checkBox6_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 5); } + private void checkBox7_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 6); } + private void checkBox8_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 7); } + private void checkBox9_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 8); } + private void checkBox10_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 9); } + private void checkBox11_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 10); } + private void checkBox12_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 11); } + private void checkBox13_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 12); } + private void checkBox14_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 13); } + private void checkBox15_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 14); } + private void checkBox16_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 15); } + private void checkBox17_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 16); } + private void checkBox18_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 17); } + private void checkBox19_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 18); } + private void checkBox20_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 19); } + private void checkBox21_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 20); } + private void checkBox22_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 21); } + private void checkBox23_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 22); } + private void checkBox24_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 23); } + private void checkBox25_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 24); } + private void checkBox26_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 25); } + private void checkBox27_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 26); } + private void checkBox28_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 27); } + private void checkBox29_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 28); } + private void checkBox30_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 29); } + private void checkBox31_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 30); } + private void checkBox32_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 31); } + private void checkBox33_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 32); } + private void checkBox34_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 33); } + private void checkBox35_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 34); } + private void checkBox36_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 35); } + private void checkBox37_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 36); } + private void checkBox38_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 37); } + private void checkBox39_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 38); } + private void checkBox40_CheckedChanged(object s, EventArgs e) { if (loadedOnce) ProcessCheckBoxChecked(s, e, 39); } /// void ProcessCheckBoxChecked(object sender, EventArgs e, int wmNr0) { diff --git a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs index 6032da078..e811a3559 100644 --- a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs +++ b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs @@ -913,6 +913,12 @@ namespace TBF.Rig.TestMethods.S640Communication } + /// + /// Assign serial numbers + /// + /// + /// + /// true = s/n-s are assigned, false = order information or DB connection bool AssignNewSNsAndRadioAddresses(IList waterMeters, RegisterReaders.S640Stream.S640Stream[] optoHeads) { var order = ProcessData.OrderInfo;