diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 5843291..e76f75f 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index aa67d30..7bed7f5 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -831,45 +831,7 @@ Public Class usrcntlAktDetails WhereWO = " AND isnull(anh_SendungsId,0) <> 0 " End If - ' 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, - ' case - ' when [anh_Art] = 'ATR' then 0 - ' when [anh_Art] = 'ATR-EUR1' then 0 - ' when [anh_Art] = 'EUR1' then 0.1 - ' when [anh_Art] = 'Rechnung' then 1 - ' when [anh_Art] = 'eFatura' then 1.1 - ' when [anh_Art] = 'CMR' then 2 - ' when [anh_Art] = 'Ausfuhr' then 3 - ' when [anh_Art] = 'Vorpapier' then 4 - ' when [anh_Art] = 'Packliste' then 5 - ' when [anh_Art] = 'Auftrag' then 6 - ' when [anh_Art] = 'Auftrag' then 7 - ' when [anh_Art] = 'Dispoliste' then 8 - ' when [anh_Art] = 'Vorkasse' then 9 - ' when [anh_Art] = 'Überweisungsbeleg' then 10 - ' when [anh_Art] = 'Vollmacht' then 11 - ' when [anh_Art] = 'ATB' then 12 - ' when [anh_Art] = 'ATA' then 13 - - ' when [anh_Art] = 'GGED_D' then 40 - ' when [anh_Art] = 'GGED_PP' then 41 - ' when [anh_Art] = 'GGED_P' then 42 - ' when [anh_Art] = 'GGED_A' then 43 - ' when [anh_Art] = 'PHYTO' then 44 - ' when [anh_Art] = 'CONFORM' then 45 - - - ' when [anh_Art] = 'Sonstiges' then 99 - - - ' when [anh_Art] ='' then 15 - - 'END, [anh_Reihenfolge],[anh_id]" - - + Dim hSQL As String hSQL = "SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND isnull(aa_name,'')='' THEN '***' ELSE [aa_name] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen, anh_markiert , anh_cmrId FROM [tblAvisoAnhaenge] left join tblAvisoAnhangsArten on aa_bezeichnung = anh_Art @@ -877,7 +839,6 @@ Public Class usrcntlAktDetails ORDER BY anh_SendungsId desc, case when aa_sort = NULL THEN 15 else aa_sort END, [anh_Reihenfolge],[anh_id]" - ' order by [anh_Reihenfolge],[anh_id] gridVermerke.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL)