From 95881d58118be0c2006072f2c55ffacc5c6d37e7 Mon Sep 17 00:00:00 2001
From: Roland Drabesch <roland.drabesch@xyleminc.com>
Date: Wed, 9 Apr 2025 12:56:32 +0200
Subject: [PATCH] Start

---
 Common/Common.sln                             |  77 +-
 .../ProductionUiCordonel/App.config           |   1 +
 .../ProductionUiCordonel/App.xaml.cs          |  20 +-
 .../ProductionUiCordonel/Picking.xaml         | 155 +++
 .../ProductionUiCordonel/Picking.xaml.cs      | 927 ++++++++++++++++++
 .../BaseProductionProcess.cs                  |   3 +-
 .../Enum/PickingProcessState.cs               |  73 ++
 .../ProductionUiCordonel.csproj               |   8 +
 .../ProductionUiCordonel/TextFile1.txt        |   1 +
 Common/Service/MeterProcessState/Web.config   |  94 +-
 .../SoftwareAccessHelper/LocalWebRequest.cs   |   1 -
 .../SoftwareAccessHelper.csproj               |  46 +-
 Common/SoftwareAccessHelper/packages.config   |   7 +
 13 files changed, 1288 insertions(+), 125 deletions(-)
 create mode 100644 Common/Production/ProductionUiCordonel/Picking.xaml
 create mode 100644 Common/Production/ProductionUiCordonel/Picking.xaml.cs
 create mode 100644 Common/Production/ProductionUiCordonel/ProductionProcesses/Enum/PickingProcessState.cs
 create mode 100644 Common/Production/ProductionUiCordonel/TextFile1.txt

diff --git a/Common/Common.sln b/Common/Common.sln
index 5f330aa2..8c3db669 100644
--- a/Common/Common.sln
+++ b/Common/Common.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.33423.255
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33717.318
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{7A0EE7B8-6B7E-41E9-B679-319C8CA48CF1}"
 EndProject
@@ -165,8 +165,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtocolCore", "Hardware\In
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LaaProduction", "LaaProduction\LaaProduction.csproj", "{FD30EB7A-7809-4E62-9374-791D31877D6D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonConsole", "CommonConsole\CommonConsole.csproj", "{AFC428F5-0141-4A3F-BEF2-470A89D972F6}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OmniPlus", "OmniPlus", "{68323534-4337-4E3A-89BC-11D8BB55343A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniPlus", "OmniPlus\OmniPlus\OmniPlus.csproj", "{F8D84B9A-0FCF-4083-B067-8C39B7314152}"
@@ -367,9 +365,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MockGenesis", "Hardware\WaterMeter\Genesis\MockGenesis\MockGenesis.csproj", "{D7A7E1FF-D024-407F-B30D-4C519CFA7BF1}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Utils\DateTimeServerShared\DateTimeServerShared.projitems*{4806d89a-fbfb-41bc-aaa7-2242444bf55a}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		_MANUAL_CONTROL|Any CPU = _MANUAL_CONTROL|Any CPU
 		_MANUAL_CONTROL|Mixed Platforms = _MANUAL_CONTROL|Mixed Platforms
@@ -3984,70 +3979,6 @@ Global
 		{FD30EB7A-7809-4E62-9374-791D31877D6D}.XP32bit|x64.Build.0 = Release|Any CPU
 		{FD30EB7A-7809-4E62-9374-791D31877D6D}.XP32bit|x86.ActiveCfg = Release|Any CPU
 		{FD30EB7A-7809-4E62-9374-791D31877D6D}.XP32bit|x86.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|Mixed Platforms.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|x64.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|x64.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|x86.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}._MANUAL_CONTROL|x86.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|Any CPU.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|Mixed Platforms.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|x64.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|x64.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|x86.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.COM|x86.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|x64.Build.0 = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Debug|x86.Build.0 = Debug|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|Any CPU.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|Mixed Platforms.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|x64.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|x64.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|x86.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.GenesisDisplayTool_V01|x86.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|Any CPU.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|Mixed Platforms.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|x64.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|x64.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|x86.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.PerformTest|x86.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|x64.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|x86.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.Release|x86.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|Any CPU.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|Mixed Platforms.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|x64.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|x64.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|x86.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.ReleaseTest|x86.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|Any CPU.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|Mixed Platforms.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|x64.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|x64.Build.0 = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|x86.ActiveCfg = Release|Any CPU
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6}.XP32bit|x86.Build.0 = Release|Any CPU
 		{F8D84B9A-0FCF-4083-B067-8C39B7314152}._MANUAL_CONTROL|Any CPU.ActiveCfg = Release|Any CPU
 		{F8D84B9A-0FCF-4083-B067-8C39B7314152}._MANUAL_CONTROL|Any CPU.Build.0 = Release|Any CPU
 		{F8D84B9A-0FCF-4083-B067-8C39B7314152}._MANUAL_CONTROL|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -5914,7 +5845,6 @@ Global
 		{BA17D20E-0CEB-4B27-9772-2392BD750ED5} = {C9393A97-C0BB-4D59-A879-B572BE04CE15}
 		{8BDD2789-96D4-43EA-AAD7-0F49D0347998} = {EC10DAFE-88CF-42D5-99E7-D247938B6430}
 		{FD30EB7A-7809-4E62-9374-791D31877D6D} = {696A94BE-7237-4AE2-9E36-6059DE519971}
-		{AFC428F5-0141-4A3F-BEF2-470A89D972F6} = {C17363DF-A043-4F25-8EBA-2B3B078227DC}
 		{F8D84B9A-0FCF-4083-B067-8C39B7314152} = {68323534-4337-4E3A-89BC-11D8BB55343A}
 		{01A28A70-D5E6-4898-8C22-E64400A3B80F} = {68323534-4337-4E3A-89BC-11D8BB55343A}
 		{4806D89A-FBFB-41BC-AAA7-2242444BF55A} = {FA3B769A-E83E-40F0-923A-DFA124AF0C2C}
@@ -5993,6 +5923,9 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4BCB7B69-696C-436A-86F7-C91EA5588164}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		Utils\DateTimeServerShared\DateTimeServerShared.projitems*{4806d89a-fbfb-41bc-aaa7-2242444bf55a}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(Performance) = preSolution
 		HasPerformanceSessions = true
 	EndGlobalSection
diff --git a/Common/Production/ProductionUiCordonel/App.config b/Common/Production/ProductionUiCordonel/App.config
index 2619f91b..2eb4ac66 100644
--- a/Common/Production/ProductionUiCordonel/App.config
+++ b/Common/Production/ProductionUiCordonel/App.config
@@ -34,6 +34,7 @@
 
 
   <appSettings>
+    <add key="Mode" value="2" />      <!--1 = EOL ; 2 = Picking-->
     <add key="SirtComport433" value="14" /> <!--Individual for Thomas-->
     <add key="SirtComport868" value="15" /> <!--Individual for Thomas-->
     <add key="SirtBoxNr" value="2" /> <!--Roland and Thomas, box for development, box at shipping station is 1-->
diff --git a/Common/Production/ProductionUiCordonel/App.xaml.cs b/Common/Production/ProductionUiCordonel/App.xaml.cs
index 50648ec2..d2e9d9e7 100644
--- a/Common/Production/ProductionUiCordonel/App.xaml.cs
+++ b/Common/Production/ProductionUiCordonel/App.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Configuration;
 using System.Windows;
 
 namespace Xylem.Common.Production.ProductionUiCordonel
@@ -10,9 +11,24 @@ namespace Xylem.Common.Production.ProductionUiCordonel
     {
         private void Application_Startup(Object sender, StartupEventArgs e)
         {
+            switch (ConfigurationManager.AppSettings[$"Mode"])
+            {
+                case "1":
+
+                    var mainWindow = new FinalTest();
+                    mainWindow.Show();
+                    break;
+                case "2":
+                    var Picking = new Picking();
+                    Picking.Show();
+                    break;
+                default:
+                    var mainWindowDef = new FinalTest();
+                    mainWindowDef.Show();
+                    break;
+            }
+
 
-            var mainWindow = new FinalTest();
-            mainWindow.Show();
         }
     }
 }
diff --git a/Common/Production/ProductionUiCordonel/Picking.xaml b/Common/Production/ProductionUiCordonel/Picking.xaml
new file mode 100644
index 00000000..1f69b1b5
--- /dev/null
+++ b/Common/Production/ProductionUiCordonel/Picking.xaml
@@ -0,0 +1,155 @@
+<Window
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        x:Class="Xylem.Common.Production.ProductionUiCordonel.Picking"
+        mc:Ignorable="d"
+        Title="FinalTest" MinHeight="730" MinWidth="820" Height="730" Width="820" Initialized="Window_Initialized" Closing="Window_Closing" ResizeMode="CanMinimize" HorizontalAlignment="Right" WindowStartupLocation="CenterScreen" Loaded="Window_Loaded">
+    <DockPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="2,2,2,2">
+        <!--Tool Panel-->
+        <!--ToolBarTray DockPanel.Dock="Top" Visibility="Visible" Background="#FFF0F0F0" HorizontalAlignment="Stretch" -->
+        <Menu DockPanel.Dock="Top" Visibility="Visible" Background="#FFF0F0F0" HorizontalAlignment="Stretch">
+            <Menu.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <DockPanel HorizontalAlignment="Stretch"></DockPanel>
+                </ItemsPanelTemplate>
+            </Menu.ItemsPanel>
+            <MenuItem x:Name="optionsMenu" HorizontalAlignment="Right" Height="30" Width="60" Header="_Options"  >
+                <MenuItem x:Name="optionsMenuLogin" Header="_Login" HorizontalAlignment="Left" Click="OnLogin_Click"/>
+                <MenuItem x:Name="optionsMenuLogout" Header="L_ogout" HorizontalAlignment="Left" Click="OnLogout_Click"/>
+                <MenuItem x:Name="optionsMenuChangePassword" Header="Change Password" HorizontalAlignment="Left" Click="OnChangePassword_Click"/>
+            </MenuItem>
+            <Label Content="Slot:    " Margin="2,2,2,2" Visibility="Hidden"/>
+            <ComboBox x:Name="cbxSlotBox" Margin="2,2,2,2" SelectionChanged="CbxSlotBox_SelectionChanged" Visibility="Hidden"/>
+            <Label x:Name="lblApprovalText" Margin="110,1,1,1" Content="SPECIAL APPROVAL - Id.Ver: 10.07"  Foreground="#FFFB0808" FontSize="16" MouseDown="LblApprovalText_Click" HorizontalAlignment="Center"/>
+            <MenuItem x:Name="hlpMenu" HorizontalAlignment="Right" Height="30" Width="40" FontSize="12"  Header="Help" Click="HlpMenu_Click" />
+            <!--Special approval / requirement-->
+        </Menu>
+        <!--/-->
+
+        <!--Status Panel-->
+        <StatusBar DockPanel.Dock="Bottom"  VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="2,2,2,2">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="50" />
+                            <ColumnDefinition Width="80" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="200" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="120" />
+                            <ColumnDefinition Width="60" />
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem Grid.Column="0" Margin="0,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Label Content="PcbID:" Margin="2,2,0,2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+            </StatusBarItem>
+            <StatusBarItem Grid.Column="1" Margin="0,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <Label x:Name="lblPcbIdValue" Content="-" Margin="2,2,2,2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+            </StatusBarItem>
+            <Separator Grid.Column="2" />
+            <StatusBarItem x:Name="lblOperator" Grid.Column="4" Margin="-1,1,-109,3" HorizontalAlignment="Center" VerticalAlignment="Stretch" />
+            <Separator Grid.Column="7" />
+            <StatusBarItem Grid.Column="8" Margin="0,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                <TextBlock x:Name="lblTimeText" Text="Elapsed Time [min:s]:" Margin="2,2,2,2" HorizontalAlignment="Right" VerticalAlignment="Stretch" />
+            </StatusBarItem>
+            <StatusBarItem Grid.Column="9" Margin="0,0,0,0" HorizontalAlignment="Right" VerticalAlignment="Stretch">
+                <Label x:Name="lblTimeValue" Content="0:00" Margin="2,2,2,2" HorizontalAlignment="Right" VerticalAlignment="Stretch" />
+            </StatusBarItem>
+        </StatusBar>
+
+        <!--Grid Design-->
+        <Grid Background="AliceBlue" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="2,2,2,2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="30"/>
+                <RowDefinition Height="30"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="17"/>
+                <ColumnDefinition Width="113"/>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="120"/>
+                <ColumnDefinition Width="30"/>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="100"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="30"/>
+                <ColumnDefinition Width="40"/>
+                <ColumnDefinition Width="60"/>
+            </Grid.ColumnDefinitions>
+
+            <!--Cordonel information-->
+            <Label x:Name="lblSerialNumberTxt"   Content="SerialNumber:" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2"  Grid.Row="0" Grid.Column="2"/>
+            <Label x:Name="lblOrderNumberText"   Content="OrderNumber:"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2"  Grid.Row="1" Grid.Column="2"/>
+            <Label                               Content="Region:"       HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2"  Grid.Row="2" Grid.Column="2"/>
+            <Label x:Name="lblRadioAddressText"  Content="RadioAddress:" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2"  Grid.Row="3" Grid.Column="2"/>
+            <Label                               Content="Firmware:"     HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2"  Grid.Row="0" Grid.Column="5"/>
+            <Label x:Name="lblLutText"           Content="LUT CRC:"      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2"  Grid.Row="1" Grid.Column="5"/>
+            <Label x:Name="lblMeterSizeText"     Content="Meter Size:"   HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2"  Grid.Row="2" Grid.Column="5"/>
+
+            <Label Content="" x:Name="lblSerialNumberValue" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="0" Grid.Column="3"/>
+            <Label Content="" x:Name="lblOrderNumberValue"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="1" Grid.Column="3"/>
+            <Label Content="" x:Name="lblRegionValue"       HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="2" Grid.Column="3"/>
+            <Label Content="" x:Name="lblRadioAddressValue" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="3" Grid.Column="3"/>
+            <Label Content="" x:Name="lblFwValue"           HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="0" Grid.Column="6"/>
+            <Label Content="" x:Name="lblLutValue"          HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="1" Grid.Column="6"/>
+            <Label Content="" x:Name="lblMeterSizeValue"    HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="2" Grid.Column="6"/>
+
+            <!--Pictures-->
+            <Border Grid.Row="0" Grid.RowSpan="4" Grid.Column="0" Margin="2,2,2,2" BorderThickness="1" BorderBrush="Black" Grid.ColumnSpan="2">
+                <Image  Margin="0,0,-1,-1" Source="/Resources/Cordonel With Display small.JPG" Stretch="Fill" />
+            </Border>
+            <Border Grid.Row="0" Grid.RowSpan="2" Grid.Column="9" Grid.ColumnSpan="2" Margin="2,2,2,2" BorderThickness="1" BorderBrush="Black" >
+                <Image Margin="0,0,-1,-1" Source="/Resources/SensusLogoXylem.JPG" Stretch="Fill" />
+            </Border>
+
+            <!--Process Information-->
+            <DataGrid    x:Name="dgTotalProcess" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="4"  Grid.RowSpan="11" Grid.Column="0" Grid.ColumnSpan="4" ItemsSource="{Binding}"  
+                         AutoGenerateColumns="True" SelectionMode="Single" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" IsEnabled="True" />
+            <StackPanel  x:Name="dpSubProcess"   HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="4"  Grid.RowSpan="11"  Grid.Column="5" Grid.ColumnSpan="3" />
+            <GroupBox    Header="Info" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="15" Grid.RowSpan="4"  Grid.Column="0" Grid.ColumnSpan="11" >
+                <RichTextBox x:Name="rtbLog"     HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+            </GroupBox>
+
+            <!--Progress Bars and Info-->
+            <ProgressBar x:Name="pbSubProgress"   HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,4,2,4" Grid.Row="19" Grid.Column="2" Grid.ColumnSpan="8" />
+            <ProgressBar x:Name="pbTotalProgress" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,4,2,4" Grid.Row="20" Grid.Column="2" Grid.ColumnSpan="8" />
+            <Label x:Name="lblSubProgressValue"   HorizontalAlignment="Right"   VerticalAlignment="Stretch" Margin="0,0,2,0" Grid.Row="19" Grid.Column="10" Content="0,0 %"/>
+            <Label x:Name="lblTotalProgressValue" HorizontalAlignment="Right"   VerticalAlignment="Stretch" Margin="0,0,2,0" Grid.Row="20" Grid.Column="10" Content="0,0 %"/>
+            <Label x:Name="lblSingleProcessText"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="19" Grid.Column="0" Content="Single Process:" Grid.ColumnSpan="2" />
+            <Label x:Name="lblTotalProcessText"   HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="2,2,2,2" Grid.Row="20" Grid.Column="0" Content="Total Process:" Grid.ColumnSpan="2" />
+
+            <!--Buttons-->
+            <Button x:Name="btnStart" HorizontalAlignment="Stretch" Margin="2,4,2,4" VerticalAlignment="Stretch" Grid.Column="9" Grid.ColumnSpan="2" Grid.Row="2" Grid.RowSpan="2" IsEnabled="false" Click="BtnStart_Click" Content="Start" />
+            <Button x:Name="btnStop"  HorizontalAlignment="Stretch" Margin="2,4,2,4" VerticalAlignment="Stretch" Grid.Column="9" Grid.ColumnSpan="2" Grid.Row="4" Grid.RowSpan="2" IsEnabled="false" Click="BtnStop_Click"  Content="Stop" />
+        </Grid>
+
+    </DockPanel>
+</Window>
+
diff --git a/Common/Production/ProductionUiCordonel/Picking.xaml.cs b/Common/Production/ProductionUiCordonel/Picking.xaml.cs
new file mode 100644
index 00000000..59dc27c7
--- /dev/null
+++ b/Common/Production/ProductionUiCordonel/Picking.xaml.cs
@@ -0,0 +1,927 @@
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Threading;
+using LaaPackages.Features.Cordonel.Models;
+using Newtonsoft.Json;
+using NLog;
+using Xylem.Common.CommonCore.Configuration;
+using Xylem.Common.CommonCore.Consts;
+using Xylem.Common.Hardware.Interfaces.Ports.PortCore;
+using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses;
+using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
+using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EventArgs;
+using Xylem.Common.Utils.Logging;
+using Xylem.Common.Utils.UserAccessCtrl;
+using Control = System.Windows.Forms.Control;
+using TextBox = System.Windows.Controls.TextBox;
+using UserControl = System.Windows.Controls.UserControl;
+
+namespace Xylem.Common.Production.ProductionUiCordonel
+{
+    /// <summary>
+    /// Interaction logic for Picking.xaml
+    /// </summary>
+    public sealed partial class Picking
+    {
+        #region variables and properties
+        private readonly ILogger _logger;
+        // remind manually changed culture setting
+        private static readonly CultureInfo _cultureInfo = Thread.CurrentThread.CurrentCulture;
+        private static readonly AssemblyName _assemblyName = Assembly.GetExecutingAssembly().GetName();
+        private static readonly String _assemblyExecRootPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        private static readonly Version _version = _assemblyName.Version;
+        private readonly String _strSoftwareNameVersion;
+        private RegisterLDAPUser _registerForm;
+
+        private Int32 Slot
+        {
+            get; set;
+        }
+
+        // maximum processing steps for calculation of progress bar 
+        private Int32 _maxOverallProcessSteps;
+        private Int32 _maxSingleProcessSteps;
+        private FinalProcessController _processCtrl;
+        private DateTimeOffset _startTime;
+        private DispatcherTimer _timer;
+        private String _lastLoggingTextToAvoidRepetition;
+        private CordonelRequirements _productionRequirements;
+        private UserAccessWindow _userAccessWindow;
+
+        #endregion
+
+        public Picking()
+        {
+            _logger = NLogHelper.CreateOrGetLogger("ProductionUiCordonel");
+
+            String msg;
+            try
+            {
+                // returns true in DEBUG configuration
+                if (!Logic.SoftwareAccessHelper.Access.HasAccess(_assemblyName))
+                {
+                    msg = $"{Properties.Resources.StrStartMessageSwLicenseExpired} {_version}";
+                    _logger.Error(msg);
+                    MessageBox.Show(msg, Properties.Resources.StrProcessStateError, 
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                    Close();
+                    return;
+                }
+            }
+            catch (Exception e)
+            {
+                msg = Properties.Resources.StrErrorMsgMissingNetworkConnetction + " " + e.Message ;
+                _logger.Error(msg);
+                MessageBox.Show(msg,
+                    Properties.Resources.StrProcessStateError,
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+                Close();
+                return;
+            }
+
+            InitializeComponent();
+            // Log version to files for debug purposes
+            _strSoftwareNameVersion = $"{Properties.Resources.StrSoftwareNameVersion} {_version}";
+            _logger.Info(_strSoftwareNameVersion);
+
+            Title = _strSoftwareNameVersion;
+
+            //static labels
+            UpdateContentControl(lblSerialNumberTxt, Properties.Resources.StrLblSerialNumberTxt + ":");
+            UpdateContentControl(lblRadioAddressText, Properties.Resources.StrLblRadioAddressTxt + ":");
+            UpdateContentControl(lblOrderNumberText, Properties.Resources.StrLblOrderNumberTxt + ":");
+            UpdateContentControl(lblMeterSizeText, Properties.Resources.StrLblMeterSizeTxt + ":");
+            UpdateContentControl(lblSingleProcessText, Properties.Resources.StrLblSingleProcessText + ":");
+            UpdateContentControl(lblTotalProcessText, Properties.Resources.StrLblTotalProcessText + ":");
+            optionsMenu.Header = Properties.Resources.StrMenuOptionsText;
+            optionsMenuChangePassword.Header = Properties.Resources.StrMenuChangePasswordText;
+            hlpMenu.Header = Properties.Resources.StrMenuHelpText;
+            UpdateUi(lblApprovalText, "");
+            UpdateUi(lblTimeText, Properties.Resources.StrLblTimeText + ":");
+
+            // buttons
+            UpdateContentControl(btnStart, Properties.Resources.StrBtnStart);
+            UpdateContentControl(btnStop, Properties.Resources.StrBtnStop);
+
+            InitializeFormState();
+
+        }
+
+        private ApplicationSettings Settings
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Initialize the FinalTest GUI:
+        /// - Read the configuration file for slot and port assignments and settings,
+        /// - Dispatch slots to slot combobox,
+        /// - Read setting from "ProductionUiConfig.json" file for GUI and slot setup,
+        /// - Create final process controller and install events,
+        /// - Create a dispatch timer to display the elapsed time of the process.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_Initialized(Object sender, EventArgs e)
+        {
+            var configFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                nameof(Hardware.WaterMeter.Genesis), ProgramConfig.SerialConfigFileName);
+
+            if (!File.Exists(configFile))
+            {
+                var msg = Properties.Resources.StrErrorMsgMissingConfigurationFile;
+                MessageBox.Show(msg,
+                    Properties.Resources.StrProcessStateError,
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+                _logger.Error(msg);
+                throw new ApplicationException(msg);
+            }
+            var tr = new StreamReader(configFile);
+            var meterConfigList = JsonConvert.DeserializeObject<SlotConfig[]>(tr.ReadToEnd());
+
+            cbxSlotBox.Items.Clear();
+            if (meterConfigList != null)
+            {
+                foreach (var item in meterConfigList.OrderBy(s => s.Slot))
+                {
+                    cbxSlotBox.Items.Add(item.Slot);
+                }
+            }
+
+            cbxSlotBox.SelectedIndex = 0;
+            Settings = new ApplicationSettings("ProductionUiConfig.json");
+
+            UseSetting(true);
+
+            if (cbxSlotBox.SelectedItem == null || string.IsNullOrEmpty(cbxSlotBox.SelectedItem.ToString()) ||
+                !int.TryParse(cbxSlotBox.SelectedItem.ToString(), out var slot))
+            {
+                Slot = 1;
+            }
+            else
+            {
+                Slot = slot;
+            }
+
+            try
+            {
+                _processCtrl = new FinalProcessController(Slot);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex.Message);
+                MessageBox.Show(ex.Message,
+                    Properties.Resources.StrProcessStateError,
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+                throw new ApplicationException(ex.Message);
+            }
+
+            //install the process changed event handler for single processes
+            _processCtrl.OnSingleProcessStateChanged += SingleProcessStateChanged_Handler;
+            _processCtrl.OnProcessLogRequest += ProcessLog_Handler;
+            _processCtrl.OnProcessProgressChanged += ProcessProgress_Handler;
+            _processCtrl.OnOverallProcessStateChanged += ProcessStateChange_Handler;
+
+            _timer = new DispatcherTimer();
+            _timer.Tick += TmrProgressUpdate_Tick;
+            _timer.Interval = TimeSpan.FromMilliseconds(500);
+
+            UpdateStatusGrid();
+        }
+
+        private void Window_Closing(Object sender, CancelEventArgs e)
+        {
+            _userAccessWindow?.Close();
+            _processCtrl.OnSingleProcessStateChanged -= SingleProcessStateChanged_Handler;
+            _processCtrl.OnProcessLogRequest -= ProcessLog_Handler;
+            _processCtrl.OnProcessProgressChanged -= ProcessProgress_Handler;
+            _processCtrl.OnOverallProcessStateChanged -= ProcessStateChange_Handler;
+            _userAccessWindow = null;
+
+            _processCtrl.Dispose();
+            _processCtrl = null;
+            _timer.Stop();
+            _timer.Tick -= TmrProgressUpdate_Tick;
+            _timer = null;
+            _registerForm = null;
+        }
+        private void UseSetting(Boolean setSlot = false)
+        {
+            //tblkAutodetectState.Text = "Off";
+            //if (Settings.AutoDetect)
+            //{
+            //    tblkAutodetectState.Text = "On";
+            //}
+            if (setSlot)
+            {
+                cbxSlotBox.SelectedValue = Settings.Slot;
+            }
+        }
+
+        private void InitializeFormState()
+        {
+            if (Software.IsRegistrationPending)
+            {
+                _registerForm = new RegisterLDAPUser();
+                _registerForm.OnCancellation += OnUserAccessControlCancellation;
+                UiElmEnable(optionsMenu, false, false);
+            }
+            else
+            {
+                UiElmEnable(optionsMenu, true);
+                UiElmEnable(optionsMenuChangePassword, Software.IsAutenticated);
+                UiElmEnable(optionsMenuLogout, Software.IsAutenticated);
+                UiElmEnable(optionsMenuLogin, !Software.IsAutenticated);
+                UiElmEnable(btnStart, Software.IsAutenticated);
+                UiElmEnable(btnStop, false);
+                UpdateContentControl(lblOperator,
+                    Software.IsAutenticated
+                        ? $"{Properties.Resources.StrLblOperatorNameText}: {Software.UserName}"
+                        : $"{Properties.Resources.StrLblOperatorNameText}: ?");
+            }
+        }
+
+        /// <summary>
+        /// Shows the user access window with login form or password change form.
+        /// </summary>
+        /// <param name="visible"></param>
+        /// <param name="control">Windows forms control</param>
+        /// <param name="headerTxt"></param>
+        /// <remarks date="2025-Mar-25" author="Thomas Wiedebusch">
+        /// - Initial.
+        /// </remarks>
+        private void ShowUserAccessWindow(Boolean visible = true, Control control = null, String headerTxt = "")
+        {
+            if (visible && control != null)
+            {
+                UiElmEnable(optionsMenu, false);
+
+                if (_userAccessWindow == null)
+                    _userAccessWindow = new UserAccessWindow(control, headerTxt);
+                // View the user access window as container for the windows forms password change and login
+                _userAccessWindow.OnCloseWindow += OnUserAccessWindowClosed_Handler;
+                _userAccessWindow.ShowDialog();
+            }
+            else
+            {
+                if (_userAccessWindow != null)
+                {
+                    _userAccessWindow.OnCloseWindow -= OnUserAccessWindowClosed_Handler;
+                    try
+                    {
+                        _userAccessWindow.Close();
+                    }
+                    catch (Exception)
+                    {
+                        //ignore
+                    }
+                    _userAccessWindow = null;
+                }
+
+                if (_registerForm != null)
+                    _registerForm.OnCancellation -= OnUserAccessControlCancellation;
+
+                UiElmEnable(optionsMenu, true);
+
+            }
+        }
+
+        /// <summary>
+        /// Close event handler of the user access window with login form or password change form.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="eventArgs"></param>
+        /// <remarks date="2025-Mar-25" author="Thomas Wiedebusch">
+        /// - Initial.
+        /// </remarks>
+        private void OnUserAccessWindowClosed_Handler(Object sender, EventArgs eventArgs)
+        {
+            ShowUserAccessWindow(false);
+            InitializeFormState();
+        }
+
+        private void UpdateUi(ContentControl c, String content, Brush color = null)
+        {
+            if (color == null)
+                color = Brushes.Black;
+
+            c.Dispatcher.Invoke(DispatcherPriority.Normal,
+                new Action(() =>
+                {
+                    c.Content = content;
+                    c.Foreground = color;
+                }));
+        }
+
+        private void UpdateUi(TextBox c, String content, Brush color = null)
+        {
+            if (color == null)
+                color = Brushes.Black;
+
+            c.Dispatcher.Invoke(DispatcherPriority.Normal,
+                new Action(() =>
+                {
+                    c.Text = content;
+                    c.Foreground = color;
+                }));
+        }
+        private void UpdateUi(TextBlock c, String content, Brush color = null)
+        {
+            if (color == null)
+                color = Brushes.Black;
+
+            c.Dispatcher.Invoke(DispatcherPriority.Normal,
+                new Action(() =>
+                {
+                    c.Text = content;
+                    c.Foreground = color;
+                }));
+        }
+
+        /// <summary>
+        /// Update the elapsed time as information
+        /// </summary>
+        /// <returns>information attached to process depending on region</returns>
+        /// <remarks date="2024-Jul-11" author="Thomas Wiedebusch">
+        /// - Initial
+        /// </remarks>
+        private void SetTimeDisplay()
+        {
+            var time = DateTimeOffset.UtcNow;
+            var timeSpan = time - _startTime;
+            UpdateContentControl(lblTimeValue, $@"{(UInt32)timeSpan.TotalMinutes}:{timeSpan.Seconds:00}");
+        }
+
+        /// <summary>
+        /// Common routine for state change:
+        /// - Log state change,
+        /// - Execute stop procedure on error.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <remarks date="2020-Dec-12" author="Roland Drabesch">
+        /// - Initial
+        /// </remarks>
+        /// <remarks date="2024-Aug-30" author="Thomas Wiedebusch">
+        /// - Extended.
+        /// </remarks>
+        private void ProcessStateChange_Handler(Object sender, ProcessStateArgs e)
+        {
+            _logger.Debug($"Slot:{Slot} - Final test state: {e.State}");
+
+            // Nothing to display
+            if (e.State == ProcessState.Idle)
+            {
+                // Update progress bars
+                ProcessProgress_Handler(this, new ProcessProgressArgs(0,
+                    ProcessProgressArgs.ProcessProgressType.OverallProcessesSteps));
+                ProcessProgress_Handler(this, new ProcessProgressArgs(0,
+                    ProcessProgressArgs.ProcessProgressType.ActualProcessSteps));
+            }
+            // Stop all procedures
+            if (e.State == ProcessState.Stop)
+            {
+                _timer?.Stop();
+                UiElmEnable(btnStart, true);
+                UiElmEnable(btnStop, false);
+                // update progress bars
+                ProcessProgress_Handler(this, new ProcessProgressArgs(0,
+                    ProcessProgressArgs.ProcessProgressType.OverallProcessesSteps));
+                ProcessProgress_Handler(this, new ProcessProgressArgs(0,
+                    ProcessProgressArgs.ProcessProgressType.ActualProcessSteps));
+                // remove user control
+                SetNewUserControl(null);
+            }
+            // Repeat failed tests 
+            if (e.State == ProcessState.RepeatFailedTests)
+            {
+                UiElmEnable(btnStart, false);
+                UiElmEnable(btnStop, true);
+                _timer?.Start();
+            }
+            // Stop time for manual operation and visual inspection as this is not part of the configuration
+            if (e.State == ProcessState.CheckOrderNumber)
+            {
+                _timer?.Stop();
+            }
+            // Prepare shipping 
+            if (e.State == ProcessState.PrepareShippingMode)
+            {
+                _timer?.Stop();
+                UiElmEnable(btnStart, false);
+                UiElmEnable(btnStop, false);
+            }
+            // Ready for shipping
+            if (e.State == ProcessState.ReadyForShipping)
+            {
+                StoreSuccessNote(out _);
+                BtnStop_Click(this, null);
+            }
+            // Print return report
+            if (e.State == ProcessState.PrintReturnReport)
+            {
+                PrintErrorNote();
+                BtnStop_Click(this, null);
+            }
+            // Print success report
+            if (e.State == ProcessState.PrintSuccessReport)
+            {
+                PrintSuccessNote();
+                BtnStop_Click(this, null);
+            }
+        }
+
+        /// <summary>
+        /// Enable UI elements
+        /// </summary>
+        /// <param name="elm"></param>
+        /// <param name="isEnabled"></param>
+        /// <param name="isVisible"></param>
+        private void UiElmEnable(UIElement elm, Boolean isEnabled, Boolean isVisible = true)
+        {
+            elm.Dispatcher.Invoke(DispatcherPriority.Normal,
+              new Action(() =>
+              {
+                  elm.Visibility = isVisible ? Visibility.Visible : Visibility.Hidden;
+                  elm.IsEnabled = isEnabled;
+
+              }));
+        }
+
+        /// <summary>
+        /// Fill logging window with information
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <remarks date="????" author="Roland Drabesch">
+        /// - Initial
+        /// </remarks>
+        /// <remarks date="2023-07-06" author="Thomas Wiedebusch">
+        /// - Changed to rich text edit with colored output.
+        /// </remarks>
+        /// <remarks date="2024-08-28" author="Thomas Wiedebusch">
+        /// - Avoid output of repeated text or useless empty text.
+        /// </remarks>
+        private void ProcessLog_Handler(Object sender, ProcessLogArgs e)
+        {
+            rtbLog.Dispatcher.Invoke(DispatcherPriority.Normal,
+                new Action(() =>
+                    {
+                        if (e != null)
+                        {
+                            try
+                            {
+                                // remove unacceptable spacing between the lines
+                                rtbLog.Document.LineHeight = 1;
+
+                                var color = e.Color ?? Brushes.Black;
+                                var text = e.Data;
+                                if (!string.IsNullOrEmpty(text) && !text.Equals(_lastLoggingTextToAvoidRepetition))
+                                {
+                                    var tr = new TextRange(rtbLog.Document.ContentEnd, rtbLog.Document.ContentEnd)
+                                    {
+                                        Text = text
+                                    };
+                                    tr.ApplyPropertyValue(TextElement.ForegroundProperty, color);
+                                    rtbLog.ScrollToEnd();
+                                    rtbLog.AppendText(Environment.NewLine);
+                                }
+
+                                _lastLoggingTextToAvoidRepetition = text;
+                            }
+                            catch (FormatException)
+                            {
+
+                            }
+                        }
+                    }
+                ));
+        }
+
+        /// <summary>
+        /// Set values for progress bar, maximum and actual for single process and overall process.
+        /// - Limit values to 0.0..100.0.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <remarks date="????" author="Roland Drabesch">
+        /// - Initial
+        /// </remarks>
+        /// <remarks date="2024-07-18" author="Thomas Wiedebusch">
+        /// - Introduced multi line text with center alignment.
+        /// </remarks>
+        private void ProcessProgress_Handler(Object sender, ProcessProgressArgs e)
+        {
+            if (e.ProgressType == ProcessProgressArgs.ProcessProgressType.MaxOverallProcessSteps)
+            {
+                _maxOverallProcessSteps = e.Progress;
+            }
+            else if (e.ProgressType == ProcessProgressArgs.ProcessProgressType.MaxActualProcessSteps)
+            {
+                _maxSingleProcessSteps = e.Progress;
+            }
+            if (e.ProgressType == ProcessProgressArgs.ProcessProgressType.OverallProcessesSteps)
+            {
+                pbTotalProgress.Dispatcher.Invoke(DispatcherPriority.Normal,
+                    new Action(() =>
+                        {
+                            // limit output to progress bar to 0..100 as integer for process bar
+                            var progress = _maxOverallProcessSteps <= 0 ? 0.0 : e.Progress * 100.0 / _maxOverallProcessSteps;
+                            progress = progress > 100.0 ? 100.0 : progress < 0.0 ? 0.0 : progress;
+                            pbTotalProgress.Value = (Int32)progress;
+                            UpdateContentControl(lblTotalProgressValue, $@"{progress:##0.0} %");
+                        }
+                    ));
+            }
+            else if (e.ProgressType == ProcessProgressArgs.ProcessProgressType.ActualProcessSteps)
+            {
+                pbSubProgress.Dispatcher.Invoke(DispatcherPriority.Normal,
+                    new Action(() =>
+                        {
+                            // limit output to progress bar to 0..100 as integer for process bar
+                            var progress = _maxSingleProcessSteps <= 0 ? 0.0 : e.Progress * 100.0 / _maxSingleProcessSteps;
+                            progress = progress > 100.0 ? 100.0 : progress < 0.0 ? 0.0 : progress;
+                            pbSubProgress.Value = (Int32)progress;
+                            UpdateContentControl(lblSubProgressValue, $@"{progress:##0.0} %");
+                        }
+                    ));
+            }
+        }
+
+        /// <summary>
+        /// Output message to control without access violation.
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks date="????" author="Roland Drabesch">
+        /// - Initial
+        /// </remarks>
+        /// <remarks date="2023-07-11" author="Thomas Wiedebusch">
+        /// - Introduced multi line text with center alignment.
+        /// </remarks>
+        private static void UpdateContentControl(ContentControl ctl, String text)
+        {
+            ctl.Dispatcher.Invoke(DispatcherPriority.Normal,
+                new Action(() =>
+                {
+                    ctl.Content = new TextBlock()
+                    {
+                        Text = text,
+                        TextWrapping = TextWrapping.Wrap,
+                        TextAlignment = TextAlignment.Center
+                    };
+                }
+              ));
+        }
+
+        /// <summary>
+        /// Status grid update for all single processes
+        /// </summary>
+        private void UpdateStatusGrid()
+        {
+            var dt = new DataTable();
+            dt.Columns.Add(Properties.Resources.StrDataTableColumnProcess);
+            dt.Columns.Add(Properties.Resources.StrDataTableColumnState);
+            var i = 0;
+            if (_processCtrl?.Processes == null)
+                return;
+            foreach (var item in _processCtrl.Processes)
+            {
+                dt.Rows.Add();
+                dt.Rows[i][0] = item.ProcessName;
+                dt.Rows[i][1] = ProductionProcessStateHelper.GetTextFromProductionProcessState(item.SingleProcessState);
+                i++;
+            }
+
+            dgTotalProcess.Dispatcher.Invoke(DispatcherPriority.Normal,
+                new Action(() =>
+                    {
+                        dgTotalProcess.DataContext = dt;
+                    }
+                ));
+        }
+
+        /// <summary>
+        /// Dispatch new user control to main screen
+        /// </summary>
+        /// <param name="uc"></param>
+        private void SetNewUserControl(UserControl uc)
+        {
+            dgTotalProcess.Dispatcher.Invoke(DispatcherPriority.Normal,
+                new Action(() =>
+                    {
+                        // remove last userControl
+                        dpSubProcess.Children.Clear();
+                        if (uc != null)
+                        {
+                            dpSubProcess.Children.Add(uc);
+                            DockPanel.SetDock(uc, Dock.Top); // & Dock.Left);
+                        }
+                    }
+                ));
+        }
+
+        #region TimerControls
+        /// <summary>
+        /// Handle timing depending updates.
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks date="2024-07-11" author="Thomas Wiedebusch">
+        /// - Initial
+        /// </remarks>
+        private void TmrProgressUpdate_Tick(Object sender, EventArgs e)
+        {
+            SetTimeDisplay();
+        }
+        #endregion
+
+        /// <summary>
+        /// Update of status grid with information returned by user control.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <remarks date="????" author="Roland Drabesch">
+        /// - Initial
+        /// </remarks>
+        /// <remarks date="2024-08-28" author="Thomas Wiedebusch">
+        /// - Activate new user control on start of process.
+        /// </remarks>
+        private void SingleProcessStateChanged_Handler(Object sender, SingleProcessStateArgs e)
+        {
+            if (sender is IProductionProcess productionProcess)
+            {
+                if (e.SingleProcessState == SingleProcessState.Running)
+                {
+                    // Set new user control
+                    SetNewUserControl(productionProcess.GetUserControl());
+                }
+                else
+                {
+                    // remove user control on idle, skipped, abort or error
+                    SetNewUserControl(null);
+                }
+            }
+
+            UpdateStatusGrid();
+            UpdateGuiWithProductInfos();
+        }
+
+        private void OnUserAccessControlCancellation(Control control)
+        {
+            OnUserAccessWindowClosed_Handler(this, null);
+        }
+
+
+        /// <summary>
+        /// Set labels of device information and order number
+        /// </summary>
+        /// <remarks date="????" author="Roland Drabesch">
+        /// - Initial
+        /// </remarks>
+        /// <remarks date="2024-07-15" author="Thomas Wiedebusch">
+        /// - Additional info of Cordonel.
+        /// </remarks>
+        private void UpdateGuiWithProductInfos()
+        {
+            var genesisMeter = _processCtrl?.GetGenesisMeter();
+            _productionRequirements = _processCtrl?.GetProductionRequirements();
+
+            if (genesisMeter == null)
+                return;
+
+            UpdateContentControl(lblOrderNumberValue,
+                genesisMeter.OrderNumber != 0 ? genesisMeter.OrderNumber.ToString() : "?");
+
+            UpdateContentControl(lblRadioAddressValue,
+                genesisMeter.RadioAddress != 0 ? genesisMeter.RadioAddress.ToString() : "");
+            UpdateContentControl(lblRadioAddressText,
+                genesisMeter.RadioAddress != 0 ? Properties.Resources.StrLblRadioAddressTxt + ":" : "");
+
+            UpdateContentControl(lblFwValue,
+                !string.IsNullOrEmpty(genesisMeter.FwVersion) ? genesisMeter.FwVersion : "?");
+
+            UpdateContentControl(lblMeterSizeValue,
+                !string.IsNullOrEmpty(genesisMeter.MeterSize) ? genesisMeter.MeterSize : "?");
+
+            UpdateContentControl(lblLutValue,
+                !string.IsNullOrEmpty(genesisMeter.LutCrc) ? genesisMeter.LutCrc : "?");
+
+
+            UpdateContentControl(lblSerialNumberValue,
+                !string.IsNullOrEmpty(genesisMeter.CustomerSerialNumber) ? genesisMeter.CustomerSerialNumber : "?");
+
+            UpdateContentControl(lblRegionValue,
+                !string.IsNullOrEmpty(genesisMeter.Region) ? genesisMeter.Region : "?");
+
+            UpdateUi(lblPcbIdValue, !string.IsNullOrEmpty(genesisMeter.PcbId) ? genesisMeter.PcbId : "?");
+
+            var msg = "";
+            var color = Brushes.Black;
+            if (_productionRequirements?.IsSpecialActive != null && (Boolean)_productionRequirements.IsSpecialActive &&
+                _productionRequirements?.IsSpecialApproved != null && (Boolean)_productionRequirements.IsSpecialApproved)
+            {
+                msg = $"{Properties.Resources.StrLblSpecialRequirement} - Id.Ver: {_productionRequirements.SpecialId}." +
+                      $"{_productionRequirements.SpecialVersion}";
+                color = Brushes.Red;
+            }
+            else if (_productionRequirements?.IsStandardActive != null && (Boolean)_productionRequirements.IsStandardActive &&
+                     _productionRequirements?.IsStandardApproved != null && (Boolean)_productionRequirements.IsStandardApproved)
+            {
+                msg = $"{Properties.Resources.StrLblStandardRequirement} - Id.Ver: {_productionRequirements.StandardId}." +
+                      $"{_productionRequirements.StandardVersion}";
+            }
+
+            UpdateUi(lblApprovalText, msg, color);
+        }
+
+        //private void BtnSwitchAutoDetect_Click(Object sender, RoutedEventArgs e)
+        //{
+        //    //Settings.AutoDetect = !Settings.AutoDetect;
+        //    //StoreSetting();
+        //    //UseSetting();
+        //}
+
+        private void OnLogout_Click(Object sender, EventArgs e)
+        {
+            Software.Logout();
+            InitializeFormState();
+        }
+
+        private void OnLogin_Click(Object sender, EventArgs args)
+        {
+            ShowUserAccessWindow(true, new LoginForm(OnUserAccessControlCancellation),
+                Properties.Resources.StrLoginMsg);
+        }
+
+        private void OnChangePassword_Click(Object _, EventArgs _1)
+        {
+            ShowUserAccessWindow(true, new ChangePassword(OnUserAccessControlCancellation),
+                Properties.Resources.StrChangePasswordMsg);
+        }
+
+        private void CbxSlotBox_SelectionChanged(Object sender, SelectionChangedEventArgs e)
+        {
+
+        }
+
+        private void StoreSetting()
+        {
+            Settings.Update("ProductionUiConfig.json");
+        }
+
+        //private void BtnConnect_Click(Object sender, RoutedEventArgs e)
+        //{
+        //    Settings.Slot = (Int32)cbxSlotBox.SelectedValue;
+        //    StoreSetting();
+        //}
+
+        private void BtnStart_Click(Object sender, RoutedEventArgs e)
+        {
+            UiElmEnable(btnStart, false);
+            UiElmEnable(btnStop, true);
+
+            _startTime = DateTimeOffset.UtcNow;
+            _timer?.Start();
+
+            // remove last userControl
+            dpSubProcess.Children.Clear();
+            rtbLog.Document.Blocks.Clear();
+            _processCtrl?.SetProcessState(ProcessState.DetectCordonel);
+        }
+
+        private void PrintErrorNote()
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine("========================================================================");
+            sb.AppendLine(Properties.Resources.StrInstructionReturnPapers);
+            sb.AppendLine("========================================================================");
+            CreateFile(sb, out var fileName);
+            Process.Start(fileName);
+        }
+
+        private void StoreSuccessNote(out String fileName)
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine("========================================================================");
+            sb.AppendLine(Properties.Resources.StrInfoSuccessPapers);
+            sb.AppendLine("========================================================================");
+            CreateFile(sb, out fileName);
+        }
+
+        private void PrintSuccessNote()
+        {
+            StoreSuccessNote(out var fileName);
+            Process.Start(fileName);
+        }
+
+        private void CreateFile(StringBuilder sb, out String fileName)
+        {
+            if (sb == null)
+                sb = new StringBuilder();
+
+            var genesisMeter = _processCtrl.GetGenesisMeter();
+            var loggingPath = $"C:\\GenesisLog\\{DateTime.Now:yyyy-MM-dd}\\ProductionUiCordonel\\";
+            fileName = $"{loggingPath}{DateTime.Now.ToString("yyyyMMddHHmmss")}_Report_{genesisMeter.PcbId}.txt";
+
+            sb.AppendLine(_strSoftwareNameVersion);
+            sb.AppendLine("------------------------------------------------------------------------");
+            sb.AppendLine($"{Properties.Resources.StrDateTime}:                    {DateTime.Now}");
+            sb.AppendLine("------------------------------------------------------------------------");
+            sb.AppendLine($"PcbId:                    {genesisMeter.PcbId}");
+            sb.AppendLine($"{Properties.Resources.StrPrintOrderNumberTxt}: {genesisMeter.OrderNumber}");
+            sb.AppendLine($"{Properties.Resources.StrLblSerialNumberTxt}:             {genesisMeter.CustomerSerialNumber}");
+            sb.AppendLine($"{Properties.Resources.StrLblOperatorNameText}:              {Software.UserName}");
+            sb.AppendLine("------------------------------------------------------------------------");
+            var rtbText = new TextRange(
+                rtbLog.Document.ContentStart,
+                rtbLog.Document.ContentEnd
+            );
+            sb.Append($"{rtbText.Text}");
+            File.WriteAllText(fileName, sb.ToString());
+        }
+
+        /// <summary>
+        /// Stop button as user interaction to kill the finalization process
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void BtnStop_Click(Object sender, RoutedEventArgs e)
+        {
+            //set the process state to the state machine
+            _processCtrl?.SetProcessState(ProcessState.Stop);
+        }
+
+        /// <summary>
+        /// Open requirement in Web-Browser.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LblApprovalText_Click(Object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            var requirementId = 0;
+            var requirementWebPageLink = ServiceUrls.InspectCordonelRequirementInfoServiceUrl();
+            if (_productionRequirements?.SpecialId != null &&
+                _productionRequirements?.IsSpecialApproved != null &&
+                _productionRequirements.SpecialId != 0)
+            {
+                requirementId = (Int32)_productionRequirements.SpecialId;
+                requirementWebPageLink += $"SpecialRequirements#{requirementId}";
+            }
+            else if (_productionRequirements?.StandardId != null &&
+                     _productionRequirements?.IsStandardApproved != null &&
+                     _productionRequirements.StandardId != 0)
+            {
+                requirementId = (Int32)_productionRequirements.StandardId;
+                requirementWebPageLink += $"StandardRequirements#{requirementId}";
+            }
+
+            if (requirementId != 0)
+            {
+                Process.Start(requirementWebPageLink);
+            }
+        }
+
+        private void HlpMenu_Click(Object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                var filename = "";
+                if (Thread.CurrentThread.CurrentCulture.Name.Contains("de"))
+                {
+                    filename = Path.Combine(_assemblyExecRootPath, "Docu", @"Handbuch Cordonel Versandfertigmachen (VFM).pdf");
+                }
+                else if (Thread.CurrentThread.CurrentCulture.Name.Contains("en"))
+                {
+                    filename = Path.Combine(_assemblyExecRootPath, "Docu", @"Manual Cordonel End of Line Test (EOL).pdf");
+                }
+
+                if (!string.IsNullOrEmpty(filename))
+                {
+                    Process.Start(filename);
+                }
+            }
+            catch (Exception exception)
+            {
+                Console.WriteLine(exception);
+            }
+        }
+
+        private void Window_Loaded(Object sender, RoutedEventArgs e)
+        {
+            if (!Software.IsAutenticated)
+                OnLogin_Click(this, null);
+
+        }
+    }
+}
diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProductionProcess.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProductionProcess.cs
index 09391fba..1eeae25d 100644
--- a/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProductionProcess.cs
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProductionProcess.cs
@@ -312,8 +312,9 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses
             exitProcessStateObjects[2] = breakExitState;
 
             var processExec = new ProcessExec();
-            processExec.NewProcess(InitProcess, PreExecuteProcess, ExecuteProcess, FinalizeProcess, 
+            processExec.NewProcess(InitProcess, PreExecuteProcess, ExecuteProcess, FinalizeProcess,
                 _cultureInfo, exitProcessStateObjects, CancellationToken);
+
         }
 
         /// <inheritdoc cref="IProductionProcess"/>
diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/Enum/PickingProcessState.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/Enum/PickingProcessState.cs
new file mode 100644
index 00000000..894fff3a
--- /dev/null
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/Enum/PickingProcessState.cs
@@ -0,0 +1,73 @@
+namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum
+{
+    /// <summary>
+    /// Genesis meter final test states
+    /// </summary>
+    public enum PickingProcessState
+    {
+        /// <summary>
+        /// Idle (nothing to do)
+        /// </summary>
+        Idle,
+
+        /// <summary>
+        /// Idle (nothing to do)
+        /// </summary>
+        ScanOrder,
+        /// <summary>
+        /// New meter detected for marker to clear all process contents like production status
+        /// and programming parameters.
+        /// </summary>
+        CheckNewMeter,
+        /// <summary>
+        /// Error handling
+        /// </summary>
+        Error,
+        /// <summary>
+        /// Abort final test execution
+        /// </summary>
+        Abort,
+        /// <summary>
+        /// Repeat the entire final test
+        /// </summary>
+        RepeatFailedTests,
+        /// <summary>
+        /// Final test failed
+        /// </summary>
+       PickingFailed,
+        /// <summary>
+        /// User stopped process
+        /// </summary>
+        Stop,
+        /// <summary>
+        /// Check the actual production state if all steps are executed
+        /// </summary>
+        DetectCordonel,
+        /// <summary>
+        /// Connect to Cordonel
+        /// </summary>
+        ConnectCordonel,
+        /// <summary>
+        /// Request the serial number and radio address from DB
+        /// </summary>
+        GetPickingParameters,
+        /// <summary>
+        /// Check the radio functionality
+        /// </summary>
+        CompareMeterDetails,
+        InstallLut,
+        //todo ad excisting processstates
+
+
+
+        PrintReturnReport,
+        /// <summary>
+        /// Print success report
+        /// </summary>
+        PrintSuccessReport,
+        /// <summary>
+        /// Delimiter for list
+        /// </summary>
+        StateListDelimiter
+    }
+}
\ No newline at end of file
diff --git a/Common/Production/ProductionUiCordonel/ProductionUiCordonel.csproj b/Common/Production/ProductionUiCordonel/ProductionUiCordonel.csproj
index 55c97e93..035607b9 100644
--- a/Common/Production/ProductionUiCordonel/ProductionUiCordonel.csproj
+++ b/Common/Production/ProductionUiCordonel/ProductionUiCordonel.csproj
@@ -283,6 +283,9 @@
     <Compile Include="ctls\ctlMultiModePressure.xaml.cs">
       <DependentUpon>ctlMultiModePressure.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Picking.xaml.cs">
+      <DependentUpon>Picking.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Model\EOLHandler.cs" />
     <Compile Include="ProductionProcesses\EolProcesses\VisualInspection.cs" />
     <Compile Include="ProductionProcesses\EolProcesses\ErrorHandler.cs" />
@@ -371,6 +374,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Picking.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="FinalTest.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -610,6 +617,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Enum\" />
+    <Folder Include="ProductionProcesses\PickingProcesses\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Common/Production/ProductionUiCordonel/TextFile1.txt b/Common/Production/ProductionUiCordonel/TextFile1.txt
new file mode 100644
index 00000000..b9a60962
--- /dev/null
+++ b/Common/Production/ProductionUiCordonel/TextFile1.txt
@@ -0,0 +1 @@
+ProcessStateChange_Handler
\ No newline at end of file
diff --git a/Common/Service/MeterProcessState/Web.config b/Common/Service/MeterProcessState/Web.config
index 05e7168a..a07963c4 100644
--- a/Common/Service/MeterProcessState/Web.config
+++ b/Common/Service/MeterProcessState/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=301879
@@ -6,14 +6,14 @@
 <configuration>
   <configSections>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
-    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
   </configSections>
   <appSettings>
-    <add key="CordonelTestSpecJson" value="~/Content/JSON/CordonelTestSpec.json"/>
+    <add key="CordonelTestSpecJson" value="~/Content/JSON/CordonelTestSpec.json" />
   </appSettings>
   <connectionStrings>
-    <add name="Default" connectionString="Data Source=SLASQL01.emea.sensus.net;;Initial Catalog=Auftrag;Persist Security Info=False;User ID=GenesisPasswordService;Password=PcbID;Connection Timeout=120" providerName="System.Data.SqlClient"/>
+    <add name="Default" connectionString="Data Source=SLASQL01.emea.sensus.net;;Initial Catalog=Auftrag;Persist Security Info=False;User ID=GenesisPasswordService;Password=PcbID;Connection Timeout=120" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -24,97 +24,97 @@
       </system.Web>
   -->
   <system.web>
-    <authentication mode="None"/>
-    <compilation debug="true" targetFramework="4.8.1"/>
-    <httpRuntime targetFramework="4.6"/>
+    <authentication mode="None" />
+    <compilation debug="true" targetFramework="4.8.1" />
+    <httpRuntime targetFramework="4.6" />
   </system.web>
   <system.webServer>
     <modules>
-      <remove name="FormsAuthentication"/>
+      <remove name="FormsAuthentication" />
     </modules>
     <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
-      <remove name="OPTIONSVerbHandler"/>
-      <remove name="TRACEVerbHandler"/>
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+      <remove name="OPTIONSVerbHandler" />
+      <remove name="TRACEVerbHandler" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0"/>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
+        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2"/>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
     <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <system.codedom>
     <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     </compilers>
   </system.codedom>
   <system.data>
     <DbProviderFactories>
-      <remove invariant="Oracle.ManagedDataAccess.Client"/>
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+      <remove invariant="Oracle.ManagedDataAccess.Client" />
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
     </DbProviderFactories>
   </system.data>
 </configuration>
\ No newline at end of file
diff --git a/Common/SoftwareAccessHelper/LocalWebRequest.cs b/Common/SoftwareAccessHelper/LocalWebRequest.cs
index f2fe1fab..9e858649 100644
--- a/Common/SoftwareAccessHelper/LocalWebRequest.cs
+++ b/Common/SoftwareAccessHelper/LocalWebRequest.cs
@@ -7,7 +7,6 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 
-
 namespace Xylem.Common.Logic.SoftwareAccessHelper
 {
     /// <summary>
diff --git a/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj b/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj
index a15482c2..75bac928 100644
--- a/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj
+++ b/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj
@@ -15,6 +15,7 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +26,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>7.0</LangVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,6 +36,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <LangVersion>7.0</LangVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == '_MANUAL_CONTROL|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +47,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <LangVersion>7.0</LangVersion>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -54,6 +58,7 @@
     <LangVersion>7.0</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -64,6 +69,7 @@
     <LangVersion>7.0</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == '_MANUAL_CONTROL|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -74,12 +80,15 @@
     <LangVersion>7.0</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-local IIS-CUST|AnyCPU'">
     <OutputPath>bin\Debug-local IIS-CUST\</OutputPath>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-local IIS-CUST|x64'">
     <OutputPath>bin\x64\Debug-local IIS-CUST\</OutputPath>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -92,11 +101,44 @@
       <HintPath>..\packages\RestSharp.105.0.0\lib\net4\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http">
-      <HintPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft\Microsoft.NET.Build.Extensions\net461\lib\System.Net.Http.dll</HintPath>
+    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
diff --git a/Common/SoftwareAccessHelper/packages.config b/Common/SoftwareAccessHelper/packages.config
index bdc5cbd9..d5b50740 100644
--- a/Common/SoftwareAccessHelper/packages.config
+++ b/Common/SoftwareAccessHelper/packages.config
@@ -3,4 +3,11 @@
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
   <package id="NLog" version="5.2.2" targetFramework="net40" />
   <package id="RestSharp" version="105.0.0" targetFramework="net40" />
+  <package id="System.IO" version="4.3.0" targetFramework="net481" requireReinstallation="true" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net481" requireReinstallation="true" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net481" requireReinstallation="true" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net481" requireReinstallation="true" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net481" requireReinstallation="true" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net481" requireReinstallation="true" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net481" requireReinstallation="true" />
 </packages>
\ No newline at end of file