- aggiunto riavvio comunicazione Sharp7 ogni tempo di refresh

- aggiunta scrittura variabile larghezza trave al varicamento programma
- anticipata verifica reset su ripartenza prima della scrittura nome programma da eseguire

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.Globalization
 Imports System.Windows
 Imports System.Windows.Input
 Imports System.Windows.Media
@@ -131,6 +132,16 @@ Public Class BTLFeatureM
       End Set
    End Property
 
+   Protected m_VARIANTList As New ObservableCollection(Of Integer)()
+   Public Property VARIANTList As ObservableCollection(Of Integer)
+      Get
+         Return m_VARIANTList
+      End Get
+      Set(value As ObservableCollection(Of Integer))
+         m_VARIANTList = value
+      End Set
+   End Property
+
    Protected m_sDES As String = String.Empty
    Public Property sDES As String
       Get
@@ -141,6 +152,16 @@ Public Class BTLFeatureM
       End Set
    End Property
 
+   Public Overridable Property nSelVARIANT As Integer
+      Get
+         Dim nDes As Integer = 0
+         Return If(Integer.TryParse(m_sDES, nDes), nDes, 0)
+      End Get
+      Set(value As Integer)
+         m_sDES = value.ToString()
+      End Set
+   End Property
+
    Protected m_frFRAME As New Frame3d
    Public Property frFRAME As Frame3d
       Get
@@ -244,6 +265,7 @@ Public Class BTLFeatureM
 #Region "CONSTRUCTOR"
 
    Protected Sub New()
+      CreateVariantList()
    End Sub
 
    Public Shared Function CreateNewBTLFeature() As BTLFeatureM
@@ -258,7 +280,7 @@ Public Class BTLFeatureM
       EgtGetInfo(nFeatureId, BTL_FTR_GRP, NewBTLFeature.m_nSelGRP)
       EgtGetInfo(nFeatureId, BTL_FTR_PRC, NewBTLFeature.m_nPRC)
       EgtGetInfo(nFeatureId, BTL_FTR_SIDE, NewBTLFeature.m_nSelSIDE)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPRIORITY)
+      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPriority)
       Dim nDO As Integer = 1
       If EgtGetInfo(nFeatureId, BTL_FTR_DO, nDO) Then
          NewBTLFeature.m_bDO = (nDO <> 0)
@@ -322,11 +344,22 @@ Public Class BTLFeatureM
       NewBTLFeature.m_nSelSIDE = nSIDE
       NewBTLFeature.m_nPriority = 0
       NewBTLFeature.m_bDO = True
+      NewBTLFeature.nSelVARIANT = 0
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
       Return NewBTLFeature
    End Function
 
+   Private Sub CreateVariantList()
+      Dim sMaxIndex As String = ""
+      Dim nMaxIndex As Integer = 0
+      EgtUILib.GetPrivateProfileString([VARIANT], K_MAXINDEX, "", sMaxIndex, m_sBTLIniFile)
+      Integer.TryParse(sMaxIndex, nMaxIndex)
+      For Index As Integer = 0 To nMaxIndex
+         m_VARIANTList.Add(Index)
+      Next
+   End Sub
+
 #End Region    ' CONSTRUCTOR
 
 #Region "METHODS"
@@ -362,15 +395,21 @@ Public Class BTLFeatureM
       Dim TempList As New List(Of BTLParamM)
       Dim NewBTLParam As BTLParamM = Nothing
       ' leggo tutti i P della feature
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, True, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, True, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
+      If TempList.Count <= 0 Then
+         While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, 0, True, ParamIndex, Me, NewBTLParam)
+            TempList.Add(NewBTLParam)
+            ParamIndex += 1
+         End While
+      End If
       NewBTLFeature.PBTLParamMList = TempList
       ' leggo tutti i Q della feature
       ParamIndex = 1
       TempList = New List(Of BTLParamM)
-      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, False, ParamIndex, Me, NewBTLParam)
+      While BTLIniFile.GetBeamPrivateProfileParam(m_nSelGRP, m_nPRC, nSelVARIANT, False, ParamIndex, Me, NewBTLParam)
          TempList.Add(NewBTLParam)
          ParamIndex += 1
       End While
@@ -545,7 +584,7 @@ Public Class BTLFeatureM
          For Each QPar In QBTLParamMList
             If QPar.bCustom Then EgtSetInfo(nFeatureId, QPar.sName & "A", 1)
          Next
-         EgtSetInfo( nFeatureId, BTL_FTR_PRIORITY, nPriority)
+         EgtSetInfo(nFeatureId, BTL_FTR_PRIORITY, nPriority)
          SetFeatureId(nFeatureId)
          ' imposto modificato per copie
          EgtDuploSetModified(ParentPart.nPartId)
@@ -598,6 +637,11 @@ Public Class BTLFeatureM
       Return True
    End Function
 
+   ' funzione che restituisce se la feature è un Variant
+   Public Function IsVariant() As Boolean
+      Return m_nPRC = 900
+   End Function
+
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb

@@ -64,6 +64,15 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
+   Public Overridable Property nSelVARIANT As Integer
+      Get
+         Return m_BTLFeatureM.nSelVARIANT
+      End Get
+      Set(value As Integer)
+         m_BTLFeatureM.nSelVARIANT = value
+      End Set
+   End Property
+
    Public ReadOnly Property sName As String
       Get
          Return m_BTLFeatureM.sName

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -593,4 +593,13 @@ Public Class ProcessResult
       m_nTIME = TIME
    End Sub
 
+   Public Sub ResetTypeFeature()
+      m_Type = ProcessResultTypes.PART
+      m_nTASKID = 0
+   End Sub
+   Public Sub ResetTypePart()
+      m_Type = ProcessResultTypes.BAR
+      m_nCUTID = 0
+   End Sub
+
 End Class

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -201,12 +201,14 @@
    Public Const BTL_GEN_USERATTRIBUTE = "USERATTRIBUTE"
 
    Public Const PROCESSINGS As String = "Processings"
+   Public Const [VARIANT] As String = "Variant"
    Public Const OUTLINE As String = "Outline"
    Public Const BTL_FTR_GRP As String = "GRP"
    Public Const BTL_FTR_PRC As String = "PRC"
    Public Const BTL_FTR_DO As String = "DO"
    Public Const BTL_FTR_SIDE As String = "SIDE"
    Public Const BTL_FTR_PRIORITY As String = "PRIORITY"
+   Public Const BTL_FTR_VARIANT As String = "VARIANT"
    Public Const BTL_FTR_NAME As String = "NAME"
    Public Const BTL_FTR_DES As String = "DES"
    Public Const BTL_FTR_PRID As String = "PRID"

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -23,6 +23,5 @@
    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/ConstGen.vb

@@ -14,9 +14,9 @@
 Public Module ConstGen
 
    ' File con direttorio radice dei dati
-   Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
-   Public Const S_DATA As String = "Data"
-   Public Const K_DATAROOT As String = "DataRoot"
+   'Public Const DAT_FILE_NAME As String = "DataRoot.Ini"
+   'Public Const S_DATA As String = "Data"
+   'Public Const K_DATAROOT As String = "DataRoot"
 
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "EgtBEAMWALL.lic"
@@ -24,6 +24,7 @@ Public Module ConstGen
    Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
+   Public Const K_MAXINDEX As String = "MaxIndex"
 
    ' Pagine del programma
    Public Enum Pages As Integer
@@ -50,7 +51,7 @@ Public Module ConstGen
    Public Const SUPGENLOG_FILE_NAME As String = "EgtBEAMWALL.SupervisorLog#.txt"
 
    ' Sottodirettorio di configurazione
-   Public Const CONF_DIR As String = "Config"
+   'Public Const CONF_DIR As String = "Config"
    ' Sottodirettorio delle risorse
    Public Const RES_DIR As String = "Resources"
    ' Sottodirettorio temporaneo
@@ -70,7 +71,7 @@ Public Module ConstGen
    ' Sottodirettorio di default per il salvataggio con nome
    Public Const SAVE_DFL_NAMEDIR As String = "MyProjects"
    ' Sottodirettorio di default per le macchine
-   Public Const MACHINES_DFL_DIR As String = "Machines"
+   'Public Const MACHINES_DFL_DIR As String = "Machines"
    ' Sottodirettorio di default per toolmakers
    Public Const TOOLMAKERS_DFL_DIR As String = "ToolMakers"
    ' Nome file Lua con le funzioni di attrezzaggio

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -47,7 +47,6 @@ Public Module ConstIni
    Public Const K_FASTPRODUCE As String = "FastProduce"
    Public Const K_ADDPROJ As String = "AddProj"
    Public Const K_PROJECTMODE As String = "ProjectMode"
-   Public Const K_NETWAREHOUSE As String = "NetWarehouse"
 
    'Public Const S_LANGUAGES As String = "Languages"
    'Public Const K_LANGUAGE As String = "Language"
@@ -99,6 +98,7 @@ Public Module ConstIni
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
    Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
+   Public Const K_BTLAUXDIR As String = "BtlAuxDir"
 
    'Public Const S_MACH As String = "Mach"
    'Public Const K_MACHINESDIR As String = "MachinesDir"
@@ -163,8 +163,6 @@ 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 S_BACKUPANDRESTORE As String = "Backup&Restore"
    Public Const K_EXTERNALBACKUPACTIVE As String = "ExternalBackupActive"

EgtBEAMWALL.Core/Constants/ConstMachIni.vb

@@ -7,6 +7,9 @@
 
    Public Const K_NCTYPE As String = "NCType"
    Public Const K_CONNECTIONSTRING As String = "ConnectionString"
+   Public Const K_SUPERVISOR As String = "Supervisor"
+   Public Const K_SAVECNCPATH As String = "SaveCncPath"
+   Public Const K_SAVEEXT As String = "SaveExt"
 
    Public Const S_CHANNELS As String = "Channels"
 

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -116,7 +116,6 @@
       <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="ProjectFileVM\ProdItem.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
@@ -146,7 +145,6 @@
     <Compile Include="Lib\MachGroupPanelM.vb" />
     <Compile Include="MachGroupModel\MyMachGroupPanelM.vb" />
     <Compile Include="Utility\ManageWindow.vb" />
-    <Compile Include="Utility\RawPart.vb" />
     <Compile Include="Utility\MyMachine.vb" />
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
       <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
@@ -159,7 +157,6 @@
     <Compile Include="ProjectManager\ProjectFileVM.vb" />
     <Compile Include="ProjectManager\ProjFileVM.vb" />
     <Compile Include="ProjectFileVM\ProjFileM.vb" />
-    <Compile Include="Utility\Material.vb" />
     <Compile Include="Utility\SectionXMaterial.vb" />
     <Compile Include="Utility\BTLIniFile.vb" />
     <Compile Include="Utility\CoreMap.vb" />

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -186,7 +186,13 @@ Public Class MyMachGroupPanelM
                While nOutlineId <> GDB_ID.NULL
                   ' verifico che sia feature
                   If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
-                     If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
+                     Dim nCurrPrId As Integer = GDB_ID.NULL
+                     If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nCurrPrId) AndAlso nCurrPrId <> GDB_ID.NULL Then
+                        If nCurrPrId < nPRId Then
+                           EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                           nPRId += 1
+                        End If
+                        nPRId = Math.Max(nPRId - 1, nCurrPrId) + 1
                         nOutlineId = EgtGetNext(nOutlineId)
                         Continue While
                      Else
@@ -225,7 +231,14 @@ Public Class MyMachGroupPanelM
                         Dim nPRC As Integer
                         If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
                            nPRId = 0
-                           If Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                           If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                              If nPRId < nGlobPRId Then
+                                 EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                                 nPRId = nGlobPRId
+                                 nGlobPRId += 1
+                              End If
+                              nGlobPRId = Math.Max(nGlobPRId - 1, nPRId) + 1
+                           Else
                               EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
                               nPRId = nGlobPRId
                               nGlobPRId += 1

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -571,7 +571,13 @@ Public MustInherit Class PartVM
    Public Sub CalcGlobalUpdate()
       m_PartM.nCALC_GlobalState = nCALC_State
       For Each Feature In FeatureVMList
-         If Not Feature.bDO Then Continue For
+         If Not Feature.bDO Then
+            If Feature.nState = CalcStates.COLLISION AndAlso Feature.nState > m_PartM.nCALC_GlobalState Then
+               m_PartM.nCALC_GlobalState = Feature.nState
+               m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR
+            End If
+            Continue For
+         End If
          If Feature.nState > m_PartM.nCALC_GlobalState Then
             m_PartM.nCALC_GlobalState = Feature.nState
             m_PartM.nCALC_GlobalERR = Feature.nCALC_ERR

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -16,7 +16,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.12.2")>
-<Assembly: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.7.1.1")>
+<Assembly: AssemblyFileVersion("2.7.1.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -779,3 +779,94 @@ 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,8 +42,6 @@ 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
@@ -440,7 +438,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()
+   Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
    End Sub
 
    Protected Sub LoadColumns(ProjectType As ProjectType)

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -14,13 +14,6 @@ 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
@@ -41,16 +34,6 @@ Public Class ProdFileM
       End Set
    End Property
 
-   Protected m_nProjCloudId As Integer
-   Public Property nProjCloudId As Integer
-      Get
-         Return m_nProjCloudId
-      End Get
-      Set(value As Integer)
-         m_nProjCloudId = value
-      End Set
-   End Property
-
 #Region "CONSTRUCTORS"
 
    Protected Sub New()
@@ -61,7 +44,7 @@ Public Class ProdFileM
    End Function
 
    Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, Optional nProjCloudId As Integer = 0) As ProdFileM
+                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean) As ProdFileM
       Dim NewProjectFileM As New ProdFileM
       NewProjectFileM.m_nProdId = nProdId
       NewProjectFileM.m_nProjIdList = nProjIdList
@@ -74,25 +57,6 @@ 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

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

EgtBEAMWALL.Core/Utility/BTLIniFile.vb

@@ -126,7 +126,7 @@ Public Module BTLIniFile
    End Function
 
    ' funzione che ottiene il parametro P/Q usando m_nBTLBWType del modulo
-   Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
+   Public Function GetBeamPrivateProfileParam(IpGRP As Integer, IpPRC As Integer, IpVariant As Integer, IsP As Boolean, IpFeatureParamIndex As String, IpParentFeature As BTLFeatureM, ByRef IpBTLParam As BTLParamM) As Boolean
       Dim sBTLParam As String = String.Empty
       Dim sBWQParam As String = String.Empty
       If m_nBTLBWType = BWType.BEAM Then
@@ -134,7 +134,7 @@ Public Module BTLIniFile
       ElseIf m_nBTLBWType = BWType.WALL Then
          sBWQParam = "W"
       End If
-      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & IpPRC, If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
+      If EgtUILib.GetPrivateProfileString(CalcBeamPrivateProfileGRP(IpGRP) & "." & If(IpPRC = 900 AndAlso IpVariant > 0, IpPRC & "." & IpVariant, IpPRC), If(IsP, "P", "Q" & sBWQParam) & IpFeatureParamIndex, String.Empty, sBTLParam, m_sBTLIniFile) > 0 Then
          Dim sBTLParamParams() As String = sBTLParam.Split(","c)
          ' verifico numero minimo di parametri
          If sBTLParamParams.Count >= 6 Then

EgtBEAMWALL.Core/Utility/Material.vb

@@ -1,90 +0,0 @@
-Imports System.Windows
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class MaterialM
-
-   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
-
-   Protected m_sMaterial As String
-   Public ReadOnly Property sMaterial As String
-      Get
-         Return m_sMaterial
-      End Get
-   End Property
-
-   Protected m_sWarehouseMaterial As String
-   Public ReadOnly Property sWarehouseMaterial As String
-      Get
-         Return m_sWarehouseMaterial
-      End Get
-   End Property
-
-   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, sWarehouseMaterial As String)
-      m_dW = dW
-      m_dH = dH
-      m_dL = dL
-      m_sMaterial = sMaterial
-      m_sWarehouseMaterial = sWarehouseMaterial
-   End Sub
-
-   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
-
-End Class
-

EgtBEAMWALL.Core/Utility/RawPart.vb

@@ -1,107 +0,0 @@
-Imports EgtWPFLib5
-
-Public Class RawPartM
-   Inherits VMBase
-
-   Protected m_nId As Integer
-   Public ReadOnly Property nId As Integer
-      Get
-         Return m_nId
-      End Get
-   End Property
-   Public Sub SetId(nId As Integer)
-      m_nId = nId
-   End Sub
-
-   Private m_bActive As Boolean
-   Public Property bActive As Boolean
-      Get
-         Return m_bActive
-      End Get
-      Set(value As Boolean)
-         m_bActive = value
-      End Set
-   End Property
-
-   Private m_Material As MaterialM
-   Public Property Material As MaterialM
-      Get
-         Return m_Material
-      End Get
-      Set(value As MaterialM)
-         m_Material = value
-      End Set
-   End Property
-
-   Private m_dW As Double
-   Public Property dW As Double
-      Get
-         Return m_dW
-      End Get
-      Set(value As Double)
-         m_dW = value
-      End Set
-   End Property
-
-   Private m_dL As Double
-   Public Property dL As Double
-      Get
-         Return m_dL
-      End Get
-      Set(value As Double)
-         m_dL = value
-      End Set
-   End Property
-
-   Private m_nQuantity As Integer
-   Public Property nQuantity As Integer
-      Get
-         Return m_nQuantity
-      End Get
-      Set(value As Integer)
-         m_nQuantity = value
-      End Set
-   End Property
-   Private m_bUseQuantity As Boolean
-   Public Property bUseQuantity As Boolean
-      Get
-         Return m_bUseQuantity
-      End Get
-      Set(value As Boolean)
-         m_bUseQuantity = value
-      End Set
-   End Property
-
-   Sub New(SxM As MaterialM, W As Double, L As Double, Qty As Integer, Active As Boolean)
-      m_Material = SxM
-      m_dW = W
-      m_dL = L
-      m_nQuantity = Qty
-      m_bActive = Active
-   End Sub
-
-   Sub New(nId As Integer, SxM As MaterialM, W As Double, L As Double, Qty As Integer, bUseQty As Boolean, Active As Boolean)
-      m_nId = nId
-      m_Material = SxM
-      m_dW = W
-      m_dL = L
-      m_nQuantity = Qty
-      m_bUseQuantity = bUseQty
-      m_bActive = Active
-   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 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,15 +15,10 @@ Public Class SectionXMaterial
       m_nType = nType
    End Sub
 
-   Public ReadOnly Property sMaterial As String
+   Protected m_Material As List(Of String)
+   Public ReadOnly Property sMaterial As List(Of String)
       Get
-         Return m_MaterialM.sMaterial
-      End Get
-   End Property
-
-   Public ReadOnly Property sWarehouseMaterial As String
-      Get
-         Return m_MaterialM.sWarehouseMaterial
+         Return m_Material
       End Get
    End Property
 
@@ -47,59 +42,50 @@ Public Class SectionXMaterial
       End Set
    End Property
 
-   Protected m_MaterialM As MaterialM
-   Public ReadOnly Property MaterialM As MaterialM
-      Get
-         Return m_MaterialM
-      End Get
-   End Property
-
+   Protected m_dW As Double = 0
    Public ReadOnly Property dW As Double
       Get
-         Return m_MaterialM.dW
+         Return m_dW
       End Get
    End Property
 
+   Protected m_dH As Double = 0
    Public ReadOnly Property dH As Double
       Get
-         Return m_MaterialM.dH
+         Return m_dH
       End Get
    End Property
 
+   Protected m_dL As Double = 0
    Public ReadOnly Property dL As Double
       Get
-         Return m_MaterialM.dL
+         Return m_dL
       End Get
    End Property
 
    Public ReadOnly Property sSectionXMaterial As String
       Get
+         Dim sAlias As String = String.Empty
+         For Each sMatItem In sMaterial
+            sAlias &= sMatItem & ";"
+         Next
+         sAlias = sAlias.TrimEnd(";")
          If Me = Empty Then
             Return ""
          ElseIf m_nType = MachineType.BEAM Then
-            Return LenToString(m_MaterialM.dW, 3) & " x " & LenToString(m_MaterialM.dH, 3) & " " & If(GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) = 1, sWarehouseMaterial, sMaterial)
+            Return LenToString(m_dW, 3) & " x " & LenToString(m_dH, 3) & " " & sAlias
          ElseIf m_nType = MachineType.WALL Then
-            Return LenToString(m_MaterialM.dH, 3) & " " & If(GetMainPrivateProfileInt(S_WAREHOUSE, K_SHOWWAREHOUSEMATERIAL, 0) = 1, sWarehouseMaterial, sMaterial)
-         Else Return ""
-         End If
-      End Get
-   End Property
-
-   Public ReadOnly Property sWarehouseSectionXMaterial As String
-      Get
-         If Me = Empty Then
-            Return ""
-         ElseIf m_nType = MachineType.BEAM Then
-            Return LenToString(m_MaterialM.dW, 3) & " x " & LenToString(m_MaterialM.dH, 3) & " " & sWarehouseMaterial
-         ElseIf m_nType = MachineType.WALL Then
-            Return LenToString(m_MaterialM.dH, 3) & " " & sWarehouseMaterial
+            Return LenToString(m_dH, 3) & " " & sAlias
          Else Return ""
          End If
       End Get
    End Property
 
    Shared Operator =(ByVal S1 As SectionXMaterial, ByVal S2 As SectionXMaterial) As Boolean
-      Return S1.m_MaterialM = S2.m_MaterialM
+      Return (Math.Abs( S1.m_dH - S2.m_dH) < 100 * EPS_SMALL AndAlso
+              Math.Abs( S1.m_dW - S2.m_dW) < 100 * EPS_SMALL AndAlso
+              Math.Abs( S1.m_dL - S2.m_dL) < 100 * EPS_SMALL AndAlso
+              S1.m_Material.Any(Function(x) S2.m_Material.Any(Function(y) y = x)))
    End Operator
 
    Shared Operator <>(ByVal S1 As SectionXMaterial, ByVal S2 As SectionXMaterial) As Boolean
@@ -113,21 +99,25 @@ Public Class SectionXMaterial
       Return False
    End Function
 
-   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, sWarehouseMaterial As String)
+   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String)
       If m_nType = BWType.BEAM Then
-         m_MaterialM = New MaterialM(dW, dH, 0, sMaterial, sWarehouseMaterial)
+         m_dW = dW
+         m_dH = dH
       ElseIf m_nType = BWType.WALL Then
-         m_MaterialM = New MaterialM(0, dH, 0, sMaterial, sWarehouseMaterial)
+         m_dH = dH
       Else
-         m_MaterialM = New MaterialM(dW, dH, dL, sMaterial, sWarehouseMaterial)
+         m_dW = dW
+         m_dH = dH
+         m_dL = dL
       End If
+      m_Material = New List(Of String)
+      Dim sMaterialArray() As String = Split(sMaterial, ";")
+      For Each sMatItem In sMaterialArray
+         m_Material.Add(sMatItem)
+      Next
    End Sub
 
-   Sub New(MaterialM As MaterialM)
-      m_MaterialM = MaterialM
-   End Sub
-
-   Public Shared Empty As New SectionXMaterial(-1, -1, -1, "", "")
+   Public Shared Empty As New SectionXMaterial(-1, -1, -1, "")
 
 #Region "Import BTL <-> Warehouse"
 
@@ -205,14 +195,22 @@ Public Class SectionXMaterial
       End Get
    End Property
 
-   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, nQuantity As Integer, sWarehouseMaterial As String)
+   Sub New(dW As Double, dH As Double, dL As Double, sMaterial As String, nQuantity As Integer)
       If m_nType = BWType.BEAM Then
-         m_MaterialM = New MaterialM(dW, dH, 0, sMaterial, sWarehouseMaterial)
+         m_dW = dW
+         m_dH = dH
       ElseIf m_nType = BWType.WALL Then
-         m_MaterialM = New MaterialM(0, dH, 0, sMaterial, sWarehouseMaterial)
+         m_dH = dH
       Else
-         m_MaterialM = New MaterialM(dW, dH, dL, sMaterial, sWarehouseMaterial)
+         m_dW = dW
+         m_dH = dH
+         m_dL = dL
       End If
+      m_Material = New List(Of String)
+      Dim sMaterialArray() As String = Split(sMaterial, ";")
+      For Each sMatItem In sMaterialArray
+         m_Material.Add(sMatItem)
+      Next
       m_nQuantity = nQuantity
    End Sub
 

EgtBEAMWALL.DataLayer/App.config

@@ -13,7 +13,7 @@
       </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" />
+      <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">
@@ -31,7 +31,7 @@
          </dependentAssembly>
          <dependentAssembly>
             <assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.3.6.0" newVersion="1.3.6.0" />
+            <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" />
@@ -41,18 +41,6 @@
             <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-6.0.0.3" newVersion="6.0.0.3" />
-         </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.Hash.xxHash" publicKeyToken="32cd54395057cec3" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.0.8.0" newVersion="1.0.8.0" />
-         </dependentAssembly>
       </assemblyBinding>
    </runtime>
    <startup>

EgtBEAMWALL.DataLayer/Controllers/AliasController.cs

@@ -1,247 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione Alias su DB (es: materiali da BTL e su DB)
-    /// </summary>
-    public class AliasController : IDisposable
-    {
-        #region Public Constructors
-
-        public AliasController()
-        {
-        }
-
-        #endregion Public Constructors
-
-#if false
-        /// <summary>
-        /// Conversion of DB model class to base class
-        /// </summary>
-        /// <param name="coreMat"></param>
-        /// <returns></returns>
-        public static Core.AliasM ConvToCore(AliasModel dbRec)
-        {
-            Core.AliasM answ = new Core.AliasM(dbRec.ValueOriginal, dbRec.ValueAlias);
-            return answ;
-        }
-#endif
-
-        #region Public Methods
-
-        /// <summary>
-        /// Helper conversione a DTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static AliasDTO ConvToDto(AliasModel currRec)
-        {
-            AliasDTO answ = new AliasDTO()
-            {
-                ValOrig = currRec.ValueOriginal,
-                ValAlias = currRec.ValueAlias
-            };
-            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>
-        /// Get record by Key
-        /// </summary>
-        /// <param name="MatId"></param>
-        /// <returns></returns>
-        public AliasModel FindByDbId(string ValueOriginal)
-        {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                string Family = "MatCode";
-                return localDbCtx
-                        .AliasList
-                        .Where(x => x.Family == Family && x.ValueOriginal.ToLower() == ValueOriginal.ToLower())
-                        .SingleOrDefault();
-            }
-        }
-        /// <summary>
-        /// Get record by Key
-        /// </summary>
-        /// <param name="MatId"></param>
-        /// <returns></returns>
-        public AliasModel FindByDbId(string ValueOriginal, string Family)
-        {
-            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 == updItem.ValueOriginal)
-                                        .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;
-        }
-
-        #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-    }
-}

EgtBEAMWALL.DataLayer/Controllers/MagmanSyncController.cs

@@ -1,233 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione MagmanSync su DB (registrazione operazioni di sync con MagMan online)
-    /// </summary>
-    public class MagmanSyncController : IDisposable
-    {
-        #region Public Constructors
-
-        public MagmanSyncController()
-        {
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        /// <summary>
-        /// Purge dei record inviati oltre periodo di giorni indicato
-        /// </summary>
-        /// <param name="NumDayMax">Num gg max da mantenere in registro</param>
-        /// <returns></returns>
-        public bool DeleteOlder(int NumDayMax)
-        {
-            bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                DateTime adesso = DateTime.Now;
-                var items2del = localDbCtx
-                                    .SyncList
-                                    .Where(x => x.DtExe != null && adesso.Subtract(x.DtReq).TotalDays > NumDayMax);
-                try
-                {
-                    // Add to database
-                    localDbCtx.SyncList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on Alias.DeleteOlder | NumDayMax: {NumDayMax}{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>
-        /// Insert record MagmanSync
-        /// </summary>
-        /// <param name="newRec"></param>
-        /// <returns>ID record inserito</returns>
-        public int Insert(MagmanSyncModel newRec)
-        {
-            int newId = 0;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                   // inserisco record 
-                   localDbCtx.SyncList.Add(newRec);
-                    
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    newId = newRec.SyncId;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.Insert: {Environment.NewLine}{exc}");
-                }
-            }
-            return newId;
-        }
-
-        /// <summary>
-        /// Update con indicazione DtExt di completamento
-        /// </summary>
-        /// <param name="SyncId">ID record</param>
-        /// <param name="DtExe">Data-Ora exe</param>
-        /// <returns></returns>
-        public bool SetCompleted(int SyncId, DateTime DtExe)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .SyncList
-                                        .Where(x => x.SyncId == SyncId)
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        // update
-                        item2update.DtExe = DtExe;
-                        localDbCtx.Entry(item2update).State = System.Data.Entity.EntityState.Modified;
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.SetCompleted: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Update or insert record MagmanSync
-        /// </summary>
-        /// <param name="updItem"></param>
-        /// <returns></returns>
-        public bool Upsert(MagmanSyncModel updItem)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    var item2update = localDbCtx
-                                        .SyncList
-                                        .Where(x => x.SyncId == updItem.SyncId)
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        // update, vers 1...
-                        localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                    }
-                    else
-                    {
-                        localDbCtx.SyncList.Add(updItem);
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.Upsert: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Update or insert Alias record list
-        /// </summary>
-        /// <param name="updList"></param>
-        /// <returns></returns>
-        public bool UpsertList(List<MagmanSyncModel> updList)
-        {
-            bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                try
-                {
-                    foreach (var updItem in updList)
-                    {
-                        var item2update = localDbCtx
-                                            .SyncList
-                                            .Where(x => x.SyncId == updItem.SyncId)
-                                            .SingleOrDefault();
-
-                        if (item2update != null)
-                        {
-                            localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
-                        }
-                        else
-                        {
-                            localDbCtx.SyncList.Add(updItem);
-                        }
-                    }
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    fatto = true;
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"EXCEPTION on MagmanSync.UpsertList: {Environment.NewLine}{exc}");
-                }
-            }
-            return fatto;
-        }
-
-        #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-    }
-}

EgtBEAMWALL.DataLayer/Controllers/MaterialsController.cs

@@ -1,454 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using static EgtBEAMWALL.DataLayer.Controllers.MaterialsController.SearchResult;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione Materiali su DB (= magazzino locale)
-    /// </summary>
-    public class MaterialsController : IDisposable
-    {
-        #region Public Constructors
-
-        public MaterialsController()
-        {
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        /// <summary>
-        /// Conversion of DB model class to base class
-        /// </summary>
-        /// <param name="coreMat"></param>
-        /// <returns></returns>
-        public static Core.MaterialM ConvToCore(MaterialModel dbRec)
-        {
-            Core.MaterialM answ = new Core.MaterialM(dbRec.MatId, (double)dbRec.WMm, (double)dbRec.HMm, (double)dbRec.LMm, dbRec.MatCode);
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione a DTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static MaterialDTO ConvToDto(MaterialModel currRec)
-        {
-            MaterialDTO answ = new MaterialDTO()
-            {
-                MatCloudId = currRec.MatCloudId,
-                MatLocalId = currRec.MatId,
-                MatCode = currRec.MatCode,
-                MatDesc = currRec.MatDesc,
-                HMm = currRec.HMm,
-                LMm = currRec.LMm,
-                WMm = currRec.WMm
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione da DTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static MaterialModel ConvToModel(MaterialDTO currRec)
-        {
-            MaterialModel answ = new MaterialModel()
-            {
-                MatCloudId = currRec.MatCloudId,
-                MatId = currRec.MatLocalId,
-                MatCode = currRec.MatCode,
-                MatDesc = currRec.MatDesc,
-                HMm = currRec.HMm,
-                LMm = currRec.LMm,
-                WMm = currRec.WMm
-            };
-            return answ;
-        }
-
-        /// <summary>
-        /// Conversion of base class to DB model class
-        /// </summary>
-        /// <param name="coreRec"></param>
-        /// <returns></returns>
-        public static MaterialModel ConvToModel(Core.MaterialM coreRec)
-        {
-            MaterialModel answ = new MaterialModel();
-            if (coreRec != null)
-            {
-                answ = new MaterialModel()
-                {
-                    MatId = coreRec.nId,
-                    MatCode = coreRec.sMaterial,
-                    HMm = (decimal)coreRec.dH,
-                    LMm = (decimal)coreRec.dL,
-                    WMm = (decimal)coreRec.dW,
-                };
-            }
-            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, "NONE");
-            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))
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        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;
-        }
-
-        /// <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;
-                        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;
-                        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/ProdController.cs

@@ -1,9 +1,7 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
 using NLog;
 using System;
 using System.Collections.Generic;
-using System.Data.Entity;
 using System.Linq;
 using static EgtBEAMWALL.Core.ConstBeam;
 
@@ -59,75 +57,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return done;
         }
 
-        /// <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>
-        /// 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);
-            //Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived, currProd.ProjListNav.Select(j => Core.ProjFileM.CreateProjFileM(j.ProdId, currProd.ProdId, j.DtCreated, j.DtExported, j.ListName, j.BTLFileName, j.ProjDescription, j.IsNew, j.Locked, j.PType, j.Machine, j.IsActive, j.IsActive)).ToList());
-            return answ;
-        }
-
         /// <summary>
         /// Delete Prod(+proj...) logically / on DB by ProdId
         /// </summary>
@@ -273,17 +202,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, currProd.ProjCloudId);
+            return Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived);
         }
 
         /// <summary>
         /// 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);
@@ -291,9 +220,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
@@ -306,25 +235,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, x.ProjCloudId)).ToList();
+            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived)).ToList();
             return result;
         }
 
         /// <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);
@@ -332,14 +261,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,
@@ -347,189 +276,12 @@ 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, 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);
+            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived)).ToList();
             return result;
         }
 
@@ -786,64 +538,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return fatto;
         }
 
-        /// <summary>
-        /// Update record su DB x ProjectCloudId
-        /// </summary>
-        /// <param name="ProdId"></param>
-        /// <param name="Description"></param>
-        /// <returns></returns>
-        public Core.ProdFileM UpdateCloudId(int ProdId, int ProjCloudId)
-        {
-            // cerco specifico Proj
-            ProdModel currData;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                currData = localDbCtx
-                               .ProdList
-                               .Where(x => x.ProdId == ProdId)
-                               .SingleOrDefault();
-                if (currData != null)
-                {
-                    try
-                    {
-                        // aggiorno valore BTL
-                        currData.ProjCloudId = ProjCloudId;
-
-                        // salvo record PROD
-                        localDbCtx.SaveChanges();
-
-                        // cerco se ci siano prod colelgati 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>
@@ -1113,7 +807,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCoreFile(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -1135,7 +829,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .SingleOrDefault();
                     if (currData != null)
                     {
-                        // aggiorno valore tipo
+                        // aggiorno valore BTL
                         currData.PType = PType;
 
                         // Commit changes
@@ -1155,7 +849,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCoreFile(currData);
+            return coreConv(currData);
         }
 
         /// <summary> Return User Code/Key that Locks by ProdId (proj & prod) </summary> <param
@@ -1208,6 +902,17 @@ 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();

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -1,5 +1,4 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -20,72 +19,6 @@ 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
@@ -100,8 +33,6 @@ 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...
@@ -113,21 +44,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return answ;
         }
 
-        /// <summary>
-        /// Helper conversione modelli
-        /// </summary>
-        /// <param name="currRec">record in formato ProjModel</param>
-        /// <returns></returns>
-        public Core.ProjFileM ConvToCore(ProjModel currRec)
-        {
-            Core.ProjFileM answ = null;
-            if (currRec != null)
-            {
-                answ = Core.ProjFileM.CreateProjFileM(currRec.ProjId, ProdIdByProdDbId(currRec.ProdDbId), currRec.DtCreated, currRec.DtExported, currRec.ListName, currRec.BTLFileName, currRec.ProjDescription, currRec.IsNew, currRec.Locked, currRec.PType, currRec.Machine, currRec.IsActive, currRec.IsArchived, currRec.ProjCloudId);
-            }
-            return answ;
-        }
-
         /// <summary>
         /// Delete Proj logically / on DB by ProjId
         /// </summary>
@@ -280,7 +196,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProjFileM FindByProjIdConv(int ProjId)
         {
-            return ConvToCore(FindByProjId(ProjId));
+            return coreConv(FindByProjId(ProjId));
         }
 
         /// <summary>
@@ -318,7 +234,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     .OrderBy(x => x.ProdDbId)
                     .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -358,7 +274,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                             .OrderByDescending(x => x.ProdDbId)
                             .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -411,7 +327,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -442,7 +358,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -475,7 +391,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Take(numRecord)
                                 .ToList();
                 // conversione
-                answ = dbRes.Select(x => ConvToCore(x)).ToList();
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
             return answ;
         }
@@ -581,7 +497,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // salvataggio
                 localDbCtx.SaveChanges();
             }
-            return ConvToCore(currProj);
+            return coreConv(currProj);
         }
 
         /// <summary>
@@ -611,7 +527,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 currProj.IsNew = false;
                 localDbCtx.SaveChanges();
             }
-            return ConvToCore(currProj);
+            return coreConv(currProj);
         }
 
         /// <summary>
@@ -665,7 +581,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// Update record su DB x elenco BTLParts
         /// </summary>
         /// <param name="ProjId"></param>
-        /// <param name="BtlPartList"></param>
+        /// <param name="newBTLFileName"></param>
         /// <returns></returns>
         public ProjModel UpdateBtlParts(int ProjId, List<Core.BTLPartM> BtlPartList)
         {
@@ -794,7 +710,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
             }
 
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -885,7 +801,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
             }
 
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -927,7 +843,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         /// <summary>
@@ -970,13 +886,28 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     Log.Error(errMessage);
                 }
             }
-            return ConvToCore(currData);
+            return coreConv(currData);
         }
 
         #endregion Public Methods
 
         #region Protected Methods
 
+        /// <summary>
+        /// Helper conversione modelli
+        /// </summary>
+        /// <param name="currProj"></param>
+        /// <returns></returns>
+        protected Core.ProjFileM coreConv(ProjModel currProj)
+        {
+            Core.ProjFileM answ = null;
+            if (currProj != null)
+            {
+                answ = Core.ProjFileM.CreateProjFileM(currProj.ProjId, ProdIdByProdDbId(currProj.ProdDbId), currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.ProjDescription, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine, currProj.IsActive, currProj.IsArchived);
+            }
+            return answ;
+        }
+
         /// <summary>
         /// Get LAST paginated data from DB (DESC ordered)
         /// </summary>

EgtBEAMWALL.DataLayer/Controllers/RawItemsController.cs

@@ -1,352 +0,0 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgwProxy.MagMan.DTO;
-using NLog;
-using System;
-using System.Collections.Generic;
-using System.Data.Entity;
-using System.Linq;
-
-namespace EgtBEAMWALL.DataLayer.Controllers
-{
-    /// <summary>
-    /// Gestione RawItem (barre) su DB (= magazzino locale)
-    /// </summary>
-    public class RawItemsController : IDisposable
-    {
-        #region Public Constructors
-
-        public RawItemsController()
-        {
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        /// <summary>
-        /// Helper conversion da DB model class a base class (VB)
-        /// </summary>
-        /// <param name="dbRec"></param>
-        /// <returns></returns>
-        public static Core.RawPartM ConvToCore(RawItemModel dbRec)
-        {
-            // converto in primis il materiale relativo
-            Core.MaterialM matRec = MaterialsController.ConvToCore(dbRec.MaterialNav);
-            Core.RawPartM answ = new Core.RawPartM(dbRec.RawItemId, matRec, (double)dbRec.WMm, (double)dbRec.LMm, dbRec.QtyAvail, dbRec.UseQty, dbRec.IsActive);
-            return answ;
-        }
-
-        /// <summary>
-        /// Helper conversione a ItemDTO
-        /// </summary>
-        /// <param name="currRec"></param>
-        /// <returns></returns>
-        public static ItemDTO ConvToItemDto(RawItemModel currRec)
-        {
-            ItemDTO answ = new ItemDTO()
-            {
-                MatCloudId = currRec.MaterialNav != null ? currRec.MaterialNav.MatCloudId : 0,
-                MatLocalId = currRec.MatId,
-                RawItemCloudId = currRec.RawItemCloudId,
-                RawItemLocalId = currRec.RawItemId,
-                IsRemn = currRec.IsRemn,
-                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,
-                IsRemn = currRec.IsRemn,
-                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,
-                IsActive = currRec.IsActive,
-                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)coreRec.Material.dH,
-                    LMm = (decimal)coreRec.dL,
-                    WMm = coreRec.dW > 0 ? (decimal)coreRec.dW : (decimal)coreRec.Material.dW,
-                    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);
-                try
-                {
-                    // Add to database
-                    localDbCtx.RawItemList.RemoveRange(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))
-                                        .SingleOrDefault();
-
-                    if (item2update != null)
-                    {
-                        //// update, vers 1...
-                        //localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);\
-                        item2update.RawItemCloudId = updItem.RawItemCloudId;
-                        item2update.HMm = updItem.HMm;
-                        item2update.LMm = updItem.LMm;
-                        item2update.WMm = updItem.WMm;
-                        item2update.IsActive = updItem.IsActive;
-                        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/DatabaseContext.cs

@@ -80,26 +80,6 @@ namespace EgtBEAMWALL.DataLayer
         /// </summary>
         public DbSet<StatusMapModel> StatusMapList { get; set; }
 
-        /// <summary>
-        /// Wharehouse materials management
-        /// </summary>
-        public DbSet<MaterialModel> MaterialsList { get; set; }
-
-        /// <summary>
-        /// Wharehouse items management
-        /// </summary>
-        public DbSet<RawItemModel> RawItemList { get; set; }
-
-        /// <summary>
-        /// Alias management
-        /// </summary>
-        public DbSet<AliasModel> AliasList { get; set; }
-
-        /// <summary>
-        /// Alias management
-        /// </summary>
-        public DbSet<MagmanSyncModel> SyncList { get; set; }
-
         #endregion Public Properties
 
         #region Public Methods

EgtBEAMWALL.DataLayer/DatabaseModels/AliasModel.cs

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

EgtBEAMWALL.DataLayer/DatabaseModels/MagmanSyncModel.cs

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

EgtBEAMWALL.DataLayer/DatabaseModels/MaterialModel.cs

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

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EgtBEAMWALL.Core.ConstBeam;
@@ -17,11 +19,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
-        public ProdModel()
-        {
-            ProjListNav = new HashSet<ProjModel>();
-        }
-
         /// <summary>
         /// Chiave univoca DB
         /// </summary>
@@ -57,11 +54,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Index]
         public int ProdId { get; set; }
 
-        /// <summary>
-        /// Codice Proj per sync info (Identificativo DB esterno del magazzino in sync)
-        /// </summary>
-        public int ProjCloudId { get; set; } = 0;
-
         /// <summary>
         /// Tipologia del progetto (Travi, Pareti, ...)
         /// </summary>
@@ -106,11 +98,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("IsArchived")]
         public bool IsArchived { get; set; } = false;
 
-        /// <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,11 +65,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Index]
         public int ProjId { get; set; }
 
-        /// <summary>
-        /// Codice Proj per sync info (Identificativo DB esterno del magazzino in sync)
-        /// </summary>
-        public int ProjCloudId { get; set; } = 0;
-
         /// <summary>
         /// Tipologia del progetto (Travi, Pareti, ...)
         /// </summary>

EgtBEAMWALL.DataLayer/DatabaseModels/RawItemModel.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EgtBEAMWALL.DataLayer.DatabaseModels
-{
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
-    //[Index(nameof(Installazione), nameof(Active), nameof(DiskStatus))]
-    [Table("RawItemList")]
-    public partial class RawItemModel
-    {
-        /// <summary>
-        /// Primary Key AUTO
-        /// </summary>
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int RawItemId { get; set; }
-
-        /// <summary>
-        /// Codice RawMat univoco e in sync (Identificativo DB esterno del magazzino in sync)
-        /// </summary>
-        public int RawItemCloudId { get; set; } = 0;
-
-        /// <summary>
-        /// ForeignKey Materiale
-        /// </summary>
-        public int MatId { get; set; } = 0;
-
-        /// <summary>
-        /// Qty available on wharehouse
-        /// </summary>
-        public int QtyAvail { get; set; } = 0;
-
-        /// <summary>
-        /// Active/  = can be used
-        /// </summary>
-        public bool IsActive { get; set; } = false;
-
-        /// <summary>
-        /// Remnant
-        /// </summary>
-        public bool IsRemn { get; set; } = false;
-
-        /// <summary>
-        /// 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.Now; 
-
-#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

@@ -33,9 +33,9 @@ namespace EgtBEAMWALL.DataLayer
         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;uid=root;pwd=Egalware_24068!;)
+        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;)
         /// </summary>
-        public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000470;uid=root;pwd=Egalware_24068!";
+        public static string CONNECTION_STRING { get; set; } = "";
 
         #endregion Public Properties
 

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -46,9 +46,6 @@
     <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.2402.2912\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>
@@ -58,18 +55,15 @@
     <Reference Include="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="K4os.Compression.LZ4, Version=1.3.6.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.3.6\lib\net462\K4os.Compression.LZ4.dll</HintPath>
+    <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
     </Reference>
-    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.6.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.6\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
+    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
+      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.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>
@@ -85,9 +79,6 @@
     <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
       <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=110.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.110.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">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -100,14 +91,13 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Pipelines, Version=6.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll</HintPath>
+    <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
@@ -118,20 +108,10 @@
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.7.0.2\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" />
@@ -146,15 +126,6 @@
   </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" />
@@ -216,34 +187,6 @@
     <Compile Include="Migrations\202308250853396_AddProjArchivedField.designer.cs">
       <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.cs" />
-    <Compile Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.designer.cs">
-      <DependentUpon>202401181534084_AddAliasMaterialRawItemsModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202401291722150_FixMatItemCloudId.cs" />
-    <Compile Include="Migrations\202401291722150_FixMatItemCloudId.designer.cs">
-      <DependentUpon>202401291722150_FixMatItemCloudId.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202401310830146_FixItemRemn.cs" />
-    <Compile Include="Migrations\202401310830146_FixItemRemn.designer.cs">
-      <DependentUpon>202401310830146_FixItemRemn.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202402141003461_RawItemAddUseQty.cs" />
-    <Compile Include="Migrations\202402141003461_RawItemAddUseQty.designer.cs">
-      <DependentUpon>202402141003461_RawItemAddUseQty.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202402290716188_AddProjCloudId.cs" />
-    <Compile Include="Migrations\202402290716188_AddProjCloudId.Designer.cs">
-      <DependentUpon>202402290716188_AddProjCloudId.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202403120645357_RawItemAddLastSync.cs" />
-    <Compile Include="Migrations\202403120645357_RawItemAddLastSync.Designer.cs">
-      <DependentUpon>202403120645357_RawItemAddLastSync.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202403120803297_AddMagmanSyncTab.cs" />
-    <Compile Include="Migrations\202403120803297_AddMagmanSyncTab.Designer.cs">
-      <DependentUpon>202403120803297_AddMagmanSyncTab.cs</DependentUpon>
-    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils.cs" />
@@ -292,27 +235,6 @@
     <EmbeddedResource Include="Migrations\202308250853396_AddProjArchivedField.resx">
       <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202401181534084_AddAliasMaterialRawItemsModel.resx">
-      <DependentUpon>202401181534084_AddAliasMaterialRawItemsModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202401291722150_FixMatItemCloudId.resx">
-      <DependentUpon>202401291722150_FixMatItemCloudId.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202401310830146_FixItemRemn.resx">
-      <DependentUpon>202401310830146_FixItemRemn.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202402141003461_RawItemAddUseQty.resx">
-      <DependentUpon>202402141003461_RawItemAddUseQty.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202402290716188_AddProjCloudId.resx">
-      <DependentUpon>202402290716188_AddProjCloudId.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202403120645357_RawItemAddLastSync.resx">
-      <DependentUpon>202403120645357_RawItemAddLastSync.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202403120803297_AddMagmanSyncTab.resx">
-      <DependentUpon>202403120803297_AddMagmanSyncTab.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

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

EgtBEAMWALL.DataLayer/Migrations/202401181534084_AddAliasMaterialRawItemsModel.cs

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

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

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

EgtBEAMWALL.DataLayer/Migrations/202401291722150_FixMatItemCloudId.cs

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

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

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

EgtBEAMWALL.DataLayer/Migrations/202401310830146_FixItemRemn.cs

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

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

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

EgtBEAMWALL.DataLayer/Migrations/202402141003461_RawItemAddUseQty.cs

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

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

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

EgtBEAMWALL.DataLayer/Migrations/202402290716188_AddProjCloudId.cs

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

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

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

EgtBEAMWALL.DataLayer/Migrations/202403120645357_RawItemAddLastSync.cs

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

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

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

EgtBEAMWALL.DataLayer/Migrations/202403120803297_AddMagmanSyncTab.cs

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

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Egalware s.r.l.")]
 [assembly: AssemblyProduct("EgtBEAMWALL.DataLayer")]
-[assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")]
+[assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.12.2")]
-[assembly: AssemblyFileVersion("2.5.12.2")]
+[assembly: AssemblyVersion("2.7.1.1")]
+[assembly: AssemblyFileVersion("2.7.1.1")]

EgtBEAMWALL.DataLayer/packages.config

@@ -2,27 +2,21 @@
 <packages>
   <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
   <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
-  <package id="EgwProxy.MagMan" version="1.0.2402.2912" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4" version="1.3.6" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4.Streams" version="1.3.6" targetFramework="net472" />
+  <package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net472" />
+  <package id="K4os.Compression.LZ4.Streams" version="1.3.5" targetFramework="net472" />
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net472" />
   <package id="MySql.Data" version="8.0.21" targetFramework="net472" />
   <package id="MySql.Data.EntityFramework" version="8.0.21" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
   <package id="NLog" version="5.0.1" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
-  <package id="RestSharp" version="110.2.0" targetFramework="net472" />
   <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.IO.Pipelines" version="6.0.3" targetFramework="net472" />
+  <package id="System.IO.Pipelines" version="5.0.2" targetFramework="net472" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net472" />
-  <package id="System.Text.Json" version="7.0.2" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
 </packages>

EgtBEAMWALL.Supervisor/Comms/SIEMENSSharp7Comm.vb

@@ -0,0 +1,501 @@
+Imports System.Buffers.Binary
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports Sharp7
+
+Public Class SIEMENSSharp7Comm
+
+   Private m_DBVariableList As New List(Of DBBuffer) ' Buffer list
+
+   Private IntBuffer() As Byte = {0, 0}
+   Private BoolBuffer() As Byte = {0}
+   Private DIntBuffer() As Byte = {0, 0, 0, 0}
+   Private RealBuffer() As Byte = {0, 0, 0, 0}
+   Private StringBuffer(65536) As Byte       ' Buffer  
+   Private Client As New S7Client                ' Client Object
+
+   ' lista variabili in lettura
+   Private Shared m_ReadingVars(100) As CommVar
+
+   ' lista dei messaggi di errore attivi
+   Private m_ActiveMessages As New List(Of SiemensReadMessages)
+
+   Private m_MachManaging As MachManaging
+   Friend ReadOnly Property MachManaging As MachManaging
+      Get
+         Return m_MachManaging
+      End Get
+   End Property
+
+   Private m_RefreshTime As Integer = 10
+   Private m_WaitingRefreshTime As Integer = 20
+   Private m_RefreshCounter As Integer = 0
+   Private m_IsRefreshing As Boolean = False
+
+   Public Sub New(MachManaging As MachManaging)
+      m_MachManaging = MachManaging
+   End Sub
+
+   Public Shared Function InitVar(Variable As CommVar) As CommVar
+      Dim Index As Integer = Array.IndexOf(m_ReadingVars, Nothing)
+      m_ReadingVars(Index) = Variable
+      Return m_ReadingVars(Index)
+   End Function
+
+   ' Avvio la connessione Hardware-Client
+   Friend Function InitConnection() As Boolean
+      ' Ip del PLC
+      Dim sIp As String = ""
+      GetPrivateProfileString(S_GENERAL, K_IP, "", sIp, CurrentMachine.sMachIniFile)
+      ' unità usate dal PLC (Rack e Slot)
+      Dim nRack As Integer = GetPrivateProfileInt(S_GENERAL, K_RACK, 0, CurrentMachine.sMachIniFile)
+      Dim nSlot As Integer = GetPrivateProfileInt(S_GENERAL, K_SLOT, 0, CurrentMachine.sMachIniFile)
+      Map.refMachManaging.DebugMessage(1, "Tentativo di connessione a CN Siemens con Sharp7")
+      Map.refMachManaging.DebugMessage(1, "IP: " & sIp)
+      Map.refMachManaging.DebugMessage(1, "Rack: " & nRack)
+      Map.refMachManaging.DebugMessage(1, "Slot: " & nSlot)
+      Dim nResult As Integer = Client.ConnectTo(sIp, nRack, nSlot)
+      If nResult = 0 Then
+         Map.refMachManaging.DebugMessage(1, "Connessione effettuata")
+      Else
+         Map.refMachManaging.DebugMessage(1, "Connessione fallita con codice di errore: " & nResult)
+      End If
+      ' se la connessione è restituisce 0
+      Return nResult = 0
+   End Function
+
+   ' chiudo la connessione
+   Friend Sub CloseConnection()
+      Dim nResult As Integer = Client.Disconnect()
+      If Map.refMachManaging.Debug > 0 Then
+         If nResult = 0 Then
+            EgtOutLog("Disconnessione effettuata")
+         Else
+            EgtOutLog("Disconnessione fallita con codice di errore: " & nResult)
+         End If
+      End If
+
+   End Sub
+
+   Friend Sub RefreshConnection()
+      If m_RefreshCounter < m_RefreshTime Then
+         m_RefreshCounter += 1
+      Else
+         ' riavvio connessione
+         m_IsRefreshing = True
+         CloseConnection()
+         InitConnection()
+         m_IsRefreshing = False
+         m_RefreshCounter = 0
+      End If
+   End Sub
+
+   Private Function WaitingRefresh() As Boolean
+      If Not m_IsRefreshing Then Return True
+      Dim WaitingCounter As Integer = 0
+      While m_IsRefreshing < m_WaitingRefreshTime
+         If Not m_IsRefreshing Then Return True
+         Threading.Thread.Sleep(100)
+      End While
+      EgtOutLog("Waiting reconnection timeout!")
+      Return False
+   End Function
+
+#Region "Read Variables"
+
+   Public Sub RefreshAllVars()
+      WaitingRefresh()
+      m_DBVariableList.Clear()
+      For Each Var In m_ReadingVars
+         ' rileggo solo variabili continue
+         If Not IsNothing(Var) AndAlso Var.nReadType = CommVar.ReadTypes.CONTINUOUS Then
+            Dim CompleteAddressSplit() As String = Var.sAddress.Split(":"c)
+            Dim nDBAddress As Integer = 0
+            Integer.TryParse(CompleteAddressSplit(0), nDBAddress)
+            If nDBAddress = 0 Then Return
+            Dim DBBuffer As DBBuffer = m_DBVariableList.FirstOrDefault(Function(x) x.DBAddress = nDBAddress)
+            If IsNothing(DBBuffer) Then
+               Dim Buffer(65536) As Byte
+               Dim nAddressByte As Integer = 0
+               Select Case nDBAddress
+                  Case 301
+                     nAddressByte = 8
+                  Case 302
+                     nAddressByte = 34
+               End Select
+               Map.refMachManaging.DebugMessage(1, "Lettura di " & nAddressByte & " byte dalla variabile " & nDBAddress)
+               Dim nResult As Integer = 1234567890
+               Try
+                  nResult = Client.DBRead(nDBAddress, 0, nAddressByte, Buffer)
+               Catch ex As Exception
+                  nResult = 1234567890
+                  Map.refMachManaging.DebugMessage(1, "Lettura di " & nDBAddress & " ha generato un'eccezione")
+                  Map.refMachManaging.DebugMessage(1, ex.ToString())
+               End Try
+               If nResult = 0 Then
+                  Map.refMachManaging.DebugMessage(1, "Lettura di " & nDBAddress & " effettuata")
+                  If Map.refMachManaging.Debug > 1 Then
+                     'For Index = 0 To Buffer.Count - 1
+                     '   Map.refMachManaging.DebugMessage(2, Index & ": " & Buffer(Index))
+                     'Next
+                  End If
+               Else
+                  Map.refMachManaging.DebugMessage(2, "Lettura fallita con codice di errore: " & nResult)
+               End If
+               If nResult = 0 Then
+                  DBBuffer = New DBBuffer(nDBAddress, Buffer)
+                  m_DBVariableList.Add(DBBuffer)
+               End If
+            End If
+            If Not IsNothing(DBBuffer) Then
+               Dim PositionAddressSplit() As String = CompleteAddressSplit(1).Split("."c)
+               Dim nStartIndex As Integer = 0
+               Integer.TryParse(PositionAddressSplit(0), nStartIndex)
+               Select Case CompleteAddressSplit(2)
+                  Case 1
+                     Dim nBytePositionIndex As Integer = 0
+                     Integer.TryParse(PositionAddressSplit(1), nBytePositionIndex)
+                     Dim nPower As Integer = Math.Pow(2, nBytePositionIndex)
+                     '  Dim bValue As Boolean = (TestBuffer(nStartIndex) And nPower) = nPower
+                     Map.refMachManaging.DebugMessage(2, "Lettura variabile " & nDBAddress & ":" & nStartIndex & "." & nBytePositionIndex)
+                     Var.SetValue(If((DBBuffer.DBValue(nStartIndex) And nPower) = nPower, 1, 0))
+                     Map.refMachManaging.DebugMessage(2, "Variabile " & nDBAddress & ":" & nStartIndex & "." & nBytePositionIndex & " (Tipo 1) = " & Var.sValue)
+                  Case 2
+                     'Dim x = BitConverter.ToInt16(TestBuffer, nStartIndex)
+                     Dim nValue As Int16 = BitConverter.ToInt16(DBBuffer.DBValue, nStartIndex)
+                     Map.refMachManaging.DebugMessage(2, "Lettura variabile " & nDBAddress & ":" & nStartIndex)
+                     Var.SetValue(BinaryPrimitives.ReverseEndianness(nValue))
+                     Map.refMachManaging.DebugMessage(2, "Variabile " & nDBAddress & ":" & nStartIndex & " (Tipo 2) = " & Var.sValue)
+                  Case 3
+                     ' Dim x = BitConverter.ToInt32(TestBuffer, nStartIndex)
+                     Dim nValue As Integer = BitConverter.ToInt32(DBBuffer.DBValue, nStartIndex)
+                     Map.refMachManaging.DebugMessage(2, "Lettura variabile " & nDBAddress & ":" & nStartIndex)
+                     Var.SetValue(BinaryPrimitives.ReverseEndianness(nValue))
+                     Map.refMachManaging.DebugMessage(2, "Variabile " & nDBAddress & ":" & nStartIndex & " (Tipo 3) = " & Var.sValue)
+               End Select
+            End If
+         End If
+      Next
+   End Sub
+
+   Friend Function WriteVariable(Address As String, Value As String) As Boolean
+      WaitingRefresh()
+      Dim CompleteAddressSplit() As String = Address.Split(":"c)
+      Dim nDBAddress As Integer = 0
+      Integer.TryParse(CompleteAddressSplit(0), nDBAddress)
+      If nDBAddress = 0 Then Return False
+      Dim PositionAddressSplit() As String = CompleteAddressSplit(1).Split("."c)
+      Dim nStartIndex As Integer = 0
+      Integer.TryParse(PositionAddressSplit(0), nStartIndex)
+      Select Case CompleteAddressSplit(2)
+         Case 1
+            ' rileggo int16
+            Dim Buffer(1) As Byte
+            Client.DBRead(nDBAddress, nStartIndex, 1, Buffer)
+            Dim nBytePositionIndex As Integer = 0
+            Integer.TryParse(PositionAddressSplit(1), nBytePositionIndex)
+            Dim nPower As Integer = Math.Pow(2, nBytePositionIndex)
+            Dim nNewValue As Integer = 0
+            If Not Integer.TryParse(Value, nNewValue) Then Return False
+            Dim nOldValue As Integer = If((Buffer(0) And nPower) = nPower, 1, 0)
+            If nOldValue = nNewValue Then
+               Return True
+            ElseIf nOldValue = 0 Then
+               Buffer(0) = Buffer(0) Or nPower
+            ElseIf nOldValue = 1 Then
+               Buffer(0) = Buffer(0) Xor nPower
+            Else
+               Return False
+            End If
+            ' Buffer(0) = Buffer(0) And nPower
+            If Map.refMachManaging.Debug > 1 Then
+               EgtOutLog("Scrittura variabile " & Address & " (Tipo 1) con valore " & Value)
+               'For Index = 0 To Buffer.Count - 1
+               '   EgtOutLog(Index & ": " & Buffer(Index))
+               'Next
+            End If
+            Dim nResult As Integer = Client.DBWrite(nDBAddress, nStartIndex, 1, Buffer)     ' DbNumber, Start, Amount, Buffer
+            '    Return WriteBool(nDBAddress, nStartIndex, bValue)
+            If Map.refMachManaging.Debug > 1 Then
+               If nResult <> 0 Then
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " effettuata")
+               Else
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " fallita")
+               End If
+            End If
+            Return nResult = 0
+         Case 2
+            Dim nValue As Int16 = 0
+            If Not Int16.TryParse(Value, nValue) Then Return False
+            If Map.refMachManaging.Debug > 1 Then
+               EgtOutLog("Scrittura variabile " & Address & " (Tipo 2) con valore " & Value)
+            End If
+            Dim bResult As Boolean = WriteInt(nDBAddress, nStartIndex, nValue)
+            If Map.refMachManaging.Debug > 1 Then
+               If bResult Then
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " effettuata")
+               Else
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " fallita")
+               End If
+            End If
+            Return bResult
+         Case 3
+            Dim nValue As Integer = 0
+            If Not Integer.TryParse(Value, nValue) Then Return False
+            If Map.refMachManaging.Debug > 1 Then
+               EgtOutLog("Scrittura variabile " & Address & " (Tipo 3) con valore " & Value)
+            End If
+            Dim bResult As Boolean = WriteDInt(nDBAddress, nStartIndex, nValue)
+            If Map.refMachManaging.Debug > 1 Then
+               If bResult Then
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " effettuata")
+               Else
+                  EgtOutLog("Scrittura variabile " & nDBAddress & ":" & nStartIndex & " con valore " & Value & " fallita")
+               End If
+            End If
+            Return bResult
+      End Select
+   End Function
+
+#End Region    ' Read Variables
+
+   Friend Function ReadInt(DBNumber As Integer, Start As Integer, ByRef Value As Integer) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 2, IntBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetIntAt(IntBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteInt(DBNumber As Integer, Start As Integer, Value As Int16) As Boolean
+      WaitingRefresh()
+      S7.SetIntAt(IntBuffer, 0, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 2, IntBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadBool(DBNumber As Integer, Start As Integer, ByRef Value As Boolean) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 1, BoolBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = BitConverter.ToBoolean(BoolBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteBool(DBNumber As Integer, Start As Integer, Value As Boolean) As Boolean
+      WaitingRefresh()
+
+      If Value Then
+         BoolBuffer(0) = &H1
+      Else
+         BoolBuffer(0) = &H0
+      End If
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 1, BoolBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadDInt(DBNumber As Integer, Start As Integer, ByRef Value As Integer) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 4, DIntBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetDIntAt(DIntBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteDInt(DBNumber As Integer, Start As Integer, Value As Integer) As Boolean
+      WaitingRefresh()
+      S7.SetDIntAt(DIntBuffer, 0, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 4, DIntBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadReal(DBNumber As Integer, Start As Integer, ByRef Value As Double) As Boolean
+      WaitingRefresh()
+      ' Read 4 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, 4, RealBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetRealAt(RealBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteReal(DBNumber As Integer, Start As Integer, Value As Single) As Boolean
+      WaitingRefresh()
+      S7.SetRealAt(RealBuffer, 0, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, 4, RealBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Function ReadString(DBNumber As Integer, Start As Integer, Length As Integer, ByRef Value As String) As Boolean
+      WaitingRefresh()
+      ' Read 2 bytes from the DBNumber starting from Start and puts them into ReadBuffer.
+      Dim Result As Integer = Client.DBRead(DBNumber, Start, Length, StringBuffer)     ' DbNumber, Start, Amount, Buffer
+      If Result = 0 Then
+         Value = S7.GetStringAt(StringBuffer, 0)
+         Return True
+      End If
+      Return False
+   End Function
+
+   Friend Function WriteString(DBNumber As Integer, Start As Integer, Value As String) As Boolean
+      WaitingRefresh()
+
+      If Value.Length > 65535 Then
+         Return False
+      End If
+      S7.SetStringAt(StringBuffer, 0, 65535, Value)
+      ' Read "Size" bytes from the DB "DBNumber" starting from 0 and puts them into Buffer.
+      Dim Result As Integer = Client.DBWrite(DBNumber, Start, Value.Length + 2, StringBuffer)     ' DbNumber, Start, Amount, Buffer
+      Return Result = 0
+   End Function
+
+   Friend Sub ResetStep(bReset As Boolean)
+      WaitingRefresh()
+      Dim ResetStep As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList(19)  ' Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESET_STEP)
+      If bReset Then
+         Map.refMachManaging.DebugMessage(1, "Imposto variabile ResetStep a 1")
+         ResetStep.sValue = 1
+         Threading.Thread.Sleep(100)
+         Dim nResetStepOk As Integer = 0
+         Dim ResetStepOk As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESET_STEP_OK)
+         While nResetStepOk <> 1
+            Map.refMachManaging.DebugMessage(1, "Rileggo variabili")
+            RefreshAllVars()
+            Map.refMachManaging.DebugMessage(1, "Leggo valore ResetStepOk")
+            Integer.TryParse(ResetStepOk.sValue, nResetStepOk)
+            Threading.Thread.Sleep(1000)
+         End While
+      End If
+      ResetStep.sValue = 0
+      Map.refMachManaging.DebugMessage(1, "Imposto variabile ResetStep a 0")
+   End Sub
+
+   Friend Sub ReadPLCMessages()
+      WaitingRefresh()
+
+      Dim nPlc_Msg As New List(Of Byte)
+      For Index As Integer = 1 To 6
+         Dim nIndex As Integer = Index
+         Dim PLCMessagesVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = PLC_MESSAGES & nIndex)
+         If IsNothing(PLCMessagesVariable) OrElse IsNothing(PLCMessagesVariable.sValue) Then Return
+         Dim nTemp As Int16 = 0
+         Int16.TryParse(PLCMessagesVariable.sValue, nTemp)
+         nTemp = BinaryPrimitives.ReverseEndianness(nTemp)
+         Dim Bytes As Byte() = BitConverter.GetBytes(nTemp)
+         nPlc_Msg.AddRange(Bytes)
+      Next
+      Dim BitArray As New BitArray(nPlc_Msg.ToArray())
+      Dim ErrorList As New List(Of Integer)
+      For BitIndex = 0 To BitArray.Count - 1
+         If BitIndex <= 169 AndAlso BitArray(BitIndex) Then
+            ErrorList.Add(BitIndex)
+         End If
+      Next
+      ShowPLCError(ErrorList)
+   End Sub
+
+   Friend Sub ShowPLCError(ErrorNumber As List(Of Integer))
+      ' resetto stati bFound
+      For Each Message In m_ActiveMessages
+         Message.bFound = False
+      Next
+
+      For index As Integer = 0 To ErrorNumber.Count - 1
+         Dim nIndex As Integer = index
+         Dim NewMessageInList As SiemensReadMessages = m_ActiveMessages.FirstOrDefault(Function(x) x.nIndex = 0.ToString())
+         ' se il messaggio e' gia' in lista
+         If Not IsNothing(NewMessageInList) Then
+            ' lo segno come trovato
+            NewMessageInList.bFound = True
+         Else
+            ' lo aggiungo
+            Dim NewMessage As SiemensReadMessages = New SiemensReadMessages(0.ToString())
+            NewMessage.bFound = True
+            m_ActiveMessages.Add(NewMessage)
+            m_SiemensAlarmCallbackDlg(0, 0)
+         End If
+      Next
+
+      ' cancello messaggi non trovati
+      For Index = m_ActiveMessages.Count - 1 To 0 Step -1
+         Dim Message As SiemensReadMessages = m_ActiveMessages(Index)
+         If Not Message.bFound Then
+            m_SiemensAlarmCallbackDlg(Message.nIndex, 1)
+            m_ActiveMessages.RemoveAt(Index)
+         End If
+      Next
+
+   End Sub
+
+End Class
+
+Friend Class DBBuffer
+
+   Private m_DBAddress As Integer
+   Public ReadOnly Property DBAddress As Integer
+      Get
+         Return m_DBAddress
+      End Get
+   End Property
+
+   Private m_DBValue(65536) As Byte
+   Public ReadOnly Property DBValue As Byte()
+      Get
+         Return m_DBValue
+      End Get
+   End Property
+
+   Sub New(DBAddress As Integer, DBValue As Byte())
+      m_DBAddress = DBAddress
+      m_DBValue = DBValue
+   End Sub
+
+End Class
+
+Public Class SiemensReadMessages
+
+   Private m_nIndex As Integer
+   Public ReadOnly Property nIndex As Integer
+      Get
+         Return m_nIndex
+      End Get
+   End Property
+   Private m_sMessage As String
+   Public ReadOnly Property sMessage As String
+      Get
+         Return m_sMessage
+      End Get
+   End Property
+   Friend Sub SetMessage(sValue As String)
+      m_sMessage = sValue
+   End Sub
+
+   Private m_bFound As Boolean = False
+   Friend Property bFound As Boolean
+      Get
+         Return m_bFound
+      End Get
+      Set(value As Boolean)
+         m_bFound = value
+      End Set
+   End Property
+   Public Sub New(nIndex As Integer)
+      m_nIndex = nIndex
+      m_sMessage = sMessage
+   End Sub
+
+End Class

EgtBEAMWALL.Supervisor/Constants/ConstCommVar.vb

@@ -19,6 +19,7 @@ Module ConstCommVar
       NUM_FLEXIUM = 2
       NUM_AXIUM_APSERVER = 3
       NUM_AXIUM_PCTOOLKIT = 4
+      SIEMENS_SHARP7 = 5
    End Enum
 
    ' Assi
@@ -54,6 +55,24 @@ Module ConstCommVar
    Public Const PLC_MESSAGES As String = "PLC_Messages"
    ' variabile per leggere e scrivere permesso invio cn a macchina
    Public Const SENDPERMISSION As String = "SendPermission"
+   ' variabile per confermare lettura dati di stato pezzo
+   Public Const DATAREADED As String = "Data_Readed"
+   ' variabile per confermare lettura stato reset
+   Public Const RESETREADED As String = "Reset_Readed"
+   ' variabile per confermare lettura stato reset
+   Public Const DATATOREAD As String = "Data_ToRead"
+   ' variabile per confermare lettura stato reset
+   Public Const RESET_STEP As String = "Reset_Step"
+   ' variabile per confermare lettura stato reset
+   Public Const RESET_STEP_OK As String = "Reset_Step_Ok"
+   ' variabile per stato CN
+   Public Const NC_STATUS As String = "NC_Status"
+   ' variabile per modo CN
+   Public Const NC_MODE As String = "NC_Mode"
+   ' variabile per apertura pinze manuale
+   Public Const OPEN_CLAMP As String = "Open_Clamp"
+   ' variabile per larghezza barra al carico
+   Public Const W_CARICO As String = "W_Carico"
 
    Public Enum OPStates
       Start = 1
@@ -72,4 +91,11 @@ Module ConstCommVar
       Home = 8
    End Enum
 
+   ' Variabili Siemens
+   Public Const K_IP As String = "Ip"
+   Public Const K_RACK As String = "Rack"
+   Public Const K_SLOT As String = "Slot"
+   Public Const K_TIMERINTERVAL As String = "TimerInterval"
+   Public Const K_ISOFILEDIR As String = "IsoFileDir"
+
 End Module

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -16,31 +16,6 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>true</IncrementalBuild>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>false</IncrementalBuild>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -53,29 +28,6 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -102,27 +54,6 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.Supervisor.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -223,6 +154,9 @@
     <Reference Include="SdkApi.Desktop.Usb, Version=2.15.2634.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\SdkApi.Desktop.Usb.dll</HintPath>
     </Reference>
+    <Reference Include="Sharp7.net">
+      <HintPath>..\ExtLibs\Sharp7.net.dll</HintPath>
+    </Reference>
     <Reference Include="SharpSnmpLib, Version=10.0.9.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL">
       <HintPath>..\packages\Lextm.SharpSnmpLib.10.0.9\lib\net452\SharpSnmpLib.dll</HintPath>
     </Reference>
@@ -326,6 +260,7 @@
     <Compile Include="Comms\NUMAxiumComm.vb" />
     <Compile Include="Comms\NUMAxiumPcToolkitComm.vb" />
     <Compile Include="Comms\NUMFlexiumComm.vb" />
+    <Compile Include="Comms\SIEMENSSharp7Comm.vb" />
     <Compile Include="Comms\TPAComm.vb" />
     <Compile Include="Constants\ConstMachMsg.vb" />
     <Compile Include="MachineLogPage\MachineLogPageV.xaml.vb">

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml

@@ -49,7 +49,8 @@
                  Visibility="{Binding E80002_Visibility}"/>
    </UniformGrid>
    <Expander  Grid.Row="4"
-              Header="Axis">
+              Header="Axis"
+              Visibility="{Binding Axis_Visibility}">
       <EgtBEAMWALL:AxesPanelV DataContext="{StaticResource AxesPanelVM}"/>
    </Expander>
 

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -148,6 +148,17 @@ Public Class LeftPanelVM
       End Get
    End Property
 
+   Public Property m_Axis_Visibility As Visibility
+   Public ReadOnly Property Axis_Visibility As Visibility
+      Get
+         Return m_Axis_Visibility
+      End Get
+   End Property
+   Friend Sub SetAxisVisibility()
+      m_Axis_Visibility = If(CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7, Visibility.Collapsed, Visibility.Visible)
+      NotifyPropertyChanged(NameOf(Axis_Visibility))
+   End Sub
+
    Private m_bRestart As Boolean = False
    Public Property bRestart As Boolean
       Get
@@ -269,7 +280,7 @@ Public Class LeftPanelVM
 
    Public ReadOnly Property OPMode_Visibility As Visibility
       Get
-         Return If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT, Visibility.Visible, Visibility.Collapsed)
+         Return If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT Or CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 
@@ -430,7 +441,7 @@ Public Class LeftPanelVM
                                                          New OPState("Pending", OPStates.Pending),
                                                          New OPState("Unspecified", OPStates.Unspecified)
          }
-         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             m_OPStateList = New List(Of OPState) From {
                                                          New OPState("Start", OPStates.Start),
                                                          New OPState("Stop", OPStates.Stop),
@@ -462,12 +473,19 @@ Public Class LeftPanelVM
                                                          New OPState("Manual", OPModes.Manual),
                                                          New OPState("Home", OPModes.Home)
             }
+         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
+            m_OPModeList = New List(Of OPState) From {
+                                                         New OPState("Auto", OPModes.Auto),
+                                                         New OPState("Mdi", OPModes.Mdi),
+                                                         New OPState("Manual", OPModes.Manual),
+                                                         New OPState("Reference Point", OPModes.Home)
+            }
       End Select
    End Sub
 
    Friend Sub SetE80000Visibility()
       ' imposto visibilità variabili E80000 e seconda del tipo di controllo
-      If CurrentMachine.NCType = NCTypes.TPA Then
+      If CurrentMachine.NCType = NCTypes.TPA OrElse CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
          m_E80000_Visibility = Visibility.Collapsed
          m_E80002_Visibility = Visibility.Collapsed
       Else

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/MachCommandMessagePanelVM.vb

@@ -324,7 +324,7 @@ Public Class MachCommandMessagePanelVM
       m_MachManagingThread = New Thread(Sub()
                                            MachineCommThread.MachManagingThreadFunction(AddressOf ResultCallbackDlg, AddressOf CloseCallbackDlg,
                                                                                           AddressOf UpdateCallbackDlg, AddressOf TPAAlarmCallbackDlg, AddressOf NUMAlarmCallbackDlg,
-                                                                                          AddressOf AxisCoordinatesCallbackDlg, AddressOf OpStateCallbackDlg,
+                                                                                          AddressOf SiemensAlarmCallbackDlg, AddressOf AxisCoordinatesCallbackDlg, AddressOf OpStateCallbackDlg,
                                                                                           AddressOf OpModeCallbackDlg, AddressOf ChannelCallbackDlg, AddressOf ReadVarCallbackDlg)
                                         End Sub)
       ' avvio thread di gestione della macchina che avvia la connessione
@@ -804,6 +804,42 @@ Public Class MachCommandMessagePanelVM
       DbControllers.m_LogMachineController.Create(LogEvent.CreateAlarmLog(DateTime.Now(), AlarmOperation & LogEvent.cSeparator & ErrorTyp & LogEvent.cSeparator & AlarmMessage & LogEvent.cSeparator & AlarmCode & LogEvent.cSeparator, DbControllers.m_SupervisorId))
    End Sub
 
+   Friend Sub SiemensAlarmCallbackDlg(nIndex As Integer, AlarmOperation As Integer)
+
+      ' se aggiungo allarme e non ce ne erano
+      If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) AndAlso m_ErrCycle.Count = 0 AndAlso m_Iso.Count = 0 AndAlso m_Message.Count = 0 AndAlso m_ErrSystem.Count = 0 Then
+         ' avvio il timer degli allarmi
+         m_AlarmTimer.Start()
+      End If
+      Dim AlarmMessage As String = nIndex
+
+      ' costruisco messaggio errore in base al tipo
+      Dim sErrorMessage As String = AlarmMessage
+      If bMsgTranslationActive Then
+         Dim sTranslatedMsg = MachMsg(MsgParagraphs.PLC, nIndex)
+         If Not String.IsNullOrWhiteSpace(sTranslatedMsg) Then
+            sErrorMessage = sTranslatedMsg
+         End If
+      End If
+      AlarmMessage = If(Not String.IsNullOrWhiteSpace(sErrorMessage), sErrorMessage, "")
+
+      If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
+         m_ErrCycle.Add(Alarm.CreateAlarm(nIndex, AlarmMessage))
+      Else
+         m_ErrCycle.RemoveAll(Function(x) x.sCode = nIndex)
+      End If
+
+      ' forzo aggiornamento allarmi
+      AlarmTimer_Tick()
+      ' se non ci sono errori
+      If m_ErrCycle.Count = 0 AndAlso m_Iso.Count = 0 AndAlso m_Message.Count = 0 AndAlso m_ErrSystem.Count = 0 Then
+         ' fermo timer degli allarmi
+         m_AlarmTimer.Stop()
+      End If
+      'DbControllers.m_LogMachineController.Create(MachLog.CreateAlarmLog(AlarmOperation, ErrorTyp, AlarmMessage, AlarmCode, DateTime.Now))
+      DbControllers.m_LogMachineController.Create(LogEvent.CreateAlarmLog(DateTime.Now(), AlarmOperation & LogEvent.cSeparator & nIndex & LogEvent.cSeparator & sErrorMessage, DbControllers.m_SupervisorId))
+   End Sub
+
    Friend Sub AxisCoordinatesCallbackDlg(AxisValue As Double, AxisIndex As Integer)
       Map.refAxesPanelVM.AxisCoordinatesCallbackDlg(AxisValue, AxisIndex)
    End Sub
@@ -821,7 +857,7 @@ Public Class MachCommandMessagePanelVM
                   Next
                End If
             End If
-         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             Map.refLeftPanelVM.SetOPState(NewState)
       End Select
       'DbControllers.m_LogMachineController.Create(MachLog.CreateOPStateLog(newOpState))
@@ -835,7 +871,7 @@ Public Class MachCommandMessagePanelVM
          Return
       End If
       Select Case CurrentMachine.NCType
-         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             Map.refLeftPanelVM.SetOPMode(NewState)
       End Select
       'DbControllers.m_LogMachineController.Create(MachLog.CreateOPStateLog(newOpState))

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -22,13 +22,14 @@ Public Class MyMachGroupVM
          ElseIf m_bToBeProduced OrElse m_bSentToMachine Then
             Return False
             ' se la macchina e' ferma
-         ElseIf IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
-                (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
-                 Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
-                 Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
-                 Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified) Then
+         ElseIf CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 AndAlso
+                (IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
+                 (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
+                  Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
+                  Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
+                  Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified)) Then
             ' verifico se c'e' un pezzo non finito
-            Dim ToBeRestartedPart As MyMachGroupVM = Map.refSupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x As MyMachGroupVM) x.nProduction_State = Global.EgtBEAMWALL.Core.ItemState.WIP And Not m_bToBeProduced)
+            Dim ToBeRestartedPart As MyMachGroupVM = Map.refSupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x As MyMachGroupVM) x.nProduction_State = Global.EgtBEAMWALL.Core.ItemState.WIP And Not x.m_bToBeProduced)
             ' se c'e', attivo solo il pezzo non finito
             Return Not (Not IsNothing(ToBeRestartedPart) AndAlso Not ToBeRestartedPart Is Me)
          Else
@@ -48,11 +49,12 @@ Public Class MyMachGroupVM
                   Case ItemState.WIP
                      If Not m_bToBeProduced AndAlso Not m_bSentToMachine Then
                         Return True
-                     ElseIf IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
-                            (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
-                             Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
-                             Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
-                             Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified) Then
+                     ElseIf CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 AndAlso
+                            (IsNothing(Map.refLeftPanelVM.SelOPState) OrElse
+                             (Map.refLeftPanelVM.SelOPState.Id = 0 OrElse
+                              Map.refLeftPanelVM.SelOPState.Id = OPStates.End OrElse
+                              Map.refLeftPanelVM.SelOPState.Id = OPStates.Stop OrElse
+                              Map.refLeftPanelVM.SelOPState.Id = OPStates.Unspecified)) Then
                         Return True
                      Else
                         Return False
@@ -225,27 +227,45 @@ Public Class MyMachGroupVM
       End If
       ' se progetto travi e lavorazione interrotta da reset
       If Map.refSupervisorManagerVM.CurrProd.nType = BWType.BEAM AndAlso (bResetWhileCutting OrElse dtStartTime <> DateTime.MinValue) And Not Map.refLeftPanelVM.bRestart Then
-         ' chiedo se riprendere o rifare la barra da zero
-         Dim bRedo As MessageBoxResult = MessageBox.Show(EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+         Dim bRedo As MessageBoxResult = MessageBoxResult.No
+         If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso Not IsNothing(Map.refMachManaging) Then
+            ' leggo pinze aperte
+            Dim Open_ClampVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = OPEN_CLAMP)
+            Map.refMachManaging.Siemens_Sharp7.RefreshAllVars()
+            Map.refMachManaging.DebugMessage(1, "Leggo variabile pinze aperte " & Open_ClampVariable.sValue)
+            If Open_ClampVariable.sValue = 1 Then
+               Map.refMachManaging.DebugMessage(1, "Pinze aperte, ripartenza impossibile")
+               bRedo = MessageBoxResult.No
+               MessageBox.Show("Pinze aperte, ripartenza impossibile!!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+            Else
+               ' chiedo se riprendere o rifare la barra da zero
+               bRedo = MessageBox.Show(EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+            End If
+         Else
+            ' chiedo se riprendere o rifare la barra da zero
+            bRedo = MessageBox.Show(EgtMsg(62509), "", MessageBoxButton.YesNo, MessageBoxImage.Information)
+         End If
          Select Case bRedo
             Case MessageBoxResult.Yes
-               ' segno da rifare pezzi non completamente lavorati 
-               For Each Part As PartVM In PartVMList
-                  If Part.dtEndTime <> DateTime.MinValue Then
-                     Part.bDO = False
-                  Else
-                     Part.SetDo(True)
-                  End If
-                  'Part.bDO = (Part.dtEndTime = DateTime.MinValue)
-                  'Part.NotifyPropertyChanged(NameOf(Part.bRedo))
-               Next
-               ' se ripresa, mostro lista feature e colonne Redo
-               Map.refLeftPanelVM.bRestart = True
-               ' blocco produzione di tutti gli altri
-               MyMachGroupVM.UpdateProduceIsEnabledForAll()
-               ' riabilito bottoni di comunicazione a fine invio programma
-               Map.refMachCommandMessagePanelVM.SetCommBtnIsEnabled(True)
-               Return
+               If CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 Then
+                  ' segno da rifare pezzi non completamente lavorati 
+                  For Each Part As PartVM In PartVMList
+                     If Part.dtEndTime <> DateTime.MinValue Then
+                        Part.bDO = False
+                     Else
+                        Part.SetDo(True)
+                     End If
+                     'Part.bDO = (Part.dtEndTime = DateTime.MinValue)
+                     'Part.NotifyPropertyChanged(NameOf(Part.bRedo))
+                  Next
+                  ' se ripresa, mostro lista feature e colonne Redo
+                  Map.refLeftPanelVM.bRestart = True
+                  ' blocco produzione di tutti gli altri
+                  MyMachGroupVM.UpdateProduceIsEnabledForAll()
+                  ' riabilito bottoni di comunicazione a fine invio programma
+                  Map.refMachCommandMessagePanelVM.SetCommBtnIsEnabled(True)
+                  Return
+               End If
             Case MessageBoxResult.No
                ' annullo stati dei pezzi gia' fatti
                For Each Part In PartVMList

EgtBEAMWALL.Supervisor/MachManagingThread/MachCommConst.vb

@@ -21,6 +21,7 @@ Module MachCommConst
    Public Delegate Sub UpdateCallbackDlg(Param As String, Params As String)
    Public Delegate Sub TPAAlarmCallbackDlg(ByVal AlarmOperation As Integer, ByVal AlarmType As Integer, ByVal AlarmMessage As String, ByVal AlarmCode As String, ByVal AlarmDateTime As String)
    Public Delegate Sub NUMAlarmCallbackDlg(ByVal CncNumber As Integer, ByVal numberOfError As Integer, ByVal ErrorTyp As String, ByVal ErrorIndex As String, ByVal ErrorNumber As String, ByVal ErrorLine As String, ByVal ErrorMessage As String, ByVal ErrorAdditional As String)
+   Public Delegate Sub SiemensAlarmCallbackDlg(nIndex As Integer, AlarmOperation As Integer)
    Public Delegate Sub AxisCoordinatesCallbackDlg(ByVal AxisValue As Double, ByVal AxisIndex As Integer)
    Public Delegate Sub OpStateCallbackDlg(ByVal newOpState As Integer)
    Public Delegate Sub OpModeCallbackDlg(ByVal newOpState As Integer)
@@ -32,6 +33,7 @@ Module MachCommConst
    Friend m_UpdateCallbackDlg As UpdateCallbackDlg
    Friend m_TPAAlarmCallbackDlg As TPAAlarmCallbackDlg
    Friend m_NUMAlarmCallbackDlg As NUMAlarmCallbackDlg
+   Friend m_SiemensAlarmCallbackDlg As SiemensAlarmCallbackDlg
    Friend m_AxisCoordinatesCallbackDlg As AxisCoordinatesCallbackDlg
    Friend m_OpStateCallbackDlg As OpStateCallbackDlg
    Friend m_OpModeCallbackDlg As OpModeCallbackDlg

EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb

@@ -7,6 +7,7 @@ Imports EgtWPFLib5
 Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.Supervisor.CommVar
+Imports System.Windows.Forms.VisualStyles
 
 Public Class MachManaging
 
@@ -49,6 +50,11 @@ Public Class MachManaging
          Return m_CN
       End Get
    End Property
+   Public ReadOnly Property Siemens_Sharp7 As SIEMENSSharp7Comm
+      Get
+         Return m_CN
+      End Get
+   End Property
 
    Private Shared WithEvents m_CommandList As New ObservableCollection(Of ThreadCommand)
    Public Shared ReadOnly Property CommandList As ObservableCollection(Of ThreadCommand)
@@ -97,7 +103,20 @@ Public Class MachManaging
       End Get
    End Property
 
+   ' variabile che indica prima barra dopo start (Siemens)
+   Private m_bFirstRaw As Boolean = True
+
+   ' variabile che indica se emettere ii messaggi di debug
+   Private m_Debug As Integer = 0
+   Public ReadOnly Property Debug As Integer
+      Get
+         Return m_Debug
+      End Get
+   End Property
+
    Sub New()
+      ' leggo variabile debug da ini
+      m_Debug = GetPrivateProfileInt(S_GENERAL, K_DEBUG, 0, CurrentMachine.sMachIniFile)
       ' imposto in Map
       Map.SetRefMachManaging(Me)
       AddHandler m_CommandList.CollectionChanged, AddressOf CommandList_CollectionChanged
@@ -241,7 +260,7 @@ Public Class MachManaging
          '         Threading.Thread.Sleep(300)
          '      End If
          '   End If
-         Case NCTypes.NUM_FLEXIUM, NCTypes.TPA, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
+         Case NCTypes.NUM_FLEXIUM, NCTypes.TPA, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT, NCTypes.SIEMENS_SHARP7
             ' eseguo ciclo principale
             Dim nReset_State As Integer
             Dim nStart_State As Boolean
@@ -254,6 +273,9 @@ Public Class MachManaging
             Dim nISO_Sent As Integer
             Dim nRunning As Integer
             Dim nCurrMachIndex As Integer
+            Dim nDataWrite As Integer
+            Dim nNCStatus As Integer
+            Dim nNCMode As Integer
             Dim ResetVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESET_STATE)
             Dim StartVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = START_STATE)
             Dim StopVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = STOP_STATE)
@@ -265,6 +287,11 @@ Public Class MachManaging
             Dim ISOSentVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_SENT)
             Dim RunningVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RUNNING)
             Dim MachIndexVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = MACHINDEX)
+            Dim DataReadedVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = DATAREADED)
+            Dim ResetReadedVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = RESETREADED)
+            Dim DataToReadVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = DATATOREAD)
+            Dim NCStatusVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NC_STATUS)
+            Dim NCModeVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = NC_MODE)
             Select Case CurrentMachine.NCType
                Case NCTypes.TPA
                   ' leggo tutte le variabili
@@ -441,7 +468,73 @@ Public Class MachManaging
                   'EgtOutLog("Pre lettura posizioni")
                   Num_Axium_PCToolkit.ReadPosition()
                   'EgtOutLog("Post lettura messaggi")
+               Case NCTypes.SIEMENS_SHARP7
+                  ' leggo tutte le variabili
+                  Map.refMachManaging.DebugMessage(1, "Leggo tutte le variabili")
+                  Siemens_Sharp7.RefreshAllVars()
+                  If Not IsNothing(ResetVariable.sValue) Then
+                     Integer.TryParse(ResetVariable.sValue, nReset_State)
+                  Else
+                     nReset_State = 1
+                  End If
+                  If Not IsNothing(ProdVariable.sValue) Then
+                     Integer.TryParse(ProdVariable.sValue, nP_Prod)
+                  Else
+                     nP_Prod = -1
+                  End If
+                  If Not IsNothing(MachGroupVariable.sValue) Then
+                     Integer.TryParse(MachGroupVariable.sValue, nP_Machgroup)
+                  Else
+                     nP_Machgroup = -1
+                  End If
+                  If Not IsNothing(PartVariable.sValue) Then
+                     Integer.TryParse(PartVariable.sValue, nP_Part)
+                  Else
+                     nP_Part = -1
+                  End If
+                  If Not IsNothing(StateVariable.sValue) Then
+                     Integer.TryParse(StateVariable.sValue, nP_State)
+                  Else
+                     nP_State = -1
+                  End If
+                  If Not IsNothing(ISONumVariable.sValue) Then
+                     Integer.TryParse(ISONumVariable.sValue, nISO_Num)
+                  Else
+                     nISO_Num = -1
+                  End If
+                  If Not IsNothing(RunningVariable.sValue) Then
+                     Integer.TryParse(RunningVariable.sValue, nRunning)
+                  Else
+                     nRunning = -1
+                  End If
+                  If Not IsNothing(DataReadedVariable.sValue) Then
+                     Integer.TryParse(DataReadedVariable.sValue, nDataWrite)
+                  Else
+                     nDataWrite = -1
+                  End If
+                  If Not IsNothing(NCStatusVariable.sValue) Then
+                     Integer.TryParse(NCStatusVariable.sValue, nNCStatus)
+                  Else
+                     nNCStatus = -1
+                  End If
+                  If Not IsNothing(NCModeVariable.sValue) Then
+                     Integer.TryParse(NCModeVariable.sValue, nNCMode)
+                  Else
+                     nNCMode = -1
+                  End If
+                  ' leggo messaggi plc
+                  Siemens_Sharp7.ReadPLCMessages()
             End Select
+            ' se SiemensSharp7 e reset a 0, verifico che conferma lettura reset sia a zero
+            If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 And ResetReadedVariable.sValue = "1" And ResetVariable.sValue = "0" Then
+               Map.refMachManaging.DebugMessage(1, "Azzero lettura reset")
+               ResetReadedVariable.sValue = "0"
+            End If
+            ' se SiemensSharp7 e dati letti a 1 e dati scritti a 0, verifico che dati letti sia a zero
+            If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 And DataReadedVariable.sValue = "1" And DataToReadVariable.sValue = "0" Then
+               Map.refMachManaging.DebugMessage(1, "Azzero lettura dati")
+               DataReadedVariable.sValue = "0"
+            End If
             ' se NUM aggiorno stato della macchina
             If CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Then
                Dim OpState As OPStates
@@ -469,6 +562,41 @@ Public Class MachManaging
                If IsNothing(Map.refLeftPanelVM.SelOPState) OrElse OpState <> Map.refLeftPanelVM.SelOPState.Id Then
                   m_OpStateCallbackDlg(OpState)
                End If
+            ElseIf CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+               Dim OpState As OPStates
+               If nNCStatus > 0 Then
+                  Select Case nNCStatus
+                     Case 1
+                        OpState = OPStates.End
+                     Case 2
+                        OpState = OPStates.Stop
+                     Case 3
+                        OpState = OPStates.Start
+                     Case Else
+                        OpState = OPStates.Unspecified
+                  End Select
+               End If
+               If IsNothing(Map.refLeftPanelVM.SelOPState) OrElse OpState <> Map.refLeftPanelVM.SelOPState.Id Then
+                  Map.refMachManaging.DebugMessage(1, "Imposto stato CN: " & OpState)
+                  m_OpStateCallbackDlg(OpState)
+               End If
+               Dim OpMode As OPModes
+               If nNCMode > 0 Then
+                  Select Case nNCMode
+                     Case 1
+                        OpMode = OPModes.Manual
+                     Case 2
+                        OpMode = OPModes.Auto
+                     Case 3
+                        OpMode = OPModes.Mdi
+                     Case 4      ' Reference Point
+                        OpMode = OPModes.Home
+                  End Select
+               End If
+               If IsNothing(Map.refLeftPanelVM.SelOPMode) OrElse OpMode <> Map.refLeftPanelVM.SelOPMode.Id Then
+                  Map.refMachManaging.DebugMessage(1, "Imposto modo CN: " & OpMode)
+                  m_OpModeCallbackDlg(OpMode)
+               End If
             End If
             ' se TPA e non ancora fatto, preparo variabili barra successiva
             If CurrentMachine.NCType = NCTypes.TPA AndAlso CurrentMachine.Flow = FlowTypes.CONTINUOUS AndAlso m_NextBarId = 0 Then
@@ -482,19 +610,31 @@ Public Class MachManaging
                    nISO_Sent = 1) OrElse
                    (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso
                    Not Num_Axium_PCToolkit.bIsTransferActive AndAlso
-                   nISO_Sent = 1) Then
+                   nISO_Sent = 1) OrElse
+                   (CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso
+                    (nISO_Num = 0 OrElse
+                     nISO_Num = nRunning)) Then
                ' verifico se c'e' un programma da lanciare
+               Map.refMachManaging.DebugMessage(1, "Entro in SendNextProgram")
                SendNextProgram()
             End If
             ' verifico se scattato stato reset
             If nReset_State <> 0 Then
+               Map.refMachManaging.DebugMessage(1, "Scattato Reset")
                ' resetto tutti i programmi
                If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then Map.refProjectVM.SupervisorMachGroupPanelVM.ResetAllMachGroups()
-               ' resetto variabili P
-               ProdVariable.sValue = "0"
-               MachGroupVariable.sValue = "0"
-               PartVariable.sValue = "0"
-               StateVariable.sValue = "0"
+               If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                  'resetto programma corrente
+                  Map.refMachManaging.DebugMessage(1, "Resetto programma corrente")
+                  ISONumVariable.sValue = "0"
+                  m_bFirstRaw = True
+               Else
+                  ' resetto variabili P
+                  ProdVariable.sValue = "0"
+                  MachGroupVariable.sValue = "0"
+                  PartVariable.sValue = "0"
+                  StateVariable.sValue = "0"
+               End If
                'Tpa.RWVariableManager.WriteVar(P_PROD, 0)
                'Tpa.RWVariableManager.WriteVar(P_MACHGROUP, 0)
                'Tpa.RWVariableManager.WriteVar(P_PART, 0)
@@ -504,7 +644,12 @@ Public Class MachManaging
                   RemoveAllProgram() ' rimuovo programma default per pending
                End If
                ' azzero variabile reset
-               ResetVariable.sValue = "0"
+               If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                  Map.refMachManaging.DebugMessage(1, "Confermo lettura reset")
+                  ResetReadedVariable.sValue = "1"
+               Else
+                  ResetVariable.sValue = "0"
+               End If
                'Tpa.remObject.SetVariableCommand(CInt(ISOCNC.Remoting.VariableCommands.WriteVar),
                '                              RWVariableManager.GetReadVarFromName(RESET_STATE).sAddress, "0")
                ' resetto prossima barra e variabili V
@@ -528,10 +673,17 @@ Public Class MachManaging
                ' attesa per essere sicuro che abbia scritto e riletto variabili
                Threading.Thread.Sleep(300)
                ' verifico stati inizio e fine pezzi
-            ElseIf nP_Prod <> 0 AndAlso
-                   nP_Machgroup <> 0 AndAlso
-                   nP_Part <> 0 Then
+            ElseIf (CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7 AndAlso
+                    nP_Prod <> 0 AndAlso
+                    nP_Machgroup <> 0 AndAlso
+                    nP_Part <> 0) OrElse
+                   (CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso
+                    DataToReadVariable.sValue = "1" AndAlso
+                    nP_Prod <> 0 AndAlso
+                    nP_Machgroup <> 0 AndAlso
+                    nP_Part <> 0) Then
                If nP_State = PartState.START Then
+                  Map.refMachManaging.DebugMessage(1, "Leggo dati start")
                   Dim dtStart As DateTime = DateTime.Now()
                   ' recupero gruppo di lavorazione del pezzo
                   Dim MachGroup As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = nP_Machgroup)
@@ -573,6 +725,9 @@ Public Class MachManaging
                         Tpa.RWVariableManager.WriteVarByName(P_STATE, 0)
                      Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
                         StateVariable.sValue = "0"
+                     Case NCTypes.SIEMENS_SHARP7
+                        Map.refMachManaging.DebugMessage(1, "Confermo lettura dati start")
+                        DataReadedVariable.sValue = "1"
                   End Select
                   ' se nessun pezzo della barra diverso da quello corrente e' in start
                   If Not MachGroup.PartVMList.Any(Function(x) x.nPartId <> nP_Part AndAlso x.nProduction_State = 1) Then
@@ -590,9 +745,11 @@ Public Class MachManaging
                   End If
                   ' flag di aggiornamento log macchina
                   Map.refMachineLogPageVM.UpdateMachineLogList(False)
+                  DebugMessage(1, "Fine lettura dati start")
                   ' attesa per essere sicuro che abbia scritto e riletto variabili
                   Threading.Thread.Sleep(300)
                ElseIf nP_State = PartState.END_ Then
+                  DebugMessage(1, "Leggo dati end")
                   Dim dtEnd As DateTime = DateTime.Now()
                   ' recupero gruppo di lavorazione del pezzo
                   Dim MachGroup As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = nP_Machgroup)
@@ -652,10 +809,16 @@ Public Class MachManaging
                      ' scrivo evento fine MachGroup su DB
                      DbControllers.m_LogMachineController.Create(LogEvent.CreateMachGroupStateLog(dtEnd, nP_Prod, nP_Machgroup, nP_State, DbControllers.SupervisorId))
                      ' azzero tutte le variabilli per iniziare barra successiva
-                     ProdVariable.sValue = "0"
-                     MachGroupVariable.sValue = "0"
-                     PartVariable.sValue = "0"
-                     StateVariable.sValue = "0"
+                     ' azzero variabile per far ripartire macchina
+                     If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                        DebugMessage(1, "Confermo lettura dati end")
+                        DataReadedVariable.sValue = "1"
+                     Else
+                        ProdVariable.sValue = "0"
+                        MachGroupVariable.sValue = "0"
+                        PartVariable.sValue = "0"
+                        StateVariable.sValue = "0"
+                     End If
 
                      ' se non impostata data start
                      If MachGroup.dtStartTime = DateTime.MinValue Then
@@ -683,7 +846,11 @@ Public Class MachManaging
                      End If
                   Else
                      ' azzero variabile per far ripartire macchina
-                     StateVariable.sValue = "0"
+                     If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+                        DataReadedVariable.sValue = "1"
+                     Else
+                        StateVariable.sValue = "0"
+                     End If
                   End If
                   ' se pezzo = -1 stampo etichette di tutti i pezzi del MachGroup
                   If nP_Part = -1 Then
@@ -701,13 +868,17 @@ Public Class MachManaging
                   End If
                   ' flag di aggiornamento log macchina
                   Map.refMachineLogPageVM.UpdateMachineLogList(False)
+                  DebugMessage(1, "Fine lettura dati end")
                   ' attesa per essere sicuro che abbia scritto e riletto variabili
                   Threading.Thread.Sleep(300)
                End If
             End If
 
       End Select
-
+      ' funzione che riavvia comunicazione Siemens se necessario
+      If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
+         Siemens_Sharp7.RefreshConnection()
+      End If
    End Sub
 
    Private m_Lock_SendProgram As New Object
@@ -750,25 +921,28 @@ Public Class MachManaging
       If (CurrentMachine.NCType = NCTypes.TPA AndAlso Not m_bStartPending AndAlso Tpa.opState = MachineOperatingState.Pending) OrElse
          (CurrentMachine.NCType = NCTypes.NUM_FLEXIUM AndAlso Not Num_Flexium.bIsTransferActive) OrElse
          (CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER AndAlso Not Num_Axium_APServer.bIsTransferActive) OrElse
-         (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso Not Num_Axium_PCToolkit.bIsTransferActive) Then ' Or Tpa.opState = MachineOperatingState.Start) Then
+         (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso Not Num_Axium_PCToolkit.bIsTransferActive) OrElse
+         CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then ' Or Tpa.opState = MachineOperatingState.Start) Then
          ' verifico se c'e' un programma da lanciare
          If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
             ' EgtOutLog("Start " & DateTime.Now())
             Dim bMachGroupNotReady As Boolean = False
             SyncLock m_Lock_SendProgram
                For Each MyMachGroup As MyMachGroupVM In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList
+                  DebugMessage(1, "Ciclo alla ricerca di un programma da mandare")
                   ' EgtOutLog("Ciclo su name: " & MyMachGroup.Name & " id: " & MyMachGroup.Id)
-                  If Not MyMachGroup.bSentToMachine AndAlso (MyMachGroup.dtStartTime = DateTime.MinValue OrElse
+                  If Not MyMachGroup.bSentToMachine AndAlso (If(CurrentMachine.NCType <> NCTypes.SIEMENS_SHARP7, MyMachGroup.dtStartTime = DateTime.MinValue, MyMachGroup.dtEndTime = DateTime.MinValue) OrElse
                      (Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL AndAlso MyMachGroup.bResetWhileCutting)) Then
                      ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " è da fare")
                      ' verifico se ricalcolo finito
                      If MyMachGroup.bReadyForMachining AndAlso If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER OrElse CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT, Not MyMachGroup.bSendingToMachine, True) Then
                         ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " pronto per essere lavorato")
                         ' lo lancio
-                        bSent = SendProgram(MyMachGroup.CnFilePath(), MyMachGroup.Name)
+                        DebugMessage(1, "Eseguo SendProgram")
+                        bSent = SendProgram(MyMachGroup.CnFilePath(), MyMachGroup.Name, MyMachGroup)
                         ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " mandato " & DateTime.Now() & " " & MyMachGroup.Name & " " & bSent.ToString())
                         Select Case CurrentMachine.NCType
-                           Case NCTypes.TPA
+                           Case NCTypes.TPA, NCTypes.SIEMENS_SHARP7
                               MyMachGroup.SetSentToMachine(bSent)
                            Case NCTypes.NUM_FLEXIUM, NCTypes.NUM_AXIUM_APSERVER, NCTypes.NUM_AXIUM_PCTOOLKIT
                               MyMachGroup.SetSendingToMachine(bSent)
@@ -785,6 +959,14 @@ Public Class MachManaging
                   End If
                Next
             End SyncLock
+            If CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 AndAlso Not Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.nProduction_State < ItemState.WIP And x.bReadyForMachining) Then
+               Dim ISONumVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_NUM)
+               Dim nISONum As Integer = 0
+               If Not Integer.TryParse(ISONumVariable.sValue, nISONum) Or nISONum <> 0 Then
+                  DebugMessage(1, "Resetto programma da inviare")
+                  ISONumVariable.sValue = 0
+               End If
+            End If
             If bMachGroupNotReady Then Return False
             ' EgtOutLog("End " & DateTime.Now())
          End If
@@ -902,6 +1084,24 @@ Public Class MachManaging
                m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")
                Return
             End Try
+         Case NCTypes.SIEMENS_SHARP7
+            Try
+               m_CN = New SIEMENSSharp7Comm(Me)
+               If Siemens_Sharp7.InitConnection() Then
+                  m_bConnected = True
+                  ' imposto stato manuale
+                  Dim ManualMode As OPState = Map.refLeftPanelVM.OPModeList.FirstOrDefault(Function(x) x.Id = OPModes.Manual)
+                  Map.refLeftPanelVM.SetOPMode(ManualMode)
+                  m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.OK, ResultTypes.EXECUTED, "")
+               Else
+                  m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")
+                  Return
+               End If
+               ' creo classe di gestione variabili
+            Catch ex As Exception
+               m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")
+               Return
+            End Try
       End Select
    End Sub
 
@@ -934,6 +1134,13 @@ Public Class MachManaging
             ' chiudo classe Num_Flexium
             Me.OnDispose()
             'Num_Flexium.OnDispose()
+         Case NCTypes.SIEMENS_SHARP7
+            m_bConnected = False
+            Siemens_Sharp7.CloseConnection()
+            m_ResultCallbackDlg(CommandTypes.DISCONNECT, CommandStates.OK, ResultTypes.EXECUTED, "")
+            ' chiudo classe Num_Flexium
+            Me.OnDispose()
+            'Num_Flexium.OnDispose()
       End Select
       ' termino thread di comunicazione
       MachineCommThread.StopThread()
@@ -1049,7 +1256,7 @@ Public Class MachManaging
       End Select
    End Sub
 
-   Public Function SendProgram(ProgramPath As String, ProgramId As String) As Boolean
+   Public Function SendProgram(ProgramPath As String, ProgramId As String, Optional MyMachGroup As MyMachGroupVM = Nothing) As Boolean
       Select Case CurrentMachine.NCType
          Case NCTypes.TPA
             If Tpa.opState = MachineOperatingState.Pending Then
@@ -1080,6 +1287,31 @@ Public Class MachManaging
                Num_Axium_PCToolkit.FileDownload(nFileType * 10, ProgramPath)
             End If
             Return True
+         Case NCTypes.SIEMENS_SHARP7
+            ' EgtOutLog("Pre Download")
+            Dim nFileType As Integer = 0
+            If Integer.TryParse(ProgramId, nFileType) AndAlso nFileType > 0 Then
+               Dim sDestDir As String = ""
+               GetPrivateProfileString(S_GENERAL, K_ISOFILEDIR, "c:/Saomad/ISO", sDestDir, CurrentMachine.sMachIniFile)
+               DebugMessage(1, "Copio programma")
+               File.Copy(ProgramPath, sDestDir & "\" & nFileType & ".mpf", True)
+               ' se primo dopo start
+               If m_bFirstRaw Then
+                  m_bFirstRaw = False
+                  DebugMessage(1, "Primo grezzo")
+                  ' annullo step di ripartenza
+                  Map.refMachManaging.Siemens_Sharp7.ResetStep(Not (MyMachGroup.dtStartTime <> DateTime.MinValue OrElse MyMachGroup.nProduction_State = ItemState.WIP))
+               End If
+               ' imposto larghezza barra
+               Dim WCarico As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = W_CARICO)
+               WCarico.sValue = DoubleToString(MyMachGroup.dW, 1)
+               DebugMessage(1, "Imposto larghezza: " & MyMachGroup.dW)
+               ' imposto numero programma scritto
+               Dim ISONumVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_NUM)
+               DebugMessage(1, "Imposto programma inviato: " & nFileType)
+               ISONumVariable.sValue = nFileType
+            End If
+            Return True
       End Select
       Return False
    End Function
@@ -1172,6 +1404,13 @@ Public Class MachManaging
                Case CommVar.Types.CN
                   Num_Axium_PCToolkit.WriteNCVariables(Address, Value)
             End Select
+         Case NCTypes.SIEMENS_SHARP7
+            Select Case Type
+               Case CommVar.Types.PLC
+                  Siemens_Sharp7.WriteVariable(Address, Value)
+                  'Case CommVar.Types.CN
+                  '   Num_Axium_PCToolkit.WriteNCVariables(Address, Value)
+            End Select
       End Select
    End Sub
 
@@ -1187,6 +1426,8 @@ Public Class MachManaging
             Return NUMAxiumComm.InitVar(NewVar)
          Case NCTypes.NUM_AXIUM_PCTOOLKIT
             Return NUMAxiumPcToolkitComm.InitVar(NewVar)
+         Case NCTypes.SIEMENS_SHARP7
+            Return SIEMENSSharp7Comm.InitVar(NewVar)
       End Select
       Return Nothing
    End Function
@@ -1279,4 +1520,14 @@ Public Class MachManaging
       End Select
    End Sub
 
+#Region "Debug"
+
+   Friend Sub DebugMessage(nLevel As Integer, sMessage As String)
+      If m_Debug >= nLevel Then
+         EgtOutLog(sMessage)
+      End If
+   End Sub
+
+#End Region    ' Debug
+
 End Class

EgtBEAMWALL.Supervisor/MachManagingThread/MachManagingThread.vb

@@ -21,7 +21,7 @@ Class MachineCommThread
    Private Shared sResetVarName As String = "0.FUNM.E80048"
 
    Public Shared Sub MachManagingThreadFunction(ResultCallbackDlg As ResultCallbackDlg, CloseCallbackDlg As CloseCallbackDlg, UpdateCallbackDlg As UpdateCallbackDlg,
-                                                TPAAlarmCallbackDlg As TPAAlarmCallbackDlg, NUMAlarmCallbackDlg As NUMAlarmCallbackDlg, AxisCoordinatesCallbackDlg As AxisCoordinatesCallbackDlg,
+                                                TPAAlarmCallbackDlg As TPAAlarmCallbackDlg, NUMAlarmCallbackDlg As NUMAlarmCallbackDlg, SiemensAlarmCallbackDlg As SiemensAlarmCallbackDlg, AxisCoordinatesCallbackDlg As AxisCoordinatesCallbackDlg,
                                                 OpStateCallbackDlg As OpStateCallbackDlg, OpModeCallbackDlg As OpModeCallbackDlg, ChannelCallbackDlg As ChannelCallbackDlg,
                                                 ReadVarCallbackDlg As ReadVarCallbackDlg)
       ' inizializzo callback
@@ -30,6 +30,7 @@ Class MachineCommThread
       m_UpdateCallbackDlg = UpdateCallbackDlg
       m_TPAAlarmCallbackDlg = TPAAlarmCallbackDlg
       m_NUMAlarmCallbackDlg = NUMAlarmCallbackDlg
+      m_SiemensAlarmCallbackDlg = SiemensAlarmCallbackDlg
       m_AxisCoordinatesCallbackDlg = AxisCoordinatesCallbackDlg
       m_OpStateCallbackDlg = OpStateCallbackDlg
       m_OpModeCallbackDlg = OpModeCallbackDlg

EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb

@@ -176,7 +176,7 @@ Public Class MainMenuVM
 #Region "METHODS"
 
    Friend Sub SetInputOutputVisibility()
-      If CurrentMachine.NCType = NCTypes.TPA Then
+      If CurrentMachine.NCType = NCTypes.TPA OrElse CurrentMachine.NCType = NCTypes.SIEMENS_SHARP7 Then
          m_Inputs_Visibility = Visibility.Collapsed
          m_Outputs_Visibility = Visibility.Collapsed
       End If

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -248,8 +248,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2701, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb

@@ -229,7 +229,7 @@ Public Class MainWindowVM
    Public Sub CloseApplication()
       ' se macchina sta funzionando
       If Not IsNothing(Map.refMachManaging) AndAlso Map.refMachManaging.bConnected AndAlso
-         (Map.refLeftPanelVM.SelOPState.Id <> OPStates.End AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.Unspecified) Then
+         (If(Not IsNothing(Map.refLeftPanelVM.SelOPState), Map.refLeftPanelVM.SelOPState.Id <> OPStates.End AndAlso Map.refLeftPanelVM.SelOPState.Id <> OPStates.Unspecified, True)) Then
          MessageBox.Show("Impossible closing software while machine is working. If you want to close, first press reset and stop the machine!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
          Return
       End If

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End if
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Supervisor")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
 
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.12.2")>
-<Assembly: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.7.1.2")>
+<Assembly: AssemblyFileVersion("2.7.1.2")>

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -11,14 +11,13 @@ Public Class OpenProjectFileDialogVM
 
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
       m_ProjectType = ProjectType
-      m_GoToProd = GoToProd
       ' carico colonne
       LoadColumns(m_ProjectType)
       NotifyPropertyChanged(NameOf(FilterTypeList))
       m_SelFilterType = m_FilterTypeList(0)
       ' carico lista progetti
       If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then
-         RefreshProjectList()
+         RefreshProjectList(GoToProd)
       Else
          m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList)
          NotifyPropertyChanged(NameOf(ProjectList))
@@ -27,7 +26,7 @@ Public Class OpenProjectFileDialogVM
       m_ProjectList_View.Filter = AddressOf ProjectFilter
    End Function
 
-   Public Overrides Sub RefreshProjectList()
+   Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
       m_ProjectList.Clear()
       ' calcolo periodo e righe
       Dim dtStart As DateTime

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -58,6 +58,12 @@ Public Class MySceneHostVM
          Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
          EgtSetMainWindowHandle(hMainWnd)
          EgtSetCurrentContext(MainScene.GetCtx())
+         ' Imposto direttorio ausiliario per import/gestione BTL
+         Dim sBtlAuxDir As String = String.Empty
+         GetMainPrivateProfileString(S_IMPORT, K_BTLAUXDIR, "", sBtlAuxDir)
+         If Not EgtSetBtlAuxDir(sBtlAuxDir) Then
+            EgtOutLog("Missing BtlAuxDir path! Will be impossible to load Variant!")
+         End If
          ' inizializzo gestore travi e pareti
          EgtInitBeamMgr(EIB_FL.TS3_POS + EIB_FL.USEUATTR)
          ' inizializzo gestore lavorazioni

EgtBEAMWALL.Supervisor/Utility/CurrentMachine.vb

@@ -268,6 +268,8 @@ Public Module CurrentMachine
       Map.refLeftPanelVM.LoadOPModes()
       ' Imposto visibilità variabili E80000
       Map.refLeftPanelVM.SetE80000Visibility()
+      ' Imposto visibilita' assi
+      Map.refLeftPanelVM.SetAxisVisibility()
    End Sub
 
 #End Region 'Init

EgtBEAMWALL.Supervisor/app.config

@@ -6,12 +6,12 @@
    </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>
+      <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=root;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient" />
    </connectionStrings>

EgtBEAMWALL.ViewerOptimizer/AddFeatureWnd/AddFeatureWndVM.vb

@@ -221,6 +221,13 @@ Public Class PRC
       End Get
    End Property
 
+   Private m_nVARIANT As Integer = 0
+   Public ReadOnly Property nVARIANT As Integer
+      Get
+         Return m_nVARIANT
+      End Get
+   End Property
+
    ' Nome
    Private m_sName As String
    Public ReadOnly Property sName As String

EgtBEAMWALL.ViewerOptimizer/App.config

@@ -1,16 +1,13 @@
 <?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=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient" />

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -1,9 +1,14 @@
 Imports System.Collections.ObjectModel
 Imports System.Collections.Specialized
 Imports System.ComponentModel
+Imports System.Globalization
+Imports System.IO
+Imports System.Text.RegularExpressions
+Imports System.Windows.Interop
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
 Imports EgtWPFLib5
+Imports Mysqlx.XDevAPI.Common
 
 Public Class BTLFeatureVM
    Inherits Core.BTLFeatureVM
@@ -78,14 +83,14 @@ Public Class BTLFeatureVM
                If EgtGetInfo(nFeatureId, "AUXID", sAuxId) Then
                   ' verifico se ha uno o due percorsi
                   Dim sAuxIdSplit() As String = sAuxId.Split(","c)
-                  If Not IsNothing( sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 1 Then
+                  If Not IsNothing(sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 1 Then
                      Dim nAuxId As Integer = GDB_ID.NULL
                      If Integer.TryParse(sAuxIdSplit(0), nAuxId) Then
                         EgtTransform(nFeatureId + nAuxId, frOld, GDB_RT.GLOB)
                         EgtTransform(nFeatureId + nAuxId, frNew, GDB_RT.GLOB)
                      End If
                   End If
-                  If Not IsNothing( sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 2 Then
+                  If Not IsNothing(sAuxIdSplit) AndAlso sAuxIdSplit.Length() >= 2 Then
                      Dim nAux2Id As Integer = GDB_ID.NULL
                      If Integer.TryParse(sAuxIdSplit(1), nAux2Id) Then
                         EgtTransform(nFeatureId + nAux2Id, frOld, GDB_RT.GLOB)
@@ -114,6 +119,67 @@ Public Class BTLFeatureVM
       End Set
    End Property
 
+   Public Property VARIANTList As ObservableCollection(Of Integer)
+      Get
+         Return m_BTLFeatureM.VARIANTList
+      End Get
+      Set(value As ObservableCollection(Of Integer))
+         m_BTLFeatureM.VARIANTList = value
+      End Set
+   End Property
+
+   Public Overrides Property nSelVARIANT As Integer
+      Get
+         Return m_BTLFeatureM.nSelVARIANT
+      End Get
+      Set(value As Integer)
+         If value <> m_BTLFeatureM.nSelVARIANT Then
+            m_BTLFeatureM.nSelVARIANT = value
+            Dim vPar As Double() = Nothing
+            Dim sPar As String = Nothing
+            Dim vParQ As String() = Nothing
+            CreateFeatureVariant(value, vPar, sPar, vParQ)
+            If IsNothing(vPar) Then
+               m_BTLFeatureM.nSelVARIANT = 0
+               CreateFeatureVariant(value, vPar, sPar, vParQ)
+            End If
+            m_BTLFeatureM.nSelVARIANT = value
+            Dim bOK As Boolean = m_BTLFeatureM.UpdateParams(nSelGRP, m_BTLFeatureM.nPRC, nSelSIDE, sDES, m_BTLFeatureM.nPRID,
+                                                            m_BTLFeatureM.frFRAME, vPar, sPar, vParQ)
+            If bOK Then
+               EgtDuploSetModified(m_BTLPartM.nPartId)
+               ' seleziono feature in disegno
+               SelGeomFeature()
+               ' rendo non calcolata questa feature
+               ResetCalcFeature()
+            End If
+            NotifyPropertyChanged(NameOf(nSelVARIANT))
+            NotifyPropertyChanged(NameOf(PBTLParamVMList))
+            NotifyPropertyChanged(NameOf(QBTLParamVMList))
+            EgtDraw()
+         End If
+      End Set
+   End Property
+
+   Private Sub CreateFeatureVariant(value As Integer, ByRef vPar() As Double, ByRef sPar As String, ByRef vParQ() As String)
+      ' crea parametri per questa feature da file ini
+      m_BTLFeatureM.CreateFeatureParams(m_BTLFeatureM)
+      m_BTLFeatureM.SetDefaultValues()
+      CreatePBTLParamVMList()
+      CreateQBTLParamVMList()
+      ' aggiorno la feature con nuovo valore
+      vPar = Nothing
+      sPar = Nothing
+      vParQ = Nothing
+      m_BTLFeatureM.CalcParamArray(vPar, sPar, vParQ)
+      ' imposto path disegno da mostrare in BottomPanel
+      If value > 0 AndAlso File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png") Then
+         Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png")
+      Else
+         Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png")
+      End If
+   End Sub
+
    Public Property sPriority As String
       Get
          Return m_BTLFeatureM.nPriority.ToString()
@@ -186,7 +252,11 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property sDrawPath As String
       Get
-         Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png"
+         If nPRC = 900 AndAlso nSelVARIANT > 0 Then
+            Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & "." & sDES & ".png"
+         Else
+            Return Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & sDescGRP & ".png"
+         End If
       End Get
    End Property
 
@@ -327,7 +397,7 @@ Public Class BTLFeatureVM
       AddHandler m_QBTLParamVMList.CollectionChanged, AddressOf OnQBTLParamVMListChanged
    End Sub
 
-   ' funzione che aggiorna lo stato e gli errori dopo calcolo
+   ' funzione che aggiorna lo stato, la rotazione e gli errori dopo calcolo
    Friend Sub CalcFeatureUpdate(ERR As Integer, ROT As Integer, MSG As String)
       EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ERR, ITG_PROD_ERR), ERR, True)
       EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_MSG, ITG_PROD_MSG), MSG, True)
@@ -354,6 +424,32 @@ Public Class BTLFeatureVM
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
    End Sub
 
+   ' funzione che resetta gli errori del calcolo
+   Friend Sub ResetFeatureError()
+      Dim ERR As Integer = 0
+      Dim MSG As String = ""
+      EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_ERR, ITG_PROD_ERR), ERR, True)
+      EgtSetInfo(nFeatureId, If(Map.refMainMenuVM.SelPage = Pages.VIEW, ITG_PROJ_MSG, ITG_PROD_MSG), MSG, True)
+      m_BTLFeatureM.nCALC_ERR = ERR
+      m_BTLFeatureM.sCALC_MSG = MSG
+      Select Case ERR
+         Case 0
+            m_BTLFeatureM.nState = CalcStates.OK
+         Case 22
+            m_BTLFeatureM.nState = CalcStates.COLLISION
+         Case 17, 19
+            m_BTLFeatureM.nState = CalcStates.WARNING
+         Case < 0
+            m_BTLFeatureM.nState = CalcStates.INFO
+         Case > 0
+            m_BTLFeatureM.nState = CalcStates.ERROR_
+      End Select
+      NotifyPropertyChanged(NameOf(Calc_Background))
+      NotifyPropertyChanged(NameOf(sCALC_MSG))
+      NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
+      NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
+   End Sub
+
    Friend Sub ResetCalcFeature()
       EgtRemoveInfo(nFeatureId, If(IsNothing(m_BTLPartM), ITG_PROD_ERR, ITG_PROJ_ERR))
       EgtRemoveInfo(nFeatureId, If(IsNothing(m_BTLPartM), ITG_PROD_MSG, ITG_PROJ_MSG))

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -213,11 +213,9 @@ Public Class BTLParamVM
          Dim bFound As Boolean = False
          If Not value Then
             ' Cerco il parametro Q direttamente nel file ini
-            Dim GRPType As Integer = Me.m_BTLFeatureM.nSelGRP
-            Dim PRC As Integer = Me.m_BTLFeatureM.nPRC
             Dim ParamIndex As String = 1
             Dim NewBTLParam As BTLParamM = Nothing
-            While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, False, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(Me.m_BTLFeatureM.nSelGRP, Me.m_BTLFeatureM.nPRC, Me.m_BTLFeatureM.nSelVARIANT, False, ParamIndex, Nothing, NewBTLParam)
                Dim QBTLParam As BTLParamVM = New BTLParamVM(NewBTLParam)
                If QBTLParam.sName = Me.sName Then
                   Me.sValue = QBTLParam.sDefault

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -5,6 +5,7 @@ Imports EgtBEAMWALL.Core
 Imports System.Collections.Specialized
 Imports System.ComponentModel
 Imports System.Windows.Threading
+Imports System.Security.Cryptography
 
 Public Class BTLPartVM
    Inherits VMBase
@@ -452,20 +453,25 @@ Public Class BTLPartVM
                   OldSection = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x = Section)
                End If
                m_BTLPartM.sMATERIAL = value
-               ' se sezione nuova non presente
-               If Not Map.refProjectVM.BTLStructureVM.SectionList.Contains(Section) Then
-                  ' creo nuova sezione
-                  Dim nMaterialId As Integer = DbControllers.m_MaterialsController.Insert(Section.MaterialM)
-                  Dim NewSection = Section
-                  Map.refProjectVM.BTLStructureVM.SectionList.Add(NewSection)
-                  If nMaterialId <> 0 Then
-                     NewSection.MaterialM.SetId(nMaterialId)
+               ' aggiorno sezione
+               If bOtherSection Then
+                  ' se sezione nuova non presente
+                  If Not Map.refProjectVM.BTLStructureVM.SectionList.Contains(Section) Then
+                     ' creo nuova sezione
+                     Map.refProjectVM.BTLStructureVM.SectionList.Add(Section)
+                  End If
+               Else
+                  ' se sezione nuova gia' presente
+                  If Map.refProjectVM.BTLStructureVM.SectionList.Contains(Section) Then
+                     ' cancello sezione vecchia
+                     Map.refProjectVM.BTLStructureVM.SectionList.Remove(OldSection)
+                  Else
+                     ' altrimenti la modifico
+                     If Not IsNothing(OldSection) Then
+                        OldSection.sMaterial.Clear()
+                        OldSection.sMaterial.Add(sMATERIAL)
+                     End If
                   End If
-               End If
-               ' se sezione vecchia non utilizzata da altri pezzi
-               If Not bOtherSection Then
-                  ' cancello sezione vecchia
-                  Map.refProjectVM.BTLStructureVM.SectionList.Remove(OldSection)
                End If
             End If
             NotifyPropertyChanged(NameOf(sMATERIAL))
@@ -1530,13 +1536,30 @@ Public Class BTLPartVM
                ' aggiorno stato abilitazione del bottone modifica free contour
                Map.refFeatureManagerVM.SetEditIsEnabled()
                Map.refFeatureManagerVM.NotifyPropertyChanged(NameOf(Map.refFeatureManagerVM.Priority_Visibility))
-            Else
-               EgtDeselectAll()
+               ' Controlo se nPRC è 900 rendo visibile combobox Variant
+               If m_SelBTLFeatureVM.nPRC = 900 Then
+                  Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Visible)
+                  Dim nVariant As Integer = 0
+                  If Integer.TryParse(m_SelBTLFeatureVM.sDES, nVariant) Then
+                     m_SelBTLFeatureVM.nSelVARIANT = nVariant
+                  End If
+                  If m_SelBTLFeatureVM.nSelVARIANT > 0 AndAlso
+                     System.IO.File.Exists(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png") Then
+                     ' imposto path disegno da mostrare in BottomPanel
+                     Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & "." & m_SelBTLFeatureVM.sDES & ".png")
+                  Else
+                     Map.refBottomPanelVM.SetCurrDraw(Map.refMainWindowVM.MainWindowM.sResourcesRoot & "\Features\" & m_SelBTLFeatureVM.sDescGRP & ".png")
+                  End If
+               Else
+                  Map.refFeatureManagerVM.SetVariant_Visibility(Visibility.Collapsed)
+               End If
+               Else
+                  EgtDeselectAll()
+               End If
+               Map.refLeftPanelVM.FeatureSelectionChanged()
             End If
-            Map.refLeftPanelVM.FeatureSelectionChanged()
-         End If
-         EgtDraw()
-         NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
+            EgtDraw()
+            NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
       End Set
    End Property
 
@@ -1719,8 +1742,14 @@ Public Class BTLPartVM
       m_BTLPartM.nFeaturesGlobalState = CalcStates.NOTCALCULATED
       If nState > CalcStates.NOTCALCULATED Then
          For Each Feature In BTLFeatureVMList
-            If Not Feature.bDO And Not bFeatureFirst Then Continue For
-
+            If Not Feature.bDO And Not bFeatureFirst Then
+               If Feature.nState = CalcStates.COLLISION AndAlso Feature.nState > m_BTLPartM.nGlobalState Then
+                  m_BTLPartM.nGlobalState = Feature.nState
+                  m_BTLPartM.nCALC_GlobalERR = Feature.nCALC_ERR
+               Else
+                  Continue For
+               End If
+            End If
             If ((Feature.nState = CalcStates.NOTCALCULATED And nState < CalcStates.WARNING) Or Not Feature.bDO) And bFeatureFirst Then
                m_BTLPartM.nGlobalState = Feature.nState
                m_BTLPartM.nCALC_GlobalERR = Feature.nCALC_ERR
@@ -1995,7 +2024,7 @@ Public Class BTLPartVM
       ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
       If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
          ' se esiste, imposto sezione inversa
-         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial = CurrSection.sMaterial)
+         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
          If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
       End If
    End Sub
@@ -2026,7 +2055,7 @@ Public Class BTLPartVM
       ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
       If bUpdateSection AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
          ' se esiste, imposto sezione inversa
-         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial = CurrSection.sMaterial)
+         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
          If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
       End If
    End Sub

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -998,12 +998,7 @@ Public Class BTLStructureVM
       For Each BTLPartVM As BTLPartVM In m_BTLPartVMList
          ' verifico sezione, gruppo e sottogruppo per inserirli nei filtri
          If Not SectionList.Contains(BTLPartVM.Section) Then
-            Dim nMaterialId As Integer = DbControllers.m_MaterialsController.Insert(BTLPartVM.Section.MaterialM)
-            Dim NewSection = BTLPartVM.Section
-            Map.refProjectVM.BTLStructureVM.SectionList.Add(NewSection)
-            If nMaterialId <> 0 Then
-               NewSection.MaterialM.SetId(nMaterialId)
-            End If
+            SectionList.Add(BTLPartVM.Section)
          End If
          If Not GroupList.Contains(BTLPartVM.sGROUP) Then
             GroupList.Add(BTLPartVM.sGROUP)

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -355,7 +355,7 @@ Public Class CALCPanelVM
                ' Resetto feature in collisione
                For Each Feature In BTLPart.m_BTLFeatureVMList
                   If Feature.nState = CalcStates.COLLISION Then
-                     Feature.CalcFeatureUpdate(0, 0, "")
+                     Feature.ResetFeatureError()
                   End If
                Next
             Else
@@ -366,7 +366,7 @@ Public Class CALCPanelVM
                   ' Resetto feature in collisione
                   For Each Feature As BTLFeatureVM In Part.FeatureVMList
                      If Feature.nState = CalcStates.COLLISION Then
-                        Feature.CalcFeatureUpdate(0, 0, "")
+                        Feature.ResetFeatureError()
                      End If
                   Next
                Next
@@ -387,15 +387,15 @@ Public Class CALCPanelVM
                         ' aggiorno nuovo pezzo
                         CurrBTLPartVM = GetBTLPartVMFromBTLPartId(Line.nCUTID)
                         If IsNothing(CurrBTLPartVM) Then
+                           Line.ResetTypePart()
                            EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(BTLPartVM).")
-                           Continue For
                         End If
                      Else
                         ' aggiorno nuovo pezzo
                         CurrPartVM = GetPartVMFromPartId(Line.nCUTID)
                         If IsNothing(CurrPartVM) Then
+                           Line.ResetTypePart()
                            EgtOutLog("Error in CALC ProcessResult. CUTID " & Line.nCUTID & "not found in project(PartVM).")
-                           Continue For
                         End If
                      End If
                   End If
@@ -422,14 +422,14 @@ Public Class CALCPanelVM
                   If nProgramPage = ProjectType.PROJ Then
                      CurrBTLFeatureVM = GetBTLFeatureVMFromBTLPartId(CurrBTLPartVM, Line.nTASKID)
                      If IsNothing(CurrBTLFeatureVM) Then
+                        Line.ResetTypeFeature()
                         EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in BTLPartVM " & CurrBTLPartVM.nPartId)
-                        Continue For
                      End If
                   Else
                      CurrBTLFeatureVM = GetFeatureVMFromPartId(CurrPartVM, Line.nTASKID)
                      If IsNothing(CurrBTLFeatureVM) Then
+                        Line.ResetTypeFeature()
                         EgtOutLog("Error in CALC ProcessResult. TASKID " & Line.nTASKID & "not found in PartVM " & CurrPartVM.nPartId)
-                        Continue For
                      End If
                   End If
                Else

EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb

@@ -30,7 +30,7 @@ Public Class ChangeParameterWndVM
             Dim ParamIndex As Integer = 1
             Dim NewBTLParam As BTLParamM = Nothing
             ' leggo tutti i P della feature
-            While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, True, ParamIndex, Nothing, NewBTLParam)
+            While BTLIniFile.GetBeamPrivateProfileParam(m_SelPRC.nGRP, m_SelPRC.nPRC, m_SelPRC.nVARIANT, True, ParamIndex, Nothing, NewBTLParam)
                m_ParamList.Add(New Parameters(NewBTLParam))
                ParamIndex += 1
             End While

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -9,6 +9,8 @@ Imports Ionic.Zip
 Imports Org.BouncyCastle.Bcpg
 Imports Microsoft.VisualBasic.ApplicationServices
 Imports Renci.SshNet.Security
+Imports Google.Protobuf.WellKnownTypes
+Imports System.Globalization
 
 Public Class ConfigurationPageVM
    Inherits VMBase
@@ -960,7 +962,7 @@ Public Class ConfigurationPageVM
       ParamIndex = 1
       TempList = New List(Of QBTLParamVM)
       If IsP Then
-         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, IsP, ParamIndex, Nothing, NewBTLParam)
+         While BTLIniFile.GetBeamPrivateProfileParam(GRPType, PRC, 0, IsP, ParamIndex, Nothing, NewBTLParam)
             TempList.Add(New QBTLParamVM(NewBTLParam, GRPType, PRC))
             ParamIndex += 1
          End While

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -1,5 +1,4 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -16,31 +15,6 @@
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>true</IncrementalBuild>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <IncrementalBuild>false</IncrementalBuild>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
   </PropertyGroup>
@@ -53,29 +27,6 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -105,27 +56,6 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\RemoteDebug\</OutputPath>
-    <DocumentationFile>EgtBEAMWALL.ViewerOptimizer.xml</DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'RemoteDebug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <DefineDebug>true</DefineDebug>
@@ -138,12 +68,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </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>
-    <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>
-    </Reference>
     <Reference Include="EgtUILib, Version=2.4.3.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
@@ -152,67 +76,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="EgwProxy.MagMan, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgwProxy.MagMan.1.0.2402.619\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>
-    <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
-    </Reference>
-    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
-    </Reference>
-    <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="MigraDoc.DocumentObjectModel-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.DocumentObjectModel-wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="MigraDoc.Rendering-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.Rendering-wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="MigraDoc.RtfRendering-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.RtfRendering-wpf.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>
-    <Reference Include="MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\PdfSharp-wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="PdfSharp.Charting-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\PdfSharp.Charting-wpf.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>
-    <Reference Include="RestSharp, Version=110.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.110.2.0\lib\net471\RestSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -221,36 +85,10 @@
     <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>
     <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>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Security" />
-    <Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.7.0.2\lib\net462\System.Text.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -260,16 +98,10 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="Application.xaml">
@@ -809,7 +641,6 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\EgtBEAMWALL.ico" />
@@ -1031,6 +862,35 @@
   <ItemGroup>
     <Resource Include="Resources\OpenProjectFileDialog\Archived.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle">
+      <Version>1.8.5</Version>
+    </PackageReference>
+    <PackageReference Include="DotNetZip">
+      <Version>1.16.0</Version>
+    </PackageReference>
+    <PackageReference Include="EntityFramework">
+      <Version>6.4.4</Version>
+    </PackageReference>
+    <PackageReference Include="Google.Protobuf">
+      <Version>3.21.9</Version>
+    </PackageReference>
+    <PackageReference Include="K4os.Compression.LZ4.Streams">
+      <Version>1.3.5</Version>
+    </PackageReference>
+    <PackageReference Include="MySql.Data.EntityFramework">
+      <Version>8.0.21</Version>
+    </PackageReference>
+    <PackageReference Include="NLog">
+      <Version>5.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="PDFsharp-MigraDoc-wpf">
+      <Version>1.50.5147</Version>
+    </PackageReference>
+    <PackageReference Include="Portable.BouncyCastle">
+      <Version>1.9.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
@@ -1038,12 +898,4 @@ IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPa
 IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR64.exe
 IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerD64.exe</PostBuildEvent>
   </PropertyGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
-    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
-  </Target>
-  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
 </Project>

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerV.xaml

@@ -32,6 +32,12 @@
                           Width="45"/>
    <TextBlock Text="{Binding Tag.sName, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
               Style="{StaticResource OptionTextBlock}"/>
+   <ComboBox ItemsSource="{Binding Tag.VARIANTList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
+             SelectedItem="{Binding Tag.nSelVARIANT, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
+             IsEnabled="{Binding FeatureManager_IsEnabled}"
+             Visibility="{Binding Variant_Visibility}"
+             Style="{StaticResource FeatureComboBox}"/>
+
    <Button Content="{Binding Edit_Msg}"
            Command="{Binding Tag.Edit_Command, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"
            Visibility="{Binding Tag.Edit_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureManagerV}}}"

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerVM.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class FeatureManagerVM
@@ -16,6 +17,18 @@ Public Class FeatureManagerVM
       End Set
    End Property
 
+
+   Private m_Variant_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Variant_Visibility As Visibility
+      Get
+         Return m_Variant_Visibility
+      End Get
+   End Property
+   Public Sub SetVariant_Visibility(value As Visibility)
+      m_Variant_Visibility = value
+      NotifyPropertyChanged(NameOf(Variant_Visibility))
+   End Sub
+
    Public ReadOnly Property Edit_IsEnabled As Boolean
       Get
          Return m_FeatureManager_IsEnabled AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso
@@ -97,7 +110,6 @@ Public Class FeatureManagerVM
       NotifyPropertyChanged(NameOf(Edit_IsEnabled))
    End Sub
 
-
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.ViewerOptimizer/FreeContourManager/FreeContourManagerVM.vb

@@ -427,7 +427,7 @@ Public Class FreeContourManagerVM
       ' posiziono la griglia sul riferimento del contorno libero
       Dim frFace As New Frame3d
       EgtBeamGetSideData(SelFeature.nSelSIDE, frFace)
-      Dim frFrame As Frame3d = SelFeature.BTLFeatureM.frFRAME
+      Dim frFrame As New Frame3d(SelFeature.BTLFeatureM.frFRAME)
       frFrame.ToGlob( frFace)
       EgtSetGridFrame(frFrame)
       EgtSetGridShow(True, True)

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml

@@ -24,7 +24,7 @@
          <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
                                  MinWidth="28">
             <DataGridCheckBoxColumn.Header>
-               <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}"/>
+               <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}" HorizontalAlignment="Center"/>
             </DataGridCheckBoxColumn.Header>
          </DataGridCheckBoxColumn>
          <!--Validità feature-->

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -928,8 +928,15 @@ Public Class LeftPanelVM
          Case MCH_CR.BR
             dPosX = WallMachGroup.dL - PartToAdd.dL - dPosX
       End Select
+      ' calcolo box del pezzo e del suo layer box per compensare la  eventuale differenza
+      Dim b3Part As New BBox3d
+      EgtGetBBoxGlob(nPartDuploId, GDB_BB.STANDARD, b3Part)
+      Dim b3Box As New BBox3d
+      Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartDuploId, "Box")
+      EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
+      Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min
       ' aggiungo il pezzo al grezzo
-      If EgtAddPartToRawPart(nPartDuploId, New Point3d(dPosX, dPosY, 0), WallMachGroup.MyMachGroupM.nRawPartId) Then
+      If EgtAddPartToRawPart(nPartDuploId, New Point3d(dPosX - vtDeltaBox.x, dPosY - vtDeltaBox.y, 0 - vtDeltaBox.z), WallMachGroup.MyMachGroupM.nRawPartId) Then
          EgtSetInfo(nPartDuploId, MGR_PRT_POSX, dPosX)
          EgtSetInfo(nPartDuploId, MGR_PRT_POSY, dPosY)
          EgtSetInfo(nPartDuploId, MGR_PRT_ROT, PartToAdd.nROTATED)
@@ -1031,12 +1038,7 @@ Public Class LeftPanelVM
             Map.refProjectVM.BTLStructureVM.SetSelBTLPart(NewPartVM, False, True)
             ' verifico se aggiungere sezione alla lista
             If Not Map.refProjectVM.BTLStructureVM.SectionList.Contains(NewPartVM.Section) Then
-               Dim nMaterialId As Integer = DbControllers.m_MaterialsController.Insert(NewPartVM.Section.MaterialM)
-               Dim NewSection = NewPartVM.Section
-               Map.refProjectVM.BTLStructureVM.SectionList.Add(NewSection)
-               If nMaterialId <> 0 Then
-                  NewSection.MaterialM.SetId(nMaterialId)
-               End If
+               Map.refProjectVM.BTLStructureVM.SectionList.Add(NewPartVM.Section)
             End If
          End If
       End If
@@ -1189,7 +1191,7 @@ Public Class LeftPanelVM
       ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
          ' se esiste, imposto sezione inversa
-         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial = CurrSection.sMaterial)
+         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
          If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
       End If
       EgtDraw()
@@ -1233,7 +1235,7 @@ Public Class LeftPanelVM
       ' se progetto travi e sezione precedente diversa da vuota (tutti i pezzi)
       If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM AndAlso CurrSection <> SectionXMaterial.Empty Then
          ' se esiste, imposto sezione inversa
-         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial = CurrSection.sMaterial)
+         Dim InverseSection As SectionXMaterial = Map.refProjectVM.BTLStructureVM.SectionList.FirstOrDefault(Function(x) x.dH = CurrSection.dW AndAlso x.dW = CurrSection.dH AndAlso x.sMaterial(0) = CurrSection.sMaterial(0))
          If Not IsNothing(InverseSection) Then Map.refProjectVM.BTLStructureVM.SetSelSection(InverseSection)
       End If
       EgtDraw()
@@ -1361,7 +1363,7 @@ Public Class LeftPanelVM
             NewFeat.CalcParamArray(vPar, sPar, vParQ)
             ' aggiorno la feature con nuovo valore
             EgtBeamSetPart(Map.refProjectVM.BTLStructureVM.SelBTLPart.nPartId)
-            nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, "",
+            nNewFeatureId = EgtBeamAddProcess(NewFeat.nSelGRP, NewFeat.nPRC, NewFeat.nSelSIDE, NewFeat.sDES,
                                               Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.NewProcId(),
                                               New Frame3d(), vPar, sPar, vParQ, GDB_ID.NULL, GDB_ID.NULL)
             bMacroFlag = False

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupVM.vb

@@ -120,6 +120,10 @@ Public Class MyMachGroupVM
                               EgtMovePartInRawPart(Part.nPartId, New Vector3d(dValue - MyMachGroupM.dL, 0, 0))
                            Next
                         End If
+                        ' ripristino eventuale PosZ
+                        If MyMachGroupM.dPosZ >= 0 Then
+                           EgtMoveRawPart(nRawPartId, New Vector3d(0, 0, MyMachGroupM.dPosZ))
+                        End If
                         EgtSetInfo(Id, MGR_RPT_PANELLEN, dValue)
                         EgtDraw()
                         MyMachGroupM.dL = dValue
@@ -191,6 +195,10 @@ Public Class MyMachGroupVM
                            EgtMovePartInRawPart(Part.nPartId, New Vector3d(0, dValue - MyMachGroupM.dW, 0))
                         Next
                      End If
+                     ' ripristino eventuale PosZ
+                     If MyMachGroupM.dPosZ >= 0 Then
+                        EgtMoveRawPart(nRawPartId, New Vector3d(0, 0, MyMachGroupM.dPosZ))
+                     End If
                      EgtSetInfo(Id, MGR_RPT_PANELWIDTH, dValue)
                      EgtDraw()
                      MyMachGroupM.dW = dValue
@@ -526,7 +534,7 @@ Public Class MyMachGroupVM
          nRawId = EgtGetFirstRawPart()
       End While
       Dim sLogPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\RawPartLog.txt"
-      Return ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) 
+      Return ExecBeam(sLogPath, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False)
    End Function
 
    Friend Sub MoveBeam(Beam As PartVM, MoveDirection As MoveDirections)
@@ -899,14 +907,14 @@ Class CopyPart
          Return m_BTLPart
       End Get
    End Property
-   Private m_sPosX As Double
-   Public ReadOnly Property sPosX As Double
+   Private m_sPosX As String
+   Public ReadOnly Property sPosX As String
       Get
          Return m_sPosX
       End Get
    End Property
-   Private m_sPosY As Double
-   Public ReadOnly Property sPosY As Double
+   Private m_sPosY As String
+   Public ReadOnly Property sPosY As String
       Get
          Return m_sPosY
       End Get
@@ -924,7 +932,7 @@ Class CopyPart
       End Get
    End Property
 
-   Sub New(BTLPart As BTLPartVM, sPosX As Double, sPosY As Double, dRot As Double, nFlip As Integer)
+   Sub New(BTLPart As BTLPartVM, sPosX As String, sPosY As String, dRot As Double, nFlip As Integer)
       m_BTLPart = BTLPart
       m_sPosX = sPosX
       m_sPosY = sPosY

EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/PartVM.vb

@@ -213,7 +213,7 @@ Public Class PartVM
             ' calcolo distanza tra i box
             Dim vtDeltaBox As Vector3d = b3Box.Min - b3Part.Min
             ' reinserisco il pezzo nel grezzo
-            EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0), ParentMachGroupVM.MyMachGroupM.nRawPartId)
+            EgtAddPartToRawPart(nPartId, New Point3d(dTempPosX - vtDeltaBox.x, dTempPosY - vtDeltaBox.y, 0 - vtDeltaBox.z), ParentMachGroupVM.MyMachGroupM.nRawPartId)
             ' lo riseleziono
             EgtSelectObj(nPartId)
             ' resetto validazione del pezzo

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -242,8 +242,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2701, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2701, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb

@@ -4,10 +4,8 @@ Imports EgtBEAMWALL.Core.ConstGen
 Imports EgtBEAMWALL.Core.ConstIni
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports System.Collections.ObjectModel
 Imports System.IO
 Imports System.Threading
-Imports System.Windows.Media.Media3D
 Imports System.Windows.Threading
 
 Public Class MainWindowVM
@@ -15,7 +13,6 @@ Public Class MainWindowVM
 
    Private m_SupervisorCommThread As Thread
    Private m_Supervisor_Timer As New DispatcherTimer
-   Private m_MaterialSyncroThread As Thread
 
    ' Riferimento al Model della MainWindow
    Private m_MainWindowM As MainWindowM
@@ -174,141 +171,7 @@ Public Class MainWindowVM
       ' avvio thread di gestione della macchina che avvia la connessione
       m_SupervisorCommThread.Start()
 
-      ' verifico se devo copiare file warehouse in Db
-      Dim sWarehousePath As String = Map.refMainWindowVM.MainWindowM.sWarehouseDir & "\" & WH_MEDIUM_INI_FILE_NAME
-      If File.Exists(sWarehousePath) Then
-         Dim bOk As Boolean = False
-         ' leggo materiali da file
-         Dim MaterialList As New List(Of IdMaterial)
-         Dim SectXMatList As New List(Of SectionXMaterial)
-         Dim nSectXMatIndex As Integer = 1
-         Dim sSxMValue As String = ""
-         While EgtUILib.GetPrivateProfileString(S_BEAM_LIST, nSectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
-            Dim sSectXMatValues() As String = sSxMValue.Split(","c)
-            ' creo parametro
-            Dim dW As Double = 0
-            Dim dH As Double = 0
-            StringToLenAdv(sSectXMatValues(0), dW)
-            StringToLenAdv(sSectXMatValues(1), dH)
-            Dim NewMaterial As New MaterialM(dW, dH, 0, sSectXMatValues(2))
-            NewMaterial.SetId(DbControllers.m_MaterialsController.Insert(NewMaterial))
-            MaterialList.Add(New IdMaterial(nSectXMatIndex, NewMaterial))
-            nSectXMatIndex += 1
-         End While
-         Dim ParamIndex As Integer = 1
-         Dim sValue As String = String.Empty
-         ' leggo grezzi da file
-         While EgtUILib.GetPrivateProfileString(S_BEAM, "L" & ParamIndex, String.Empty, sValue, sWarehousePath)
-            Dim sParamValues() As String = sValue.Split(","c)
-            ' verifico numero minimo di parametri
-            If sParamValues.Count >= 2 Then
-               ' cancello spazi
-               For Index = 0 To sParamValues.Count - 1
-                  sParamValues(Index) = sParamValues(Index).Trim()
-               Next
-               Dim RawPartIdMaterial As IdMaterial = MaterialList.FirstOrDefault(Function(x) x.nIndex = sParamValues(0))
-               ' creo parametro
-               Dim dL As Double = 0
-               Dim nQty As Integer = 0
-               Dim nActive As Integer = 1
-               StringToLenAdv(sParamValues(1), dL)
-               If sParamValues.Count >= 3 Then Integer.TryParse(sParamValues(2), nQty)
-               If sParamValues.Count >= 4 Then Integer.TryParse(sParamValues(3), nActive)
-               DbControllers.m_RawItemsController.Upsert(New RawPartM(RawPartIdMaterial.Material, 0, dL, nQty, nActive > 0))
-            End If
-            ParamIndex += 1
-         End While
-         ' ricavo SectionXMaterial tramite Wall_List
-         MaterialList.Clear()
-         nSectXMatIndex = 1
-         sSxMValue = ""
-         While EgtUILib.GetPrivateProfileString(S_WALL_LIST, nSectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
-            Dim sSectXMatValues() As String = sSxMValue.Split(","c)
-            ' creo parametro
-            Dim dH As Double = 0
-            StringToLenAdv(sSectXMatValues(0), dH)
-            Dim NewMaterial As New MaterialM(0, dH, 0, sSectXMatValues(1))
-            NewMaterial.SetId(DbControllers.m_MaterialsController.Insert(NewMaterial))
-            MaterialList.Add(New IdMaterial(nSectXMatIndex, NewMaterial))
-            nSectXMatIndex += 1
-         End While
-         ParamIndex = 1
-         While EgtUILib.GetPrivateProfileString(S_WALL, "S" & ParamIndex, String.Empty, sValue, sWarehousePath)
-            Dim sParamValues() As String = sValue.Split(","c)
-            ' verifico numero minimo di parametri
-            If sParamValues.Count >= 3 Then
-               ' cancello spazi
-               For Index = 0 To sParamValues.Count - 1
-                  sParamValues(Index) = sParamValues(Index).Trim()
-               Next
-               Dim RawPartIdMaterial As IdMaterial = MaterialList.FirstOrDefault(Function(x) x.nIndex = sParamValues(0))
-               ' creo parametro
-               Dim dW As Double = 0
-               Dim dL As Double = 0
-               Dim nQty As Integer = 0
-               Dim nActive As Integer = 1
-               StringToLenAdv(sParamValues(1), dW)
-               StringToLenAdv(sParamValues(2), dL)
-               If sParamValues.Count >= 4 Then Integer.TryParse(sParamValues(3), nQty)
-               If sParamValues.Count >= 5 Then Integer.TryParse(sParamValues(4), nActive)
-               DbControllers.m_RawItemsController.Upsert(New RawPartM(RawPartIdMaterial.Material, dW, dL, nQty, nActive > 0))
-            End If
-            ParamIndex += 1
-         End While
-
-         'If bOk Then
-         '   File.Move(sWarehousePath, Path.ChangeExtension(sWarehousePath, ".old.ini"))
-         'End If
-      End If
-
-
-      m_MaterialSyncroThread = New Thread(Sub()
-                                             ' sincronizzo magazzino con versione online
-                                             'DbControllers.m_MagmanController.ResourcesForceSyncAll()
-                                             'Dim nIndex As Integer = 0
-                                             'Dim nMaterialOk As DataLayer.Controllers.MagmanController.SyncResult = DataLayer.Controllers.MagmanController.SyncResult.ERR_ND
-                                             'While nMaterialOk <> DataLayer.Controllers.MagmanController.SyncResult.ALL_OK And nIndex < 5
-                                             '   nMaterialOk = DbControllers.m_MagmanController.ResourcesForceSyncAll()
-                                             '   nIndex += 1
-                                             'End While
-                                             'Dim nRawOk As DataLayer.Controllers.MagmanController.SyncResult = DataLayer.Controllers.MagmanController.SyncResult.ERR_ND
-                                             'While nRawOk <> DataLayer.Controllers.MagmanController.SyncResult.ERR_Res2SendEmpty And nIndex < 5
-                                             '   nRawOk = DbControllers.m_MagmanController.ResourcesSync(New List(Of Integer)({19}))
-                                             '   nIndex += 1
-                                             'End While
-                                             'Dim nMaterialOk = DbControllers.m_MagmanController.ResourcesForceSyncAll()
-
-                                             'Dim bCurrMaterialOK As DataLayer.Controllers.MagmanController.SyncResult = DbControllers.m_MagmanController.ResourcesSync(New List(Of Integer)({19}))
-                                             'Dim nIndex As Integer = 0
-                                             'Dim bMaterialOk As Boolean = False
-                                             'While Not bMaterialOk And nIndex < 5
-                                             '   bMaterialOk = DbControllers.m_MagmanController.MaterialsSyncro()
-                                             '   nIndex += 1
-                                             'End While
-                                             'If bMaterialOk Then
-                                             '   'nIndex = 0
-                                             '   'Dim bRawPartOk As Boolean = False
-                                             '   'While Not bRawPartOk And nIndex < 5
-                                             '   '   Dim MaterialList As List(Of MaterialM) = DbControllers.m_MaterialsController.GetFilt("")
-                                             '   '   For Each Material In MaterialList
-                                             '   '      Dim bCurrMaterialOK As Boolean = DbControllers.m_MagmanController.ResourcesSync(New List(Of Integer)({Material.nId}))
-                                             '   '      If Not bCurrMaterialOK Then
-                                             '   '         bRawPartOk = False
-                                             '   '         Exit For
-                                             '   '      End If
-                                             '   '   Next
-                                             '   '   nIndex += 1
-                                             '   'End While
-                                             'End If
-                                          End Sub)
-      m_MaterialSyncroThread.SetApartmentState(ApartmentState.STA)
-      ' avvio thread di gestione della macchina che avvia la connessione
-      m_MaterialSyncroThread.Start()
-
-      ' sincronizzo magazzino con versione online
-      'DbControllers.m_MagmanController.MaterialsSyncro()
-
-      ' ' verifico se richiedere di fare backup
+      ' verifico se richiedere di fare backup
       If Map.refConfigurationPageVM.SelReminder.Id <> 0 Then
          Dim sBackupFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir & "\Backup"
          Dim nYear As Integer = 0
@@ -526,26 +389,3 @@ Public Class MainWindowVM
 #End Region    ' COMMANDS
 
 End Class
-
-Public Class IdMaterial
-
-   Private m_nIndex As Integer
-   Public ReadOnly Property nIndex As Integer
-      Get
-         Return m_nIndex
-      End Get
-   End Property
-
-   Private m_Material As MaterialM
-   Public ReadOnly Property Material As MaterialM
-      Get
-         Return m_Material
-      End Get
-   End Property
-
-   Sub New(nIndex As Integer, Material As MaterialM)
-      m_nIndex = nIndex
-      m_Material = Material
-   End Sub
-
-End Class

EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb

@@ -30,7 +30,7 @@ Imports System.Windows
 #End If
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.ViewerOptimizer")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2025 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 <Assembly: ComVisible(false)>
 
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.12.2")>
-<Assembly: AssemblyFileVersion("2.5.12.2")>
+<Assembly: AssemblyVersion("2.7.1.2")>
+<Assembly: AssemblyFileVersion("2.7.1.2")>

EgtBEAMWALL.ViewerOptimizer/NestingRunningWnd/NestingRunningWndVM.vb

@@ -275,7 +275,7 @@ Public Class NestingRunningWndVM
             Dim nIndex As Integer = 1
             ' aggiungo le sezioni con diverse lunghezze in base al warehouse
             If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
-               ' leggo start offset
+               ' leggo start offset 
                dStartOffset = WarehouseHelper.GetStartOffset()
                ' leggo lunghezza barra e quantity
                WarehouseHelper.GetDimensionsAndQuantityForList(Map.refProjectVM.BTLStructureVM.nPROJTYPE, m_SectionProgressList)
@@ -302,37 +302,6 @@ Public Class NestingRunningWndVM
                                                      Select x.BTLPartM).ToList()
          SectionProgress.SetSectionPartList(SectionPartList)
       Next
-      ' se magazzino di rete attivo e non impostato per utilizzo diretto
-      If GetMainPrivateProfileInt(S_GENERAL, K_NETWAREHOUSE, 0) = 1 Then
-         If Map.refOptimizePanelVM.UseNetWarehouse_IsChecked Then
-            ' modifico quantita' per grezzi considerando quelli gia' presenti nel progetto
-            For Each SectionProgress In m_SectionProgressList
-               For Each Raw In SectionProgress.SParamList
-                  Dim nProjectRawCnt As Integer = 0
-                  For Each MachGroup As MyMachGroupVM In Map.refMachGroupPanelVM.MachGroupVMList
-                     If MachGroup.Section = Raw.SectXMat AndAlso MachGroup.dL = Raw.dL Then
-                        nProjectRawCnt += 1
-                     End If
-                  Next
-                  Raw.nQuantity = Math.Max(Raw.nQuantity - nProjectRawCnt, 0)
-               Next
-            Next
-         Else
-            ' modifico quantita' per grezzi con flag quantita' infinita
-            For Each SectionProgress In m_SectionProgressList
-               For Each Raw In SectionProgress.SParamList
-                  If Raw.bUseQuantity Then Raw.nQuantity = SectionProgress.SectionPartList.Sum(Function(x) x.m_nCNT)
-               Next
-            Next
-         End If
-      Else
-         ' modifico quantita' per grezzi con flag quantita' infinita
-         For Each SectionProgress In m_SectionProgressList
-            For Each Raw In SectionProgress.SParamList
-               If Raw.bUseQuantity Then Raw.nQuantity = SectionProgress.SectionPartList.Count
-            Next
-         Next
-      End If
       ' avvio timer avanzamento nesting
       m_CurrState = SectionProgress.NestStates.NULL
       m_TotTime = 0