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

div. Änderungen Spedbuch, etc.

Browse Source
This commit is contained in:
d.breimaier
2026-09-28 16:23:26 +02:00
parent 3748e8fe09
commit ff67d788f6
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb
View File

@@ -620,16 +620,13 @@ Public Class frmNacherfassungNEU
Case Else : where = " AND mit_firma NOT IN ('IMEX','UNISPED','AMBAR','FRONTOFFICE') "
End Select
' cboQuickStopMa.fillWithSQL("SELECT ID,cast(ID as nvarchar(3)) +' ' + Name as Name FROM Personal WHERE [Status]<>'L' ORDER BY Name ", False, "FMZOLL", True)
cboQuickStopMa.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " &
" FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND mit_abteilung='QS' AND [mit_gekuendigt]=0 " & where & " order by name", False, "ADMIN", True)
'ComboBox1.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", True, "FMZOLL")
cboQuickStopMa.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] + ' ('+ mit_abteilung + ')' as NAME FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND mit_ChatBenutzer = 1 and ISNULL(mit_TESTonly,0) = 0 AND [mit_gekuendigt]=0 and mit_abteilung in ('ZOLL', 'QS') " & where & " order by name", False, "ADMIN", True)
Dim LänderSql = "SELECT LandKz as Kz,cast(LandKz as nvarchar(8)) + ' - ' + LandBez as Bez FROM [Länderverzeichnis für die Außenhandelsstatistik] " &
" union " &
" SELECT RIGHT('00'+CAST(LänderNr AS VARCHAR(2)),2) as Kz,RIGHT('00'+CAST(LänderNr AS VARCHAR(2)),2) + ' - ' + [LänderBez] as Bez FROM [Länder der Bundesrepublik Deutschland] " &
" ORDER BY Kz "
cboVersendungsland.fillWithSQL(LänderSql, False, "FMZOLL", True)
cboBestimmungsland.fillWithSQL(LänderSql, False, "FMZOLL", True)
cbxWaehrung.fillWithSQL(" SELECT LandNr, isnull(Währungscode + ' - ' ,'') + LandBez + ' (' + cast(LandNr as varchar(8)) + ')' FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY case when Währungscode is null then 1 else 0 end,LandBez ", False, "FMZOLL", True)
@@ -1801,6 +1798,7 @@ Class cSpedBuch_Aktendeckel
VALUES.VG_MA = SQL.DLookup("[Name]", "Personal", "ID='" & SPEDBUCH.Personalnummer & "'", "FMZOLL", "")
VALUES.QS_MA = SQL.DLookup("mit_vname + ' ' + mit_nname", "tblMitarbeiter", "mit_id='" & SPEDBUCH.PersonalnummerQS & "'", "ADMIN", "")

10
SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb
View File

@@ -530,11 +530,10 @@ Public Class usrCntlSpeditionsBuchSuche
''' Case "ATILLA" : cboFiliale._allowedValuesFreiText = {"4801"}
End Select
cboSB_Qs.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " &
" FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND mit_abteilung='QS' AND [mit_gekuendigt]=0 " & where & " order by name", False, "ADMIN", True)
cboSB_Qs.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] + ' ('+ mit_abteilung + ')' as NAME FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND [mit_gekuendigt]=0 and mit_ChatBenutzer = 1 and ISNULL(mit_TESTonly,0) = 0 " & where & " order by name", False, "ADMIN", True)
cboSB_TR.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME FROM [tblMitarbeiter] WHERE mit_firma IN ('VERIMEX') AND [mit_gekuendigt]=0 order by name", False, "ADMIN", True)
cboSB_TR.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " &
" FROM [tblMitarbeiter] WHERE mit_firma IN ('VERIMEX') AND [mit_gekuendigt]=0 order by name", False, "ADMIN", True)
btnDetailsuche.PerformClick()
cboRolle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", "VermittlerKundenNr"))
@@ -592,9 +591,6 @@ Public Class usrCntlSpeditionsBuchSuche
End If
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen_Erlöse", "SDL") Then
btnSpedBuchEinnahmen.Visible = True
End If

3
VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
View File

@@ -1039,6 +1039,7 @@ Public Class cTimasAPI
dt.Columns.Add("Geschlecht", GetType(String))
dt.Columns.Add("Ausweis-Nr", GetType(Integer))
dt.Columns.Add("Info", GetType(String))
'dt.Columns.Add("AVISO-ID", GetType(Integer))
End If
dt.Clear()
@@ -1055,6 +1056,8 @@ Public Class cTimasAPI
R("Geschlecht") = employee.StringOf("gender")
R("Ausweis-Nr") = employee.IntOf("card")
R("Info") = employee.StringOf("info")
'R("AVISO-ID") = employee.IntOf("externid")
dt.Rows.Add(R)
j = j + 1
End While