neu

2020-08-04 16:33:49 +02:00
parent 0a7e4feedd
commit 81905f2f44
24 changed files with 985 additions and 596 deletions
--- a/Aviso/frmHauptfenster.vb
+++ b/Aviso/frmHauptfenster.vb
@@ -10,6 +10,7 @@ Imports System.Drawing
 Imports Hardcodet.Wpf.TaskbarNotification
 Imports com.esendex.sdk.messaging
 Imports Newtonsoft.Json
+Imports System.Reflection


 'Imports UID
@@ -74,6 +75,13 @@ Public Class frmHauptfenster
        Timer1_Tick(Timer1, New EventArgs)
    End Sub

+    Public Shared Sub EnableDoubleBuffered(ByRef dgv As DataGridView)
+        Dim dgvType As Type = dgv.[GetType]()
+        Dim pi As PropertyInfo = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance Or BindingFlags.NonPublic)
+        pi.SetValue(dgv, True, Nothing)
+    End Sub
+
+

    Private Sub frmMain_KeyDown(sender As Object, e As System.Windows.Forms.KeyEventArgs) Handles MyBase.KeyDown

@@ -112,6 +120,22 @@ Public Class frmHauptfenster
            btnNeu.PerformClick()
        End If

+        If (e.KeyCode) = Keys.K AndAlso e.Control Then
+            If btnKunden.Visible Then btnKunden.PerformClick()
+        End If
+        If (e.KeyCode) = Keys.R AndAlso e.Control Then
+            If btnRg.Visible Then btnRg.PerformClick()
+        End If
+        If (e.KeyCode) = Keys.F AndAlso e.Control Then
+            If btnFakturierung.Visible Then btnFakturierung.PerformClick()
+        End If
+        If (e.KeyCode) = Keys.S AndAlso e.Control Then
+            If btnSpedBuch.Visible Then btnSpedBuch.PerformClick()
+        End If
+        If (e.KeyCode) = Keys.M AndAlso e.Control Then
+            If picAVISOMessenger.Visible Then PictureBox1_Click(picAVISOMessenger, New EventArgs)
+        End If
+
        If e.KeyCode = Keys.D1 AndAlso e.Control Then tbcntrAviso.SelectedIndex = 1 : txtSuche.Focus()
        If e.KeyCode = Keys.D2 AndAlso e.Control Then tbcntrAviso.SelectedIndex = 2 : txtSuche.Focus()
        If (e.KeyCode) = Keys.D3 AndAlso e.Control Then tbcntrAviso.SelectedIndex = 3 : txtSuche.Focus()
@@ -127,6 +151,8 @@ Public Class frmHauptfenster
        Me.AutoScaleMode = AutoScaleMode.Dpi
        hideErr.Interval = 3000

+        EnableDoubleBuffered(gridAviso)
+        EnableDoubleBuffered(gridMyAviso)
        'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
        '    Case "IMEX"
        '        FIMRA_COLOR = Color.FromArgb(250, 200, 0)
@@ -1782,6 +1808,7 @@ Public Class frmHauptfenster

    Private Sub btnNeu_Click(sender As System.Object, e As System.EventArgs) Handles btnNeu.Click
        Try
+            Me.Cursor = Cursors.WaitCursor
            gridAviso.ClearSelection()
            gridMyAviso.ClearSelection()
            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
@@ -1797,6 +1824,7 @@ Public Class frmHauptfenster
        Catch ex As Exception

        End Try
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub btnLöschen_Click(sender As System.Object, e As System.EventArgs)
@@ -1811,14 +1839,16 @@ Public Class frmHauptfenster
    End Sub

    Private Sub btnPaketdienst_Click(sender As System.Object, e As System.EventArgs) Handles btnKunden.Click
+        Me.Cursor = Cursors.WaitCursor
        'For Each frm As Form In Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing
        If Not Application.OpenForms.Item("frmKundenUebersichtZOLL") Is Nothing Then
            Application.OpenForms.Item("frmKundenUebersichtZOLL").BringToFront()
-            Exit Sub
+            Me.Cursor = Cursors.Default : Exit Sub
        End If
        '  Next
        Dim zoll As New SDL.frmKundenUebersichtZOLL
        zoll.Show()
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnSpedBuch.Click
@@ -1830,10 +1860,10 @@ Public Class frmHauptfenster
                    Exit Sub
                End If
            Next
-
+            Me.Cursor = Cursors.WaitCursor
            Dim sped As New SDL.frmSpeditionsbuchSuche
            sped.Show()
-
+            Me.Cursor = Cursors.Default
        End If

    End Sub
@@ -2436,7 +2466,7 @@ Public Class frmHauptfenster
        'Me.Cursor = Cursors.WaitCursor

        Dim firma = ""
-        MsgBox("LOS" & vbNewLine & firma)
+        '  MsgBox("LOS" & vbNewLine & firma)

        Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856")
        If path <> "" Then
@@ -2513,30 +2543,30 @@ Public Class frmHauptfenster
                                    Optional isEmptyToNull As Boolean = False,
                                    Optional jsonSettings As JsonSerializerSettings = Nothing) As String

-            Dim response As String = String.Empty
+        Dim response As String = String.Empty

-            If Not EqualityComparer(Of T).Default.Equals(data, Nothing) Then
-                response = JsonConvert.SerializeObject(data, jsonSettings)
-            End If
+        If Not EqualityComparer(Of T).Default.Equals(data, Nothing) Then
+            response = JsonConvert.SerializeObject(data, jsonSettings)
+        End If

-            Return If(isEmptyToNull, (If(response = "{}", "null", response)), response)
+        Return If(isEmptyToNull, (If(response = "{}", "null", response)), response)

-        End Function
+    End Function

-        Public Function ToClass(Of T)(data As String,
-                                  Optional jsonSettings As JsonSerializerSettings = Nothing) As T
+    Public Function ToClass(Of T)(data As String,
+                              Optional jsonSettings As JsonSerializerSettings = Nothing) As T

-            Dim response = Nothing
+        Dim response = Nothing

-            If Not String.IsNullOrEmpty(data) Then
-                response = If(jsonSettings Is Nothing,
-                          JsonConvert.DeserializeObject(Of T)(data),
-                          JsonConvert.DeserializeObject(Of T)(data, jsonSettings))
-            End If
+        If Not String.IsNullOrEmpty(data) Then
+            response = If(jsonSettings Is Nothing,
+                      JsonConvert.DeserializeObject(Of T)(data),
+                      JsonConvert.DeserializeObject(Of T)(data, jsonSettings))
+        End If

-            Return response
+        Return response

-        End Function
+    End Function


    Private Sub timerStandzeit_Tick(sender As Object, e As EventArgs) Handles timerStandzeit.Tick
@@ -2832,9 +2862,10 @@ Public Class frmHauptfenster
                Exit Sub
            End If
        Next
-
+        Me.Cursor = Cursors.WaitCursor
        Dim sped As New SDL.frmRechnungenSuche
        sped.Show()
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub TimerUPDATE_Tick(sender As Object, e As EventArgs) Handles TimerUPDATE.Tick
@@ -3080,8 +3111,10 @@ Public Class frmHauptfenster
    End Sub

    Private Sub Button2_Click_2(sender As Object, e As EventArgs) Handles btnFakturierung.Click
+        Me.Cursor = Cursors.WaitCursor
        Dim f As New SDL.frmAbrechnungsMaske
        f.Show(Me)
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub ToolStripMenuItem1_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click
@@ -3353,18 +3386,19 @@ Public Class frmHauptfenster
    End Sub

    Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles picAVISOMessenger.Click
-
+        Me.Cursor = Cursors.WaitCursor
        For Each openForm In Application.OpenForms()
            If TypeOf (openForm) Is VERAG_PROG_ALLGEMEIN.frmMessenger Then
                CType(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).WindowState = FormWindowState.Normal
                CType(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).BringToFront()
-                Exit Sub
+                Me.Cursor = Cursors.Default : Exit Sub
            End If
        Next

        Dim f As New VERAG_PROG_ALLGEMEIN.frmMessenger
        f.Location = Cursor.Position
        f.Show(Me)
+        Me.Cursor = Cursors.Default
    End Sub

    'Private Sub TimerMessanger_NewMessages_Tick(sender As Object, e As EventArgs) Handles TimerMessanger_NewMessages.Tick
@@ -3438,13 +3472,17 @@ Public Class frmHauptfenster
    End Sub

    Private Sub Button11_Click(sender As Object, e As EventArgs) Handles btnMAVerzeichnis.Click
+        Me.Cursor = Cursors.WaitCursor
        Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche
        f.Show()
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click, Label22.Click
+        Me.Cursor = Cursors.WaitCursor
        Dim f As New frm_eAVISO
        f.Show()
+        Me.Cursor = Cursors.Default
    End Sub


@@ -3532,13 +3570,13 @@ Public Class AvisoStatusFunctions
        'End If
        ' If Aviso.Grenzstelle.Replace("???", "") <> "" Then
        If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then
-                If Aviso.Grenzstelle <> VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG Then
-                    Dim f As New frmAnkunftAendern(Aviso)
+            If Aviso.Grenzstelle <> VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG Then
+                Dim f As New frmAnkunftAendern(Aviso)
                If f.ShowDialog() Then
                    Aviso.Grenzstelle = f.AVISO.Grenzstelle
                End If
            End If
-            End If
+        End If
        ' End If

        Aviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft
@@ -4158,7 +4196,7 @@ Public Class AvisoStatusFunctions
                    AvisoDAL.addAenderung(AvisoID, "AKT abgeschlossen", "auf 'AKT ABGESCHLOSSEN' gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))

                    'Benachrichtigungen erledigen
-                    VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID)
+                    VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID, False)
                Else
                    Aviso.Abgeschlossen = value
                    AvisoDAL.SpeichernAviso(Aviso)
@@ -4571,6 +4609,9 @@ Public Class AvisoStatusFunctions
        Dim tmpid = AvisoDAL.SpeichernAviso(Aviso)
        AvisoDAL.addAenderung(tmpid, "Akt übernommen", "Akt übernommen von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm"))

+        'Benachrichtigungen erledigen 'nicht mehr, 16.07.2020
+        'VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_ALL(Aviso.AvisoID, True)
+

        If askSendungenUebernehmen Or nurLeereSendungenUebernehmen Then
            Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen)
@@ -4731,6 +4772,10 @@ Public Class AvisoStatusFunctions
        If SENDUNG_TMP.SAVE() Then
            AvisoDAL.addAenderung(SENDUNG_TMP.tblSnd_AvisoID, "Sendung übernommen", "Sendung Nr. " & SENDUNG_TMP.tblSnd_PosUnterNr & If(GesendetAn, " gesendet an ", " übernommen von ") & MITARBEITER.Fullname & " am " & Format(Now, "dd.MM.yyyy HH:mm") & If(GesendetAn, " (von " & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname & ")", ""))
            SENDUNG_TMP.saveSachbearbeiter = saveSachbearbeiterTmp
+
+            'Benachrichtigungen erledigen  'nicht mehr, 16.07.2020
+            '    VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.BESTAETIGEN_BENACHRICHTIGUNG_SND(SENDUNG_TMP.tblSnd_SendungID, True)
+
            Return True
        End If
        SENDUNG_TMP.saveSachbearbeiter = saveSachbearbeiterTmp
@@ -4807,9 +4852,11 @@ Public Class AvisoStatusFunctions
        SENDUNG_TMP.saveSachbearbeiter = True

        If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then
-            If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
-                SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
-            End If
+            SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+            SENDUNG_TMP.tblSnd_FilialeAbklaerung = VERAG_PROG_ALLGEMEIN.cAllgemein.getSTAMMFILIALE
+            'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
+            '    SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+            'End If
            If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId

            SENDUNG_TMP.tblSnd_Vorbereitet = Now                     'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn..
@@ -5100,7 +5147,7 @@ Public Class AvisoStatusFunctions
                        Dim found = False
                        Select Case s.tblSnd_Abfertigungsart_ID
                            Case 5, 6, 18, 24, 32, 33, 34, 37, 40
-                               getDataFronDY_NCTS(s.tblSnd_SendungID, AtcMrn, frist, DsId, s.FilialenNr, s.AbfertigungsNr, s.tblSnd_Abfertigungsart_ID, s.tblSnd_DakosyRef)
+                                getDataFronDY_NCTS(s.tblSnd_SendungID, AtcMrn, frist, DsId, s.FilialenNr, s.AbfertigungsNr, s.tblSnd_Abfertigungsart_ID, s.tblSnd_DakosyRef)
                                If KUNDE_ERW.EmailFreigabe_VBDPDF And IsNumeric(DsId) Then 'VBD anhängen
                                    Try
                                        Dim PathTmp = (New VERAG_PROG_ALLGEMEIN.cDATENSERVER(DsId)).GET_TOP1_PATH(False)