Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/NewWarehouseTest' into DataLayer

Browse Source
This commit is contained in:
Samuele Locatelli
2024-07-11 11:50:41 +02:00
parent f1624982c6 4449a73137
commit 8f1b068850
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+2 -2
View File
@@ -158,7 +158,7 @@ Public Class MainWindowVM
' sincronizzo tutti i progetti
DbControllers.m_MagmanController.ProjAllSyncro()
' sincronizzo log macchina
DbControllers.m_MagmanController.CloudLogMaccSyncro(100, 5000, True)
'DbControllers.m_MagmanController.CloudLogMaccSyncro(100, 5000, True)
End If
End Sub
@@ -255,7 +255,7 @@ Public Class MainWindowVM
' loggo chiusura programma
DbControllers.m_LogMachineController.Create(LogEvent.CreateSoftwareOnOffLog(False, DbControllers.m_SupervisorId))
' sincronizzo
DbControllers.m_MagmanController.CloudLogMaccSyncro(100, 5000, True)
' DbControllers.m_MagmanController.CloudLogMaccSyncro(100, 5000, True)
End If
' Termino il Model
MainWindowM.Close()
EgtBEAMWALL.ViewerOptimizer/MachGroupPanel/MyMachGroupPanelVM.vb
+6 -1
View File
@@ -318,7 +318,12 @@ Public Class MyMachGroupPanelVM
Part.MaterialM.SetWarehouseMaterial(RawPart.Material.sWarehouseMaterial)
Next
Else
Dim nRawPartId As Integer = DbControllers.m_RawItemsController.Upsert(New RawPartM(Material, MachGroup.dW, MachGroup.dL, 0, False))
Dim nRawPartId As Integer = 0
If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
nRawPartId = DbControllers.m_RawItemsController.Upsert(New RawPartM(Material, 0, MachGroup.dL, 0, False))
ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL Then
nRawPartId = DbControllers.m_RawItemsController.Upsert(New RawPartM(Material, MachGroup.dW, MachGroup.dL, 0, False))
End If
If nRawPartId > 0 Then
SearchRawPart = DbControllers.m_RawItemsController.GetFilt(Material.nId)
If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+1
View File
@@ -140,6 +140,7 @@ Public Class NewOpenProjectFileDialogVM
If Not IsNothing(SelProject.ProdFileVM) Then
' archivio il progetto
DbControllers.m_ProdController.UpdateArchived(SelProject.ProdFileVM.nProdId, Not SelProject.bIsArchived)
DbControllers.m_MagmanController.ProjSyncro(SelProject.ProdFileVM.nProdId)
NotifyPropertyChanged(NameOf(Archive_Msg))
End If
' aggiorno lista progetti