merge

2025-12-11 09:22:17 +01:00
parent cad6bf2731 4bdc72e908
commit 636ede6a32
4 changed files with 83 additions and 14 deletions
--- a/Aviso/frmHauptfenster.Designer.vb
+++ b/Aviso/frmHauptfenster.Designer.vb
@@ -416,6 +416,7 @@ Partial Class frmHauptfenster
        Me.Panel5 = New System.Windows.Forms.Panel()
        Me.Panel7 = New System.Windows.Forms.Panel()
        Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem()
+        Me.NewsletterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.conMenuAviso.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
@@ -916,7 +917,7 @@ Partial Class frmHauptfenster
        '
        'FunktionenToolStripMenuItem
        '
-        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VerträgeToolStripMenuItem, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem, Me.FIBUSachkontenToolStripMenuItem})
+        Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.NewsletterToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VerträgeToolStripMenuItem, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem, Me.FIBUSachkontenToolStripMenuItem})
        Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem"
        Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 16)
        Me.FunktionenToolStripMenuItem.Text = "Funktionen"
@@ -1126,6 +1127,13 @@ Partial Class frmHauptfenster
        '
        Me.VerträgeToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
        Me.VerträgeToolStripMenuItem.Name = "VerträgeToolStripMenuItem"
+        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.VerträgeToolStripMenuItem.Text = "Verträge"
+        '
+        'VerträgeToolStripMenuItem
+        '
+        Me.VerträgeToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
+        Me.VerträgeToolStripMenuItem.Name = "VerträgeToolStripMenuItem"
        Me.VerträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22)
        Me.VerträgeToolStripMenuItem.Text = "Verträge"
        '
@@ -3985,11 +3993,15 @@ Partial Class frmHauptfenster
        Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28)
        Me.UsrCntlTestsystem1.TabIndex = 8
        '
+        'NewsletterToolStripMenuItem
        'UNBescheinigungAusTFEinlesenToolStripMenuItem
        '
        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Name = "UNBescheinigungAusTFEinlesenToolStripMenuItem"
        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
        Me.UNBescheinigungAusTFEinlesenToolStripMenuItem.Text = "UN-Bescheinigung aus TF einlesen"
+        Me.NewsletterToolStripMenuItem.Name = "NewsletterToolStripMenuItem"
+        Me.NewsletterToolStripMenuItem.Size = New System.Drawing.Size(391, 30)
+        Me.NewsletterToolStripMenuItem.Text = "Newsletter"
        '
        'frmHauptfenster
        '
@@ -4450,5 +4462,6 @@ Partial Class frmHauptfenster
    Friend WithEvents WikiToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents MitarbeiterverzeichnisToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VerträgeToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents NewsletterToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents UNBescheinigungAusTFEinlesenToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -164,6 +164,7 @@ Public Class frmHauptfenster
    Private listenerThread As System.Threading.Thread

    Private Sub StartPipeListener()
+
        listenerThread = New System.Threading.Thread(Sub()
                                                         Try

@@ -173,22 +174,23 @@ Public Class frmHauptfenster

                                                             Console.WriteLine($"Waiting for messages on pipe {pipeName}...")

+                                                             Dim server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity) ' ← einmalig außerhalb While
+
                                                             While True
-                                                                 Using server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity)
-                                                                     Try
-                                                                         server.WaitForConnection()

-                                                                         Using reader = New StreamReader(server, Encoding.UTF8)
-                                                                             Dim message = reader.ReadLine()
+                                                                 Try
+                                                                     server.WaitForConnection()

-                                                                             ProcessMessage(message)
-                                                                         End Using
+                                                                     Using reader = New StreamReader(server, Encoding.UTF8)
+                                                                         Dim message = reader.ReadLine()

-                                                                         server.Disconnect()
-                                                                     Catch ex As Exception
-                                                                         Console.WriteLine("Fehler im Listener: " & ex.Message)
-                                                                     End Try
-                                                                 End Using
+                                                                         ProcessMessage(message)
+                                                                     End Using
+
+                                                                     server.Disconnect()
+                                                                 Catch ex As Exception
+                                                                     Console.WriteLine("Fehler im Listener: " & ex.Message)
+                                                                 End Try
                                                             End While

                                                         Catch ex As Exception
@@ -217,6 +219,18 @@ Public Class frmHauptfenster
                       End If
                   End Sub)

+        ElseIf message.StartsWith("OpenAviso_") Then
+            Invoke(Sub()
+                       Dim split = message.ToString.Split("_")
+                       If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
+
+                           If IsNumeric(split(1)) AndAlso split(1) > 0 Then
+                               VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = split(1)
+                           End If
+                           Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+                       End If
+                   End Sub)
+
        End If
    End Sub

@@ -3474,7 +3488,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)
@@ -5270,4 +5284,9 @@ ELSE_ATILLA:


    End Sub
+
+    Private Sub NewsletterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NewsletterToolStripMenuItem.Click
+        Dim f As New SDL.frmNewsletter
+        f.Show(Me)
+    End Sub
 End Class
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -11,6 +11,7 @@ Imports SDL
 Imports System.IO
 Imports EAGetMail
 Imports System.Globalization
+Imports iText.Layout.Element

 Public Class frmSendungsdetailsNEU
    Public AvisoId As Integer
@@ -316,6 +317,22 @@ Public Class frmSendungsdetailsNEU
                End If
            End If

+
+            If cntlAvisierer_Abf.Visible = False And
+                cntlAuftr_Abf.Visible = False And
+                cntlEmpf_Abf.Visible = False And
+                cntlAbsender_Abf.Visible = False And
+                cntlFrachtf_Abf.Visible = False Then
+
+                Dim err = "- Abfertigungskosten: Es ist kein Kunde mit passendem Offert ausgewählt."
+                rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True
+
+            End If
+
+
+
+
+
            ' pnlValidation.Visible = rtbValidierung.Text <> ""
            Return True

@@ -2542,11 +2559,31 @@ Public Class frmSendungsdetailsNEU
        End Select


+        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("CHECK_SND_AbfertigungsartOffert") Then
+
+
+            cntlAvisierer_Abf.Visible = checkOfferteExistFromAbfArt(txtAvisierer.KdNr_value, cboAbfertigungsart._value)
+            cntlAuftr_Abf.Visible = checkOfferteExistFromAbfArt(txtAuftraggeber.KdNr_value, cboAbfertigungsart._value)
+            cntlEmpf_Abf.Visible = checkOfferteExistFromAbfArt(txtEmpfaenger.KdNr_value, cboAbfertigungsart._value)
+            cntlAbsender_Abf.Visible = checkOfferteExistFromAbfArt(txtAbsender.KdNr_value, cboAbfertigungsart._value)
+            cntlFrachtf_Abf.Visible = checkOfferteExistFromAbfArt(txtFrachtfuehrer.KdNr_value, cboAbfertigungsart._value)
+
+        End If
+
+
        If Not isFailureShown Then VALIDATE_ME(False)
        sperrePanel()
        '  initOfferteDGV()
    End Sub

+    Function checkOfferteExistFromAbfArt(Kdnr, AbfArt) As Boolean
+        If Kdnr <= 0 Then Return False
+        If AbfArt = "" Then Return False
+        If AbfArt <= 0 Then Return False
+        Return (SQL.DLookup(" count(*) ", "offerten inner join [tblAbfertigungsartOffertenstamm] on ao_OffertenNr=OffertenNr", "KundenNr=" & Kdnr & " AND ao_Abfertigungsart='" & AbfArt & "'", "FMZOLL", "0") > 0)
+    End Function
+
+
    Sub initOfferteDGV()
        Try
            SENDUNG_LIST(CURRENT_INDEX).LOAD_ABRECHNUNG()