cbam, etc.

2025-09-04 12:03:05 +02:00
parent 1fafef1089
commit 410e292b44
6 changed files with 42 additions and 28 deletions
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -452,9 +452,9 @@ Namespace My.Resources
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Byte[].
        '''</summary>
-        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
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -958,7 +958,7 @@
  <data name="Detailauswertung_divers" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Detailauswertung_divers.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="CBAM_GP" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CBAM_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="CBAM_Auswertung_GP" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CBAM_Auswertung_GP.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
 </root>
--- a/SDL/Resources/CBAM_Auswertung_GP.xlsx
+++ b/SDL/Resources/CBAM_Auswertung_GP.xlsx
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -4652,6 +4652,7 @@
    <None Include="ClassDiagram1.cd" />
    <None Include="PrivateCodeSignaturDaniel20240131.pfx" />
    <None Include="Resources\Auswertung_divers.xlsx" />
+    <None Include="Resources\CBAM_Auswertung_GP.xlsx" />
    <None Include="Resources\CBAM_GP.xlsx" />
    <None Include="Resources\Detailauswertung_divers.xlsx" />
    <None Include="Resources\FA_Graz_EV-Veranlagung_Muster.xlsx">
--- 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
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -386,14 +386,12 @@
    <Compile Include="AuditFlow\Classes\cAuditFlow.vb" />
    <Compile Include="AuditFlow\Classes\cAuditFlow_Pruefobjekte.vb" />
    <Compile Include="AuditFlow\Classes\cAuditFlow_Pruefungen.vb" />
-    <Compile Include="Classes\cUI_Performance.vb" />
    <Compile Include="frmDatumsabfrage.Designer.vb">
      <DependentUpon>frmDatumsabfrage.vb</DependentUpon>
    </Compile>
    <Compile Include="frmDatumsabfrage.vb">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="Schnittstellen\ATEZ\GREENPULSE\cATEZ_Greenpulse_KafkaDecs.vb" />
    <Compile Include="Schnittstellen\ATEZ\RELAYHUB\cRelayHub.vb" />
    <Compile Include="Schnittstellen\ATEZ\RELAYHUB\cRelayHubToken.vb" />
    <Compile Include="Schnittstellen\BZST\cBZST_UID_XML.vb" />
@@ -1426,9 +1424,6 @@
    <None Include="Resources\people.png" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Confluent.Kafka">
-      <Version>2.11.1</Version>
-    </PackageReference>
    <PackageReference Include="esendex-dotnet-sdk">
      <Version>3.8.0</Version>
    </PackageReference>
@@ -1450,6 +1445,9 @@
    <PackageReference Include="SSH.NET">
      <Version>2024.0.0</Version>
    </PackageReference>
+    <PackageReference Include="System.Management">
+      <Version>9.0.8</Version>
+    </PackageReference>
    <PackageReference Include="xmlrpcnet">
      <Version>3.0.0.266</Version>
    </PackageReference>
@@ -1599,7 +1597,6 @@
  <ItemGroup>
    <Content Include="My Project\licensePDFPro.elic.xml" />
    <Content Include="My Project\licensePDFViewer.elic.xml" />
-    <None Include="Resources\abgeklaertAktiv.jpg" />
    <None Include="Resources\save.png" />
  </ItemGroup>
  <ItemGroup>