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

NCTS 5

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-09-24 23:03:47 +02:00
parent 6e2166588b
commit 3f3b2ea783
5 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Aviso/usrcntlAktDetails.vb
View File

@@ -251,7 +251,8 @@ Public Class usrcntlAktDetails
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
btnOptionen.Enabled = False
btnLkwBeleg.Visible = False
tbcntlVermerke.TabPages.Remove(tbAnhang)
'tbcntlVermerke.TabPages.Remove(tbAnhang)
Button18.Visible = False
btnDipoListeEmail.Visible = False
btnLZDruckDIGITAL.Visible = False
@@ -768,11 +769,21 @@ Public Class usrcntlAktDetails
btnQuckScan.Visible = True
End If
Dim AktSndAnhaenge = " AND isnull(anh_SendungsId,0) <=0 "
If dgvSendungen.SelectedRows.Count > 0 Then
AktSndAnhaenge = " AND ( isnull(anh_SendungsId,0) <=0 OR isnull(anh_SendungsId,0)='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value & "' ) "
End If
Dim WhereWO = " "
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
WhereWO = " AND isnull(anh_SendungsId,0) <> 0 "
End If
Button18.Visible = True
Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],[anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge]
WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0
ORDER BY
case
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,
case
when [anh_Art] = 'ATR-EUR1' then 0
when [anh_Art] = 'Rechnung' then 1
when [anh_Art] = 'eFatura' then 1.1
@@ -1814,7 +1825,11 @@ Public Class usrcntlAktDetails
Private Sub dgvSendungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSendungen.SelectionChanged
If sendAktiv Then
If dgvSendungen.SelectedRows.Count > 0 Then
If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2
If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
If tbcntlVermerke.SelectedIndex <> 2 And tbcntlVermerke.SelectedIndex <> 3 Then tbcntlVermerke.SelectedIndex = 2
Else
If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2 ' Wennnnciht WO, soll immer zu den Sendungsvermerken gesprungen werdne.
End If
Else
If tbcntlVermerke.SelectedIndex <> 0 Then tbcntlVermerke.SelectedIndex = 0
End If