From 410e292b44d4fad1fd6492671eaeca68bc241c59 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 4 Sep 2025 12:03:05 +0200 Subject: [PATCH] cbam, etc. --- SDL/My Project/Resources.Designer.vb | 4 +- SDL/My Project/Resources.resx | 4 +- SDL/Resources/CBAM_Auswertung_GP.xlsx | Bin 0 -> 9934 bytes SDL/SDL.vbproj | 1 + SDL/kunden/usrCntlCBAM.vb | 52 ++++++++++++------ .../VERAG_PROG_ALLGEMEIN.vbproj | 9 +-- 6 files changed, 42 insertions(+), 28 deletions(-) create mode 100644 SDL/Resources/CBAM_Auswertung_GP.xlsx diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index 2f036aab..4b234d07 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -452,9 +452,9 @@ Namespace My.Resources ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' - Friend ReadOnly Property CBAM_GP() As Byte() + Friend ReadOnly Property CBAM_Auswertung_GP() As Byte() Get - Dim obj As Object = ResourceManager.GetObject("CBAM_GP", resourceCulture) + Dim obj As Object = ResourceManager.GetObject("CBAM_Auswertung_GP", resourceCulture) Return CType(obj,Byte()) End Get End Property diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index cf383368..98fba931 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -958,7 +958,7 @@ ..\Resources\Detailauswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\CBAM_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\CBAM_Auswertung_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 \ No newline at end of file diff --git a/SDL/Resources/CBAM_Auswertung_GP.xlsx b/SDL/Resources/CBAM_Auswertung_GP.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..a9b1fce5bf489ade85b1ad4039aaf335b120dec3 GIT binary patch literal 9934 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 + diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index bfeca966..ec626e52 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1,4 +1,6 @@ -Public Class usrCntlCBAM +Imports DocumentFormat.OpenXml.Spreadsheet + +Public Class usrCntlCBAM Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Public kdnr As Integer = -1 @@ -542,15 +544,16 @@ ' MsgBox(SQLSTR) If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) - btnCBAM_DS_DAKOSY_Detail.Tag = path - btnCBAM_DS_DAKOSY_Detail.Enabled = True - btnCBAM_DS_DAKOSY_Copy.Enabled = True + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False, EORI & "_Detailbericht_" & txtVon._value & "-" & txtBis._value) + btnCBAM_DS_DAKOSY_Detail.Tag = path + btnCBAM_DS_DAKOSY_Detail.Enabled = True + btnCBAM_DS_DAKOSY_Copy.Enabled = True - End If + End If If dtGP IsNot Nothing AndAlso dt.Rows.Count > 0 Then + btnCBAM_DS_DAKOSY_GP.Tag = "" btnCBAM_DS_DAKOSY_GP.Tag = createExcelForGreenPulse(dtGP, EORI, IIf(AD.Ort <> "", AD.Ort, "")) btnCBAM_DS_DAKOSY_GP.Enabled = True @@ -558,13 +561,13 @@ Dim dtNew = SQL.loadDgvBySql(sqlNew, "FMZOLL", 600) - If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then - If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke") - Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value) - btnCBAM_DS_DAKOSY_Spedb.Enabled = True - btnCBAM_DS_DAKOSY_Spedb.Tag = path - Me.Cursor = Cursors.Default - End If + If dtNew IsNot Nothing AndAlso dtNew.Rows.Count > 0 Then + If dtNew.Columns.Contains("Packstücke") Then dtNew.Columns.Remove("Packstücke") + Dim path = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtNew,,,,, False, EORI & "_Unterschiede zum Sped-Buch_" & txtVon._value & "-" & txtBis._value) + btnCBAM_DS_DAKOSY_Spedb.Enabled = True + btnCBAM_DS_DAKOSY_Spedb.Tag = path + Me.Cursor = Cursors.Default + End If @@ -1589,7 +1592,7 @@ End If Dim exclApp As Object 'as Application - Dim Datei As Object 'as WorkBook + Dim Datei As Object 'Workbook Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet exclApp = CreateObject("Excel.Application") @@ -1603,7 +1606,12 @@ While System.IO.File.Exists(Path_GP) Path_GP = sPath & EORI & "_Detailbericht_GP_" & txtVon._value & "-" & txtBis._value & Now.ToString("ddMMyyyyHHmmss") & ".xlsx" End While - My.Computer.FileSystem.WriteAllBytes(Path_GP, My.Resources.CBAM_GP, False) + My.Computer.FileSystem.WriteAllBytes(Path_GP, My.Resources.CBAM_Auswertung_GP, False) + + System.Threading.Thread.Sleep(200) + GC.Collect() + GC.WaitForPendingFinalizers() + Catch ex As System.Exception ' MsgBox(ex.Message) MsgBox("ERROR 01: " & ex.Message & vbNewLine & ex.StackTrace) @@ -1612,10 +1620,10 @@ Return "" End Try - Datei = .Workbooks.Open(Path_GP) 'Anpassen - Blatt = Datei.Worksheets(1) 'Anpassen + Datei = .Workbooks.Open(Path_GP) + Blatt = Datei.Worksheets(1) - Dim cnt = 2 + Dim cnt = 3 Dim rowcounter As Integer = 0 @@ -1658,8 +1666,16 @@ rowcounter += 1 Next + Datei.Save() + Datei.Close(SaveChanges:=True) + Datei = Nothing + End With + exclApp.Quit() + exclApp = Nothing + + Return Path_GP End Function diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 5126e0ce..2a73db23 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -386,14 +386,12 @@ - frmDatumsabfrage.vb Form - @@ -1426,9 +1424,6 @@ - - 2.11.1 - 3.8.0 @@ -1450,6 +1445,9 @@ 2024.0.0 + + 9.0.8 + 3.0.0.266 @@ -1599,7 +1597,6 @@ -