diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb index 29a8865..14cd2d1 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/EZA/cDakosyEZA.vb @@ -1152,6 +1152,14 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_ Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE [mit_DAKOSY_SB]='" & DY.eza_Bearbeiter & "'", "ADMIN") SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If + + If If(SPEDITIONSBUCH.Personalnummer, "") = "" Then ' Falls nciht gefunden, mit vollem Namen + If DY.eza_AnmeldenderBearbeiterName IsNot Nothing Then + Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE mit_DAKOSY_SBFull='" & DY.eza_AnmeldenderBearbeiterName & "' ", "ADMIN") + SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) + End If + + End If Catch ex As Exception ' MsgBox( vbNewLine & ex.Message & vbNewLine & ex.StackTrace) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler DAKOSY Personal: " & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -1276,6 +1284,7 @@ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eza_BezugsnummerBEAnteilZL", eza_ Dim p = SQL.getValueTxtBySql("SELECT ISNULL(CASE WHEN [mit_FMZollPersIDKasseIsnotSpedBuch]=1 THEN [mit_FMZollPersIDSpedBuch] ELSE [mit_FMZollPersID] END ,-1) as [mit_FMZollPersID] FROM [ADMIN].[dbo].[tblMitarbeiter] WHERE [mit_DAKOSY_SB]='" & DY.aes_Bearbeiter & "'", "ADMIN") SPEDITIONSBUCH.Personalnummer = If(IsNumeric(p), p, Nothing) End If + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler DAKOSY Personal: " & ex.StackTrace & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx b/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx index 1ae8ad3..c96a876 100644 Binary files a/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx and b/MailSender/Resources/MDM_ZOLL_Verguetung.xlsx differ diff --git a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj index 4bc99f6..e583185 100644 --- a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj +++ b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj @@ -53,9 +53,6 @@ - - ..\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll - @@ -113,5 +110,11 @@ Designer + + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN + + \ No newline at end of file diff --git a/TELOTEK_Worker_lib/cTelokec.vb b/TELOTEK_Worker_lib/cTelokec.vb index fcdf331..31bb75b 100644 --- a/TELOTEK_Worker_lib/cTelokec.vb +++ b/TELOTEK_Worker_lib/cTelokec.vb @@ -1244,6 +1244,139 @@ Public Class cTelotec_Anmeldung End Function + + Public Shared Function ConvertTAMessageToTelotec(msg As VERAG_PROG_ALLGEMEIN.cTelotecAPI.TAMessage) As cTelotec_Anmeldung + Dim telotec As New cTelotec_Anmeldung() + + With msg + If .declarationContent IsNot Nothing Then + Dim decl = .declarationContent + + telotec.telanm_ART = "TA" + telotec.telanm_BezugsNr = .lrn + telotec.telanm_CRN = .mrn + telotec.MsgType = .msgType + telotec.Refs_LRN = .lrn + telotec.Refs_CRN = .mrn + + telotec.Mandant_ID = decl.mandant_ID + telotec.Referenz_ID = decl.interfaceReferenceId + telotec.dec_CreatePersonalID = decl.erstellPersonalID + telotec.dec_CreateDate = decl.erstellDatum + telotec.dec_Template_ID = decl.template_ID + telotec.dec_TotNet = decl.totNet + telotec.dec_TotNetSplit_IND = decl.totNetSplit_IND + telotec.dec_FillPackList_IND = decl.fillPackList_IND + telotec.dec_Memo = decl.memo + + telotec.Hea_DecTy = decl.declarationType + telotec.Hea_Simp = decl.reducedDatasetIndicator + telotec.Hea_DecDT = decl.declarationAcceptanceDate + telotec.Hea_WoffD = decl.writeOffDate + telotec.Hea_AccDT = decl.declarationAcceptanceDate + telotec.Hea_ProArrDT = decl.presentationOfTheGoodsDateAndTime + telotec.Hea_PlaDepDT = decl.presentationOfTheGoodsDateAndTime + telotec.Hea_TotGross = decl.grossMass + ' telotec.Hea_PayMet = decl.methodOfPayment int erw + telotec.Hea_SecInd = decl.security + telotec.Hea_DestLNG = decl.countryOfDestination + telotec.Hea_DepLNG = decl.countryOfDispatch + telotec.Transp_InMo = decl.inlandModeOfTransport + telotec.Transp_BordMo = decl.modeOfTransportAtTheBorder + telotec.Transp_ContInd = decl.containerIndicator + telotec.Transp_DepIdnt = SafeFirst(decl.departureTransportMeans, Function(dt) dt.identificationNumber) + telotec.Transp_DepNat = SafeFirst(decl.departureTransportMeans, Function(dt) dt.nationality) + + ' Consignor/Consignee + telotec.ConorTra_Na = SafeGetName(decl.consignor) + 'telotec.ConorTra_Strt = decl.consignor.streetAndNumber + 'telotec.ConorTra_Pst = decl.consignor?.postcode + 'telotec.ConorTra_Cty = decl.consignor?.city + 'telotec.ConorTra_Ctry = decl.consignor?.country + telotec.ConorTra_TIN = decl.consignor?.identificationNumber + + telotec.ConeeTra_Na = SafeGetName(decl.consignee) + telotec.ConeeTra_Strt = decl.consignee?.streetAndNumber + telotec.ConeeTra_Pst = decl.consignee?.postcode + telotec.ConeeTra_Cty = decl.consignee?.city + telotec.ConeeTra_Ctry = decl.consignee?.country + telotec.ConeeTra_TIN = decl.consignee?.identificationNumber + + telotec.Represent_Na = decl.representative?.contactPersonName + telotec.Represent_RIN = decl.representative?.identificationNumber + + telotec.Locs_Disp = decl.countryOfDispatch + telotec.Locs_Dest = decl.countryOfDestination + telotec.Locs_GdsLoc = decl.locationOfGoods_PlaceOfGoods + telotec.Locs_GdsLocCd = decl.locationOfGoods_CustomsOffice + + ' HouseConsignments inkl. ConsignmentItems und Packaging + 'If decl.houseConsignment IsNot Nothing Then + ' telotec.HouseConsignments = New List(Of cTelotec_Positionsdaten)() + ' For Each hc In decl.houseConsignment + ' Dim newHc As New cTelotec_HouseConsignment() + ' newHc.CountryOfDispatch = hc.countryOfDispatch + ' newHc.CountryOfDestination = hc.countryOfDestination + ' newHc.GrossMass = hc.grossMass + ' newHc.ReferenceNumberUCR = hc.referenceNumberUCR + ' newHc.MethodOfPayment = hc.methodOfPayment + + ' If hc.consignmentItem IsNot Nothing Then + ' newHc.ConsignmentItems = New List(Of cTelotec_ConsignmentItem)() + ' For Each item In hc.consignmentItem + ' Dim newItem As New cTelotec_ConsignmentItem() + ' newItem.GoodsItemNumber = item.goodsItemNumber + ' newItem.DeclarationGoodsItemNumber = item.declarationGoodsItemNumber + ' newItem.DeclarationType = item.declarationType + ' newItem.CountryOfDispatch = item.countryOfDispatch + ' newItem.CountryOfDestination = item.countryOfDestination + ' newItem.DescriptionOfGoods = item.descriptionOfGoods + ' newItem.GrossMass = item.grossMass + ' newItem.NetMass = item.netMass + ' newItem.MethodOfPayment = item.methodOfPayment + ' newItem.ReferenceNumberUCR = item.referenceNumberUCR + + ' If item.packaging IsNot Nothing Then + ' newItem.Packaging = New List(Of cTelotec_Packaging)() + ' For Each pack In item.packaging + ' Dim newPack As New cTelotec_Packaging() + ' newPack.TypeOfPackages = pack.typeOfPackages + ' newPack.NumberOfPackages = pack.numberOfPackages + ' newPack.ShippingMarks = pack.shippingMarks + ' newItem.Packaging.Add(newPack) + ' Next + ' End If + + ' newHc.ConsignmentItems.Add(newItem) + ' Next + ' End If + + ' telotec.HouseConsignments.Add(newHc) + ' Next + 'End If + End If + End With + + telotec.telanm_LetzteBearbeitung = Now + telotec.telanm_Erstellung = Now + telotec.telanm_Erstellung_SB = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + telotec.telanm_LetzteBearbeitung_SB = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + telotec.ComIndicator = True + telotec.initData() + + Return telotec + End Function + + Private Shared Function SafeFirst(Of T, R)(list As List(Of T), selector As Func(Of T, R)) As R + If list Is Nothing OrElse list.Count = 0 Then Return Nothing + Return selector(list(0)) + End Function + + Private Shared Function SafeGetName(party As Object) As String + If party Is Nothing Then Return Nothing + Return If(party?.consignorName, party?.consigneeName, "") + End Function + End Class @@ -1971,5 +2104,7 @@ Public Class cTelotec_PositionsdatenDokumente Return "" End Function + + End Class diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index f045870..591b232 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -24,6 +24,9 @@ Partial Class usrctlProcedures Private Sub InitializeComponent() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.Label16 = New System.Windows.Forms.Label() + Me.txtHMRCApplName = New System.Windows.Forms.TextBox() + Me.Button44 = New System.Windows.Forms.Button() Me.CheckBox6 = New System.Windows.Forms.CheckBox() Me.TextBox15 = New System.Windows.Forms.TextBox() Me.Button37 = New System.Windows.Forms.Button() @@ -75,6 +78,12 @@ Partial Class usrctlProcedures Me.Label1 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() Me.tbxLog = New System.Windows.Forms.TextBox() + Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.Button46 = New System.Windows.Forms.Button() + Me.tctModalTEstLRN = New System.Windows.Forms.TextBox() + Me.Button45 = New System.Windows.Forms.Button() + Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.Button47 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() Me.TextBox1 = New System.Windows.Forms.TextBox() Me.lblAnzahl = New System.Windows.Forms.Label() @@ -125,9 +134,10 @@ Partial Class usrctlProcedures Me.Button32 = New System.Windows.Forms.Button() Me.lblStatus = New System.Windows.Forms.Label() Me.Button33 = New System.Windows.Forms.Button() + Me.Button43 = New System.Windows.Forms.Button() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Button43 = New System.Windows.Forms.Button() + Me.Button48 = New System.Windows.Forms.Button() Me.TabControl1.SuspendLayout() Me.TabPage3.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -135,6 +145,8 @@ Partial Class usrctlProcedures Me.GroupBox1.SuspendLayout() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage2.SuspendLayout() + Me.TabPage4.SuspendLayout() + Me.TabPage5.SuspendLayout() Me.SuspendLayout() ' 'TabControl1 @@ -142,6 +154,8 @@ Partial Class usrctlProcedures Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage2) + Me.TabControl1.Controls.Add(Me.TabPage4) + Me.TabControl1.Controls.Add(Me.TabPage5) Me.TabControl1.Location = New System.Drawing.Point(7, 407) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 @@ -150,6 +164,9 @@ Partial Class usrctlProcedures ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.Label16) + Me.TabPage3.Controls.Add(Me.txtHMRCApplName) + Me.TabPage3.Controls.Add(Me.Button44) Me.TabPage3.Controls.Add(Me.CheckBox6) Me.TabPage3.Controls.Add(Me.TextBox15) Me.TabPage3.Controls.Add(Me.Button37) @@ -171,6 +188,31 @@ Partial Class usrctlProcedures Me.TabPage3.Text = "TabPage3" Me.TabPage3.UseVisualStyleBackColor = True ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Location = New System.Drawing.Point(434, 58) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(169, 13) + Me.Label16.TabIndex = 80 + Me.Label16.Text = "fremde HMRC Application (Name):" + ' + 'txtHMRCApplName + ' + Me.txtHMRCApplName.Location = New System.Drawing.Point(437, 71) + Me.txtHMRCApplName.Name = "txtHMRCApplName" + Me.txtHMRCApplName.Size = New System.Drawing.Size(159, 20) + Me.txtHMRCApplName.TabIndex = 79 + ' + 'Button44 + ' + Me.Button44.Location = New System.Drawing.Point(437, 9) + Me.Button44.Name = "Button44" + Me.Button44.Size = New System.Drawing.Size(159, 49) + Me.Button44.TabIndex = 78 + Me.Button44.Text = "HMRC TOKEN" + Me.Button44.UseVisualStyleBackColor = True + ' 'CheckBox6 ' Me.CheckBox6.AutoSize = True @@ -647,6 +689,66 @@ Partial Class usrctlProcedures Me.tbxLog.Size = New System.Drawing.Size(380, 380) Me.tbxLog.TabIndex = 4 ' + 'TabPage4 + ' + Me.TabPage4.Controls.Add(Me.Button46) + Me.TabPage4.Controls.Add(Me.tctModalTEstLRN) + Me.TabPage4.Controls.Add(Me.Button45) + Me.TabPage4.Location = New System.Drawing.Point(4, 22) + Me.TabPage4.Name = "TabPage4" + Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage4.Size = New System.Drawing.Size(601, 288) + Me.TabPage4.TabIndex = 3 + Me.TabPage4.Text = "MODAL" + Me.TabPage4.UseVisualStyleBackColor = True + ' + 'Button46 + ' + Me.Button46.Location = New System.Drawing.Point(221, 42) + Me.Button46.Name = "Button46" + Me.Button46.Size = New System.Drawing.Size(145, 49) + Me.Button46.TabIndex = 67 + Me.Button46.Text = "NCTS TEST Senden" + Me.Button46.UseVisualStyleBackColor = True + ' + 'tctModalTEstLRN + ' + Me.tctModalTEstLRN.Location = New System.Drawing.Point(24, 16) + Me.tctModalTEstLRN.Name = "tctModalTEstLRN" + Me.tctModalTEstLRN.Size = New System.Drawing.Size(145, 20) + Me.tctModalTEstLRN.TabIndex = 66 + Me.tctModalTEstLRN.Text = "LRN" + ' + 'Button45 + ' + Me.Button45.Location = New System.Drawing.Point(24, 42) + Me.Button45.Name = "Button45" + Me.Button45.Size = New System.Drawing.Size(145, 49) + Me.Button45.TabIndex = 16 + Me.Button45.Text = "IMPORT TEST Senden" + Me.Button45.UseVisualStyleBackColor = True + ' + 'TabPage5 + ' + Me.TabPage5.Controls.Add(Me.Button48) + Me.TabPage5.Controls.Add(Me.Button47) + Me.TabPage5.Location = New System.Drawing.Point(4, 22) + Me.TabPage5.Name = "TabPage5" + Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage5.Size = New System.Drawing.Size(601, 288) + Me.TabPage5.TabIndex = 4 + Me.TabPage5.Text = "Teleotec" + Me.TabPage5.UseVisualStyleBackColor = True + ' + 'Button47 + ' + Me.Button47.Location = New System.Drawing.Point(20, 24) + Me.Button47.Name = "Button47" + Me.Button47.Size = New System.Drawing.Size(145, 49) + Me.Button47.TabIndex = 62 + Me.Button47.Text = "getTAD" + Me.Button47.UseVisualStyleBackColor = True + ' 'Button18 ' Me.Button18.Location = New System.Drawing.Point(59, 183) @@ -1107,6 +1209,15 @@ Partial Class usrctlProcedures Me.Button33.Text = "DAKOSY CSV Importieren" Me.Button33.UseVisualStyleBackColor = True ' + 'Button43 + ' + Me.Button43.Location = New System.Drawing.Point(694, 29) + Me.Button43.Name = "Button43" + Me.Button43.Size = New System.Drawing.Size(145, 49) + Me.Button43.TabIndex = 65 + Me.Button43.Text = "TELOTEC NCTS" + Me.Button43.UseVisualStyleBackColor = True + ' 'DataGridViewTextBoxColumn1 ' Me.DataGridViewTextBoxColumn1.HeaderText = "dat" @@ -1117,14 +1228,14 @@ Partial Class usrctlProcedures Me.DataGridViewTextBoxColumn2.HeaderText = "anz" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'Button43 + 'Button48 ' - Me.Button43.Location = New System.Drawing.Point(694, 29) - Me.Button43.Name = "Button43" - Me.Button43.Size = New System.Drawing.Size(145, 49) - Me.Button43.TabIndex = 65 - Me.Button43.Text = "TELOTEC NCTS" - Me.Button43.UseVisualStyleBackColor = True + Me.Button48.Location = New System.Drawing.Point(209, 24) + Me.Button48.Name = "Button48" + Me.Button48.Size = New System.Drawing.Size(145, 49) + Me.Button48.TabIndex = 63 + Me.Button48.Text = "getTAD File" + Me.Button48.UseVisualStyleBackColor = True ' 'usrctlProcedures ' @@ -1195,6 +1306,9 @@ Partial Class usrctlProcedures CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage2.ResumeLayout(False) Me.TabPage2.PerformLayout() + Me.TabPage4.ResumeLayout(False) + Me.TabPage4.PerformLayout() + Me.TabPage5.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -1305,4 +1419,14 @@ Partial Class usrctlProcedures Friend WithEvents Button37 As Button Friend WithEvents CheckBox6 As CheckBox Friend WithEvents Button43 As Button + Friend WithEvents Button44 As Button + Friend WithEvents Label16 As Label + Friend WithEvents txtHMRCApplName As TextBox + Friend WithEvents TabPage4 As TabPage + Friend WithEvents tctModalTEstLRN As TextBox + Friend WithEvents Button45 As Button + Friend WithEvents Button46 As Button + Friend WithEvents TabPage5 As TabPage + Friend WithEvents Button47 As Button + Friend WithEvents Button48 As Button End Class diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 0765640..4c0f7bc 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -18,6 +18,8 @@ Imports System.Data.OleDb Imports Chilkat Imports TELOTEC_Worker Imports GrapeCity +Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN.cTelotecAPI 'Imports Microsoft.Office.Interop Public Class usrctlProcedures @@ -3898,6 +3900,73 @@ Public Class usrctlProcedures End Try End Sub + Private Sub Button44_Click(sender As Object, e As EventArgs) Handles Button44.Click + Dim TOKENNAME = InputBox("Bitte Token-Bezeichnung angeben:") + If TOKENNAME <> "" Then + Dim TOKEN = cHMRC.getTOKEN("ENS", True, TOKENNAME, txtHMRCApplName.Text) + MsgBox("REFRESH_TOKEN: " & TOKEN.token_REFRESH_TOKEN & vbNewLine & "BEARER_TOKEN: " & TOKEN.token_BEARER_TOKEN) + End If + + + End Sub + + Private Sub Button45_Click(sender As Object, e As EventArgs) Handles Button45.Click + VERAG_PROG_ALLGEMEIN.cModalTransIMPORT.CreateAndSendMinimalImportDeclaration(tctModalTEstLRN.Text) + End Sub + + Private Sub Button46_Click(sender As Object, e As EventArgs) Handles Button46.Click + VERAG_PROG_ALLGEMEIN.cModalTransNCTS.TestNCTSSend() + + End Sub + + Private Sub Button47_Click(sender As Object, e As EventArgs) Handles Button47.Click + Dim TELO As New VERAG_PROG_ALLGEMEIN.cTelotecAPI + + Dim messages As List(Of VERAG_PROG_ALLGEMEIN.cTelotecAPI.TAMessage) = TELO.GetTAMessages() + + + MsgBox(messages.Count) + + For Each mmm In messages + MsgBox(mmm.lrn) + MsgBox(mmm.declarationContent.anmeldedatum) + Next + End Sub + + Private Sub Button48_Click(sender As Object, e As EventArgs) Handles Button48.Click + Dim TELO As New VERAG_PROG_ALLGEMEIN.cTelotecAPI + + Dim messages As New List(Of TAMessage)() + + Using ofd As New OpenFileDialog() + ofd.Title = "Wähle eine JSON-Datei mit TA-Nachrichten" + ofd.InitialDirectory = "\\datenarchiv\Datenarchiv\TELOTEC\ECHTSYSTEM\Nachrichtendaten_Ablage_JSON\" + ofd.Filter = "JSON-Dateien (*.json)|*.json|Alle Dateien (*.*)|*.*" + + If ofd.ShowDialog() = DialogResult.OK Then + Dim selectedPath As String = ofd.FileName + messages = TELO.ParseTAMessagesFromFile(selectedPath) + + + MsgBox(messages.Count) + + For Each mmm In messages + MsgBox(mmm.lrn) + Dim TELO_ANM = TELOTEC_Worker.cTelotec_Anmeldung.ConvertTAMessageToTelotec(mmm) + If TELO_ANM.SAVE() Then + MsgBox("SUSSSSS") + End If + + Next + + Else + Console.WriteLine("🔕 Keine Datei ausgewählt.") + End If + End Using + + + End Sub + 'Private Sub Button26_Click(sender As Object, e As EventArgs) ' For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019") diff --git a/initATLASAufschubkonten/cWorker_NCTS.vb b/initATLASAufschubkonten/cWorker_NCTS.vb index 13364e5..3b3c14b 100644 --- a/initATLASAufschubkonten/cWorker_NCTS.vb +++ b/initATLASAufschubkonten/cWorker_NCTS.vb @@ -4154,12 +4154,17 @@ Public Class cWorker_NCTS End If End Sub - Shared Sub checkATEZIRU_Bereitstellung(DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, filePath As String) + Shared Sub checkATEZIRU_Bereitstellung(DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, filePath As String, Optional Division3 As String = "") If DY_TMP Is Nothing Then Exit Sub - 'Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(DY_TMP.dy_BezugsNr) - If (DY_TMP.dy_BezugsNr.Contains("IRU0")) Then - ' Dim fio As New IO.FileInfo(filePath) - ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) + + checkATEZIRU_BereitstellungBezugsNr(DY_TMP.dy_BezugsNr, filePath, Division3) + + End Sub + + Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String, Optional Division3 As String = "") + If dy_BezugsNr = "" Then Exit Sub + + If (dy_BezugsNr.Contains("IRU0")) OrElse Division3 = "IRU" Then Try @@ -4170,32 +4175,15 @@ Public Class cWorker_NCTS End If Dim F As New System.IO.FileInfo(filePath) - ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) - - 'Dim DY_server = "91.93.197.91" - 'Dim DY_name = "Verag" - 'Dim DY_pwd = "5P1PYOr1" - ''Dim DY_name = "Verag-test" - ''Dim DY_pwd = "A1ZDTK99" - 'Dim DY_port = "22" - 'Dim DY_PFAD_IN = "" - 'Dim DY_PFAD_IN_KD = "" - - Dim DY_server = "sftp-01.singlewindow.io" Dim DY_name = "VERAG" Dim DY_pwd = "5P1PYOr1" - 'Dim DY_name = "Verag-test" - 'Dim DY_pwd = "A1ZDTK99" Dim DY_port = "22" - 'Dim DY_PFAD_IN = "/TIR/DE/OUT" Dim DY_PFAD_IN = "/" Dim DY_PFAD_IN_KD = "" If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then DY_server = "sftp-01.singlewindow.io" - 'DY_name = "IRU-TEST" - 'DY_pwd = "T1AF58OP" DY_name = "VERAG-TEST" DY_pwd = "A1ZDTK99" End If @@ -4223,6 +4211,8 @@ Public Class cWorker_NCTS End If End Sub + + Shared Sub checkATEZ_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String) If dy_BezugsNr = "" Then Exit Sub Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr) @@ -4235,63 +4225,63 @@ Public Class cWorker_NCTS ' End If End If End Sub - Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String) - If dy_BezugsNr = "" Then Exit Sub - Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr) - If (dy_BezugsNr.Contains("IRU0")) Then - ' Dim fio As New IO.FileInfo(filePath) - ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) + 'Shared Sub checkATEZIRU_BereitstellungBezugsNr(dy_BezugsNr As String, filePath As String) + ' If dy_BezugsNr = "" Then Exit Sub + ' Dim ATEZ = VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_DATA.LOAD_ByBezugsNr(dy_BezugsNr) + ' If (dy_BezugsNr.Contains("IRU0")) Then + ' ' Dim fio As New IO.FileInfo(filePath) + ' ' FileCopy(filePath, "\\ftps.verag.ag\FTP\ATEZ\OUT\" & fio.Name.Replace("lock_", "")) - Try + ' Try - If Not System.IO.File.Exists(filePath) Then + ' If Not System.IO.File.Exists(filePath) Then - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). File existert nicht.", "" & vbNewLine & "Datei: " & filePath, System.Reflection.MethodInfo.GetCurrentMethod.Name) - Exit Sub - End If - Dim F As New System.IO.FileInfo(filePath) + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). File existert nicht.", "" & vbNewLine & "Datei: " & filePath, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' Exit Sub + ' End If + ' Dim F As New System.IO.FileInfo(filePath) - 'Dim DY_server = "91.93.197.91" - 'Dim DY_name = "Verag" - 'Dim DY_pwd = "5P1PYOr1" - ''Dim DY_name = "Verag-test" - ''Dim DY_pwd = "A1ZDTK99" - 'Dim DY_port = "22" - 'Dim DY_PFAD_IN = "" - 'Dim DY_PFAD_IN_KD = "" + ' 'Dim DY_server = "91.93.197.91" + ' 'Dim DY_name = "Verag" + ' 'Dim DY_pwd = "5P1PYOr1" + ' ''Dim DY_name = "Verag-test" + ' ''Dim DY_pwd = "A1ZDTK99" + ' 'Dim DY_port = "22" + ' 'Dim DY_PFAD_IN = "" + ' 'Dim DY_PFAD_IN_KD = "" - Dim DY_server = "sftp-01.singlewindow.io" - Dim DY_name = "IRU-TEST" - Dim DY_pwd = "T1AF58OP" - 'Dim DY_name = "Verag-test" - 'Dim DY_pwd = "A1ZDTK99" - Dim DY_port = "22" - Dim DY_PFAD_IN = "/TIR/DE/OUT" - Dim DY_PFAD_IN_KD = "" + ' Dim DY_server = "sftp-01.singlewindow.io" + ' Dim DY_name = "IRU-TEST" + ' Dim DY_pwd = "T1AF58OP" + ' 'Dim DY_name = "Verag-test" + ' 'Dim DY_pwd = "A1ZDTK99" + ' Dim DY_port = "22" + ' Dim DY_PFAD_IN = "/TIR/DE/OUT" + ' Dim DY_PFAD_IN_KD = "" - 'getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY) + ' 'getSFTPLoginData(DY_server, DY_name, DY_pwd, DY_port, DY_PFAD_IN, "", DY_PFAD_IN_KD, FRIMA_DY) - Dim ConnectionInfo As New Renci.SshNet.ConnectionInfo(DY_server, DY_port, DY_name, New Renci.SshNet.PasswordAuthenticationMethod(DY_name, DY_pwd)) - Using client = New Renci.SshNet.SftpClient(ConnectionInfo) - client.Connect() - If DY_PFAD_IN <> "" Then client.ChangeDirectory(DY_PFAD_IN) - Using uplfileStream = System.IO.File.OpenRead(filePath) - client.UploadFile(uplfileStream, "." & F.Name, True) - client.RenameFile("." & F.Name, F.Name) - End Using - client.Disconnect() - End Using + ' Dim ConnectionInfo As New Renci.SshNet.ConnectionInfo(DY_server, DY_port, DY_name, New Renci.SshNet.PasswordAuthenticationMethod(DY_name, DY_pwd)) + ' Using client = New Renci.SshNet.SftpClient(ConnectionInfo) + ' client.Connect() + ' If DY_PFAD_IN <> "" Then client.ChangeDirectory(DY_PFAD_IN) + ' Using uplfileStream = System.IO.File.OpenRead(filePath) + ' client.UploadFile(uplfileStream, "." & F.Name, True) + ' client.RenameFile("." & F.Name, F.Name) + ' End Using + ' client.Disconnect() + ' End Using - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). " & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - Exit Sub - End Try + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Senden an ATEZ FTP (IRU-NCTS-File). " & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' Exit Sub + ' End Try - End If - End Sub + ' End If + 'End Sub Shared Sub checkATEZ_Bereitstellung_VBD(dy_BezugsNr As String, filePath As String) diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index 9cb8126..d113060 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -454,7 +454,6 @@ Public Class frmDYNachrichtenVerarbeitung 'AES/EZA: Wiedervorlage zur Ausfuhr If Not found And cGetMsgType.isAES_E_EXP_FUP_DEXPFE(doc) Then - MsgBox("HALLLO") If readAES_E_EXP_FUP_DEXPFE(doc) <> "" Then found = True End If diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 0f7b045..9d950cc 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -25,6 +25,8 @@ Partial Class frmStartOptions Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions)) Me.pnl = New System.Windows.Forms.Panel() + 'Me.LinkLabel73 = New System.Windows.Forms.LinkLabel() + 'Me.Button27 = New System.Windows.Forms.Button() Me.txtMRNPrefix = New System.Windows.Forms.TextBox() Me.ATCNRinRE = New System.Windows.Forms.LinkLabel() Me.PictureBox24 = New System.Windows.Forms.PictureBox() @@ -145,6 +147,7 @@ Partial Class frmStartOptions Me.PictureBox15 = New System.Windows.Forms.PictureBox() Me.PictureBox14 = New System.Windows.Forms.PictureBox() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.MyTextBox06 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.CheckBox9 = New System.Windows.Forms.CheckBox() Me.Label49 = New System.Windows.Forms.Label() Me.Button28 = New System.Windows.Forms.Button() @@ -274,6 +277,8 @@ Partial Class frmStartOptions Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() + Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() + ' Me.Label050 = New System.Windows.Forms.Label() Me.Button21 = New System.Windows.Forms.Button() Me.cbxPloseNeu = New System.Windows.Forms.CheckBox() Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -354,6 +359,8 @@ Partial Class frmStartOptions ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + 'Me.pnl.Controls.Add(Me.LinkLabel73) + 'Me.pnl.Controls.Add(Me.Button27) Me.pnl.Controls.Add(Me.txtMRNPrefix) Me.pnl.Controls.Add(Me.ATCNRinRE) Me.pnl.Controls.Add(Me.PictureBox24) @@ -433,9 +440,32 @@ Partial Class frmStartOptions Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1229, 920) + Me.pnl.Size = New System.Drawing.Size(1229, 970) Me.pnl.TabIndex = 0 ' + 'LinkLabel73 + ' + 'Me.LinkLabel73.AutoSize = True + 'Me.LinkLabel73.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + 'Me.LinkLabel73.Location = New System.Drawing.Point(1023, 173) + 'Me.LinkLabel73.Name = "LinkLabel73" + 'Me.LinkLabel73.Size = New System.Drawing.Size(176, 13) + 'Me.LinkLabel73.TabIndex = 160 + 'Me.LinkLabel73.TabStop = True + 'Me.LinkLabel73.Text = "Rechnungsdetaildaten aktualisieren" + ' + 'Button27 + ' + 'Me.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat + 'Me.Button27.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + 'Me.Button27.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + 'Me.Button27.Location = New System.Drawing.Point(1076, 386) + 'Me.Button27.Name = "Button27" + 'Me.Button27.Size = New System.Drawing.Size(123, 24) + 'Me.Button27.TabIndex = 161 + 'Me.Button27.Text = "Test Err Mail" + 'Me.Button27.UseVisualStyleBackColor = True + ' 'txtMRNPrefix ' Me.txtMRNPrefix.Location = New System.Drawing.Point(1036, 48) @@ -946,7 +976,7 @@ Partial Class frmStartOptions Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Bottom - Me.tbcntr.Location = New System.Drawing.Point(0, 416) + Me.tbcntr.Location = New System.Drawing.Point(0, 466) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 Me.tbcntr.Size = New System.Drawing.Size(1227, 502) @@ -1017,7 +1047,7 @@ Partial Class frmStartOptions ' Me.LinkLabel68.AutoSize = True Me.LinkLabel68.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel68.Location = New System.Drawing.Point(18, 393) + Me.LinkLabel68.Location = New System.Drawing.Point(743, 32) Me.LinkLabel68.Name = "LinkLabel68" Me.LinkLabel68.Size = New System.Drawing.Size(127, 13) Me.LinkLabel68.TabIndex = 151 @@ -1028,7 +1058,7 @@ Partial Class frmStartOptions ' Me.PictureBox26.BackgroundImage = CType(resources.GetObject("PictureBox26.BackgroundImage"), System.Drawing.Image) Me.PictureBox26.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox26.Location = New System.Drawing.Point(837, 32) + Me.PictureBox26.Location = New System.Drawing.Point(876, 32) Me.PictureBox26.Name = "PictureBox26" Me.PictureBox26.Size = New System.Drawing.Size(18, 18) Me.PictureBox26.TabIndex = 141 @@ -1842,6 +1872,7 @@ Partial Class frmStartOptions ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.MyTextBox06) Me.TabPage3.Controls.Add(Me.CheckBox9) Me.TabPage3.Controls.Add(Me.Label49) Me.TabPage3.Controls.Add(Me.Button28) @@ -1874,6 +1905,31 @@ Partial Class frmStartOptions Me.TabPage3.Text = "Partner-Systeme" Me.TabPage3.UseVisualStyleBackColor = True ' + 'MyTextBox06 + ' + Me.MyTextBox06._DateTimeOnly = False + Me.MyTextBox06._numbersOnly = False + Me.MyTextBox06._numbersOnlyKommastellen = "" + Me.MyTextBox06._numbersOnlyTrennzeichen = False + Me.MyTextBox06._Prozent = False + Me.MyTextBox06._ShortDateNew = False + Me.MyTextBox06._ShortDateOnly = False + Me.MyTextBox06._TimeOnly = False + Me.MyTextBox06._TimeOnly_Seconds = False + Me.MyTextBox06._value = "200" + Me.MyTextBox06._Waehrung = False + Me.MyTextBox06._WaehrungZeichen = False + Me.MyTextBox06.ForeColor = System.Drawing.Color.Black + Me.MyTextBox06.Location = New System.Drawing.Point(583, 302) + Me.MyTextBox06.MaxLength = 18 + Me.MyTextBox06.MaxLineLength = -1 + Me.MyTextBox06.MaxLines_Warning = "" + Me.MyTextBox06.MaxLines_Warning_Label = Nothing + Me.MyTextBox06.Name = "MyTextBox06" + Me.MyTextBox06.Size = New System.Drawing.Size(150, 20) + Me.MyTextBox06.TabIndex = 148 + Me.MyTextBox06.Text = "200" + ' 'CheckBox9 ' Me.CheckBox9.AutoSize = True @@ -2252,12 +2308,11 @@ Partial Class frmStartOptions 'Label50 ' Me.Label50.AutoSize = True - Me.Label50.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label50.Location = New System.Drawing.Point(728, 124) + Me.Label50.Location = New System.Drawing.Point(548, 305) Me.Label50.Name = "Label50" - Me.Label50.Size = New System.Drawing.Size(27, 13) - Me.Label50.TabIndex = 163 - Me.Label50.Text = "Jahr" + Me.Label50.Size = New System.Drawing.Size(29, 13) + Me.Label50.TabIndex = 149 + Me.Label50.Text = "Top:" ' 'UTAREPdf ' @@ -4155,7 +4210,7 @@ Partial Class frmStartOptions Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1229, 920) + Me.ClientSize = New System.Drawing.Size(1229, 970) Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -4248,6 +4303,7 @@ Partial Class frmStartOptions Friend WithEvents PictureBox12 As PictureBox Friend WithEvents LinkLabel20 As LinkLabel Friend WithEvents MyTextBox1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents MyTextBox06 As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label3 As Label Friend WithEvents CheckBox1 As CheckBox Friend WithEvents cbxBu As CheckBox diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 23a72d3..659f040 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -2419,6 +2419,8 @@ Public Class frmStartOptions 'IO.Directory.CreateDirectory(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\TEST3\" & betreff.ToString.Replace(",", "")) + betreff = betreff.replace("*00*", "") + If betreff.ToString.Contains("VBD - Versandbegleitdokument (DE), ") Then Dim found = False betreff = betreff.replace("WG: ", "") @@ -5629,9 +5631,9 @@ weiter: ' Dim dt = (New SQL).loadDgvBySql("SELECT TOP (1000) [ncts_Id] FROM [tblNCTS_FREMD] where ncts_Partnersystem='ATEZ' and ncts_status < 60", "FMZOLL") Dim top = 200 - 'If IsNumeric(MyTextBox6._value) AndAlso CInt(MyTextBox6._value) > 0 Then - ' top = CInt(MyTextBox6._value) - 'End If + If IsNumeric(MyTextBox06._value) AndAlso CInt(MyTextBox06._value) > 0 Then + top = CInt(MyTextBox06._value) + End If updateATEZStatusByMRNTop(top) End Sub @@ -5857,6 +5859,10 @@ weiter: End Sub + 'Private Sub Button27_Click_1(sender As Object, e As EventArgs) Handles Button27.Click + ' cErrorHandler.sendERRORperMail(My.Application.Info.AssemblyName, "TEST", "", "error@verag.ag", "", "Error_Test") + 'End Sub + Private Sub LinkLabel52_LinkClicked_1(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel52.LinkClicked If txtPloseJahr.Text.ToString.Length <> 4 Then MsgBox("Bitte Jahr eingeben!") : Exit Sub