marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ProductionUiCordonel: - re-organized to support multiple production processes part 1

Browse Source
This commit is contained in:
Thomas Wiedebusch
2025-04-14 12:57:00 +02:00
parent 2f8acdb0b5
commit 1560282fad
25 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProductionProcess.cs
+1 -1
View File
@@ -16,7 +16,7 @@ using Xylem.Common.Logic.ProductionOrderCore;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EventArgs;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
using Xylem.Common.Utils.ProcessExec;
using Xylem.Common.Utils.ProcessExec.EventArguments;
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckOrderNumber.cs → Common/Production/ProductionUiCordonel/ProductionProcesses/CommonProcesses/CheckOrderNumber.cs
+2 -2
View File
@@ -2,9 +2,9 @@
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.CommonProcesses
{
public class CheckOrderNumber : BaseProductionProcess
{
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckSerialNumber.cs → Common/Production/ProductionUiCordonel/ProductionProcesses/CommonProcesses/CheckSerialNumber.cs
+2 -2
View File
@@ -2,9 +2,9 @@
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.CommonProcesses
{
public class CheckSerialNumber : BaseProductionProcess
{
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/DetectCordonel.cs → Common/Production/ProductionUiCordonel/ProductionProcesses/CommonProcesses/DetectCordonel.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.CommonProcesses
{
/// <summary>
/// Production process detects the serial number of the Cordonel.
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/ErrorHandler.cs → Common/Production/ProductionUiCordonel/ProductionProcesses/CommonProcesses/ErrorHandler.cs
+2 -2
View File
@@ -3,9 +3,9 @@ using System.Collections.Generic;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.CommonProcesses
{
public class ErrorHandler : BaseProductionProcess
{
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckAttachments.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using Xylem.Common.Logic.ProductionOrderCore.Vako;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
{
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckRadio.cs
+1 -1
View File
@@ -14,7 +14,7 @@ using Xylem.Common.Logic.ProductionOrderCore;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
using Button = System.Windows.Controls.Button;
// ReSharper disable UnusedAutoPropertyAccessor.Local
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/ConnectCordonel.cs
+1
View File
@@ -1,5 +1,6 @@
using System;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.CommonProcesses;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/ExecPasswordFile.cs
+1 -1
View File
@@ -10,7 +10,7 @@ using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.ProductionOrderCore;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
//using Xylem.Common.Ui.ProductionUiCordonel.UserControls.FinalTest;
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/GetFinalParametrization.cs
+1
View File
@@ -7,6 +7,7 @@ using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore;
using Xylem.Common.Hardware.WaterMeter.Genesis.Registers;
using Xylem.Common.Logic.SoftwareAccessHelper;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.CommonProcesses;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/PrepareShipping.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Production.ProductionUiCordonel.Model;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
{
Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/VisualInspection.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.Production.ProductionUiCordonel.UserControls;
namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses
{
Common/Production/ProductionUiCordonel/ProductionProcesses/ProcessStateDef.cs
+1
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.CommonProcesses;
using Xylem.Common.Production.ProductionUiCordonel.Properties;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolProcesses;
Common/Production/ProductionUiCordonel/ProductionUiCordonel.csproj
+15 -15
View File
@@ -289,10 +289,10 @@
<Compile Include="Model\EOLHandler.cs" />
<Compile Include="ProductionProcesses\Enum\PickingProcessState.cs" />
<Compile Include="ProductionProcesses\EolProcesses\VisualInspection.cs" />
<Compile Include="ProductionProcesses\EolProcesses\ErrorHandler.cs" />
<Compile Include="ProductionProcesses\CommonProcesses\ErrorHandler.cs" />
<Compile Include="ProductionProcesses\EolProcesses\ExecStoreConfiguration.cs" />
<Compile Include="ProductionProcesses\EolProcesses\GetSerialNumberAndRadioAddress.cs" />
<Compile Include="ProductionProcesses\EolProcesses\DetectCordonel.cs" />
<Compile Include="ProductionProcesses\CommonProcesses\DetectCordonel.cs" />
<Compile Include="ProductionProcesses\EolProcesses\ExecRebootCordonel.cs" />
<Compile Include="ProductionProcesses\EolProcesses\PrepareShipping.cs" />
<Compile Include="ProductionProcesses\Enum\DialogResult.cs" />
@@ -317,8 +317,8 @@
<DependentUpon>MultiModeChild.xaml</DependentUpon>
</Compile>
<Compile Include="Model\IMultiModeChildViewModel.cs" />
<Compile Include="ProductionProcesses\EolProcesses\CheckSerialNumber.cs" />
<Compile Include="ProductionProcesses\EolProcesses\CheckOrderNumber.cs" />
<Compile Include="ProductionProcesses\CommonProcesses\CheckSerialNumber.cs" />
<Compile Include="ProductionProcesses\CommonProcesses\CheckOrderNumber.cs" />
<Compile Include="ProductionProcesses\EolProcesses\CheckAttachments.cs" />
<Compile Include="ProductionProcesses\EolProcesses\CheckProductionState.cs" />
<Compile Include="ProductionProcesses\EolProcesses\CheckFinalParametrization.cs" />
@@ -347,20 +347,20 @@
<Compile Include="UserAccessWindow.xaml.cs">
<DependentUpon>UserAccessWindow.xaml</DependentUpon>
</Compile>
<Compile Include="UserControls\FinalTest\IUserControl.cs" />
<Compile Include="UserControls\FinalTest\UcBarcodeInput.xaml.cs">
<Compile Include="UserControls\IUserControl.cs" />
<Compile Include="UserControls\UcBarcodeInput.xaml.cs">
<DependentUpon>UcBarcodeInput.xaml</DependentUpon>
</Compile>
<Compile Include="UserControls\FinalTest\UcDialog.xaml.cs">
<Compile Include="UserControls\UcDialog.xaml.cs">
<DependentUpon>UcDialog.xaml</DependentUpon>
</Compile>
<Compile Include="UserControls\FinalTest\UcRadioCheck.xaml.cs">
<Compile Include="UserControls\UcRadioCheck.xaml.cs">
<DependentUpon>UcRadioCheck.xaml</DependentUpon>
</Compile>
<Compile Include="UserControls\FinalTest\UcPlain.xaml.cs">
<Compile Include="UserControls\UcPlain.xaml.cs">
<DependentUpon>UcPlain.xaml</DependentUpon>
</Compile>
<Compile Include="UserControls\FinalTest\UcPasswordFile.xaml.cs">
<Compile Include="UserControls\UcPasswordFile.xaml.cs">
<DependentUpon>UcPasswordFile.xaml</DependentUpon>
</Compile>
<Page Include="ctls\ctlMultiModeMarriage.xaml">
@@ -410,23 +410,23 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControls\FinalTest\UcBarcodeInput.xaml">
<Page Include="UserControls\UcBarcodeInput.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UserControls\FinalTest\UcDialog.xaml">
<Page Include="UserControls\UcDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UserControls\FinalTest\UcRadioCheck.xaml">
<Page Include="UserControls\UcRadioCheck.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UserControls\FinalTest\UcPlain.xaml">
<Page Include="UserControls\UcPlain.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControls\FinalTest\UcPasswordFile.xaml">
<Page Include="UserControls\UcPasswordFile.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
Common/Production/ProductionUiCordonel/UserControls/FinalTest/IUserControl.cs → Common/Production/ProductionUiCordonel/UserControls/IUserControl.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls
{
public interface IUserControl
{
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml → Common/Production/ProductionUiCordonel/UserControls/UcBarcodeInput.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest.UcBarcodeInput"
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.UcBarcodeInput"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcBarcodeInput.xaml.cs → Common/Production/ProductionUiCordonel/UserControls/UcBarcodeInput.xaml.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using System.Windows.Input;
using System.Windows.Threading;
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls
{
/// <summary>
/// Interaction logic for UcDialog.xaml
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcDialog.xaml → Common/Production/ProductionUiCordonel/UserControls/UcDialog.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest.UcDialog"
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.UcDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcDialog.xaml.cs → Common/Production/ProductionUiCordonel/UserControls/UcDialog.xaml.cs
+1 -1
View File
@@ -5,7 +5,7 @@ using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Threading;
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls
{
/// <summary>
/// Interaction logic for UcDialog.xaml
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcPasswordFile.xaml → Common/Production/ProductionUiCordonel/UserControls/UcPasswordFile.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest.UcPasswordFile"
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.UcPasswordFile"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcPasswordFile.xaml.cs → Common/Production/ProductionUiCordonel/UserControls/UcPasswordFile.xaml.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using System.Windows.Controls;
using System.Windows.Threading;
using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls
{
/// <summary>
/// Interaction logic for UcPasswordFile.xaml
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcPlain.xaml → Common/Production/ProductionUiCordonel/UserControls/UcPlain.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest.UcPlain"
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.UcPlain"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcPlain.xaml.cs → Common/Production/ProductionUiCordonel/UserControls/UcPlain.xaml.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Windows.Threading;
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls
{
/// <summary>
/// Interaction logic for UcPlain.xaml
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcRadioCheck.xaml → Common/Production/ProductionUiCordonel/UserControls/UcRadioCheck.xaml
+1 -1
View File
@@ -1,4 +1,4 @@
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest.UcRadioCheck"
<UserControl x:Class="Xylem.Common.Production.ProductionUiCordonel.UserControls.UcRadioCheck"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Common/Production/ProductionUiCordonel/UserControls/FinalTest/UcRadioCheck.xaml.cs → Common/Production/ProductionUiCordonel/UserControls/UcRadioCheck.xaml.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using System.Windows.Media;
using System.Windows.Threading;
using Color = System.Drawing.Color;
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls.FinalTest
namespace Xylem.Common.Production.ProductionUiCordonel.UserControls
{
/// <summary>
/// Interaction logic for UcRadioCheck.xaml