diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb index 7981bc96..67c51825 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004.vb @@ -223,7 +223,7 @@ Public Class usrCntlATLAS_NCTS004 End If - loaddataFromAVISO(AVISO, SENDUNG, cDy_ART, BezugsNr, ncts_OUT) + loaddataFromAVISO(AVISO, SENDUNG, cDy_ART, BezugsNr, ncts_OUT, FIRMA_DY) cboStammreferenz.changeItem(Stammreferenz) @@ -395,7 +395,7 @@ Public Class usrCntlATLAS_NCTS004 - Shared Sub loaddataFromAVISO(AVISO As cAviso, SENDUNG As cSendungen, cDy_ART As String, BezugsNr As String, ByRef cdy As cDakosyNCTSOut004) + Shared Sub loaddataFromAVISO(AVISO As cAviso, SENDUNG As cSendungen, cDy_ART As String, BezugsNr As String, ByRef cdy As cDakosyNCTSOut004, FIRMA_DY As String) Try '==> VORBLENDUNG: @@ -408,6 +408,15 @@ Public Class usrCntlATLAS_NCTS004 cdy.ncts_dyaArt = cDy_ART If AVISO IsNot Nothing Then cdy.ncts_DepartureTransportMeans_1_IdentificationNumber = AVISO.LKW_Nr + Select Case AVISO.Transportmittelart + Case "LKW", "SPRINTER" + cdy.ncts_DepartureTransportMeans_1_TypeOfIdentification = 30 + If FIRMA_DY <> "AMBAR" Then + cdy.ncts_InlandModeOfTransport = "3" + cdy.ncts_ModeOfTransportAtTheBorder = "3" + End If + End Select + cdy.ncts_DepartureTransportMeans_1_Nationality = AVISO.LKW_Nationalitaet If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "ATILLA" Then 'cdy.transportm = "X" @@ -418,9 +427,6 @@ Public Class usrCntlATLAS_NCTS004 End If - - cdy.ncts_InlandModeOfTransport = "3" - cdy.ncts_ModeOfTransportAtTheBorder = "3" 'cdy.ncts_Befoerderungsmittel_ArtGrenzueberschreitung = "35" @@ -623,6 +629,7 @@ Public Class usrCntlATLAS_NCTS004 ncts_OUT.ncts_LetzteBearbeitung_SB = DY_ANM.dy_LetzteBearbeitung_SB DAKOSY_Interface_SEND.loadInClass_VersandanmeldungNCTSDE_004(ncts_OUT, Me, DY_ANM, FIRMA_DY) + If Not ncts_OUT.SAVE_ALL() Then 'gespeichert End If @@ -778,7 +785,7 @@ Public Class usrCntlATLAS_NCTS004 NCTS_OUT.ncts_Id = -1 NCTS_OUT.ncts_dyaAnmID = DY_ANM.dy_Id - usrCntlATLAS_NCTS004.loaddataFromAVISO(AVISO, SENDUNG, cDy_ART, BezugsNr, NCTS_OUT) + usrCntlATLAS_NCTS004.loaddataFromAVISO(AVISO, SENDUNG, cDy_ART, BezugsNr, NCTS_OUT, FIRMA_DY) 'cboStammreferenz.changeItem(Stammreferenz) If NCTS_OUT.SAVE() Then diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004_Allg.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004_Allg.vb index 49789a62..9113858c 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004_Allg.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/NCTS004/usrCntlATLAS_NCTS004_Allg.vb @@ -233,7 +233,7 @@ ' NCTS.ncts_DepartureTransportMeans_1_TypeOfIdentification = cProgramFunctions.isLeerNothing(cboArtGrenzUeberschreitung._value) NCTS.ncts_DepartureTransportMeans_1_TypeOfIdentification = cProgramFunctions.isLeerNothing(sbArtGrenzUeberschreitung._value) - ' NCTS.ncts_Befoerderungsmittel_VerkehrszweigGrenzueberschreitent = cProgramFunctions.isLeerNothing(cboVerkehrszweig._value) + NCTS.ncts_ModeOfTransportAtTheBorder = cProgramFunctions.isLeerNothing(cboVerkehrszweig._value) NCTS.ncts_SpecificCircomstanceIndicator = cProgramFunctions.isLeerNothing(cboBesondereUmstaende._value) NCTS.ncts_TransportCharges = cProgramFunctions.isLeerNothing(cboZahlungsweiseBefKosten._value) @@ -288,7 +288,7 @@ cboVerfahrensart.changeItem(If(NCTS.ncts_TransitDeclarationType, "")) 'cbxVereinfachtesVerfahren.Checked = If(NCTS.ncts_KzVereinfachtesVerfahren, False) - 'cbxSumASicherheit.Checked = If(NCTS.ncts_SumA_KzSumASicherheit, False) + cbxSumASicherheit.Checked = If(NCTS.ncts_Security, False) ' txtBeladungsort.Text = If(NCTS.ncts_PlaceOfLoading_Location, "") txtWiedergestellungsdatum._value = If(NCTS.ncts_LimitDate, Nothing) @@ -305,7 +305,7 @@ 'cboArtGrenzUeberschreitung.changeItem(NCTS.ncts_DepartureTransportMeans_1_TypeOfIdentification) sbArtGrenzUeberschreitung.SET_VALUE(NCTS.ncts_DepartureTransportMeans_1_TypeOfIdentification) - ' cboVerkehrszweig.changeItem(NCTS.ncts_Befoerderungsmittel_VerkehrszweigGrenzueberschreitent) + cboVerkehrszweig.changeItem(NCTS.ncts_ModeOfTransportAtTheBorder) cboBesondereUmstaende.changeItem(NCTS.ncts_SpecificCircomstanceIndicator) cboZahlungsweiseBefKosten.changeItem(NCTS.ncts_TransportCharges) diff --git a/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb b/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb index f32d0f4c..8369706b 100644 --- a/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb +++ b/VERAG_PROG_ALLGEMEIN/cErrorHandler.vb @@ -5,7 +5,7 @@ Imports System.Windows.Forms Public Class cErrorHandler - Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "al@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing) + Public Shared Sub ERR(message As String, stack As String, functionName As String, Optional OP As String = "", Optional title As String = "", Optional mailadess As String = "error@verag.ag", Optional recieverMailAdress As String = "", Optional zusatz As String = "", Optional errCode As String = Nothing) If OP = "" Then OP = VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL ' GLobal gesetzes Errorhandling! (Standart=SHOW) 'If Form.ActiveForm IsNot Nothing Then @@ -18,19 +18,19 @@ Public Class cErrorHandler Try Select Case OP - Case ERROR_OP.MAIL - sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName) - Case ERROR_OP.SHOW - Dim c As New cProgramFunctions - Dim url = c.MakeScreenshot() + Case ERROR_OP.MAIL + sendERRORperMail(title & " | " & My.Application.Info.AssemblyName, message, stack, mailadess, zusatz, functionName) + Case ERROR_OP.SHOW + Dim c As New cProgramFunctions + Dim url = c.MakeScreenshot() - Dim f As New frmErrorMeldung(If(functionName <> "", "Fehler in der Funktion '" & functionName & "'" & vbNewLine & vbNewLine, "") & message & vbNewLine & zusatz, stack, title, url) - f.ShowDialog() - Case ERROR_OP.SHOW_MSGBOX - MsgBox(If(functionName <> "", "Fehler in der Funktion '" & functionName & "'" & vbNewLine & vbNewLine, "") & message & vbNewLine & stack & vbNewLine & zusatz, MsgBoxStyle.OkOnly, If(title <> "", title, "Fehler")) - End Select + Dim f As New frmErrorMeldung(If(functionName <> "", "Fehler in der Funktion '" & functionName & "'" & vbNewLine & vbNewLine, "") & message & vbNewLine & zusatz, stack, title, url) + f.ShowDialog() + Case ERROR_OP.SHOW_MSGBOX + MsgBox(If(functionName <> "", "Fehler in der Funktion '" & functionName & "'" & vbNewLine & vbNewLine, "") & message & vbNewLine & stack & vbNewLine & zusatz, MsgBoxStyle.OkOnly, If(title <> "", title, "Fehler")) + End Select - VERAG_PROG_ALLGEMEIN.cERS.saveErr(OP, message, stack, errCode, functionName, recieverMailAdress, zusatz) + VERAG_PROG_ALLGEMEIN.cERS.saveErr(OP, message, stack, errCode, functionName, recieverMailAdress, zusatz) Catch ex As Exception @@ -49,8 +49,10 @@ Public Class cErrorHandler Dim myCredentials As New System.Net.NetworkCredential 'myCredentials.UserName = "support@verag.ag" 'myCredentials.Password = "$up0Rt2809!" - myCredentials.UserName = "al@verag.ag" - myCredentials.Password = "verag#2" + 'myCredentials.UserName = "al@verag.ag" + 'myCredentials.Password = "verag#2" + myCredentials.UserName = "edv@verag.ag" + myCredentials.Password = "Ju18WA10" Msg.IsBodyHtml = False Dim mySmtpsvr As New SmtpClient() @@ -60,7 +62,8 @@ Public Class cErrorHandler mySmtpsvr.Credentials = myCredentials Try - Msg.From = New MailAddress("al@verag.ag") + ' Msg.From = New MailAddress("al@verag.ag") + Msg.From = New MailAddress("edv@verag.ag") Msg.To.Add(recieverMailAdress) Msg.Subject = title '"ERROR - DAKOSY Einarbeitung"