From e2c05a5ea333c31ab04002660c403b761f73d976 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 10 Sep 2019 13:46:18 +0200 Subject: [PATCH] neu --- MDM_Worker/cPLOSE.vb | 18 ++-- MailSender/MAILSender.vb | 90 ++++++++++------- UID/Mitarbeiter/frmMitarbDetails.Designer.vb | 99 +++++++++++++------ UID/Mitarbeiter/frmMitarbDetails.vb | 14 +++ UID/My Project/Resources.Designer.vb | 11 +-- UID/My Project/Resources.resx | 5 +- UID/cSqlDb.vb | 11 ++- UID/usrctlProcedures.vb | 22 ++--- VERAGMonitoring/cSqlDb.vb | 2 +- .../frmTCNachrichtenVerarbeitung.vb | 59 ----------- 10 files changed, 169 insertions(+), 162 deletions(-) diff --git a/MDM_Worker/cPLOSE.vb b/MDM_Worker/cPLOSE.vb index dc25d20..219e088 100644 --- a/MDM_Worker/cPLOSE.vb +++ b/MDM_Worker/cPLOSE.vb @@ -35,13 +35,14 @@ Imports System.Data.SqlClient Property plose_DokumentNrQuittungUhrzeit As Object = Nothing ' VARCHAR(7) NULL, Property plose_ArtTransaktion As Object = Nothing ' VARCHAR(1) NULL, Property plose_Fahrzeugklasse As Object = Nothing ' VARCHAR(2) NULL, - Property plose_KlassenidentifikationEURO As Object = Nothing ' VARCHAR(2) NULL, - Property plose_ProduktbeschreibungShort As Object = Nothing ' VARCHAR(3) NULL, - Property plose_TransaktionUhrzeit As Object = Nothing ' VARCHAR(4) NULL, - Property plose_Geraetetyp As Object = Nothing ' VARCHAR(3) NULL, - Property plose_ProduktCode As Object = Nothing ' VARCHAR(6) NULL, - Property plose_ReferenzenBuchungMaut As Object = Nothing ' VARCHAR(33) NULL, - + Property plose_KlassenidentifikationEURO As Object = Nothing + Property plose_ProduktbeschreibungShort As Object = Nothing + Property plose_TransaktionUhrzeit As Object = Nothing + Property plose_Geraetetyp As Object = Nothing + Property plose_ProduktCode As Object = Nothing + Property plose_ReferenzenBuchungMaut As Object = Nothing + Property plose_Fakturiert As Boolean = False + Property plose_FakturiertDatum As Object = Nothing Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -96,7 +97,10 @@ Imports System.Data.SqlClient list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_TransaktionUhrzeit", plose_TransaktionUhrzeit)) ' VARCHAR(4) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_Geraetetyp", plose_Geraetetyp)) ' VARCHAR(3) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_ProduktCode", plose_ProduktCode)) ' VARCHAR(6) NULL, + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_ReferenzenBuchungMaut", plose_ReferenzenBuchungMaut)) ' VARCHAR(33) NULL, + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_Fakturiert", plose_Fakturiert)) ' VARCHAR(6) NULL, + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_FakturiertDatum", plose_FakturiertDatum)) ' VARCHAR(6) NULL, Return list End Function diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 6ce6045..18ba4df 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -45,20 +45,46 @@ Module Mail System.Console.WriteLine("MailSender konnte nicht gestartet werden, da eine Insatanz noch läuft...") Else ' PARAM = "BRG_AUSWERTUNG_STANDARD" + + 'Select Case firma + ' Case "ATILLA" + ' Msg.Subject = "Kunden TR - Offene Rechnungen - ATILLA" + ' ' Msg.To.Add("mestan@verag.ag") + + ' Msg.To.Add("verimex@verimex360.com") + ' Msg.Bcc.Add("al@verag.ag") + ' Case "IMEX" + ' Msg.Subject = "Kunden TR - Offene Rechnungen - IMEX" + ' Msg.Bcc.Add("al@verag.ag") + ' Msg.To.Add("mario.hoefer@imex-group.at") + ' Msg.CC.Add("viktoria.leirich@imex-group.at") + ' Msg.CC.Add("verimex@verimex360.com") + ' Case "VERAG" + ' Msg.Subject = "Kunden TR - Offene Rechnungen" + ' Msg.To.Add("mestan@verag.ag") + ' Msg.CC.Add("verimex@verimex360.com") + ' Msg.Bcc.Add("al@verag.ag") + + ' End Select Select Case PARAM + Case "KD_OP5000" + System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000 _ Erstellt eine Liste türkischer Kunden und versendet diese AL.") + If SendEmail_OP5000("VERAG", "", {"al@verag.ag"}, {}, {}, "VERAG - Offene Posten") Then + System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") + End If Case "KD_TR_OP5000" System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000 _ Erstellt eine Liste türkischer Kunden und versendet diese an Mestan und Bahadir.") - If SendEmail_KD_TR_OP5000("VERAG") Then + If SendEmail_OP5000("VERAG", "'TR'", {"mestan@verag.ag"}, {"verimex@verimex360.com"}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen") Then System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") End If Case "KD_TR_OP5000_ATILLA" System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000_ATILLA _ Erstellt eine Liste türkischer Kunden von ATILLA.") - If SendEmail_KD_TR_OP5000("ATILLA") Then + If SendEmail_OP5000("ATILLA", "'TR'", {"verimex@verimex360.com"}, {}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen - ATILLA") Then System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") End If Case "KD_TR_OP5000_IMEX" System.Console.WriteLine("OPTION erkannt: KD_TR_OP5000_IMEX _ Erstellt eine Liste türkischer Kunden von IMEX.") - If SendEmail_KD_TR_OP5000("IMEX") Then + If SendEmail_OP5000("IMEX", "'TR'", {"mario.hoefer@imex-group.at"}, {"viktoria.leirich@imex-group.at", "verimex@verimex360.com"}, {"al@verag.ag"}, "Kunden TR - Offene Rechnungen - IMEX") Then System.Console.WriteLine("Vorgang erfolgreich abgeschlossen ...") End If Case "BRG_AUSWERTUNG_STANDARD" @@ -619,8 +645,7 @@ Module Mail End Function - - Private Function SendEmail_KD_TR_OP5000(Optional firma As String = "VERAG") As Boolean + Private Function SendEmail_OP5000(firma As String, LandEinschr As String, Mail_to() As String, Mail_cc() As String, Mail_bcc() As String, Mail_Subject As String) As Boolean ' send() ' Exit Function Dim Msg As New MailMessage @@ -655,36 +680,29 @@ Module Mail Dim excel As String = "" Select Case firma Case "ATILLA" - excel = genEXCEL_TR_ATILLA() + excel = genEXCEL_TR_ATILLA(LandEinschr) Case "IMEX" - excel = genEXCEL_TR_IMEX() + excel = genEXCEL_TR_IMEX(LandEinschr) Case "VERAG" - excel = genEXCEL_TR() + excel = genEXCEL_TR(LandEinschr) End Select + + System.Console.WriteLine("EXCEL erstellt...") If excel <> "" And Not excel.StartsWith("ERROR: ") Then System.Console.WriteLine("Sende E-Mail...") Msg.From = New MailAddress("support@verag.ag") - Select Case firma - Case "ATILLA" - Msg.Subject = "Kunden TR - Offene Rechnungen - ATILLA" - ' Msg.To.Add("mestan@verag.ag") - Msg.To.Add("verimex@verimex360.com") - Msg.Bcc.Add("al@verag.ag") - Case "IMEX" - Msg.Subject = "Kunden TR - Offene Rechnungen - IMEX" - Msg.Bcc.Add("al@verag.ag") - Msg.To.Add("mario.hoefer@imex-group.at") - Msg.CC.Add("viktoria.leirich@imex-group.at") - Msg.CC.Add("verimex@verimex360.com") - Case "VERAG" - Msg.Subject = "Kunden TR - Offene Rechnungen" - Msg.To.Add("mestan@verag.ag") - Msg.CC.Add("verimex@verimex360.com") - Msg.Bcc.Add("al@verag.ag") - End Select + + + For Each m In Mail_to : Msg.To.Add(m) : Next + For Each m In Mail_cc : Msg.CC.Add(m) : Next + For Each m In Mail_bcc : Msg.Bcc.Add(m) : Next + Msg.Subject = Mail_Subject + + + ' Msg.To.Add("al@verag.ag") Msg.Body = "Anbei befindet sich die Liste der türkischen Kunden mit einem offenen Rechnungsbetrag von über 1.000,- EUR." & vbNewLine & vbNewLine & "Stand: " & Now.ToShortDateString & " " & Now.ToShortTimeString & vbNewLine & vbNewLine & vbNewLine & "Automatisch generiertes E-Mail." @@ -1204,15 +1222,15 @@ Module Mail End Try End Function - - Public Function genEXCEL_TR() As String + + Public Function genEXCEL_TR(LandEinschr) As String Try + If LandEinschr <> "" Then LandEinschr = " AND LandKz IN (" & LandEinschr & ") " - - Dim sqlstr = " SELECT [Kontonummer] as KdNr,cast(SUM([Gesamtausstand]) as decimal(12,2)) as Summe,max([Waehrung]) as Währung ,max(LandKz) as Land, max(Ordnungsbegriff) as Firma,max(Ort) as Ort,max(Straße) as Straße,max([E-Mail]) as [E-Mail],max(Telefon) as Telefon " & + Dim sqlstr = " SELECT [Kontonummer] as KdNr,cast(SUM([Gesamtausstand]) as decimal(12,2)) as Summe,max([Waehrung]) as Währung ,max(LandKz) as Land, max(Ordnungsbegriff) as Firma,max(Ort) as Ort,max(Straße) as Straße,max([E-Mail]) as [E-Mail],max(Telefon) as Telefon, min([Fälligkeitsdatum]) as [Fälligkeitsdatum] " & "FROM [Offene Posten] INNER JOIN Adressen ON AdressenNr=Kontonummer " & - "WHERE LandKz='TR' AND Firma_ID <> 7 " & + "WHERE 1=1 " & LandEinschr & " AND Firma_ID NOT IN (7,15) " & "GROUP BY [Kontonummer] " & "HAVING SUM([Gesamtausstand]) > " & betragOpTr & "ORDER BY Firma asc" @@ -1232,13 +1250,14 @@ Module Mail - Public Function genEXCEL_TR_IMEX() As String + Public Function genEXCEL_TR_IMEX(LandEinschr) As String Try + If LandEinschr <> "" Then LandEinschr = " AND LandKz IN (" & LandEinschr & ") " Dim sqlstr = " SELECT [KundenNr] as KdNr,cast(SUM(Saldo) as decimal(12,2)) as Summe/*,max([Waehrung]) as Währung */,max(LandKz) as Land, max(Ordnungsbegriff) as Firma,max(Ort) as Ort,max(Straße) as Straße,max([E-Mail]) as [E-Mail],max(Telefon) as Telefon " & " FROM Offene_Posten_DVO INNER JOIN Adressen ON AdressenNr=[KundenNr] " & - "WHERE LandKz='TR' " & + "WHERE 1=1 " & LandEinschr & "GROUP BY [KundenNr] " & "HAVING SUM([Saldo]) > " & betragOpTr & "ORDER BY Firma asc" @@ -1257,13 +1276,14 @@ Module Mail End Function - Public Function genEXCEL_TR_ATILLA() As String + Public Function genEXCEL_TR_ATILLA(LandEinschr) As String Try + If LandEinschr <> "" Then LandEinschr = " AND LandKz IN (" & LandEinschr & ") " Dim sqlstr = " SELECT [Kontonummer] as KdNr,cast(SUM([Gesamtausstand]) as decimal(12,2)) as Summe,max([Waehrung]) as Währung ,max(LandKz) as Land, max(Ordnungsbegriff) as Firma,max(Ort) as Ort,max(Straße) as Straße,max([E-Mail]) as [E-Mail],max(Telefon) as Telefon " & "FROM [Offene Posten] INNER JOIN Adressen ON AdressenNr=Kontonummer " & - "WHERE LandKz='TR' AND Firma_ID = 7 " & + "WHERE 1=1 " & LandEinschr & " AND Firma_ID = 7 " & "GROUP BY [Kontonummer] " & "HAVING SUM([Gesamtausstand]) > " & betragOpTr & "ORDER BY Firma asc" diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index 0d68af8..1ae4e73 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -49,6 +49,8 @@ Partial Class frmMitarbDetails Me.cboSpedbuch = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.txtTelotecSB = New System.Windows.Forms.TextBox() + Me.Label51 = New System.Windows.Forms.Label() Me.txtDyFullName = New System.Windows.Forms.TextBox() Me.Label49 = New System.Windows.Forms.Label() Me.txtDakosySB = New System.Windows.Forms.TextBox() @@ -156,8 +158,9 @@ Partial Class frmMitarbDetails Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.cboAdminBer = New System.Windows.Forms.ComboBox() Me.Label7 = New System.Windows.Forms.Label() - Me.txtTelotecSB = New System.Windows.Forms.TextBox() - Me.Label51 = New System.Windows.Forms.Label() + Me.Label52 = New System.Windows.Forms.Label() + Me.txtALIASUser = New System.Windows.Forms.TextBox() + Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.TabControl2.SuspendLayout() @@ -236,7 +239,7 @@ Partial Class frmMitarbDetails ' Me.btnCancel.BackColor = System.Drawing.Color.White Me.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnCancel.Location = New System.Drawing.Point(191, 770) + Me.btnCancel.Location = New System.Drawing.Point(191, 795) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(88, 36) Me.btnCancel.TabIndex = 52 @@ -247,7 +250,7 @@ Partial Class frmMitarbDetails ' Me.btnOK.BackColor = System.Drawing.Color.White Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOK.Location = New System.Drawing.Point(12, 770) + Me.btnOK.Location = New System.Drawing.Point(12, 795) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(173, 36) Me.btnOK.TabIndex = 51 @@ -261,7 +264,7 @@ Partial Class frmMitarbDetails Me.TabControl2.Location = New System.Drawing.Point(12, 63) Me.TabControl2.Name = "TabControl2" Me.TabControl2.SelectedIndex = 0 - Me.TabControl2.Size = New System.Drawing.Size(723, 705) + Me.TabControl2.Size = New System.Drawing.Size(723, 726) Me.TabControl2.TabIndex = 0 ' 'TabPage1 @@ -274,7 +277,7 @@ Partial Class frmMitarbDetails Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(715, 679) + Me.TabPage1.Size = New System.Drawing.Size(715, 700) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Daten" Me.TabPage1.UseVisualStyleBackColor = True @@ -283,7 +286,7 @@ Partial Class frmMitarbDetails ' Me.tbcntr.Controls.Add(Me.TabPage2) Me.tbcntr.Controls.Add(Me.TabPage4) - Me.tbcntr.Location = New System.Drawing.Point(2, 473) + Me.tbcntr.Location = New System.Drawing.Point(2, 494) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 Me.tbcntr.Size = New System.Drawing.Size(450, 200) @@ -489,6 +492,24 @@ Partial Class frmMitarbDetails Me.TabPage4.Text = "Zuordnung Zollprogramme" Me.TabPage4.UseVisualStyleBackColor = True ' + 'txtTelotecSB + ' + Me.txtTelotecSB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtTelotecSB.Location = New System.Drawing.Point(9, 133) + Me.txtTelotecSB.Name = "txtTelotecSB" + Me.txtTelotecSB.Size = New System.Drawing.Size(200, 20) + Me.txtTelotecSB.TabIndex = 116 + ' + 'Label51 + ' + Me.Label51.AutoSize = True + Me.Label51.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label51.Location = New System.Drawing.Point(6, 117) + Me.Label51.Name = "Label51" + Me.Label51.Size = New System.Drawing.Size(134, 13) + Me.Label51.TabIndex = 115 + Me.Label51.Text = "TELOTEC Sachbearbeiter:" + ' 'txtDyFullName ' Me.txtDyFullName.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -576,7 +597,7 @@ Partial Class frmMitarbDetails 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(461, 473) + Me.Label4.Location = New System.Drawing.Point(461, 494) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(28, 13) Me.Label4.TabIndex = 85 @@ -584,6 +605,9 @@ Partial Class frmMitarbDetails ' 'GroupBox2 ' + Me.GroupBox2.Controls.Add(Me.cboALIASDomain) + Me.GroupBox2.Controls.Add(Me.txtALIASUser) + Me.GroupBox2.Controls.Add(Me.Label52) Me.GroupBox2.Controls.Add(Me.lkl) Me.GroupBox2.Controls.Add(Me.Label45) Me.GroupBox2.Controls.Add(Me.MyListBox1) @@ -614,7 +638,7 @@ Partial Class frmMitarbDetails Me.GroupBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox2.Location = New System.Drawing.Point(2, 245) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(709, 222) + Me.GroupBox2.Size = New System.Drawing.Size(709, 243) Me.GroupBox2.TabIndex = 84 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Firmendaten" @@ -702,7 +726,7 @@ Partial Class frmMitarbDetails Me.cbxEinsteigsDat.Checked = True Me.cbxEinsteigsDat.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxEinsteigsDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxEinsteigsDat.Location = New System.Drawing.Point(409, 39) + Me.cbxEinsteigsDat.Location = New System.Drawing.Point(20, 214) Me.cbxEinsteigsDat.Name = "cbxEinsteigsDat" Me.cbxEinsteigsDat.Size = New System.Drawing.Size(15, 14) Me.cbxEinsteigsDat.TabIndex = 90 @@ -712,7 +736,7 @@ Partial Class frmMitarbDetails ' Me.Label30.AutoSize = True Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label30.Location = New System.Drawing.Point(406, 21) + Me.Label30.Location = New System.Drawing.Point(17, 195) Me.Label30.Name = "Label30" Me.Label30.Size = New System.Drawing.Size(81, 13) Me.Label30.TabIndex = 89 @@ -721,7 +745,7 @@ Partial Class frmMitarbDetails 'datEinstiegsdatum ' Me.datEinstiegsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.datEinstiegsdatum.Location = New System.Drawing.Point(430, 37) + Me.datEinstiegsdatum.Location = New System.Drawing.Point(41, 212) Me.datEinstiegsdatum.Name = "datEinstiegsdatum" Me.datEinstiegsdatum.Size = New System.Drawing.Size(200, 20) Me.datEinstiegsdatum.TabIndex = 2 @@ -750,7 +774,7 @@ Partial Class frmMitarbDetails ' Me.datGekuendigtAm.Enabled = False Me.datGekuendigtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.datGekuendigtAm.Location = New System.Drawing.Point(113, 194) + Me.datGekuendigtAm.Location = New System.Drawing.Point(301, 212) Me.datGekuendigtAm.Name = "datGekuendigtAm" Me.datGekuendigtAm.Size = New System.Drawing.Size(200, 20) Me.datGekuendigtAm.TabIndex = 9 @@ -759,7 +783,7 @@ Partial Class frmMitarbDetails ' Me.cbxGekuendigt.AutoSize = True Me.cbxGekuendigt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxGekuendigt.Location = New System.Drawing.Point(18, 197) + Me.cbxGekuendigt.Location = New System.Drawing.Point(301, 194) Me.cbxGekuendigt.Name = "cbxGekuendigt" Me.cbxGekuendigt.Size = New System.Drawing.Size(96, 17) Me.cbxGekuendigt.TabIndex = 8 @@ -936,7 +960,7 @@ Partial Class frmMitarbDetails ' Me.cbxTestaccount.AutoSize = True Me.cbxTestaccount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTestaccount.Location = New System.Drawing.Point(304, 194) + Me.cbxTestaccount.Location = New System.Drawing.Point(301, 174) Me.cbxTestaccount.Name = "cbxTestaccount" Me.cbxTestaccount.Size = New System.Drawing.Size(86, 17) Me.cbxTestaccount.TabIndex = 92 @@ -1183,7 +1207,7 @@ Partial Class frmMitarbDetails ' 'txtInfo ' - Me.txtInfo.Location = New System.Drawing.Point(464, 489) + Me.txtInfo.Location = New System.Drawing.Point(464, 510) Me.txtInfo.Name = "txtInfo" Me.txtInfo.Size = New System.Drawing.Size(245, 184) Me.txtInfo.TabIndex = 0 @@ -1670,30 +1694,40 @@ Partial Class frmMitarbDetails Me.Label7.TabIndex = 78 Me.Label7.Text = "Berechtigung:" ' - 'txtTelotecSB + 'Label52 ' - Me.txtTelotecSB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtTelotecSB.Location = New System.Drawing.Point(9, 133) - Me.txtTelotecSB.Name = "txtTelotecSB" - Me.txtTelotecSB.Size = New System.Drawing.Size(200, 20) - Me.txtTelotecSB.TabIndex = 116 + Me.Label52.AutoSize = True + Me.Label52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label52.Location = New System.Drawing.Point(406, 21) + Me.Label52.Name = "Label52" + Me.Label52.Size = New System.Drawing.Size(167, 13) + Me.Label52.TabIndex = 98 + Me.Label52.Text = "ALIAS-Name (Domain / AD-User):" ' - 'Label51 + 'txtALIASUser ' - Me.Label51.AutoSize = True - Me.Label51.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label51.Location = New System.Drawing.Point(6, 117) - Me.Label51.Name = "Label51" - Me.Label51.Size = New System.Drawing.Size(134, 13) - Me.Label51.TabIndex = 115 - Me.Label51.Text = "TELOTEC Sachbearbeiter:" + Me.txtALIASUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtALIASUser.Location = New System.Drawing.Point(524, 37) + Me.txtALIASUser.Name = "txtALIASUser" + Me.txtALIASUser.Size = New System.Drawing.Size(179, 20) + Me.txtALIASUser.TabIndex = 99 + ' + 'cboALIASDomain + ' + Me.cboALIASDomain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboALIASDomain.FormattingEnabled = True + Me.cboALIASDomain.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"}) + Me.cboALIASDomain.Location = New System.Drawing.Point(409, 37) + Me.cboALIASDomain.Name = "cboALIASDomain" + Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21) + Me.cboALIASDomain.TabIndex = 100 ' 'frmMitarbDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke - Me.ClientSize = New System.Drawing.Size(747, 813) + Me.ClientSize = New System.Drawing.Size(747, 841) Me.Controls.Add(Me.TabControl2) Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnOK) @@ -1865,4 +1899,7 @@ Partial Class frmMitarbDetails Friend WithEvents lkl As LinkLabel Friend WithEvents txtTelotecSB As TextBox Friend WithEvents Label51 As Label + Friend WithEvents cboALIASDomain As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtALIASUser As TextBox + Friend WithEvents Label52 As Label End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 56816dc..2f3b72d 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -53,6 +53,15 @@ cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) + cboALIASDomain.Items.Clear() + cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAGOST", "VERAGOST")) + cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX")) + cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-SBG", "VERAG-SBG")) + cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAGNEUHAUS", "VERAGNEUHAUS")) + cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-NCTS (ATILLA)", "VERAG-NCTS")) + + ZOLLDATENBEARB = False @@ -183,6 +192,9 @@ txtDyFullName.Text = If(mitarbeiter.mit_DAKOSY_SBFull, "") txtTelotecSB.Text = mitarbeiter.mit_TELOTEC_SB + cboALIASDomain.changeItem(mitarbeiter.mit_AliasAD_Domain) + txtALIASUser.Text = mitarbeiter.mit_AliasAD_Username + If mitarbeiter.mit_firma = "VERAG" Then cboFirma.SelectedIndex = 0 ElseIf mitarbeiter.mit_firma = "ATILLA" Then @@ -417,6 +429,8 @@ mitarbeiter.mit_DAKOSY_SB = txtDakosySB.Text mitarbeiter.mit_DAKOSY_SBFull = txtDyFullName.Text mitarbeiter.mit_TELOTEC_SB = txtTelotecSB.Text + mitarbeiter.mit_AliasAD_Domain = cboALIASDomain._value + mitarbeiter.mit_AliasAD_Username = txtALIASUser.Text If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index bf6632f..1e6b01b 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -140,15 +140,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property bbt5bfg() As String - Get - Return ResourceManager.GetString("bbt5bfg", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' @@ -644,7 +635,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.8.4 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.8.5 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 0f5d609..30de367 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -188,7 +188,7 @@ Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; - 1.8.4 + 1.8.5 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -298,7 +298,4 @@ ..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - \ No newline at end of file diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index 7407fd3..58dae57 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -1504,8 +1504,8 @@ Public Class cMitarbeiter 'Änderung Dim sql = "INSERT INTO tblMitarbeiter " & - "(mit_username, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB) VALUES " & - "(@mit_username,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB)" + "(mit_username, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username) VALUES " & + "(@mit_username,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username)" Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() Using cmd As New SqlCommand(sql, conn) @@ -1550,7 +1550,8 @@ Public Class cMitarbeiter cmd.Parameters.AddWithValue("@mit_TESTonly", m.mit_TESTonly) cmd.Parameters.AddWithValue("@mit_PasswortChanged", If(m.mit_PasswortChanged, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_TELOTEC_SB", If(m.mit_TELOTEC_SB, DBNull.Value)) - + cmd.Parameters.AddWithValue("@mit_AliasAD_Domain", If(m.mit_AliasAD_Domain, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_AliasAD_Username", If(m.mit_AliasAD_Username, DBNull.Value)) Try cmd.ExecuteNonQuery() @@ -1568,7 +1569,7 @@ Public Class cMitarbeiter Dim hAuswahl As String = "" Dim sql = "UPDATE tblMitarbeiter " & - "SET mit_username=@mit_username, mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB " & + "SET mit_username=@mit_username, mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username " & " WHERE mit_id=@mit_id " @@ -1619,6 +1620,8 @@ Public Class cMitarbeiter cmd.Parameters.AddWithValue("@mit_TESTonly", m.mit_TESTonly) cmd.Parameters.AddWithValue("@mit_PasswortChanged", If(m.mit_PasswortChanged, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_TELOTEC_SB", If(m.mit_TELOTEC_SB, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_AliasAD_Domain", If(m.mit_AliasAD_Domain, DBNull.Value)) + cmd.Parameters.AddWithValue("@mit_AliasAD_Username", If(m.mit_AliasAD_Username, DBNull.Value)) Try cmd.ExecuteNonQuery() diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 9646377..839a7d4 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -2364,27 +2364,27 @@ 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 + '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 + ' For Each f In System.IO.Directory.GetFiles(d) + ' If cGetMsgType.isEZA_FreierVerkehrAktVeredelUmwandlungXML(doc) Then - End If - Next + ' End If + ' Next - End If + ' End If - Next + ' Next - End Sub + 'End Sub End Class diff --git a/VERAGMonitoring/cSqlDb.vb b/VERAGMonitoring/cSqlDb.vb index 4200fba..d18cc94 100644 --- a/VERAGMonitoring/cSqlDb.vb +++ b/VERAGMonitoring/cSqlDb.vb @@ -318,7 +318,7 @@ Public Class cBrgDb Public Function loadDgvBySqlFromBrgKtoTELOTECDetails(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As DataTable - Dim sql As String = "SELECT dec_CreateDate asDatum, telanm_CRN as CRN,telanm_Status as Status,([GVal]) as Betrag, telanm_ID as ID, telanm_ART as Art,GRN,ConeeTra_TIN as EORI,ConeeTra_Na as Empfänger,Represent_Na as Bearbeiter " + Dim sql As String = "SELECT dec_CreateDate asDatum, telanm_CRN as CRN,[telanm_BezugsNr] as LRN,telanm_Status as Status,([GVal]) as Betrag, telanm_ID as ID, telanm_ART as Art,GRN,ConeeTra_TIN as EORI,ConeeTra_Na as Empfänger,Represent_Na as Bearbeiter " sql &= " FROM tblTelotec_Sicherheit inner join [tblTelotec_Anmeldung] on telanm_id = telgrt_telanmId" sql &= " where [tblTelotec_Anmeldung].[dec_CreateDate] BETWEEN '" & datumVon.ToShortDateString & " 00:00:00' AND '" & datumBis.ToShortDateString & " 23:23:59' AND telanm_Status BETWEEN '" & statusVon & "' and '" & statusBis & "' AND GRN='" & buergschaft & "' AND [telnam_aktuellsteNachricht]=1 " & where 'MsgBox(sql) diff --git a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb index 33bbd58..48923b0 100644 --- a/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmTCNachrichtenVerarbeitung.vb @@ -810,65 +810,6 @@ Public Class frmTCNachrichtenVerarbeitung - Function InsertAbgaben(EZA, division, STATUS, DY_TMP, regNr, Bezugsnummer, regDat, firma, nl, EDIFACTNachrichtenNr) - Dim EZA_TMP As DAKOSY_Worker.cDakosyEZA = saveDY_EZA(STATUS, DY_TMP, EZA.Transaktion.IOReferenz, EZA.Transaktion.IODatumZeit, regNr) - - If EZA.EinzelAbgabenbescheid.KopfDaten.AbgabenNachArt IsNot Nothing Then - For Each A In EZA.EinzelAbgabenbescheid.KopfDaten.AbgabenNachArt - Dim LeistungsNr = 0 - If A.AbgabeArt IsNot Nothing Then - ' If A.Zahlungsart = "A" Then 'Nur wenn Zahlungsart=...? - If If(A.KennBuchstabenAufschub, "").Trim = "M" And (CInt(A.AufschubkontoNr) = 6128 Or CInt(A.AufschubkontoNr) = 6136 Or CInt(A.AufschubkontoNr) = 2718 Or CInt(A.AufschubkontoNr) = 2719) Then '_>TEST Or CInt(A.AufschubkontoNr) = 678010 - - Select Case A.AbgabeArt.ToString - Case "A0000", "10100" : LeistungsNr = 60 ' ZOLL - Case "B0000", "20000" : LeistungsNr = 20 ' EUST - Case Else : LeistungsNr = 10 'Diverse Zollvorschreibungen - End Select - - ' MsgBox("- " & A.Abgabenbetrag) - - Dim ABGABEN As New VERAG_PROG_ALLGEMEIN.cAbgaben - ABGABEN.Belegart = A.AbgabeArt - ABGABEN.Betrag = A.Abgabenbetrag - ABGABEN.Status = Nothing - ABGABEN.LeistungsNr = LeistungsNr - ABGABEN.Bezugsnummer = Bezugsnummer - ABGABEN.Registriernummer = regNr - ABGABEN.AOFD = A.KennBuchstabenAufschub - ABGABEN.AKTO = A.AufschubkontoNr - ABGABEN.Fälligkeitsdatum = A.Faelligkeit - ABGABEN.Mandant = If(firma.ToString.Length > 4, firma.ToString.Substring(0, 4), firma) - ABGABEN.Niederlassung = If(nl.ToString.Length > 3, nl.ToString.Substring(0, 3), nl) - ABGABEN.Abfertigungsdatum = regDat - ABGABEN.Übernahmedatum = Now - ABGABEN.Eingabedatum = regDat - - 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) - - Select Case CInt(A.AufschubkontoNr) - Case 6128 : tryToInsertProgramm(ABGABEN.Eingabedatum, ABGABEN.Betrag, 1, EDIFACTNachrichtenNr, ABGABEN.Registriernummer, 0) - Case 2718 : tryToInsertProgramm(ABGABEN.Eingabedatum, ABGABEN.Betrag, 8, EDIFACTNachrichtenNr, ABGABEN.Registriernummer, 0) - - 'Case 2718 : VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMailTEST("al@verag.ag", "AUFSCHUB IMEX: " & ABGABEN.Betrag, "AUFSCHUB IMEX: " & ABGABEN.Betrag & vbNewLine & ABGABEN.Bezugsnummer) - End Select - - - If CInt(A.AufschubkontoNr) = 6128 Then 'Nur bei ZOLL ' --> TEST: Or CInt(A.AufschubkontoNr) = 678010 - AtlasAufschubDatenEinlesen.tryToInsertProgramm(regDat, A.Abgabenbetrag, "1", "DY", regNr, "") - End If - - End If - ' End If - End If - Next - End If - End Function - Public Function tryToInsertProgramm(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_fileline) As Boolean