Correzione naming e nuova dll sync

- sync stato cancellato
- fix upsert a fine modifica magazzino che riporta a zero cloudID

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -316,13 +316,12 @@ Public Class BTLFeatureM
    End Function
 
    Public Shared Function CreateBTLFeature(nPRC As Integer, nGRP As Integer, nSIDE As Integer) As BTLFeatureM
-      Dim NewBTLFeature As New BTLFeatureM With {
-         .m_nPRC = nPRC,
-         .m_nSelGRP = nGRP,
-         .m_nSelSIDE = nSIDE,
-         .m_nPriority = 0,
-         .m_bDO = True
-      }
+      Dim NewBTLFeature As New BTLFeatureM
+      NewBTLFeature.m_nPRC = nPRC
+      NewBTLFeature.m_nSelGRP = nGRP
+      NewBTLFeature.m_nSelSIDE = nSIDE
+      NewBTLFeature.m_nPriority = 0
+      NewBTLFeature.m_bDO = True
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature
@@ -549,7 +548,7 @@ Public Class BTLFeatureM
          EgtSetInfo( nFeatureId, BTL_FTR_PRIORITY, nPriority)
          SetFeatureId(nFeatureId)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(ParentPart.nPartId)
+         EgtDuploSetModified(ParentPart.nPartId)
          bOk = True
       Else
          ' Impossibile creare una feature con questi valori - ERRORE

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -178,6 +178,16 @@ 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
@@ -922,6 +932,7 @@ 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
@@ -1242,7 +1253,7 @@ Public Class BTLPartM
          m_nROTATED = If(dNewRotation >= 0, dNewRotation, 360 + dNewRotation)
          EgtSetInfo(nPartId, BTL_PRT_ROTATED, m_nROTATED)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
       ' se era invertito
       If bInverted Then
@@ -1275,7 +1286,7 @@ Public Class BTLPartM
          m_nINVERTED = If(m_nINVERTED = 0, 180, 0)
          EgtSetInfo(nPartId, BTL_PRT_INVERTED, m_nINVERTED)
          ' imposto modificato per copie
-         MyMachGroupPanelM.SetDuploModified(nPartId)
+         EgtDuploSetModified(nPartId)
       End If
    End Sub
 

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -264,9 +264,6 @@ Public Class BTLFeatureVM
       End If
    End Sub
 
-   Public Overridable Sub RefreshFeature()
-   End Sub
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml

@@ -1,155 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="BeamMachiningsWindowV"
-                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
-                            Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize"
-                            Width="500" Height="450"
-                            IsResizable="False"
-                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-                            CloseCommand="{Binding Close_Command,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-
-   <Grid Margin="5,5,5,0">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      
-      <TabControl ItemsSource="{Binding MachiningList}"
-                  SelectedItem="{Binding SelMachining}"
-                  IsSynchronizedWithCurrentItem="True"
-                  Margin="5,0,5,0"
-                  Style="{StaticResource TabControl_OnlyHeaders}"/>
-
-      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-                               ItemsSource="{Binding TableRowList}"
-                               SelectedIndex="{Binding SelRowIndex}"
-                               AutoGenerateColumns="False"
-                               CanUserResizeRows="False"
-                               SelectionMode="Single"
-                               ScrollViewer.CanContentScroll="True" 
-                               ScrollViewer.VerticalScrollBarVisibility="Auto"
-                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                               Margin="0,0,0,5"
-                               BindingColumns="{Binding BeamMachiningsColumns}">
-         
-         <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
-               <Setter Property="Height" Value="25"/>
-               <Setter Property="VerticalContentAlignment" Value="Center"/>
-            </Style>
-         </DataGrid.RowStyle>
-
-         <DataGrid.Resources>
-            <Style x:Key="DataGridCheckBoxColumn_Style"
-                   TargetType="{x:Type DataGridCell}">
-               <Setter Property="Template">
-                  <Setter.Value>
-                     <ControlTemplate TargetType="{x:Type DataGridCell}">
-                        <Grid Background="{TemplateBinding Background}">
-                           <ContentPresenter VerticalAlignment="Center" />
-                        </Grid>
-                     </ControlTemplate>
-                  </Setter.Value>
-               </Setter>
-            </Style>
-            
-            <!--Colonna On-->
-            <DataGridCheckBoxColumn x:Key="colON" Binding="{Binding OnPar, UpdateSourceTrigger=PropertyChanged}"
-                                    CellStyle="{StaticResource DataGridCheckBoxColumn_Style}">
-               <DataGridCheckBoxColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.OnHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-               </DataGridCheckBoxColumn.Header>
-            </DataGridCheckBoxColumn>
-
-            <!--Colonna Name-->
-            <DataGridTemplateColumn x:Key="colNAME">
-               <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.NameHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-               </DataGridTemplateColumn.Header>
-               <DataGridTemplateColumn.CellEditingTemplate>
-                  <DataTemplate>
-                     <ComboBox IsEditable="False" 
-                               SelectedItem="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                               ItemsSource="{Binding Path=NamesList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellEditingTemplate>
-               <DataGridTemplateColumn.CellTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                VerticalAlignment="Center"
-                                Margin="5,0,0,0"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-
-            <!--Colonna Style-->
-            <DataGridTemplateColumn x:Key="colTYPE">
-               <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.TypeHdr,RelativeSource={RelativeSource AncestorType={x:Type EgtWPFLib5:EgtCustomWindow}}}"/>
-               </DataGridTemplateColumn.Header>
-               <DataGridTemplateColumn.CellEditingTemplate>
-                  <DataTemplate>
-                     <ComboBox IsEditable="False" 
-                               SelectedItem="{Binding Type,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                               ItemsSource="{Binding Path=TypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellEditingTemplate>
-               <DataGridTemplateColumn.CellTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=Type,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                VerticalAlignment="Center"
-                                Margin="5,0,0,0"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-            
-         </DataGrid.Resources>
-         
-      </EgtBEAMWALL:EgtDataGrid>
-      
-      <Grid Grid.Row="2"
-            Margin="0,0,0,5"
-            HorizontalAlignment="Center">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-
-         <Button Content="/\"
-                 Command="{Binding MoveRowUp_Command}"
-                 Grid.Column="0"
-                 Margin="0,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="\/"
-                 Command="{Binding MoveRowDown_Command}"
-                 Grid.Column="1"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding AddRowMsg}"
-                 Command="{Binding AddRow_Command}"
-                 Grid.Column="2"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding DeleteRowMsg}"
-                 Command="{Binding DeleteRow_Command}"
-                 Grid.Column="3"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding SaveMsg}"
-                 Command="{Binding Save_Command}"
-                 Grid.Column="4"
-                 Margin="2.5,0,0,0"
-                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
-
-      </Grid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/BeamMachiningsWindow/BeamMachiningsWindowV.xaml.vb

@@ -1,20 +0,0 @@
-Imports System.Windows
-
-Public Class BeamMachiningsWindowV
-
-   Private WithEvents m_BeamMachiningsWindowVM As MyBeamMachiningsWindowVM
-
-   Sub New(Owner As Window, BeamMachiningsWindowVM As MyBeamMachiningsWindowVM)
-      MyBase.New(Owner)
-      ' This call is required by the designer.
-      InitializeComponent()
-      Me.DataContext = BeamMachiningsWindowVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_BeamMachiningsWindowVM = BeamMachiningsWindowVM
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_BeamMachiningsWindowVM.m_CloseWindow
-      Me.DialogResult = bDialogResult
-   End Sub
-
-End Class

EgtBEAMWALL.Core/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb

@@ -1,36 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports EgtBEAMWALL.Core
-Imports EgtWPFLib5
-
-Public Class MyBeamMachiningsWindowVM
-   Inherits BeamMachiningsWindowVM
-
-#Region "FIELDS & PROPERTIES"
-
-   Private m_BeamMachiningsColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property BeamMachiningsColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_BeamMachiningsColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_BeamMachiningsColumns = value
-      End Set
-   End Property
-
-#End Region    ' FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New(sTitle As String, sBaseDir As String, sMachTypePath As String, sTabTemplPath As String, Optional bIsBeam As Boolean = True)
-      MyBase.New(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, bIsBeam)
-      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_BEAMMACHININGS, BeamMachiningsColumns)
-      ' aggiorno la visibilità delle colonne
-      For Each col In BeamMachiningsColumns
-         col.ColumnVisibility = If(col.Visible, Windows.Visibility.Visible, Windows.Visibility.Collapsed)
-      Next
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-End Class

EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml

@@ -1,80 +0,0 @@
-<DockPanel x:Class="ConfigurationPageV"
-           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-           xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core">
-
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="10*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="6*"/>
-      </Grid.RowDefinitions>
-      <TabControl Grid.Row="0" Grid.Column="0" Grid.RowSpan="2" Grid.ColumnSpan="2"
-                  SelectedIndex="{Binding SelConfigSubPage}">
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding General_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding General_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALL:General_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-         <TabItem>
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding ParameterQ_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding ParameterQ_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-            <TabItem.Content>
-               <EgtBEAMWALL:QParameter_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-         <TabItem >
-            <TabItem.Header>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding Machine_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Command="{Binding SaveCommand}"
-                          ToolTip="{Binding SaveToolTip}"
-                          Visibility="{Binding Machine_Visibility}"
-                          Style="{StaticResource OptionPanel_Button}">
-                     <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-                  </Button>
-               </StackPanel>
-            </TabItem.Header>
-
-            <TabItem.Content>
-               <EgtBEAMWALL:Machine_ConfigurationPageV/>
-            </TabItem.Content>
-         </TabItem>
-      </TabControl>
-
-      <!--<Button Command="{Binding SaveCommand}"
-                ToolTip="{Binding SaveToolTip}"
-                Grid.Row="1" 
-                Grid.Column="1"
-                Style="{StaticResource OptionPanel_Button}">
-         <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-      </Button>-->
-
-   </Grid>
-</DockPanel>

EgtBEAMWALL.Core/ConfigurationPage/ConfigurationPageV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class ConfigurationPageV
-
-End Class

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml

@@ -1,118 +0,0 @@
-<Grid x:Class="General_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <StackPanel Grid.Row="0" Grid.Column="0" Margin="5,5,5,0">
-      <GroupBox Header="{Binding CurrentLanguage_Msg}"
-                Margin="0,0,0,5">
-         <UniformGrid Rows="2" Margin="3,3,3,3">
-            <ComboBox ItemsSource="{Binding LanguageList, Mode=OneWay}" Height="25"
-                      DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
-                      Margin="0,0,0,5"/>
-            <TextBlock Text="{Binding LanguageAdvert_Msg}" TextWrapping="Wrap"
-                       TextAlignment="Center"/>
-         </UniformGrid>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding MMUnits_Msg}" VerticalAlignment="Center"/>
-         <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                   SelectedIndex="{Binding SelMeasureUnit}" Height="25"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="{Binding Nesting_Msg}"
-                Margin="0,0,0,5">
-         <StackPanel>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding SectionTime_Msg}"
-                          Grid.Row="0" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding SectionTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="0" Grid.Column="1"/>
-            </UniformGrid>
-            <UniformGrid Columns="2"
-                         Margin="0,0,0,5">
-               <TextBlock Text="{Binding PartTime_Msg}"
-                          Grid.Row="1" Grid.Column="0"/>
-               <EgtWPFLib5:EgtTextBox Text="{Binding PartTime, UpdateSourceTrigger=Explicit}"
-                                      Grid.Row="1" Grid.Column="1"/>
-            </UniformGrid>
-         </StackPanel>
-      </GroupBox>
-      <UniformGrid Columns="2"
-                   Margin="0,0,0,5">
-         <TextBlock Text="{Binding PrintLabel_Msg}" VerticalAlignment="Center"/>
-         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
-                   Margin="0,5,0,0"/>
-      </UniformGrid>
-      <GroupBox Header="Backup And Restore">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <CheckBox x:Name="ExternalBackup_CheckBox"
-                         IsChecked="{Binding bExternalBackupActive}"
-                         VerticalAlignment="Center"/>
-               <TextBlock Grid.Column="1"
-                          Text="External file path:"
-                          VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1"
-                  Margin="0,2,0,5">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBox Text="{Binding ExternalBackupFolderPath}"
-                        IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                        Margin="0,0,2.5,0"/>
-               <Button Grid.Column="1"
-                       Content="..."
-                       Width="18"
-                       Command="{Binding ChooseExternalBackupFolderPath_Command}"
-                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
-                       Margin="2.5,0,0,0"/>
-            </Grid>
-            <Grid Grid.Row="2">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <TextBlock Text="Reminder Frequency"/>
-               <ComboBox Grid.Column="1"
-                         ItemsSource="{Binding ReminderList}"
-                         SelectedItem="{Binding SelReminder}"/>
-            </Grid>
-            <StackPanel Grid.Row="3"
-                        Orientation="Horizontal">
-               <Button Content="Backup"
-                       Command="{Binding Backup_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-               <Button Content="Restore"
-                       Command="{Binding Restore_Command}"
-                       Style="{StaticResource ToolBar_TextButton}"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/General_ConfigurationPageV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class General_ConfigurationPageV
-
-End Class

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml

@@ -1,70 +0,0 @@
-<Grid x:Class="Machine_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
-      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="Auto"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="Auto"/>
-      <RowDefinition Height="10*"/>
-   </Grid.RowDefinitions>
-
-   <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
-      <GroupBox Style="{StaticResource GroupBoxStyle_NoHeader}" Padding="5,10,5,5">
-         <EgtBEAMWALL:MachinePanelV DataContext="{Binding MachinePanelVM}" VerticalAlignment="Center"/>
-      </GroupBox>
-   </StackPanel>
-
-   <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal">
-      <ItemsControl ItemsSource="{Binding ConfigMachTableList}">
-         <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-               <StackPanel x:Name="GroupStackPanel" Orientation="Horizontal"/>
-            </ItemsPanelTemplate>
-         </ItemsControl.ItemsPanel>
-         <ItemsControl.ItemTemplate>
-            <DataTemplate>
-               <GroupBox Header="{Binding sName}"  Width="Auto" VerticalAlignment="Top" Height="Auto">
-                  <ItemsControl Name="MachParamsItemsControl" ItemsSource="{Binding MachParamList}" Margin="0,5,0,0">
-                     <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                           <WrapPanel Orientation="Vertical"/>
-                        </ItemsPanelTemplate>
-                     </ItemsControl.ItemsPanel>
-                     <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                           <Grid Margin="0,0,5,5">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="*" />
-                              </Grid.ColumnDefinitions>
-                              <TextBlock Text="{Binding sName}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="100"
-                                         Style="{StaticResource MachParamTextBlock}"/>
-                              <EgtWPFLib5:EgtTextBox Text="{Binding sValue, UpdateSourceTrigger=Explicit}"
-                                                     Grid.Column="1"
-                                                     Width="70"/>
-                              <TextBlock Text="{Binding sDescription}"
-                                         TextWrapping="WrapWithOverflow"
-                                         Width="200"
-                                         Style="{StaticResource MachParamTextBlock}"
-                                         Grid.Column="2"/>
-                           </Grid>
-                        </DataTemplate>
-                     </ItemsControl.ItemTemplate>
-                  </ItemsControl>
-               </GroupBox>
-            </DataTemplate>
-         </ItemsControl.ItemTemplate>
-      </ItemsControl>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/Machine_ConfigurationPageV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class Machine_ConfigurationPageV
-
-End Class

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml

@@ -1,80 +0,0 @@
-<Grid x:Class="QParameter_ConfigurationPageV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="2*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-   <Grid.RowDefinitions>
-      <RowDefinition Height="1*"/>
-   </Grid.RowDefinitions>
-   <EgtBEAMWALL:QParamListV DataContext="{Binding}" 
-                            ItemsSource="{Binding QBTLParamVMList}"
-                            SelectedItem="{Binding SelQParam}"
-                            Grid.Column="0"
-                            Margin="5">
-      <DataGrid.GroupStyle>
-         <GroupStyle>
-            <GroupStyle.Panel>
-               <ItemsPanelTemplate>
-                  <DataGridRowsPresenter/>
-               </ItemsPanelTemplate>
-            </GroupStyle.Panel>
-            <GroupStyle.HeaderTemplate>
-               <DataTemplate>
-                  <StackPanel>
-                     <TextBlock Text="{Binding Path=Name}"/>
-                  </StackPanel>
-               </DataTemplate>
-            </GroupStyle.HeaderTemplate>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="#FFBABABA"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-         <GroupStyle>
-            <GroupStyle.ContainerStyle>
-               <Style TargetType="{x:Type GroupItem}">
-                  <Setter Property="Template">
-                     <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type GroupItem}">
-                           <Expander IsExpanded="True">
-                              <Expander.Background>
-                                 <SolidColorBrush Color="LightGray"></SolidColorBrush>
-                              </Expander.Background>
-                              <Expander.Header>
-                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding Path=Name}" />
-                                 </StackPanel>
-                              </Expander.Header>
-                              <ItemsPresenter />
-                           </Expander>
-                        </ControlTemplate>
-                     </Setter.Value>
-                  </Setter>
-               </Style>
-            </GroupStyle.ContainerStyle>
-         </GroupStyle>
-      </DataGrid.GroupStyle>
-   </EgtBEAMWALL:QParamListV>
-
-</Grid>

EgtBEAMWALL.Core/ConfigurationPage/QParameter_ConfigurationPageV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class QParameter_ConfigurationPageV
-
-End Class

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -302,6 +302,7 @@
    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,8 +20,10 @@
    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"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDims.vb

@@ -9,6 +9,5 @@
    Public Const TOPPANEL_OPTIMIZER As String = "TopPanel_Optimizer"
    Public Const LEFTPANEL_SUPERVISOR As String = "LeftPanel_Supervisor"
    Public Const PROJECT_SUPERVISOR As String = "Project_Supervisor"
-   Public Const PROJECT_ONLYPROD As String = "Project_OnlyProd"
 
 End Class

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -33,7 +33,6 @@ Public Module ConstGen
       CONFIG = 3
       INPUTS = 4
       OUTPUTS = 5
-      ONLYPRODPAGE = 6
    End Enum
 
    ' Abilitazioni licenza
@@ -46,13 +45,6 @@ Public Module ConstGen
       ANY_DB = 32
    End Enum
 
-   ' Selezione Tab Prod / Proj
-   Public Enum ProdProj As Integer
-      NULL = 0
-      PROJ = 1
-      PROD = 2
-   End Enum
-
    ' File di log generale
    Public Const VWOPTGENLOG_FILE_NAME As String = "EgtBEAMWALL.ViewerOptimizerLog#.txt"
    Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
@@ -68,9 +60,7 @@ Public Module ConstGen
    ' Sottodirettorio per Csv automatico
    Public Const PRODS_DIR As String = "Prods"
    ' Sottodirettorio per Macro
-   Public Const MACRODEFAULT_DIR As String = "MacroDefault"
-   ' Sottodirettorio per MacroCustom
-   Public Const MACROCUSTOM_DIR As String = "MacroCustom"
+   Public Const MACRO_DIR As String = "Macro"
    ' Sottodirettorio per Magazzino
    Public Const WAREHOUSE_DIR As String = "Warehouse"
    ' Sottodirettorio per lavorazioni travi

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -47,6 +47,7 @@ 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"
@@ -162,15 +163,18 @@ 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 K_ONLYPROD As String = "OnlyProd"
-   Public Const K_MODIFYSETUP As String = "ModifySetup"
-   
    Public Const S_SPECIAL As String = "Special"
    Public Const K_SPECIALENABLE As String = "SpecialEnable"
 

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -77,21 +77,8 @@
     <Import Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml.vb">
-      <DependentUpon>BeamMachiningsWindowV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="BeamMachiningsWindow\MyBeamMachiningsWindowVM.vb" />
     <Compile Include="BTLViewModel\BTLFeatureVM.vb" />
     <Compile Include="CALCPanel\CalcEditEndEventArgs.vb" />
-    <Compile Include="ConfigurationPage\General_ConfigurationPageV.xaml.vb">
-      <DependentUpon>General_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\Machine_ConfigurationPageV.xaml.vb">
-      <DependentUpon>Machine_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml.vb">
-      <DependentUpon>QParameter_ConfigurationPageV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Constants\ConstColumns.vb" />
     <Compile Include="Constants\ConstDataGridColumnsIni.vb" />
     <Compile Include="Constants\ConstDims.vb" />
@@ -110,9 +97,6 @@
     <Compile Include="CALCPanel\CalcIntegration.vb" />
     <Compile Include="DataAccess\PartAddedEventArgs.vb" />
     <Compile Include="DataAccess\BTLParamAddedEventArgs.vb" />
-    <Compile Include="ItemParamList\QParamListV.xaml.vb">
-      <DependentUpon>QParamListV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Lib\MachGroupAddedEventArgs.vb" />
     <Compile Include="Lib\MachGroupVM.vb" />
     <Compile Include="Lib\NewMachGroupPanelVM.vb" />
@@ -128,14 +112,11 @@
       <DependentUpon>LoadingWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="LoadingWnd\LoadingWndVM.vb" />
-    <Compile Include="MachinePanel\MachinePanelV.xaml.vb">
-      <DependentUpon>MachinePanelV.xaml</DependentUpon>
-    </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="Utility\Configuration.vb" />
+    <Compile Include="ProjectFileVM\ProdItem.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
@@ -165,6 +146,7 @@
     <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>
@@ -177,6 +159,7 @@
     <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" />
@@ -206,38 +189,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="BeamMachiningsWindow\BeamMachiningsWindowV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ConfigurationPage\General_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\Machine_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="ConfigurationPage\QParameter_ConfigurationPageV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
     <Page Include="EgtDataGrid\EgtDataGrid.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ItemParamList\QParamListV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="LoadingWnd\LoadingWndV.xaml">
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
-    <Page Include="MachinePanel\MachinePanelV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
     <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -251,10 +210,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\ProjectManager\Save.png" />
-  </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent>

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -370,6 +370,7 @@ Public Class EgtDataGrid
 End Class
 
 Public Class EgtDataGridColumn
+   Inherits VMBase
 
    Private m_dgColumn As DataGridColumn
 
@@ -507,7 +508,7 @@ Public Class EgtDataGridColumn
    Private m_ColumnVisibility As Visibility
    Public Property ColumnVisibility As Visibility
       Get
-         Return If(m_Visible, Visibility.Visible, Visibility.Collapsed)
+         Return If(m_ColumnVisibility, Visibility.Visible, Visibility.Collapsed)
       End Get
       Set(value As Visibility)
          m_ColumnVisibility = value
@@ -527,6 +528,9 @@ 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/ItemParamList/QParamListV.xaml

@@ -1,78 +0,0 @@
-<DataGrid x:Class="QParamListV"
-          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-          AutoGenerateColumns="False"
-          CanUserSortColumns="False"
-          CanUserResizeColumns="False"
-          CanUserResizeRows="False"
-          CanUserReorderColumns="False"
-          SelectionMode="Single"
-          ScrollViewer.CanContentScroll="True" 
-          ScrollViewer.VerticalScrollBarVisibility="Auto"
-          ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-          Margin="0,0,0,5">
-
-   <DataGrid.Columns>
-
-      <!--BWType-->
-      <DataGridTextColumn Binding="{Binding sBWType}"
-                           Width="40"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Type_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Nome-->
-      <DataGridTextColumn Binding="{Binding sName}"
-                           Width="50"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.NAM_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Descrizione-->
-      <DataGridTextColumn Binding="{Binding sDescription}"
-                           Width="1*"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Description_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Default-->
-      <DataGridTextColumn Binding="{Binding sDefault}"
-                           Width="65">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Default_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Minimo-->
-      <DataGridTextColumn Binding="{Binding sMin}"
-                           Width="65"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Min_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-      <!--Massimo-->
-      <DataGridTextColumn Binding="{Binding sMax}"
-                           Width="65"
-                           IsReadOnly="True">
-         <DataGridTextColumn.HeaderTemplate>
-            <DataTemplate>
-               <TextBlock Text="{Binding DataContext.Max_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-            </DataTemplate>
-         </DataGridTextColumn.HeaderTemplate>
-      </DataGridTextColumn>
-   </DataGrid.Columns>
-
-</DataGrid>

EgtBEAMWALL.Core/ItemParamList/QParamListV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class QParamListV
-
-End Class

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupM.vb

@@ -113,6 +113,26 @@ 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

@@ -22,7 +22,7 @@ Public Class MyMachGroupPanelM
       ' Assegno macchina di default
       NewMyMachGroupPanelM.m_DefaultMachine = ""
       ' aggiorno copie
-      UpdateAllDuplo()
+      UpdateDuplo()
       ' recupero i MachGroup
       NewMyMachGroupPanelM.m_MachGroupMList = LoadMyMachGroups(MachineList)
       Return NewMyMachGroupPanelM
@@ -167,7 +167,7 @@ Public Class MyMachGroupPanelM
    End Function
 
    ' funzione che fa l'update di tutte le copie dei pezzi modificati
-   Public Shared Sub UpdateAllDuplo()
+   Public Shared Sub UpdateDuplo()
       ' verifico tipo di progetto
       Dim nBtlInfoId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
       Dim nBWType As Integer = 0
@@ -178,7 +178,151 @@ Public Class MyMachGroupPanelM
       While nPartId <> GDB_ID.NULL
          Dim bIsModified As Boolean = False
          If EgtDuploGetModified(nPartId, bIsModified) AndAlso bIsModified Then
-            UpdateDuplo(nPartId)
+            ' verifico se c'é PRID sugli outline
+            Dim nPRId As Integer = 1
+            Dim nOutlineLayer As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
+            If nOutlineLayer <> GDB_ID.NULL Then
+               Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
+               While nOutlineId <> GDB_ID.NULL
+                  ' verifico che sia feature
+                  If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
+                     If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
+                        nOutlineId = EgtGetNext(nOutlineId)
+                        Continue While
+                     Else
+                        EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                        nPRId += 1
+                     End If
+                  End If
+                  nOutlineId = EgtGetNext(nOutlineId)
+               End While
+            End If
+            bTotIsModified = True
+            Dim DuploList As New List(Of Integer)
+            EgtDuploList(nPartId, DuploList)
+            Dim DuploArray() As Integer
+            Dim RotArray(DuploList.Count) As Integer
+            Dim FlipArray(DuploList.Count) As Integer
+            Dim QArray(DuploList.Count) As Dictionary(Of String, Dictionary(Of String, String))
+            DuploArray = DuploList.ToArray()
+            ' recupero ROT (gradi) e FLIP (0/1) per non perderli
+            For Duploindex = 0 To DuploArray.Length - 1
+               RotArray(Duploindex) = 0
+               EgtGetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
+               FlipArray(Duploindex) = 0
+               EgtGetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
+               If FlipArray(Duploindex) <> 0 Then FlipArray(Duploindex) = 180
+               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 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
+                              EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                              nPRId = nGlobPRId
+                           Else
+                              If nPRId > nGlobPRId Then nGlobPRId = nPRId
+                           End If
+                           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(nOutlineId, QKey, QValue) Then
+                                 QArray(Duploindex)(sKey).Add(QKey, QValue)
+                              End If
+                           Next
+                        End If
+                        nOutlineId = EgtGetNext(nOutlineId)
+                     End While
+                  End If
+               End If
+            Next
+            ' aggiornamento dei Duplo
+            EgtDuploUpdate(nPartId)
+            ' ripristino i valori di ROT e FLIP
+            For Duploindex = 0 To DuploArray.Length - 1
+               ' ripristino info rot e flip
+               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
+               EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
+               If nBWType = BWType.WALL Then
+                  ' ciclo sugli outline
+                  nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
+                  If nOutlineLayer <> GDB_ID.NULL Then
+                     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
+                           EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                           Dim sKey As String = nPRId & "." & nPRC
+                           ' ripristino parametri Q
+                           If QArray(Duploindex).ContainsKey(sKey) Then
+                              For Each QPar In QArray(Duploindex)(sKey)
+                                 EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
+                              Next
+                           End If
+                        End If
+                        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
+                           ' ripristino parametri Q
+                           If QArray(Duploindex).ContainsKey(sKey) Then
+                              For Each QPar In QArray(Duploindex)(sKey)
+                                 EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
+                              Next
+                           End If
+                        End If
+                        nFeatureId = EgtGetNext(nFeatureId)
+                     End While
+                  End If
+               End If
+            Next
          End If
          nPartId = EgtGetNextPart(nPartId)
       End While
@@ -189,180 +333,6 @@ Public Class MyMachGroupPanelM
       End If
    End Sub
 
-   Public Shared Sub UpdateDuplo(nPartId As Integer)
-      ' verifico tipo di progetto
-      Dim nBtlInfoId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-      Dim nBWType As Integer = 0
-      EgtGetInfo(nBtlInfoId, BTL_GEN_PROJTYPE, nBWType)
-      ' ciclo sui pezzi
-      Dim bTotIsModified As Boolean = False
-      Dim bIsModified As Boolean = False
-      ' verifico se c'é PRID sugli outline
-      Dim nPRId As Integer = 1
-      Dim nOutlineLayer As Integer = EgtGetFirstNameInGroup(nPartId, OUTLINE)
-      If nOutlineLayer <> GDB_ID.NULL Then
-         Dim nOutlineId As Integer = EgtGetFirstInGroup(nOutlineLayer)
-         While nOutlineId <> GDB_ID.NULL
-            ' verifico che sia feature
-            If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
-               If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
-                  nOutlineId = EgtGetNext(nOutlineId)
-                  Continue While
-               Else
-                  EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                  nPRId += 1
-               End If
-            End If
-            nOutlineId = EgtGetNext(nOutlineId)
-         End While
-      End If
-      bTotIsModified = True
-      Dim DuploList As New List(Of Integer)
-      EgtDuploList(nPartId, DuploList)
-      Dim DuploArray() As Integer
-      Dim RotArray(DuploList.Count) As Integer
-      Dim FlipArray(DuploList.Count) As Integer
-      Dim QArray(DuploList.Count) As Dictionary(Of String, Dictionary(Of String, String))
-      DuploArray = DuploList.ToArray()
-      ' recupero ROT (gradi) e FLIP (0/1) per non perderli
-      For Duploindex = 0 To DuploArray.Length - 1
-         RotArray(Duploindex) = 0
-         EgtGetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
-         FlipArray(Duploindex) = 0
-         EgtGetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-         If FlipArray(Duploindex) <> 0 Then FlipArray(Duploindex) = 180
-         If nBWType = BWType.WALL Then
-            ' salvo parametri Q
-            QArray(Duploindex) = New Dictionary(Of String, Dictionary(Of String, String))
-            ' 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) Then
-                        EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
-                        nPRId = nGlobPRId
-                        nGlobPRId += 1
-                     End If
-                     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(nOutlineId, QKey, QValue) Then
-                           QArray(Duploindex)(sKey).Add(QKey, QValue)
-                        End If
-                     Next
-                  End If
-                  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
-      EgtDuploUpdate(nPartId)
-      ' ripristino i valori di ROT e FLIP
-      For Duploindex = 0 To DuploArray.Length - 1
-         ' ripristino info rot e flip
-         EgtSetInfo(DuploArray(Duploindex), MGR_PRT_ROT, RotArray(Duploindex))
-         EgtSetInfo(DuploArray(Duploindex), MGR_PRT_FLIP, FlipArray(Duploindex))
-         If nBWType = BWType.WALL Then
-            ' ciclo sugli outline
-            nOutlineLayer = EgtGetFirstNameInGroup(DuploArray(Duploindex), OUTLINE)
-            If nOutlineLayer <> GDB_ID.NULL Then
-               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
-                     EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
-                     Dim sKey As String = nPRId & "." & nPRC
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nOutlineId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  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
-                     ' ripristino parametri Q
-                     If QArray(Duploindex).ContainsKey(sKey) Then
-                        For Each QPar In QArray(Duploindex)(sKey)
-                           EgtSetInfo(nFeatureId, QPar.Key, QPar.Value)
-                        Next
-                     End If
-                  End If
-                  nFeatureId = EgtGetNext(nFeatureId)
-               End While
-            End If
-         End If
-      Next
-   End Sub
-
-   Public Shared Sub SetDuploModified(nPartId As Integer)
-      If Configuration.bOnlyProd Then
-         ' segno modificato e aggiorno duplo
-         EgtDuploSetModified(nPartId)
-         UpdateDuplo(nPartId)
-         ' aggiorno grafica duplo
-         Dim DuploIdList As New List(Of Integer)
-         EgtDuploList(nPartId, DuploIdList)
-         Dim DuploList As List(Of MachGroupVM) = CoreMap.refMachGroupPanelVM.MachGroupVMList.Where(Function(x) tt(x, DuploIdList)).ToList()
-         For Each CurrMachGroup As MyMachGroupVM In DuploList
-            CurrMachGroup.RefreshMachGroup()
-         Next
-      Else
-         EgtDuploSetModified(nPartId)
-      End If
-   End Sub
-
-   Private Shared Function tt(x As MachGroupVM, DuploIdList As List(Of Integer)) As Boolean
-      Dim TempMyMachGroupVM As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
-      Return TempMyMachGroupVM.PartVMList.Any(Function(y) DuploIdList.Contains(y.nPartId))
-   End Function
-
    Class DuploFeature
       ' Id geometrico della feature
       Friend nFeatureId As Integer

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -210,6 +210,16 @@ 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
@@ -482,8 +492,6 @@ Public Class PartM
       EgtGetInfo(nPartId, BTL_PRT_GROUP, NewPartM.m_sGROUP)
       EgtGetInfo(nPartId, BTL_PRT_STOREY, NewPartM.m_sSTOREY)
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewPartM.m_sMATERIAL)
-      EgtGetInfo(nPartId, MGR_PRT_ROT, NewPartM.m_dROT)
-      EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
       Dim nTemp As Integer = 0
       If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then
          nTemp = 0
@@ -516,6 +524,8 @@ Public Class PartM
          ' leggo PosX, PosY, Rot e Flip
          EgtGetInfo(nPartId, MGR_PRT_POSX, NewPartM.m_dPOSX)
          EgtGetInfo(nPartId, MGR_PRT_POSY, NewPartM.m_dPOSY)
+         EgtGetInfo(nPartId, MGR_PRT_ROT, NewPartM.m_dROT)
+         EgtGetInfo(nPartId, MGR_PRT_FLIP, NewPartM.m_nFLIP)
       End If
       ' leggo volume 
       If Not EgtGetInfo(nPartId, BTL_PRT_VOLUME, NewPartM.dVolume) Then
@@ -639,10 +649,6 @@ Public Class PartM
       Return New List(Of BTLFeatureM)(m_FeatureMList)
    End Function
 
-   Public Sub RefreshBTLFeatures()
-      m_FeatureMList = LoadBTLFeatures(Me, nPartId)
-   End Sub
-
 #End Region    ' Features
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -91,7 +91,7 @@ Public MustInherit Class MyMachGroupPanelVM
       ' Svuoto precedente lista di MachGroup
       MachGroupVMList.Clear()
       ' aggiorno copie
-      MyMachGroupPanelM.UpdateAllDuplo()
+      MyMachGroupPanelM.UpdateDuplo()
       ' verifico se esistono già gruppi di lavorazione o se devo creare il primo
       Dim bOk As Boolean = False
       Dim nId = EgtGetFirstMachGroup()

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -116,6 +116,18 @@ 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()
@@ -130,7 +142,7 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property Section As SectionXMaterial
       Get
-         Return New SectionXMaterial(dW, dH, dL, MyMachGroupM.sMATERIAL)
+         Return New SectionXMaterial(dW, dH, dL, MyMachGroupM.RawPartM.Material.sMaterial, MyMachGroupM.sWAREHOUSEMATERIAL)
       End Get
    End Property
 
@@ -620,10 +632,6 @@ Public MustInherit Class MyMachGroupVM
 
    Public MustOverride Sub RefreshPartList()
 
-   Public Overridable Sub RefreshMachGroup()
-
-   End Sub
-
 #End Region    ' Parts
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -1,9 +1,11 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.IO
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
+Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
 
@@ -160,6 +162,19 @@ 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
@@ -507,10 +522,6 @@ Public MustInherit Class PartVM
 
 #Region "METHODS"
 
-   Public Overridable Sub RefreshPart()
-
-   End Sub
-
 #Region "Feature"
 
    Protected MustOverride Sub CreateBTLFeatureVMList()

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml

@@ -1,45 +0,0 @@
-<Grid x:Class="MachinePanelV"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      IsEnabled="{Binding MachPanel_IsEnabled}">
-
-   <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="1*"/>
-      <ColumnDefinition Width="1*"/>
-   </Grid.ColumnDefinitions>
-
-   <Grid Margin="0,0,5,0">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="1*"/>
-         <ColumnDefinition Width="1*"/>
-      </Grid.ColumnDefinitions>
-      <TextBlock Grid.Row="0" Grid.Column="0" Text="Macchina corrente" VerticalAlignment="Center"  Margin="0,0,5,0"/>
-      <!--Combobox per selezionare la macchina corrente-->
-      <ComboBox ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
-                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-                Height="22" Width="150"
-                Grid.Row="0" Grid.Column="1"/>
-   </Grid>
-   <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
-      <Button Command="{Binding ToolDbCommand}" ToolTip="{Binding ToolDBToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding ToolDBMsg}"/>
-      <Button Command="{Binding MachDbCommand}" ToolTip="{Binding MachiningDbToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding MachiningDbMsg}"/>
-      <Button Command="{Binding SetUpCommand}" ToolTip="{Binding SetUpToolTip}"
-              Style="{StaticResource ToolBar_TextButton}" Content="{Binding SetUpMsg}"
-              Visibility="{Binding SetUp_Visibility}"/>
-      <Button ToolTip="{Binding BeamTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}"
-              Command="{Binding BeamTable_Command}"
-              Visibility="{Binding BeamTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-      <Button ToolTip="{Binding WallTable_ToolTip}"
-              Style="{StaticResource ToolBar_Button}"
-              Command="{Binding WallTable_Command}"
-              Visibility="{Binding WallTable_Visibility}">
-         <Image Source="/Resources/Configuration/MachiningsTable.png" Stretch="Uniform"/>
-      </Button>
-   </StackPanel>
-
-</Grid>

EgtBEAMWALL.Core/MachinePanel/MachinePanelV.xaml.vb

@@ -1,3 +0,0 @@
-Public Class MachinePanelV
-
-End Class

EgtBEAMWALL.Core/MachinePanel/MachinePanelVM.vb

@@ -1,357 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports EgtBEAMWALL.Core
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MachinePanelVM
-   Inherits EgtWPFLib5.MachinePanelVM
-
-#Region "FIELDS & PROPERTIES"
-
-   ' Radice del direttorio delle macchine
-   Private m_sMachinesRoot As String
-
-   ' Macchina correntemente selezionata e quindi attiva
-   Private m_SelectedMachine As Machine = Nothing
-   Public Overrides Property SelectedMachine As Machine
-      Get
-         Return m_SelectedMachine
-      End Get
-      Set(value As Machine)
-         If value IsNot m_SelectedMachine Then
-            ' imposto macchina in DbGeometrico
-            If Not IsNothing(value) AndAlso EgtSetCurrMachine(value.Name) Then
-               m_SelectedMachine = value
-            End If
-            ' Salvo impostazione macchina corrente
-            SaveCurrentMachine()
-            NotifyPropertyChanged(NameOf(SelectedMachine))
-            ' inizializzo la macchina selezionata come macchina corrente
-            Dim nMachType As MachineType = DirectCast(m_SelectedMachine, MyMachine).nType
-            SectionXMaterial.SetType(nMachType)
-            If Not IsNothing(value) Then
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, value.Name, nMachType)
-            Else
-               InitCurrentMachine(Map.refMainWindowVM.MainWindowM.sMachinesRoot, m_SelectedMachine.Name, nMachType)
-            End If
-            ' mostro bottone tabella beam o wall a seconda del tipo
-            m_BeamTable_Visibility = If(nMachType = MachineType.BEAM OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            m_WallTable_Visibility = If(nMachType = MachineType.WALL OrElse nMachType = MachineType.BOTH, Visibility.Visible, Visibility.Collapsed)
-            NotifyPropertyChanged(NameOf(BeamTable_Visibility))
-            NotifyPropertyChanged(NameOf(WallTable_Visibility))
-            ' carico i Parametri Q da mostrare (Beam, Wall o entrambi) in base al tipo di macchina selezionata
-            If Not IsNothing(Map.refConfigurationPageVM) Then
-               ' carico i parametri Q dei Process letti dall'ini
-               Map.refConfigurationPageVM.GetQParamsList()
-               ' carico la lista di tutti i parametri Q ciclando su ogni Process di PRCList
-               If Not IsNothing(Map.refConfigurationPageVM.QBTLParamVMList) Then
-                  Map.refConfigurationPageVM.QBTLParamVMList.Clear()
-               End If
-               For Each PRCItem In Map.refConfigurationPageVM.PRCList
-                  For Each QBTLParam In PRCItem.QBTLParamVMList
-                     Map.refConfigurationPageVM.QBTLParamVMList.Add(QBTLParam)
-                  Next
-               Next
-               NotifyPropertyChanged(NameOf(Map.refConfigurationPageVM.QBTLParamVMList))
-            End If
-            ' aggiorno nome macchina in statusbar
-            Map.refMyStatusBarVM.RefreshMachName()
-         End If
-      End Set
-   End Property
-
-   Private m_MachPanel_IsEnabled As Boolean = True
-   Public Property MachPanel_IsEnabled As Boolean
-      Get
-         Return m_MachPanel_IsEnabled
-      End Get
-      Set(value As Boolean)
-         m_MachPanel_IsEnabled = value
-         NotifyPropertyChanged("MachPanel_IsEnabled")
-      End Set
-   End Property
-
-   Private m_BeamTable_Visibility As Visibility
-   Public ReadOnly Property BeamTable_Visibility As Visibility
-      Get
-         Return m_BeamTable_Visibility
-      End Get
-   End Property
-
-   Private m_WallTable_Visibility As Visibility
-   Public ReadOnly Property WallTable_Visibility As Visibility
-      Get
-         Return m_WallTable_Visibility
-      End Get
-   End Property
-
-   Public ReadOnly Property SetUp_Visibility As Visibility
-      Get
-         Return If(Map.refMainWindowVM.MainWindowM.bModifySetup, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-
-#Region "Messages"
-
-   Public ReadOnly Property ToolDBMsg As String
-      Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 6)
-      End Get
-   End Property
-   Public ReadOnly Property MachiningDbMsg As String
-      Get
-         Return EgtMsg(MSG_MACHINEPAGEUC + 7)
-      End Get
-   End Property
-   Public ReadOnly Property SetUpMsg As String
-      Get
-         Return EgtMsg(MSG_ALARMSPAGEUC + 33)
-      End Get
-   End Property
-
-#End Region    ' Messages
-
-#Region "ToolTip"
-
-   Public ReadOnly Property ToolDBToolTip As String
-      Get
-         Return EgtMsg(5003)
-      End Get
-   End Property
-   Public ReadOnly Property MachiningDbToolTip As String
-      Get
-         Return EgtMsg(5004)
-      End Get
-   End Property
-   Public ReadOnly Property SetUpToolTip As String
-      Get
-         Return EgtMsg(31501)
-      End Get
-   End Property
-
-#End Region   ' ToolTip
-
-   ' Definizione comandi
-   Private m_cmdBeamTable As ICommand
-   Private m_cmdWallTable As ICommand
-
-#End Region    'FIELDS & PROPERTIES
-
-#Region "CONSTRUCTOR"
-
-   Sub New()
-      ' Creo riferimento a questa classe in Map
-      Map.SetRefMachinePanelVM(Me)
-      ' recupero cartella radice delle macchine
-      m_sMachinesRoot = Map.refMainWindowVM.MainWindowM.sMachinesRoot
-      ' Carica macchine da cartella delle macchine
-      MyMachine.MachineListInit(m_sMachinesRoot, MachineList)
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Friend Sub LoadCurrentMachine()
-      If MachineList.Count = 0 Then Return
-      Dim CurrMachine As Machine = Nothing
-      Dim CurrMachineName As String = String.Empty
-      GetMainPrivateProfileString(S_MACH, K_CURRMACH, String.Empty, CurrMachineName)
-      Dim bFound As Boolean = False
-      If Not String.IsNullOrEmpty(CurrMachineName) Then
-         For Each Mach In MachineList
-            If Mach.Name = CurrMachineName Then
-               bFound = True
-               CurrMachine = Mach
-               Exit For
-            End If
-         Next
-      End If
-      If Not bFound And MachineList.Count > 0 Then
-         CurrMachine = MachineList(0)
-      End If
-      If Not IsNothing(CurrMachine) Then
-         If EgtSetCurrMachine(CurrMachine.Name) Then
-            SelectedMachine = CurrMachine
-         End If
-      End If
-   End Sub
-
-   Friend Sub SaveCurrentMachine()
-      If IsNothing(m_SelectedMachine) Then Return
-      WriteMainPrivateProfileString(S_MACH, K_CURRMACH, SelectedMachine.Name)
-   End Sub
-
-   Friend Sub UpdateCurrentMachine()
-      'EgtSetCurrentContext(IniFile.m_ProjectSceneContext)
-      Dim sMachName As String = String.Empty
-      If EgtGetCurrMachineName(sMachName) Then
-         For Each Mach In MachineList
-            If Mach.Name = sMachName Then
-               SelectedMachine = Mach
-               Exit For
-            End If
-         Next
-      End If
-   End Sub
-
-   Friend Function BeamMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Beam"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\BeamTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' apro finestra di gestione lavorazioni travi
-         Dim sTitle = EgtMsg(9000)               'Tabelle delle lavorazioni delle travi
-         Dim BeamMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath)
-         Dim BeamMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, BeamMchsWinVM)
-         BeamMchsWinV.ShowDialog()
-      Else
-         ' Impossibile aprire l'Editor delle lavorazioni delle travi.<br/>Mancano i file di configurazione. - Errore
-         MessageBox.Show(EgtMsg(9009), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-      End If
-      Return True
-   End Function
-
-   Friend Function WallMachDb() As Boolean
-      ' Assegno le path
-      Dim sBaseDir As String = m_sMachinesRoot & "\" & m_SelectedMachine.Name & "\" & "Wall"
-      ' verifico se ci sono i file ini
-      Dim sMachTypePath As String = sBaseDir & "\MachiningTypes.ini"
-      Dim sTabTemplPath As String = sBaseDir & "\WallTableTemplate.ini"
-      If File.Exists(sMachTypePath) AndAlso File.Exists(sTabTemplPath) Then
-         ' apro finestra di gestione lavorazioni pareti
-         Dim sTitle = EgtMsg(9010)               'Tabelle delle lavorazioni delle pareti
-         Dim WallMchsWinVM As New MyBeamMachiningsWindowVM(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, False)
-         Dim WallMchsWinV As New BeamMachiningsWindowV(Application.Current.MainWindow, WallMchsWinVM)
-         WallMchsWinV.ShowDialog()
-      Else
-         ' Impossibile aprire l'Editor delle lavorazioni delle pareti.<br/>Mancano i file di configurazione. - Errore
-         MessageBox.Show(EgtMsg(9011), EgtMsg(9008), MessageBoxButton.OK, MessageBoxImage.Stop)
-      End If
-      Return True
-   End Function
-
-   Public Overrides Sub ToolDb(ByVal param As Object)
-      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-      ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
-      If Not EgtTdbReload() Then
-         EgtOutLog("Impossible reloading tool Db")
-         MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Return
-      End If
-
-      Dim ToolDbWindowVM As New MyToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Beam")
-      Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM)
-      If ToolDbWindowVM.MatType <> 0 Then
-         ToolDbWindowV.Height = 640
-         ToolDbWindowV.Width = 1024
-         ToolDbWindowV.ShowDialog()
-      Else
-         Exit Sub
-      End If
-
-   End Sub
-
-   Public Overrides Sub MachDb(ByVal param As Object)
-      If Not VerifyMachinesDir(m_sMachinesRoot) Then Return
-      ' ricarico il database per intercettare eventuali aggiornamenti fatti da altre istanze del programma (se la cartella Machines è condivisa)
-      If Not EgtMdbReload() Then
-         EgtOutLog("Impossible reloading machining Db")
-         MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Return
-      End If
-      Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, Map.refSceneHostVM.MainScene.GetCtx(), "Stone")
-      Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
-
-      If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
-         MachDbWindowV.Height = 768
-         MachDbWindowV.Width = 1024
-         MachDbWindowV.ShowDialog()
-      Else
-         Exit Sub
-      End If
-
-   End Sub
-
-   Public Overrides Sub SetUp(ByVal param As Object)
-      ' verifico che il file di configurazione attrezzaggio (lua) della macchina esista
-      If Not File.Exists(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA) Then
-         EgtOutLog("SetUp error: SetUp configuration file doesn't exist ")
-         MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 7), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-         Return
-      End If
-      ' carico Lua che contiene le funzioni per ottenere le posizioni valide dell'utensile selezionato,
-      ' e testa e uscita dell'utensile attrezzato
-      EgtLuaExecFile(CurrentMachine.sMachDir & "\Scripts\" & SETUP_LUA)
-      ' verifico che le teste riportate in configurazione esistano
-      Dim Index As Integer = 1
-      Dim nErr As Integer = 0
-      While nErr = 0
-         Dim sHead As String = String.Empty
-         nErr = 999
-         EgtLuaSetGlobIntVar("STU.INDEX", Index)
-         EgtLuaCallFunction("STU.GetTcPosHeadGroupFromPos")
-         ' Leggo variabili
-         EgtLuaGetGlobStringVar("STU.HEAD", sHead)
-         EgtLuaGetGlobIntVar("STU.ERR", nErr)
-         If nErr = 0 Then
-            If EgtGetHeadExitCount(sHead) = 0 Then
-               MessageBox.Show(EgtMsg(MSG_SETUPERRORS + 8), EgtMsg(MSG_SETUPERRORS + 1), MessageBoxButton.OK, MessageBoxImage.Error)
-               Return
-            End If
-         End If
-         Index += 1
-      End While
-      ' Reset lua
-      EgtLuaResetGlobVar("STU")
-
-      Dim SetUpWindow As New SetUpWindowV(Application.Current.MainWindow, New SetUpWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachineName))
-      SetUpWindow.Height = 614
-      SetUpWindow.Width = 1024
-      SetUpWindow.ShowDialog()
-
-   End Sub
-
-#End Region
-
-#Region "COMMANDS"
-
-#Region "BeamTable"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property BeamTable_Command As ICommand
-      Get
-         If m_cmdBeamTable Is Nothing Then
-            m_cmdBeamTable = New Command(AddressOf BeamMachDb)
-         End If
-         Return m_cmdBeamTable
-      End Get
-   End Property
-
-#End Region    ' BeamTable
-
-#Region "WallTable"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property WallTable_Command As ICommand
-      Get
-         If m_cmdWallTable Is Nothing Then
-            m_cmdWallTable = New Command(AddressOf WallMachDb)
-         End If
-         Return m_cmdWallTable
-      End Get
-   End Property
-
-#End Region    ' WallTable
-
-#End Region    ' COMMANDS
-
-End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -779,94 +779,3 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
 End Class
 
-Public Class ProdItem
-   Inherits VMBase
-
-   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
-
-   Protected m_ProdFileVM As ProdFileVM
-   Public ReadOnly Property ProdFileVM As ProdFileVM
-      Get
-         Return m_ProdFileVM
-      End Get
-   End Property
-
-   Private m_ProjFileList As New List(Of ProjectFileVM)
-   Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
-      Get
-         Return m_ProjFileList
-      End Get
-   End Property
-
-   Public ReadOnly Property sProdId As String
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
-      End Get
-   End Property
-
-   Public Overridable Property sName As String
-      Get
-         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
-   End Property
-
-   Public ReadOnly Property dtCreateDate As Date
-      Get
-         Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
-      End Get
-   End Property
-   Public ReadOnly Property sCreateDate As String
-      Get
-         Return dtCreateDate.ToString()
-      End Get
-   End Property
-
-   Public ReadOnly Property sMachine As String
-      Get
-         If Not IsNothing(m_ProdFileVM) Then
-            Return m_ProdFileVM.sMachine
-         ElseIf Not IsNothing(m_ProjFileList(0)) Then
-            Return m_ProjFileList(0).sMachine
-         Else Return ""
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsArchived As Boolean
-      Get
-         If Not IsNothing(m_ProdFileVM) Then
-            Return m_ProdFileVM.bIsArchived
-         ElseIf Not IsNothing(m_ProjFileList(0)) Then
-            Return m_ProjFileList(0).bIsArchived
-         Else
-            Return True
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property Archived_Visibility As Visibility
-      Get
-         Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
-      End Get
-   End Property
-
-   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
-      m_ProdFileVM = ProdFileVM
-      m_ProjFileList.Add(ProjFileVM)
-   End Sub
-
-   Sub New(ProjFileVM As ProjFileVM)
-      m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
-   End Sub
-
-   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
-      m_ProdFileVM = ProdFileVM
-      m_ProjFileList = ProjFileVMList
-   End Sub
-
-End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -42,6 +42,8 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
+   Protected m_GoToProd As Boolean = False
+
    Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property ProjectColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -438,7 +440,7 @@ Public MustInherit Class OpenProjectFileDialogVM
 #Region "METHODS"
 
    Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
-   Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+   Public Overridable Sub RefreshProjectList()
    End Sub
 
    Protected Sub LoadColumns(ProjectType As ProjectType)

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -14,6 +14,13 @@ Public Class ProdFileM
       m_nProjIdList = value
    End Sub
 
+   Protected m_ProjMList As List(Of ProjFileM)
+   Public ReadOnly Property ProjMList As List(Of ProjFileM)
+      Get
+         Return m_ProjMList
+      End Get
+   End Property
+
    Protected m_sName As String
    Public Property sName As String
       Get
@@ -34,6 +41,16 @@ 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()
@@ -44,7 +61,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) As ProdFileM
+                                          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
       Dim NewProjectFileM As New ProdFileM
       NewProjectFileM.m_nProdId = nProdId
       NewProjectFileM.m_nProjIdList = nProjIdList
@@ -57,6 +74,25 @@ Public Class ProdFileM
       NewProjectFileM.m_bIsActive = bIsActive
       NewProjectFileM.m_bIsProduced = bIsProduced
       NewProjectFileM.m_bIsArchived = bIsArchived
+      NewProjectFileM.m_nProjCloudId = nProjCloudId
+      Return NewProjectFileM
+   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, ProjMList As List(Of ProjFileM)) As ProdFileM
+      Dim NewProjectFileM As New ProdFileM
+      NewProjectFileM.m_nProdId = nProdId
+      NewProjectFileM.m_nProjIdList = nProjIdList
+      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+      NewProjectFileM.m_sName = sName
+      NewProjectFileM.m_nType = nType
+      NewProjectFileM.m_sMachine = sMachine
+      NewProjectFileM.m_sLockedBy = sLockedBy
+      NewProjectFileM.m_dtLock = dtLock
+      NewProjectFileM.m_bIsActive = bIsActive
+      NewProjectFileM.m_bIsProduced = bIsProduced
+      NewProjectFileM.m_bIsArchived = bIsArchived
+      NewProjectFileM.m_ProjMList = ProjMList
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb

@@ -0,0 +1,116 @@
+
+Imports EgtWPFLib5
+Imports System.Windows
+
+Public Class ProdItem
+    Inherits VMBase
+
+    Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
+
+    Protected m_ProdFileVM As ProdFileVM
+    Public ReadOnly Property ProdFileVM As ProdFileVM
+        Get
+            Return m_ProdFileVM
+        End Get
+    End Property
+
+    Private m_ProjFileList As New List(Of ProjectFileVM)
+    Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
+        Get
+            Return m_ProjFileList
+        End Get
+    End Property
+
+    Public ReadOnly Property sProdId As String
+        Get
+            Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
+        End Get
+    End Property
+
+    Public Overridable Property sName As String
+        Get
+            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
+    End Property
+
+    Public ReadOnly Property dtCreateDate As Date
+        Get
+            Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
+        End Get
+    End Property
+    Public ReadOnly Property sCreateDate As String
+        Get
+            Return dtCreateDate.ToString()
+        End Get
+    End Property
+
+    Public ReadOnly Property sMachine As String
+        Get
+            If Not IsNothing(m_ProdFileVM) Then
+                Return m_ProdFileVM.sMachine
+            ElseIf Not IsNothing(m_ProjFileList(0)) Then
+                Return m_ProjFileList(0).sMachine
+            Else Return ""
+            End If
+        End Get
+    End Property
+
+    Public ReadOnly Property bIsArchived As Boolean
+        Get
+            If Not IsNothing(m_ProdFileVM) Then
+                Return m_ProdFileVM.bIsArchived
+            ElseIf Not IsNothing(m_ProjFileList(0)) Then
+                Return m_ProjFileList(0).bIsArchived
+            Else
+                Return True
+            End If
+        End Get
+    End Property
+
+    Public ReadOnly Property Archived_Visibility As Visibility
+        Get
+            Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
+        End Get
+    End Property
+
+    Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
+        m_ProdFileVM = ProdFileVM
+        m_ProjFileList.Add(ProjFileVM)
+    End Sub
+
+    Sub New(ProjFileVM As ProjFileVM)
+        m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
+    End Sub
+
+    Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
+        m_ProdFileVM = ProdFileVM
+        m_ProjFileList = ProjFileVMList
+    End Sub
+
+
+   Public Shared Function CreateProdItem(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, ProjMList As List(Of ProjFileM)) As ProdItem
+
+
+      Dim NewProdFileM = ProdFileM.CreateProdFileM(nProdId, nProjIdList, dtCreateProjDate, sName, nType, sMachine, sLockedBy, dtLock, bIsActive, bIsProduced, bIsArchived)
+      Dim NewProdFileVM = New ProdFileVM(NewProdFileM)
+      Dim NewProjFileVM As IEnumerable(Of ProjectFileVM)
+      NewProjFileVM = ProjMList.Select(Of ProjFileVM)(Function(j) New ProjFileVM(j)).ToList
+      Dim NewProdItem = New ProdItem(NewProdFileVM, NewProjFileVM.ToList)
+
+      Return NewProdItem
+   End Function
+
+   Public Shared Function CreateProdItem(ProjFileM As ProjFileM) As ProdItem
+
+      Dim NewProdItem = New ProdItem(New ProjFileVM(ProjFileM))
+
+      Return NewProdItem
+   End Function
+
+End Class

EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb

@@ -29,25 +29,35 @@ 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
+   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
 
 #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) 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, Optional nProjCloudId As Integer = 0) As ProjFileM
       Dim NewProjectFileM As New ProjFileM
       NewProjectFileM.m_nProjId = nProjId
       NewProjectFileM.m_nProdId = nProdId
@@ -62,6 +72,7 @@ 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/Configuration.vb

@@ -1,24 +0,0 @@
-Public Module Configuration
-
-   Private m_bOnlyProd As Boolean
-   Public ReadOnly Property bOnlyProd As Boolean
-      Get
-         Return m_bOnlyProd
-      End Get
-   End Property
-   Public Sub SetOnlyProd(value As Boolean)
-      m_bOnlyProd = value
-   End Sub
-
-   Private m_bModifySetup As Boolean
-   Public ReadOnly Property bModifySetup As Boolean
-      Get
-         Return m_bModifySetup
-      End Get
-   End Property
-   Public Sub SetModifySetup(value As Boolean)
-      m_bModifySetup = value
-   End Sub
-
-
-End Module

EgtBEAMWALL.Core/Utility/DbControllers.vb

@@ -0,0 +1,22 @@
+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/Enum.vb

@@ -63,7 +63,6 @@ Public Enum StatusMapOpType
    ChangeProdInProdRequest = 16
    OpenPageInViewOptimRequest = 17
    MachGroupValidationUpdate = 18
-   ChangeProdInOnlyProdRequest = 19
 End Enum
 
 Public Enum DimensionType

EgtBEAMWALL.Core/Utility/MachLog.vb

@@ -3,6 +3,7 @@
 #Region "Private Fields"
 
    Public Enum MachLogTypes
+      NULL = 0
       PART_STATUS = 1
       MACHGROUP_STATUS = 2
       MACHINE_MODE = 3
@@ -13,20 +14,13 @@
       ALARM = 8
       OPERATOR_MSG = 9
       PROGRAM_SEND = 10
+      APPLICATION = 11
    End Enum
 
-   Private m_AlarmCode As String
    Private m_AlarmDateTime As DateTime
-   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_nProdId As Integer
+   Private m_ResultType As MachLogTypes
+   Private m_SupervisorId As String
    Private m_VarValue As String
 
    ' variabili del log macchina
@@ -96,18 +90,10 @@
 #Region "Protected Constructors"
 
    Protected Sub New()
-      m_AlarmCode = ""
       m_AlarmDateTime = DateTime.MinValue
-      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_nProdId = 0
       m_ResultType = ResultTypes.NULL
-      m_VarAddress = ""
+      m_SupervisorId = ""
       m_VarValue = ""
    End Sub
 
@@ -115,63 +101,15 @@
 
 #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 AlarmMessage As String
+   Public ReadOnly Property ProdId As Integer
       Get
-         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
+         Return m_nProdId
       End Get
    End Property
 
@@ -183,7 +121,7 @@
 
    Public ReadOnly Property VarAddress As String
       Get
-         Return m_VarAddress
+         Return m_SupervisorId
       End Get
    End Property
 
@@ -199,28 +137,20 @@
 
    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_CommandType = LogCommandTypes.NEWOP
-      NewMachLog.m_newOpState = newOpState
+      NewMachLog.m_nProdId = 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_CommandType = CommandTypes.READ_TPA
-      NewMachLog.m_CommandExecutedCorrectly = CommandExecutedCorrectly
-      NewMachLog.m_VarAddress = VarAddress
+      NewMachLog.m_SupervisorId = VarAddress
       NewMachLog.m_VarValue = VarValue
       NewMachLog.m_AlarmDateTime = DateTime.Now()
       Return NewMachLog
@@ -228,20 +158,18 @@
 
    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, SupervisorID As String)
+   Public Shared Function CreateMachLog(EventType As MachLogTypes, EventDateTime As DateTime, Value As String, nProdId As Integer, SupervisorID As String)
       Dim NewMachEvent As New MachLog
       NewMachEvent.m_ResultType = EventType
       NewMachEvent.m_AlarmDateTime = EventDateTime
       NewMachEvent.m_VarValue = Value
-      NewMachEvent.m_VarAddress = SupervisorID
+      NewMachEvent.m_nProdId = nProdId
+      NewMachEvent.m_SupervisorId = SupervisorID
       Return NewMachEvent
    End Function
 
@@ -252,18 +180,10 @@
    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_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_nProdId = newOpState
       NewMachLog.m_ResultType = ResultType
-      NewMachLog.m_VarAddress = VarAddress
+      NewMachLog.m_SupervisorId = VarAddress
       NewMachLog.m_VarValue = VarValue
 
       Return NewMachLog

EgtBEAMWALL.Core/Utility/Material.vb

@@ -0,0 +1,111 @@
+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

@@ -0,0 +1,121 @@
+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,77 +15,91 @@ Public Class SectionXMaterial
       m_nType = nType
    End Sub
 
-   Protected m_Material As List(Of String)
-   Public ReadOnly Property sMaterial As List(Of String)
+   Public ReadOnly Property sMaterial As String
       Get
-         Return m_Material
+         Return m_MaterialM.sMaterial
       End Get
    End Property
 
-   Protected m_MaterialForSameSection_List As New List(Of String)
-   Public Property MaterialForSameSection_List As List(Of String)
+   Public ReadOnly Property sWarehouseMaterial As String
       Get
-         Return m_MaterialForSameSection_List
+         Return m_MaterialM.sWarehouseMaterial
       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
+   '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
       Get
-         Return m_SelMaterialForSameSection
+         Return m_MaterialM
       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_dW
+         Return m_MaterialM.dW
       End Get
    End Property
 
-   Protected m_dH As Double = 0
    Public ReadOnly Property dH As Double
       Get
-         Return m_dH
+         Return m_MaterialM.dH
       End Get
    End Property
 
-   Protected m_dL As Double = 0
    Public ReadOnly Property dL As Double
       Get
-         Return m_dL
+         Return m_MaterialM.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_dW, 3) & " x " & LenToString(m_dH, 3) & " " & sAlias
+            Return LenToString(m_MaterialM.dW, 3) & " x " & LenToString(m_MaterialM.dH, 3) & " " & If(GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) = 1, sWarehouseMaterial, sMaterial)
          ElseIf m_nType = MachineType.WALL Then
-            Return LenToString(m_dH, 3) & " " & sAlias
+            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
          Else Return ""
          End If
       End Get
    End Property
 
    Shared Operator =(ByVal S1 As SectionXMaterial, ByVal S2 As SectionXMaterial) As Boolean
-      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)))
+      Return S1.m_MaterialM = S2.m_MaterialM
    End Operator
 
    Shared Operator <>(ByVal S1 As SectionXMaterial, ByVal S2 As SectionXMaterial) As Boolean
@@ -99,122 +113,110 @@ Public Class SectionXMaterial
       Return False
    End Function
 
-   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String)
+   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, sWarehouseMaterial As String)
       If m_nType = BWType.BEAM Then
-         m_dW = dW
-         m_dH = dH
+         m_MaterialM = New MaterialM(dW, dH, 0, sMaterial, sWarehouseMaterial)
       ElseIf m_nType = BWType.WALL Then
-         m_dH = dH
+         m_MaterialM = New MaterialM(0, dH, 0, sMaterial, sWarehouseMaterial)
       Else
-         m_dW = dW
-         m_dH = dH
-         m_dL = dL
+         m_MaterialM = New MaterialM(dW, dH, dL, sMaterial, sWarehouseMaterial)
       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
 
-   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
+   Sub New(MaterialM As MaterialM)
+      m_MaterialM = MaterialM
    End Sub
 
-#End Region ' Import BTL <-> Warehouse
+   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 Class
 

EgtBEAMWALL.DataLayer/App.config

@@ -1,49 +1,81 @@
 <?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="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>
+    <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>
 </configuration>

EgtBEAMWALL.DataLayer/Controllers/AliasController.cs

@@ -0,0 +1,270 @@
+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,7 +1,9 @@
 using NLog;
 using System;
 using System.Linq;
+using System.Runtime.Remoting.Contexts;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
@@ -41,7 +43,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             bool answ = false;
             string domain = isNetwork ? "%" : "localhost";
-            answ = doCheckCreate(username, pwd, answ, domain, false);
+            answ = doCheckCreate(username, pwd, domain, false);
             if (answ)
             {
                 doGrantPriv(username, domain, "ALL ON *.*");
@@ -76,36 +78,67 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             bool answ = false;
 
-            // in primis refresh delle view
-            string sqlCommand = @"CREATE OR REPLACE VIEW v_expProdRaw AS
-                                    SELECT DbId, AlarmDtEvent AS DtEvent, VarValue,
+            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,
                                     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 ResultType = 1
-                                    AND VarAddress = 1;
+                                    WHERE EvType = 1
+                                    AND SupervId = 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, answ, domain, true);
-            if (answ)
-            {
-                doGrantPriv(username, domain, "USAGE ON *.*");
-                doGrantPriv(username, domain, $"SELECT ON {dbName}.v_expProd");
+                    // 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)
+            {
+                string errMessage = $"EXCEPTION on DbController.refreshViews: {Environment.NewLine}{exc}";
+                Console.WriteLine(errMessage);
+                Log.Error(errMessage);
             }
-
             return answ;
         }
 
@@ -157,43 +190,49 @@ 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, bool answ, string domain, bool force)
+        private bool doCheckCreate(string username, string pwd, string domain, bool force)
         {
-            // ricerca utente...
-            var numUser = adbCtx
-                .UserList
-                .Where(x => x.User == username)
-                .ToList()
-                .Count;
-            if (numUser > 0)
+            bool answ = false;
+            try
             {
-                answ = true;
-            }
-            if (!answ)
-            {
-                // creo utente
-                string sqlCommand = $"DROP USER  IF EXISTS {username};";
-                if (force)
+                // 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;
                 }
-                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;
             }
-
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione in doCheckCreate:{Environment.NewLine}{exc}");
+            }
             return answ;
         }
 

EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs

@@ -1,4 +1,5 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
+using EgwProxy.MagMan.DTO;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -18,6 +19,24 @@ 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>
@@ -25,24 +44,29 @@ 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()
                 {
-                    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
+                    EvType = coreMacLog.EventType,
+                    DtEvent = coreMacLog.AlarmDateTime,
+                    SupervId = coreMacLog.VarAddress,
+                    VarValue = coreMacLog.VarValue,
+                    ProdId = coreMacLog.ProdId,
+                    ProjCloudId = projCloudId
                 };
             }
             return answ;
@@ -55,7 +79,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.MachLog ConvertToCore(LogMachineModel dbLog)
         {
-            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);
+            var newRecord = (Core.MachLog)Core.MachLog.CreateMachLog(dbLog.EvType, dbLog.DtEvent, dbLog.VarValue, dbLog.ProdId, dbLog.SupervId);
             return newRecord;
         }
 
@@ -66,38 +90,36 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public bool Create(LogMachineModel newLogMac)
         {
-            bool fatto = false;
+            bool done = false;
             try
             {
-                try
+                using (var locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
                 {
-                    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);
+                    // Add to database
+                    locDbCtx.LogMachineList.Add(newLogMac);
+                    // Commit changes
+                    locDbCtx.SaveChanges();
+                    done = true;
                 }
             }
-            catch
-            { }
-            return fatto;
+            catch (Exception exc)
+            {
+                string errMessage = $"EXCEPTION on LogMachine.Create: {Environment.NewLine}{exc}";
+                Console.WriteLine(errMessage);
+                Log.Error(errMessage);
+            }
+            return done;
         }
 
         /// <summary>
         /// Create machine LOG record (da modello dati CORE)
         /// </summary>
-        /// <param name="newLogMac"></param>
+        /// <param name="newLogMac">Record Log</param>
+        /// <param name="projDbId">ProjID da DB (locale)</param>
         /// <returns></returns>
         public bool Create(Core.MachLog newMachLog)
         {
+            // converto record
             var dbLogModel = ConvertFromCore(newMachLog);
             return Create(dbLogModel);
         }
@@ -147,9 +169,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();
             }
         }
 
@@ -165,10 +187,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 // retrieve
                 return localDbCtx
-                .LogMachineList
-                .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
-                .OrderBy(x => x.AlarmDatetime)
-                .ToList();
+                        .LogMachineList
+                        .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
+                        .OrderBy(x => x.DtEvent)
+                        .ToList();
             }
         }
 
@@ -210,13 +232,195 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 // retrieve
                 return localDbCtx
-                .LogMachineList
-                .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
-                .OrderByDescending(x => x.AlarmDatetime)
-                .ToList();
+                        .LogMachineList
+                        .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
+                        .OrderByDescending(x => x.DtEvent)
+                        .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

@@ -0,0 +1,322 @@
+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

@@ -0,0 +1,538 @@
+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 locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                answ = locallocalDbCtx
+                answ = locDbCtx
                         .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 locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
-                var item2upd = locallocalDbCtx
+                var item2upd = locDbCtx
                                     .PartList
                                     .Where(x => x.PartDbId == updItem.PartDbId)
                                     .SingleOrDefault();
@@ -233,14 +233,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     try
                     {
                         // update, vers 1...
-                        locallocalDbCtx.Entry(item2upd).CurrentValues.SetValues(updItem);
+                        locDbCtx.Entry(item2upd).CurrentValues.SetValues(updItem);
 
                         //// update, vers 2
                         //localDbCtx.PartList.Remove(item2del);
                         //localDbCtx.PartList.Add(updItem);
 
                         // Commit changes
-                        locallocalDbCtx.SaveChanges();
+                        locDbCtx.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 locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locallocalDbCtx
+                    var item2upd = locDbCtx
                         .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
-                        locallocalDbCtx.SaveChanges();
+                        locDbCtx.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 locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locallocalDbCtx
+                    var item2upd = locDbCtx
                         .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
-                        locallocalDbCtx.SaveChanges();
+                        locDbCtx.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 locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locallocalDbCtx
+                    var item2upd = locDbCtx
                         .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
-                        locallocalDbCtx.SaveChanges();
+                        locDbCtx.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 ProjId + PDN
+        /// Get BtlPartDBId by ProdId + PDN
         /// </summary>
         /// <param name="ProjId"></param>
         /// <param name="PDN"></param>
@@ -414,9 +414,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int BtlPartDbId = 0;
 
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var btlPart = locallocalDbCtx
+                var btlPart = locDbCtx
                                 .BTLPartList
                                 .Where(x => x.Project.ProjId == ProjId && x.PDN == PDN)
                                 .SingleOrDefault();
@@ -430,7 +430,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         /// <summary>
-        /// Get BtlPartDBId by ProjId + BtlPartId
+        /// Get BtlPartDBId by ProdId + BtlPartId
         /// </summary>
         /// <param name="ProjId"></param>
         /// <param name="BtlPartId"></param>

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -1,8 +1,11 @@
 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
@@ -20,6 +23,42 @@ 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>
@@ -57,6 +96,39 @@ 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>
@@ -95,6 +167,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             }
                             // segno eliminazione logica al prod
                             currProd.IsActive = false;
+                            currProd.DtLastMod = DateTime.Now;
                             // Commit changes
                             localDbCtx.SaveChanges();
                             done = true;
@@ -202,17 +275,17 @@ 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);
+            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);
         }
 
         /// <summary>
         /// Elenco prod
         /// </summary>
-        /// <param name="numRecord">Num max record da recuperare</param>
+        /// <param name="NumRecord">Num max record da recuperare</param>
         /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
         /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProdFileM> GetLastDesc(int numRecord, bool OnlyActive, bool ShowArchived = false)
+        public List<Core.ProdFileM> GetLastDesc(int NumRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
             //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
@@ -220,9 +293,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // se numRecord = 0 --> passo tutti
-                if (numRecord == 0)
+                if (NumRecord == 0)
                 {
-                    numRecord = localDbCtx.ProdList.Count();
+                    NumRecord = localDbCtx.ProdList.Count();
                 }
                 // retrieve
                 dbResult = localDbCtx
@@ -235,25 +308,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(numRecord)
+                    .Take(NumRecord)
                     .ToList();
             }
 
             // 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)).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, x.ProjCloudId)).ToList();
             return result;
         }
 
         /// <summary>
         /// Elenco prod
         /// </summary>
-        /// <param name="dtStart">Inizio periodo estrazione</param>
-        /// <param name="dtEnd">Fine periodo estrazione</param>
-        /// <param name="numRecord">Num max record da recuperare</param>
+        /// <param name="DtStart">Inizio periodo estrazione</param>
+        /// <param name="DtEnd">Fine periodo estrazione</param>
+        /// <param name="NumRecord">Num max record da recuperare</param>
         /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
         /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProdFileM> GetLastDesc(DateTime dtStart, DateTime dtEnd, int numRecord, bool OnlyActive, bool ShowArchived = false)
+        public List<Core.ProdFileM> GetLastDesc(DateTime DtStart, DateTime DtEnd, int NumRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
             //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
@@ -261,14 +334,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // se numRecord = 0 --> passo tutti
-                if (numRecord == 0)
+                if (NumRecord == 0)
                 {
-                    numRecord = localDbCtx.ProdList.Count();
+                    NumRecord = localDbCtx.ProdList.Count();
                 }
                 // retrieve
                 dbResult = localDbCtx
                     .ProdList
-                    .Where(x => x.DtCreated >= dtStart && x.DtCreated <= dtEnd && (!x.IsArchived || ShowArchived))
+                    .Where(x => x.DtCreated >= DtStart && x.DtCreated <= DtEnd && (!x.IsArchived || ShowArchived))
                     // condizione join sui PROJ
                     .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
                         p => p.ProdDbId,
@@ -276,15 +349,210 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         (p, e) => p)
                     .Distinct()
                     .OrderByDescending(x => x.ProdId)
-                    .Take(numRecord)
+                    .Take(NumRecord)
                     .ToList();
             }
 
             // 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)).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, x.ProjCloudId)).ToList();
             return result;
         }
 
+        /// <summary>
+        /// Elenco prod
+        /// </summary>
+        /// <param name="NumRecord">Num max record da recuperare</param>
+        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
+        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
+        /// <returns></returns>
+        public List<Core.ProdItem> GetLastDescFull(int NumRecord, bool OnlyActive, bool ShowArchived = false)
+        {
+            List<Core.ProdItem> result = new List<Core.ProdItem>();
+            // elenco prod completi
+            List<ProdModel> dbResultProd = new List<ProdModel>();
+            // elenco proj "orfani"
+            List<ProjModel> dbResultProj = new List<ProjModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // se numRecord = 0 --> passo tutti
+                if (NumRecord == 0)
+                {
+                    NumRecord = localDbCtx.ProdList.Count();
+                }
+                // recupero PROD + proj relativi
+                dbResultProd = localDbCtx
+                            .ProdList
+                            .Where(x => (!x.IsArchived || ShowArchived))
+                            //.Include(j => j.)
+                            // condizione join sui PROJ
+                            .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
+                                p => p.ProdDbId,
+                                e => e.ProdDbId,
+                                (p, e) => p)
+                            .Distinct()
+                            .Include(j => j.ProjListNav)
+                            .OrderByDescending(x => x.ProdId)
+                            .Take(NumRecord)
+                            .ToList();
+
+                // recupero i proj "orfani"
+                dbResultProj = localDbCtx
+                            .ProjList
+                            .Where(x => (x.IsActive || !OnlyActive) && x.Prod == null)
+                            .OrderByDescending(x => x.ProjId)
+                            .Take(NumRecord)
+                            .ToList();
+            }
+
+            // conversione
+            result = dbResultProd.Select(x => ConvToCore(x)).ToList();
+            var resProj = dbResultProj.Select(x => ConvToCore(x)).ToList();
+            // sommo i risultati
+            result.AddRange(resProj);
+            return result;
+        }
+
+        /// <summary>
+        /// Elenco prod
+        /// </summary>
+        /// <param name="DtStart">Inizio periodo estrazione</param>
+        /// <param name="DtEnd">Fine periodo estrazione</param>
+        /// <param name="NumRecord">Num max record da recuperare</param>
+        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
+        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
+        /// <returns></returns>
+        public List<Core.ProdItem> GetLastDescFull(DateTime DtStart, DateTime DtEnd, int NumRecord, bool OnlyActive, bool ShowArchived = false)
+        {
+            List<Core.ProdItem> result = new List<Core.ProdItem>();
+            // elenco prod completi
+            List<ProdModel> dbResultProd = new List<ProdModel>();
+            // elenco proj "orfani"
+            List<ProjModel> dbResultProj = new List<ProjModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // se numRecord = 0 --> passo tutti
+                if (NumRecord == 0)
+                {
+                    NumRecord = localDbCtx.ProdList.Count();
+                }
+                // retrieve
+                dbResultProd = localDbCtx
+                            .ProdList
+                            .Where(x => x.DtCreated >= DtStart && x.DtCreated <= DtEnd && (!x.IsArchived || ShowArchived))
+                            // condizione join sui PROJ
+                            .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
+                                p => p.ProdDbId,
+                                e => e.ProdDbId,
+                                (p, e) => p)
+                            .Distinct()
+                            .Include(j => j.ProjListNav)
+                            .OrderByDescending(x => x.ProdId)
+                            .Take(NumRecord)
+                            .ToList();
+
+                // recupero i proj "orfani"
+                dbResultProj = localDbCtx
+                            .ProjList
+                            .Where(x => (x.IsActive || !OnlyActive) && x.Prod == null && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd))
+                            .OrderByDescending(x => x.ProjId)
+                            .Take(NumRecord)
+                            .ToList();
+            }
+            // conversione
+            result = dbResultProd.Select(x => ConvToCore(x)).ToList();
+            var resProj = dbResultProj.Select(x => ConvToCore(x)).ToList();
+            // sommo i risultati
+            result.AddRange(resProj);
+            return result;
+        }
+
+        /// <summary>
+        /// Elenco prod
+        /// </summary>
+        /// <param name="DtStart">Inizio periodo estrazione</param>
+        /// <param name="DtEnd">Fine periodo estrazione</param>
+        /// <param name="DtIsCreation">Ture: usa data creazione / False: usa data export</param>
+        /// <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="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)
+        {
+            List<Core.ProdItem> result = new List<Core.ProdItem>();
+            List<ProdModel> dbResultProd = new List<ProdModel>();
+            // elenco proj "orfani"
+            List<ProjModel> dbResultProj = new List<ProjModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // se numRecord = 0 --> passo tutti
+                if (NumRecord == 0)
+                {
+                    NumRecord = localDbCtx.ProdList.Count();
+                }
+                // retrieve
+                dbResultProd = localDbCtx
+                            .ProdList
+                            .Where(x => (!x.IsArchived || ShowArchived))
+                            // condizione join sui PROJ
+                            .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(ListName) || x.ListName.ToLower().Contains(ListName.ToLower()))
+                                    && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd)))
+                                    ),
+                                p => p.ProdDbId,
+                                e => e.ProdDbId,
+                                (p, e) => p)
+                            .Distinct()
+                            .Include(j => j.ProjListNav)
+                            .OrderByDescending(x => x.ProdId)
+                            .Take(NumRecord)
+                            .ToList();
+
+                // recupero i proj "orfani"
+                dbResultProj = localDbCtx
+                            .ProjList
+                            .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()))
+                            && (string.IsNullOrEmpty(ListName) || x.ListName.ToLower().Contains(ListName.ToLower()))
+                            && ((DtIsCreation && (x.DtCreated >= DtStart && x.DtCreated <= DtEnd)) || (!DtIsCreation && (x.DtExported >= DtStart && x.DtExported <= DtEnd))))
+                            .OrderByDescending(x => x.ProjId)
+                            .Take(NumRecord)
+                            .ToList();
+            }
+            // conversione
+            result = dbResultProd.Select(x => ConvToCore(x)).ToList();
+            var resProj = dbResultProj.Select(x => ConvToCore(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>
@@ -338,6 +606,25 @@ 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?)
@@ -358,7 +645,11 @@ 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;
@@ -388,9 +679,13 @@ 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;
@@ -407,7 +702,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     currProd.Locked = Locked;
                     currProd.LockDate = DateTime.Now;
                     currProd.LockedBy = Locked ? UserKey : "";
-                    localDbCtx.Entry(currProd).State = System.Data.Entity.EntityState.Modified;
+                    localDbCtx.Entry(currProd).State = EntityState.Modified;
 
                     var currProj = localDbCtx
                         .ProjList
@@ -420,7 +715,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         item.Locked = Locked;
                         item.LockDate = DateTime.Now;
                         item.LockedBy = Locked ? UserKey : "";
-                        localDbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
+                        localDbCtx.Entry(item).State = EntityState.Modified;
                     }
                 }
 
@@ -483,6 +778,36 @@ 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>
@@ -511,6 +836,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     {
                         // aggiorno valore descrizione
                         currData.IsArchived = IsArchived;
+                        currData.DtLastMod = DateTime.Now;
 
                         // update dei proj relativi
                         foreach (var item in proj2update)
@@ -538,6 +864,64 @@ 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>
@@ -807,7 +1191,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return coreConv(currData);
+            return ConvToCoreFile(currData);
         }
 
         /// <summary>
@@ -829,7 +1213,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .SingleOrDefault();
                     if (currData != null)
                     {
-                        // aggiorno valore BTL
+                        // aggiorno valore tipo
                         currData.PType = PType;
 
                         // Commit changes
@@ -849,7 +1233,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return coreConv(currData);
+            return ConvToCoreFile(currData);
         }
 
         /// <summary> Return User Code/Key that Locks by ProdId (proj & prod) </summary> <param
@@ -902,22 +1286,68 @@ 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);
-            return answ;
-        }
-
         protected List<int> ProjIdByProd(int ProdId)
         {
             var ProjCtr = new ProjController();
             return ProjCtr.GetByProdAsc(ProdId).Select(y => y.nProjId).ToList();
-            //return DbManager.obj.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;
         }
 
         #endregion Protected Methods

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -1,4 +1,5 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
+using EgwProxy.MagMan.DTO;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -19,9 +20,75 @@ 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 : ProjId (already present) for overwrite
+        /// =0 : NOT found &gt;0 : ProdId (already present) for overwrite
         /// </summary>
         /// <param name="BTLFileName"></param>
         /// <returns></returns>
@@ -33,6 +100,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 var dbResult = localDbCtx
                        .ProjList
                        .Where(x => x.BTLFileName == BTLFileName)
+                       //valutare se usare solo attivi...
+                       //.Where(x => x.BTLFileName == BTLFileName && x.IsActive == true)
                        .FirstOrDefault();
 
                 //se avesse trovato-- > riporto id...
@@ -45,7 +114,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         /// <summary>
-        /// Delete Proj logically / on DB by ProjId
+        /// 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
         /// </summary>
         /// <param name="ProjId"></param>
         /// <param name="IsLogical"></param>
@@ -160,43 +244,53 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public ProjModel FindByProjDbId(int ProjDbId)
         {
-            ProjModel answ;
+            ProjModel answ = new ProjModel();
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                answ = localDbCtx
-                        .ProjList
-                        .Where(x => x.ProjDbId == ProjDbId)
-                        .SingleOrDefault();
+                try
+                {
+                    answ = localDbCtx
+                            .ProjList
+                            .Where(x => x.ProjDbId == ProjDbId)
+                            .SingleOrDefault();
+                }
+                catch
+                { }
             }
             return answ;
         }
 
         /// <summary>
-        /// Get record by ProjId
+        /// Get record by ProdId
         /// </summary>
         /// <param name="ProjId"></param>
         /// <returns></returns>
         public ProjModel FindByProjId(int ProjId)
         {
-            ProjModel answ;
+            ProjModel answ = new ProjModel();
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                answ = localDbCtx
-               .ProjList
-                .Where(x => x.ProjId == ProjId)
-                .SingleOrDefault();
+                try
+                {
+                    answ = localDbCtx
+                   .ProjList
+                    .Where(x => x.ProjId == ProjId)
+                    .SingleOrDefault();
+                }
+                catch
+                { }
             }
             return answ;
         }
 
         /// <summary>
-        /// Get record by ProjId converted
+        /// Get record by ProdId converted
         /// </summary>
         /// <param name="ProjId"></param>
         /// <returns></returns>
         public Core.ProjFileM FindByProjIdConv(int ProjId)
         {
-            return coreConv(FindByProjId(ProjId));
+            return ConvToCore(FindByProjId(ProjId));
         }
 
         /// <summary>
@@ -234,7 +328,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     .OrderBy(x => x.ProdDbId)
                     .ToList();
                 // conversione
-                answ = dbRes.Select(x => coreConv(x)).ToList();
+                answ = dbRes.Select(x => ConvToCore(x)).ToList();
             }
             return answ;
         }
@@ -274,7 +368,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .OrderByDescending(x => x.ProdDbId)
                             .ToList();
                 // conversione
-                answ = dbRes.Select(x => coreConv(x)).ToList();
+                answ = dbRes.Select(x => ConvToCore(x)).ToList();
             }
             return answ;
         }
@@ -327,7 +421,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => coreConv(x)).ToList();
+                answ = dbRes.Select(x => ConvToCore(x)).ToList();
             }
             return answ;
         }
@@ -358,7 +452,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => coreConv(x)).ToList();
+                answ = dbRes.Select(x => ConvToCore(x)).ToList();
             }
             return answ;
         }
@@ -391,7 +485,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => coreConv(x)).ToList();
+                answ = dbRes.Select(x => ConvToCore(x)).ToList();
             }
             return answ;
         }
@@ -446,7 +540,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return nextId;
         }
 
-        /// <summary> Manage Lock by ProjId (proj & prod) </summary> <param name="ProjId">ID
+        /// <summary> Manage Lock by ProdId (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")
@@ -497,7 +591,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // salvataggio
                 localDbCtx.SaveChanges();
             }
-            return coreConv(currProj);
+            return ConvToCore(currProj);
         }
 
         /// <summary>
@@ -527,7 +621,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 currProj.IsNew = false;
                 localDbCtx.SaveChanges();
             }
-            return coreConv(currProj);
+            return ConvToCore(currProj);
         }
 
         /// <summary>
@@ -569,7 +663,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.Update: req item was not found | ProjId {updItem.ProjId} | ProjDbId {updItem.ProjDbId} | ProdDbId {updItem.ProdDbId}";
+                    string errMessage = $"ERROR on Proj.Update: req item was not found | ProdId {updItem.ProjId} | ProjDbId {updItem.ProjDbId} | ProdDbId {updItem.ProdDbId}";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
@@ -581,7 +675,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// Update record su DB x elenco BTLParts
         /// </summary>
         /// <param name="ProjId"></param>
-        /// <param name="newBTLFileName"></param>
+        /// <param name="BtlPartList"></param>
         /// <returns></returns>
         public ProjModel UpdateBtlParts(int ProjId, List<Core.BTLPartM> BtlPartList)
         {
@@ -661,7 +755,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.UpdateBtlParts: req item was not found | ProjId {ProjId} | BtlPartList {BtlPartList.Count} items";
+                    string errMessage = $"ERROR on Proj.UpdateBtlParts: req item was not found | ProdId {ProjId} | BtlPartList {BtlPartList.Count} items";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
@@ -704,13 +798,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.UpdateDescription: req item was not found | ProjId {ProjId} | Description {Description}";
+                    string errMessage = $"ERROR on Proj.UpdateDescription: req item was not found | ProdId {ProjId} | Description {Description}";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
             }
 
-            return coreConv(currData);
+            return ConvToCore(currData);
         }
 
         /// <summary>
@@ -749,7 +843,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             // se ne ho esattamente 1 nel DB allora DEVE essere il record Parent
                             if (duplicateList.Count == 1)
                             {
-                                // verifico se ProjId variato
+                                // verifico se ProdId variato
                                 if (!duplicateList[0].ProjId.Equals(currData.ProjId))
                                 {
                                     // in questo caso ho il PRIMO duplicato
@@ -795,13 +889,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.UpdateInfo: req item was not found | ProjId {ProjId} | Description {BTLFileName} | ListName {ListName} | DtExported {DtExported} | PType {PType} | Machine {Machine}";
+                    string errMessage = $"ERROR on Proj.UpdateInfo: req item was not found | ProdId {ProjId} | Description {BTLFileName} | ListName {ListName} | DtExported {DtExported} | PType {PType} | Machine {Machine}";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
             }
 
-            return coreConv(currData);
+            return ConvToCore(currData);
         }
 
         /// <summary>
@@ -831,7 +925,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     }
                     else
                     {
-                        string errMessage = $"ERROR on Proj.UpdateListName: req item was not found | ProjId {ProjId} | ListName {ListName}";
+                        string errMessage = $"ERROR on Proj.UpdateListName: req item was not found | ProdId {ProjId} | ListName {ListName}";
                         Console.WriteLine(errMessage);
                         Log.Error(errMessage);
                     }
@@ -843,7 +937,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return coreConv(currData);
+            return ConvToCore(currData);
         }
 
         /// <summary>
@@ -874,7 +968,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     }
                     else
                     {
-                        string errMessage = $"ERROR on Proj.UpdateMachine: req item was not found | ProjId {ProjId} | Machine {Machine}";
+                        string errMessage = $"ERROR on Proj.UpdateMachine: req item was not found | ProdId {ProjId} | Machine {Machine}";
                         Console.WriteLine(errMessage);
                         Log.Error(errMessage);
                     }
@@ -886,28 +980,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return coreConv(currData);
+            return ConvToCore(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

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

EgtBEAMWALL.DataLayer/DatabaseContext.cs

@@ -7,6 +7,7 @@ using System.IO;
 
 namespace EgtBEAMWALL.DataLayer
 {
+#if false
     //[DbConfigurationType(typeof(MySqlEFConfiguration))]
     public class aMySqlConfiguration : MySqlEFConfiguration
     {
@@ -19,7 +20,8 @@ namespace EgtBEAMWALL.DataLayer
         }
 
         #endregion Public Constructors
-    }
+    } 
+#endif
 
     [DbConfigurationType(typeof(MySqlEFConfiguration))]
     public class DatabaseContext : DbContext
@@ -38,6 +40,21 @@ 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>
@@ -80,6 +97,27 @@ 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

@@ -0,0 +1,35 @@
+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,86 +16,53 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         #region Public Properties
 
         /// <summary>
-        /// Codice Allarme
+        /// Chiave primaria evento LOG
         /// </summary>
-        [Column("AlarmCode")]
-        public string AlarmCode { get; set; } = "";
-
-        /// <summary>
-        /// Data Evento
-        /// </summary>
-        [Column("AlarmDtEvent")]
-        public DateTime AlarmDatetime { get; set; } = DateTime.Now;
-
-        /// <summary>
-        /// Messaggio Allarme
-        /// </summary>
-        [Column("AlarmMessage")]
-        public string AlarmMessage { get; set; } = "";
-
-        /// <summary>
-        /// Alarm Operation
-        /// </summary>
-        [Column("AlarmOperation")]
-        public int AlarmOperation { get; set; } = 0;
-
-        /// <summary>
-        /// Alarm Type
-        /// </summary>
-        [Column("AlarmType")]
-        public int AlarmType { get; set; } = 0;
-
-        /// <summary>
-        /// 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;
+        [Column("EvType")]
+        public Core.MachLog.MachLogTypes EvType { get; set; } = Core.MachLog.MachLogTypes.NULL;
 
         /// <summary>
-        /// Indirizzo VAR
+        /// Data Evento
         /// </summary>
-        [Column("VarAddress")]
-        public string VarAddress { get; set; } = "";
+        [Column("DtEvent")]
+        public DateTime DtEvent { get; set; } = DateTime.Now;
 
         /// <summary>
-        /// Valore VAR
+        /// Key prod attivo (DB locale)
+        /// </summary>
+        [Column("ProdId")]
+        public int ProdId { get; set; } = 0;
+
+        /// <summary>
+        /// Key progetto (cloud)
+        /// </summary>
+        [Column("ProjCloudId")]
+        public int ProjCloudId { get; set; } = 0;
+
+        /// <summary>
+        /// ID Supervisore (Indirizzo VAR)
+        /// </summary>
+        [Column("SupervId")]
+        public string SupervId { get; set; } = "";
+
+        /// <summary>
+        /// Valore VAR (oggetto del log da decodificare)
         /// </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

@@ -0,0 +1,58 @@
+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

@@ -0,0 +1,119 @@
+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>
-    /// Tabelal delle singole istsanze prodotte\
+    /// Tabella delle singole istanze prodotte
     /// </summary>
     [Table("PartList")]
     public class PartModel

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -1,7 +1,5 @@
 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;
@@ -19,6 +17,11 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
+        public ProdModel()
+        {
+            ProjListNav = new HashSet<ProjModel>();
+        }
+
         /// <summary>
         /// Chiave univoca DB
         /// </summary>
@@ -54,6 +57,11 @@ 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>
@@ -75,7 +83,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; } = DateTime.MinValue;
+        public DateTime LockDate { get; set; } = new DateTime(1900, 01, 01);
 
         /// <summary>
         /// Record attivo (se false == cancellazione logica)
@@ -98,6 +106,18 @@ 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>
+        public virtual ICollection<ProjModel> ProjListNav { get; set; }
+
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/DatabaseModels/ProjModel.cs

@@ -65,6 +65,11 @@ 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>
@@ -87,7 +92,7 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// dispositivo in rete
         /// </summary>
         [Column("LockDate")]
-        public DateTime LockDate { get; set; } = DateTime.MinValue;
+        public DateTime LockDate { get; set; } = new DateTime(1900, 01, 01);
 
         /// <summary>
         /// Record attivo (se false == cancellazione logica)

EgtBEAMWALL.DataLayer/DatabaseModels/RawItemModel.cs

@@ -0,0 +1,129 @@
+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,14 +28,31 @@ namespace EgtBEAMWALL.DataLayer
         #region Public Properties
 
         /// <summary>
-        /// DB Connection string per azioni amministrative
+        /// DB Connection string per azioni amministrative:
+        /// aggiunto parametro "allow user variables", da https://forums.mysql.com/read.php?38,609672,610320#msg-610320
         /// </summary>
         public static string ADMIN_CONNECTION_STRING { get; set; } = "";
 
         /// <summary>
-        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;)
+        /// 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!;
         /// </summary>
-        public static string CONNECTION_STRING { get; set; } = "";
+        //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";
 
         #endregion Public Properties
 
@@ -73,8 +90,10 @@ namespace EgtBEAMWALL.DataLayer
         /// <returns></returns>
         public static bool CheckViews(string nKey, string sKey)
         {
-            // esecuzione script di install locale
-            return Controllers.DbController.man.refreshViews(DATABASE_NAME);
+            return false;
+            // commento, scambiare con migrations da file?!?
+            //// esecuzione script di install locale
+            //return Controllers.DbController.man.refreshViews(DATABASE_NAME);
         }
 
         /// <summary>
@@ -83,9 +102,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: --skip-extended-insert)</param>
+        /// <param name="exportOpt">Opzioni in fase di export | default:  --add-drop-database --skip-extended-insert --hex-blob</param>
         /// <returns></returns>
-        public static bool DataBaseDumpToFile(string zipFilePath, string dbName = "", string mysqlDumpPath = "mysqldump", string exportOpt = "--skip-extended-insert")
+        public static bool DataBaseDumpToFile(string zipFilePath, string dbName = "", string mysqlDumpPath = "mysqldump", string exportOpt = "--add-drop-database --skip-extended-insert --hex-blob")
         {
             bool fatto = false;
             // fix path eseguibile
@@ -119,12 +138,16 @@ 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} {dbName} {exportOpt} > {tempSqlPath}";
+            string callScript = $"\"{mysqlDumpPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} --databases {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
@@ -249,9 +272,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";
+            CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};SslMode=None;allow user variables=true";
             // 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";
+            ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;SslMode=none;CHARSET=utf8;allow user variables=true";
         }
 
         /// <summary>

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -37,8 +37,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <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 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>
     <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,38 +46,53 @@
     <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.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
+    <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>
-    <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 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>
-    <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 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>
     <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="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 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="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 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>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\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.0.1\lib\net46\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.3.2\lib\net46\NLog.dll</HintPath>
     </Reference>
-    <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 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>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -86,18 +101,25 @@
     <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=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 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>
     <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>
@@ -108,24 +130,40 @@
     <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="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 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>
   </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" />
@@ -187,6 +225,62 @@
     <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" />
@@ -235,6 +329,53 @@
     <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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,63 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,42 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,29 @@
+// <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

@@ -0,0 +1,18 @@
+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");
+        }
+    }
+}