This commit is contained in:
2022-09-30 22:17:55 +02:00
parent dc3b07e539
commit 120fa35a97
9 changed files with 185 additions and 44 deletions

View File

@@ -171,7 +171,9 @@ Public Class SendungOptions
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("RPT_SND_Grenzstelle") Then
If AVISO.Zollstelle IsNot Nothing AndAlso AVISO.Zollstelle <> "" Then
VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
' VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & AVISO.Zollstelle & "' ", "ATLAS")
VALUES.Grenze = VERAGSQL.getValueTxtBySql("SELECT Code +' - ' + [Description] FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & AVISO.Zollstelle & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
Else
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
VALUES.Grenze = ""
@@ -671,7 +673,9 @@ Public Class SendungOptions
Shared Function getZSTBezeichnung(SQL As VERAG_PROG_ALLGEMEIN.SQL, o As Object) As String
If o Is Nothing Then Return ""
Dim tmp = SQL.getValueTxtBySql("select isnull([basncd_name],'') as Dienststelle FROM atlas.dbo.basncd WHERE [basncd_dstnr]='" & o & "'", "ATLAS")
' Dim tmp = SQL.getValueTxtBySql("select isnull([basncd_name],'') as Dienststelle FROM atlas.dbo.basncd WHERE [basncd_dstnr]='" & o & "'", "ATLAS")
Dim tmp = SQL.getValueTxtBySql("select isnull([Description],'') as Dienststelle FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE [Code]='" & o & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL")
Return If(tmp <> "", tmp, o)
End Function