From ea594e66e57d150a8a1c601c6925e8cd9b84d6e4 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 23 Aug 2019 16:28:14 +0200 Subject: [PATCH] X --- UID/usrctlProcedures.Designer.vb | 8 +- UID/usrctlProcedures.vb | 22 ++++ .../EZollAufschubEinlesen.vb | 49 ++++---- .../frmDYNachrichtenVerarbeitung.vb | 114 +++++++++--------- .../frmStartOptions.Designer.vb | 57 +++++---- initATLASAufschubkonten/frmStartOptions.vb | 54 +++++++++ .../frmTCNachrichtenVerarbeitung.vb | 1 + 7 files changed, 203 insertions(+), 102 deletions(-) diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index 269b538..d0efbcb 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class usrctlProcedures Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class usrctlProcedures 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() @@ -377,7 +377,7 @@ Partial Class usrctlProcedures Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(882, 161) + Me.TabPage2.Size = New System.Drawing.Size(601, 161) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "TEST" Me.TabPage2.UseVisualStyleBackColor = True diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index dcb1377..9646377 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -2363,6 +2363,28 @@ Public Class usrctlProcedures VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = test 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") + Dim fi As New FileInfo(d) + If fi.Name >= 20190615 Then + + + For Each f In System.IO.Directory.GetFiles(d) + If cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlungXML(doc) Then + + End If + Next + + + + + + End If + + Next + + End Sub End Class diff --git a/initATLASAufschubkonten/EZollAufschubEinlesen.vb b/initATLASAufschubkonten/EZollAufschubEinlesen.vb index 5d99a41..e946bae 100644 --- a/initATLASAufschubkonten/EZollAufschubEinlesen.vb +++ b/initATLASAufschubkonten/EZollAufschubEinlesen.vb @@ -18,39 +18,46 @@ Public Class EZollAufschubEinlesen If Not ABGABEN.hasEntry Then Dim LeistungsNr = "" Dim LeistungsBez = "" + + Dim saveAbgaben = True Select Case d1.Abgabenart Case "2EU", "2IG", "2PE", "5EU" LeistungsNr = "20" - Case "5EV", "B00" 'EV-KONTO!! + Case "B00" 'EUST LeistungsNr = "20" ABGABEN.Status = "A" 'AUSGEBUCHT + Case "5EV" '"5EV"--> EV-KONTO!! + saveAbgaben = False Case "2DU", "5DU", "5ZO", "5ZZ", "A20", "A30", "A35", "A40", "A45", "C00", "C10", "A00" LeistungsNr = "76" Case Else '1BD,0ML, 0PB, 0PG, 0PS, 1LG, 1ZN, 2AS, 2KO, 2RB, 2SB, 2SI, 2VF, 2VS, 5SI, 5VS, 6AK, 6BE, 6MS, 6SS, 6TS, 6ZW, 9EA, D00,D10,E00 LeistungsNr = "482" LeistungsBez = getLeistungsBez(d1.Abgabenart) End Select - ABGABEN.Belegart = d1.Abgabenart - ABGABEN.Betrag = CDbl(d1.Betrag) - ABGABEN.Status = Nothing - ABGABEN.LeistungsNr = LeistungsNr - ABGABEN.Bezugsnummer = d1.LRN - ABGABEN.Registriernummer = d1.CRN - ' ABGABEN.AOFD = A.KennBuchstabenAufschub - ABGABEN.AKTO = d1.Abgabenkonto - 'ABGABEN.Fälligkeitsdatum = A.Faelligkeit - ' ABGABEN.Mandant = "VERG" - ABGABEN.Niederlassung = d1.OperatorId - ABGABEN.Abfertigungsdatum = d1.Datum - ABGABEN.Übernahmedatum = d1.Datum - ABGABEN.Eingabedatum = Now.ToShortDateString - ABGABEN.Sachbearbeiter = "AUTO" - ABGABEN.LeistungsBez = LeistungsBez - If If(ABGABEN.Bezugsnummer, "").ToString.Length > 35 Then ABGABEN.Bezugsnummer = ABGABEN.Bezugsnummer.ToString.Substring(0, 35) - If If(ABGABEN.Registriernummer, "").ToString.Length > 21 Then ABGABEN.Registriernummer = ABGABEN.Registriernummer.ToString.Substring(0, 21) + If saveAbgaben Then - Dim errHInweis = "ATC: " & ABGABEN.Registriernummer & " - BezugsNr: " & ABGABEN.Bezugsnummer - ABGABEN.SAVE(errHInweis) + ABGABEN.Belegart = d1.Abgabenart + ABGABEN.Betrag = CDbl(d1.Betrag) + ABGABEN.Status = Nothing + ABGABEN.LeistungsNr = LeistungsNr + ABGABEN.Bezugsnummer = d1.LRN + ABGABEN.Registriernummer = d1.CRN + ' ABGABEN.AOFD = A.KennBuchstabenAufschub + ABGABEN.AKTO = d1.Abgabenkonto + 'ABGABEN.Fälligkeitsdatum = A.Faelligkeit + ' ABGABEN.Mandant = "VERG" + ABGABEN.Niederlassung = d1.OperatorId + ABGABEN.Abfertigungsdatum = d1.Datum + ABGABEN.Übernahmedatum = d1.Datum + ABGABEN.Eingabedatum = Now.ToShortDateString + ABGABEN.Sachbearbeiter = "AUTO" + ABGABEN.LeistungsBez = LeistungsBez + If If(ABGABEN.Bezugsnummer, "").ToString.Length > 35 Then ABGABEN.Bezugsnummer = ABGABEN.Bezugsnummer.ToString.Substring(0, 35) + If If(ABGABEN.Registriernummer, "").ToString.Length > 21 Then ABGABEN.Registriernummer = ABGABEN.Registriernummer.ToString.Substring(0, 21) + + Dim errHInweis = "ATC: " & ABGABEN.Registriernummer & " - BezugsNr: " & ABGABEN.Bezugsnummer + ABGABEN.SAVE(errHInweis) + End If End If End Select Next diff --git a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb index 9f6d5c2..23427f0 100644 --- a/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb @@ -2462,7 +2462,8 @@ Public Class frmDYNachrichtenVerarbeitung EZA.eza_Vorsteuerabzug = FCFCDC.Header.InputTaxDeductionFlag EZA.eza_ZusatzangabenAnmeldung = FCFCDC.Header.AdditionalInformation - End If + ' EZA.eza_VerfahrenBeantragtCode + End If End If @@ -2588,8 +2589,9 @@ Public Class frmDYNachrichtenVerarbeitung End If - 'Vertreter - If FCFCDC.Representative IsNot Nothing Then + + 'Vertreter + If FCFCDC.Representative IsNot Nothing Then Dim ADR As New DAKOSY_Worker.cDakosy_EZA_Adressen ADR.ezaAd_AdressTyp = "CB" If FCFCDC.Representative.Identification IsNot Nothing Then @@ -2635,66 +2637,70 @@ Public Class frmDYNachrichtenVerarbeitung If FCFCDC.Body IsNot Nothing AndAlso FCFCDC.Body.Acquirer IsNot Nothing Then Dim ADR As New DAKOSY_Worker.cDakosy_EZA_Adressen ADR.ezaAd_AdressTyp = "UC" - If FCFCDC.Body.Acquirer.Name IsNot Nothing Then - If FCFCDC.Body.Acquirer.Name.ToString.Length > 40 Then - If FCFCDC.Body.Acquirer.Name.ToString.Length > 80 Then - ADR.ezaAd_NameFirma1 = FCFCDC.Body.Acquirer.Name.ToString.Substring(0, 40) - ADR.ezaAd_NameFirma2 = FCFCDC.Body.Acquirer.Name.ToString.Substring(40, 40) - ADR.ezaAd_NameFirma3 = FCFCDC.Body.Acquirer.Name.ToString.Substring(80, FCFCDC.Body.Acquirer.Name.ToString.Length - 80) - End If + If FCFCDC.Body.Acquirer.Name IsNot Nothing Then + If FCFCDC.Body.Acquirer.Name.ToString.Length > 40 Then + If FCFCDC.Body.Acquirer.Name.ToString.Length > 80 Then ADR.ezaAd_NameFirma1 = FCFCDC.Body.Acquirer.Name.ToString.Substring(0, 40) - ADR.ezaAd_NameFirma2 = FCFCDC.Body.Acquirer.Name.ToString.Substring(40, FCFCDC.Body.Acquirer.Name.ToString.Length - 40) - Else - ADR.ezaAd_NameFirma1 = FCFCDC.Body.Acquirer.Name + ADR.ezaAd_NameFirma2 = FCFCDC.Body.Acquirer.Name.ToString.Substring(40, 40) + ADR.ezaAd_NameFirma3 = FCFCDC.Body.Acquirer.Name.ToString.Substring(80, FCFCDC.Body.Acquirer.Name.ToString.Length - 80) End If + ADR.ezaAd_NameFirma1 = FCFCDC.Body.Acquirer.Name.ToString.Substring(0, 40) + ADR.ezaAd_NameFirma2 = FCFCDC.Body.Acquirer.Name.ToString.Substring(40, FCFCDC.Body.Acquirer.Name.ToString.Length - 40) + Else + ADR.ezaAd_NameFirma1 = FCFCDC.Body.Acquirer.Name End If - If FCFCDC.Body.Acquirer.Identification IsNot Nothing Then - ADR.ezaAd_TeilnehmerEORI = FCFCDC.Body.Acquirer.Identification.ReferenceNumber - ADR.ezaAd_TeilnehmerNLNR = FCFCDC.Body.Acquirer.Identification.SubsidiaryNumber - End If - If FCFCDC.Body.Acquirer.Address IsNot Nothing Then - ADR.ezaAd_StrasseHausNr1 = FCFCDC.Body.Acquirer.Address.Line - ADR.ezaAd_StrasseHausNr2 = Nothing - ADR.ezaAd_Ort = FCFCDC.Body.Acquirer.Address.City - ADR.ezaAd_PLZ = FCFCDC.Body.Acquirer.Address.Postcode - ADR.ezaAd_LandCode = FCFCDC.Body.Acquirer.Address.Country - End If - EZA.eza_ADRESSEN.Add(ADR) + End If + If FCFCDC.Body.Acquirer.TaxNumber IsNot Nothing Then + ADR.ezaAd_UStIDAnmelder = FCFCDC.Body.Acquirer.TaxNumber End If - 'Versender/Ausführer - If FCFCDC.Body IsNot Nothing AndAlso FCFCDC.Body.Consignor IsNot Nothing Then - Dim ADR As New DAKOSY_Worker.cDakosy_EZA_Adressen - ADR.ezaAd_AdressTyp = "CZ" - If FCFCDC.Body.Consignor.Name IsNot Nothing Then - If FCFCDC.Body.Consignor.Name.ToString.Length > 40 Then - If FCFCDC.Body.Consignor.Name.ToString.Length > 80 Then - ADR.ezaAd_NameFirma1 = FCFCDC.Body.Consignor.Name.ToString.Substring(0, 40) - ADR.ezaAd_NameFirma2 = FCFCDC.Body.Consignor.Name.ToString.Substring(40, 40) - ADR.ezaAd_NameFirma3 = FCFCDC.Body.Consignor.Name.ToString.Substring(80, FCFCDC.Body.Consignor.Name.ToString.Length - 80) - End If + If FCFCDC.Body.Acquirer.Identification IsNot Nothing Then + ADR.ezaAd_TeilnehmerEORI = FCFCDC.Body.Acquirer.Identification.ReferenceNumber + ADR.ezaAd_TeilnehmerNLNR = FCFCDC.Body.Acquirer.Identification.SubsidiaryNumber + End If + If FCFCDC.Body.Acquirer.Address IsNot Nothing Then + ADR.ezaAd_StrasseHausNr1 = FCFCDC.Body.Acquirer.Address.Line + ADR.ezaAd_StrasseHausNr2 = Nothing + ADR.ezaAd_Ort = FCFCDC.Body.Acquirer.Address.City + ADR.ezaAd_PLZ = FCFCDC.Body.Acquirer.Address.Postcode + ADR.ezaAd_LandCode = FCFCDC.Body.Acquirer.Address.Country + End If + EZA.eza_ADRESSEN.Add(ADR) + End If + + 'Versender/Ausführer + If FCFCDC.Body IsNot Nothing AndAlso FCFCDC.Body.Consignor IsNot Nothing Then + Dim ADR As New DAKOSY_Worker.cDakosy_EZA_Adressen + ADR.ezaAd_AdressTyp = "CZ" + If FCFCDC.Body.Consignor.Name IsNot Nothing Then + If FCFCDC.Body.Consignor.Name.ToString.Length > 40 Then + If FCFCDC.Body.Consignor.Name.ToString.Length > 80 Then ADR.ezaAd_NameFirma1 = FCFCDC.Body.Consignor.Name.ToString.Substring(0, 40) - ADR.ezaAd_NameFirma2 = FCFCDC.Body.Consignor.Name.ToString.Substring(40, FCFCDC.Body.Consignor.Name.ToString.Length - 40) - Else - ADR.ezaAd_NameFirma1 = FCFCDC.Body.Consignor.Name + ADR.ezaAd_NameFirma2 = FCFCDC.Body.Consignor.Name.ToString.Substring(40, 40) + ADR.ezaAd_NameFirma3 = FCFCDC.Body.Consignor.Name.ToString.Substring(80, FCFCDC.Body.Consignor.Name.ToString.Length - 80) End If + ADR.ezaAd_NameFirma1 = FCFCDC.Body.Consignor.Name.ToString.Substring(0, 40) + ADR.ezaAd_NameFirma2 = FCFCDC.Body.Consignor.Name.ToString.Substring(40, FCFCDC.Body.Consignor.Name.ToString.Length - 40) + Else + ADR.ezaAd_NameFirma1 = FCFCDC.Body.Consignor.Name End If - If FCFCDC.Body.Consignor.Identification IsNot Nothing Then - ADR.ezaAd_TeilnehmerEORI = FCFCDC.Body.Consignor.Identification.ReferenceNumber - ' ADR.ezaAd_TeilnehmerNLNR = FCFCDC.Body.Consignor.Identification.SubsidiaryNumber - End If - If FCFCDC.Body.Consignor.Address IsNot Nothing Then - ADR.ezaAd_StrasseHausNr1 = FCFCDC.Body.Consignor.Address.Line - ADR.ezaAd_StrasseHausNr2 = Nothing - ADR.ezaAd_Ort = FCFCDC.Body.Consignor.Address.City - ADR.ezaAd_PLZ = FCFCDC.Body.Consignor.Address.Postcode - ADR.ezaAd_LandCode = FCFCDC.Body.Consignor.Address.Country - End If - EZA.eza_ADRESSEN.Add(ADR) End If + If FCFCDC.Body.Consignor.Identification IsNot Nothing Then + ADR.ezaAd_TeilnehmerEORI = FCFCDC.Body.Consignor.Identification.ReferenceNumber + ' ADR.ezaAd_TeilnehmerNLNR = FCFCDC.Body.Consignor.Identification.SubsidiaryNumber + End If + If FCFCDC.Body.Consignor.Address IsNot Nothing Then + ADR.ezaAd_StrasseHausNr1 = FCFCDC.Body.Consignor.Address.Line + ADR.ezaAd_StrasseHausNr2 = Nothing + ADR.ezaAd_Ort = FCFCDC.Body.Consignor.Address.City + ADR.ezaAd_PLZ = FCFCDC.Body.Consignor.Address.Postcode + ADR.ezaAd_LandCode = FCFCDC.Body.Consignor.Address.Country + End If + EZA.eza_ADRESSEN.Add(ADR) + End If - 'Verkäufer - If FCFCDC.Body IsNot Nothing AndAlso FCFCDC.Body.CustomsValue IsNot Nothing AndAlso FCFCDC.Body.CustomsValue.Vendor IsNot Nothing Then + 'Verkäufer + If FCFCDC.Body IsNot Nothing AndAlso FCFCDC.Body.CustomsValue IsNot Nothing AndAlso FCFCDC.Body.CustomsValue.Vendor IsNot Nothing Then Dim ADR As New DAKOSY_Worker.cDakosy_EZA_Adressen ADR.ezaAd_AdressTyp = "SE" If FCFCDC.Body.CustomsValue.Vendor.Name IsNot Nothing Then @@ -2838,6 +2844,7 @@ Public Class frmDYNachrichtenVerarbeitung POS.ezaWP_AHStatMengeQualifier = GOODSITEM.ForeignTradeStatistics.Amount.Qualifier POS.ezaWP_AHStatMengeMasseinheit = GOODSITEM.ForeignTradeStatistics.Amount.MeasurementUnit POS.ezaWP_AHStatMenge = GOODSITEM.ForeignTradeStatistics.Amount.Quantity + POS.ezaWP_AHStatWert = GOODSITEM.ForeignTradeStatistics.Quantity End If End If @@ -2852,7 +2859,6 @@ Public Class frmDYNachrichtenVerarbeitung ' POS.ezaWP_Zollwert = GOODSITEM.Assessment.Amount. ' POS.ezaWP_KostenEUSt = GOODSITEM.Assessment.TaxCosts - ' ' POS.ezaWP_AHStatWert = GOODSITEM.Assessment.Amount??!! ' POS.ezaWP_VeredelungWertsteigerung = GOODSITEM.Assessment.OutwardProcessingFee 'End If diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index f64e902..3a9a24b 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -37,7 +37,6 @@ Partial Class frmStartOptions Me.cbxKd = New System.Windows.Forms.CheckBox() Me.Button9 = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox12 = New System.Windows.Forms.PictureBox() Me.LinkLabel20 = New System.Windows.Forms.LinkLabel() Me.PictureBox11 = New System.Windows.Forms.PictureBox() @@ -77,6 +76,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.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button1 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() @@ -97,6 +98,7 @@ Partial Class frmStartOptions ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.Button1) Me.pnl.Controls.Add(Me.CheckBox2) Me.pnl.Controls.Add(Me.LinkLabel25) Me.pnl.Controls.Add(Me.LinkLabel23) @@ -298,28 +300,6 @@ Partial Class frmStartOptions Me.Label3.TabIndex = 39 Me.Label3.Text = "Routine Manager IMEX" ' - 'MyTextBox1 - ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = True - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._value = "10000" - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(111, 132) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox1.TabIndex = 38 - Me.MyTextBox1.Text = "10000" - ' 'PictureBox12 ' Me.PictureBox12.BackgroundImage = CType(resources.GetObject("PictureBox12.BackgroundImage"), System.Drawing.Image) @@ -749,6 +729,36 @@ Partial Class frmStartOptions Me.lblRoutineManager.TabIndex = 0 Me.lblRoutineManager.Text = "Routine Manager" ' + 'MyTextBox1 + ' + Me.MyTextBox1._DateTimeOnly = False + Me.MyTextBox1._numbersOnly = True + Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._Prozent = False + Me.MyTextBox1._ShortDateNew = False + Me.MyTextBox1._ShortDateOnly = False + Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._value = "10000" + Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True + Me.MyTextBox1.ForeColor = System.Drawing.Color.Black + Me.MyTextBox1.Location = New System.Drawing.Point(111, 132) + Me.MyTextBox1.MaxLineLength = -1 + Me.MyTextBox1.MaxLines_Warning = "" + Me.MyTextBox1.MaxLines_Warning_Label = Nothing + Me.MyTextBox1.Name = "MyTextBox1" + Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox1.TabIndex = 38 + Me.MyTextBox1.Text = "10000" + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(489, 221) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(198, 34) + Me.Button1.TabIndex = 52 + Me.Button1.UseVisualStyleBackColor = True + ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -834,4 +844,5 @@ Partial Class frmStartOptions Friend WithEvents Label5 As Label Friend WithEvents LinkLabel25 As LinkLabel Friend WithEvents CheckBox2 As CheckBox + Friend WithEvents Button1 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 592e5bb..ac29c36 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -902,4 +902,58 @@ Public Class frmStartOptions importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), Now)) End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019") + Dim fid As New FileInfo(d) + If fid.Name >= 20190820 Then + + + For Each f In System.IO.Directory.GetFiles(d) + Dim fi As New FileInfo(f) + If fi.Extension = ".xml" Then + + Dim XML_Code = System.IO.File.ReadAllText(f, System.Text.UTF8Encoding.Default) + + + If XML_Code.Contains("") And XML_Code.Contains("9153") Then + If Not IO.File.Exists("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\TEST\FISKAL\" & fi.Name) Then + + + IO.File.Copy(f, "\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\TEST\FISKAL\" & fi.Name) + End If + End If + + + + 'Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True} + + 'Dim doc As New XmlDocument() + + + 'Dim XML_Code = System.IO.File.ReadAllText(f, System.Text.UTF8Encoding.Default) + + 'doc.LoadXml(frmDYNachrichtenVerarbeitung.SanitizeXmlString(XML_Code)) + + 'If cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlungXML(doc) Then + ' MsgBox(f) + 'End If + + + + End If + + + + + Next + + + + + + End If + + Next + + End Sub End Class \ No newline at end of file diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index 029ccf9..33bbd58 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -566,6 +566,7 @@ Public Class frmTCNachrichtenVerarbeitung TC.dec_Memo = vifDEC.dec_Memo TC.Refs_LRN = vifDEC.Refs_LRN TC.Refs_CRN = vifDEC.Refs_CRN + TC.telanm_CRN = vifDEC.Refs_CRN TC.Refs_CSRN = vifDEC.Refs_CSRN TC.Refs_ERN = vifDEC.Refs_ERN TC.Refs_FRN = vifDEC.Refs_FRN