From f2bff1d39c1562fdb19aa8260fd3adadef61abc2 Mon Sep 17 00:00:00 2001
From: Roland Drabesch <roland.drabesch@xyleminc.com>
Date: Fri, 26 Aug 2022 16:14:40 +0200
Subject: [PATCH] FinalCheck is ready for fai

---
 .../Exceptions/DB/PcbIdNotException.cs        |   2 +-
 Common/ProductionUiCordonel/FinalTest.xaml    |  31 +++--
 Common/ProductionUiCordonel/FinalTest.xaml.cs | 113 ++++++++++++++----
 .../ProductionUiCordonel/MainWindow.xaml.cs   |   2 +-
 .../ProductionProcessCheckOrderNumber.cs      |   5 +-
 .../ProductionProcessCheckSerialNumber.cs     |   7 +-
 .../Actions/ProductionProcessDone.cs          |  34 +++++-
 .../Actions/ProductionProcessShippingMode.cs  |  41 ++++++-
 .../MultiProcessController.cs                 |   4 +
 .../FinalTest/UcBarcodeInput.xaml             |   8 +-
 .../FinalTest/UcBarcodeInput.xaml.cs          |  51 ++++----
 .../UserControls/FinalTest/UcRadioCheck.xaml  |   2 +-
 .../Controllers/RadioCheckController.cs       |   2 +-
 .../SoftwareAccessHelper/LocalWebRequest.cs   |   9 +-
 14 files changed, 224 insertions(+), 87 deletions(-)

diff --git a/Common/CommonCore/Exceptions/DB/PcbIdNotException.cs b/Common/CommonCore/Exceptions/DB/PcbIdNotException.cs
index 87edfeee..d32d1a33 100644
--- a/Common/CommonCore/Exceptions/DB/PcbIdNotException.cs
+++ b/Common/CommonCore/Exceptions/DB/PcbIdNotException.cs
@@ -28,7 +28,7 @@ namespace Xylem.Common.CommonCore.Exceptions.Db
 
             sb.AppendLine("1. Retry your request.");
             sb.AppendLine("2. Check if your pcb was produced by LAA Operations.");
-            sb.AppendLine("3. Ask the source of your pcb for the password and the pcbid and let it regiuser at LAA Operations.");
+            sb.AppendLine("3. Ask the source of your pcb for the password and the pcbid and let it register at LAA Operations.");
 
             if (_lCode.HasValue)
             {
diff --git a/Common/ProductionUiCordonel/FinalTest.xaml b/Common/ProductionUiCordonel/FinalTest.xaml
index b3ca4e68..9c644d0e 100644
--- a/Common/ProductionUiCordonel/FinalTest.xaml
+++ b/Common/ProductionUiCordonel/FinalTest.xaml
@@ -6,8 +6,8 @@
         xmlns:local="clr-namespace:ProductionUiCordonel"
         xmlns:uc="clr-namespace:ProductionUiCordonel"
         mc:Ignorable="d"
-        Title="FinalTest" MinHeight="500" MinWidth="400" Height="603" Width="646" Initialized="Window_Initialized" Closing="Window_Closing">
-    <DockPanel HorizontalAlignment="Stretch" Width="634" Height="569" VerticalAlignment="Top" Margin="0,0,2,0">
+        Title="FinalTest" MinHeight="500" MinWidth="600" Height="638" Width="800" Initialized="Window_Initialized" Closing="Window_Closing" PreviewKeyDown="Window_PreviewKeyDown">
+    <DockPanel HorizontalAlignment="Stretch" Width="800" Height="600" VerticalAlignment="Top" Margin="0,0,2,0">
         <ToolBarTray DockPanel.Dock="Top" Visibility="Collapsed">
             <ToolBar>
                 <Label>Slot:</Label>
@@ -75,18 +75,19 @@
                 <RowDefinition Height="30"/>
                 <RowDefinition Height="30"/>
                 <RowDefinition Height="30"/>
-                <RowDefinition Height="238" MinHeight="150"/>
-                <RowDefinition Height="28"/>
-                <RowDefinition Height="28"/>
+                <RowDefinition Height="255" MinHeight="150"/>
+                <RowDefinition Height="38"/>
+                <RowDefinition Height="34"/>
                 <RowDefinition MinHeight="50"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition MinWidth="125" Width="125*"/>
                 <ColumnDefinition MinWidth="148" Width="158*"/>
-                <ColumnDefinition MinWidth="125" Width="221*" />
+                <ColumnDefinition MinWidth="125" Width="172*" />
+                <ColumnDefinition Width="49*"/>
                 <ColumnDefinition MinWidth="100" Width="130*"/>
             </Grid.ColumnDefinitions>
-            <Button Name="btnStart" IsEnabled="False" Content="Start" Click="ButtonBase_OnClick"  HorizontalAlignment="Left" Height="58" Margin="0,0,0,1" VerticalAlignment="Bottom" Width="122" Grid.Row="0" Grid.Column="3" Grid.RowSpan="2" />
+            <!--<Button Name="btnStart" IsEnabled="False" Content="Start" Click="ButtonBase_OnClick"  HorizontalAlignment="Left" Height="58" Margin="0,0,0,1" VerticalAlignment="Bottom" Width="122" Grid.Row="0" Grid.Column="4" Grid.RowSpan="2" />-->
             <Label Content="SerialNumber" HorizontalAlignment="Left"  Margin="10,1,0,0" VerticalAlignment="Top"  Grid.Row="0" Grid.Column="0" Height="26" Width="82"  />
             <Label Content="RadioAdress" HorizontalAlignment="Left" Margin="10,2,0,0" VerticalAlignment="Top"  Grid.Row="1" Grid.Column="0" Height="26" Width="76"   />
             <Label Content="OrderNumber" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="2" Grid.Column="0" Height="26" Width="84"   />
@@ -95,16 +96,20 @@
             <Label Content="" Name="lblSerialNumber" HorizontalAlignment="Left"  Margin="10,1,0,0" VerticalAlignment="Top"  Grid.Row="0" Grid.Column="1" Height="26" Width="240" Grid.ColumnSpan="2"  />
             <Label Content="" Name="lblRadioAdress" HorizontalAlignment="Left" Margin="10,2,0,0" VerticalAlignment="Top"  Grid.Row="1" Grid.Column="1" Height="26" Width="221" Grid.ColumnSpan="2"   />
             <Label Content="" Name="lblOrderNumber" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="2" Grid.Column="1" Height="26" Width="221" Grid.ColumnSpan="2"   />
+            <TextBox Text="" Name="txtInputHidden" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="2" Grid.Column="3" Height="26" Width="6"   />
 
             <Label Content="Status" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top"  Grid.Row="3" Grid.Column="0" Height="26" Width="84"   />
-            <Label Content="Warte auf Zähler" Name="lblCurrentProcess" Margin="10,3,10,0" VerticalAlignment="Top"  Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Height="26" RenderTransformOrigin="0.607,0.577"   />
+            <Label Content="Warte auf Zähler" Name="lblCurrentProcess" Margin="10,3,10,0" VerticalAlignment="Top"  Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="4" Height="26" RenderTransformOrigin="0.607,0.577"   />
 
-            <DataGrid Name="dgTotalProcess" ItemsSource="{Binding}"  AutoGenerateColumns="True" HorizontalAlignment="Left" Margin="10,4,0,5" Width="267" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" SelectionMode="Single" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" IsEnabled="False"/>
-            <DockPanel Name="dpSubProcess" Grid.Column="2" Margin="18,12,8,8" Grid.Row="4" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.ColumnSpan="2"/>
+            <DataGrid Name="dgTotalProcess" ItemsSource="{Binding}"  AutoGenerateColumns="True" Margin="10,4,30,5" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" SelectionMode="Single" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" IsEnabled="False"/>
+            <StackPanel Name="dpSubProcess"  Grid.Column="2" Margin="18,12,8,8" Grid.Row="4" VerticalAlignment="Stretch" HorizontalAlignment="Left"  Grid.ColumnSpan="3">
+         
+                
+            </StackPanel>
 
-            <TextBox Name="txtLog" Grid.Column="0" Grid.ColumnSpan="4"  Grid.Row="7" TextWrapping="Wrap" HorizontalAlignment="Stretch"  VerticalAlignment="Stretch" Margin="0,0,73,10" />
-            <ProgressBar Name="pbTotalProgress" Grid.Column="0" Grid.ColumnSpan="4"  Grid.Row="6" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,0,73,0" />
-            <ProgressBar Name="pbSubProgress" Grid.ColumnSpan="2" Grid.Column="2"  Grid.Row="5"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,0,73,0"/>
+            <TextBox Name="txtLog" Grid.Column="0" Grid.ColumnSpan="5"  Grid.Row="7" TextWrapping="Wrap" HorizontalAlignment="Stretch"  VerticalAlignment="Stretch" Margin="0,10,73,38" />
+            <ProgressBar Name="pbTotalProgress" Grid.Column="0" Grid.ColumnSpan="5"  Grid.Row="6" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,0,73,0" />
+            <ProgressBar Name="pbSubProgress" Grid.ColumnSpan="3" Grid.Column="2"  Grid.Row="5"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,0,73,0"/>
             <Button x:Name="btnDetect" IsEnabled="false" Content="Detect" Click="BtnDetect_Click"  HorizontalAlignment="Left" Height="58" Margin="97,0,0,0" VerticalAlignment="Bottom" Width="114" Grid.Row="0" Grid.Column="2" Grid.RowSpan="2" />
         </Grid>
 
diff --git a/Common/ProductionUiCordonel/FinalTest.xaml.cs b/Common/ProductionUiCordonel/FinalTest.xaml.cs
index ff6300cd..887861f1 100644
--- a/Common/ProductionUiCordonel/FinalTest.xaml.cs
+++ b/Common/ProductionUiCordonel/FinalTest.xaml.cs
@@ -2,12 +2,14 @@
 using ProductionUiCordonel.ProductionProcesses;
 using ProductionUiCordonel.ProductionProcesses.Actions;
 using ProductionUiCordonel.ProductionProcesses.Enum;
+using ProductionUiCordonel.UserControls.FinalTest;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
@@ -30,6 +32,7 @@ namespace ProductionUiCordonel
         public event EventHandler OnLockMeter;
         public event EventHandler OnReleaseMeter;
         public event EventHandler OrderHasChanged;
+        public event EventHandler KeyInputMainFrom;
         #region prop
 
         private GenesisMeter genesisMeter;
@@ -129,7 +132,7 @@ namespace ProductionUiCordonel
         public FinalRadioTest()
         {
             InitializeComponent();
-            SetUpBlank();
+            SetUpBlank(false);
 
 
 
@@ -413,9 +416,9 @@ namespace ProductionUiCordonel
             }
             tmrAutoDetect.Enabled = Settings.AutoDetect;
         }
-
-
-        public void SetUpBlank()
+        ProductionProcessCheckOrderNumber orderBarcode;
+        ProductionProcessCheckSerialNumber serialBarcode;
+        public void SetUpBlank(bool retry, bool abort =false)
         {
 
             pc.Processes = new List<IProductionProcess>();
@@ -428,13 +431,17 @@ namespace ProductionUiCordonel
 
 
 
-            var CheckOrder = new ProductionProcessCheckOrderNumber(OrderNumber);
-            CheckOrder.isDone += CheckOrder_isDone;
+            orderBarcode = new ProductionProcessCheckOrderNumber(OrderNumber);
+       
 
-            pc.Processes.Add(CheckOrder);               //[x] [x] [x]
-            pc.Processes.Add(new ProductionProcessCheckSerialNumber(SerialNumber));               //[x] [x] [x]
+            orderBarcode.isDone += CheckOrder_isDone;
+
+            pc.Processes.Add(orderBarcode);               //[x] [x] [x]
+
+            serialBarcode = new ProductionProcessCheckSerialNumber(SerialNumber);
+            pc.Processes.Add(serialBarcode);               //[x] [x] [x]
                                                                                                   //pc.Processes.Add(new ProductionProcessFullReadOut());           //[x] [x] [x]
-
+      
             pc.Processes.Add(new ProductionCheckShippingState());           //[x] [x] [x]
 
             pc.Processes.Add(new ProductionProcessPasswordFile());           //[x] [x] [x]
@@ -443,7 +450,7 @@ namespace ProductionUiCordonel
             //pc.Processes.Add(new ProductionProcessFinalParameterizationFix()); //[x] [x] []
             pc.Processes.Add(new ProductionProcessFinalParameterizationVakoCsd(connectProcess)); //[x] [x] []
             var radioCheck = new ProductionProcessRadioCheck();
-            CheckOrder.isDone += delegate (object sender, EventArgs e)
+            orderBarcode.isDone += delegate (object sender, EventArgs e)
             {
                 radioCheck.Ordernumber = ((ProductionProcessCheckOrderNumber)sender).Ordernumber;
             };
@@ -460,7 +467,7 @@ namespace ProductionUiCordonel
             pc.Processes.Add(new ProductionProcessLogOff());                //[] [] []
 
             var checkAttach = new ProductionProcessCheckAttachment(OrderNumber);
-            CheckOrder.isDone += (x, g) =>
+            orderBarcode.isDone += (x, g) =>
             {
                 checkAttach.OrderNumber = ((ProductionProcessCheckOrderNumber)x).Ordernumber; ;
             };
@@ -473,13 +480,21 @@ namespace ProductionUiCordonel
 
             var successeP = new ProductionProcessDone(false);
 
-            successeP.isDone += allProcessesDone;
+            successeP.isDone +=  allProcessesDone;
             pc.DoneProcess = successeP;
 
 
 
             updateStatusGrid();
             UiElmEnable(btnDetect, true);
+            if (retry)
+            {
+                runDetect();
+            }
+            else if(abort)
+            {
+                dpSubProcess.Children.Clear();
+            }   
         }
 
         private void CheckOrder_isDone(object sender, EventArgs e)
@@ -497,12 +512,20 @@ namespace ProductionUiCordonel
             OrderHasChanged?.Invoke(this, e);
         }
 
-        private void allProcessesDone(object sender, EventArgs e)
+   
+        private void allProcessesDone(object sender, Tuple<bool,bool, bool> e)
         {
             detectIsLocked = false;
-            SetUpBlank();
+            if (e.Item3)
+            {
+                printErrorNote();
+            }
+         
+            SetUpBlank(e.Item1,e.Item2);
         }
 
+        
+
         private void meterHasChanged(GenesisMeter oldMeter, GenesisMeter newMeter)
         {
             if (newMeter == null && oldMeter == null)
@@ -513,7 +536,6 @@ namespace ProductionUiCordonel
             {
                 //remove all
                 CurrentProcess = "Warte auf Zähler";
-                UiElmEnable(btnStart, false);
                 UiElmEnable(btnDetect, true);
                 Task.Run(() => { LoadDetails(); });
                 return;
@@ -524,7 +546,6 @@ namespace ProductionUiCordonel
                 return;
             }
 
-            UiElmEnable(btnStart, true);
             UiElmEnable(btnDetect, false);
             CurrentProcess = "Bitte den Startknopf drücken";
             Task.Run(() => { LoadDetails(); });
@@ -554,7 +575,7 @@ namespace ProductionUiCordonel
                     {
                         if (e != null)
                         {
-                            txtLog.Text = e.Data;
+                            txtLog.Text = e.Data + System.Environment.NewLine + txtLog.Text;
                         }
                     }
                 ));
@@ -635,7 +656,7 @@ namespace ProductionUiCordonel
                     {
                         dpSubProcess.Children.Clear();
                         dpSubProcess.Children.Add(c);
-                        DockPanel.SetDock(c, Dock.Top & Dock.Left & Dock.Right);
+                        DockPanel.SetDock(c, Dock.Top & Dock.Left);
                     }
                 ));
 
@@ -657,11 +678,7 @@ namespace ProductionUiCordonel
 
         private void ButtonBase_OnClick(Object sender, RoutedEventArgs e)
         {
-            OnLockMeter?.Invoke(sender, EventArgs.Empty);
-            btnStart.IsEnabled = false;
-            CurrentGenesisMeter.SerialNumber = SerialNumber;
-            CurrentProcess = "gestartet";
-            pc.Start(CurrentGenesisMeter);
+
 
         }
 
@@ -704,10 +721,58 @@ namespace ProductionUiCordonel
             Settings.Slot = (int)cbxSlotBox.SelectedValue;
             storeSetting();
         }
+        private void runDetect()
+        {
+            var hasDetect = Detect(true, 1);
+            btnDetect.IsEnabled = false;
+            if (hasDetect)
+            {
+                OnLockMeter?.Invoke(null, EventArgs.Empty);
 
+                CurrentGenesisMeter.SerialNumber = SerialNumber;
+                CurrentProcess = "gestartet";
+                pc.Start(CurrentGenesisMeter);
+            }
+        }
         private void BtnDetect_Click(object sender, RoutedEventArgs e)
         {
-            var hasDetect = Detect(true,1);
+            runDetect();
+        }
+        private void printErrorNote()
+        {
+            var sb = new StringBuilder();
+            var fileName = $"{DateTime.Now.ToString("yyyyMMddHHmmss")}_ReturnNoteTxt_{lblPcbID.Content}.txt";
+            sb.AppendLine($"Aufallschein         {DateTime.Now}");
+            sb.AppendLine($"----------------------------------");
+            sb.AppendLine($"PcbId                {lblPcbID.Content}");
+            sb.AppendLine($"Auftrag              {lblOrderNumber.Content}");
+            sb.AppendLine($"Seriennummer         {lblSerialNumber.Content}");
+            sb.AppendLine($"Status               {lblMessage.Text}");
+            sb.AppendLine($"-------------Meldung---------------");
+            sb.Append($"{txtLog.Text}");
+            File.WriteAllText(fileName, sb.ToString());
+            //txtLog.Text 
+            System.Diagnostics.Process.Start(fileName);
+        }
+
+        private void Window_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+
+            txtInputHidden.Focus();
+            if (e.Key == System.Windows.Input.Key.Enter)
+            {
+                if (serialBarcode?.GetUserControl() is UcBarcodeInput bar)
+                {
+                    bar?.inputKey(txtInputHidden.Text);
+                }
+                if (orderBarcode?.GetUserControl() is UcBarcodeInput obar)
+                {
+                    obar?.inputKey(txtInputHidden.Text);
+                }
+                txtInputHidden.Clear();
+            }
+
+
         }
     }
 }
diff --git a/Common/ProductionUiCordonel/MainWindow.xaml.cs b/Common/ProductionUiCordonel/MainWindow.xaml.cs
index 1910e962..8b16efde 100644
--- a/Common/ProductionUiCordonel/MainWindow.xaml.cs
+++ b/Common/ProductionUiCordonel/MainWindow.xaml.cs
@@ -425,7 +425,7 @@ namespace ProductionUiCordonel
         private void UcFinalRadioTest_OnReleaseMeter(object sender, EventArgs e)
         {
             detectIsLocked = false;
-            ucFinalRadioTest.SetUpBlank();
+            ucFinalRadioTest.SetUpBlank(false);
         }
 
 
diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckOrderNumber.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckOrderNumber.cs
index a0f678f0..63818827 100644
--- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckOrderNumber.cs
+++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckOrderNumber.cs
@@ -76,14 +76,15 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
             UserControl.SetDesc(msg);
             UserControl.SetFocusMe();
             //UserControl.Focus();
+            base.NewStatus(msg);
             UserControl.BarcodeInput += UserControl_KeyDown;
 
 
         }
 
-        private void UserControl_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        private void UserControl_KeyDown(object sender, string input)
         {
-            var a = UserControl.txtHiddenInput.Text;
+            var a = input;
 
             UserControl.txtHiddenInput.Text = "";
             if (OldOrderNumber.HasValue && a == Ordernumber.ToString())
diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckSerialNumber.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckSerialNumber.cs
index d8d44822..77298c16 100644
--- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckSerialNumber.cs
+++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessCheckSerialNumber.cs
@@ -72,15 +72,16 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
         private void StepMismatch(string msg)
         {
             base.currentProcessState = ProductionProcessState.Error;
+            base.NewStatus(msg);
             isDone?.Invoke(this, EventArgs.Empty);
 
 
 
         }
 
-        private void UserControl_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        private void UserControl_KeyDown(object sender, string input)
         {
-            var a = UserControl.txtHiddenInput.Text;
+            var a = input;
 
             UserControl.txtHiddenInput.Text = "";
             if (a.Trim().Contains(PcbSerialNumber.Trim()))
@@ -102,7 +103,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
                     }
                     else
                     {
-                        StepMismatch($"Falsche oder fehlerhafter Scan! {Environment.NewLine} Dieser Zähler müsste die ({PcbSerialNumber}) haben");
+                        StepMismatch($"Falsche oder fehlerhafter Scan! {Environment.NewLine} Dieser Zähler müsste die ({PcbSerialNumber}) haben. gescannt wurde {a}");
                     }
                 }
 
diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessDone.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessDone.cs
index a64a995e..85cae768 100644
--- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessDone.cs
+++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessDone.cs
@@ -14,7 +14,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
 {
     public class ProductionProcessDone : BaseProductionProcess
     {
-        public event EventHandler isDone;
+        public event EventHandler<Tuple<bool,bool, bool>> isDone;
         private UcDialog UserControl;
         public DialogResult Result = DialogResult.None;
         public enum DialogResult
@@ -56,13 +56,35 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
         private void StepDone()
         {
             base.currentProcessState = ProductionProcessState.Done;
-            isDone?.Invoke(null, EventArgs.Empty);
+            var retry = false;
+            var abort = false;
+            var print = false;
+            if (Error)
+            {
+                switch (Result)
+                {
+        
+                    case DialogResult.Retry:
+                        retry = true;
+                        break;
+                    case DialogResult.Print:
+                        abort = true;
+                        print = true;
+                        break;
+                    case DialogResult.Abort:
+                        abort = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            isDone?.Invoke(null, new Tuple<bool, bool,bool>(retry, abort, print));
         }
 
-        private void StepError()
+        private void StepError(string ErrorText = "Ein Fehler ist aufgetreten")
         {
-
-            UserControl.SetDesc("Errors occur");
+     
+            UserControl.SetDesc(ErrorText);
             var errorOptionList = new List<UcDialog.DialogOption>();
             var retry = new UcDialog.DialogOption("Wiederholen", "Alle Schritte werden wiederholt", () =>
             {
@@ -79,7 +101,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
             });
             var print = new UcDialog.DialogOption("Rückläuferschein drucken", "Rückläuferschein beim Zähler lassen und auf Klärung durch QS warten", () =>
             {
-                Result = DialogResult.Retry;
+                Result = DialogResult.Print;
                 StepDone();
 
             });
diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessShippingMode.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessShippingMode.cs
index 92af74be..19ca27e8 100644
--- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessShippingMode.cs
+++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessShippingMode.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading;
 using System.Windows.Controls;
 using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
+using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile;
 
 namespace ProductionUiCordonel.ProductionProcesses.Actions
 {
@@ -71,7 +72,45 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
                     var SENSUSRADIO_ExtendedAlarmMask = Meter.ReadRegister("SENSUSRADIO_ExtendedAlarmMask");
                     if (radioResetSuccess[0] == 0x02 && writeList.All(a => a == true) && SENSUSRADIO_MainAlarmMask[0] != 0)
                     {
-                        base.currentProcessState = ProductionProcessState.Done;
+                        var _meterResetPsu = new MeterResetPsu(Meter)
+                        {
+                            StoreConfigEnable = true
+                        };
+                        var rebootSucceeded = _meterResetPsu.MeterResetPsuExecute();
+                        var CheckValuesAufterBoot = new List<Tuple<string, byte[]>>();
+                        CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("METROLOGYASST_PulseLength", Meter.ReadRegister("METROLOGYASST_PulseLength")));
+                        CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("POWERMON_BatteryQuantity", Meter.ReadRegister("POWERMON_BatteryQuantity")));
+                        CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("GENESISFLOW_MeterSize", Meter.ReadRegister("GENESISFLOW_MeterSize")));
+                        CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("GENESISFLOW_CalFactor1", Meter.ReadRegister("GENESISFLOW_CalFactor1")));
+                        CheckValuesAufterBoot.Add(new Tuple<string, byte[]>("SENSUSRADIO_RadioAddress", Meter.ReadRegister("SENSUSRADIO_RadioAddress")));
+
+                        bool? hasDiffrences = null;
+                        foreach (var item in CheckValuesAufterBoot)
+                        {
+                            if (!item.Item2.SequenceEqual(Meter.ReadRegister(item.Item1)))
+                            {
+                                hasDiffrences = true;
+                            }
+                            else
+                            {
+                                if (!hasDiffrences.HasValue)
+                                {
+                                    hasDiffrences = false;
+                                }
+                            }      
+                        }
+
+                        if (rebootSucceeded && hasDiffrences.HasValue && !hasDiffrences.Value)
+                        {
+                            base.currentProcessState = ProductionProcessState.Done;
+                        }
+                        else
+                        {
+                            Meter.WriteLog("reboot compare failed");
+                            base.currentProcessState = ProductionProcessState.Error;
+                        }   
+
+                
                     }
                     else
                     {
diff --git a/Common/ProductionUiCordonel/ProductionProcesses/MultiProcessController.cs b/Common/ProductionUiCordonel/ProductionProcesses/MultiProcessController.cs
index 50dc6858..9c663f06 100644
--- a/Common/ProductionUiCordonel/ProductionProcesses/MultiProcessController.cs
+++ b/Common/ProductionUiCordonel/ProductionProcesses/MultiProcessController.cs
@@ -57,8 +57,12 @@ namespace ProductionUiCordonel.ProductionProcesses
 
                 AddProccessEvents(showLastStep);
                 showLastStep.Start(meter, canncelToken.Token);
+
+                
                 RemoveProccessEvents(showLastStep);
                 CalcAndPushOverAllProcess();
+
+       
             });
 
             t.Start();
diff --git a/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml b/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml
index 95e031eb..362e280e 100644
--- a/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml
+++ b/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml
@@ -5,12 +5,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ProductionUiCordonel.UserControls.FinalTest"
              mc:Ignorable="d" 
-             d:DesignHeight="180" d:DesignWidth="320" MouseDown="UserControl_MouseDown" Background="AliceBlue">
+             d:DesignHeight="300" d:DesignWidth="420" MouseDown="UserControl_MouseDown">
     <Grid Margin="0,0,0,0">
         <Label Content="" HorizontalAlignment="Left" Height="7" VerticalAlignment="Top" Width="264" Margin="10,0,0,0"/>
-        <Label Name="lblDescription"   Content="" Margin="0,0,26,10" HorizontalAlignment="Right" Width="284" Height="129" VerticalAlignment="Bottom"/>
-        <Label Content="Scanner Input" Margin="0,0,227,144" RenderTransformOrigin="0.5,0.5" MaxHeight="25"   FontSize="10" Height="29" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="83" />
-        <Label Name="lblInput"  Background="Beige"  Content="" Margin="0,0,74,144" FontSize="10" MaxHeight="25"  MouseDown="LblInput_MouseDown" Height="24" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="168"/>
+        <Label Name="lblDescription"   Content="" Margin="17,53,0,0" HorizontalAlignment="Left" Width="423" Height="237" VerticalAlignment="Top"/>
+        <Label Content="Scanner Input" Margin="0,0,334,259" RenderTransformOrigin="0.5,0.5" MaxHeight="25"   FontSize="10" Height="29" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="83" />
+        <Label Name="lblInput"  Background="Beige"  Content="" Margin="0,0,161,259" FontSize="10" MaxHeight="25"  MouseDown="LblInput_MouseDown" Height="24" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="168"/>
         <TextBox Name="txtHiddenInput" KeyDown="txtHiddenInput_KeyDown" Margin="118,29,125,25" Width="0" >
 
 
diff --git a/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml.cs b/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml.cs
index fb1cef7f..be091ebd 100644
--- a/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml.cs
+++ b/Common/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml.cs
@@ -1,18 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace ProductionUiCordonel.UserControls.FinalTest
@@ -22,9 +11,9 @@ namespace ProductionUiCordonel.UserControls.FinalTest
     /// </summary>
     public partial class UcBarcodeInput : UserControl
     {
-        
-         public event EventHandler<KeyEventArgs> BarcodeInput;
-        
+
+        public event EventHandler<string> BarcodeInput;
+
         public UcBarcodeInput()
         {
             InitializeComponent();
@@ -85,18 +74,28 @@ namespace ProductionUiCordonel.UserControls.FinalTest
                 ));
         }
 
+        public void inputKey(string input)
+        {
+            this.Dispatcher.Invoke(DispatcherPriority.Send,
+                new Action(() =>
+                {
+                    BarcodeInput?.Invoke(this,input);
+                }
+                ));
+        }
+
         private void txtHiddenInput_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.Key == Key.Enter)
-            {
-                
-                BarcodeInput?.Invoke(sender, e);
-            }
-            else
-            {
-                lblInput.Content = txtHiddenInput.Text;
-            }    
-      
+            //if (e.Key == Key.Enter)
+            //{
+
+            //    BarcodeInput?.Invoke(sender, e);
+            //}
+            //else
+            //{
+            //    lblInput.Content = txtHiddenInput.Text;
+            //}
+
 
         }
 
@@ -105,7 +104,7 @@ namespace ProductionUiCordonel.UserControls.FinalTest
             this.Dispatcher.Invoke(DispatcherPriority.Send,
         new Action(() =>
         {
-            txtHiddenInput.Focus();
+            //txtHiddenInput.Focus();
         }
         ));
         }
@@ -115,7 +114,7 @@ namespace ProductionUiCordonel.UserControls.FinalTest
             this.Dispatcher.Invoke(DispatcherPriority.Send,
        new Action(() =>
        {
-           txtHiddenInput.Focus();
+           //txtHiddenInput.Focus();
        }
        ));
         }
diff --git a/Common/ProductionUiCordonel/UserControls/FinalTest/UcRadioCheck.xaml b/Common/ProductionUiCordonel/UserControls/FinalTest/UcRadioCheck.xaml
index 7324a689..42c90743 100644
--- a/Common/ProductionUiCordonel/UserControls/FinalTest/UcRadioCheck.xaml
+++ b/Common/ProductionUiCordonel/UserControls/FinalTest/UcRadioCheck.xaml
@@ -43,7 +43,7 @@
         <Label Name="lblCordMax" Content="-" HorizontalAlignment="Left" Height="25" Margin="0,0,0,0" Grid.Row="2" Grid.Column="3" VerticalAlignment="Top" Width="50" Grid.ColumnSpan="2"/>
         <Label Name="lblSirtMax" Content="-" HorizontalAlignment="Left" Height="25" Margin="0,0,0,0" Grid.Row="3" Grid.Column="3" VerticalAlignment="Top" Width="50"/>
         <Button Content="Done" IsEnabled="False" Name="BtnDone" HorizontalAlignment="Left" Height="25" Grid.Row="5" VerticalAlignment="Top" Width="100" Click="BtnDone_Click"/>
-        <Button Content="Skip" IsEnabled="True" x:Name="BtnDone_Copy" HorizontalAlignment="Left" Height="25" Grid.Row="4" VerticalAlignment="Top" Width="100" Click="BtnDone_Copy_Click" />
+        <Button Content="Skip" IsEnabled="True" Visibility="Hidden" x:Name="BtnDone_Copy" HorizontalAlignment="Left" Height="25" Grid.Row="4" VerticalAlignment="Top" Width="100" Click="BtnDone_Copy_Click" />
         <Button x:Name="btnfrocePam" Content="Force a PAM" Click="BtnfrocePam_Click"  HorizontalAlignment="Left" Width="72" Grid.Row="5" Grid.Column="2" Margin="1,0,0,0" Grid.ColumnSpan="2"/>
 
 
diff --git a/Common/Service/MeterProcessState/Controllers/RadioCheckController.cs b/Common/Service/MeterProcessState/Controllers/RadioCheckController.cs
index 4bbbf725..45545475 100644
--- a/Common/Service/MeterProcessState/Controllers/RadioCheckController.cs
+++ b/Common/Service/MeterProcessState/Controllers/RadioCheckController.cs
@@ -97,7 +97,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
         /// <returns></returns>
         private bool GetLimitsFromDB(Int16 Frequenz, Int16 Nennweite, Int16 Baulaenge, Int16 BoxHead, int Variant_o, int Variant_p, out byte RSSI_Pam_Min, out byte RSSI_Pam_Max, out byte RSSI_SEMI_Min, out byte RSSI_SEMI_Max, out UInt32 LimitId)
         {
-            string sql = $"SELECT top 1 * FROM [Cordonel_Radio_RSSI_Limits] WHERE [Box_Head]={BoxHead} and [Frequency] = {Frequenz} and [Nennweite] = {Nennweite} and [Baulaenge] = {Baulaenge} order by id desc "; //and [Variant_o] = {Variant_o} and [Variant_p] = {Variant_p} ";
+            string sql = $"SELECT top 1 * FROM [Cordonel_Radio_RSSI_Limits] WHERE [Box_Head]={BoxHead} and [Frequency] = {Frequenz} and [Nennweite] = {Nennweite} and ([Baulaenge] = {Baulaenge} or [Baulaenge]  = 0) order by id desc "; //and [Variant_o] = {Variant_o} and [Variant_p] = {Variant_p} ";
 
             using (SqlCommand sqlcommand = new SqlCommand(sql, connection))
             {
diff --git a/Common/SoftwareAccessHelper/LocalWebRequest.cs b/Common/SoftwareAccessHelper/LocalWebRequest.cs
index 54a59cd9..4cdc7c83 100644
--- a/Common/SoftwareAccessHelper/LocalWebRequest.cs
+++ b/Common/SoftwareAccessHelper/LocalWebRequest.cs
@@ -80,7 +80,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
             {
 
                 var client = new RestClient(Url);
-
+                WebRequest.DefaultWebProxy = null;
                 var request = new RestRequest(Method.POST);
 
                 ServicePointManager.Expect100Continue = false;
@@ -124,7 +124,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
             {
 
                 var client = new RestClient(Url);
-
+                WebRequest.DefaultWebProxy = null;
                 var request = new RestRequest(Method.POST);
 
                 ServicePointManager.Expect100Continue = false;
@@ -167,7 +167,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
             {
 
                 var client = new RestClient(Url);
-
+                WebRequest.DefaultWebProxy = null;
                 var request = new RestRequest(Method.POST);
 
                 ServicePointManager.Expect100Continue = false;
@@ -217,6 +217,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
             {
 
                 var client = new RestClient(Url);
+                WebRequest.DefaultWebProxy = null;
                 ServicePointManager.Expect100Continue = false;
                 var request = new RestRequest(Method.POST);
 
@@ -275,7 +276,7 @@ namespace Xylem.Common.Logic.SoftwareAccessHelper
         {
 
             var client = new RestClient(Url);
-
+            WebRequest.DefaultWebProxy = null;
             var request = new RestRequest(Method.GET);
             ServicePointManager.Expect100Continue = false;
             if (!TimeoutMS.HasValue)