merge

2026-10-06 09:23:52 +02:00
parent d702783d1b eb162cc981
commit 7b979a3815
12 changed files with 677 additions and 399 deletions
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -512,6 +512,10 @@ Public Class frmHauptfenster
            cbx_My_CBAM.Checked = True
        End If

+        'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("CBAM", "AVISO") Then
+        '    cbx_My_VW.Checked = True
+        'End If
+
        'If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Speditionsbuch", "AVISO") Then
        '    btnSpedBuch.Visible = False
        'End If
@@ -699,12 +703,6 @@ Public Class frmHauptfenster
            DatevBuchungsexportToolStripMenuItem.Visible = True
        End If

-
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then
-            cbx_My_LKW.Checked = True
-        End If
-
-
        Panel1.Height -= pnlSearch.Height

        If Now.ToShortDateString >= DateTime.Parse("01/01/2023") Then
@@ -1247,6 +1245,7 @@ ELSE_ATILLA:

            If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
            If cbx_My_CBAM.Visible AndAlso Not cbx_My_CBAM.Checked Then hSQL &= " AND tblSnd_Abfertigungsart_ID NOT IN (65) "
+            If cbx_My_VW.Visible AndAlso Not cbx_My_VW.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (67,68,69) "

            'Farbe
            If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -1361,57 +1360,57 @@ ELSE_ATILLA:
                'Dim originalImage = Image.FromFile("\\share01\Datenarchiv\DOKUMENTE\MITARBEITER\PERSONAL_FOTOS\20200419_000451_Hofer_375.jpg") 'My.Resources.Koerfez61
                'Dim originalImage = Image.FromFile("\\share01\Datenarchiv\DOKUMENTE\MITARBEITER\PERSONAL_FOTOS\20220620_091930_Luxbauer_4.jpg") 'My.Resources.Koerfez61
                Dim originalImage = Image.FromFile(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId)) 'My.Resources.Koerfez61
-                    'Dim originalImage = Image.FromFile("C:\Users\DEVELOPER1\Desktop\grund.png") 'My.Resources.Koerfez61
+                'Dim originalImage = Image.FromFile("C:\Users\DEVELOPER1\Desktop\grund.png") 'My.Resources.Koerfez61

-                    '  MsgBox(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId))
+                '  MsgBox(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId))


-                    Dim picSize = 35
+                Dim picSize = 35

-                    Dim space_X As Integer = 0
-                    Dim space_Y As Integer = 0
-                    Dim picWidth As Integer = 0
-                    Dim picHheight As Integer = 0
+                Dim space_X As Integer = 0
+                Dim space_Y As Integer = 0
+                Dim picWidth As Integer = 0
+                Dim picHheight As Integer = 0

-                    Dim factor As Double = 1
-                    If originalImage.Height < originalImage.Width Then
-                        factor = picSize / originalImage.Height
-                        picWidth = originalImage.Width * factor
-                        picHheight = originalImage.Height * factor
-                        ' space_X = (picWidth - picHheight) / 2
+                Dim factor As Double = 1
+                If originalImage.Height < originalImage.Width Then
+                    factor = picSize / originalImage.Height
+                    picWidth = originalImage.Width * factor
+                    picHheight = originalImage.Height * factor
+                    ' space_X = (picWidth - picHheight) / 2

-                    Else
-                        factor = picSize / originalImage.Width
-                        picWidth = originalImage.Width * factor
-                        picHheight = originalImage.Height * factor
-                        ' space_X = (picHheight - picWidth) / 2
-                    End If
-
-                    '  MsgBox(picWidth & " - " & picHheight)
-                    'Create a new, blank image with the same dimensions.
-                    Dim croppedImage As New Bitmap(picWidth, picHheight)
-
-                    'Prepare to draw on the new image.
-                    Using g = Graphics.FromImage(croppedImage)
-                        Dim path As New GraphicsPath
-
-                        'Create an ellipse that fills the image in both directions.
-                        'path.AddEllipse(0, 0, croppedImage.Width, croppedImage.Height)
-                        path.AddEllipse(0, 0, picSize, picSize)
-
-                        Dim reg As New Region(path)
-
-                        'Draw only within the specified ellipse.
-                        g.Clip = reg
-                        'g.DrawImage(originalImage, 0, 0, picSize, picSize)
-                        g.DrawImage(originalImage, 0, 0, picWidth, picHheight)
-                    End Using
-
-                    'Display the new image.
-                    btnMitarbeiterKonto.Image = croppedImage
-
-                    Exit Sub
+                Else
+                    factor = picSize / originalImage.Width
+                    picWidth = originalImage.Width * factor
+                    picHheight = originalImage.Height * factor
+                    ' space_X = (picHheight - picWidth) / 2
                End If
+
+                '  MsgBox(picWidth & " - " & picHheight)
+                'Create a new, blank image with the same dimensions.
+                Dim croppedImage As New Bitmap(picWidth, picHheight)
+
+                'Prepare to draw on the new image.
+                Using g = Graphics.FromImage(croppedImage)
+                    Dim path As New GraphicsPath
+
+                    'Create an ellipse that fills the image in both directions.
+                    'path.AddEllipse(0, 0, croppedImage.Width, croppedImage.Height)
+                    path.AddEllipse(0, 0, picSize, picSize)
+
+                    Dim reg As New Region(path)
+
+                    'Draw only within the specified ellipse.
+                    g.Clip = reg
+                    'g.DrawImage(originalImage, 0, 0, picSize, picSize)
+                    g.DrawImage(originalImage, 0, 0, picWidth, picHheight)
+                End Using
+
+                'Display the new image.
+                btnMitarbeiterKonto.Image = croppedImage
+
+                Exit Sub
+            End If
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
        End Try
@@ -1518,7 +1517,7 @@ ELSE_ATILLA:
                    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' OR FIRMA='ATILLA' ) "
                Else
                    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
-                 '   MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+                    '   MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
                    'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
                    '    '+AMBAR
                    '    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR (tblSendungen.FilialenNr  IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66))  ) "
@@ -1620,6 +1619,7 @@ ELSE_ATILLA:

                If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') "
                If cbx_My_CBAM.Visible AndAlso Not cbx_My_CBAM.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (65) "
+                If cbx_My_VW.Visible AndAlso Not cbx_My_VW.Checked Then sqlStr &= " AND tblSnd_Abfertigungsart_ID NOT IN (67,68,69) "

                'Farbe
                If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
@@ -3453,7 +3453,7 @@ ELSE_ATILLA:
        Try


-            'Dim MIC = New VERAG_PROG_ALLGEMEIN.MicCustImportInvoiceComponent.InsertImportShipment
+            'Dim MIC = New VERAG_PROG_ALLGEMEIN.MIC_IMPORT.InsertImportShipment
            'MIC.ImportShipmentMessage.ImportShipment.Shipment.company = "UK"
            'MIC.SaveToFile("C:\VeragTMP\Test2.xml")

@@ -3523,7 +3523,7 @@ ELSE_ATILLA:

        Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856")
        If path <> "" Then
-            Process.Start(path)
+            process.Start(path)
        End If
        'If SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(firma, "ATU74813856") = 0 Then
        '    MsgBox("HURRA2" & vbNewLine & firma)
@@ -4484,7 +4484,7 @@ ELSE_ATILLA:

    End Sub

-    Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged, cbx_My_CBAM.CheckStateChanged
+    Private Sub cboMyAvisoAnzeige_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboMyAvisoAnzeige.SelectedIndexChanged, cbx_My_LKW.CheckedChanged, cbx_My_Brexit.CheckedChanged, cboMy_Grenzstelle.SelectedIndexChanged, cboMy_QS.CheckStateChanged, cboMy_VB.CheckStateChanged, cbx_My_CBAM.CheckStateChanged, cbx_My_VW.CheckStateChanged
        If Grid_aktiv Then
            'Wenn VERIMEX/T1 und cboMyAvisoAnzeige geändert --> Checkboxes richtig setzen
            If sender Is cboMyAvisoAnzeige Then
@@ -4518,10 +4518,12 @@ ELSE_ATILLA:
            lblMeineAviso.Text = "Meine Aviso:"
            cbx_My_Brexit.Visible = False
            cbx_My_CBAM.Visible = False
+            cbx_My_VW.Visible = False
        Else
            lblMeineAviso.Text = "Meine Sendungen:"
            cbx_My_Brexit.Visible = True
            cbx_My_CBAM.Visible = True
+            cbx_My_VW.Visible = True
        End If
    End Sub