Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

This commit is contained in:
2026-04-29 15:47:53 +02:00

View File

@@ -195,6 +195,18 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
XML.EinzelEingangsanzeige.TransitOperation.IncidentFlag = "N" XML.EinzelEingangsanzeige.TransitOperation.IncidentFlag = "N"
XML.EinzelEingangsanzeige.TransitOperation.TraderAtDestination = New EingangsanzeigeNCTSDE_003.AddressEAType
XML.EinzelEingangsanzeige.TransitOperation.TraderAtDestination.ContactPerson.EMailAddress = getDefaultMail_FIRMA()
XML.EinzelEingangsanzeige.TransitOperation.TraderAtDestination.ContactPerson.Name = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname
XML.EinzelEingangsanzeige.TransitOperation.TraderAtDestination.ContactPerson.PhoneNumber = getTelefon()
XML.EinzelEingangsanzeige.TransitOperation.LocationOfGoods = New EingangsanzeigeNCTSDE_003.LocationOfGoodsEAType
XML.EinzelEingangsanzeige.TransitOperation.LocationOfGoods.ContactPerson.EMailAddress = getDefaultMail_FIRMA()
XML.EinzelEingangsanzeige.TransitOperation.LocationOfGoods.ContactPerson.Name = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.Fullname
XML.EinzelEingangsanzeige.TransitOperation.LocationOfGoods.ContactPerson.PhoneNumber = getTelefon()
Dim saveDir = Application.StartupPath & "\Dakosy_SEND\" Dim saveDir = Application.StartupPath & "\Dakosy_SEND\"
@@ -211,6 +223,37 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
Return True Return True
End Function End Function
Private Shared Function getTelefon() As String
Dim defaultDW = "200"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "ATILLA" : Return "0043 7711 28450"
Case "AMBAR" : Return "0049 8651 9962492"
Case "UNISPED" : defaultDW = "800"
Case "IMEX" : defaultDW = "602"
Case "VERAG" : defaultDW = "200"
End Select
Dim dw = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
Return "0049 8503 7973999 " &
If(String.IsNullOrEmpty(dw) OrElse dw.Length >= 5, defaultDW, dw)
End Function
Private Shared Function getDefaultMail_FIRMA() As String
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "VERAG"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
Case "KLIPP" : Return "klipphausen@verag.ag"
Case "DTB" : Return "dettelbach@verag.ag"
Case "NKN" : Return "neunkirchen@verag.ag"
Case "SBG" : Return "de@verag.ag"
Case "NEU" : Return "neuhaus@verag.ag"
Case Else : Return "quickstop@verag.ag"
End Select
Case "IMEX" : Return "steuerbescheide@imex-group.at"
Case "UNISPED" : Return "office@unisped.at"
Case "AMBAR" : Return "office@ambarlog.com"
End Select
Return "quickstop@verag.ag"
End Function
Private Function createGesamtsicherheitDummy(GesSichRef As cGesamtsicherheitsReferenz, Standort As String, Warenort As String, gsnr As Integer, WarenwertEUR As Double) Private Function createGesamtsicherheitDummy(GesSichRef As cGesamtsicherheitsReferenz, Standort As String, Warenort As String, gsnr As Integer, WarenwertEUR As Double)
Try Try
@@ -266,7 +309,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige
.gs_posNr = getLatestPosNr(gsnr, txtMRN._value) .gs_posNr = getLatestPosNr(gsnr, txtMRN._value)
attachPosNrToExistingATB = True attachPosNrToExistingATB = True
Else Else
.gs_gsNr = SQL.getValueTxtBySql("select MAX([gs_gsNr]) + 1 as MaxGesSich from tblGesamtsicherheit", "AVISO") .gs_gsNr = SQL.getValueTxtBySql("Select MAX([gs_gsNr]) + 1 As MaxGesSich from tblGesamtsicherheit", "AVISO")
.gs_posNr = 0 .gs_posNr = 0
End If End If