SEndungsdetails ATilla

2025-02-19 10:50:13 +01:00
parent 390d5353f2
commit 7823d11489
19 changed files with 2603 additions and 4038 deletions
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -157,20 +157,22 @@ Public Class usrcntlAktDetails

        If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("LKW_CHAT") Then
            If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("LKW_CHAT", Me.FindForm) Then
+                If pnlMaDetails.Visible Then

-                picAVISOMessengerSNDChat.Visible = True
-                lblSNDChat_MsgCnt.Visible = False
-                Dim newMsgSnd = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT_SendungsID(SendungsID)
-                If newMsgSnd > 0 Then
-                    lblSNDChat_MsgCnt.Text = newMsgSnd
-                    lblSNDChat_MsgCnt.Visible = True
-                    lblSNDChat_MsgCnt.BringToFront()
+                    picAVISOMessengerSNDChat.Visible = True
+                    lblSNDChat_MsgCnt.Visible = False
+                    Dim newMsgSnd = VERAG_PROG_ALLGEMEIN.cMessenger.GET_NewMSG_COUNT_SendungsID(SendungsID)
+                    If newMsgSnd > 0 Then
+                        lblSNDChat_MsgCnt.Text = newMsgSnd
+                        lblSNDChat_MsgCnt.Visible = True
+                        lblSNDChat_MsgCnt.BringToFront()
+                    End If
+                    'If VERAG_PROG_ALLGEMEIN.cMessenger.isACTIVE_SendungsID(SendungsID) Then
+                    '    lblSNDChat_MsgCnt.Text = "!!"
+                    '    lblSNDChat_MsgCnt.Visible = True
+                    '    lblSNDChat_MsgCnt.BringToFront()
+                    'End If
                End If
-                'If VERAG_PROG_ALLGEMEIN.cMessenger.isACTIVE_SendungsID(SendungsID) Then
-                '    lblSNDChat_MsgCnt.Text = "!!"
-                '    lblSNDChat_MsgCnt.Visible = True
-                '    lblSNDChat_MsgCnt.BringToFront()
-                'End If
            End If
        End If

@@ -264,6 +266,7 @@ Public Class usrcntlAktDetails
            btnErfasst.Visible = True
        End If

+        Button18.Visible = True

        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
            btnOptionen.Enabled = False
@@ -783,11 +786,29 @@ Public Class usrcntlAktDetails
        lblInfoAviso.Visible = False
        infotxt = ""

+        'If dgvSendungen.SelectedRows.Count > 0 Then
+        '    btnQuckScan.Text = "Quick-Scan" & vbNewLine & dgvSendungen.SelectedRows(0).Cells("AbfertigungsNr").Value
+        'Else
+        '    btnQuckScan.Text = "Quick-Scan" & vbNewLine & "LKW"
+        'End If     
+        If dgvSendungen.SelectedRows.Count > 0 Then
+            btnQuckScan.Text = "Quick-Scan (SND)"
+        Else
+            btnQuckScan.Text = "Quick-Scan (LKW)"
+        End If
+
        ' If setAkive_AuswahlID() = -1 Then Exit Sub
        If AvisoID <= 0 Then Exit Sub
-        pnlMAInfo.Visible = False
-        Button18.Visible = False
-        btnQuckScan.Visible = False
+        pnlMaDetails.Visible = False
+        picAVISOMessengerSNDChat.Visible = False
+        lblSNDChat_MsgCnt.Visible = False
+        'Button18.Visible = False
+        btnQuckScan.Visible = True
+
+        'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then
+        '    btnQuckScan.Visible = True
+        'End If
+
        Select Case tbcntlVermerke.SelectedIndex
            Case 0, 1, 2 : Vermerke_anzeigen2(rowindex)
            Case 3
@@ -805,7 +826,7 @@ Public Class usrcntlAktDetails
                    WhereWO = " AND  isnull(anh_SendungsId,0) <> 0 "
                End If

-                Button18.Visible = True
+                '   Button18.Visible = True
                Dim hSQL As String '= " Select [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge] 
                '      WHERE [anh_AvisoId]='" & AvisoID & "'  " & AktSndAnhaenge & " " & WhereWO & "
                '                               ORDER BY  anh_SendungsId desc,
@@ -920,7 +941,7 @@ Public Class usrcntlAktDetails

        'Hier werden die passenden Vermerke zum Aviso angezeigt
        Dim sendwhere = ""
-        If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then
+        If True Then
            If gridVermerke.Columns("tblSnd_PosUnterNr") IsNot Nothing Then gridVermerke.Columns("tblSnd_PosUnterNr").Visible = False
            Select Case tbcntlVermerke.SelectedIndex
                Case 0
@@ -959,13 +980,12 @@ Public Class usrcntlAktDetails
                        sendwhere = " AND VermerkArt='S'  AND SendungID=" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value


-                        initSND_CHAT(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)

                        '---------------------------------------------------------
                        'MA INFO
                        '---------------------------------------------------------
                        'AbklaerungTR
-                        pnlMAInfo.Visible = True
+                        pnlMaDetails.Visible = True
                        If dgvSendungen.SelectedRows(0).Cells("tblSnd_AbklaerungTR").Value IsNot DBNull.Value Then
                            picMAinfo_AbklaerungTR.BackgroundImage = My.Resources.abklaerungTR_Aktiv
                            txtMAinfo_AbklaerungTR.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_AbklaerungTR_MA").Value & "'", "ADMIN", "-")
@@ -975,14 +995,14 @@ Public Class usrcntlAktDetails
                        'AbfertigungTR
                        'pnlMAInfoXX.Visible = True
                        'If dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR").Value IsNot DBNull.Value Then
-                        '    picMAinfo_AbfertigungTR.BackgroundImage = My.Resources.AbfertigungTR_Aktiv
+                        '    picMAinfo_AbfertigungTR.BackgroundImpicAVISOMessengerSNDChatage = My.Resources.AbfertigungTR_Aktiv
                        '    txtMAinfo_AbfertigungTR.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR_MA").Value & "'", "ADMIN", "-")
                        '    txtMAinfo_AbfertigungTR.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_AbfertigungTR_MA").Value
                        'End If


                        'Vorbereitet
-                        pnlMAInfo.Visible = True
+                        pnlMaDetails.Visible = True
                        If dgvSendungen.SelectedRows(0).Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then
                            picMAinfo_VorbereitetQs.BackgroundImage = My.Resources.statusBtn_vorbereitet_Aktiv
                            txtMAinfo_VorbereitetQs.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_QS_MA").Value & "'", "ADMIN", "-")
@@ -990,7 +1010,7 @@ Public Class usrcntlAktDetails
                        End If
                        '---------------------------------------------------------
                        'Vorgeschrieben
-                        pnlMAInfo.Visible = True
+                        pnlMaDetails.Visible = True
                        If dgvSendungen.SelectedRows(0).Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then
                            picMAinfo_Vorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_Aktiv
                            txtMAinfo_Vorgeschrieben.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_VG_MA").Value & "'", "ADMIN", "-")
@@ -1032,6 +1052,12 @@ Public Class usrcntlAktDetails

        ' Dim hSQL As String = "SELECT [VermerkID],[AvisoID],[Datum],[Mitarbeiter],[Hinweis_Vermerk],[VermerkeCode],[MitarbeiterId] FROM Vermerke WHERE AvisoID = " & AvisoID & " " & sendwhere & " ORDER BY Datum DESC"

+        picAVISOMessengerSNDChat.Visible = pnlMaDetails.Visible
+        ' lblSNDChat_MsgCnt.Visible = pnlMaDetails.Visibl
+        If dgvSendungen.SelectedRows.Count > 0 Then
+
+            initSND_CHAT(dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
+        End If

        Dim hSQL = usrcntlAktDetails.vermerkehSQL
        hSQL = hSQL.Replace("[[AvisoId]]", AvisoID)
@@ -3758,9 +3784,17 @@ Public Class usrcntlAktDetails
    Private Sub btnQuckScan_Click(sender As Object, e As EventArgs) Handles btnQuckScan.Click
        Try
            Me.Cursor = Cursors.WaitCursor
-            If frmSendungAnhangImport.quickScan(AvisoID) Then
-                Vermerke_anzeigen()
+            If gridVermerke.SelectedRows.Count > 0 Then
+                If frmSendungAnhangImport.quickScan(AvisoID, gridVermerke.SelectedRows(0).Cells("SendungID").Value) Then
+                    Vermerke_anzeigen()
+                End If
+            Else
+                If frmSendungAnhangImport.quickScan(AvisoID) Then
+                    Vermerke_anzeigen()
+                End If
            End If
+
+
        Catch ex As Exception
            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler QuickScan")
        End Try