From 587f6dffd0f1590d6a4666894b36428ce16278c7 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 16 Nov 2021 10:06:36 +0100 Subject: [PATCH] More MainWnd, MainSeq, DataEntry.S620 and OrderManagement changes, ver. 3.1.1810 --- Common/ProcedureInfo.cs | 1 + Results/BatchResults.cs | 3 +- Results/Entities/Batch.cs | 5 +- TBF/Properties/AssemblyInfo.cs | 4 +- TBF/Rig/DataEntry/S620/EntryForm.cs | 4 +- .../FormForMechanicalMetersWithTracing.cs | 29 +- .../FormForMechanicalMetersWithTracing.resx | 692 ++++++++++++++++-- TBF/Rig/Sequences/MainSeq.cs | 6 +- TBF/Rig/Sequences/MainSeqUtils.cs | 3 +- TBF/UI/MainWnd.cs | 7 +- 10 files changed, 666 insertions(+), 88 deletions(-) diff --git a/Common/ProcedureInfo.cs b/Common/ProcedureInfo.cs index ea2b4e67d..833662ad8 100644 --- a/Common/ProcedureInfo.cs +++ b/Common/ProcedureInfo.cs @@ -18,6 +18,7 @@ namespace Common public readonly string Name; public ProcedureSelection ResolvedSource; /// ProcedureSelection.FromLocalDB or ProcedureSelection.FromSharedDB when Resolved==true public string ResolvedName; + public string Order; public string Variant; public ProcedureInfo(ProcedureSelection source, int itemNr, string name, string signature = null, string variant = null) diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs index 5dc8a4d5c..81a719b29 100644 --- a/Results/BatchResults.cs +++ b/Results/BatchResults.cs @@ -44,7 +44,7 @@ namespace Results public static BatchResults NewFromProcedure(int batchNr, int benchId, string benchName, string a1, string a2, string a3, string a4, string a5, string user, int userNr, string programVer, Config.Entities.Procedure procedure, - WaterMeterData[] waterMeterDatas, int[] waterMeterParts, string variant, + WaterMeterData[] waterMeterDatas, int[] waterMeterParts, string variant, string order, double realDensity, double atTemperature, double buoyancy) { BatchResults d = new BatchResults(waterMeterDatas.Length); @@ -67,6 +67,7 @@ namespace Results ProcedureName = procedure.Name, ProcedureDescription = procedure.Description, WatermetersStr = variant, + PurchaseOrder = order, ProcedureRevision = procedure.Revision, StartTime = DateTime.Now, SampleDensity = realDensity, diff --git a/Results/Entities/Batch.cs b/Results/Entities/Batch.cs index 62bca4f33..702ca6556 100644 --- a/Results/Entities/Batch.cs +++ b/Results/Entities/Batch.cs @@ -23,7 +23,8 @@ namespace Results.Entities public virtual int UserNumber { get; set; } public virtual string ProcedureName { get; set; } public virtual bool IsRemoteProcedure { get; set; } /// Stara Tura, not mapped to DB - public virtual string ProcedureDescription { get; set; } /// CEVAK, not mapped to DB + public virtual string PurchaseOrder { get; set; } /// Stara Tura, Nanjing, not mapped to DB + public virtual string ProcedureDescription { get; set; } /// CEVAK, not mapped to DB public virtual int ProcedureRevision { get; set; } public virtual string WatermetersStr { get; set; } /// CEVAK, not mapped to DB public virtual string Remark { get; set; } @@ -111,6 +112,7 @@ namespace Results.Entities UserName = string.Empty; ProcedureName = string.Empty; IsRemoteProcedure = false; + PurchaseOrder = null; ProcedureDescription = string.Empty; WatermetersStr = string.Empty; Remark = string.Empty; @@ -138,6 +140,7 @@ namespace Results.Entities UserNumber = oriBatch.UserNumber; ProcedureName = oriBatch.ProcedureName; IsRemoteProcedure = oriBatch.IsRemoteProcedure; + PurchaseOrder = oriBatch.PurchaseOrder; ProcedureDescription = oriBatch.ProcedureDescription; ProcedureRevision = oriBatch.ProcedureRevision; WatermetersStr = oriBatch.WatermetersStr; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 030f5410b..7d83e2fa1 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.1809.0")] -[assembly: AssemblyFileVersion("3.1.1809.0")] +[assembly: AssemblyVersion("3.1.1810.0")] +[assembly: AssemblyFileVersion("3.1.1810.0")] diff --git a/TBF/Rig/DataEntry/S620/EntryForm.cs b/TBF/Rig/DataEntry/S620/EntryForm.cs index fb8de9efa..5aa4bea35 100644 --- a/TBF/Rig/DataEntry/S620/EntryForm.cs +++ b/TBF/Rig/DataEntry/S620/EntryForm.cs @@ -133,7 +133,7 @@ namespace TBF.Rig.DataEntry.S620 { if (entryFormCfg.ProductionTracing) { - myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, false, true, entryFormCfg.OrdersFromProdTracing); + myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, false, true, entryFormCfg.OrdersFromProdTracing, (TBF.Rig.Sequences.ProcessData.BatchRslts != null) ? TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.PurchaseOrder : null); } else { @@ -146,7 +146,7 @@ namespace TBF.Rig.DataEntry.S620 { if (entryFormCfg.ProductionTracing) { - myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, true, true); + myRef.modelessDlg = new FormForMechanicalMetersWithTracing(waterMeters, entryFormCfg.MaxWMsCount, entryFormCfg.CloseButton, true, true, entryFormCfg.OrdersFromProdTracing, (TBF.Rig.Sequences.ProcessData.BatchRslts != null) ? TBF.Rig.Sequences.ProcessData.BatchRslts.Batch.PurchaseOrder : null); } else { diff --git a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs index 00316bc61..293f6642e 100644 --- a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs +++ b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs @@ -33,6 +33,7 @@ namespace TBF.Rig.DataEntry.S620 readonly bool atTheEnd; readonly bool withProductionTracing; readonly bool ordersFromProdTracing; + readonly string preSelectedPurchaseOrder; /// To be retrieved after the form is closed string purchaseOrder; @@ -219,7 +220,7 @@ namespace TBF.Rig.DataEntry.S620 /// Constructor /// /// Number of text boxes for serial numbers - public FormForMechanicalMetersWithTracing(IList waterMeters, int maxWMsCount, char closeButton, bool atTheEnd, bool withProductionTracing = true, bool ordersFromProdTracing = false) + public FormForMechanicalMetersWithTracing(IList waterMeters, int maxWMsCount, char closeButton, bool atTheEnd, bool withProductionTracing = true, bool ordersFromProdTracing = false, string purchaseOrder = null) : this() { this.waterMeters = waterMeters; @@ -229,6 +230,7 @@ namespace TBF.Rig.DataEntry.S620 this.atTheEnd = atTheEnd; this.withProductionTracing = withProductionTracing; this.ordersFromProdTracing = ordersFromProdTracing; + this.preSelectedPurchaseOrder = purchaseOrder; bodyNrText = new string[waterMeters.Count]; assignedSerialNr = new int[waterMeters.Count]; @@ -360,9 +362,16 @@ namespace TBF.Rig.DataEntry.S620 } #endif - if (atTheEnd) + bool poProcessed = false; + if (preSelectedPurchaseOrder != null) { ProcessPO(); + poProcessed = true; + } + + if (atTheEnd) + { + if (!poProcessed) ProcessPO(); UpdateSNFromTo(); AssignSerialNumbers(); } @@ -403,7 +412,7 @@ namespace TBF.Rig.DataEntry.S620 if (waterMeters[i].PassedFromTests() && !string.IsNullOrEmpty(bodyNrBoxes[i].Text) && checkBoxes[i].Checked) { int nextSN = GetNextSerialNr(); - serialNrBoxes[i].Text = (nextSN > 0) ? nextSN.ToString() : string.Empty; + serialNrBoxes[i].Text = (nextSN > 0) ? nextSN.ToString(string.Format("D{0}", snDigits)) : string.Empty; } else { @@ -695,8 +704,18 @@ namespace TBF.Rig.DataEntry.S620 { } - if (LS.PurchaseOrderHistoryCount > 0 && orderCB.Items.Contains(LS.PurchaseOrderHistory[0])) + if (preSelectedPurchaseOrder != null) + { + orderCB.Text = preSelectedPurchaseOrder; + } + else if (LS.PurchaseOrderHistoryCount > 0 && orderCB.Items.Contains(LS.PurchaseOrderHistory[0])) + { orderCB.Text = LS.PurchaseOrderHistory[0]; + } + else + { + orderCB.Text = string.Empty; + } } else { @@ -739,7 +758,7 @@ namespace TBF.Rig.DataEntry.S620 (suffix != null) ? suffix : string.Empty); disabled[i] = !checkBoxes[i].Checked; } - purchaseOrder = orderCB.Text; + purchaseOrder = (preSelectedPurchaseOrder != null) ? preSelectedPurchaseOrder : orderCB.Text; SaveProductionTracingRecords(); diff --git a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.resx b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.resx index b479684e0..541742e97 100644 --- a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.resx +++ b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.resx @@ -244,7 +244,7 @@ Verdana, 9.75pt - 593, 37 + 948, 37 93, 23 @@ -325,7 +325,7 @@ Verdana, 9.75pt - 326, 37 + 483, 37 93, 23 @@ -382,7 +382,7 @@ True - 425, 37 + 780, 37 63, 23 @@ -409,7 +409,7 @@ True - 530, 37 + 885, 37 63, 23 @@ -463,7 +463,7 @@ True - 261, 37 + 418, 37 65, 23 @@ -493,7 +493,7 @@ Verdana, 9.75pt - 491, 37 + 846, 37 28, 23 @@ -556,7 +556,7 @@ NoControl - 893, 37 + 266, 38 70, 23 @@ -586,7 +586,7 @@ NoControl - 704, 37 + 591, 37 86, 23 @@ -616,7 +616,7 @@ Verdana, 9.75pt - 964, 37 + 337, 38 63, 23 @@ -643,7 +643,7 @@ Verdana, 9.75pt - 791, 38 + 678, 38 93, 23 @@ -4164,6 +4164,537 @@ 43 + + bodyLabel2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 0 + + + bodyLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 1 + + + textBox80 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 2 + + + textBox79 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 3 + + + textBox78 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 4 + + + textBox77 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 5 + + + textBox76 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 6 + + + textBox75 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 7 + + + textBox74 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 8 + + + textBox73 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 9 + + + textBox72 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 10 + + + textBox71 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 11 + + + textBox70 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 12 + + + textBox69 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 13 + + + textBox68 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 14 + + + textBox67 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 15 + + + textBox66 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 16 + + + textBox65 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 17 + + + textBox64 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 18 + + + textBox63 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 19 + + + textBox62 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 20 + + + textBox61 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 21 + + + textBox60 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 22 + + + textBox59 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 23 + + + textBox58 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 24 + + + textBox57 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 25 + + + textBox56 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 26 + + + textBox55 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 27 + + + textBox54 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 28 + + + textBox53 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 29 + + + textBox52 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 30 + + + textBox51 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 31 + + + textBox50 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 32 + + + textBox49 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 33 + + + textBox48 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 34 + + + textBox47 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 35 + + + textBox46 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 36 + + + textBox45 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 37 + + + textBox44 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 38 + + + textBox43 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 39 + + + textBox42 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 40 + + + textBox41 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + serialNumbersGroupBox + + + 41 + + + Verdana, 14.25pt + + + 14, 210 + + + 855, 640 + + + 186 + + + Serial numbers + + + serialNumbersGroupBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + True @@ -5190,32 +5721,53 @@ 41 - + + batchesCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + batchesGroupBox + + + 0 + + + flowLayoutPanel2 + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + batchesGroupBox + + + 1 + + Verdana, 14.25pt - - 14, 210 + + 882, 210 - - 855, 640 + + 556, 640 - - 186 + + 187 - - Serial numbers + + batchesGroupBox - - serialNumbersGroupBox - - + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 True @@ -5271,30 +5823,6 @@ 1 - - Verdana, 14.25pt - - - 882, 210 - - - 556, 640 - - - 187 - - - batchesGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Verdana, 12pt @@ -5319,18 +5847,6 @@ 1 - - 853, 22 - - - 40, 31 - - - 190 - - - @ - reloadWorkflowsButton @@ -5370,17 +5886,29 @@ 1 - - Verdana, 12pt + + 853, 22 - - 21, 25 + + 40, 31 - - 312, 26 + + 190 - - 189 + + @ + + + reloadWorkflowsButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + workflowGroupBox + + + 0 workstepComboBox @@ -5421,6 +5949,30 @@ 0 + + Verdana, 12pt + + + 21, 25 + + + 312, 26 + + + 189 + + + workstepComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + workstepGroupBox + + + 0 + True diff --git a/TBF/Rig/Sequences/MainSeq.cs b/TBF/Rig/Sequences/MainSeq.cs index 7cbb1a2c2..1011aeef5 100644 --- a/TBF/Rig/Sequences/MainSeq.cs +++ b/TBF/Rig/Sequences/MainSeq.cs @@ -377,7 +377,7 @@ namespace TBF.Rig.Sequences if (selection == Selection.RestoreBatch) { - BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, string.Empty); + BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, string.Empty, null); RestoreBatchResults(TBF.UiBridge.Bridge.BatchNr, ref BatchRslts); /// pass the original batch number of the batch to be restored } else if (selection == Selection.RestoreAndFixBatch) @@ -385,7 +385,7 @@ namespace TBF.Rig.Sequences /// /// Restore and fix a batch - part 1 (fix "Previous workstep is missing" error) /// - BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, string.Empty); + BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, string.Empty, null); RestoreBatchResults(TBF.UiBridge.Bridge.BatchNr, ref BatchRslts); /// pass the original batch number of the batch to be restored for (int i = 0; i < BatchRslts.Batch.WaterMeters.Count; i++) @@ -426,7 +426,7 @@ namespace TBF.Rig.Sequences else if (selection != Selection.RestoreInterruptedSession) { /// This is a regular session => initialize BatchRslts - BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, Bridge.SelectedProcedure.Variant); + BatchRslts = CreateNewBatchResults(newBatchNr, StateMachine.Procedure, Bridge.SelectedProcedure.Variant, Bridge.SelectedProcedure.Order); } diff --git a/TBF/Rig/Sequences/MainSeqUtils.cs b/TBF/Rig/Sequences/MainSeqUtils.cs index 4565ff660..b76aa8aeb 100644 --- a/TBF/Rig/Sequences/MainSeqUtils.cs +++ b/TBF/Rig/Sequences/MainSeqUtils.cs @@ -534,7 +534,7 @@ namespace TBF.Rig.Sequences /// New batch number /// Selected procedure /// Created BatchResults - Results.BatchResults CreateNewBatchResults(int newBatchNr, Procedure procedure, string variant) + Results.BatchResults CreateNewBatchResults(int newBatchNr, Procedure procedure, string variant, string order) { /// /// Prepare new water meters @@ -620,6 +620,7 @@ namespace TBF.Rig.Sequences waterMeterData, waterMeterParts, variant, + order, Formulas.RealDensity(), Formulas.AtTemperature(), Formulas.Buoyancy()); diff --git a/TBF/UI/MainWnd.cs b/TBF/UI/MainWnd.cs index 460e6ff26..a12b7f89c 100644 --- a/TBF/UI/MainWnd.cs +++ b/TBF/UI/MainWnd.cs @@ -871,7 +871,7 @@ namespace TBF.UI var orderInfo = mySqlOrders.FirstOrDefault(x => x.POName == procedureComboBox.Text); if (orderInfo != null) { - UpdateProcedure(0, orderInfo.TestProcedure, ProcedureSelection.OrderNrFromTracingDB); + UpdateProcedure(0, orderInfo.TestProcedure, ProcedureSelection.OrderNrFromTracingDB, procedureComboBox.Text); } } else if (benchInfo.Sources.Contains(ProcedureSelection.OrderNrFromOracleDB)) @@ -879,7 +879,7 @@ namespace TBF.UI var orderDetails = oracleOrders.FirstOrDefault(x => x.AuftragsNummer == procedureComboBox.Text); if (orderDetails != null) { - UpdateProcedure(0, orderDetails.AuftragsNummer, ProcedureSelection.OrderNrFromOracleDB); + UpdateProcedure(0, orderDetails.AuftragsNummer, ProcedureSelection.OrderNrFromOracleDB, procedureComboBox.Text); } } } @@ -898,12 +898,13 @@ namespace TBF.UI } } - public void UpdateProcedure(int procedureNr, string procedureName, ProcedureSelection source) + public void UpdateProcedure(int procedureNr, string procedureName, ProcedureSelection source, string order = null) { SelectedProcedure = new ProcedureInfo(source, 0, procedureName, ProcedureInfo.GetSignature(source, (Rig.Sequences.ProcessData.BenchInfo != null) ? Rig.Sequences.ProcessData.BenchInfo.Sources : null)); SelectedProcedure.ResolvedSource = ProcedureSelection.FromLocalDB; SelectedProcedure.ResolvedName = procedureName; + SelectedProcedure.Order = order; BenchControlPanel.ReloadTests(); if (CurrentProcedure != null && CurrentProcedure.Description != null)