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
2023-05-08 14:20:35 +02:00
parent 9ea2d32d2c 6ea3ce60ba
commit 7240040d39
4 changed files with 69 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Aviso/usrcntlAktDetails.vb
View File

@@ -5,7 +5,7 @@ Imports System.IO
'Imports Gemeinsames.cDatenbank
Imports System.Drawing
Imports Microsoft.Office.Interop
Imports System.Security.Cryptography
Public Class usrcntlAktDetails
@@ -433,6 +433,7 @@ Public Class usrcntlAktDetails
.Columns("Geloescht").Visible = False 'tblSnd_Empfaengernicht anzeigen
.Columns("VorauskasseId").Visible = False 'tblSnd_Empfaengernicht anzeigen
.Columns("SMSId").Visible = False 'tblSnd_Empfaengernicht anzeigen
.Columns("VermerkIDAufgehoben").Visible = False 'tblSnd_Empfaengernicht anzeigen
.Columns("Datum").Width = 125 '110
.Columns("Datum").HeaderText = "Datum"
@@ -966,7 +967,7 @@ Public Class usrcntlAktDetails
Dim hSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," &
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId" &
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben" &
" FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
" LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
" WHERE AvisoID = " & AvisoID & " " & sendwhere & " " &
@@ -1212,6 +1213,12 @@ Public Class usrcntlAktDetails
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
Case "101"
myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("offen", "erledigt")
myVermerk.VermerkCodeId = 102
Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp)
init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen()
End Select
loaded = False
@@ -1410,6 +1417,15 @@ Public Class usrcntlAktDetails
optionCell.Value = "DE-ZOLL fertig"
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL (DIGITAL) fertig' einzutragen."
End If
Case 101
If r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then
' If Not existCodeInGridVermerke(102, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
optionCell.Value = "Erledigt"
optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Sonstiger Grund erledigt' einzutragen."
End If
End Select
End If
@@ -1447,21 +1463,23 @@ Public Class usrcntlAktDetails
Function existCodeInGridVermerke(code As Integer, Optional text As String = "") As Boolean
For Each r As DataGridViewRow In gridVermerke.Rows
If DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString = CStr(code) Then
Select Case code
Case 59
Return True
Case 2, 4, 6, 8, 10, 12, 14, 30, 37, 34
If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then
If r.Cells("Geloescht").Value = False Then
If DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString = CStr(code) Then
Select Case code
Case 59
Return True
End If
Case 32
If DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("Vorbereitung abgeschlossen", "in Vorbereitung") = text Then
Case 2, 4, 6, 8, 10, 12, 14, 30, 37, 34
If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then
Return True
End If
Case 32
If DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("Vorbereitung abgeschlossen", "in Vorbereitung") = text Then
Return True
End If
Case Else
Return True
End If
Case Else
Return True
End Select
End Select
End If
End If
Next
Return False
@@ -1471,12 +1489,14 @@ Public Class usrcntlAktDetails
Function existCodeInGridVermerke_VK(VorauskasseId As Object) As Boolean
For Each r As DataGridViewRow In gridVermerke.Rows
Select Case If(DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString, "")
Case 14, 59
If DirectCast(r.Cells("VorauskasseId"), DataGridViewTextBoxCell).Value.ToString = CStr(VorauskasseId) Then
Return True
End If
End Select
If r.Cells("Geloescht").Value = False Then
Select Case If(DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString, "")
Case 14, 59
If DirectCast(r.Cells("VorauskasseId"), DataGridViewTextBoxCell).Value.ToString = CStr(VorauskasseId) Then
Return True
End If
End Select
End If
Next
Return False
End Function