From e713c03389c4e343cca810e0b38e35640519da0c Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Tue, 21 Jul 2026 13:51:39 +0200 Subject: [PATCH] - correzioni verifica che bloccava i pezzi gia' in supervisore - Open project ripristina se selezione del tempo ma al posto di periodo mette ultimo mese per vedere sempre ultimi progetti - aggiornamento EgwRedmineAPI per compatibilita' con Redmine 6 --- .../NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb | 5 +++-- EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb | 4 +++- EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj | 2 +- EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb | 6 ------ EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb | 3 --- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb index 0a670bf3..07a2b248 100644 --- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb @@ -544,7 +544,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM m_colProdFile_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Key = COL_NAME) m_colArchived_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Key = COL_ARCHIVED) ' leggo valori per filtri - m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0) + Dim IniDayType As DayTypes = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0) + m_SelDayType = If(IniDayType <> DayTypes.PERIOD, IniDayType, DayTypes.LASTMONTH) Select Case m_SelDayType Case DayTypes.LASTMONTH m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1) @@ -555,7 +556,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM Case DayTypes.LAST6MONTHS m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1) m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6) - Case DayTypes.PERIOD + Case Else ' DayTypes.LASTMONTH Dim sStartDate As String = "0" Dim lStartDate As Long = 0 GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate) diff --git a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb index 8c04e4d6..b1d0431e 100644 --- a/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb +++ b/EgtBEAMWALL.Optimizer/CALCPanel/CALCPanelVM.vb @@ -569,6 +569,7 @@ Public Class CALCPanelVM Private Sub VerifyProjWithEngine(CurrPart As BTLPartVM, CmdType As Integer) If Not CurrPart.bDO Then Return + CurrPart.SetIsRowEnabled(False) Dim Args As New Dictionary(Of String, String) Args.Add("BarId", CurrPart.nPartId) Args.Add("ProgramPage", ProjectType.PROJ) @@ -619,6 +620,7 @@ Public Class CALCPanelVM Private Sub VerifyProdWithEngine(CurrMachGroup As MyMachGroupVM) ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra If CurrMachGroup.nProduction_State >= ItemState.Assigned Then Return + CurrMachGroup.SetIsRowEnabled(False) Dim Args As New Dictionary(Of String, String) Args.Add("BarId", CurrMachGroup.Id) Args.Add("ProgramPage", ProjectType.PROD) @@ -815,7 +817,7 @@ Public Class CALCPanelVM Map.refMyStatusBarVM.MaximumValue = Map.refMachGroupPanelVM.MachGroupVMList.Count For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 ' se e' gia' stato assegnato a supervisor, la salto e vado alla prossima barra - If DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).nProduction_State >= ItemState.Assigned Then Return + If DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).nProduction_State >= ItemState.Assigned Then Continue For VerifyProdWithEngine(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex)) Next End If diff --git a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj index 5bdd93d6..73565b2d 100644 --- a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj +++ b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj @@ -1027,7 +1027,7 @@ 3.1.1.2 - 3.1.7.14 + 3.1.7.15 3.1.7.3 diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb index 5419c519..b577398d 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListVM.vb @@ -276,9 +276,6 @@ Public Class BTLPartListVM If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return ' imposto flag per calcolo Map.refCALCPanelVM.SetCalculating(True) - For Each BTLPartItem As BTLPartVM In Map.refProjectVM.BTLStructureVM.BTLPartVMList - BTLPartItem.SetIsRowEnabled(False) - Next Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ, CalcIntegration.CmdTypes.CHECKNOSIM) Return End Sub @@ -300,9 +297,6 @@ Public Class BTLPartListVM If (IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)) Then Return ' imposto flag per calcolo Map.refCALCPanelVM.SetCalculating(True) - For Each BTLPartItem As BTLPartVM In Map.refProjectVM.BTLStructureVM.BTLPartVMList - BTLPartItem.SetIsRowEnabled(False) - Next Map.refCALCPanelVM.VerifyAll(ProjectType.PROJ, CalcIntegration.CmdTypes.FLIP_ROT) Return End Sub diff --git a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb index b7fbbdce..8c361368 100644 --- a/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/RawPartManager/RawPartManagerVM.vb @@ -779,9 +779,6 @@ Public Class RawPartManagerVM Friend Sub VerifyAll() If ((IsNothing(ProjectManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.BTLStructureVM) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM))) Then Return Map.refCALCPanelVM.SetCalculating(True) - For PartIndex = 0 To Map.refMachGroupPanelVM.MachGroupVMList.Count - 1 - DirectCast(Map.refMachGroupPanelVM.MachGroupVMList(PartIndex), MyMachGroupVM).SetIsRowEnabled(False) - Next Map.refCALCPanelVM.VerifyAll(ProjectType.PROD, CalcIntegration.CmdTypes.CHECKGEN) Return End Sub