edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Browse Source
This commit is contained in:
d.breimaier
2022-11-23 09:41:37 +01:00
parent 25c9ac0f42 1da7a5f5f7
commit ea6a3f1135
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/frmHauptfenster.vb
View File

@@ -11,10 +11,14 @@ Imports Hardcodet.Wpf.TaskbarNotification
Imports com.esendex.sdk.messaging Imports com.esendex.sdk.messaging
Imports Newtonsoft.Json Imports Newtonsoft.Json
Imports System.Reflection Imports System.Reflection
Imports System.Runtime.InteropServices
'Imports UID 'Imports UID
Public Class frmHauptfenster Public Class frmHauptfenster
Public aktiv = False Public aktiv = False
Private AvisoDAL As New cAvisoDAL Private AvisoDAL As New cAvisoDAL
Private VermerkeDAL As New cVermerkeDAL Private VermerkeDAL As New cVermerkeDAL

12
Aviso/usrcntlAktDetails.vb
View File

@@ -1160,6 +1160,12 @@ Public Class usrcntlAktDetails
' avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID) ' avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID)
'Vermerke_aktualisieren() 'Vermerke_aktualisieren()
init = True ' Vermerke_anzeigen(e.RowIndex) init = True ' Vermerke_anzeigen(e.RowIndex)
Case "96"
myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten")
myVermerk.VermerkCodeId = 97
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
End Select End Select
loaded = False loaded = False
@@ -1339,6 +1345,12 @@ Public Class usrcntlAktDetails
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen." optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen."
End If End If
Case 96
If Not existCodeInGridVermerke(97, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
optionCell.Value = "T1 Bestätigung erhalten"
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'T1 Bestätigung erhalten' einzutragen."
End If
Case 80 Case 80
If Not existCodeInGridVermerke(81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then If Not existCodeInGridVermerke(81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
optionCell.Value = "ATB-Nr. erhalten" optionCell.Value = "ATB-Nr. erhalten"