- Ulteriori modifiche a paginazione e filtri nuova finestra apri

- rimosso ProdItem da  ViewerOptimizer

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -178,16 +178,6 @@ Public Class BTLPartM
       End Set
    End Property
 
-   Public m_MaterialM As MaterialM
-   Public Property MaterialM As MaterialM
-      Get
-         Return m_MaterialM
-      End Get
-      Set(value As MaterialM)
-         m_MaterialM = value
-      End Set
-   End Property
-
    Public m_sTIMBERGRADE As String
    Public Property sTIMBERGRADE As String
       Get
@@ -597,7 +587,7 @@ Public Class BTLPartM
    Public ReadOnly Property nINPROD As Integer
       Get
          Dim INPROD As Integer = 0
-         EgtDuploInRawCount(m_nPartId, INPROD)
+         EgtDuploCount(m_nPartId, INPROD)
          Return INPROD
       End Get
    End Property
@@ -932,7 +922,6 @@ Public Class BTLPartM
          NewBTLPart.m_nINVERTED = 0
       End If
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewBTLPart.m_sMATERIAL)
-      ' EgtGetInfo(nPartId, BTL_PRT_WAREHOUSEMATERIAL, NewBTLPart.m_sWAREHOUSEMATERIAL)
       If Not EgtGetInfo(nPartId, LOCK_ROT, NewBTLPart.m_bLockRotation) Then
          NewBTLPart.m_bLockRotation = False
       End If

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -302,7 +302,6 @@
    Public Const BTLFILENAME As String = "BTLFILENAME"
    Public Const EXP_PART As String = "ImportExport"
    Public Const EXP_MACHINE As String = "Machine"
-   Public Const EXP_CLOUDID As String = "CloudId"
    ' parametro che indica se il progetto e' stato appena importato e quindi bisogna riverificare i MachGroup
    Public Const IMP_VERIFYMACHGROUP As String = "VerifyMachGroup"
 

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -20,10 +20,11 @@
    Public Const COL_NAME As String = "colNAME"
    Public Const COL_H As String = "colH"
    Public Const COL_MATERIAL As String = "colMATERIAL"
-   Public Const COL_WAREHOUSEMATERIAL As String = "colWAREHOUSEMATERIAL"
    Public Const COL_USAGE As String = "colUSAGE"
    Public Const COL_WASTE As String = "colWASTE"
    Public Const COL_ARCHIVED As String = "colARCHIVED"
-   Public Const COL_USEQTY As String = "colUSEQTY"
+   Public Const COL_PROJID As String = "colPROJID"
+   Public Const COL_PRODID As String = "colPRODID"
+   Public Const COL_CREATEDATE As String = "colCRTDATE"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -47,7 +47,6 @@ Public Module ConstIni
    Public Const K_FASTPRODUCE As String = "FastProduce"
    Public Const K_ADDPROJ As String = "AddProj"
    Public Const K_PROJECTMODE As String = "ProjectMode"
-   Public Const K_NETWAREHOUSE As String = "NetWarehouse"
 
    'Public Const S_LANGUAGES As String = "Languages"
    'Public Const K_LANGUAGE As String = "Language"
@@ -163,19 +162,10 @@ Public Module ConstIni
    Public Const S_WAREHOUSE As String = "Warehouse"
    Public Const K_TYPE As String = "Type"
    Public Const K_DEFAULTQUANTITY As String = "DefaultQuantity"
-   Public Const K_LASTSYNCHRONIZATION As String = "LastSynchronization"
-   Public Const K_USENETWAREHOUSE As String = "UseNetWarehouse"
-   Public Const K_SHOWWAREHOUSEMATERIAL As String = "ShowWarehouseMaterial"
-   Public Const K_NETADDRESS As String = "NetAddress"
-   Public Const K_AUTHTOKEN As String = "AuthToken"
-   Public Const K_SENDESTIMONSAVE As String = "SendEstimOnSave"
 
    Public Const S_BACKUPANDRESTORE As String = "Backup&Restore"
    Public Const K_EXTERNALBACKUPACTIVE As String = "ExternalBackupActive"
    Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
    Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
 
-   Public Const S_SPECIAL As String = "Special"
-   Public Const K_SPECIALENABLE As String = "SpecialEnable"
-
 End Module

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -146,7 +146,6 @@
     <Compile Include="Lib\MachGroupPanelM.vb" />
     <Compile Include="MachGroupModel\MyMachGroupPanelM.vb" />
     <Compile Include="Utility\ManageWindow.vb" />
-    <Compile Include="Utility\RawPart.vb" />
     <Compile Include="Utility\MyMachine.vb" />
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
       <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
@@ -159,7 +158,6 @@
     <Compile Include="ProjectManager\ProjectFileVM.vb" />
     <Compile Include="ProjectManager\ProjFileVM.vb" />
     <Compile Include="ProjectFileVM\ProjFileM.vb" />
-    <Compile Include="Utility\Material.vb" />
     <Compile Include="Utility\SectionXMaterial.vb" />
     <Compile Include="Utility\BTLIniFile.vb" />
     <Compile Include="Utility\CoreMap.vb" />

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -370,7 +370,6 @@ Public Class EgtDataGrid
 End Class
 
 Public Class EgtDataGridColumn
-   Inherits VMBase
 
    Private m_dgColumn As DataGridColumn
 
@@ -508,7 +507,7 @@ Public Class EgtDataGridColumn
    Private m_ColumnVisibility As Visibility
    Public Property ColumnVisibility As Visibility
       Get
-         Return If(m_ColumnVisibility, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_Visible, Visibility.Visible, Visibility.Collapsed)
       End Get
       Set(value As Visibility)
          m_ColumnVisibility = value
@@ -528,9 +527,6 @@ Public Class EgtDataGridColumn
          End If
       End Set
    End Property
-   Public Sub SetColumnVisibility(value As Visibility)
-      ColumnVisibility = value
-   End Sub
 
    Private m_CanUserEditVisible As Boolean
    Public Property CanUserEditVisible As Boolean

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupM.vb

@@ -113,26 +113,6 @@ Public Class MyMachGroupM
       End Set
    End Property
 
-   Protected m_sWAREHOUSEMATERIAL As String
-   Public Property sWAREHOUSEMATERIAL As String
-      Get
-         Return m_sWAREHOUSEMATERIAL
-      End Get
-      Set(value As String)
-         m_sWAREHOUSEMATERIAL = value
-      End Set
-   End Property
-
-   Protected m_RawPartM As RawPartM
-   Public Property RawPartM As RawPartM
-      Get
-         Return m_RawPartM
-      End Get
-      Set(value As RawPartM)
-         m_RawPartM = value
-      End Set
-   End Property
-
    ' lista dei pezzi che sono nel grezzo
    Protected m_PartMList As New List(Of PartM)
    Public Property PartMList As List(Of PartM)

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -215,46 +215,20 @@ Public Class MyMachGroupPanelM
                If nBWType = BWType.WALL Then
                   ' salvo parametri Q
                   QArray(Duploindex) = New Dictionary(Of String, Dictionary(Of String, String))
-                  ' ciclo sulle feature
-                  Dim nGlobPRId As Integer = 1
-                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
-                  If nFeatureLayer <> GDB_ID.NULL Then
-                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
-                     While nFeatureId <> GDB_ID.NULL
-                        ' verifico che sia feature
-                        Dim nPRC As Integer
-                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
-                           nPRId = 0
-                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
-                           If nPRId > nGlobPRId Then nGlobPRId = nPRId
-                           Dim sKey As String = nPRId & "." & nPRC
-                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
-                           For QIndex = 1 To 10
-                              Dim QKey As String = "Q" & QIndex.ToString("D2")
-                              Dim QValue As Integer = 0
-                              If EgtGetInfo(nFeatureId, QKey, QValue) Then
-                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
-                              End If
-                           Next
-                        End If
-                        nFeatureId = EgtGetNext(nFeatureId)
-                     End While
-                  End If
                   ' ciclo sugli outline
                   nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
                   If nOutlineLayer <> GDB_ID.NULL Then
+                     Dim nGlobPRId As Integer = 1
                      Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
                      While nOutlineId <> GDB_ID.NULL
                         ' verifico che sia feature
                         Dim nPRC As Integer
                         If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
                            nPRId = 0
-                           If Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) OrElse nPRId < nGlobPRId Then
-                              nGlobPRId += 1
+                           If Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
                               EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
                               nPRId = nGlobPRId
-                           Else
-                              If nPRId > nGlobPRId Then nGlobPRId = nPRId
+                              nGlobPRId += 1
                            End If
                            Dim sKey As String = nPRId & "." & nPRC
                            QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
@@ -269,6 +243,29 @@ Public Class MyMachGroupPanelM
                         nOutlineId = EgtGetNext(nOutlineId)
                      End While
                   End If
+                  ' ciclo sulle feature
+                  Dim nFeatureLayer As Integer = EgtGetFirstNameInGroup(DuploArray(Duploindex), PROCESSINGS)
+                  If nFeatureLayer <> GDB_ID.NULL Then
+                     Dim nFeatureId As Integer = EgtGetFirstInGroup(nFeatureLayer)
+                     While nFeatureId <> GDB_ID.NULL
+                        ' verifico che sia feature
+                        Dim nPRC As Integer
+                        If EgtGetInfo(nFeatureId, MGR_FTR_PRC, nPRC) Then
+                           nPRId = 0
+                           EgtGetInfo(nFeatureId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           QArray(Duploindex).Add(sKey, New Dictionary(Of String, String))
+                           For QIndex = 1 To 10
+                              Dim QKey As String = "Q" & QIndex.ToString("D2")
+                              Dim QValue As Integer = 0
+                              If EgtGetInfo(nFeatureId, QKey, QValue) Then
+                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
+                              End If
+                           Next
+                        End If
+                        nFeatureId = EgtGetNext(nFeatureId)
+                     End While
+                  End If
                End If
             Next
             ' aggiornamento dei Duplo

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -210,16 +210,6 @@ Public Class PartM
       End Set
    End Property
 
-   Public m_MaterialM As MaterialM
-   Public Property MaterialM As MaterialM
-      Get
-         Return m_MaterialM
-      End Get
-      Set(value As MaterialM)
-         m_MaterialM = value
-      End Set
-   End Property
-
    Public m_sSTOREY As String
    Public Property sSTOREY As String
       Get

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -116,18 +116,6 @@ Public MustInherit Class MyMachGroupVM
       End Set
    End Property
 
-   Public ReadOnly Property sWAREHOUSEMATERIAL As String
-      Get
-         Return MyMachGroupM.RawPartM.Material.sWarehouseMaterial
-      End Get
-   End Property
-
-   Public ReadOnly Property RawPartM As RawPartM
-      Get
-         Return MyMachGroupM.RawPartM
-      End Get
-   End Property
-
    Public ReadOnly Property sUnitTime As String
       Get
          Return TimeSpan.FromSeconds(nCALC_TIME).ToString()
@@ -142,7 +130,7 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property Section As SectionXMaterial
       Get
-         Return New SectionXMaterial(dW, dH, dL, MyMachGroupM.RawPartM.Material.sMaterial, MyMachGroupM.sWAREHOUSEMATERIAL)
+         Return New SectionXMaterial(dW, dH, dL, MyMachGroupM.sMATERIAL)
       End Get
    End Property
 

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -162,19 +162,6 @@ Public MustInherit Class PartVM
       End Set
    End Property
 
-   Public ReadOnly Property sWAREHOUSEMATERIAL As String
-      Get
-         Return m_PartM.MaterialM.sWarehouseMaterial
-      End Get
-   End Property
-
-   Public ReadOnly Property MaterialM As MaterialM
-      Get
-         Return m_PartM.MaterialM
-      End Get
-   End Property
-
-
    Public ReadOnly Property sSTOREY As String
       Get
          Return m_PartM.sSTOREY

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.12.2")>
-<Assembly: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.5.8.1")>
+<Assembly: AssemblyFileVersion("2.5.8.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -68,6 +68,7 @@
                   <ColumnDefinition Width="Auto"/>
                   <ColumnDefinition Width="1*"/>
                   <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
                <ComboBox ItemsSource="{Binding FilterTypeList}"
                          SelectedItem="{Binding SelFilterType}"
@@ -80,6 +81,17 @@
                                       Visibility="{Binding SearchText_Visibility}"/>
                <StackPanel Grid.Column="2" 
                            Orientation="Horizontal">
+                  <TextBlock Text="Page index"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <Button Content="&lt;"
+                          Command="{Binding PrevPage_Command}" />
+                  <TextBlock Text="{Binding nPageIndex}"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <Button Content="&gt;"
+                          Command="{Binding NextPage_Command}" />
+               </StackPanel>
+               <StackPanel Grid.Column="3" 
+                           Orientation="Horizontal">
                   <TextBlock Text="{Binding Rows_Msg}"
                              Style="{StaticResource OptionTextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
@@ -92,7 +104,7 @@
 
       <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
                                Grid.Row="1"
-                               ItemsSource="{Binding ProjectList}" 
+                               ItemsSource="{Binding PageList}" 
                                SelectedItem="{Binding SelProject}"
                                CanUserAddRows="False"
                                AutoGenerateColumns="False"
@@ -104,10 +116,12 @@
                                Margin="5"
                                RowDetailsVisibilityMode="Visible"
                                CellEditEnding="MainDataGrid_CellEditEnding"
-                               BindingColumns="{Binding ProdColumns}">
+                               BindingColumns="{Binding ProdColumns}"
+                               Sorting="MainDataGrid_Sorting">
          <DataGrid.Resources>
             <!-- ProdId -->
-            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
+            <DataGridTextColumn x:Key="colPRODID"
+                                Binding="{Binding sProdId}">
                <DataGridTextColumn.HeaderTemplate>
                   <DataTemplate>
                      <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
@@ -115,7 +129,8 @@
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
             <!--Name-->
-            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+            <DataGridTextColumn x:Key="colNAME" 
+                                Binding="{Binding sName}">
                <DataGridTextColumn.Header>
                   <Grid>
                      <Grid.ColumnDefinitions>
@@ -134,19 +149,23 @@
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Creation date -->
-            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
+            <DataGridTextColumn x:Key="colCRTDATE" 
+                                Binding="{Binding dtCreateDate}">
                <DataGridTextColumn.Header>
                   <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Machine -->
-            <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
+            <DataGridTextColumn x:Key="colMACHINE" 
+                                Binding="{Binding sMachine}" 
+                                CanUserSort="False">
                <DataGridTextColumn.Header>
                   <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
             <!-- Archived -->
-            <DataGridTemplateColumn x:Key="colARCHIVED">
+            <DataGridTemplateColumn x:Key="colARCHIVED"
+                                    CanUserSort="False">
                <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
                      <Image Source="\Resources\OpenProjectFileDialog\Archived.png"

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb

@@ -83,4 +83,182 @@ Public Class NewOpenProjectFileDialogV
       'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
    End Sub
 
-End Class
+   Private Sub MainDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs)
+      ' aggiorno direziona colonna
+      Dim column As DataGridColumn = e.Column
+      column.SortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending)
+      '' ricalcolo colonne sort
+      'Dim datagrid As DataGrid = sender
+      'ProdItemComparer.RefreshColumns()
+      '' lancio sort custom
+      'm_OpenProjFileDialogVM.RefreshProdItemSort()
+      m_OpenProjFileDialogVM.SortPageList()
+      m_OpenProjFileDialogVM.UpdatePageList()
+      e.Handled = True
+
+
+   End Sub
+
+End Class
+
+Friend Class ProdItemComparer
+   Implements IComparer
+
+   Private Shared DataGrid As DataGrid
+   Friend Shared Sub SetDataGrid(value As DataGrid)
+      DataGrid = value
+   End Sub
+
+   Private Shared m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
+   Friend Shared Sub SetOpenProjFileDialogVM(value As NewOpenProjectFileDialogVM)
+      m_OpenProjFileDialogVM = value
+   End Sub
+
+   Private Shared m_ColumnList As New List(Of DataGridColumn)
+   Private Shared m_EgtColumnList As New List(Of EgtDataGridColumn)
+
+   Friend Shared Sub RefreshColumns()
+      m_ColumnList.Clear()
+      m_EgtColumnList.Clear()
+      For Each col In DataGrid.Columns
+         If Not IsNothing(col.SortDirection) Then
+            m_ColumnList.Add(col)
+            m_EgtColumnList.Add(m_OpenProjFileDialogVM.ProdColumns(col.DisplayIndex))
+         End If
+      Next
+      '   Map.refRawPartListVM.SetRawPartListSorted(m_ColumnList.Count > 0)
+   End Sub
+
+
+   Public Function Compare(x As Object, y As Object) As Integer Implements IComparer.Compare
+      '   Dim First As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
+      '   Dim Second As MyMachGroupVM = DirectCast(y, MyMachGroupVM)
+      '   Dim bFirstProduced As Boolean = First.nProduction_State = Core.ItemState.WIP OrElse First.nProduction_State = Core.ItemState.Produced
+      '   Dim bSecondProduced As Boolean = Second.nProduction_State = Core.ItemState.WIP OrElse Second.nProduction_State = Core.ItemState.Produced
+      '   Dim bFirstInQueue As Boolean = First.bToBeProduced
+      '   Dim bSecondInQueue As Boolean = Second.bToBeProduced
+      '   ' verifico se gia' prodotti
+      '   If bFirstProduced AndAlso bSecondProduced Then
+      '      If First.nProductionIndex > Second.nProductionIndex Then
+      '         Return 1
+      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
+      '         Return -1
+      '      Else
+      '         Return 0
+      '      End If
+      '   ElseIf bFirstProduced Then
+      '      Return -1
+      '   ElseIf bSecondProduced Then
+      '      Return 1
+      '   ElseIf bFirstInQueue AndAlso bSecondInQueue Then
+      '      If First.nProductionIndex > Second.nProductionIndex Then
+      '         Return 1
+      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
+      '         Return -1
+      '      Else
+      '         Return 0
+      '      End If
+      '   ElseIf bFirstInQueue Then
+      '      Return -1
+      '   ElseIf bSecondInQueue Then
+      '      Return 1
+      '   Else
+      '      ' verifico ordine per colonne
+      '      Dim ColumnIndex = 0
+      '      While ColumnIndex <= m_EgtColumnList.Count - 1
+      '         Dim nDir As ListSortDirection = If(m_ColumnList(ColumnIndex).SortDirection, 1, -1)
+      '         Dim nCheck As Integer = Check(First, Second, nDir, m_EgtColumnList(ColumnIndex))
+      '         If nCheck <> 0 Then
+      '            Return nCheck
+      '         End If
+      '         ColumnIndex += 1
+      '      End While
+      '      ' se non trovo colonne, metto in ordine indice di produzione
+      '      If First.nProductionIndex > Second.nProductionIndex Then
+      '         Return 1
+      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
+      '         Return -1
+      '      Else
+      '         Return 0
+      '      End If
+      '   End If
+   End Function
+
+   Private Function Check(First As MyMachGroupVM, Second As MyMachGroupVM, nDirection As Integer, Column As EgtDataGridColumn) As Integer
+      Select Case Column.Name
+         Case COL_NAME
+            If First.nName > Second.nName Then
+               Return 1 * nDirection
+            ElseIf First.nName < Second.nName Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_STARTCUT
+            If First.Id > Second.Id Then
+               Return 1 * nDirection
+            ElseIf First.Id < Second.Id Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_W
+            If First.dW > Second.dW Then
+               Return 1 * nDirection
+            ElseIf First.dW < Second.dW Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_H
+            If First.dH > Second.dH Then
+               Return 1 * nDirection
+            ElseIf First.dH < Second.dH Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_L
+            If First.dL > Second.dL Then
+               Return 1 * nDirection
+            ElseIf First.dL < Second.dL Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_POSZ
+               'If First.posz > Second.dL Then
+               '   Return 1 * nDirection
+               'ElseIf First.dL < Second.dL Then
+               '   Return -1 * nDirection
+               'Else
+               '   Return 0
+               'End If
+         Case COL_MATERIAL
+            If First.sMATERIAL > Second.sMATERIAL Then
+               Return 1 * nDirection
+            ElseIf First.sMATERIAL < Second.sMATERIAL Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_USAGE
+            If First.dUsage > Second.dUsage Then
+               Return 1 * nDirection
+            ElseIf First.dUsage < Second.dUsage Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_WASTE
+            If First.dWaste > Second.dWaste Then
+               Return 1 * nDirection
+            ElseIf First.dWaste < Second.dWaste Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+      End Select
+   End Function
+
+End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -19,7 +19,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       EXPORTDATE = 1
    End Enum
 
-   Private Enum FilterTypes As Integer
+   Protected Enum FilterTypes As Integer
       NULL = 0
       ID = 1
       BTLFILENAME = 2
@@ -36,9 +36,9 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    End Enum
 
    Public Enum RowQuantities As Integer
-      FIFTY = 0
-      HUNDRED = 1
-      HUNDREDANDFIFTY = 2
+      TEN = 0
+      TWENTY = 1
+      THIRTY = 2
    End Enum
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
@@ -67,6 +67,27 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
    End Property
 
+   Private m_colProjId_Name As EgtDataGridColumn
+   Public ReadOnly Property colProjId_Name As EgtDataGridColumn
+      Get
+         Return m_colProjId_Name
+      End Get
+   End Property
+
+   Private m_colProdId_Name As EgtDataGridColumn
+   Public ReadOnly Property colProdId_Name As EgtDataGridColumn
+      Get
+         Return m_colProdId_Name
+      End Get
+   End Property
+
+   Private m_colCreateDate_Name As EgtDataGridColumn
+   Public ReadOnly Property colCreateDate_Name As EgtDataGridColumn
+      Get
+         Return m_colCreateDate_Name
+      End Get
+   End Property
+
    Protected m_ProjColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property ProjColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -106,7 +127,13 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
    End Property
 
-   Public m_ProjectList_View As CollectionView = Nothing
+   Private m_ProjectList_View As CollectionView = Nothing
+   Public ReadOnly Property ProjectList_View As CollectionView
+      Get
+         Return m_ProjectList_View
+      End Get
+   End Property
+
    Protected m_ProjectList As New ObservableCollection(Of ProdItem)
    Public ReadOnly Property ProjectList As ObservableCollection(Of ProdItem)
       Get
@@ -185,7 +212,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Set(value As Integer)
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         'm_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -227,7 +255,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          NotifyPropertyChanged(NameOf(Date_Visibility))
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -242,7 +271,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, lStartDate.ToString())
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -257,7 +287,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, lEndDate.ToString())
          ' aggiorno lista da Db
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -275,7 +306,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
    End Property
 
-   Private m_SelRowQuantity As RowQuantities
+   Protected m_SelRowQuantity As RowQuantities
    Public Property SelRowQuantity As Integer
       Get
          Return m_SelRowQuantity
@@ -283,7 +314,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Set(value As Integer)
          m_SelRowQuantity = value
          RefreshProjectList()
-         m_ProjectList_View.Refresh()
+         ' m_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -308,7 +340,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          If Not IsNothing(SearchDate) Then SearchDate.Clear()
          ' setto il Tipo Filtro a NULL e refresho la lista dei progetti (in modo da averli visibili tutti)
          m_SelFilterType = m_FilterTypeList(0)
-         m_ProjectList_View.Refresh()
+         'm_ProjectList_View.Refresh()
+         UpdatePageList()
          ' ora setto il valore scelto come Tipo Filtro
          m_SelFilterType = value
          Select Case m_SelFilterType.Id
@@ -332,7 +365,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
       Set(value As String)
          m_SearchText = value
-         m_ProjectList_View.Refresh()
+         'm_ProjectList_View.Refresh()
+         UpdatePageList()
       End Set
    End Property
 
@@ -390,9 +424,9 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Set(value As Boolean)
          m_bViewArchived = value
          WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_VIEWARCHIVED, If(bViewArchived, 1, 0))
-         If Not IsNothing( m_colArchived_Name) Then
-             m_colArchived_Name.Visible = value
-             RefreshProjectList()
+         If Not IsNothing(m_colArchived_Name) Then
+            m_colArchived_Name.Visible = value
+            RefreshProjectList()
          End If
       End Set
    End Property
@@ -419,6 +453,30 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       NotifyPropertyChanged(NameOf(bDelete_IsEnabled))
    End Sub
 
+   Private m_PageList_View As ListCollectionView = Nothing
+   Public ReadOnly Property PageList_View As ListCollectionView
+      Get
+         Return m_PageList_View
+      End Get
+   End Property
+   Protected m_PageList As New ObservableCollection(Of ProdItem)
+   Public Property PageList As ObservableCollection(Of ProdItem)
+      Get
+         Return m_PageList
+      End Get
+      Set(value As ObservableCollection(Of ProdItem))
+         m_PageList = value
+      End Set
+   End Property
+
+   Private m_nPageIndex As Integer = 1
+   Public ReadOnly Property nPageIndex As Integer
+      Get
+         Return m_nPageIndex
+      End Get
+   End Property
+
+
    Protected m_ChangeOpenedProjectOnCancel As Boolean = False
 
 #Region "Messages"
@@ -545,6 +603,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    Private m_cmdDelete As ICommand
    Private m_cmdArchive As ICommand
    Private m_cmdCancel As ICommand
+   Private m_cmdPrevPage As ICommand
+   Private m_cmdNextPage As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -555,6 +615,9 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       LoadColumns()
       m_colProdFile_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_NAME)
       m_colArchived_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_ARCHIVED)
+      m_colProjId_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_PROJID)
+      m_colProdId_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_PRODID)
+      m_colCreateDate_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_CREATEDATE)
       ' leggo valori per filtri
       m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
       Select Case m_SelDayType
@@ -589,6 +652,29 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
    End Sub
 
+
+   Private m_ProdItemComparer As ProdItemComparer
+   Friend ReadOnly Property ProdItemComparer As ProdItemComparer
+      Get
+         Return m_ProdItemComparer
+      End Get
+   End Property
+
+   Friend Sub SetPageListView()
+      m_PageList_View = CollectionViewSource.GetDefaultView(m_PageList)
+      m_ProdItemComparer = New ProdItemComparer
+      m_PageList_View.CustomSort = m_ProdItemComparer
+      NotifyPropertyChanged(NameOf(PageList_View))
+   End Sub
+
+   Friend Sub RefreshProdItemSort()
+      m_PageList_View.CustomSort = m_ProdItemComparer
+   End Sub
+
+   Friend Sub SortPageList()
+      ' m_ProjectList = New ObservableCollection(Of ProdItem)(m_ProjectList.OrderBy(Of Integer)(Function(x) If(String.IsNullOrWhiteSpace(x.sProdId), 0, CInt(x.sProdId))))
+   End Sub
+
    Protected Sub LoadColumns()
       'If ProjectType = ProjectType.PROJ Then
       ' carico le colonne della datagrid
@@ -650,17 +736,69 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Return AllFilesInDir.Any(Function(x) Path.GetExtension(x).ToLower() = ".nge")
    End Function
 
-   Protected Function ProjectFilter(Proj As Object) As Boolean
-      Dim bProjectOk As Boolean = True
-      'If TypeOf Proj Is ProjFileVM Then
-      Dim CurrProj As ProdItem = DirectCast(Proj, ProdItem)
-      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-         (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).dtExportDate.Date))) OrElse
-         (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-         (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-         (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-         (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+   'Protected Function ProjectFilter(Proj As Object) As Boolean
+   '   Dim bProjectOk As Boolean = True
+   '   'If TypeOf Proj Is ProjFileVM Then
+   '   Dim CurrProj As ProdItem = DirectCast(Proj, ProdItem)
+   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+   '      (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).dtExportDate.Date))) OrElse
+   '      (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+   '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+   '      (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+   '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+   '   'ElseIf TypeOf Proj Is ProdFileVM Then
+   '   '   Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
+   '   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+   '   '      (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+   '   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+   '   '      (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+   '   '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+   '   '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+   '   'End If
+   '   Return bProjectOk
+   'End Function
+
+   Public Overridable Function UpdatePageList() As Boolean
+      Dim FilteredList As IEnumerable(Of ProdItem) = m_ProjectList.Where(Function(x)
+                                                                            If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso
+                                                                               ((m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+                                                                               (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+                                                                               (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso x.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then Return False
+                                                                            Return True
+                                                                         End Function)
+      Dim nPageRowQty As Integer = 0
+      Select Case m_SelRowQuantity
+         Case RowQuantities.TEN
+            nPageRowQty = 10
+         Case RowQuantities.TWENTY
+            nPageRowQty = 20
+         Case RowQuantities.THIRTY
+            nPageRowQty = 30
+      End Select
+      Dim nStart = nPageIndex * nPageRowQty
+      If (nPageIndex - 1) * nPageRowQty + 1 > FilteredList.Count() Then
+         Return False
+      End If
+      '   FilteredList = FilteredList.OrderBy(Of ProdItem)()
+      ' m_PageList = New ObservableCollection(Of ProdItem)(FilteredList.Skip((nPageIndex - 1) * nPageRowQty + 1).Take(nPageIndex * nPageRowQty).Select(Function(x) x))
+      m_PageList.Clear()
+      For Index = (nPageIndex - 1) * nPageRowQty + 1 To nPageIndex * nPageRowQty
+         m_PageList.Add(FilteredList(Index))
+      Next
+      NotifyPropertyChanged(NameOf(PageList))
+      Return True
+
+      'Dim bProjectOk As Boolean = True
+      ''If TypeOf Proj Is ProjFileVM Then
+      'Dim CurrProj As ProdItem = DirectCast(PROJ, ProdItem)
+      'If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+      '   (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).dtExportDate.Date))) OrElse
+      '   (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+      'If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+      '   (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+      '   (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+      '   (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       'ElseIf TypeOf Proj Is ProdFileVM Then
       '   Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
       '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
@@ -670,6 +808,15 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
       '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       'End If
+      ' Return bProjectOk
+   End Function
+
+   Protected Function ProjectFilter(CurrProj As ProdItem) As Boolean
+      Dim bProjectOk As Boolean = True
+      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+         (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+         (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+         (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       Return bProjectOk
    End Function
 
@@ -775,6 +922,60 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
 #End Region ' Cancel
 
+#Region "PrevPage"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property PrevPage_Command As ICommand
+      Get
+         If m_cmdPrevPage Is Nothing Then
+            m_cmdPrevPage = New Command(AddressOf PrevPage)
+         End If
+         Return m_cmdPrevPage
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Public Overridable Sub PrevPage()
+      If m_nPageIndex > 1 Then
+         m_nPageIndex -= 1
+      End If
+      UpdatePageList()
+      NotifyPropertyChanged(NameOf(nPageIndex))
+   End Sub
+
+#End Region ' PrevPage
+
+#Region "NextPage"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property NextPage_Command As ICommand
+      Get
+         If m_cmdNextPage Is Nothing Then
+            m_cmdNextPage = New Command(AddressOf NextPage)
+         End If
+         Return m_cmdNextPage
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Public Overridable Sub NextPage()
+      m_nPageIndex += 1
+      If Not UpdatePageList() Then
+         m_nPageIndex -= 1
+      End If
+      NotifyPropertyChanged(NameOf(nPageIndex))
+   End Sub
+
+#End Region ' NextPage
+
 #End Region    ' Commands
 
 End Class

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -41,16 +41,6 @@ Public Class ProdFileM
       End Set
    End Property
 
-   Protected m_nProjCloudId As Integer
-   Public Property nProjCloudId As Integer
-      Get
-         Return m_nProjCloudId
-      End Get
-      Set(value As Integer)
-         m_nProjCloudId = value
-      End Set
-   End Property
-
 #Region "CONSTRUCTORS"
 
    Protected Sub New()
@@ -61,7 +51,7 @@ Public Class ProdFileM
    End Function
 
    Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, Optional nProjCloudId As Integer = 0) As ProdFileM
+                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean) As ProdFileM
       Dim NewProjectFileM As New ProdFileM
       NewProjectFileM.m_nProdId = nProdId
       NewProjectFileM.m_nProjIdList = nProjIdList
@@ -74,7 +64,6 @@ Public Class ProdFileM
       NewProjectFileM.m_bIsActive = bIsActive
       NewProjectFileM.m_bIsProduced = bIsProduced
       NewProjectFileM.m_bIsArchived = bIsArchived
-      NewProjectFileM.m_nProjCloudId = nProjCloudId
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb

@@ -5,9 +5,10 @@ Imports System.Windows
 Public Class ProdItem
     Inherits VMBase
 
-    Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
+   Public Shared m_delUpdateNameInDb As Action(Of Integer, String)
+   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
 
-    Protected m_ProdFileVM As ProdFileVM
+   Protected m_ProdFileVM As ProdFileVM
     Public ReadOnly Property ProdFileVM As ProdFileVM
         Get
             Return m_ProdFileVM
@@ -32,10 +33,12 @@ Public Class ProdItem
             Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
         End Get
         Set(value As String)
-            If Not IsNothing(m_ProdFileVM) Then
-                m_ProdFileVM.sName = value
-            End If
-        End Set
+         If Not IsNothing(m_ProdFileVM) Then
+            m_delUpdateNameInDb(m_ProdFileVM.nProdId, value)
+            m_ProdFileVM.sName = value
+            m_delIsModifiedSetUp(False)
+         End If
+      End Set
     End Property
 
     Public ReadOnly Property dtCreateDate As Date

EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb

@@ -29,35 +29,25 @@ Public Class ProjFileM
     End Property
 
     Protected m_sDescription As String = String.Empty
-   Public Property sDescription As String
-      Get
-         Return m_sDescription
-      End Get
-      Set(value As String)
-         m_sDescription = value
-      End Set
-   End Property
-
-   Protected m_nProjCloudId As Integer
-   Public Property nProjCloudId As Integer
-      Get
-         Return m_nProjCloudId
-      End Get
-      Set(value As Integer)
-         m_nProjCloudId = value
-      End Set
-   End Property
+    Public Property sDescription As String
+        Get
+            Return m_sDescription
+        End Get
+        Set(value As String)
+            m_sDescription = value
+        End Set
+    End Property
 
 #Region "CONSTRUCTORS"
 
-   Protected Sub New()
+    Protected Sub New()
    End Sub
 
    Public Shared Function CreateNewProjFileM() As ProjFileM
       Return New ProjFileM
    End Function
 
-   Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String, sBTLFileName As String, sDescription As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String, bIsActive As Boolean, bIsArchived As Boolean, Optional nProjCloudId As Integer = 0) As ProjFileM
+   Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String, sBTLFileName As String, sDescription As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String, bIsActive As Boolean, bIsArchived As Boolean) As ProjFileM
       Dim NewProjectFileM As New ProjFileM
       NewProjectFileM.m_nProjId = nProjId
       NewProjectFileM.m_nProdId = nProdId
@@ -72,7 +62,6 @@ Public Class ProjFileM
       NewProjectFileM.m_sMachine = sMachine
       NewProjectFileM.m_bIsActive = bIsActive
       NewProjectFileM.m_bIsArchived = bIsArchived
-      NewProjectFileM.m_nProjCloudId = nProjCloudId
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/Utility/DbControllers.vb

@@ -1,22 +0,0 @@
-Imports EgtUILib
-Imports EgtWPFLib5
-Imports EgtBEAMWALL.Core
-Imports EgtBEAMWALL.ViewerOptimizer
-
-Public Module DbControllers
-
-   Public m_MaterialsController As DataLayer.Controllers.MaterialsController
-   Public m_RawItemsController As DataLayer.Controllers.RawItemsController
-
-   Sub Init()
-   End Sub
-
-   Sub New()
-   End Sub
-
-   Sub LoadControllers(MaterialsController As DataLayer.Controllers.MaterialsController, RawItemsController As DataLayer.Controllers.RawItemsController)
-      m_MaterialsController = MaterialsController
-      m_RawItemsController = RawItemsController
-   End Sub
-
-End Module

EgtBEAMWALL.Core/Utility/MachLog.vb

@@ -3,7 +3,6 @@
 #Region "Private Fields"
 
    Public Enum MachLogTypes
-      NULL = 0
       PART_STATUS = 1
       MACHGROUP_STATUS = 2
       MACHINE_MODE = 3
@@ -14,13 +13,20 @@
       ALARM = 8
       OPERATOR_MSG = 9
       PROGRAM_SEND = 10
-      APPLICATION = 11
    End Enum
 
+   Private m_AlarmCode As String
    Private m_AlarmDateTime As DateTime
-   Private m_nProdId As Integer
-   Private m_ResultType As MachLogTypes
-   Private m_SupervisorId As String
+   Private m_AlarmMessage As String
+   Private m_AlarmOperation As Integer
+   Private m_AlarmType As Integer
+   Private m_CommandExecutedCorrectly As Boolean
+   Private m_CommandState As CommandStates
+   Private m_CommandType As LogCommandTypes
+   Private m_Description As String
+   Private m_newOpState As Integer
+   Private m_ResultType As ResultTypes
+   Private m_VarAddress As String
    Private m_VarValue As String
 
    ' variabili del log macchina
@@ -90,10 +96,18 @@
 #Region "Protected Constructors"
 
    Protected Sub New()
+      m_AlarmCode = ""
       m_AlarmDateTime = DateTime.MinValue
-      m_nProdId = 0
+      m_AlarmMessage = ""
+      m_AlarmOperation = 0
+      m_AlarmType = 0
+      m_CommandExecutedCorrectly = False
+      m_CommandState = CommandStates.NULL
+      m_CommandType = LogCommandTypes.NULL
+      m_Description = ""
+      m_newOpState = 0
       m_ResultType = ResultTypes.NULL
-      m_SupervisorId = ""
+      m_VarAddress = ""
       m_VarValue = ""
    End Sub
 
@@ -101,15 +115,63 @@
 
 #Region "Public Properties"
 
+   Public ReadOnly Property AlarmCode As String
+      Get
+         Return m_AlarmCode
+      End Get
+   End Property
+
    Public ReadOnly Property AlarmDateTime As Date
       Get
          Return m_AlarmDateTime
       End Get
    End Property
 
-   Public ReadOnly Property ProdId As Integer
+   Public ReadOnly Property AlarmMessage As String
       Get
-         Return m_nProdId
+         Return m_AlarmMessage
+      End Get
+   End Property
+
+   Public ReadOnly Property AlarmOperation As Integer
+      Get
+         Return m_AlarmOperation
+      End Get
+   End Property
+
+   Public ReadOnly Property AlarmType As Integer
+      Get
+         Return m_AlarmType
+      End Get
+   End Property
+
+   Public ReadOnly Property CommandExecutedCorrectly As Boolean
+      Get
+         Return m_CommandExecutedCorrectly
+      End Get
+   End Property
+
+   Public ReadOnly Property CommandState As CommandStates
+      Get
+         Return m_CommandState
+      End Get
+   End Property
+
+   Public ReadOnly Property CommandType As LogCommandTypes
+      Get
+         Return m_CommandType
+      End Get
+   End Property
+
+   Public ReadOnly Property Description As String
+      Get
+         Return m_Description
+      End Get
+   End Property
+
+   Public ReadOnly Property newOpState As Integer
+      Get
+         Return m_newOpState
       End Get
    End Property
 
@@ -121,7 +183,7 @@
 
    Public ReadOnly Property VarAddress As String
       Get
-         Return m_SupervisorId
+         Return m_VarAddress
       End Get
    End Property
 
@@ -137,20 +199,28 @@
 
    Public Shared Function CreateAlarmLog(AlarmOperation As Integer, AlarmType As Integer, AlarmMessage As String, AlarmCode As String, AlarmDateTime As String)
       Dim NewMachLog As New MachLog
+      NewMachLog.m_CommandType = LogCommandTypes.ALARM
+      NewMachLog.m_AlarmOperation = AlarmOperation
+      NewMachLog.m_AlarmType = AlarmType
+      NewMachLog.m_AlarmMessage = AlarmMessage
+      NewMachLog.m_AlarmCode = AlarmCode
       DateTime.TryParse(AlarmDateTime, NewMachLog.m_AlarmDateTime)
       Return NewMachLog
    End Function
 
    Public Shared Function CreateOPStateLog(newOpState As Integer)
       Dim NewMachLog As New MachLog
-      NewMachLog.m_nProdId = newOpState
+      NewMachLog.m_CommandType = LogCommandTypes.NEWOP
+      NewMachLog.m_newOpState = newOpState
       NewMachLog.m_AlarmDateTime = DateTime.Now()
       Return NewMachLog
    End Function
 
    Public Shared Function CreateReadLog(CommandExecutedCorrectly As Boolean, VarAddress As String, VarValue As String)
       Dim NewMachLog As New MachLog
-      NewMachLog.m_SupervisorId = VarAddress
+      NewMachLog.m_CommandType = CommandTypes.READ_TPA
+      NewMachLog.m_CommandExecutedCorrectly = CommandExecutedCorrectly
+      NewMachLog.m_VarAddress = VarAddress
       NewMachLog.m_VarValue = VarValue
       NewMachLog.m_AlarmDateTime = DateTime.Now()
       Return NewMachLog
@@ -158,18 +228,20 @@
 
    Public Shared Function CreateResultLog(CommandType As LogCommandTypes, CommandState As CommandStates, ResultType As ResultTypes, Description As String)
       Dim NewMachLog As New MachLog
+      NewMachLog.m_CommandType = CommandType
+      NewMachLog.m_CommandState = CommandState
       NewMachLog.m_ResultType = ResultType
+      NewMachLog.m_Description = Description
       NewMachLog.m_AlarmDateTime = DateTime.Now()
       Return NewMachLog
    End Function
 
-   Public Shared Function CreateMachLog(EventType As MachLogTypes, EventDateTime As DateTime, Value As String, nProdId As Integer, SupervisorID As String)
+   Public Shared Function CreateMachLog(EventType As MachLogTypes, EventDateTime As DateTime, Value As String, SupervisorID As String)
       Dim NewMachEvent As New MachLog
       NewMachEvent.m_ResultType = EventType
       NewMachEvent.m_AlarmDateTime = EventDateTime
       NewMachEvent.m_VarValue = Value
-      NewMachEvent.m_nProdId = nProdId
-      NewMachEvent.m_SupervisorId = SupervisorID
+      NewMachEvent.m_VarAddress = SupervisorID
       Return NewMachEvent
    End Function
 
@@ -180,10 +252,18 @@
    Public Shared Function CreateMachLog(AlarmCode As String, AlarmDateTime As Date, AlarmMessage As String, AlarmOperation As Integer, AlarmType As Integer, CommandExecutedCorrectly As Boolean, CommandState As CommandStates, CommandType As LogCommandTypes, Description As String, newOpState As Integer, ResultType As ResultTypes, VarAddress As String, VarValue As String) As MachLog
 
       Dim NewMachLog As New MachLog
+      NewMachLog.m_AlarmCode = AlarmCode
       NewMachLog.m_AlarmDateTime = AlarmDateTime
-      NewMachLog.m_nProdId = newOpState
+      NewMachLog.m_AlarmMessage = AlarmMessage
+      NewMachLog.m_AlarmOperation = AlarmOperation
+      NewMachLog.m_AlarmType = AlarmType
+      NewMachLog.m_CommandExecutedCorrectly = CommandExecutedCorrectly
+      NewMachLog.m_CommandState = CommandState
+      NewMachLog.m_CommandType = CommandType
+      NewMachLog.m_Description = Description
+      NewMachLog.m_newOpState = newOpState
       NewMachLog.m_ResultType = ResultType
-      NewMachLog.m_SupervisorId = VarAddress
+      NewMachLog.m_VarAddress = VarAddress
       NewMachLog.m_VarValue = VarValue
 
       Return NewMachLog

EgtBEAMWALL.Core/Utility/Material.vb

@@ -1,111 +0,0 @@
-Imports System.Windows
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MaterialM
-
-   Protected m_nId As Integer = 0
-   Public ReadOnly Property nId As Integer
-      Get
-         Return m_nId
-      End Get
-   End Property
-   Public Sub SetId(nId As Integer)
-      m_nId = nId
-   End Sub
-
-   Protected m_sMaterial As String
-   Public ReadOnly Property sMaterial As String
-      Get
-         Return m_sMaterial
-      End Get
-   End Property
-   Public Sub SetMaterial(sMaterial As String)
-      m_sMaterial = sMaterial
-   End Sub
-
-   Protected m_sWarehouseMaterial As String
-   Public ReadOnly Property sWarehouseMaterial As String
-      Get
-         Return m_sWarehouseMaterial
-      End Get
-   End Property
-   Public Sub SetWarehouseMaterial(sWarehouseMaterial As String)
-      m_sWarehouseMaterial = sWarehouseMaterial
-   End Sub
-
-   Protected m_dW As Double = 0
-   Public ReadOnly Property dW As Double
-      Get
-         Return m_dW
-      End Get
-   End Property
-
-   Protected m_dH As Double = 0
-   Public ReadOnly Property dH As Double
-      Get
-         Return m_dH
-      End Get
-   End Property
-
-   Protected m_dL As Double = 0
-   Public ReadOnly Property dL As Double
-      Get
-         Return m_dL
-
-      End Get
-   End Property
-
-   Shared Operator =(ByVal S1 As MaterialM, ByVal S2 As MaterialM) As Boolean
-      If IsNothing(S1) OrElse IsNothing(S2) Then Return False
-      Return (Math.Abs(S1.m_dH - S2.m_dH) < 100 * EPS_SMALL AndAlso
-              Math.Abs(S1.m_dW - S2.m_dW) < 100 * EPS_SMALL AndAlso
-              Math.Abs(S1.m_dL - S2.m_dL) < 100 * EPS_SMALL AndAlso
-              S1.m_sWarehouseMaterial = S2.m_sWarehouseMaterial)
-   End Operator
-
-   Shared Operator <>(ByVal S1 As MaterialM, ByVal S2 As MaterialM) As Boolean
-      Return Not S1 = S2
-   End Operator
-
-   Public Overrides Function Equals(ByVal obj As Object) As Boolean
-      If TypeOf obj Is MaterialM Then
-         Return Me = DirectCast(obj, MaterialM) '(m_dH = obj.dH AndAlso m_dW = obj.dW AndAlso m_dL = obj.dL AndAlso m_Material.Any(Function(x) DirectCast(obj.sMaterial, List(Of String)).Any(Function(y) y = x)))
-      End If
-      Return False
-   End Function
-
-   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String)
-      m_dW = dW
-      m_dH = dH
-      m_dL = dL
-      m_sMaterial = sMaterial
-   End Sub
-
-   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, sWarehouseMaterial As String)
-      m_dW = dW
-      m_dH = dH
-      m_dL = dL
-      m_sMaterial = sMaterial
-      m_sWarehouseMaterial = sWarehouseMaterial
-   End Sub
-
-   ' costruttore per DataLayer
-   Sub New(nId As Integer, dW As Double, dH As Double, dL As Double, sMaterial As String, sWarehouseMaterial As String)
-      m_nId = nId
-      m_dW = dW
-      m_dH = dH
-      m_dL = dL
-      m_sMaterial = sMaterial
-      m_sWarehouseMaterial = sWarehouseMaterial
-   End Sub
-
-   Public Sub Update(dW As Double, dH As Double, dL As Double, sMaterial As String)
-      m_dW = dW
-      m_dH = dH
-      m_dL = dL
-      m_sMaterial = sMaterial
-   End Sub
-
-End Class
-

EgtBEAMWALL.Core/Utility/RawPart.vb

@@ -1,121 +0,0 @@
-Imports EgtWPFLib5
-
-Public Class RawPartM
-   Inherits VMBase
-
-   Protected m_nId As Integer
-   Public ReadOnly Property nId As Integer
-      Get
-         Return m_nId
-      End Get
-   End Property
-   Public Sub SetId(nId As Integer)
-      m_nId = nId
-   End Sub
-
-   Private m_bActive As Boolean
-   Public Property bActive As Boolean
-      Get
-         Return m_bActive
-      End Get
-      Set(value As Boolean)
-         m_bActive = value
-      End Set
-   End Property
-
-   Private m_Material As MaterialM
-   Public Property Material As MaterialM
-      Get
-         Return m_Material
-      End Get
-      Set(value As MaterialM)
-         m_Material = value
-      End Set
-   End Property
-
-   Private m_dW As Double
-   Public Property dW As Double
-      Get
-         Return m_dW
-      End Get
-      Set(value As Double)
-         m_dW = value
-      End Set
-   End Property
-
-   Private m_dL As Double
-   Public Property dL As Double
-      Get
-         Return m_dL
-      End Get
-      Set(value As Double)
-         m_dL = value
-      End Set
-   End Property
-
-   Private m_nQuantity As Integer
-   Public Property nQuantity As Integer
-      Get
-         Return m_nQuantity
-      End Get
-      Set(value As Integer)
-         m_nQuantity = value
-      End Set
-   End Property
-   Private m_bUseQuantity As Boolean
-   Public Property bUseQuantity As Boolean
-      Get
-         Return m_bUseQuantity
-      End Get
-      Set(value As Boolean)
-         m_bUseQuantity = value
-      End Set
-   End Property
-
-   Sub New(Material As MaterialM, W As Double, L As Double, Qty As Integer, Active As Boolean)
-      m_Material = Material
-      m_dW = W
-      m_dL = L
-      m_nQuantity = Qty
-      m_bActive = Active
-   End Sub
-
-   Sub New(nId As Integer, Material As MaterialM, W As Double, L As Double, Qty As Integer, bUseQty As Boolean, Active As Boolean)
-      m_nId = nId
-      m_Material = Material
-      m_dW = W
-      m_dL = L
-      m_nQuantity = Qty
-      m_bUseQuantity = bUseQty
-      m_bActive = Active
-   End Sub
-
-   Sub New(Material As MaterialM, W As Double, L As Double)
-      m_Material = Material
-      m_dW = W
-      m_dL = L
-      m_nQuantity = 0
-      m_bUseQuantity = False
-      m_bActive = False
-   End Sub
-
-   Public Sub Update(RawPart As RawPartM)
-      m_Material = RawPart.m_Material
-      m_dW = RawPart.dW
-      m_dL = RawPart.dL
-      m_nQuantity = RawPart.m_nQuantity
-      m_bUseQuantity = RawPart.m_bUseQuantity
-      m_bActive = RawPart.m_bActive
-   End Sub
-
-   Public Sub Update(W As Double, L As Double)
-      m_dW = W
-      m_dL = L
-   End Sub
-
-   Public Function Copy() As RawPartM
-      Return New RawPartM(m_nId, m_Material, m_dW, m_dL, m_nQuantity, bUseQuantity, bActive)
-   End Function
-
-End Class
-

EgtBEAMWALL.Core/Utility/SectionXMaterial.vb

@@ -15,91 +15,77 @@ Public Class SectionXMaterial
       m_nType = nType
    End Sub
 
-   Public ReadOnly Property sMaterial As String
+   Protected m_Material As List(Of String)
+   Public ReadOnly Property sMaterial As List(Of String)
       Get
-         Return m_MaterialM.sMaterial
+         Return m_Material
       End Get
    End Property
 
-   Public ReadOnly Property sWarehouseMaterial As String
+   Protected m_MaterialForSameSection_List As New List(Of String)
+   Public Property MaterialForSameSection_List As List(Of String)
       Get
-         Return m_MaterialM.sWarehouseMaterial
+         Return m_MaterialForSameSection_List
       End Get
+      Set(value As List(Of String))
+         m_MaterialForSameSection_List = value
+      End Set
    End Property
 
-   'Protected m_MaterialForSameSection_List As New List(Of String)
-   'Public Property MaterialForSameSection_List As List(Of String)
-   '   Get
-   '      Return m_MaterialForSameSection_List
-   '   End Get
-   '   Set(value As List(Of String))
-   '      m_MaterialForSameSection_List = value
-   '   End Set
-   'End Property
-
-   'Protected m_SelMaterialForSameSection As String
-   'Public Property SelMaterialForSameSection As String
-   '   Get
-   '      Return m_SelMaterialForSameSection
-   '   End Get
-   '   Set(value As String)
-   '      m_SelMaterialForSameSection = value
-   '   End Set
-   'End Property
-
-   Protected m_MaterialM As MaterialM
-   Public ReadOnly Property MaterialM As MaterialM
+   Protected m_SelMaterialForSameSection As String
+   Public Property SelMaterialForSameSection As String
       Get
-         Return m_MaterialM
+         Return m_SelMaterialForSameSection
       End Get
+      Set(value As String)
+         m_SelMaterialForSameSection = value
+      End Set
    End Property
 
+   Protected m_dW As Double = 0
    Public ReadOnly Property dW As Double
       Get
-         Return m_MaterialM.dW
+         Return m_dW
       End Get
    End Property
 
+   Protected m_dH As Double = 0
    Public ReadOnly Property dH As Double
       Get
-         Return m_MaterialM.dH
+         Return m_dH
       End Get
    End Property
 
+   Protected m_dL As Double = 0
    Public ReadOnly Property dL As Double
       Get
-         Return m_MaterialM.dL
+         Return m_dL
       End Get
    End Property
 
    Public ReadOnly Property sSectionXMaterial As String
       Get
+         Dim sAlias As String = String.Empty
+         For Each sMatItem In sMaterial
+            sAlias &= sMatItem & ";"
+         Next
+         sAlias = sAlias.TrimEnd(";")
          If Me = Empty Then
             Return ""
          ElseIf m_nType = MachineType.BEAM Then
-            Return LenToString(m_MaterialM.dW, 3) & " x " & LenToString(m_MaterialM.dH, 3) & " " & If(GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) = 1, sWarehouseMaterial, sMaterial)
+            Return LenToString(m_dW, 3) & " x " & LenToString(m_dH, 3) & " " & sAlias
          ElseIf m_nType = MachineType.WALL Then
-            Return LenToString(m_MaterialM.dH, 3) & " " & If(GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) = 1, sWarehouseMaterial, sMaterial)
-         Else Return ""
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property sWarehouseSectionXMaterial As String
-      Get
-         If Me = Empty Then
-            Return ""
-         ElseIf m_nType = MachineType.BEAM Then
-            Return LenToString(m_MaterialM.dW, 3) & " x " & LenToString(m_MaterialM.dH, 3) & " " & sWarehouseMaterial
-         ElseIf m_nType = MachineType.WALL Then
-            Return LenToString(m_MaterialM.dH, 3) & " " & sWarehouseMaterial
+            Return LenToString(m_dH, 3) & " " & sAlias
          Else Return ""
          End If
       End Get
    End Property
 
    Shared Operator =(ByVal S1 As SectionXMaterial, ByVal S2 As SectionXMaterial) As Boolean
-      Return S1.m_MaterialM = S2.m_MaterialM
+      Return (Math.Abs( S1.m_dH - S2.m_dH) < 100 * EPS_SMALL AndAlso
+              Math.Abs( S1.m_dW - S2.m_dW) < 100 * EPS_SMALL AndAlso
+              Math.Abs( S1.m_dL - S2.m_dL) < 100 * EPS_SMALL AndAlso
+              S1.m_Material.Any(Function(x) S2.m_Material.Any(Function(y) y = x)))
    End Operator
 
    Shared Operator <>(ByVal S1 As SectionXMaterial, ByVal S2 As SectionXMaterial) As Boolean
@@ -113,110 +99,122 @@ Public Class SectionXMaterial
       Return False
    End Function
 
-   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, sWarehouseMaterial As String)
+   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String)
       If m_nType = BWType.BEAM Then
-         m_MaterialM = New MaterialM(dW, dH, 0, sMaterial, sWarehouseMaterial)
+         m_dW = dW
+         m_dH = dH
       ElseIf m_nType = BWType.WALL Then
-         m_MaterialM = New MaterialM(0, dH, 0, sMaterial, sWarehouseMaterial)
+         m_dH = dH
       Else
-         m_MaterialM = New MaterialM(dW, dH, dL, sMaterial, sWarehouseMaterial)
+         m_dW = dW
+         m_dH = dH
+         m_dL = dL
       End If
+      m_Material = New List(Of String)
+      Dim sMaterialArray() As String = Split(sMaterial, ";")
+      For Each sMatItem In sMaterialArray
+         m_Material.Add(sMatItem)
+      Next
    End Sub
 
-   Sub New(MaterialM As MaterialM)
-      m_MaterialM = MaterialM
+   Public Shared Empty As New SectionXMaterial(-1, -1, -1, "")
+
+#Region "Import BTL <-> Warehouse"
+
+   Private m_dNewW As Double
+   Public Property dNewW As Double
+      Get
+         Return m_dNewW
+      End Get
+      Set(value As Double)
+         m_dNewW = value
+      End Set
+   End Property
+
+   Private m_dNewL As Double
+   Public Property dNewL As Double
+      Get
+         Return m_dNewL
+      End Get
+      Set(value As Double)
+         m_dNewL = value
+      End Set
+   End Property
+
+   Private m_nQuantity As Integer
+   Public Property nQuantity As Integer
+      Get
+         Return m_nQuantity
+      End Get
+      Set(value As Integer)
+         m_nQuantity = value
+      End Set
+   End Property
+
+   Private m_Alias_IsEnabled As Boolean
+   Public Property Alias_IsEnabled As Boolean
+      Get
+         Return m_Alias_IsEnabled
+      End Get
+      Set(value As Boolean)
+         m_Alias_IsEnabled = value
+      End Set
+   End Property
+
+   Private m_Alias_IsChecked As Boolean
+   Public Overridable Property Alias_IsChecked As Boolean
+      Get
+         Return m_Alias_IsChecked
+      End Get
+      Set(value As Boolean)
+         m_Alias_IsChecked = value
+      End Set
+   End Property
+
+   Public ReadOnly Property L_Msg As String
+      Get
+         Return EgtMsg(61604)
+      End Get
+   End Property
+
+   Public ReadOnly Property W_Msg As String
+      Get
+         Return EgtMsg(61605)
+      End Get
+   End Property
+
+   Public ReadOnly Property H_Msg As String
+      Get
+         Return EgtMsg(61606)
+      End Get
+   End Property
+
+   Public ReadOnly Property Quantity_Msg As String
+      Get
+         Return EgtMsg(61774)
+      End Get
+   End Property
+
+   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, nQuantity As Integer)
+      If m_nType = BWType.BEAM Then
+         m_dW = dW
+         m_dH = dH
+      ElseIf m_nType = BWType.WALL Then
+         m_dH = dH
+      Else
+         m_dW = dW
+         m_dH = dH
+         m_dL = dL
+      End If
+      m_Material = New List(Of String)
+      Dim sMaterialArray() As String = Split(sMaterial, ";")
+      For Each sMatItem In sMaterialArray
+         m_Material.Add(sMatItem)
+      Next
+      m_nQuantity = nQuantity
    End Sub
 
-   Public Shared Empty As New SectionXMaterial(-1, -1, -1, "", "")
-
-   '#Region "Import BTL <-> Warehouse"
-
-   '   Private m_dNewW As Double
-   '   Public Property dNewW As Double
-   '      Get
-   '         Return m_dNewW
-   '      End Get
-   '      Set(value As Double)
-   '         m_dNewW = value
-   '      End Set
-   '   End Property
-
-   '   Private m_dNewL As Double
-   '   Public Property dNewL As Double
-   '      Get
-   '         Return m_dNewL
-   '      End Get
-   '      Set(value As Double)
-   '         m_dNewL = value
-   '      End Set
-   '   End Property
-
-   '   Private m_nQuantity As Integer
-   '   Public Property nQuantity As Integer
-   '      Get
-   '         Return m_nQuantity
-   '      End Get
-   '      Set(value As Integer)
-   '         m_nQuantity = value
-   '      End Set
-   '   End Property
-
-   '   Private m_Alias_IsEnabled As Boolean
-   '   Public Property Alias_IsEnabled As Boolean
-   '      Get
-   '         Return m_Alias_IsEnabled
-   '      End Get
-   '      Set(value As Boolean)
-   '         m_Alias_IsEnabled = value
-   '      End Set
-   '   End Property
-
-   '   Private m_Alias_IsChecked As Boolean
-   '   Public Overridable Property Alias_IsChecked As Boolean
-   '      Get
-   '         Return m_Alias_IsChecked
-   '      End Get
-   '      Set(value As Boolean)
-   '         m_Alias_IsChecked = value
-   '      End Set
-   '   End Property
-
-   '   Public ReadOnly Property L_Msg As String
-   '      Get
-   '         Return EgtMsg(61604)
-   '      End Get
-   '   End Property
-
-   '   Public ReadOnly Property W_Msg As String
-   '      Get
-   '         Return EgtMsg(61605)
-   '      End Get
-   '   End Property
-
-   '   Public ReadOnly Property H_Msg As String
-   '      Get
-   '         Return EgtMsg(61606)
-   '      End Get
-   '   End Property
-
-   '   Public ReadOnly Property Quantity_Msg As String
-   '      Get
-   '         Return EgtMsg(61774)
-   '      End Get
-   '   End Property
-
-   '   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, nQuantity As Integer, sWarehouseMaterial As String)
-   '      If m_nType = BWType.BEAM Then
-   '         m_MaterialM = New MaterialM(dW, dH, 0, sMaterial, sWarehouseMaterial)
-   '      ElseIf m_nType = BWType.WALL Then
-   '         m_MaterialM = New MaterialM(0, dH, 0, sMaterial, sWarehouseMaterial)
-   '      Else
-   '         m_MaterialM = New MaterialM(dW, dH, dL, sMaterial, sWarehouseMaterial)
-   '      End If
-   '      m_nQuantity = nQuantity
-   '   End Sub
-
-   '#End Region ' Import BTL <-> Warehouse
+#End Region ' Import BTL <-> Warehouse
 
 End Class
 

EgtBEAMWALL.DataLayer/App.config

@@ -1,81 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" />
-    </configSections>
-    <entityFramework>
-        <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.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="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.4.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
-        </providers>
-    </entityFramework>
-    <connectionStrings>
-        <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=steamware;password=steamware_password;Persist Security Info=True;database=EgtBwDb_000470;SslMode=none" providerName="MySql.Data.MySqlClient" />
-    </connectionStrings>
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.8.9.0" newVersion="1.8.9.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.27.0.0" newVersion="3.27.0.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="K4os.Compression.LZ4" publicKeyToken="2186fa9121ef231d" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.3.8.0" newVersion="1.3.8.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="K4os.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.0.8.0" newVersion="1.0.8.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-8.0.32.0" newVersion="8.0.32.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" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.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" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-111.2.0.0" newVersion="111.2.0.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-0.8.1.0" newVersion="0.8.1.0" />
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-    </startup>
+   <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" />
+   </configSections>
+   <entityFramework>
+      <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
+      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+      <providers>
+         <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
+         </provider>
+      </providers>
+   </entityFramework>
+   <connectionStrings>
+      <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=steamware;password=Egalware_24068!;Persist Security Info=True;database=EgtBwDb_000470;SslMode=none" providerName="MySql.Data.MySqlClient" />
+   </connectionStrings>
+   <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+         <dependentAssembly>
+            <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-8.0.21.0" newVersion="8.0.21.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" />
+         </dependentAssembly>
+         <dependentAssembly>
+            <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-3.21.9.0" newVersion="3.21.9.0" />
+         </dependentAssembly>
+         <dependentAssembly>
+            <assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-1.3.5.0" newVersion="1.3.5.0" />
+         </dependentAssembly>
+         <dependentAssembly>
+            <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.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" />
+         </dependentAssembly>
+      </assemblyBinding>
+   </runtime>
+   <startup>
+      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+   </startup>
 </configuration>

EgtBEAMWALL.DataLayer/Controllers/AliasController.cs

@@ -1,270 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione Alias su DB (es: materiali da BTL e su DB)
-    /// </summary>
-    public class AliasController : IDisposable
-    {
-        #region Public Constructors
-
-        public AliasController()
-        {
-        }
-
-        #endregion Public Constructors
-
-#if false
-        /// <summary>
-        /// Conversion of DB model class to base class
-        /// </summary>
-        /// <param name="coreMat"></param>
-        /// <returns></returns>
-        public static Core.AliasM ConvToCore(AliasModel dbRec)
-        {
-            Core.AliasM answ = new Core.AliasM(dbRec.ValueOriginal, dbRec.ValueAlias);
-            return answ;
-        }
-#endif
-
-        #region Public Methods
-
-        /// <summary>
-        /// Helper conversione a DTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static AliasDTO ConvToDto(AliasModel currRec)
-        {
-            AliasDTO answ = new AliasDTO()
-            {
-                ValOrig = currRec.ValueOriginal,
-                ValAlias = currRec.ValueAlias,
-                IsActive = true
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione da DTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <param name="family"></param>
-        /// <returns></returns>
-        public static AliasModel ConvToModel(AliasDTO currRec, string family)
-        {
-            AliasModel answ = new AliasModel()
-            {
-                Family = family,
-                ValueOriginal = currRec.ValOrig,
-                ValueAlias = currRec.ValAlias
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Delete by key
-        /// </summary>
-        /// <param name="Family"></param>
-        /// <param name="ValueOriginal"></param>
-        /// <returns></returns>
-        public bool DeleteByKey(string Family, string ValueOriginal)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var items2del = localDbCtx
-                                    .AliasList
-                                    .Where(x => x.Family == Family && x.ValueOriginal == ValueOriginal);
-                try
-                {
-                    // Add to database
-                    localDbCtx.AliasList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Alias.DeleteByKey: {Environment.NewLine}{exc}");
-                }
-            }
-            return done;
-        }
-
-        public void Dispose()
-        {
-        }
-
-        /// <summary>
-        /// Ricerca record da chiave (=valore ALIAS)
-        /// </summary>
-        /// <param name="ValueOriginal">Valore ALIAS cercato</param>
-        /// <param name="Family">Famiglia alias cercato (MatCode se non specificato)</param>
-        /// <returns></returns>
-        public AliasModel FindByDbId(string ValueOriginal, string Family = "MatCode")
-        {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .AliasList
-                        .Where(x => x.Family == Family && x.ValueOriginal.ToLower() == ValueOriginal.ToLower())
-                        .SingleOrDefault();
-            }
-        }
-
-        /// <summary>
-        /// Elenco Alias x famiglia
-        /// </summary>
-        /// <param name="Family">se "" restituisce tutti</param>
-        /// <returns></returns>
-        public List<AliasModel> GetFilt(string Family)
-        {
-            // retrieve
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .AliasList
-                        .Where(x => x.Family == Family)
-                        .OrderBy(x => x.ValueOriginal)
-                        .ToList();
-            }
-        }
-
-        /// <summary>
-        /// Update or insert Alias record
-        /// </summary>
-        /// <param name="updItem"></param>
-        /// <returns></returns>
-        public bool Upsert(AliasModel updItem)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .AliasList
-                                        .Where(x => x.Family == updItem.Family && x.ValueOriginal.Equals(updItem.ValueOriginal, StringComparison.InvariantCulture))
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        // update, vers 1...
-                        localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                    }
-                    else
-                    {
-                        localDbCtx.AliasList.Add(updItem);
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Alias.Upsert: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Update or insert Alias record list
-        /// </summary>
-        /// <param name="updList"></param>
-        /// <returns></returns>
-        public bool UpsertList(List<AliasModel> updList)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    foreach (var updItem in updList)
-                    {
-
-                        var item2update = localDbCtx
-                                            .AliasList
-                                            .Where(x => x.Family == updItem.Family && x.ValueOriginal.ToLower() == updItem.ValueOriginal.ToLower())
-                                            .SingleOrDefault();
-
-                        if (item2update != null)
-                        {
-                            if (item2update.ValueAlias.ToLower() != updItem.ValueAlias.ToLower())
-                            {
-                                localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                            }
-                        }
-                        else
-                        {
-                            localDbCtx.AliasList.Add(updItem);
-                        }
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Alias.UpsertList: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Eliminazione eventuali record Alias nella lista (se presenti)
-        /// </summary>
-        /// <param name="updList"></param>
-        /// <returns></returns>
-        public bool DeleteList(List<AliasModel> updList)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    foreach (var updItem in updList)
-                    {
-
-                        var item2del = localDbCtx
-                                            .AliasList
-                                            .Where(x => x.Family == updItem.Family && x.ValueOriginal.ToLower() == updItem.ValueOriginal.ToLower())
-                                            .SingleOrDefault();
-
-                        if (item2del != null)
-                        {
-                            localDbCtx.AliasList.Remove(item2del);
-                        }
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Alias.DeleteList: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-    }
-}

EgtBEAMWALL.DataLayer/Controllers/DbController.cs

@@ -1,9 +1,7 @@
 using NLog;
 using System;
 using System.Linq;
-using System.Runtime.Remoting.Contexts;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
@@ -43,7 +41,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             bool answ = false;
             string domain = isNetwork ? "%" : "localhost";
-            answ = doCheckCreate(username, pwd, domain, false);
+            answ = doCheckCreate(username, pwd, answ, domain, false);
             if (answ)
             {
                 doGrantPriv(username, domain, "ALL ON *.*");
@@ -78,67 +76,36 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             bool answ = false;
 
-            try
-            {
-                // migrazione minima x eseguire refresh viste
-                string minMigration = "202404261445205_UpdateLogMachineTable";
-                //// cerco se ho la migration minima per proseguire...
-                //var numRec = dbCtx
-                //              .MigrList
-                //              .Where(x => x.MigrationId == minMigration)
-                //              .ToList()
-                //              .Count;
-
-                //string sqlQuery = $"SELECT 'Migration' AS TableName, COUNT(*) AS Count FROM __MigrationHistory WHERE MigrationId = '{minMigration}' LIMIT 1;";
-                //var table = dbCtx
-                //                .DbSetCounts
-                //                .SqlQuery(sqlQuery)
-                //                .AsNoTracking()
-                //.ToList();
-
-                string sqlQuery = $"SELECT COUNT(*) AS Count FROM __MigrationHistory WHERE MigrationId = '{minMigration}' LIMIT 1;";
-                var total = dbCtx.Database.SqlQuery<int>(sqlQuery).Single();
-
-                //if (table != null && table.Count > 0)
-                if (total > 0)
-                {
-                    // in primis refresh delle view
-                    string sqlCommand = @"CREATE OR REPLACE VIEW v_expProdRaw AS
-                                    SELECT DbId, DtEvent, VarValue,
+            // in primis refresh delle view
+            string sqlCommand = @"CREATE OR REPLACE VIEW v_expProdRaw AS
+                                    SELECT DbId, AlarmDtEvent AS DtEvent, VarValue,
                                     SUBSTRING_INDEX(VarValue, ';', 1) AS Prod,
                                     SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', 2), ';', -1) AS MachGroupId,
                                     SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', -2), ';', 1) AS PartId,
                                     SUBSTRING_INDEX(VarValue, ';', -1) AS Status
                                     FROM logmachine
-                                    WHERE EvType = 1
-                                    AND SupervId = 1;
+                                    WHERE ResultType = 1
+                                    AND VarAddress = 1;
 
                                     CREATE OR REPLACE VIEW v_expProd AS
                                     SELECT vp.DtEvent, vp.Prod, mgl.Name AS mgName, pl.PDN, vp.`Status`
                                     FROM v_expProdRaw AS vp
                                     INNER JOIN MachGroupList mgl ON vp.MachGroupId = mgl.Id
                                     INNER JOIN partlist pl ON vp.PartId = pl.Id;";
-                    dbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                    Thread.Sleep(100);
+            dbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+            Thread.Sleep(100);
 
-                    // ora setup parametri x utente
-                    string domain = "%";
+            // ora setup parametri x utente
+            string domain = "%";
 
-                    // ora controllo utente con diritti
-                    answ = doCheckCreate(username, pwd, domain, true);
-                    if (answ)
-                    {
-                        doGrantPriv(username, domain, "USAGE ON *.*");
-                        doGrantPriv(username, domain, $"SELECT ON {dbName}.v_expProd");
-                    }
-                }
-            }
-            catch (Exception exc)
+            // ora controllo utente con diritti
+            answ = doCheckCreate(username, pwd, answ, domain, true);
+            if (answ)
             {
-                string errMessage = $"EXCEPTION on DbController.refreshViews: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
+                doGrantPriv(username, domain, "USAGE ON *.*");
+                doGrantPriv(username, domain, $"SELECT ON {dbName}.v_expProd");
             }
+
             return answ;
         }
 
@@ -190,49 +157,43 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="username"></param>
         /// <param name="pwd"></param>
+        /// <param name="answ"></param>
         /// <param name="domain"></param>
         /// <param name="force">Force = esegue un drop prima...</param>
         /// <returns></returns>
-        private bool doCheckCreate(string username, string pwd, string domain, bool force)
+        private bool doCheckCreate(string username, string pwd, bool answ, string domain, bool force)
         {
-            bool answ = false;
-            try
+            // ricerca utente...
+            var numUser = adbCtx
+                .UserList
+                .Where(x => x.User == username)
+                .ToList()
+                .Count;
+            if (numUser > 0)
             {
-                // ricerca utente...
-                var numUser = adbCtx
-                                .UserList
-                                .Where(x => x.User == username && x.Host == domain)
-                                .ToList()
-                                .Count;
-                if (numUser > 0)
-                {
-                    answ = true;
-                }
-                if (!answ)
-                {
-                    // creo utente
-                    string sqlCommand = $"DROP USER  IF EXISTS {username};";
-                    if (force)
-                    {
-                        adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                        Thread.Sleep(100);
-                    }
-                    sqlCommand = "FLUSH PRIVILEGES;";
-                    adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                    Thread.Sleep(100);
-                    sqlCommand = $"CREATE USER '{username}'@'{domain}' IDENTIFIED BY '{pwd}';";
-                    adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                    Thread.Sleep(100);
-                    sqlCommand = "FLUSH PRIVILEGES;";
-                    adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                    Thread.Sleep(100);
-                    answ = true;
-                }
+                answ = true;
             }
-            catch (Exception exc)
+            if (!answ)
             {
-                Log.Error($"Eccezione in doCheckCreate:{Environment.NewLine}{exc}");
+                // creo utente
+                string sqlCommand = $"DROP USER  IF EXISTS {username};";
+                if (force)
+                {
+                    adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+                    Thread.Sleep(100);
+                }
+                sqlCommand = "FLUSH PRIVILEGES;";
+                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+                Thread.Sleep(100);
+                sqlCommand = $"CREATE USER '{username}'@'{domain}' IDENTIFIED BY '{pwd}';";
+                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+                Thread.Sleep(100);
+                sqlCommand = "FLUSH PRIVILEGES;";
+                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+                Thread.Sleep(100);
+                answ = true;
             }
+
             return answ;
         }
 

EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs

@@ -1,5 +1,4 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -19,24 +18,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         #region Public Methods
 
-        /// <summary>
-        /// Helper conversione a LogMachineDTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static LogMachineDTO ConvToItemDto(LogMachineModel currRec)
-        {
-            LogMachineDTO answ = new LogMachineDTO()
-            {
-                DtEvent = currRec.DtEvent,
-                EvType = (EgwProxy.MagMan.MachLogTypes)currRec.EvType,
-                ProjCloudId = currRec.ProjCloudId,
-                SupervId = currRec.SupervId,
-                VarValue = currRec.VarValue
-            };
-            return answ;
-        }
-
         /// <summary>
         /// Conversion of base class to DB model class
         /// </summary>
@@ -44,29 +25,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public LogMachineModel ConvertFromCore(Core.MachLog coreMacLog)
         {
-            int projCloudId = 0;
-            // calcolo projCloudId da ProdId...
-            using (var localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // Add to database
-                var projRec = localDbCtx.ProdList.Where(x => x.ProdId == coreMacLog.ProdId).FirstOrDefault();
-                if (projRec != null)
-                {
-                    projCloudId = projRec.ProjCloudId;
-                }
-            }
-            // converto!
             LogMachineModel answ = new LogMachineModel();
             if (coreMacLog != null)
             {
                 answ = new LogMachineModel()
                 {
-                    EvType = coreMacLog.EventType,
-                    DtEvent = coreMacLog.AlarmDateTime,
-                    SupervId = coreMacLog.VarAddress,
-                    VarValue = coreMacLog.VarValue,
-                    ProdId = coreMacLog.ProdId,
-                    ProjCloudId = projCloudId
+                    AlarmCode = coreMacLog.AlarmCode,
+                    AlarmDatetime = coreMacLog.AlarmDateTime,
+                    AlarmMessage = coreMacLog.AlarmMessage,
+                    AlarmOperation = coreMacLog.AlarmOperation,
+                    AlarmType = coreMacLog.AlarmType,
+                    CommandExecutedCorrectly = coreMacLog.CommandExecutedCorrectly,
+                    CommandState = coreMacLog.CommandState,
+                    CommandType = coreMacLog.CommandType,
+                    Description = coreMacLog.Description,
+                    NewOpState = coreMacLog.newOpState,
+                    ResultType = coreMacLog.ResultType,
+                    VarAddress = coreMacLog.VarAddress,
+                    VarValue = coreMacLog.VarValue
                 };
             }
             return answ;
@@ -79,7 +55,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.MachLog ConvertToCore(LogMachineModel dbLog)
         {
-            var newRecord = (Core.MachLog)Core.MachLog.CreateMachLog(dbLog.EvType, dbLog.DtEvent, dbLog.VarValue, dbLog.ProdId, dbLog.SupervId);
+            var newRecord = Core.MachLog.CreateMachLog(dbLog.AlarmCode, dbLog.AlarmDatetime, dbLog.AlarmMessage, dbLog.AlarmOperation, dbLog.AlarmType, dbLog.CommandExecutedCorrectly, dbLog.CommandState, dbLog.CommandType, dbLog.Description, dbLog.NewOpState, dbLog.ResultType, dbLog.VarAddress, dbLog.VarValue);
             return newRecord;
         }
 
@@ -90,36 +66,38 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public bool Create(LogMachineModel newLogMac)
         {
-            bool done = false;
+            bool fatto = false;
             try
             {
-                using (var locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                try
                 {
-                    // Add to database
-                    locDbCtx.LogMachineList.Add(newLogMac);
-                    // Commit changes
-                    locDbCtx.SaveChanges();
-                    done = true;
+                    using (var locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                    {
+                        // Add to database
+                        locallocalDbCtx.LogMachineList.Add(newLogMac);
+                        // Commit changes
+                        locallocalDbCtx.SaveChanges();
+                    }
+                }
+                catch (Exception exc)
+                {
+                    string errMessage = $"EXCEPTION on LogMachine.Create: {Environment.NewLine}{exc}";
+                    Console.WriteLine(errMessage);
+                    Log.Error(errMessage);
                 }
             }
-            catch (Exception exc)
-            {
-                string errMessage = $"EXCEPTION on LogMachine.Create: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
-            }
-            return done;
+            catch
+            { }
+            return fatto;
         }
 
         /// <summary>
         /// Create machine LOG record (da modello dati CORE)
         /// </summary>
-        /// <param name="newLogMac">Record Log</param>
-        /// <param name="projDbId">ProjID da DB (locale)</param>
+        /// <param name="newLogMac"></param>
         /// <returns></returns>
         public bool Create(Core.MachLog newMachLog)
         {
-            // converto record
             var dbLogModel = ConvertFromCore(newMachLog);
             return Create(dbLogModel);
         }
@@ -169,9 +147,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 return localDbCtx
-                        .LogMachineList
-                        .Where(x => x.LogDbId == LogDbId)
-                        .SingleOrDefault();
+                .LogMachineList
+                .Where(x => x.LogDbId == LogDbId)
+                .SingleOrDefault();
             }
         }
 
@@ -187,10 +165,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 // retrieve
                 return localDbCtx
-                        .LogMachineList
-                        .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
-                        .OrderBy(x => x.DtEvent)
-                        .ToList();
+                .LogMachineList
+                .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
+                .OrderBy(x => x.AlarmDatetime)
+                .ToList();
             }
         }
 
@@ -232,195 +210,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 // retrieve
                 return localDbCtx
-                        .LogMachineList
-                        .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
-                        .OrderByDescending(x => x.DtEvent)
-                        .ToList();
+                .LogMachineList
+                .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
+                .OrderByDescending(x => x.AlarmDatetime)
+                .ToList();
             }
         }
 
-        /// <summary>
-        /// Recupero i dati NON sincronizzati in ordine crescente fino al num max indicato
-        /// </summary>
-        /// <param name="numMax"></param>
-        /// <returns></returns>
-        public List<LogMachineModel> GetUnsentAsc(int numMax)
-        {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
-                        .LogMachineList
-                        .Where(x => (x.DtSent == null || x.DtSent < x.DtEvent) && x.ProjCloudId > 0)
-                        .OrderBy(x => x.DtEvent)
-                        .Take(numMax)
-                        .ToList();
-            }
-        }
-
-        /// <summary>
-        /// Creazione LOG record di avvio programma
-        /// </summary>
-        /// <returns></returns>
-        public bool RecordAppStartup()
-        {
-            bool done = false;
-            try
-            {
-                using (var locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-                {
-                    // cerco ultimo record registrato
-                    var lastRec = locDbCtx
-                                        .LogMachineList
-                                        .OrderByDescending(x => x.DtEvent)
-                                        .FirstOrDefault();
-
-                    // cerco ultimo evento chiusura
-                    var lastRecClose = locDbCtx
-                                        .LogMachineList
-                                        .Where(x => x.EvType == Core.MachLog.MachLogTypes.APPLICATION
-                                                    && x.VarValue == "0")
-                                        .OrderByDescending(x => x.DtEvent)
-                                        .FirstOrDefault();
-
-                    // preparo nuovo record avvio!
-                    LogMachineModel recStartApp = new LogMachineModel()
-                    {
-                        DtEvent = DateTime.Now.AddSeconds(-1),
-                        EvType = Core.MachLog.MachLogTypes.APPLICATION,
-                        VarValue = "1",
-                        ProdId = lastRec != null ? lastRec.ProdId : 0,
-                        ProjCloudId = lastRec != null ? lastRec.ProjCloudId : 0,
-                        SupervId = lastRec != null ? lastRec.SupervId : "1"
-                    };
-
-                    // verifico esistenza record chiusura...
-                    if (lastRecClose != null && lastRec != null)
-                    {
-                        // se l'ultimo record registrato NON fosse di chiusura... lo genero!
-                        if (lastRecClose.DtEvent < lastRec.DtEvent)
-                        {
-                            var recCloseApp = new LogMachineModel()
-                            {
-                                DtEvent = lastRec.DtEvent.AddSeconds(1),
-                                EvType = recStartApp.EvType,
-                                VarValue = "0",
-                                ProdId = lastRec != null ? lastRec.ProdId : 0,
-                                ProjCloudId = lastRec != null ? lastRec.ProjCloudId : 0,
-                                SupervId = lastRec != null ? lastRec.SupervId : "1"
-                            };
-                            // aggiungo rec chiusura
-                            locDbCtx.LogMachineList.Add(recCloseApp);
-                        }
-                    }
-
-                    // aggiungo rec avvio
-                    locDbCtx.LogMachineList.Add(recStartApp);
-                    // salvataggio
-                    locDbCtx.SaveChanges();
-                    done = true;
-                }
-            }
-            catch (Exception exc)
-            {
-                string errMessage = $"EXCEPTION on LogMachine.RecordAppStartup: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
-            }
-            return done;
-        }
-
-        /// <summary>
-        /// Aggiorna i record indicati inserendo dataora corrente x DtSent
-        /// </summary>
-        /// <param name="rec2upd"></param>
-        /// <returns></returns>
-        public bool SetDtSent(List<LogMachineModel> rec2upd)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                DateTime adesso = DateTime.Now;
-                foreach (var item in rec2upd)
-                {
-                    var currRec = localDbCtx
-                        .LogMachineList
-                        .Where(x => (x.DtSent == null || x.DtSent < x.DtEvent) && x.LogDbId == item.LogDbId)
-                        .FirstOrDefault();
-                    if (currRec != null)
-                    {
-                        currRec.DtSent = adesso;
-                        // indico modificato
-                        localDbCtx.Entry(currRec).State = System.Data.Entity.EntityState.Modified;
-                    }
-                }
-                // Salvataggio finale
-                localDbCtx.SaveChanges();
-            }
-            return done;
-        }
-
-        /// <summary>
-        /// Cerca di sistemare gli ID di Prod e ProjCloud mancanti
-        /// </summary>
-        /// <returns></returns>
-        public bool TryFixProjCloudId()
-        {
-            // init vars
-            bool fatto = false;
-            int prodId = 0;
-            // vado sul DB
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                var list2proc = localDbCtx
-                        .LogMachineList
-                        .Where(x => x.ProjCloudId == 0 && (x.EvType == Core.MachLog.MachLogTypes.PART_STATUS || x.EvType == Core.MachLog.MachLogTypes.MACHGROUP_STATUS))
-                        .OrderBy(x => x.DtEvent)
-                        .ToList();
-                // se ci sono...
-                if (list2proc != null && list2proc.Count > 0)
-                {
-                    // recupero elenco PROD
-                    List<ProdModel> prodList = localDbCtx
-                                                .ProdList
-                                                .AsNoTracking()
-                                                .ToList();
-
-                    foreach (var item in list2proc)
-                    {
-                        prodId = 0;
-                        // cerco valore
-                        string[] dataList = item.VarValue.Split(';');
-                        if (dataList != null && dataList.Count() > 0)
-                        {
-                            int.TryParse(dataList[0], out prodId);
-                            // se trovato
-                            if (prodId > 0)
-                            {
-                                // salvo il valore prodId
-                                item.ProdId = prodId;
-                                // cerco il projCloudId in elenco
-                                var projRec = prodList.Where(x => x.ProdId == prodId).FirstOrDefault();
-                                if (projRec != null)
-                                {
-                                    item.ProjCloudId = projRec.ProjCloudId;
-                                }
-                                // indico modificato
-                                localDbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
-                            }
-                        }
-                    }
-                    // salvo
-                    localDbCtx.SaveChanges();
-                    // registro
-                    fatto = true;
-                }
-            }
-            // risultato
-            return fatto;
-        }
-
         /// <summary>
         /// Update single LogMachineModel
         /// </summary>

EgtBEAMWALL.DataLayer/Controllers/MagmanSyncController.cs

@@ -1,322 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione MagmanSync su DB (registrazione operazioni di sync con MagMan online)
-    /// </summary>
-    public class MagmanSyncController : IDisposable
-    {
-        #region Public Constructors
-
-        public MagmanSyncController()
-        {
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        /// <summary>
-        /// Purge dei record inviati oltre periodo di giorni indicato
-        /// </summary>
-        /// <param name="NumDayMax">Num gg max da mantenere in registro</param>
-        /// <returns></returns>
-        public bool DeleteOlder(int NumDayMax)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                DateTime adesso = DateTime.Now;
-                var items2del = localDbCtx
-                                    .SyncList
-                                    .Where(x => x.DtExe != null && adesso.Subtract(x.DtReq).TotalDays > NumDayMax);
-                try
-                {
-                    // Add to database
-                    localDbCtx.SyncList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.DeleteOlder | NumDayMax: {NumDayMax}{Environment.NewLine}{exc}");
-                }
-            }
-            return done;
-        }
-
-        /// <summary>
-        /// Purge dei record NON INVIATI date condizioni filtro
-        /// </summary>
-        /// <param name="ProjCloudId">Id progetto x cui filtrare</param>
-        /// <param name="SyncType">Tipo di record da cercare</param>
-        /// <param name="DtLimit">DataOra limite (max) x cui cercare record non inviati</param>
-        /// <returns></returns>
-        public bool DeleteUnsentFilt(int ProjCloudId, string SyncType, DateTime DtLimit)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // cercl candidati
-                var items2del = localDbCtx
-                                    .SyncList
-                                    .Where(x => x.DtExe == null && x.CloudId == ProjCloudId && x.SyncType == SyncType && x.DtReq <= DtLimit);
-                // se ne ho trovato...
-                if (items2del != null && items2del.Count() > 0)
-                {
-                    try
-                    {
-                        // Add to database
-                        localDbCtx.SyncList.RemoveRange(items2del);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                    }
-                    catch (Exception exc)
-                    {
-                        Log.Error($"EXCEPTION on MagmanSync.DeleteUnsentFilt | ProjCloudId: {ProjCloudId} | SyncType: {SyncType} | DtLimit: {DtLimit}{Environment.NewLine}{exc}");
-                    }
-                }
-            }
-            return done;
-        }
-
-        public void Dispose()
-        {
-        }
-
-        /// <summary>
-        /// Lista record filtrati
-        /// </summary>
-        /// <param name="SyncType">Tipo di record richiesti, se "" = tutti</param>
-        /// <param name="DtMax">Data-Ora limite per recupero ordinato DESC</param>
-        /// <param name="NumMax">num max di record da restituire</param>
-        /// <returns></returns>
-        public List<MagmanSyncModel> GetFilt(string SyncType, DateTime DtMax, int NumMax)
-        {
-            List<MagmanSyncModel> dbResult = new List<MagmanSyncModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                dbResult = localDbCtx
-                        .SyncList
-                        .Where(x => (string.IsNullOrEmpty(SyncType) || x.SyncType == SyncType) && x.DtReq <= DtMax)
-                        .OrderByDescending(x => x.DtReq)
-                        .Take(NumMax)
-                        .ToList();
-            }
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Recupero ultimo record di sync dato tipo
-        /// </summary>
-        /// <param name="SyncType">TIpo di sync richiesto, tipicamente ProjArchSync x fix stato archived</param>
-        /// <returns></returns>
-        public MagmanSyncModel GetLastBySync(string SyncType)
-        {
-            // record default a 1 anno fa...
-            DateTime dtLim = DateTime.Today.AddYears(-1);
-            MagmanSyncModel dbResult = new MagmanSyncModel()
-            {
-                CloudId = 0,
-                SyncType = SyncType,
-                DtReq = dtLim,
-                Payload = ""
-            };
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var rawRes = localDbCtx
-                            .SyncList
-                            .Where(x => (!string.IsNullOrEmpty(SyncType) && x.SyncType == SyncType))
-                            .OrderByDescending(x => x.DtReq)
-                            .FirstOrDefault();
-                if (rawRes != null)
-                {
-                    dbResult = rawRes;
-                }
-            }
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Lista record NON inviati filtrati x tipo e num max
-        /// </summary>
-        /// <param name="SyncType">Tipo di record richiesti, se "" = tutti</param>
-        /// <param name="DtMax">Data-Ora limite per recupero ordinato ASC</param>
-        /// <param name="NumMax">num max di record da restituire</param>
-        /// <returns></returns>
-        public List<MagmanSyncModel> GetUnsentFilt(string SyncType, DateTime DtMax, int NumMax)
-        {
-            List<MagmanSyncModel> dbResult = new List<MagmanSyncModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                dbResult = localDbCtx
-                        .SyncList
-                        .Where(x => x.DtExe == null && (string.IsNullOrEmpty(SyncType) || x.SyncType == SyncType) && x.DtReq <= DtMax)
-                        .OrderBy(x => x.DtReq)
-                        .Take(NumMax)
-                        .ToList();
-            }
-            return dbResult;
-        }
-
-        /// <summary>
-        /// Insert record MagmanSync
-        /// </summary>
-        /// <param name="newRec"></param>
-        /// <returns>ID record inserito</returns>
-        public int Insert(MagmanSyncModel newRec)
-        {
-            int newId = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    // inserisco record
-                    localDbCtx.SyncList.Add(newRec);
-
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    newId = newRec.SyncId;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.Insert: {Environment.NewLine}{exc}");
-                }
-            }
-            return newId;
-        }
-
-        /// <summary>
-        /// Update con indicazione DtExt di completamento
-        /// </summary>
-        /// <param name="SyncId">ID record</param>
-        /// <param name="DtExe">Data-Ora exe</param>
-        /// <returns></returns>
-        public bool SetCompleted(int SyncId, DateTime DtExe)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .SyncList
-                                        .Where(x => x.SyncId == SyncId)
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        // update
-                        item2update.DtExe = DtExe;
-                        localDbCtx.Entry(item2update).State = System.Data.Entity.EntityState.Modified;
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.SetCompleted: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Update or insert record MagmanSync
-        /// </summary>
-        /// <param name="updItem"></param>
-        /// <returns></returns>
-        public bool Upsert(MagmanSyncModel updItem)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .SyncList
-                                        .Where(x => x.SyncId == updItem.SyncId)
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        // update, vers 1...
-                        localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                    }
-                    else
-                    {
-                        localDbCtx.SyncList.Add(updItem);
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.Upsert: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Update or insert Alias record list
-        /// </summary>
-        /// <param name="updList"></param>
-        /// <returns></returns>
-        public bool UpsertList(List<MagmanSyncModel> updList)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    foreach (var updItem in updList)
-                    {
-                        var item2update = localDbCtx
-                                            .SyncList
-                                            .Where(x => x.SyncId == updItem.SyncId)
-                                            .SingleOrDefault();
-
-                        if (item2update != null)
-                        {
-                            localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                        }
-                        else
-                        {
-                            localDbCtx.SyncList.Add(updItem);
-                        }
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.UpsertList: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-    }
-}

EgtBEAMWALL.DataLayer/Controllers/MaterialsController.cs

@@ -1,538 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using static EgtBEAMWALL.DataLayer.Controllers.MaterialsController.SearchResult;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione Materiali su DB (= magazzino locale)
-    /// </summary>
-    public class MaterialsController : IDisposable
-    {
-        #region Public Constructors
-
-        public MaterialsController()
-        {
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        /// <summary>
-        /// Conversion of DB model class to base class
-        /// </summary>
-        /// <param name="coreMat"></param>
-        /// <returns></returns>
-        public static Core.MaterialM ConvToCore(MaterialModel dbRec)
-        {
-            Core.MaterialM answ = new Core.MaterialM(dbRec.MatId, (double)dbRec.WMm, (double)dbRec.HMm, (double)dbRec.LMm, "", dbRec.MatCode);
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione a DTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static MaterialDTO ConvToDto(MaterialModel currRec)
-        {
-            MaterialDTO answ = new MaterialDTO()
-            {
-                MatCloudId = currRec.MatCloudId,
-                MatLocalId = currRec.MatId,
-                MatCode = currRec.MatCode,
-                MatDesc = currRec.MatDesc,
-                HMm = currRec.HMm,
-                LMm = currRec.LMm,
-                WMm = currRec.WMm
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione da DTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static MaterialModel ConvToModel(MaterialDTO currRec)
-        {
-            MaterialModel answ = new MaterialModel()
-            {
-                MatCloudId = currRec.MatCloudId,
-                MatId = currRec.MatLocalId,
-                MatCode = currRec.MatCode,
-                MatDesc = currRec.MatDesc,
-                HMm = currRec.HMm,
-                LMm = currRec.LMm,
-                WMm = currRec.WMm
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Conversion of base class to DB model class
-        /// </summary>
-        /// <param name="coreRec"></param>
-        /// <returns></returns>
-        public static MaterialModel ConvToModel(Core.MaterialM coreRec)
-        {
-            MaterialModel answ = new MaterialModel();
-            if (coreRec != null)
-            {
-                answ = new MaterialModel()
-                {
-                    MatId = coreRec.nId,
-                    MatCode = coreRec.sWarehouseMaterial,
-                    HMm = (decimal)Math.Round(coreRec.dH, 2),
-                    LMm = (decimal)Math.Round(coreRec.dL, 2),
-                    WMm = (decimal)Math.Round(coreRec.dW, 2),
-                };
-            }
-            return answ;
-        }
-
-        /// <summary>
-        /// Delete by key
-        /// </summary>
-        /// <param name="MatId"></param>
-        /// <returns></returns>
-        public bool DeleteByKey(int MatId)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var items2del = localDbCtx
-                                    .MaterialsList
-                                    .Where(x => x.MatId == MatId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.MaterialsList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Materials.DeleteByKey: {Environment.NewLine}{exc}");
-                }
-            }
-            return done;
-        }
-
-        public void Dispose()
-        {
-        }
-
-        /// <summary>
-        /// Get record by Key
-        /// </summary>
-        /// <param name="MatId"></param>
-        /// <returns></returns>
-        public Core.MaterialM FindByDbId(int MatId)
-        {
-            Core.MaterialM result = new Core.MaterialM(0, 0, 0, "", "");
-            var rawData = FindByDbIdModel(MatId);
-            if (rawData != null)
-            {
-                result = ConvToCore(rawData);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Get record by Key in formato Model
-        /// </summary>
-        /// <param name="MatId"></param>
-        /// <returns></returns>
-        public MaterialModel FindByDbIdModel(int MatId)
-        {
-            MaterialModel result = new MaterialModel();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                result = localDbCtx
-                                .MaterialsList
-                                .Where(x => x.MatId == MatId)
-                                .SingleOrDefault();
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Get Material (filtro x MatId) in formato Core
-        /// </summary>
-        /// <param name="MatCode">se "" restituisce tutti</param>
-        /// <returns></returns>
-        public List<Core.MaterialM> GetFilt(string MatCode)
-        {
-            // recupero e converto
-            List<Core.MaterialM> result = new List<Core.MaterialM>();
-            var rawData = GetFiltModel(MatCode);
-            if (rawData != null)
-            {
-                result = rawData.Select(x => ConvToCore(x)).ToList();
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Get Material (filtro x MatId) in formato Model
-        /// </summary>
-        /// <param name="MatCode">se "" restituisce tutti</param>
-        /// <returns></returns>
-        public List<MaterialModel> GetFiltModel(string MatCode)
-        {
-            List<MaterialModel> result = new List<MaterialModel>();
-            // retrieve
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                result = localDbCtx
-                                .MaterialsList
-                                .Where(x => string.IsNullOrEmpty(MatCode) || x.MatCode == MatCode)
-                                .OrderBy(x => x.MatDesc)
-                                .ToList();
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Insert Material record from CoreM if missing or return existing (for Id)
-        /// </summary>
-        /// <param name="coreItem"></param>
-        /// <returns>MatId (existing or new)</returns>
-        public int Insert(Core.MaterialM coreItem)
-        {
-            int newIdx = 0;
-            // converto
-            MaterialModel updItem = ConvToModel(coreItem);
-            newIdx = Insert(updItem);
-            return newIdx;
-        }
-
-        /// <summary>
-        /// Insert Material record
-        /// </summary>
-        /// <param name="updItem"></param>
-        /// <returns>MatId (existing or new)</returns>
-        public int Insert(MaterialModel updItem)
-        {
-            int newIdx = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .MaterialsList
-                                        .Where(x => (updItem.MatId > 0 && x.MatId == updItem.MatId)
-                                                 || (updItem.MatCloudId > 0 && x.MatCloudId == updItem.MatCloudId)
-                                                 || (x.MatCode == updItem.MatCode && x.WMm == updItem.WMm && x.HMm == updItem.HMm && x.LMm == updItem.LMm))
-                                        .OrderBy(x => x.MatId)
-                                        .FirstOrDefault();
-
-                    if (item2update != null)
-                    {
-                        newIdx = item2update.MatId;
-                    }
-                    else
-                    {
-                        localDbCtx.MaterialsList.Add(updItem);
-                        // verifico se c'è già "alias original"
-                        var aliasOrig = localDbCtx
-                                        .AliasList
-                                        .Where(x => x.ValueOriginal == updItem.MatCode)
-                                        .FirstOrDefault();
-                        if (aliasOrig == null || string.IsNullOrEmpty(aliasOrig.ValueOriginal) || aliasOrig.ValueOriginal != updItem.MatCode)
-                        {
-                            // inserisco alias!
-                            localDbCtx.AliasList.Add(new AliasModel() { Family = "MatCode", ValueOriginal = updItem.MatCode, ValueAlias = updItem.MatCode });
-                        }
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        newIdx = updItem.MatId;
-                    }
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Materials.Insert: {Environment.NewLine}{exc}");
-                }
-            }
-            return newIdx;
-        }
-
-        /// <summary>
-        /// Get Last RawItem used for Material
-        /// </summary>
-        /// <param name="updItem"></param>
-        /// <returns>Returns 0 if not found</returns>
-        public int LastRawItemGet(int MatId)
-        {
-            int RawItemIdLast = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .MaterialsList
-                                        .Where(x => (MatId > 0 && x.MatId == MatId))
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        RawItemIdLast = item2update.RawItemIdLast;
-                    }
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Materials.LastRawItemGet: {Environment.NewLine}{exc}");
-                }
-            }
-            return RawItemIdLast;
-        }
-
-        /// <summary>
-        /// Update Last RawItem used for Material record
-        /// </summary>
-        /// <param name="MatId">Id locale materiale</param>
-        /// <param name="RawItemIdLast">Id del RawItem</param>
-        /// <returns>Returns true if updated</returns>
-        public bool LastRawItemSet(int MatId, int RawItemIdLast)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .MaterialsList
-                                        .Where(x => (MatId > 0 && x.MatId == MatId))
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        item2update.RawItemIdLast = RawItemIdLast;
-                        localDbCtx.Entry(item2update).State = System.Data.Entity.EntityState.Modified;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                    }
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Materials.LastRawItemSet: {Environment.NewLine}{exc}");
-                }
-            }
-            return done;
-        }
-
-        /// <summary>
-        /// Restituisce il primo materiale (se esiste) per MatCode (diretto o tramite Alias)
-        /// </summary>
-        /// <param name="MatCode">Non accetta ""</param>
-        /// <returns></returns>
-        public SearchResult SearchFilt(string MatCode)
-        {
-            // init valori esito ricerca + risultato
-            TypeFound esito = string.IsNullOrEmpty(MatCode) ? TypeFound.MISSING_CODE : TypeFound.NOT_FOUND;
-            List<Core.MaterialM> result = new List<Core.MaterialM>();
-            // solo se ho una VERA ricerca x MatCode
-            if (!string.IsNullOrEmpty(MatCode))
-            {
-                // cerco nei materiali
-                var rawData = GetFiltModel(MatCode);
-                if (rawData != null && rawData.Count > 0)
-                {
-                    // ...e converto
-                    result = rawData.Select(x => ConvToCore(x)).ToList();
-                    esito = TypeFound.MATERIAL;
-                }
-                else
-                {
-                    // cerco negli alias...
-                    using (AliasController aliasDbContr = new AliasController())
-                    {
-                        var aliasRec = aliasDbContr.FindByDbId(MatCode);
-                        if (aliasRec != null)
-                        {
-                            rawData = GetFiltModel(aliasRec.ValueAlias);
-                            if (rawData != null && rawData.Count > 0)
-                            {
-                                // ...e converto
-                                result = rawData.Select(x => ConvToCore(x)).ToList();
-                                esito = TypeFound.ALIAS;
-                            }
-                        }
-                    }
-                }
-            }
-            // compongo risposta!
-            SearchResult answ = new SearchResult()
-            {
-                Tipo = esito,
-                Result = result
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Update Material record from CoreM
-        /// </summary>
-        /// <param name="coreItem"></param>
-        /// <returns>Returns 0 if not found</returns>
-        public int Update(Core.MaterialM coreItem)
-        {
-            int newIdx = 0;
-            // converto
-            MaterialModel updItem = ConvToModel(coreItem);
-            newIdx = Update(updItem);
-            return newIdx;
-        }
-
-        /// <summary>
-        /// Update Material record
-        /// </summary>
-        /// <param name="updItem"></param>
-        /// <returns>Returns 0 if not found</returns>
-        public int Update(MaterialModel updItem)
-        {
-            int newIdx = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .MaterialsList
-                                        .Where(x => (updItem.MatId > 0 && x.MatId == updItem.MatId)
-                                                 || (updItem.MatCloudId > 0 && x.MatCloudId == updItem.MatCloudId)
-                                                 || (x.MatCode == updItem.MatCode && x.WMm == updItem.WMm && x.HMm == updItem.HMm && x.LMm == updItem.LMm))
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        //// update, vers 1...
-                        //localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                        item2update.MatCloudId = updItem.MatCloudId;
-                        // aggiorno SE presente...
-                        if (!string.IsNullOrEmpty(updItem.MatDesc))
-                        {
-                            item2update.MatDesc = updItem.MatDesc;
-                        }
-                        localDbCtx.Entry(item2update).State = System.Data.Entity.EntityState.Modified;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        newIdx = item2update.MatId;
-                    }
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Materials.Update: {Environment.NewLine}{exc}");
-                }
-            }
-            return newIdx;
-        }
-
-        /// <summary>
-        /// Upsert Material record
-        /// </summary>
-        /// <param name="updItem"></param>
-        /// <returns>MatId (existing or new)</returns>
-        public int Upsert(MaterialModel updItem)
-        {
-            int newIdx = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .MaterialsList
-                                        .Where(x => (updItem.MatId > 0 && x.MatId == updItem.MatId)
-                                                 || (updItem.MatCloudId > 0 && x.MatCloudId == updItem.MatCloudId)
-                                                 || (x.MatCode == updItem.MatCode && x.WMm == updItem.WMm && x.HMm == updItem.HMm && x.LMm == updItem.LMm))
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        //// update, vers 1...
-                        //localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                        item2update.MatCloudId = updItem.MatCloudId;
-                        // aggiorno SE presente...
-                        if (!string.IsNullOrEmpty(updItem.MatDesc))
-                        {
-                            item2update.MatDesc = updItem.MatDesc;
-                        }
-                        localDbCtx.Entry(item2update).State = System.Data.Entity.EntityState.Modified;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        newIdx = item2update.MatId;
-                    }
-                    else
-                    {
-                        localDbCtx.MaterialsList.Add(updItem);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        newIdx = updItem.MatId;
-                    }
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Materials.Insert: {Environment.NewLine}{exc}");
-                }
-            }
-            return newIdx;
-        }
-
-        #endregion Public Methods
-
-        #region Public Classes
-
-        /// <summary>
-        /// Risultato ricerca materiali
-        /// </summary>
-        public class SearchResult
-        {
-            #region Public Enums
-
-            /// <summary>
-            /// Enum del risultato della ricerca materiali
-            /// </summary>
-            public enum TypeFound
-            {
-                MISSING_CODE = 0,
-                NOT_FOUND,
-                ALIAS,
-                MATERIAL
-            }
-
-            #endregion Public Enums
-
-            #region Public Properties
-
-            /// <summary>
-            /// Materiali trovati
-            /// </summary>
-            public List<Core.MaterialM> Result { get; set; } = new List<Core.MaterialM>();
-
-            /// <summary>
-            /// Tipologia oggetto trovato
-            /// </summary>
-            public TypeFound Tipo { get; set; } = TypeFound.MISSING_CODE;
-
-            #endregion Public Properties
-        }
-
-        #endregion Public Classes
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-    }
-}

EgtBEAMWALL.DataLayer/Controllers/PartController .cs

@@ -203,9 +203,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public PartModel FindByPartId(int ProdId, int PartId)
         {
             PartModel answ = null;
-            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                answ = locDbCtx
+                answ = locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.PartId == PartId)
                         .FirstOrDefault();
@@ -221,10 +221,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(PartModel updItem)
         {
             bool done = false;
-            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
-                var item2upd = locDbCtx
+                var item2upd = locallocalDbCtx
                                     .PartList
                                     .Where(x => x.PartDbId == updItem.PartDbId)
                                     .SingleOrDefault();
@@ -233,14 +233,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     try
                     {
                         // update, vers 1...
-                        locDbCtx.Entry(item2upd).CurrentValues.SetValues(updItem);
+                        locallocalDbCtx.Entry(item2upd).CurrentValues.SetValues(updItem);
 
                         //// update, vers 2
                         //localDbCtx.PartList.Remove(item2del);
                         //localDbCtx.PartList.Add(updItem);
 
                         // Commit changes
-                        locDbCtx.SaveChanges();
+                        locallocalDbCtx.SaveChanges();
                         done = true;
                         // aggiorno info sullo status
                         myStatusMapCtrl.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
@@ -271,13 +271,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateEnd(int ProdId, int MachGroupId, int PartId, DateTime DtEnd)
         {
             bool done = false;
-            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locDbCtx
+                    var item2upd = locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                         .FirstOrDefault();
@@ -286,7 +286,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     {
                         item2upd.DtEnd = DtEnd;
                         // Commit changes
-                        locDbCtx.SaveChanges();
+                        locallocalDbCtx.SaveChanges();
                         done = true;
                         // aggiorno info sullo status
                         myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
@@ -317,13 +317,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStart(int ProdId, int MachGroupId, int PartId, DateTime DtStart)
         {
             bool done = false;
-            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locDbCtx
+                    var item2upd = locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                         .FirstOrDefault();
@@ -331,7 +331,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     {
                         item2upd.DtStart = DtStart;
                         // Commit changes
-                        locDbCtx.SaveChanges();
+                        locallocalDbCtx.SaveChanges();
                         done = true;
                         // aggiorno info sullo status
                         myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
@@ -363,13 +363,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStatus(int ProdId, int MachGroupId, int PartId, Core.ItemState newState)
         {
             bool done = false;
-            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locDbCtx
+                    var item2upd = locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                         .FirstOrDefault();
@@ -377,7 +377,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     {
                         item2upd.State = newState;
                         // Commit changes
-                        locDbCtx.SaveChanges();
+                        locallocalDbCtx.SaveChanges();
                         done = true;
                         // aggiorno info sullo status
                         myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, newState == Core.ItemState.Scrapped ? Core.StatusMapOpType.SetPartScrapped : Core.StatusMapOpType.MachGroupMod, "");
@@ -405,7 +405,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         #region Protected Methods
 
         /// <summary>
-        /// Get BtlPartDBId by ProdId + PDN
+        /// Get BtlPartDBId by ProjId + PDN
         /// </summary>
         /// <param name="ProjId"></param>
         /// <param name="PDN"></param>
@@ -414,9 +414,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int BtlPartDbId = 0;
 
-            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var btlPart = locDbCtx
+                var btlPart = locallocalDbCtx
                                 .BTLPartList
                                 .Where(x => x.Project.ProjId == ProjId && x.PDN == PDN)
                                 .SingleOrDefault();
@@ -430,7 +430,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         /// <summary>
-        /// Get BtlPartDBId by ProdId + BtlPartId
+        /// Get BtlPartDBId by ProjId + BtlPartId
         /// </summary>
         /// <param name="ProjId"></param>
         /// <param name="BtlPartId"></param>

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -1,11 +1,9 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
 using NLog;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
 using System.Linq;
-using System.Linq.Expressions;
 using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
@@ -23,42 +21,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         #region Public Methods
 
-        /// <summary>
-        /// Helper conversione a ProjectDTO
-        /// </summary>
-        /// <param name="currRec">record in formato ProdModel</param>
-        /// <returns></returns>
-        public static ProjectDTO ConvToDto(ProdModel currRec)
-        {
-            // ho valori mancanti che saranno calcolati dal cloud e valori messi a zero di default
-            ProjectDTO answ = new ProjectDTO()
-            {
-                ProjCloudId = currRec.ProjCloudId,
-                ProjLocalId = currRec.ProdDbId,
-                ProjExtId = currRec.ProdId,
-                // è calcolato sul cloud, da token --> machine ID
-                MachineCloudId = 0,
-                // è calcolato sul cloud, da token --> KeyNum
-                KeyNum = 0,
-                // disponibile solo su PROJ
-                BTLFileName = "",
-                PType = (EgwProxy.MagMan.BWType)currRec.PType,
-                Machine = currRec.Machine,
-                ProjDescription = currRec.Description,
-                DtCreated = currRec.DtCreated,
-                DtLastAction = DateTime.MinValue,
-                DtSchedule = DateTime.MinValue,
-                DtStartProd = DateTime.MinValue,
-                // disponibile solo su PROJ
-                ListName = "",
-                ProcTimeEst = 0,
-                ProcTimeReal = 0,
-                IsActive = currRec.IsActive,
-                IsArchived = currRec.IsArchived
-            };
-            return answ;
-        }
-
         /// <summary>
         /// Aggiunta di un PROJ ad un PROD
         /// </summary>
@@ -96,39 +58,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return done;
         }
 
-        /// <summary>
-        /// Helper conversione modelli verso Core.ProdItem
-        /// </summary>
-        /// <param name="currProd"></param>
-        /// <returns></returns>
-        public Core.ProdItem ConvToCore(ProdModel currProd)
-        {
-            Core.ProdItem answ = Core.ProdItem.CreateProdItem(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProjId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive, j.ProjCloudId)).ToList());
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione modelli verso Core.ProdItem
-        /// </summary>
-        /// <param name="currProd"></param>
-        /// <returns></returns>
-        public Core.ProdItem ConvToCore(ProjModel currProj)
-        {
-            Core.ProdItem answ = Core.ProdItem.CreateProdItem(Core.ProjFileM.CreateProjFileM(currProj.ProjId, 0, currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.ProjDescription, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine, currProj.IsActive, currProj.IsActive, currProj.ProjCloudId));
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione modelli
-        /// </summary>
-        /// <param name="currProd"></param>
-        /// <returns></returns>
-        public Core.ProdFileM ConvToCoreFile(ProdModel currProd)
-        {
-            Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjCloudId);
-            return answ;
-        }
-
         /// <summary>
         /// Delete Prod(+proj...) logically / on DB by ProdId
         /// </summary>
@@ -167,7 +96,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             }
                             // segno eliminazione logica al prod
                             currProd.IsActive = false;
-                            currProd.DtLastMod = DateTime.Now;
                             // Commit changes
                             localDbCtx.SaveChanges();
                             done = true;
@@ -275,7 +203,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 return null;
             }
-            return Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjCloudId);
+            return Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived);
         }
 
         /// <summary>
@@ -313,7 +241,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             }
 
             // conversione
-            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived, x.ProjCloudId)).ToList();
+            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived)).ToList();
             return result;
         }
 
@@ -354,7 +282,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             }
 
             // conversione
-            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived, x.ProjCloudId)).ToList();
+            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived)).ToList();
             return result;
         }
 
@@ -405,8 +333,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             }
 
             // conversione
-            result = dbResultProd.Select(x => ConvToCore(x)).ToList();
-            var resProj = dbResultProj.Select(x => ConvToCore(x)).ToList();
+            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
+            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
             // sommo i risultati
             result.AddRange(resProj);
             return result;
@@ -459,8 +387,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .ToList();
             }
             // conversione
-            result = dbResultProd.Select(x => ConvToCore(x)).ToList();
-            var resProj = dbResultProj.Select(x => ConvToCore(x)).ToList();
+            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
+            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
             // sommo i risultati
             result.AddRange(resProj);
             return result;
@@ -475,8 +403,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="NumRecord">Num max record da recuperare</param>
         /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
         /// <param name="Machine">Nome Macchina (default vuoto = non usato)</param>
-        /// <param name="BtlFileName">Nome file BTL (default vuoto = non usato)</param>
-        /// <param name="ListName">Nome List (default vuoto = non usato)</param>
+        /// <param name="BtlFileName">Nome file BTL  (default vuoto = non usato)</param>
+        /// <param name="ListName">Nome List  (default vuoto = non usato)</param>
         /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
         public List<Core.ProdItem> GetLastDescFull(DateTime DtStart, DateTime DtEnd, bool DtIsCreation, int NumRecord, bool OnlyActive, string Machine = "", string BtlFileName = "", string ListName = "", bool ShowArchived = false)
@@ -495,14 +423,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // retrieve
                 dbResultProd = localDbCtx
                             .ProdList
-                            .Where(x => (!x.IsArchived || ShowArchived))
+                            .Where(x =>  (!x.IsArchived || ShowArchived))
                             // condizione join sui PROJ
-                            .Join(localDbCtx.ProjList.Where(x =>
+                            .Join(localDbCtx.ProjList.Where(x => 
                                     (x.IsActive || !OnlyActive)
                                     && (string.IsNullOrEmpty(Machine) || x.Machine.ToLower().Contains(Machine.ToLower()))
-                                    && (string.IsNullOrEmpty(BtlFileName) || x.BTLFileName.ToLower().Contains(BtlFileName.ToLower()))
+                                    && (string.IsNullOrEmpty(BtlFileName) || x.BTLFileName.ToLower().Contains( BtlFileName.ToLower()))
                                     && (string.IsNullOrEmpty(ListName) || x.ListName.ToLower().Contains(ListName.ToLower()))
-                                    && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd)))
+                                    && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd))) 
                                     ),
                                 p => p.ProdDbId,
                                 e => e.ProdDbId,
@@ -516,8 +444,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // recupero i proj "orfani"
                 dbResultProj = localDbCtx
                             .ProjList
-                            .Where(x =>
-                            (x.IsActive || !OnlyActive)
+                            .Where(x => 
+                            (x.IsActive || !OnlyActive) 
                             && x.Prod == null
                             && (string.IsNullOrEmpty(Machine) || x.Machine.ToLower().Contains(Machine.ToLower()))
                             && (string.IsNullOrEmpty(BtlFileName) || x.BTLFileName.ToLower().Contains(BtlFileName.ToLower()))
@@ -528,31 +456,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .ToList();
             }
             // conversione
-            result = dbResultProd.Select(x => ConvToCore(x)).ToList();
-            var resProj = dbResultProj.Select(x => ConvToCore(x)).ToList();
+            result = dbResultProd.Select(x => coreItemConv(x)).ToList();
+            var resProj = dbResultProj.Select(x => coreItemConv(x)).ToList();
             // sommo i risultati
             result.AddRange(resProj);
             return result;
         }
 
-        /// <summary>
-        /// Recupero i dati modificati dopo la data richiesta x sincr su cloud
-        /// </summary>
-        /// <param name="DtLimit"></param>
-        /// <returns></returns>
-        public List<ProdModel> GetModAfter(DateTime DtLimit)
-        {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
-                        .ProdList
-                        .Where(x => x.DtLastMod >= DtLimit)
-                        .OrderBy(x => x.ProdDbId)
-                        .ToList();
-            }
-        }
-
         /// <summary>
         /// Fornisce nuovo indice VUOTO da usare (allocando sul DB)
         /// </summary>
@@ -606,25 +516,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return nextId;
         }
 
-        /// <summary>
-        /// Recupero i dati NON sincronizzati
-        /// </summary>
-        /// <param name="dtStart"></param>
-        /// <param name="dtEnd"></param>
-        /// <returns></returns>
-        public List<ProdModel> GetUnsentAsc()
-        {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
-                        .ProdList
-                        .Where(x => x.ProjCloudId == 0)
-                        .OrderBy(x => x.ProdDbId)
-                        .ToList();
-            }
-        }
-
         /// <summary>
         /// Verifica prod assegnato a supervisor: ...se c'e' anche un solo machgroup del prod
         /// assegnato ad un supervisor o in stato 0 (dovrebbe essere la stessa cosa?)
@@ -645,11 +536,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return numAssigned > 0;
         }
 
-        /// <summary> 
-        /// Return Lock by ProdId (proj & prod)
-        /// </summary>
-        /// <param name="ProdId"></param>
-        /// <returns></returns>
+        /// <summary> Return Lock by ProdId (proj & prod) </summary> <param name="ProdId"></param> <returns></returns>
         public bool IsLockByProdId(int ProdId)
         {
             bool bIsLock = false;
@@ -679,13 +566,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return bIsLock;
         }
 
-        /// <summary>
-        /// Manage Lock by ProdId (proj & prod)
-        /// </summary>
-        /// <param name="ProdId"></param>
-        /// <param name="Locked">Stato Lock da impostare</param>
-        /// <param name="UserKey">User ID / Key number</param>
-        /// <returns></returns>
+        /// <summary> Manage Lock by ProdId (proj & prod) </summary> <param name="ProdId"></param>
+        /// <param name="Locked">Stato Lock da impostare</param> <param name="UserKey">User ID / Key
+        /// number</param> <returns></returns>
         public ProdModel LockByProdId(int ProdId, bool Locked, string UserKey = "USER01")
         {
             ProdModel currProd;
@@ -702,7 +585,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     currProd.Locked = Locked;
                     currProd.LockDate = DateTime.Now;
                     currProd.LockedBy = Locked ? UserKey : "";
-                    localDbCtx.Entry(currProd).State = EntityState.Modified;
+                    localDbCtx.Entry(currProd).State = System.Data.Entity.EntityState.Modified;
 
                     var currProj = localDbCtx
                         .ProjList
@@ -715,7 +598,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         item.Locked = Locked;
                         item.LockDate = DateTime.Now;
                         item.LockedBy = Locked ? UserKey : "";
-                        localDbCtx.Entry(item).State = EntityState.Modified;
+                        localDbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
                     }
                 }
 
@@ -778,36 +661,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return done;
         }
 
-        /// <summary>
-        /// Esegue syncro sul DB dell'elenco dei record
-        /// </summary>
-        /// <param name="cloudStatus">Dizionario valori cloudId / isArchived</param>
-        /// <returns></returns>
-        public bool UpdateListArchived(Dictionary<int, bool> cloudStatus)
-        {
-            bool fatto = false;
-            int numDone = 0;
-            int num2do = cloudStatus.Count;
-            try
-            {
-                DateTime adesso = DateTime.Now;
-                // ciclo tutti i record e segno update...
-                foreach (var item in cloudStatus)
-                {
-                    // chiamo metodo singolo
-                    numDone += UpdateArchivedByCloudId(item.Key, item.Value) ? 1 : 0;
-                }
-                fatto = numDone == num2do;
-            }
-            catch (Exception exc)
-            {
-                string errMessage = $"EXCEPTION on Prod.UpdateListArchived: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
-            }
-            return fatto;
-        }
-
         /// <summary>
         /// Update record su DB x campo IsArchived
         /// </summary>
@@ -836,7 +689,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     {
                         // aggiorno valore descrizione
                         currData.IsArchived = IsArchived;
-                        currData.DtLastMod = DateTime.Now;
 
                         // update dei proj relativi
                         foreach (var item in proj2update)
@@ -864,64 +716,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return fatto;
         }
 
-        /// <summary>
-        /// Update record su DB x ProjectCloudId
-        /// </summary>
-        /// <param name="ProdId"></param>
-        /// <param name="Description"></param>
-        /// <returns></returns>
-        public Core.ProdFileM UpdateCloudId(int ProdId, int ProjCloudId)
-        {
-            // cerco specifico Proj
-            ProdModel currData;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                currData = localDbCtx
-                               .ProdList
-                               .Where(x => x.ProdId == ProdId)
-                               .SingleOrDefault();
-                if (currData != null)
-                {
-                    try
-                    {
-                        // aggiorno valore BTL
-                        currData.ProjCloudId = ProjCloudId;
-
-                        // salvo record PROD
-                        localDbCtx.SaveChanges();
-
-                        // cerco se ci siano projects collegati ed aggiorno pure loro...
-                        var projList = localDbCtx
-                                        .ProjList
-                                        .Where(x => x.ProdDbId == currData.ProdDbId)
-                                        .ToList();
-                        if (projList != null)
-                        {
-                            foreach (var item in projList)
-                            {
-                                item.ProjCloudId = ProjCloudId;
-                            }
-                            // salvo modifihce ai PROJ
-                            localDbCtx.SaveChanges();
-                        }
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Prod.UpdateCloudId:{Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Prod.UpdateCloudId: req item was not found | ProdId {ProdId} | ProjCloudId {ProjCloudId}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
-            }
-            return ConvToCoreFile(currData);
-        }
-
         /// <summary>
         /// Update record su DB x Description
         /// </summary>
@@ -1191,7 +985,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCoreFile(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -1213,7 +1007,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .SingleOrDefault();
                     if (currData != null)
                     {
-                        // aggiorno valore tipo
+                        // aggiorno valore BTL
                         currData.PType = PType;
 
                         // Commit changes
@@ -1233,7 +1027,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCoreFile(currData);
+            return coreConv(currData);
         }
 
         /// <summary> Return User Code/Key that Locks by ProdId (proj & prod) </summary> <param
@@ -1286,68 +1080,45 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         #region Protected Methods
 
+        /// <summary>
+        /// Helper conversione modelli
+        /// </summary>
+        /// <param name="currProd"></param>
+        /// <returns></returns>
+        protected Core.ProdFileM coreConv(ProdModel currProd)
+        {
+            Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived);
+            //Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProjId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive)).ToList());
+            return answ;
+        }
+
+        /// <summary>
+        /// Helper conversione modelli verso prodItem
+        /// </summary>
+        /// <param name="currProd"></param>
+        /// <returns></returns>
+        protected Core.ProdItem coreItemConv(ProdModel currProd)
+        {
+            Core.ProdItem answ = Core.ProdItem.CreateProdItem(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProjId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive)).ToList());
+            return answ;
+        }
+
+        /// <summary>
+        /// Helper conversione modelli verso prodItem da singolo proj
+        /// </summary>
+        /// <param name="currProd"></param>
+        /// <returns></returns>
+        protected Core.ProdItem coreItemConv(ProjModel currProj)
+        {
+            Core.ProdItem answ = Core.ProdItem.CreateProdItem(Core.ProjFileM.CreateProjFileM(currProj.ProjId, 0, currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.ProjDescription, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine, currProj.IsActive, currProj.IsActive));
+            return answ;
+        }
+
         protected List<int> ProjIdByProd(int ProdId)
         {
             var ProjCtr = new ProjController();
             return ProjCtr.GetByProdAsc(ProdId).Select(y => y.nProjId).ToList();
-        }
-
-        /// <summary>
-        /// Update record su DB x campo IsArchived dato CloudId
-        /// </summary>
-        /// <param name="ProjCloudId"></param>
-        /// <param name="IsArchived"></param>
-        /// <returns></returns>
-        protected bool UpdateArchivedByCloudId(int ProjCloudId, bool IsArchived)
-        {
-            bool fatto = false;
-            DateTime adesso = DateTime.Now;
-            // cerco specifico Prod
-            ProdModel currData = new ProdModel();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                currData = localDbCtx
-                               .ProdList
-                               .Where(x => x.ProjCloudId == ProjCloudId)
-                               .SingleOrDefault();
-                if (currData != null)
-                {
-                    // sel dei proj da aggiornare...
-                    var proj2update = localDbCtx
-                                        .ProjList
-                                        .Where(x => x.ProdDbId == currData.ProdDbId)
-                                        .ToList();
-                    try
-                    {
-                        // aggiorno valore descrizione
-                        currData.IsArchived = IsArchived;
-                        currData.DtLastMod = adesso;
-
-                        // update dei proj relativi
-                        foreach (var item in proj2update)
-                        {
-                            item.IsArchived = IsArchived;
-                        }
-
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        fatto = true;
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Prod.UpdateArchivedByCloudId:{Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Prod.UpdateArchivedByCloudId: req item was not found | ProjCloudId {ProjCloudId} | IsArchived {IsArchived}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
-            }
-            return fatto;
+            //return DbManager.obj.ProjCtr.GetByProdAsc(ProdId).Select(y => y.nProjId).ToList();
         }
 
         #endregion Protected Methods

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -1,5 +1,4 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -20,75 +19,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         #region Public Methods
 
-        /// <summary>
-        /// Helper conversione a ProjectDTO
-        /// </summary>
-        /// <param name="currRec">record in formato ProjModel</param>
-        /// <returns></returns>
-        public static ProjectDTO ConvToDto(ProjModel currRec)
-        {
-            // ho valori mancanti che saranno calcolati dal cloud e valori messi a zero di default
-            ProjectDTO answ = new ProjectDTO()
-            {
-                ProjCloudId = currRec.ProjCloudId,
-                ProjLocalId = currRec.ProjDbId,
-                ProjExtId = currRec.ProjId,
-                // è calcolato sul cloud, da token --> machine ID
-                MachineCloudId = 0,
-                // è calcolato sul cloud, da token --> KeyNum
-                KeyNum = 0,
-                BTLFileName = currRec.BTLFileName,
-                PType = (EgwProxy.MagMan.BWType)currRec.PType,
-                Machine = currRec.Machine,
-                ProjDescription = currRec.ProjDescription,
-                DtCreated = currRec.DtCreated,
-                DtLastAction = DateTime.MinValue,
-                DtSchedule = DateTime.MinValue,
-                DtStartProd = DateTime.MinValue,
-                ListName = currRec.ListName,
-                ProcTimeEst = 0,
-                ProcTimeReal = 0,
-                IsActive = currRec.IsActive,
-                IsArchived = currRec.IsArchived
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione a ProjModel
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <param name="isActive"></param>
-        /// <returns></returns>
-        public static ProjModel ConvToModel(ProjectDTO currRec, bool isActive)
-        {
-            ProjModel answ = new ProjModel()
-            {
-                ProjCloudId = currRec.ProjCloudId,
-                ProjDbId = currRec.ProjLocalId,
-                ProjId = currRec.ProjExtId,
-                //MachineID = currRec.MachineCloudId,
-                //KeyNum = currRec.KeyNum,
-                BTLFileName = currRec.BTLFileName,
-                PType = (BWType)currRec.PType,
-                Machine = currRec.Machine,
-                ProjDescription = currRec.ProjDescription,
-                DtCreated = currRec.DtCreated,
-                //DtLastAction = currRec.DtLastAction,
-                //DtSchedule = currRec.DtSchedule,
-                //DtStartProd = currRec.DtStartProd,
-                ListName = currRec.ListName,
-                //ProcTimeEst = currRec.ProcTimeEst,
-                //ProcTimeReal = currRec.ProcTimeReal,
-                IsActive = currRec.IsActive,
-                IsArchived = currRec.IsArchived
-            };
-            return answ;
-        }
-
         /// <summary>
         /// Search for already imported BTL from FileName (only)
-        /// =0 : NOT found &gt;0 : ProdId (already present) for overwrite
+        /// =0 : NOT found &gt;0 : ProjId (already present) for overwrite
         /// </summary>
         /// <param name="BTLFileName"></param>
         /// <returns></returns>
@@ -114,22 +47,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         /// <summary>
-        /// Helper conversione modelli
-        /// </summary>
-        /// <param name="currRec">record in formato ProjModel</param>
-        /// <returns></returns>
-        public Core.ProjFileM ConvToCore(ProjModel currRec)
-        {
-            Core.ProjFileM answ = null;
-            if (currRec != null)
-            {
-                answ = Core.ProjFileM.CreateProjFileM(currRec.ProjId, ProdIdByProdDbId(currRec.ProdDbId), currRec.DtCreated, currRec.DtExported, currRec.ListName, currRec.BTLFileName, currRec.ProjDescription, currRec.IsNew, currRec.Locked, currRec.PType, currRec.Machine, currRec.IsActive, currRec.IsArchived, currRec.ProjCloudId);
-            }
-            return answ;
-        }
-
-        /// <summary>
-        /// Delete Proj logically / on DB by ProdId
+        /// Delete Proj logically / on DB by ProjId
         /// </summary>
         /// <param name="ProjId"></param>
         /// <param name="IsLogical"></param>
@@ -244,53 +162,43 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public ProjModel FindByProjDbId(int ProjDbId)
         {
-            ProjModel answ = new ProjModel();
+            ProjModel answ;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                try
-                {
-                    answ = localDbCtx
-                            .ProjList
-                            .Where(x => x.ProjDbId == ProjDbId)
-                            .SingleOrDefault();
-                }
-                catch
-                { }
+                answ = localDbCtx
+                        .ProjList
+                        .Where(x => x.ProjDbId == ProjDbId)
+                        .SingleOrDefault();
             }
             return answ;
         }
 
         /// <summary>
-        /// Get record by ProdId
+        /// Get record by ProjId
         /// </summary>
         /// <param name="ProjId"></param>
         /// <returns></returns>
         public ProjModel FindByProjId(int ProjId)
         {
-            ProjModel answ = new ProjModel();
+            ProjModel answ;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                try
-                {
-                    answ = localDbCtx
-                   .ProjList
-                    .Where(x => x.ProjId == ProjId)
-                    .SingleOrDefault();
-                }
-                catch
-                { }
+                answ = localDbCtx
+               .ProjList
+                .Where(x => x.ProjId == ProjId)
+                .SingleOrDefault();
             }
             return answ;
         }
 
         /// <summary>
-        /// Get record by ProdId converted
+        /// Get record by ProjId converted
         /// </summary>
         /// <param name="ProjId"></param>
         /// <returns></returns>
         public Core.ProjFileM FindByProjIdConv(int ProjId)
         {
-            return ConvToCore(FindByProjId(ProjId));
+            return coreConv(FindByProjId(ProjId));
         }
 
         /// <summary>
@@ -328,7 +236,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     .OrderBy(x => x.ProdDbId)
                     .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -368,7 +276,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .OrderByDescending(x => x.ProdDbId)
                             .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -421,7 +329,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -452,7 +360,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -485,7 +393,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -540,7 +448,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return nextId;
         }
 
-        /// <summary> Manage Lock by ProdId (proj & prod) </summary> <param name="ProjId">ID
+        /// <summary> Manage Lock by ProjId (proj & prod) </summary> <param name="ProjId">ID
         /// Proj</param> <param name="Locked">Stato Lock da impostare</param> <param
         /// name="UserKey">User ID / Key number</param> <returns></returns>
         public Core.ProjFileM LockByProjId(int ProjId, bool Locked, string UserKey = "USER01")
@@ -591,7 +499,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // salvataggio
                 localDbCtx.SaveChanges();
             }
-            return ConvToCore(currProj);
+            return coreConv(currProj);
         }
 
         /// <summary>
@@ -621,7 +529,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 currProj.IsNew = false;
                 localDbCtx.SaveChanges();
             }
-            return ConvToCore(currProj);
+            return coreConv(currProj);
         }
 
         /// <summary>
@@ -663,7 +571,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.Update: req item was not found | ProdId {updItem.ProjId} | ProjDbId {updItem.ProjDbId} | ProdDbId {updItem.ProdDbId}";
+                    string errMessage = $"ERROR on Proj.Update: req item was not found | ProjId {updItem.ProjId} | ProjDbId {updItem.ProjDbId} | ProdDbId {updItem.ProdDbId}";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
@@ -755,7 +663,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.UpdateBtlParts: req item was not found | ProdId {ProjId} | BtlPartList {BtlPartList.Count} items";
+                    string errMessage = $"ERROR on Proj.UpdateBtlParts: req item was not found | ProjId {ProjId} | BtlPartList {BtlPartList.Count} items";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
@@ -798,13 +706,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.UpdateDescription: req item was not found | ProdId {ProjId} | Description {Description}";
+                    string errMessage = $"ERROR on Proj.UpdateDescription: req item was not found | ProjId {ProjId} | Description {Description}";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
             }
 
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -843,7 +751,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             // se ne ho esattamente 1 nel DB allora DEVE essere il record Parent
                             if (duplicateList.Count == 1)
                             {
-                                // verifico se ProdId variato
+                                // verifico se ProjId variato
                                 if (!duplicateList[0].ProjId.Equals(currData.ProjId))
                                 {
                                     // in questo caso ho il PRIMO duplicato
@@ -889,13 +797,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.UpdateInfo: req item was not found | ProdId {ProjId} | Description {BTLFileName} | ListName {ListName} | DtExported {DtExported} | PType {PType} | Machine {Machine}";
+                    string errMessage = $"ERROR on Proj.UpdateInfo: req item was not found | ProjId {ProjId} | Description {BTLFileName} | ListName {ListName} | DtExported {DtExported} | PType {PType} | Machine {Machine}";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
             }
 
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -925,7 +833,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     }
                     else
                     {
-                        string errMessage = $"ERROR on Proj.UpdateListName: req item was not found | ProdId {ProjId} | ListName {ListName}";
+                        string errMessage = $"ERROR on Proj.UpdateListName: req item was not found | ProjId {ProjId} | ListName {ListName}";
                         Console.WriteLine(errMessage);
                         Log.Error(errMessage);
                     }
@@ -937,7 +845,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -968,7 +876,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     }
                     else
                     {
-                        string errMessage = $"ERROR on Proj.UpdateMachine: req item was not found | ProdId {ProjId} | Machine {Machine}";
+                        string errMessage = $"ERROR on Proj.UpdateMachine: req item was not found | ProjId {ProjId} | Machine {Machine}";
                         Console.WriteLine(errMessage);
                         Log.Error(errMessage);
                     }
@@ -980,13 +888,28 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         #endregion Public Methods
 
         #region Protected Methods
 
+        /// <summary>
+        /// Helper conversione modelli
+        /// </summary>
+        /// <param name="currProj"></param>
+        /// <returns></returns>
+        protected Core.ProjFileM coreConv(ProjModel currProj)
+        {
+            Core.ProjFileM answ = null;
+            if (currProj != null)
+            {
+                answ = Core.ProjFileM.CreateProjFileM(currProj.ProjId, ProdIdByProdDbId(currProj.ProdDbId), currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.ProjDescription, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine, currProj.IsActive, currProj.IsArchived);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Get LAST paginated data from DB (DESC ordered)
         /// </summary>

EgtBEAMWALL.DataLayer/Controllers/RawItemsController.cs

@@ -1,372 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione RawItem (barre) su DB (= magazzino locale)
-    /// </summary>
-    public class RawItemsController : IDisposable
-    {
-        #region Public Constructors
-
-        public RawItemsController()
-        {
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        /// <summary>
-        /// Helper conversion da DB model class a base class (VB)
-        /// </summary>
-        /// <param name="dbRec"></param>
-        /// <returns></returns>
-        public static Core.RawPartM ConvToCore(RawItemModel dbRec)
-        {
-            // converto in primis il materiale relativo
-            Core.MaterialM matRec = MaterialsController.ConvToCore(dbRec.MaterialNav);
-            Core.RawPartM answ = new Core.RawPartM(dbRec.RawItemId, matRec, (double)dbRec.WMm, (double)dbRec.LMm, dbRec.QtyAvail, dbRec.UseQty, dbRec.IsActive);
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione a ItemDTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static ItemDTO ConvToItemDto(RawItemModel currRec)
-        {
-            ItemDTO answ = new ItemDTO()
-            {
-                MatCloudId = currRec.MaterialNav != null ? currRec.MaterialNav.MatCloudId : 0,
-                MatLocalId = currRec.MatId,
-                RawItemCloudId = currRec.RawItemCloudId,
-                RawItemLocalId = currRec.RawItemId,
-                IsRemn = currRec.IsRemn,
-                IsDeleted = currRec.IsDeleted,
-                QtyAvail = currRec.QtyAvail,
-                HMm = currRec.HMm,
-                LMm = currRec.LMm,
-                WMm = currRec.WMm,
-                Note = currRec.Note
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione da ItemDTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <param name="isActive"></param>
-        /// <returns></returns>
-        public static RawItemModel ConvToModel(ItemDTO currRec, bool isActive)
-        {
-            RawItemModel answ = new RawItemModel()
-            {
-                RawItemCloudId = currRec.RawItemCloudId,
-                RawItemId = currRec.RawItemLocalId,
-                QtyAvail = currRec.QtyAvail,
-                HMm = currRec.HMm,
-                LMm = currRec.LMm,
-                WMm = currRec.WMm,
-                MatId = currRec.MatLocalId,
-                IsDeleted = currRec.IsDeleted,
-                IsRemn = currRec.IsRemn,
-                // attivo = selezionato x nesting
-                IsActive = isActive,
-                UseQty = true,
-                Note = currRec.Note
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione da ResourceExpDTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <param name="matLocalId"></param>
-        /// <returns></returns>
-        public static RawItemModel ConvToModel(ResourceExpDTO currRec, int matLocalId)
-        {
-            RawItemModel answ = new RawItemModel()
-            {
-                RawItemCloudId = currRec.RawItemCloudId,
-                RawItemId = currRec.RawItemLocalId,
-                QtyAvail = currRec.Qty,
-                HMm = currRec.HMm,
-                LMm = currRec.LMm,
-                WMm = currRec.WMm,
-                MatId = matLocalId,
-                IsRemn = currRec.IsRemn,
-                IsDeleted = currRec.IsDeleted,
-                UseQty = true,
-                Note = currRec.Note
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Conversion of base class to DB model class
-        /// </summary>
-        /// <param name="coreRec"></param>
-        /// <returns></returns>
-        public static RawItemModel ConvToModel(Core.RawPartM coreRec)
-        {
-            RawItemModel answ = new RawItemModel();
-            if (coreRec != null)
-            {
-                answ = new RawItemModel()
-                {
-                    RawItemId = coreRec.nId,
-                    MatId = coreRec.Material.nId,
-                    HMm = (decimal)Math.Round(coreRec.Material.dH, 2),
-                    LMm = (decimal)Math.Round(coreRec.dL, 2),
-                    WMm = coreRec.dW > 0 ? (decimal)Math.Round(coreRec.dW, 2) : (decimal)Math.Round(coreRec.Material.dW, 2),
-                    IsActive = coreRec.bActive,
-                    UseQty = coreRec.bUseQuantity,
-                    QtyAvail = coreRec.nQuantity
-                };
-            }
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione a ResourceDTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static ResourceDTO ConvToResDto(RawItemModel currRec)
-        {
-            ResourceDTO answ = new ResourceDTO()
-            {
-                RawItemCloudId = currRec.RawItemCloudId,
-                RawItemLocalId = currRec.RawItemId,
-                Qty = currRec.QtyAvail
-            };
-            return answ;
-        }
-
-        ///// <summary>
-        ///// Helper conversione a ResourceDTO con garanzia valori Qty negativi
-        ///// </summary>
-        ///// <param name="currRec"></param>
-        ///// <returns></returns>
-        //public static ResourceDTO ConvToResDtoNeg(RawItemModel currRec)
-        //{
-        //    ResourceDTO answ = new ResourceDTO()
-        //    {
-        //        RawItemCloudId = currRec.RawItemCloudId,
-        //        RawItemLocalId = currRec.RawItemId,
-        //        Qty = -Math.Abs(currRec.QtyAvail)
-        //    };
-        //    return answ;
-        //}
-
-        /// <summary>
-        /// Delete by key
-        /// </summary>
-        /// <param name="RawItemId"></param>
-        /// <returns></returns>
-        public bool DeleteByKey(int RawItemId)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var items2del = localDbCtx
-                                    .RawItemList
-                                    .Where(x => x.RawItemId == RawItemId)
-                                    .FirstOrDefault();
-                try
-                {
-                    // verifico SE esista
-                    if (items2del != null)
-                    {
-                        // verifico seabbia un cloud id (fa canc logica)...
-                        if (items2del.RawItemCloudId > 0)
-                        {
-                            items2del.IsDeleted = true;
-                            localDbCtx.Entry(items2del).State = EntityState.Modified;
-                        }
-                        else
-                        {
-                            // ...o meno: fa eliminazione vera
-                            localDbCtx.RawItemList.Remove(items2del);
-                        }
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                    }
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on RawItems.DeleteByKey: {Environment.NewLine}{exc}");
-                }
-            }
-            return done;
-        }
-
-        public void Dispose()
-        {
-        }
-
-        /// <summary>
-        /// Get record by Key / Core
-        /// </summary>
-        /// <param name="RawItemId"></param>
-        /// <returns></returns>
-        public Core.RawPartM FindByDbId(int RawItemId)
-        {
-            var rawdata = FindByDbIdModel(RawItemId);
-            var result = ConvToCore(rawdata);
-            return result;
-        }
-
-        /// <summary>
-        /// Get record by Key / Db Model
-        /// </summary>
-        /// <param name="RawItemId"></param>
-        /// <returns></returns>
-        public RawItemModel FindByDbIdModel(int RawItemId)
-        {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .RawItemList
-                        .Where(x => x.RawItemId == RawItemId)
-                        .Include(m => m.MaterialNav)
-                        .SingleOrDefault();
-            }
-        }
-
-        /// <summary>
-        /// Get Material (filtro x MatId) / Core
-        /// </summary>
-        /// <param name="MatId">0 = tutti</param>
-        /// <returns></returns>
-        public List<Core.RawPartM> GetFilt(int MatId)
-        {
-            var rawList = GetFiltModel(MatId);
-            var result = rawList.Select(x => ConvToCore(x)).ToList();
-            return result;
-        }
-
-        /// <summary>
-        /// Get Material (filtro x MatId)
-        /// </summary>
-        /// <param name="MatId">0 = tutti</param>
-        /// <returns></returns>
-        public List<RawItemModel> GetFiltModel(int MatId)
-        {
-            // retrieve
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .RawItemList
-                        .Include(j => j.MaterialNav)
-                        .Where(x => MatId == 0 || x.MatId == MatId)
-                        .OrderBy(x => x.LMm)
-                        .ThenBy(x => x.WMm)
-                        .ToList();
-            }
-        }
-
-        /// <summary>
-        /// Update or insert RawItem record
-        /// </summary>
-        /// <param name="updItem">Recorda da registrare</param>
-        /// <param name="changeUseQty">Indica se, in caso di modifica, vada aggiornato UseQty</param>
-        /// <param name="changeQtyAvail">Indica se, in caso di modifica, vada aggiornato QtyAvail</param>
-        /// <returns></returns>
-        public int Upsert(RawItemModel updItem, bool changeUseQty, bool changeQtyAvail)
-        {
-            int newIdx = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .RawItemList
-                                        .Where(x => (updItem.RawItemId > 0 && x.RawItemId == updItem.RawItemId)
-                                                 || (x.MatId == updItem.MatId && x.WMm == updItem.WMm && x.HMm == updItem.HMm && x.LMm == updItem.LMm))
-                                        .FirstOrDefault();
-
-                    if (item2update != null)
-                    {
-                        // se ho un valore > 0 x CloudId sennò NON modifica
-                        if (updItem.RawItemCloudId > 0)
-                        {
-                            item2update.RawItemCloudId = updItem.RawItemCloudId;
-                        }
-                        item2update.HMm = updItem.HMm;
-                        item2update.LMm = updItem.LMm;
-                        item2update.WMm = updItem.WMm;
-                        item2update.IsActive = updItem.IsActive;
-                        item2update.IsDeleted = updItem.IsDeleted;
-                        item2update.IsRemn = updItem.IsRemn;
-                        if (changeUseQty)
-                        {
-                            item2update.UseQty = updItem.UseQty;
-                        }
-                        if (changeQtyAvail)
-                        {
-                            item2update.QtyAvail = updItem.QtyAvail;
-                            item2update.LastSync = DateTime.Now;
-                        }
-                        localDbCtx.Entry(item2update).State = EntityState.Modified;
-                    }
-                    else
-                    {
-                        localDbCtx.RawItemList.Add(updItem);
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    if (item2update != null)
-                    {
-                        newIdx = item2update.RawItemId;
-                    }
-                    else
-                    {
-                        newIdx = updItem.RawItemId;
-                    }
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on RawItems.Upsert: {Environment.NewLine}{exc}");
-                }
-            }
-            return newIdx;
-        }
-
-        /// <summary>
-        /// Update or insert RawItem record from CoreM
-        /// </summary>
-        /// <param name="coreItem"></param>
-        /// <returns></returns>
-        public int Upsert(Core.RawPartM coreItem)
-        {
-            int newIdx = 0;
-            // converto
-            RawItemModel updItem = ConvToModel(coreItem);
-            newIdx = Upsert(updItem, true, true);
-            return newIdx;
-        }
-
-        #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-    }
-}

EgtBEAMWALL.DataLayer/Controllers/StatusMapController.cs

@@ -136,17 +136,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             // Initialize database context
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                try
-                {
-                    // retrieve
-                    answ = localDbCtx
-                        .StatusMapList
-                        .Where(x => x.Session == Session && x.ItemType == Core.StatusMapItemType.Prod)
-                        .OrderByDescending(x => x.Index)
-                        .ToList();
-                }
-                catch
-                { }
+                // retrieve
+                answ = localDbCtx
+                    .StatusMapList
+                    .Where(x => x.Session == Session && x.ItemType == Core.StatusMapItemType.Prod)
+                    .OrderByDescending(x => x.Index)
+                    .ToList();
             }
             return answ;
         }

EgtBEAMWALL.DataLayer/DatabaseContext.cs

@@ -7,7 +7,6 @@ using System.IO;
 
 namespace EgtBEAMWALL.DataLayer
 {
-#if false
     //[DbConfigurationType(typeof(MySqlEFConfiguration))]
     public class aMySqlConfiguration : MySqlEFConfiguration
     {
@@ -20,8 +19,7 @@ namespace EgtBEAMWALL.DataLayer
         }
 
         #endregion Public Constructors
-    } 
-#endif
+    }
 
     [DbConfigurationType(typeof(MySqlEFConfiguration))]
     public class DatabaseContext : DbContext
@@ -40,21 +38,6 @@ namespace EgtBEAMWALL.DataLayer
 
         #endregion Public Constructors
 
-        protected override void OnModelCreating(DbModelBuilder modelBuilder)
-        {
-#if false
-            // fix valori decimal
-            modelBuilder.Entity<MaterialModel>().Property(x => x.HMm).HasPrecision(18, 6);
-            modelBuilder.Entity<MaterialModel>().Property(x => x.LMm).HasPrecision(18, 6);
-            modelBuilder.Entity<MaterialModel>().Property(x => x.WMm).HasPrecision(18, 6);
-            modelBuilder.Entity<RawItemModel>().Property(x => x.HMm).HasPrecision(18, 6);
-            modelBuilder.Entity<RawItemModel>().Property(x => x.LMm).HasPrecision(18, 6);
-            modelBuilder.Entity<RawItemModel>().Property(x => x.WMm).HasPrecision(18, 6); 
-#endif
-
-            base.OnModelCreating(modelBuilder);
-        }
-
         #region Public Properties
 
         /// <summary>
@@ -97,27 +80,6 @@ namespace EgtBEAMWALL.DataLayer
         /// </summary>
         public DbSet<StatusMapModel> StatusMapList { get; set; }
 
-        /// <summary>
-        /// Wharehouse materials management
-        /// </summary>
-        public DbSet<MaterialModel> MaterialsList { get; set; }
-
-        /// <summary>
-        /// Wharehouse items management
-        /// </summary>
-        public DbSet<RawItemModel> RawItemList { get; set; }
-
-        /// <summary>
-        /// Alias management
-        /// </summary>
-        public DbSet<AliasModel> AliasList { get; set; }
-
-        /// <summary>
-        /// Alias management
-        /// </summary>
-        public DbSet<MagmanSyncModel> SyncList { get; set; }
-
-
         #endregion Public Properties
 
         #region Public Methods

EgtBEAMWALL.DataLayer/DatabaseModels/AliasModel.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EgtBEAMWALL.DataLayer.DatabaseModels
-{
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
-    [Table("AliasList")]
-    public class AliasModel
-    {
-        /// <summary>
-        /// Famiglia di sinonimi
-        /// </summary>
-        [Column("Family", Order = 1), Key]
-        public string Family { get; set; } = "";
-
-        /// <summary>
-        /// Codice originale (da trasformare)
-        /// </summary>
-        [Column("ValueOriginal", Order = 2), Key]
-        public string ValueOriginal { get; set; } = "";
-
-        /// <summary>
-        /// Codice Alias in cui viene convertito
-        /// </summary>
-        public string ValueAlias { get; set; } = "";
-
-    }
-}

EgtBEAMWALL.DataLayer/DatabaseModels/LogMachineModel.cs

@@ -16,53 +16,86 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         #region Public Properties
 
         /// <summary>
-        /// Chiave primaria evento LOG
+        /// Codice Allarme
         /// </summary>
-        [Key, Column("DbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int LogDbId { get; set; }
-
-        /// <summary>
-        /// Stato da enum Core
-        /// </summary>
-        [Column("EvType")]
-        public Core.MachLog.MachLogTypes EvType { get; set; } = Core.MachLog.MachLogTypes.NULL;
+        [Column("AlarmCode")]
+        public string AlarmCode { get; set; } = "";
 
         /// <summary>
         /// Data Evento
         /// </summary>
-        [Column("DtEvent")]
-        public DateTime DtEvent { get; set; } = DateTime.Now;
+        [Column("AlarmDtEvent")]
+        public DateTime AlarmDatetime { get; set; } = DateTime.Now;
 
         /// <summary>
-        /// Key prod attivo (DB locale)
+        /// Messaggio Allarme
         /// </summary>
-        [Column("ProdId")]
-        public int ProdId { get; set; } = 0;
+        [Column("AlarmMessage")]
+        public string AlarmMessage { get; set; } = "";
 
         /// <summary>
-        /// Key progetto (cloud)
+        /// Alarm Operation
         /// </summary>
-        [Column("ProjCloudId")]
-        public int ProjCloudId { get; set; } = 0;
+        [Column("AlarmOperation")]
+        public int AlarmOperation { get; set; } = 0;
 
         /// <summary>
-        /// ID Supervisore (Indirizzo VAR)
+        /// Alarm Type
         /// </summary>
-        [Column("SupervId")]
-        public string SupervId { get; set; } = "";
+        [Column("AlarmType")]
+        public int AlarmType { get; set; } = 0;
 
         /// <summary>
-        /// Valore VAR (oggetto del log da decodificare)
+        /// Esaecuzione comando corretta
+        /// </summary>
+        [Column("CommExecuted")]
+        public bool CommandExecutedCorrectly { get; set; } = false;
+
+        /// <summary>
+        /// Stato da enum Core
+        /// </summary>
+        [Column("CommandState")]
+        public Core.ConstMachComm.CommandStates CommandState { get; set; } = Core.ConstMachComm.CommandStates.NULL;
+
+        /// <summary>
+        /// Tipo Comando da enum Core
+        /// </summary>
+        [Column("CommandType")]
+        public Core.ConstMachComm.LogCommandTypes CommandType { get; set; } = Core.ConstMachComm.LogCommandTypes.NULL;
+
+        /// <summary>
+        /// Descrizione
+        /// </summary>
+        [Column("Description")]
+        public string Description { get; set; } = "";
+
+        [Key, Column("DbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int LogDbId { get; set; }
+
+        /// <summary>
+        /// New OP State
+        /// </summary>
+        [Column("NewOpState")]
+        public int NewOpState { get; set; } = 0;
+
+        /// <summary>
+        /// Stato da enum Core
+        /// </summary>
+        [Column("ResultType")]
+        public Core.ConstMachComm.ResultTypes ResultType { get; set; } = Core.ConstMachComm.ResultTypes.NULL;
+
+        /// <summary>
+        /// Indirizzo VAR
+        /// </summary>
+        [Column("VarAddress")]
+        public string VarAddress { get; set; } = "";
+
+        /// <summary>
+        /// Valore VAR
         /// </summary>
         [Column("VarValue")]
         public string VarValue { get; set; } = "";
 
-        /// <summary>
-        /// Data di invio evento (su cloud)
-        /// </summary>
-        [Column("DtSent")]
-        public DateTime? DtSent { get; set; } = null;
-
         #endregion Public Properties
 
     }

EgtBEAMWALL.DataLayer/DatabaseModels/MagmanSyncModel.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EgtBEAMWALL.DataLayer.DatabaseModels
-{
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
-    [Table("MagmanSync")]
-    public partial class MagmanSyncModel
-    {
-        /// <summary>
-        /// Primary Key AUTO
-        /// </summary>
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int SyncId { get; set; }
-
-        /// <summary>
-        /// Tipologia Sync
-        /// </summary>
-        public string SyncType { get; set; } = "";
-
-        /// <summary>
-        /// Id riferimento remoto cloud x invio (es ProjCloudId)
-        /// </summary>
-        public int CloudId { get; set; } = 0;
-
-        /// <summary>
-        /// DataOra inserimento richiesta
-        /// </summary>
-        public DateTime DtReq { get; set; } = DateTime.Now;
-
-        /// <summary>
-        /// DataOra esecuzione richiesta
-        /// </summary>
-        public DateTime? DtExe { get; set; } = null;
-
-        /// <summary>
-        /// Payload trasmesso/da trasmettere (serializzato)
-        /// </summary>
-        public string Payload { get; set; } = "";
-
-        /// <summary>
-        /// Record inviato se DtExe != null && >= dtReq
-        /// </summary>
-        [NotMapped]
-        public bool Sent
-        {
-            get => DtExe != null && DtExe > DtReq;
-        }
-
-    }
-}

EgtBEAMWALL.DataLayer/DatabaseModels/MaterialModel.cs

@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EgtBEAMWALL.DataLayer.DatabaseModels
-{
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
-    [Table("MaterialsList")]
-    public partial class MaterialModel
-    {
-        /// <summary>
-        /// Init classe
-        /// </summary>
-        public MaterialModel()
-        {
-            RawItemList = new HashSet<RawItemModel>();
-        }
-
-        /// <summary>
-        /// Primary Key AUTO
-        /// </summary>
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int MatId { get; set; }
-
-        /// <summary>
-        /// Codice materiale (Identificativo DB esterno del magazzino in sync)
-        /// </summary>
-        public int MatCloudId { get; set; } = 0;
-
-        /// <summary>
-        /// Codice Materiale
-        /// </summary>
-        public string MatCode { get; set; } = "";
-
-        /// <summary>
-        /// Descrizione Materiale
-        /// </summary>
-        public string MatDesc { get; set; } = "";
-
-        /// <summary>
-        /// Lenght/Lunghezza in mm
-        /// </summary>
-        public decimal LMm { get; set; } = 0;
-        /// <summary>
-        /// Width/Larghezza in mm
-        /// </summary>
-        public decimal WMm { get; set; } = 0;
-        /// <summary>
-        /// Height (Thikness/Spessore) in mm
-        /// </summary>
-        public decimal HMm { get; set; } = 0;
-
-        /// <summary>
-        /// ID dell'ultimo articolo (variante) usato per il materiale
-        /// </summary>
-        public int RawItemIdLast { get; set; } = 0;
-
-#if false
-        /// <summary>
-        /// Lenght/Lunghezza in inch
-        /// </summary>
-        [NotMapped]
-        public decimal LIn
-        {
-            get => Math.Round(LMm / (decimal)25.4, 3);
-        }
-        /// <summary>
-        /// Width/Larghezza in inch
-        /// </summary>
-        [NotMapped]
-        public decimal WIn
-        {
-            get => Math.Round(WMm / (decimal)25.4, 3);
-        }
-        /// <summary>
-        /// Height/Altezza (Thikness/Spessore) in inch
-        /// </summary>
-        [NotMapped]
-        public decimal HIn
-        {
-            get => Math.Round(HMm / (decimal)25.4, 3);
-        }
-
-        /// <summary>
-        /// Codice materiale x QR/Datamatrix
-        /// </summary>
-        [NotMapped]
-        public string MatDtmx
-        {
-            get => $"MT{MatExtId:00000000}";
-        } 
-#endif
-        /// <summary>
-        /// Verifica che sia Beam, quando L == 0
-        /// </summary>
-        [NotMapped]
-        public bool IsBeam
-        {
-            get => (LMm == 0 && (HMm > 0 && WMm > 0));
-        }
-
-        /// <summary>
-        /// Verifica che sia Wall, quando W/L == 0
-        /// </summary>
-        [NotMapped]
-        public bool IsWall
-        {
-            get => (LMm == 0 && WMm == 0);
-        }
-
-        public virtual ICollection<RawItemModel> RawItemList { get; set; }
-    }
-}

EgtBEAMWALL.DataLayer/DatabaseModels/PartModel.cs

@@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
     /// <summary>
-    /// Tabella delle singole istanze prodotte
+    /// Tabelal delle singole istsanze prodotte\
     /// </summary>
     [Table("PartList")]
     public class PartModel

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EgtBEAMWALL.Core.ConstBeam;
@@ -57,11 +59,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Index]
         public int ProdId { get; set; }
 
-        /// <summary>
-        /// Codice Proj per sync info (Identificativo DB esterno del magazzino in sync)
-        /// </summary>
-        public int ProjCloudId { get; set; } = 0;
-
         /// <summary>
         /// Tipologia del progetto (Travi, Pareti, ...)
         /// </summary>
@@ -83,7 +80,7 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un dispositivo in rete
         /// </summary>
         [Column("LockDate")]
-        public DateTime LockDate { get; set; } = new DateTime(1900, 01, 01);
+        public DateTime LockDate { get; set; } = DateTime.MinValue;
 
         /// <summary>
         /// Record attivo (se false == cancellazione logica)
@@ -106,13 +103,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("IsArchived")]
         public bool IsArchived { get; set; } = false;
 
-        /// <summary>
-        /// Data Creazione
-        /// </summary>
-        [Index]
-        [Column("DtLastMod")]
-        public DateTime DtLastMod { get; set; } = new DateTime(1900, 01, 01);
-
         /// <summary>
         /// Collezione oggetti Proj associati (almeno 1 by design)
         /// </summary>

EgtBEAMWALL.DataLayer/DatabaseModels/ProjModel.cs

@@ -65,11 +65,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Index]
         public int ProjId { get; set; }
 
-        /// <summary>
-        /// Codice Proj per sync info (Identificativo DB esterno del magazzino in sync)
-        /// </summary>
-        public int ProjCloudId { get; set; } = 0;
-
         /// <summary>
         /// Tipologia del progetto (Travi, Pareti, ...)
         /// </summary>
@@ -92,7 +87,7 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// dispositivo in rete
         /// </summary>
         [Column("LockDate")]
-        public DateTime LockDate { get; set; } = new DateTime(1900, 01, 01);
+        public DateTime LockDate { get; set; } = DateTime.MinValue;
 
         /// <summary>
         /// Record attivo (se false == cancellazione logica)

EgtBEAMWALL.DataLayer/DatabaseModels/RawItemModel.cs

@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EgtBEAMWALL.DataLayer.DatabaseModels
-{
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
-    //[Index(nameof(Installazione), nameof(Active), nameof(DiskStatus))]
-    [Table("RawItemList")]
-    public partial class RawItemModel
-    {
-        /// <summary>
-        /// Primary Key AUTO
-        /// </summary>
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int RawItemId { get; set; }
-
-        /// <summary>
-        /// Codice RawMat univoco e in sync (Identificativo DB esterno del magazzino in sync)
-        /// </summary>
-        public int RawItemCloudId { get; set; } = 0;
-
-        /// <summary>
-        /// ForeignKey Materiale
-        /// </summary>
-        public int MatId { get; set; } = 0;
-
-        /// <summary>
-        /// Qty available on wharehouse
-        /// </summary>
-        public int QtyAvail { get; set; } = 0;
-
-        /// <summary>
-        /// Active  = can be used
-        /// </summary>
-        public bool IsActive { get; set; } = false;
-
-        /// <summary>
-        /// Remnant
-        /// </summary>
-        public bool IsRemn { get; set; } = false;
-
-        /// <summary>
-        /// Deleted  = from cloud, not to use
-        /// </summary>
-        public bool IsDeleted { get; set; } = false;
-
-        /// <summary>
-        /// Item's Lenght
-        /// </summary>
-        public decimal LMm { get; set; } = 0;
-
-        /// <summary>
-        /// Item's Width
-        /// </summary>
-        public decimal WMm { get; set; } = 0;
-
-        /// <summary>
-        /// Item's Height (Thikness/Spessore) in mm
-        /// </summary>
-        public decimal HMm { get; set; } = 0;
-
-        /// <summary>
-        /// Note (optional)
-        /// </summary>
-        public string Note { get; set; } = "";
-
-        /// <summary>
-        /// Indica se debba usare qty effettiva o indefinita (x nesting/schedulazione a capacita illimitata)
-        /// </summary>
-        public bool UseQty { get; set; } = false;
-
-        /// <summary>
-        /// DataOra ultimo aggiornamento dal cloud dei dati (in particolare giacenza)
-        /// </summary>
-        public DateTime LastSync { get; set; } = DateTime.Today.AddYears(-10); 
-
-#if false
-        [NotMapped]
-        public decimal LIn
-        {
-            get => Math.Round(LMm / (decimal)25.4, 3);
-        }
-        [NotMapped]
-        public decimal WIn
-        {
-            get => Math.Round(WMm / (decimal)25.4, 3);
-        }
-        [NotMapped]
-        public decimal HIn
-        {
-            get => Math.Round(HMm / (decimal)25.4, 3);
-        }
-
-        [NotMapped]
-        public decimal Area
-        {
-            get => LMm * WMm;
-        } 
-
-        [NotMapped]
-        public string ItemDtmx
-        {
-            get
-            {
-                string answ = $"MT99999999-{LMm * 1000:00000000}";
-                if (MaterialNav != null)
-                {
-                    answ = $"MT{MaterialNav.MatExtId:00000000}-{LMm * 1000:00000000}";
-                }
-                return answ;
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Navigation property to Material
-        /// </summary>
-        [ForeignKey("MatId")]
-        public virtual MaterialModel MaterialNav { get; set; }
-
-    }
-}

EgtBEAMWALL.DataLayer/DbConfig.cs

@@ -28,31 +28,14 @@ namespace EgtBEAMWALL.DataLayer
         #region Public Properties
 
         /// <summary>
-        /// DB Connection string per azioni amministrative:
-        /// aggiunto parametro "allow user variables", da https://forums.mysql.com/read.php?38,609672,610320#msg-610320
+        /// DB Connection string per azioni amministrative
         /// </summary>
         public static string ADMIN_CONNECTION_STRING { get; set; } = "";
 
         /// <summary>
-        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato 
-        /// DB Manu:    server=localhost;port=3306;database=EgtBwDb_000102;uid=root;pwd=Egalware_24068!;
-        /// DB Sam:     server=localhost;port=3306;database=EgtBwDb_000470;uid=root;pwd=Egalware_24068!;
-        /// DB Lovato:  server=localhost;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!;
-        /// 
-        /// DB RETE Lovato:     server=mdb.ufficio;port=3306;database=EgtBwDb_000656;uid=steamware;pwd=Egalware_24068!;
-        /// DB TET corelocal:   server=corelocal.egalware.com;port=3306;database=EgtBwDb_000999;uid=steamware;pwd=Egalware_24068!;
+        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;)
         /// </summary>
-        //public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000470;uid=root;pwd=Egalware_24068!;allow user variables=true";
-
-        //public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!;allow user variables=true";
-        //public static string CONNECTION_STRING { get; set; } = "server=corelocal.egalware.com;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!;allow user variables=true";
-        //public static string CONNECTION_STRING { get; set; } = "server=mdb.ufficio;port=3306;database=EgtBwDb_000656;uid=steamware;pwd=Egalware_24068!;allow user variables=true";
-
-        public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!;allow user variables=true";
-        //public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000102;uid=root;pwd=Egalware_24068!;allow user variables=true";
-        //public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000999;uid=root;pwd=Egalware_24068!;allow user variables=true";
-        //public static string CONNECTION_STRING { get; set; } = "server=corelocal.egalware.com;port=3306;database=EgtBwDb_000999;uid=root;pwd=Egalware_24068!;allow user variables=true";
-        //public static string CONNECTION_STRING { get; set; } = "server=mdb.ufficio;port=3306;database=EgtBwDb_000999;uid=steamware;pwd=Egalware_24068!;allow user variables=true";
+        public static string CONNECTION_STRING { get; set; } = "";
 
         #endregion Public Properties
 
@@ -90,10 +73,8 @@ namespace EgtBEAMWALL.DataLayer
         /// <returns></returns>
         public static bool CheckViews(string nKey, string sKey)
         {
-            return false;
-            // commento, scambiare con migrations da file?!?
-            //// esecuzione script di install locale
-            //return Controllers.DbController.man.refreshViews(DATABASE_NAME);
+            // esecuzione script di install locale
+            return Controllers.DbController.man.refreshViews(DATABASE_NAME);
         }
 
         /// <summary>
@@ -102,9 +83,9 @@ namespace EgtBEAMWALL.DataLayer
         /// <param name="zipFilePath">Percorso di salvataggio del dump (*.zip)</param>
         /// <param name="dbName">Nome del DB da processare (se vuoto quello di default calcolato)</param>
         /// <param name="mysqlDumpPath">Nome o Percorso Eseguibile mysqldump (opzionale)</param>
-        /// <param name="exportOpt">Opzioni in fase di export | default:  --add-drop-database --skip-extended-insert --hex-blob</param>
+        /// <param name="exportOpt">Opzioni in fase di export (default: --skip-extended-insert)</param>
         /// <returns></returns>
-        public static bool DataBaseDumpToFile(string zipFilePath, string dbName = "", string mysqlDumpPath = "mysqldump", string exportOpt = "--add-drop-database --skip-extended-insert --hex-blob")
+        public static bool DataBaseDumpToFile(string zipFilePath, string dbName = "", string mysqlDumpPath = "mysqldump", string exportOpt = "--skip-extended-insert")
         {
             bool fatto = false;
             // fix path eseguibile
@@ -138,16 +119,12 @@ namespace EgtBEAMWALL.DataLayer
             {
                 File.Delete(zipFilePath);
             }
-            // 2024.06.28 aggiunto  --hex-blob x dati binary
             // creazione SQL, tramite  script esterno... importante parametro "--skip-extended-insert" altrimenti problemi con restore (anche se + verboso e lento in backup...)
-            string callScript = $"\"{mysqlDumpPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} --databases {dbName} {exportOpt} > {tempSqlPath}";
+            string callScript = $"\"{mysqlDumpPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {dbName} {exportOpt} > {tempSqlPath}";
             ExecuteCommand(callScript);
             // compressione con pwd!
             using (ZipFile zip = new ZipFile())
             {
-                // non paiono necessarie x ripristino
-                //zip.CompressionMethod = CompressionMethod.BZip2;
-                //zip.UseUnicodeAsNecessary = true;
                 // aggiungo pwd
                 zip.Password = ZIP_PWD;
                 // inserisco file
@@ -272,9 +249,9 @@ namespace EgtBEAMWALL.DataLayer
             DATABASE_USER = $"user_{nKey}";
             DATABASE_PWD = $"pwd_{sKey}";
             ZIP_PWD = $"{DATABASE_USER}:{DATABASE_PWD}:{DATABASE_USER}:{DATABASE_PWD}";
-            CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};SslMode=None;allow user variables=true";
+            CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};SslMode=None";
             // stringa admin con utente root egalware...
-            ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;SslMode=none;CHARSET=utf8;allow user variables=true";
+            ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;SslMode=none;CHARSET=utf8";
         }
 
         /// <summary>

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -37,8 +37,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
@@ -46,53 +46,38 @@
     <Reference Include="EgtWPFLib5">
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="EgwProxy.MagMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgwProxy.MagMan.1.0.2408.514\lib\EgwProxy.MagMan.dll</HintPath>
-    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Protobuf, Version=3.27.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.27.0\lib\net45\Google.Protobuf.dll</HintPath>
+    <Reference Include="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+    <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
     </Reference>
-    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data, Version=8.4.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.4.0\lib\net462\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data.EntityFramework, Version=8.4.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.EntityFramework.8.4.0\lib\net462\MySql.Data.EntityFramework.dll</HintPath>
+    <Reference Include="MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.3.2\lib\net46\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="Renci.SshNet, Version=2024.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2024.0.0\lib\net462\Renci.SshNet.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=111.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.111.2.0\lib\net471\RestSharp.dll</HintPath>
+    <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -101,25 +86,18 @@
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
-    </Reference>
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+    <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
@@ -130,40 +108,24 @@
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.3\lib\net462\System.Text.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="ZstdSharp, Version=0.8.1.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
-      <HintPath>..\packages\ZstdSharp.Port.0.8.1\lib\net462\ZstdSharp.dll</HintPath>
+    <Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminContext.cs" />
-    <Compile Include="Controllers\MagmanSyncController.cs" />
-    <Compile Include="Controllers\MagmanController.cs" />
-    <Compile Include="Controllers\AliasController.cs" />
-    <Compile Include="Controllers\RawItemsController.cs" />
-    <Compile Include="Controllers\MaterialsController.cs" />
-    <Compile Include="DatabaseModels\AliasModel.cs" />
-    <Compile Include="DatabaseModels\MagmanSyncModel.cs" />
-    <Compile Include="DatabaseModels\MaterialModel.cs" />
-    <Compile Include="DatabaseModels\RawItemModel.cs" />
     <Compile Include="DatabaseModels\UserPrivModel.cs" />
     <Compile Include="DbConfig.cs" />
     <Compile Include="Controllers\LogMachineController.cs" />
@@ -225,62 +187,6 @@
     <Compile Include="Migrations\202308250853396_AddProjArchivedField.designer.cs">
       <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.cs" />
-    <Compile Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.designer.cs">
-      <DependentUpon>202401181534084_AddAliasMaterialRawItemsModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202401291722150_FixMatItemCloudId.cs" />
-    <Compile Include="Migrations\202401291722150_FixMatItemCloudId.designer.cs">
-      <DependentUpon>202401291722150_FixMatItemCloudId.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202401310830146_FixItemRemn.cs" />
-    <Compile Include="Migrations\202401310830146_FixItemRemn.designer.cs">
-      <DependentUpon>202401310830146_FixItemRemn.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202402141003461_RawItemAddUseQty.cs" />
-    <Compile Include="Migrations\202402141003461_RawItemAddUseQty.designer.cs">
-      <DependentUpon>202402141003461_RawItemAddUseQty.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202402290716188_AddProjCloudId.cs" />
-    <Compile Include="Migrations\202402290716188_AddProjCloudId.Designer.cs">
-      <DependentUpon>202402290716188_AddProjCloudId.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202403120645357_RawItemAddLastSync.cs" />
-    <Compile Include="Migrations\202403120645357_RawItemAddLastSync.Designer.cs">
-      <DependentUpon>202403120645357_RawItemAddLastSync.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202403120803297_AddMagmanSyncTab.cs" />
-    <Compile Include="Migrations\202403120803297_AddMagmanSyncTab.Designer.cs">
-      <DependentUpon>202403120803297_AddMagmanSyncTab.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202404261445205_UpdateLogMachineTable.cs" />
-    <Compile Include="Migrations\202404261445205_UpdateLogMachineTable.Designer.cs">
-      <DependentUpon>202404261445205_UpdateLogMachineTable.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202404261505131_UpdateLogMachineTable02.cs" />
-    <Compile Include="Migrations\202404261505131_UpdateLogMachineTable02.Designer.cs">
-      <DependentUpon>202404261505131_UpdateLogMachineTable02.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202404290906337_UpdateLogMachineTable03.cs" />
-    <Compile Include="Migrations\202404290906337_UpdateLogMachineTable03.Designer.cs">
-      <DependentUpon>202404290906337_UpdateLogMachineTable03.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202404291620416_UpdateLogMachineTable04.cs" />
-    <Compile Include="Migrations\202404291620416_UpdateLogMachineTable04.Designer.cs">
-      <DependentUpon>202404291620416_UpdateLogMachineTable04.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202406070826284_AddStoredProc01.cs" />
-    <Compile Include="Migrations\202406070826284_AddStoredProc01.Designer.cs">
-      <DependentUpon>202406070826284_AddStoredProc01.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202407170704518_AddProdDtLastMod.cs" />
-    <Compile Include="Migrations\202407170704518_AddProdDtLastMod.Designer.cs">
-      <DependentUpon>202407170704518_AddProdDtLastMod.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202408051054365_AddRawItemLogicalDelete.cs" />
-    <Compile Include="Migrations\202408051054365_AddRawItemLogicalDelete.Designer.cs">
-      <DependentUpon>202408051054365_AddRawItemLogicalDelete.cs</DependentUpon>
-    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils.cs" />
@@ -329,53 +235,6 @@
     <EmbeddedResource Include="Migrations\202308250853396_AddProjArchivedField.resx">
       <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.resx">
-      <DependentUpon>202401181534084_AddAliasMaterialRawItemsModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202401291722150_FixMatItemCloudId.resx">
-      <DependentUpon>202401291722150_FixMatItemCloudId.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202401310830146_FixItemRemn.resx">
-      <DependentUpon>202401310830146_FixItemRemn.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202402141003461_RawItemAddUseQty.resx">
-      <DependentUpon>202402141003461_RawItemAddUseQty.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202402290716188_AddProjCloudId.resx">
-      <DependentUpon>202402290716188_AddProjCloudId.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202403120645357_RawItemAddLastSync.resx">
-      <DependentUpon>202403120645357_RawItemAddLastSync.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202403120803297_AddMagmanSyncTab.resx">
-      <DependentUpon>202403120803297_AddMagmanSyncTab.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202404261445205_UpdateLogMachineTable.resx">
-      <DependentUpon>202404261445205_UpdateLogMachineTable.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202404261505131_UpdateLogMachineTable02.resx">
-      <DependentUpon>202404261505131_UpdateLogMachineTable02.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202404290906337_UpdateLogMachineTable03.resx">
-      <DependentUpon>202404290906337_UpdateLogMachineTable03.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202404291620416_UpdateLogMachineTable04.resx">
-      <DependentUpon>202404291620416_UpdateLogMachineTable04.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202406070826284_AddStoredProc01.resx">
-      <DependentUpon>202406070826284_AddStoredProc01.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202407170704518_AddProdDtLastMod.resx">
-      <DependentUpon>202407170704518_AddProdDtLastMod.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202408051054365_AddRawItemLogicalDelete.resx">
-      <DependentUpon>202408051054365_AddRawItemLogicalDelete.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="SqlScripts\Stored\stp_LogMachineFixPid.sql">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

EgtBEAMWALL.DataLayer/Migrations/202401181534084_AddAliasMaterialRawItemsModel.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddAliasMaterialRawItemsModel : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddAliasMaterialRawItemsModel));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202401181534084_AddAliasMaterialRawItemsModel"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202401181534084_AddAliasMaterialRawItemsModel.cs

@@ -1,63 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddAliasMaterialRawItemsModel : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.AliasList",
-                c => new
-                    {
-                        Family = c.String(nullable: false, maxLength: 128, storeType: "nvarchar"),
-                        ValueOriginal = c.String(nullable: false, maxLength: 128, storeType: "nvarchar"),
-                        ValueAlias = c.String(unicode: false),
-                    })
-                .PrimaryKey(t => new { t.Family, t.ValueOriginal });
-            
-            CreateTable(
-                "dbo.MaterialsList",
-                c => new
-                    {
-                        MatId = c.Int(nullable: false, identity: true),
-                        MatExtId = c.Int(nullable: false),
-                        MatCode = c.String(unicode: false),
-                        MatDesc = c.String(unicode: false),
-                        LMm = c.Decimal(nullable: false, precision: 18, scale: 2),
-                        WMm = c.Decimal(nullable: false, precision: 18, scale: 2),
-                        HMm = c.Decimal(nullable: false, precision: 18, scale: 2),
-                        RawItemIdLast = c.Int(nullable: false),
-                    })
-                .PrimaryKey(t => t.MatId);
-            
-            CreateTable(
-                "dbo.RawItemList",
-                c => new
-                    {
-                        RawItemId = c.Int(nullable: false, identity: true),
-                        MatId = c.Int(nullable: false),
-                        QtyAvail = c.Int(nullable: false),
-                        IsActive = c.Boolean(nullable: false),
-                        LMm = c.Decimal(nullable: false, precision: 18, scale: 2),
-                        WMm = c.Decimal(nullable: false, precision: 18, scale: 2),
-                        HMm = c.Decimal(nullable: false, precision: 18, scale: 2),
-                        Note = c.String(unicode: false),
-                    })
-                .PrimaryKey(t => t.RawItemId)
-                .ForeignKey("dbo.MaterialsList", t => t.MatId, cascadeDelete: true)
-                .Index(t => t.MatId);
-            
-        }
-        
-        public override void Down()
-        {
-            DropForeignKey("dbo.RawItemList", "MatId", "dbo.MaterialsList");
-            DropIndex("dbo.RawItemList", new[] { "MatId" });
-            DropTable("dbo.RawItemList");
-            DropTable("dbo.MaterialsList");
-            DropTable("dbo.AliasList");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202401291722150_FixMatItemCloudId.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class FixMatItemCloudId : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(FixMatItemCloudId));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202401291722150_FixMatItemCloudId"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202401291722150_FixMatItemCloudId.cs

@@ -1,22 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class FixMatItemCloudId : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.MaterialsList", "MatCloudId", c => c.Int(nullable: false));
-            AddColumn("dbo.RawItemList", "RawItemCloudId", c => c.Int(nullable: false));
-            DropColumn("dbo.MaterialsList", "MatExtId");
-        }
-        
-        public override void Down()
-        {
-            AddColumn("dbo.MaterialsList", "MatExtId", c => c.Int(nullable: false));
-            DropColumn("dbo.RawItemList", "RawItemCloudId");
-            DropColumn("dbo.MaterialsList", "MatCloudId");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202401310830146_FixItemRemn.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class FixItemRemn : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(FixItemRemn));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202401310830146_FixItemRemn"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202401310830146_FixItemRemn.cs

@@ -1,18 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class FixItemRemn : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.RawItemList", "IsRemn", c => c.Boolean(nullable: false));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.RawItemList", "IsRemn");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202402141003461_RawItemAddUseQty.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class RawItemAddUseQty : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(RawItemAddUseQty));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202402141003461_RawItemAddUseQty"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202402141003461_RawItemAddUseQty.cs

@@ -1,18 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class RawItemAddUseQty : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.RawItemList", "UseQty", c => c.Boolean(nullable: false));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.RawItemList", "UseQty");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202402290716188_AddProjCloudId.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddProjCloudId : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddProjCloudId));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202402290716188_AddProjCloudId"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202402290716188_AddProjCloudId.cs

@@ -1,20 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddProjCloudId : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.ProjList", "ProjCloudId", c => c.Int(nullable: false));
-            AddColumn("dbo.ProdList", "ProjCloudId", c => c.Int(nullable: false));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.ProdList", "ProjCloudId");
-            DropColumn("dbo.ProjList", "ProjCloudId");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202403120645357_RawItemAddLastSync.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class RawItemAddLastSync : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(RawItemAddLastSync));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202403120645357_RawItemAddLastSync"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202403120645357_RawItemAddLastSync.cs

@@ -1,18 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class RawItemAddLastSync : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.RawItemList", "LastSync", c => c.DateTime(nullable: false, precision: 0, defaultValueSql: "DATE('2000-01-01')"));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.RawItemList", "LastSync");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202403120803297_AddMagmanSyncTab.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddMagmanSyncTab : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddMagmanSyncTab));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202403120803297_AddMagmanSyncTab"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202403120803297_AddMagmanSyncTab.cs

@@ -1,30 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddMagmanSyncTab : DbMigration
-    {
-        public override void Up()
-        {
-            CreateTable(
-                "dbo.MagmanSync",
-                c => new
-                    {
-                        SyncId = c.Int(nullable: false, identity: true),
-                        SyncType = c.String(unicode: false),
-                        CloudId = c.Int(nullable: false),
-                        DtReq = c.DateTime(nullable: false, precision: 0),
-                        DtExe = c.DateTime(precision: 0),
-                        Payload = c.String(unicode: false),
-                    })
-                .PrimaryKey(t => t.SyncId);
-            
-        }
-        
-        public override void Down()
-        {
-            DropTable("dbo.MagmanSync");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404261445205_UpdateLogMachineTable.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class UpdateLogMachineTable : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateLogMachineTable));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202404261445205_UpdateLogMachineTable"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404261445205_UpdateLogMachineTable.cs

@@ -1,42 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class UpdateLogMachineTable : DbMigration
-    {
-        public override void Up()
-        {
-            RenameColumn("dbo.LogMachine", "ResultType", "EvType");
-            RenameColumn("dbo.LogMachine", "AlarmDtEvent", "DtEvent");
-            RenameColumn("dbo.LogMachine", "VarAddress", "SupervId");
-            AddColumn("dbo.LogMachine", "DtSent", c => c.DateTime(nullable: false, precision: 0, defaultValueSql: "DATE('1900-01-01')"));
-            DropColumn("dbo.LogMachine", "AlarmCode");
-            DropColumn("dbo.LogMachine", "AlarmMessage");
-            DropColumn("dbo.LogMachine", "AlarmOperation");
-            DropColumn("dbo.LogMachine", "AlarmType");
-            DropColumn("dbo.LogMachine", "CommExecuted");
-            DropColumn("dbo.LogMachine", "CommandState");
-            DropColumn("dbo.LogMachine", "CommandType");
-            DropColumn("dbo.LogMachine", "Description");
-            DropColumn("dbo.LogMachine", "NewOpState");
-        }
-        
-        public override void Down()
-        {
-            RenameColumn("dbo.LogMachine", "EvType", "ResultType");
-            RenameColumn("dbo.LogMachine", "DtEvent", "AlarmDtEvent");
-            RenameColumn("dbo.LogMachine", "SupervId", "VarAddress");
-            DropColumn("dbo.LogMachine", "DtSent");
-            AddColumn("dbo.LogMachine", "NewOpState", c => c.Int(nullable: false));
-            AddColumn("dbo.LogMachine", "Description", c => c.String(unicode: false));
-            AddColumn("dbo.LogMachine", "CommandType", c => c.Int(nullable: false));
-            AddColumn("dbo.LogMachine", "CommandState", c => c.Int(nullable: false));
-            AddColumn("dbo.LogMachine", "CommExecuted", c => c.Boolean(nullable: false));
-            AddColumn("dbo.LogMachine", "AlarmType", c => c.Int(nullable: false));
-            AddColumn("dbo.LogMachine", "AlarmOperation", c => c.Int(nullable: false));
-            AddColumn("dbo.LogMachine", "AlarmMessage", c => c.String(unicode: false));
-            AddColumn("dbo.LogMachine", "AlarmCode", c => c.String(unicode: false));
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404261505131_UpdateLogMachineTable02.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class UpdateLogMachineTable02 : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateLogMachineTable02));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202404261505131_UpdateLogMachineTable02"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404261505131_UpdateLogMachineTable02.cs

@@ -1,18 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class UpdateLogMachineTable02 : DbMigration
-    {
-        public override void Up()
-        {
-            AlterColumn("dbo.LogMachine", "DtSent", c => c.DateTime(precision: 0));
-        }
-        
-        public override void Down()
-        {
-            AlterColumn("dbo.LogMachine", "DtSent", c => c.DateTime(nullable: false, precision: 0));
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404290906337_UpdateLogMachineTable03.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class UpdateLogMachineTable03 : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateLogMachineTable03));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202404290906337_UpdateLogMachineTable03"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404290906337_UpdateLogMachineTable03.cs

@@ -1,18 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class UpdateLogMachineTable03 : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.LogMachine", "ProdId", c => c.Int(nullable: false, defaultValue: 0, defaultValueSql: "0"));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.LogMachine", "ProdId");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404291620416_UpdateLogMachineTable04.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class UpdateLogMachineTable04 : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateLogMachineTable04));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202404291620416_UpdateLogMachineTable04"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202404291620416_UpdateLogMachineTable04.cs

@@ -1,18 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class UpdateLogMachineTable04 : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.LogMachine", "ProjCloudId", c => c.Int(nullable: false, defaultValue: 0, defaultValueSql: "0"));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.LogMachine", "ProjCloudId");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202406070826284_AddStoredProc01.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddStoredProc01 : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddStoredProc01));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202406070826284_AddStoredProc01"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202406070826284_AddStoredProc01.cs

@@ -1,36 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using Mysqlx.Crud;
-    using System;
-    using System.Data.Entity.Migrations;
-    using System.IO;
-    using System.Reflection;
-
-    public partial class AddStoredProc01 : DbMigration
-    {
-        public override void Up()
-        {
-            // aggiunta stored
-            addStored("stp_LogMachineFixPid");
-        }
-
-        public override void Down()
-        {
-            // rimozione stored
-            remStored("stp_LogMachineFixPid");
-        }
-
-        private void addStored(string objName)
-        {
-            string path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "SqlScripts", "Stored", $"{objName}.sql");
-            string sqlBody = File.ReadAllText(path);
-            Sql(sqlBody);
-        }
-
-        private void remStored(string objName)
-        {
-            string sqlBody = $"DROP PROCEDURE IF EXISTS {objName};";
-            Sql(sqlBody);
-        } 
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202407170704518_AddProdDtLastMod.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddProdDtLastMod : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddProdDtLastMod));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202407170704518_AddProdDtLastMod"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202407170704518_AddProdDtLastMod.cs

@@ -1,20 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddProdDtLastMod : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.ProdList", "DtLastMod", c => c.DateTime(nullable: false, precision: 0, defaultValueSql: "DATE('1900-01-01')"));
-            CreateIndex("dbo.ProdList", "DtLastMod");
-        }
-        
-        public override void Down()
-        {
-            DropIndex("dbo.ProdList", new[] { "DtLastMod" });
-            DropColumn("dbo.ProdList", "DtLastMod");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202408051054365_AddRawItemLogicalDelete.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddRawItemLogicalDelete : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddRawItemLogicalDelete));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202408051054365_AddRawItemLogicalDelete"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202408051054365_AddRawItemLogicalDelete.cs

@@ -1,18 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddRawItemLogicalDelete : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.RawItemList", "IsDeleted", c => c.Boolean(nullable: false, defaultValue: false, defaultValueSql: "0"));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.RawItemList", "IsDeleted");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.12.2")]
-[assembly: AssemblyFileVersion("2.5.12.2")]
+[assembly: AssemblyVersion("2.5.8.1")]
+[assembly: AssemblyFileVersion("2.5.8.1")]

EgtBEAMWALL.DataLayer/SqlScripts/Stored/stp_LogMachineFixPid.sql

@@ -1,26 +0,0 @@
-DROP PROCEDURE IF EXISTS stp_LogMachineFixPid;
-
-CREATE PROCEDURE stp_LogMachineFixPid()
-LANGUAGE SQL
-NOT DETERMINISTIC
-CONTAINS SQL
-SQL SECURITY DEFINER
-COMMENT 'Procedura sistemazione dati LogMachine per ProdId e ProjCloudId'
-BEGIN
-
-	# Step 1: Per prima cosa aggiorno il valore di ProdId dove mancasse
-	UPDATE	LogMachine
-	SET		ProdId = SUBSTRING(VarValue, 1, POSITION(';' IN VarValue)-1)
-	WHERE 	ProdId = 0
-		AND	(EvType = 1 OR EvType=2);
-	
-	# Step 2: aggiorno il CloudId dove mancasse
-	UPDATE 		LogMachine LM
-		INNER JOIN prodlist PL ON LM.ProdId = PL.Id
-	SET		LM.ProjCloudId = PL.ProjCloudId
-	WHERE 	(LM.EvType = 1 OR LM.EvType=2)
-				AND LM.ProjCloudId = 0
-				AND PL.ProjCloudId > 0;
-
-
-END;

EgtBEAMWALL.DataLayer/packages.config

@@ -1,33 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle.Cryptography" version="2.4.0" targetFramework="net472" />
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
   <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
-  <package id="EgwProxy.MagMan" version="1.0.2408.514" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
-  <package id="Google.Protobuf" version="3.27.0" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net472" />
+  <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
+  <package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net472" />
+  <package id="K4os.Compression.LZ4.Streams" version="1.3.5" targetFramework="net472" />
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.1" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.1" targetFramework="net472" />
-  <package id="MySql.Data" version="8.4.0" targetFramework="net472" />
-  <package id="MySql.Data.EntityFramework" version="8.4.0" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
-  <package id="NLog" version="5.3.2" targetFramework="net472" />
+  <package id="MySql.Data" version="8.0.21" targetFramework="net472" />
+  <package id="MySql.Data.EntityFramework" version="8.0.21" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="NLog" version="5.0.1" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
-  <package id="RestSharp" version="111.2.0" targetFramework="net472" />
-  <package id="SSH.NET" version="2024.0.0" targetFramework="net472" />
+  <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net472" />
-  <package id="System.IO.Pipelines" version="8.0.0" targetFramework="net472" />
+  <package id="System.IO.Pipelines" version="5.0.2" targetFramework="net472" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
-  <package id="System.Text.Json" version="8.0.3" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-  <package id="ZstdSharp.Port" version="0.8.1" targetFramework="net472" />
 </packages>

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -143,8 +143,8 @@
       <HintPath>..\ExtLibs\APServer.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
-      <HintPath>..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="Csv, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Csv.1.0.31\lib\net40\Csv.dll</HintPath>
@@ -160,9 +160,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="EgwProxy.MagMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgwProxy.MagMan.1.0.2407.1708\lib\EgwProxy.MagMan.dll</HintPath>
-    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
@@ -172,8 +169,8 @@
     <Reference Include="FluentFTP, Version=19.2.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentFTP.19.2.2\lib\net45\FluentFTP.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Protobuf, Version=3.27.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.27.0\lib\net45\Google.Protobuf.dll</HintPath>
+    <Reference Include="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="Interop.FXLog">
       <HintPath>..\ExtLibs\Interop.FXLog.dll</HintPath>
@@ -186,42 +183,36 @@
     <Reference Include="ISOCNC.Remoting">
       <HintPath>..\ExtLibs\ISOCNC.Remoting.dll</HintPath>
     </Reference>
-    <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+    <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
     </Reference>
-    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.DotNet.PlatformAbstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyModel.8.0.0\lib\net462\Microsoft.Extensions.DependencyModel.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyModel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyModel.2.1.0\lib\net451\Microsoft.Extensions.DependencyModel.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=8.4.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.4.0\lib\net462\MySql.Data.dll</HintPath>
+    <Reference Include="MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.EntityFramework, Version=8.4.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.EntityFramework.8.4.0\lib\net462\MySql.Data.EntityFramework.dll</HintPath>
+    <Reference Include="MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.3.2\lib\net46\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="Renci.SshNet, Version=2024.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2024.0.0\lib\net462\Renci.SshNet.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp, Version=111.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.111.2.0\lib\net471\RestSharp.dll</HintPath>
+    <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+      <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="SdkApi.Core, Version=2.15.2634.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\SdkApi.Core.dll</HintPath>
@@ -232,8 +223,8 @@
     <Reference Include="SdkApi.Desktop.Usb, Version=2.15.2634.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\SdkApi.Desktop.Usb.dll</HintPath>
     </Reference>
-    <Reference Include="SharpSnmpLib, Version=12.1.0.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lextm.SharpSnmpLib.12.1.0\lib\net471\SharpSnmpLib.dll</HintPath>
+    <Reference Include="SharpSnmpLib, Version=10.0.9.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lextm.SharpSnmpLib.10.0.9\lib\net452\SharpSnmpLib.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -246,25 +237,18 @@
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
-    </Reference>
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+    <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>
       <Private>True</Private>
@@ -279,30 +263,20 @@
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.3\lib\net462\System.Text.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -318,6 +292,9 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -325,11 +302,8 @@
     <Reference Include="ZebraPrinterSdk, Version=2.15.2634.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\ZebraPrinterSdk.dll</HintPath>
     </Reference>
-    <Reference Include="ZstdNet, Version=1.4.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.31\lib\net452\ZstdNet.dll</HintPath>
-    </Reference>
-    <Reference Include="ZstdSharp, Version=0.8.1.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
-      <HintPath>..\packages\ZstdSharp.Port.0.8.1\lib\net462\ZstdSharp.dll</HintPath>
+    <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml

@@ -156,13 +156,6 @@
                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
-         <!--WAREHOUSEMAT - Warehouse Materiale-->
-         <DataGridTextColumn x:Key="colWAREHOUSEMATERIAL" Binding="{Binding sWAREHOUSEMATERIAL}">
-            <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.MAT_Msg,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
-            </DataGridTextColumn.Header>
-         </DataGridTextColumn>
          <!--GRP - Gruppo-->
          <DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
             <DataGridTextColumn.Header>

EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb

@@ -1,7 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class PartInRawPartListVM
 
@@ -143,6 +142,10 @@ Public Class PartInRawPartListVM
       m_colPartInRawPart_Flip = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_FLIP)
       m_colPartInRawPart_PosX = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSX)
       m_colPartInRawPart_PosY = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSY)
+      ' aggiorno la visibilità delle colonne
+      For Each col In PartInRawPartColumns
+         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+      Next
       ' nascondo colonna redo
       If Not IsNothing(colPartInRawPart_Redo) Then
          colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
@@ -152,20 +155,14 @@ Public Class PartInRawPartListVM
 #End Region    ' CONSTRUCTOR
 
    Friend Sub UpdateColumns(nMachType As MachineType)
-      ' aggiorno la visibilità delle colonne
-      For Each col In PartInRawPartColumns
-         If col.Name = COL_MATERIAL Then
-            col.Visible = GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) = 0
-         ElseIf col.Name = COL_WAREHOUSEMATERIAL Then
-            col.Visible = GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) > 0
-         Else
-            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-         End If
-      Next
       If nMachType = MachineType.BEAM Then
          If Not IsNothing(m_colPartInRawPart_Offset) Then
             m_colPartInRawPart_Offset.ColumnVisibility = Visibility.Visible
          End If
+         ' aggiorno la visibilità delle colonne
+         For Each col In PartInRawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
          If Not IsNothing(colPartInRawPart_Redo) Then
             colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
          End If
@@ -196,6 +193,10 @@ Public Class PartInRawPartListVM
          If Not IsNothing(m_colPartInRawPart_PosY) Then
             m_colPartInRawPart_PosY.ColumnVisibility = Visibility.Visible
          End If
+         ' aggiorno la visibilità delle colonne
+         For Each col In PartInRawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
          If Not IsNothing(colPartInRawPart_Redo) Then
             colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
          End If

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml

@@ -98,13 +98,6 @@
                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
-         <!--WAREHOUSEMAT - Warehouse Materiale-->
-         <DataGridTextColumn x:Key="colWAREHOUSEMATERIAL" Binding="{Binding sWAREHOUSEMATERIAL}">
-            <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.Material_Msg,
-                                         RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>
-            </DataGridTextColumn.Header>
-         </DataGridTextColumn>
          <!--% - % utilizzo-->
          <DataGridTextColumn x:Key="colUSAGE" Binding="{Binding sUsage}" SortMemberPath="dUsage">
             <DataGridTextColumn.Header>

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml.vb

@@ -219,7 +219,6 @@ Friend Class MyComparer
                Return 0
             End If
       End Select
-      Return 0
    End Function
 
 End Class

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb

@@ -1,7 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
-Imports EgtWPFLib5
 
 Public Class RawPartListVM
 
@@ -117,17 +116,11 @@ Public Class RawPartListVM
 #End Region    ' CONSTRUCTOR
 
    Friend Sub UpdateColumns(nMachType As MachineType)
-      ' aggiorno la visibilità delle colonne
-      For Each col In RawPartColumns
-         If col.Name = COL_MATERIAL Then
-            col.Visible = GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) = 0
-         ElseIf col.Name = COL_WAREHOUSEMATERIAL Then
-            col.Visible = GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) > 0
-         Else
-            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-         End If
-      Next
       If nMachType = MachineType.BEAM Then
+         ' aggiorno la visibilità delle colonne
+         For Each col In RawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
          If Not IsNothing(m_colRawPart_StartCut) Then
             m_colRawPart_StartCut.ColumnVisibility = Visibility.Visible
          End If
@@ -137,6 +130,10 @@ Public Class RawPartListVM
          'RawPartColumns.Clear()
          'GetPrivateProfileColumns(S_RAWPARTLIST_BEAM, RawPartColumns)
       ElseIf nMachType = MachineType.WALL Then
+         ' aggiorno la visibilità delle colonne
+         For Each col In RawPartColumns
+            col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+         Next
          If Not IsNothing(m_colRawPart_StartCut) Then
             m_colRawPart_StartCut.ColumnVisibility = Visibility.Collapsed
          End If

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -437,10 +437,6 @@ Public Class LeftPanelVM
                                                          New OPState("Reset", OPStates.End),
                                                          New OPState("Unspecified", OPStates.Unspecified)
          }
-         Case Else
-            m_OPStateList = New List(Of OPState) From {
-                                                         New OPState("Unspecified", OPStates.Unspecified)
-         }
       End Select
       ' seleziono in partenza unspecified
       Dim UnspecifiedState As OPState = m_OPStateList.FirstOrDefault(Function(x) x.Id = OPStates.Unspecified)
@@ -558,7 +554,6 @@ Public Class LeftPanelVM
          Dim Part As PartVM = SelMachGroup.PartVMList(PartIndex)
          SetDonePart(SelMachGroup, Part)
       Next
-
       ' riseleziono il gruppo
       Map.refSupervisorMachGroupPanelVM.SelectedMachGroup = SelMachGroup
       ' aggiorno bottoni
@@ -871,25 +866,6 @@ Public Class LeftPanelVM
          Part.nProduction_State = ItemState.Produced
          ' scrivo evento fine pezzo su DB
          DbControllers.m_LogMachineController.Create(LogEvent.CreatePartStateLog(Time, Map.refSupervisorManagerVM.CurrProd.nProdId, MachGroup.Id, Part.nPartId, 2, DbControllers.SupervisorId))
-         ' se attivo magazzino web, e primo pezzo della barra, aggiorno utilizzo barra da magazzino
-         If GetMainPrivateProfileInt(S_WAREHOUSE, K_NETWAREHOUSE, 0) = 1 AndAlso MachGroup.PartVMList(0).nPartId = Part.nPartId AndAlso MachGroup.nProduction_State <> ItemState.Scrapped Then
-            ' Dim nMaterialId As Integer
-            'If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM Then
-            '   ' nMaterialId = DbControllers.m_MaterialsController.Insert(New MaterialM(MachGroup.dW, MachGroup.dH, 0, MachGroup.sMATERIAL, MachGroup.sWAREHOUSEMATERIAL))
-            '   nMaterialId = DbControllers.m_MaterialsController.Insert(MachGroup.RawPartM.Material)
-            'ElseIf Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL Then
-            '   nMaterialId = DbControllers.m_MaterialsController.Insert(New MaterialM(0, MachGroup.dH, 0, MachGroup.sMATERIAL, MachGroup.sWAREHOUSEMATERIAL))
-            'End If
-            'Dim RawPartList = DbControllers.m_RawItemsController.GetFilt(nMaterialId)
-            'Dim RawPart As RawPartM = RawPartList.FirstOrDefault(Function(x) x.dL = MachGroup.dL AndAlso x.Material.dW = MachGroup.dW AndAlso x.Material.dH = MachGroup.dH AndAlso x.Material.sWarehouseMaterial = MachGroup.sWAREHOUSEMATERIAL)
-            'Dim RawDictionary As New Dictionary(Of Integer, Integer)
-            'RawDictionary.Add(RawPart.nId, 1)
-            Dim RawDictionary As New Dictionary(Of Integer, Integer)
-            RawDictionary.Add(MachGroup.MyMachGroupM.RawPartM.nId, 1)
-            ' forzo aggiornamento eventuali dati non inviati su Db
-            DbControllers.m_MagmanController.ForceSyncroSend()
-            DbControllers.m_MagmanController.ResourceSendCons(Map.refSupervisorManagerVM.CurrProd.ProdFileM.nProjCloudId, RawDictionary)
-         End If
          If MachGroup.PartVMList.All(Function(x) x.nProduction_State >= ItemState.Produced) Then
             'aggiorno anche fine MachGroup
             DbControllers.m_MachGroupController.UpdateEnd(Map.refSupervisorManagerVM.CurrProd.nProdId, MachGroup.Id, Time)
@@ -1062,7 +1038,7 @@ Public Class LeftPanelVM
       sFileText.Add("Var1=$PRODID$," & Map.refSupervisorManagerVM.CurrProd.sProdId)
       sFileText.Add("Var2=$MACHGROUPID$," & SelMachGroup.nName)
       sFileText.Add("Var3=$PARTID$," & SelPart.nPDN)
-      sFileText.Add("Var4=$MATERIAL$," & SelPart.MaterialM.sMaterial)
+      sFileText.Add("Var4=$MATERIAL$," & SelPart.sMATERIAL)
       bOk = EgtGetInfo(nBtlInfoId, BTL_GEN_PROJNUM, sInfo)
       sFileText.Add("Var5=$PROJECTNUMBER$," & If(bOk, sInfo, ""))
       bOk = EgtGetInfo(nBtlInfoId, BTL_GEN_PROJNAME, sInfo)

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -10,9 +10,6 @@ Public Class MyMachGroupPanelVM
 
 #Region "FIELDS & PROPERTIES"
 
-   ' lista dei RawPart presenti su db
-   Private m_RawPartDbList As New List(Of RawPartM)
-
    Public Shadows Property SelectedMachGroup As MachGroupVM
       Get
          Return m_SelectedMachGroup
@@ -51,7 +48,6 @@ Public Class MyMachGroupPanelVM
             MachGroup.UpdateUsage()
          End If
       Next
-      ReadAllRawPartFromDb()
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -133,93 +129,6 @@ Public Class MyMachGroupPanelVM
       End If
    End Sub
 
-   Friend Sub ReadAllRawPartFromDb()
-      m_RawPartDbList.Clear()
-      ' aggiornamento materiale
-      For Each MachGroup As MyMachGroupVM In Map.refMachGroupPanelVM.m_MachGroupVMList
-         If IsNothing(MachGroup.MyMachGroupM.RawPartM) OrElse MachGroup.MyMachGroupM.RawPartM.nId = 0 OrElse MachGroup.MyMachGroupM.RawPartM.Material.nId = 0 OrElse String.IsNullOrWhiteSpace(MachGroup.MyMachGroupM.RawPartM.Material.sWarehouseMaterial) Then
-            ReadRawPartFromDb(MachGroup, True)
-         End If
-      Next
-      m_RawPartDbList.Clear()
-   End Sub
-
-   Friend Sub ReadRawPartFromDb(MachGroup As MyMachGroupVM, Optional bUseList As Boolean = False)
-      If Not IsNothing(MachGroup.MyMachGroupM.RawPartM) AndAlso MachGroup.MyMachGroupM.RawPartM.nId > 0 AndAlso MachGroup.MyMachGroupM.RawPartM.Material.nId > 0 AndAlso Not String.IsNullOrWhiteSpace(MachGroup.MyMachGroupM.RawPartM.Material.sWarehouseMaterial) Then Return
-      ' aggiornamento materiale
-      Dim RawPart As RawPartM = Nothing
-      If bUseList Then
-         RawPart = m_RawPartDbList.FirstOrDefault(Function(x) x.Material.sMaterial = MachGroup.RawPartM.Material.sMaterial AndAlso x.Material.dW = MachGroup.dW AndAlso x.Material.dH = MachGroup.dH AndAlso x.Material.dL = MachGroup.dL)
-      End If
-      If Not IsNothing(RawPart) Then
-         MachGroup.MyMachGroupM.RawPartM.Material.SetId(RawPart.Material.nId)
-         MachGroup.MyMachGroupM.RawPartM.Material.SetWarehouseMaterial(RawPart.Material.sWarehouseMaterial)
-         MachGroup.MyMachGroupM.RawPartM.SetId(RawPart.nId)
-         For Each Part In MachGroup.PartVMList
-            Part.MaterialM.SetId(RawPart.Material.nId)
-            Part.MaterialM.SetWarehouseMaterial(RawPart.Material.sWarehouseMaterial)
-         Next
-      Else
-         Dim Material As MaterialM = Nothing
-         Dim SearchMaterial As DataLayer.Controllers.MaterialsController.SearchResult = DbControllers.m_MaterialsController.SearchFilt(MachGroup.RawPartM.Material.sMaterial)
-         Select Case SearchMaterial.Tipo
-            Case DataLayer.Controllers.MaterialsController.SearchResult.TypeFound.ALIAS, DataLayer.Controllers.MaterialsController.SearchResult.TypeFound.MATERIAL
-               If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM Then
-                  Material = SearchMaterial.Result.FirstOrDefault(Function(x) x.dW = MachGroup.dW AndAlso x.dH = MachGroup.dH)
-               ElseIf Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL Then
-                  Material = SearchMaterial.Result.FirstOrDefault(Function(x) x.dH = MachGroup.dH)
-               End If
-            Case Else
-               EgtOutLog("Error! MachGroup material not found!!")
-               If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM Then
-                  Material = New MaterialM(MachGroup.dW, MachGroup.dH, 0, 0, MachGroup.sMATERIAL)
-               ElseIf Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL Then
-                  Material = New MaterialM(0, MachGroup.dH, 0, 0, MachGroup.sMATERIAL)
-               End If
-         End Select
-         Dim SearchRawPart As List(Of RawPartM) = DbControllers.m_RawItemsController.GetFilt(Material.nId)
-         If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM Then
-            RawPart = SearchRawPart.FirstOrDefault(Function(x) x.Material.dW = MachGroup.dW AndAlso x.Material.dH = MachGroup.dH AndAlso x.dL = MachGroup.dL)
-         ElseIf Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL Then
-            RawPart = SearchRawPart.FirstOrDefault(Function(x) x.dW = MachGroup.dW AndAlso x.Material.dH = MachGroup.dH AndAlso x.Material.dL = MachGroup.dL)
-         End If
-         If Not IsNothing(RawPart) Then
-            MachGroup.MyMachGroupM.RawPartM.Material.SetId(RawPart.Material.nId)
-            MachGroup.MyMachGroupM.RawPartM.Material.SetWarehouseMaterial(RawPart.Material.sWarehouseMaterial)
-            MachGroup.MyMachGroupM.RawPartM.SetId(RawPart.nId)
-            For Each Part In MachGroup.PartVMList
-               Part.MaterialM.SetId(RawPart.Material.nId)
-               Part.MaterialM.SetWarehouseMaterial(RawPart.Material.sWarehouseMaterial)
-            Next
-         Else
-            Dim nRawPartId As Integer = DbControllers.m_RawItemsController.Upsert(New RawPartM(Material, MachGroup.dW, MachGroup.dL, 0, False))
-            If nRawPartId > 0 Then
-               SearchRawPart = DbControllers.m_RawItemsController.GetFilt(Material.nId)
-               If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM Then
-                  RawPart = SearchRawPart.FirstOrDefault(Function(x) x.Material.dW = MachGroup.dW AndAlso x.Material.dH = MachGroup.dH AndAlso x.dL = MachGroup.dL)
-               ElseIf Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL Then
-                  RawPart = SearchRawPart.FirstOrDefault(Function(x) x.dW = MachGroup.dW AndAlso x.Material.dH = MachGroup.dH AndAlso x.dL = MachGroup.dL)
-               End If
-               If IsNothing(RawPart) Then
-                  EgtOutLog("Error! MachGroup material not found!!")
-                  RawPart = New RawPartM(Material, MachGroup.dW, MachGroup.dL, 0, False)
-               End If
-               MachGroup.MyMachGroupM.RawPartM.Material.SetId(RawPart.Material.nId)
-               MachGroup.MyMachGroupM.RawPartM.Material.SetWarehouseMaterial(RawPart.Material.sWarehouseMaterial)
-               MachGroup.MyMachGroupM.RawPartM.SetId(RawPart.nId)
-               For Each Part In MachGroup.PartVMList
-                  Part.MaterialM.SetId(RawPart.Material.nId)
-                  Part.MaterialM.SetWarehouseMaterial(RawPart.Material.sWarehouseMaterial)
-               Next
-            End If
-         End If
-         If bUseList Then
-            m_RawPartDbList.AddRange(SearchRawPart)
-            m_RawPartDbList = m_RawPartDbList.Distinct().ToList()
-         End If
-      End If
-   End Sub
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -85,12 +85,6 @@ Public Class MyMachGroupVM
 
    Sub New(MyMachGroupM As MyMachGroupM)
       MyBase.New(MyMachGroupM)
-      ' aggiungo RawPartM
-      If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM Then
-         MyMachGroupM.RawPartM = New RawPartM(New MaterialM(Math.Min(MyMachGroupM.dW, MyMachGroupM.dH), Math.Max(MyMachGroupM.dW, MyMachGroupM.dH), 0, MyMachGroupM.sMATERIAL), 0, MyMachGroupM.dL)
-      Else
-         MyMachGroupM.RawPartM = New RawPartM(New MaterialM(0, MyMachGroupM.dH, 0, MyMachGroupM.sMATERIAL), MyMachGroupM.dW, MyMachGroupM.dL)
-      End If
    End Sub
 
 #End Region    ' CONSTRUCTORS
@@ -323,7 +317,6 @@ Public Class MyMachGroupVM
          ' segno pezzo da produrre
          MachGroup.m_bToBeProduced = True
          MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Production_Background))
-         Map.refSupervisorMachGroupPanelVM.MachGroupVMList_View.Refresh()
 
          ' sposto MachGroup in lista come ultimo dei pronti da produrre
          Dim OldIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(MachGroup)