This commit is contained in:
2024-10-30 13:46:43 +01:00
parent 0ce0181350
commit 82cd82243a
7 changed files with 86 additions and 89 deletions

View File

@@ -163,6 +163,13 @@ Public Class SendungOptions
If barcodeLKW IsNot Nothing Then VALUES.barcodeLKW = barcodeLKW
If barcode IsNot Nothing Then VALUES.barcodeSendung = barcode
Dim imgQR As Image = Nothing
If SENDUNG.tblSnd_Abfertigungsart_ID.ToString = "44" Then
imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID))
'imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) & "&SendungId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(SENDUNG.tblSnd_SendungID))
End If
If barcode IsNot Nothing Then VALUES.imgQR = imgQR
VALUES.ABF_ART = SENDUNG.tblSnd_Abfertigungsart_ID
VALUES.Abfertigungsnummer = SENDUNG.AbfertigungsNr
VALUES.FilialeNr = SENDUNG.FilialenNr
@@ -172,7 +179,7 @@ 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 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")
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