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

Workflow used in DataEntry.S620, LaserMarking stored to WaterMeter.Remark.

Browse Source
This commit is contained in:
Milan Hanajik
2021-11-18 14:54:03 +01:00
parent 351157dbba
commit 09a0968b76
5 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs
+4 -1
View File
@@ -34,6 +34,7 @@ namespace TBF.Rig.DataEntry.S620
readonly bool withProductionTracing;
readonly bool ordersFromProdTracing;
readonly string preSelectedPurchaseOrder;
readonly string preSelectedWorkflow;
/// To be retrieved after the form is closed
string purchaseOrder;
@@ -220,7 +221,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, string purchaseOrder = null)
public FormForMechanicalMetersWithTracing(IList<Results.Entities.WaterMeter> waterMeters, int maxWMsCount, char closeButton, bool atTheEnd, bool withProductionTracing = true, bool ordersFromProdTracing = false, string purchaseOrder = null, string workflow = null)
: this()
{
this.waterMeters = waterMeters;
@@ -231,6 +232,7 @@ namespace TBF.Rig.DataEntry.S620
this.withProductionTracing = withProductionTracing;
this.ordersFromProdTracing = ordersFromProdTracing;
this.preSelectedPurchaseOrder = purchaseOrder;
this.preSelectedWorkflow = workflow;
bodyNrText = new string[waterMeters.Count];
assignedSerialNr = new int[waterMeters.Count];
@@ -300,6 +302,7 @@ namespace TBF.Rig.DataEntry.S620
{
/// Production tracing
UpdateWorkflowCombo(workflows, (currentWorkflow != null) ? currentWorkflow.Name : Program.LocalSettings.LastWorkflow);
if (!string.IsNullOrEmpty(preSelectedWorkflow)) workflowComboBox.Text = preSelectedWorkflow;
currentWorkflow = Process.GetProcessFromName(workflows, workflowComboBox.Text);
stepsOfTheCurrentWorkflow = (currentWorkflow != null) ? currentWorkflow.Worksteps : new List<Workstep>();
currentWStep = UpdateWStepCombo(currentWorkflow, (currentWStep != null) ? currentWStep.Name : Program.LocalSettings.LastWStep);