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

More MainWnd, MainSeq, DataEntry.S620 and OrderManagement changes, ver. 3.1.1810

Browse Source
This commit is contained in:
Milan Hanajik
2021-11-18 14:53:12 +01:00
parent a35716733d
commit 587f6dffd0
10 changed files with 666 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/ProcedureInfo.cs
+1
View File
@@ -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)
Results/BatchResults.cs
+2 -1
View File
@@ -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,
Results/Entities/Batch.cs
+3
View File
@@ -23,6 +23,7 @@ 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 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
@@ -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;
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]
TBF/Rig/DataEntry/S620/EntryForm.cs
+2 -2
View File
@@ -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
{
TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs
+24 -5
View File
@@ -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
/// </summary>
/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
public FormForMechanicalMetersWithTracing(IList<Results.Entities.WaterMeter> waterMeters, int maxWMsCount, char closeButton, bool atTheEnd, bool withProductionTracing = true, bool ordersFromProdTracing = false)
public FormForMechanicalMetersWithTracing(IList<Results.Entities.WaterMeter> 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,10 +704,20 @@ 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
{
/// From history
for (int i = 0; i < LS.PurchaseOrderHistoryCount; i++)
@@ -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();
TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.resx
+622 -70
View File
@@ -244,7 +244,7 @@
<value>Verdana, 9.75pt</value>
</data>
<data name="suffixTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>593, 37</value>
<value>948, 37</value>
</data>
<data name="suffixTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 23</value>
@@ -325,7 +325,7 @@
<value>Verdana, 9.75pt</value>
</data>
<data name="prefixTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>326, 37</value>
<value>483, 37</value>
</data>
<data name="prefixTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 23</value>
@@ -382,7 +382,7 @@
<value>True</value>
</data>
<data name="snDigitsLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>425, 37</value>
<value>780, 37</value>
</data>
<data name="snDigitsLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 23</value>
@@ -409,7 +409,7 @@
<value>True</value>
</data>
<data name="suffixLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>530, 37</value>
<value>885, 37</value>
</data>
<data name="suffixLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 23</value>
@@ -463,7 +463,7 @@
<value>True</value>
</data>
<data name="prefixLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>261, 37</value>
<value>418, 37</value>
</data>
<data name="prefixLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 23</value>
@@ -493,7 +493,7 @@
<value>Verdana, 9.75pt</value>
</data>
<data name="snDigitsTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>491, 37</value>
<value>846, 37</value>
</data>
<data name="snDigitsTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>28, 23</value>
@@ -556,7 +556,7 @@
<value>NoControl</value>
</data>
<data name="piecesCountLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>893, 37</value>
<value>266, 38</value>
</data>
<data name="piecesCountLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>70, 23</value>
@@ -586,7 +586,7 @@
<value>NoControl</value>
</data>
<data name="firstSNLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>704, 37</value>
<value>591, 37</value>
</data>
<data name="firstSNLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 23</value>
@@ -616,7 +616,7 @@
<value>Verdana, 9.75pt</value>
</data>
<data name="pcsCountTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>964, 37</value>
<value>337, 38</value>
</data>
<data name="pcsCountTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 23</value>
@@ -643,7 +643,7 @@
<value>Verdana, 9.75pt</value>
</data>
<data name="firstSNTextBox.Location" type="System.Drawing.Point, System.Drawing">
<value>791, 38</value>
<value>678, 38</value>
</data>
<data name="firstSNTextBox.Size" type="System.Drawing.Size, System.Drawing">
<value>93, 23</value>
@@ -4164,6 +4164,537 @@
<data name="&gt;&gt;snLabel2.ZOrder" xml:space="preserve">
<value>43</value>
</data>
<data name="&gt;&gt;bodyLabel2.Name" xml:space="preserve">
<value>bodyLabel2</value>
</data>
<data name="&gt;&gt;bodyLabel2.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;bodyLabel2.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;bodyLabel2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;bodyLabel.Name" xml:space="preserve">
<value>bodyLabel</value>
</data>
<data name="&gt;&gt;bodyLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;bodyLabel.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;bodyLabel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;textBox80.Name" xml:space="preserve">
<value>textBox80</value>
</data>
<data name="&gt;&gt;textBox80.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox80.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox80.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;textBox79.Name" xml:space="preserve">
<value>textBox79</value>
</data>
<data name="&gt;&gt;textBox79.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox79.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox79.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;textBox78.Name" xml:space="preserve">
<value>textBox78</value>
</data>
<data name="&gt;&gt;textBox78.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox78.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox78.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;textBox77.Name" xml:space="preserve">
<value>textBox77</value>
</data>
<data name="&gt;&gt;textBox77.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox77.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox77.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;textBox76.Name" xml:space="preserve">
<value>textBox76</value>
</data>
<data name="&gt;&gt;textBox76.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox76.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox76.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;textBox75.Name" xml:space="preserve">
<value>textBox75</value>
</data>
<data name="&gt;&gt;textBox75.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox75.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox75.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;textBox74.Name" xml:space="preserve">
<value>textBox74</value>
</data>
<data name="&gt;&gt;textBox74.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox74.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox74.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;textBox73.Name" xml:space="preserve">
<value>textBox73</value>
</data>
<data name="&gt;&gt;textBox73.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox73.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox73.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="&gt;&gt;textBox72.Name" xml:space="preserve">
<value>textBox72</value>
</data>
<data name="&gt;&gt;textBox72.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox72.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox72.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="&gt;&gt;textBox71.Name" xml:space="preserve">
<value>textBox71</value>
</data>
<data name="&gt;&gt;textBox71.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox71.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox71.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="&gt;&gt;textBox70.Name" xml:space="preserve">
<value>textBox70</value>
</data>
<data name="&gt;&gt;textBox70.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox70.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox70.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="&gt;&gt;textBox69.Name" xml:space="preserve">
<value>textBox69</value>
</data>
<data name="&gt;&gt;textBox69.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox69.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox69.ZOrder" xml:space="preserve">
<value>13</value>
</data>
<data name="&gt;&gt;textBox68.Name" xml:space="preserve">
<value>textBox68</value>
</data>
<data name="&gt;&gt;textBox68.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox68.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox68.ZOrder" xml:space="preserve">
<value>14</value>
</data>
<data name="&gt;&gt;textBox67.Name" xml:space="preserve">
<value>textBox67</value>
</data>
<data name="&gt;&gt;textBox67.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox67.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox67.ZOrder" xml:space="preserve">
<value>15</value>
</data>
<data name="&gt;&gt;textBox66.Name" xml:space="preserve">
<value>textBox66</value>
</data>
<data name="&gt;&gt;textBox66.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox66.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox66.ZOrder" xml:space="preserve">
<value>16</value>
</data>
<data name="&gt;&gt;textBox65.Name" xml:space="preserve">
<value>textBox65</value>
</data>
<data name="&gt;&gt;textBox65.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox65.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox65.ZOrder" xml:space="preserve">
<value>17</value>
</data>
<data name="&gt;&gt;textBox64.Name" xml:space="preserve">
<value>textBox64</value>
</data>
<data name="&gt;&gt;textBox64.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox64.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox64.ZOrder" xml:space="preserve">
<value>18</value>
</data>
<data name="&gt;&gt;textBox63.Name" xml:space="preserve">
<value>textBox63</value>
</data>
<data name="&gt;&gt;textBox63.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox63.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox63.ZOrder" xml:space="preserve">
<value>19</value>
</data>
<data name="&gt;&gt;textBox62.Name" xml:space="preserve">
<value>textBox62</value>
</data>
<data name="&gt;&gt;textBox62.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox62.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox62.ZOrder" xml:space="preserve">
<value>20</value>
</data>
<data name="&gt;&gt;textBox61.Name" xml:space="preserve">
<value>textBox61</value>
</data>
<data name="&gt;&gt;textBox61.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox61.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox61.ZOrder" xml:space="preserve">
<value>21</value>
</data>
<data name="&gt;&gt;textBox60.Name" xml:space="preserve">
<value>textBox60</value>
</data>
<data name="&gt;&gt;textBox60.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox60.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox60.ZOrder" xml:space="preserve">
<value>22</value>
</data>
<data name="&gt;&gt;textBox59.Name" xml:space="preserve">
<value>textBox59</value>
</data>
<data name="&gt;&gt;textBox59.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox59.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox59.ZOrder" xml:space="preserve">
<value>23</value>
</data>
<data name="&gt;&gt;textBox58.Name" xml:space="preserve">
<value>textBox58</value>
</data>
<data name="&gt;&gt;textBox58.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox58.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox58.ZOrder" xml:space="preserve">
<value>24</value>
</data>
<data name="&gt;&gt;textBox57.Name" xml:space="preserve">
<value>textBox57</value>
</data>
<data name="&gt;&gt;textBox57.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox57.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox57.ZOrder" xml:space="preserve">
<value>25</value>
</data>
<data name="&gt;&gt;textBox56.Name" xml:space="preserve">
<value>textBox56</value>
</data>
<data name="&gt;&gt;textBox56.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox56.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox56.ZOrder" xml:space="preserve">
<value>26</value>
</data>
<data name="&gt;&gt;textBox55.Name" xml:space="preserve">
<value>textBox55</value>
</data>
<data name="&gt;&gt;textBox55.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox55.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox55.ZOrder" xml:space="preserve">
<value>27</value>
</data>
<data name="&gt;&gt;textBox54.Name" xml:space="preserve">
<value>textBox54</value>
</data>
<data name="&gt;&gt;textBox54.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox54.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox54.ZOrder" xml:space="preserve">
<value>28</value>
</data>
<data name="&gt;&gt;textBox53.Name" xml:space="preserve">
<value>textBox53</value>
</data>
<data name="&gt;&gt;textBox53.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox53.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox53.ZOrder" xml:space="preserve">
<value>29</value>
</data>
<data name="&gt;&gt;textBox52.Name" xml:space="preserve">
<value>textBox52</value>
</data>
<data name="&gt;&gt;textBox52.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox52.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox52.ZOrder" xml:space="preserve">
<value>30</value>
</data>
<data name="&gt;&gt;textBox51.Name" xml:space="preserve">
<value>textBox51</value>
</data>
<data name="&gt;&gt;textBox51.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox51.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox51.ZOrder" xml:space="preserve">
<value>31</value>
</data>
<data name="&gt;&gt;textBox50.Name" xml:space="preserve">
<value>textBox50</value>
</data>
<data name="&gt;&gt;textBox50.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox50.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox50.ZOrder" xml:space="preserve">
<value>32</value>
</data>
<data name="&gt;&gt;textBox49.Name" xml:space="preserve">
<value>textBox49</value>
</data>
<data name="&gt;&gt;textBox49.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox49.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox49.ZOrder" xml:space="preserve">
<value>33</value>
</data>
<data name="&gt;&gt;textBox48.Name" xml:space="preserve">
<value>textBox48</value>
</data>
<data name="&gt;&gt;textBox48.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox48.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox48.ZOrder" xml:space="preserve">
<value>34</value>
</data>
<data name="&gt;&gt;textBox47.Name" xml:space="preserve">
<value>textBox47</value>
</data>
<data name="&gt;&gt;textBox47.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox47.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox47.ZOrder" xml:space="preserve">
<value>35</value>
</data>
<data name="&gt;&gt;textBox46.Name" xml:space="preserve">
<value>textBox46</value>
</data>
<data name="&gt;&gt;textBox46.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox46.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox46.ZOrder" xml:space="preserve">
<value>36</value>
</data>
<data name="&gt;&gt;textBox45.Name" xml:space="preserve">
<value>textBox45</value>
</data>
<data name="&gt;&gt;textBox45.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox45.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox45.ZOrder" xml:space="preserve">
<value>37</value>
</data>
<data name="&gt;&gt;textBox44.Name" xml:space="preserve">
<value>textBox44</value>
</data>
<data name="&gt;&gt;textBox44.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox44.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox44.ZOrder" xml:space="preserve">
<value>38</value>
</data>
<data name="&gt;&gt;textBox43.Name" xml:space="preserve">
<value>textBox43</value>
</data>
<data name="&gt;&gt;textBox43.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox43.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox43.ZOrder" xml:space="preserve">
<value>39</value>
</data>
<data name="&gt;&gt;textBox42.Name" xml:space="preserve">
<value>textBox42</value>
</data>
<data name="&gt;&gt;textBox42.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox42.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox42.ZOrder" xml:space="preserve">
<value>40</value>
</data>
<data name="&gt;&gt;textBox41.Name" xml:space="preserve">
<value>textBox41</value>
</data>
<data name="&gt;&gt;textBox41.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox41.Parent" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;textBox41.ZOrder" xml:space="preserve">
<value>41</value>
</data>
<data name="serialNumbersGroupBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
<data name="serialNumbersGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 210</value>
</data>
<data name="serialNumbersGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>855, 640</value>
</data>
<data name="serialNumbersGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>186</value>
</data>
<data name="serialNumbersGroupBox.Text" xml:space="preserve">
<value>Serial numbers</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.Name" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="bodyLabel2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -5190,32 +5721,53 @@
<data name="&gt;&gt;textBox41.ZOrder" xml:space="preserve">
<value>41</value>
</data>
<data name="serialNumbersGroupBox.Font" type="System.Drawing.Font, System.Drawing">
<data name="&gt;&gt;batchesCheckBox.Name" xml:space="preserve">
<value>batchesCheckBox</value>
</data>
<data name="&gt;&gt;batchesCheckBox.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;batchesCheckBox.Parent" xml:space="preserve">
<value>batchesGroupBox</value>
</data>
<data name="&gt;&gt;batchesCheckBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;flowLayoutPanel2.Name" xml:space="preserve">
<value>flowLayoutPanel2</value>
</data>
<data name="&gt;&gt;flowLayoutPanel2.Type" xml:space="preserve">
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;flowLayoutPanel2.Parent" xml:space="preserve">
<value>batchesGroupBox</value>
</data>
<data name="&gt;&gt;flowLayoutPanel2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="batchesGroupBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
<data name="serialNumbersGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 210</value>
<data name="batchesGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>882, 210</value>
</data>
<data name="serialNumbersGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>855, 640</value>
<data name="batchesGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>556, 640</value>
</data>
<data name="serialNumbersGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>186</value>
<data name="batchesGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>187</value>
</data>
<data name="serialNumbersGroupBox.Text" xml:space="preserve">
<value>Serial numbers</value>
<data name="&gt;&gt;batchesGroupBox.Name" xml:space="preserve">
<value>batchesGroupBox</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.Name" xml:space="preserve">
<value>serialNumbersGroupBox</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.Type" xml:space="preserve">
<data name="&gt;&gt;batchesGroupBox.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.Parent" xml:space="preserve">
<data name="&gt;&gt;batchesGroupBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;serialNumbersGroupBox.ZOrder" xml:space="preserve">
<value>3</value>
<data name="&gt;&gt;batchesGroupBox.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="batchesCheckBox.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -5271,30 +5823,6 @@
<data name="&gt;&gt;flowLayoutPanel2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="batchesGroupBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 14.25pt</value>
</data>
<data name="batchesGroupBox.Location" type="System.Drawing.Point, System.Drawing">
<value>882, 210</value>
</data>
<data name="batchesGroupBox.Size" type="System.Drawing.Size, System.Drawing">
<value>556, 640</value>
</data>
<data name="batchesGroupBox.TabIndex" type="System.Int32, mscorlib">
<value>187</value>
</data>
<data name="&gt;&gt;batchesGroupBox.Name" xml:space="preserve">
<value>batchesGroupBox</value>
</data>
<data name="&gt;&gt;batchesGroupBox.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;batchesGroupBox.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;batchesGroupBox.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="workflowComboBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 12pt</value>
</data>
@@ -5319,18 +5847,6 @@
<data name="&gt;&gt;workflowComboBox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="reloadWorkflowsButton.Location" type="System.Drawing.Point, System.Drawing">
<value>853, 22</value>
</data>
<data name="reloadWorkflowsButton.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 31</value>
</data>
<data name="reloadWorkflowsButton.TabIndex" type="System.Int32, mscorlib">
<value>190</value>
</data>
<data name="reloadWorkflowsButton.Text" xml:space="preserve">
<value>@</value>
</data>
<data name="&gt;&gt;reloadWorkflowsButton.Name" xml:space="preserve">
<value>reloadWorkflowsButton</value>
</data>
@@ -5370,17 +5886,29 @@
<data name="&gt;&gt;workflowGroupBox.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="workstepComboBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 12pt</value>
<data name="reloadWorkflowsButton.Location" type="System.Drawing.Point, System.Drawing">
<value>853, 22</value>
</data>
<data name="workstepComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>21, 25</value>
<data name="reloadWorkflowsButton.Size" type="System.Drawing.Size, System.Drawing">
<value>40, 31</value>
</data>
<data name="workstepComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>312, 26</value>
<data name="reloadWorkflowsButton.TabIndex" type="System.Int32, mscorlib">
<value>190</value>
</data>
<data name="workstepComboBox.TabIndex" type="System.Int32, mscorlib">
<value>189</value>
<data name="reloadWorkflowsButton.Text" xml:space="preserve">
<value>@</value>
</data>
<data name="&gt;&gt;reloadWorkflowsButton.Name" xml:space="preserve">
<value>reloadWorkflowsButton</value>
</data>
<data name="&gt;&gt;reloadWorkflowsButton.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;reloadWorkflowsButton.Parent" xml:space="preserve">
<value>workflowGroupBox</value>
</data>
<data name="&gt;&gt;reloadWorkflowsButton.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;workstepComboBox.Name" xml:space="preserve">
<value>workstepComboBox</value>
@@ -5421,6 +5949,30 @@
<data name="&gt;&gt;workstepGroupBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="workstepComboBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Verdana, 12pt</value>
</data>
<data name="workstepComboBox.Location" type="System.Drawing.Point, System.Drawing">
<value>21, 25</value>
</data>
<data name="workstepComboBox.Size" type="System.Drawing.Size, System.Drawing">
<value>312, 26</value>
</data>
<data name="workstepComboBox.TabIndex" type="System.Int32, mscorlib">
<value>189</value>
</data>
<data name="&gt;&gt;workstepComboBox.Name" xml:space="preserve">
<value>workstepComboBox</value>
</data>
<data name="&gt;&gt;workstepComboBox.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;workstepComboBox.Parent" xml:space="preserve">
<value>workstepGroupBox</value>
</data>
<data name="&gt;&gt;workstepComboBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
TBF/Rig/Sequences/MainSeq.cs
+3 -3
View File
@@ -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);
}
TBF/Rig/Sequences/MainSeqUtils.cs
+2 -1
View File
@@ -534,7 +534,7 @@ namespace TBF.Rig.Sequences
/// <param name="newBatchNr">New batch number</param>
/// <param name="procedure">Selected procedure</param>
/// <returns>Created BatchResults</returns>
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());
TBF/UI/MainWnd.cs
+4 -3
View File
@@ -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)