From a094691083f9ed1a0cf81de2cd6b9793bcedfd2e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 18 Dec 2023 15:19:37 +0100 Subject: [PATCH] Asfinag_Rechnungsverarbeitung --- SDL/mdm/ASFINAG/rptASFINAG_Anhang.Designer.vb | 150 +++++++++-------- SDL/mdm/frmMDMDatenverarbetiung.Designer.vb | 158 +++++++++--------- SDL/mdm/frmMDMDatenverarbetiung.vb | 64 ++++--- 3 files changed, 200 insertions(+), 172 deletions(-) diff --git a/SDL/mdm/ASFINAG/rptASFINAG_Anhang.Designer.vb b/SDL/mdm/ASFINAG/rptASFINAG_Anhang.Designer.vb index d0fdcd93..77c982e7 100644 --- a/SDL/mdm/ASFINAG/rptASFINAG_Anhang.Designer.vb +++ b/SDL/mdm/ASFINAG/rptASFINAG_Anhang.Designer.vb @@ -46,6 +46,11 @@ Partial Public Class rptASFINAG_Anhang Me.lblFirmaEmail = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.lblFirmaWeb = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Label18 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.TextBox1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() + Me.Label2 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.Label3 = New GrapeCity.ActiveReports.SectionReportModel.Label() + Me.Label4 = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.ReportFooter1 = New GrapeCity.ActiveReports.SectionReportModel.ReportFooter() Me.txtBruttoGesSum = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.txtNettoGesSum = New GrapeCity.ActiveReports.SectionReportModel.Label() @@ -80,11 +85,6 @@ Partial Public Class rptASFINAG_Anhang Me.txtMWSTKzSum = New GrapeCity.ActiveReports.SectionReportModel.Label() Me.Line4 = New GrapeCity.ActiveReports.SectionReportModel.Line() Me.lblSummeKennzeichen = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label1 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.TextBox1 = New GrapeCity.ActiveReports.SectionReportModel.TextBox() - Me.Label2 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label3 = New GrapeCity.ActiveReports.SectionReportModel.Label() - Me.Label4 = New GrapeCity.ActiveReports.SectionReportModel.Label() CType(Me.lblKategorie, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtProdukt, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtBrutto, System.ComponentModel.ISupportInitialize).BeginInit() @@ -109,6 +109,11 @@ Partial Public Class rptASFINAG_Anhang CType(Me.lblFirmaEmail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblFirmaWeb, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label18, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtBruttoGesSum, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtNettoGesSum, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtMWSTGEsSum, System.ComponentModel.ISupportInitialize).BeginInit() @@ -131,11 +136,6 @@ Partial Public Class rptASFINAG_Anhang CType(Me.txtNettoKzSum, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtMWSTKzSum, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.lblSummeKennzeichen, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Label4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' 'PageHeader @@ -465,6 +465,66 @@ Partial Public Class rptASFINAG_Anhang Me.Label18.Top = 0.6716536! Me.Label18.Width = 0.436614! ' + 'Label1 + ' + Me.Label1.Height = 0.2311024! + Me.Label1.HyperLink = Nothing + Me.Label1.Left = 4.496457! + Me.Label1.Name = "Label1" + Me.Label1.Style = "font-size: 12pt; font-weight: bold; text-align: right; ddo-char-set: 1" + Me.Label1.Text = "-" + Me.Label1.Top = 0.0523622! + Me.Label1.Width = 2.969686! + ' + 'TextBox1 + ' + Me.TextBox1.Height = 0.1574803! + Me.TextBox1.Left = 5.0! + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & + "-char-set: 1" + Me.TextBox1.Text = "1000000" + Me.TextBox1.Top = 0.8291339! + Me.TextBox1.Width = 0.8688979! + ' + 'Label2 + ' + Me.Label2.Height = 0.1574803! + Me.Label2.HyperLink = Nothing + Me.Label2.Left = 4.304331! + Me.Label2.Name = "Label2" + Me.Label2.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & + "o-char-set: 1" + Me.Label2.Text = "Partner-Kunden-Nr:" + Me.Label2.Top = 0.8291339! + Me.Label2.Width = 1.020079! + ' + 'Label3 + ' + Me.Label3.Height = 0.1574803! + Me.Label3.HyperLink = Nothing + Me.Label3.Left = 5.983465! + Me.Label3.Name = "Label3" + Me.Label3.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & + "o-char-set: 1" + Me.Label3.Text = "Zeitraum bis:" + Me.Label3.Top = 0.8291339! + Me.Label3.Visible = False + Me.Label3.Width = 0.6905512! + ' + 'Label4 + ' + Me.Label4.Height = 0.1574803! + Me.Label4.HyperLink = Nothing + Me.Label4.Left = 6.674016! + Me.Label4.Name = "Label4" + Me.Label4.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & + "-char-set: 1" + Me.Label4.Text = "01.01.2019" + Me.Label4.Top = 0.8291339! + Me.Label4.Visible = False + Me.Label4.Width = 0.7960634! + ' 'ReportFooter1 ' Me.ReportFooter1.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.txtBruttoGesSum, Me.txtNettoGesSum, Me.txtMWSTGEsSum, Me.lblGessumme, Me.Line7, Me.Line8}) @@ -828,65 +888,7 @@ Partial Public Class rptASFINAG_Anhang Me.lblSummeKennzeichen.Top = 0.01968504! Me.lblSummeKennzeichen.Width = 1.484645! ' - 'Label1 - ' - Me.Label1.Height = 0.2311024! - Me.Label1.HyperLink = Nothing - Me.Label1.Left = 4.496457! - Me.Label1.Name = "Label1" - Me.Label1.Style = "font-size: 12pt; font-weight: bold; text-align: right; ddo-char-set: 1" - Me.Label1.Text = "-" - Me.Label1.Top = 0.0523622! - Me.Label1.Width = 2.969686! - ' - 'TextBox1 - ' - Me.TextBox1.Height = 0.1574803! - Me.TextBox1.Left = 5.0! - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & - "-char-set: 1" - Me.TextBox1.Text = "1000000" - Me.TextBox1.Top = 0.8291339! - Me.TextBox1.Width = 0.8688979! - ' - 'Label2 - ' - Me.Label2.Height = 0.1574803! - Me.Label2.HyperLink = Nothing - Me.Label2.Left = 4.304331! - Me.Label2.Name = "Label2" - Me.Label2.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & - "o-char-set: 1" - Me.Label2.Text = "Partner-Kunden-Nr:" - Me.Label2.Top = 0.8291339! - Me.Label2.Width = 1.020079! - ' - 'Label3 - ' - Me.Label3.Height = 0.1574803! - Me.Label3.HyperLink = Nothing - Me.Label3.Left = 5.983465! - Me.Label3.Name = "Label3" - Me.Label3.Style = "font-size: 8pt; font-weight: normal; text-align: left; vertical-align: middle; dd" & - "o-char-set: 1" - Me.Label3.Text = "Zeitraum bis:" - Me.Label3.Top = 0.8291339! - Me.Label3.Width = 0.6905512! - ' - 'Label4 - ' - Me.Label4.Height = 0.1574803! - Me.Label4.HyperLink = Nothing - Me.Label4.Left = 6.674016! - Me.Label4.Name = "Label4" - Me.Label4.Style = "font-size: 8pt; font-weight: bold; text-align: right; vertical-align: middle; ddo" & - "-char-set: 1" - Me.Label4.Text = "01.01.2019" - Me.Label4.Top = 0.8291339! - Me.Label4.Width = 0.7960634! - ' - 'rptPLOSE_Anhang + 'rptASFINAG_Anhang ' Me.PageSettings.Margins.Bottom = 0.3937008! Me.PageSettings.Margins.Left = 0.3937008! @@ -936,6 +938,11 @@ Partial Public Class rptASFINAG_Anhang CType(Me.lblFirmaEmail, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblFirmaWeb, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label18, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtBruttoGesSum, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtNettoGesSum, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtMWSTGEsSum, System.ComponentModel.ISupportInitialize).EndInit() @@ -958,11 +965,6 @@ Partial Public Class rptASFINAG_Anhang CType(Me.txtNettoKzSum, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtMWSTKzSum, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.lblSummeKennzeichen, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Label4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index f95e59f9..bbdd4956 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -53,7 +53,6 @@ Partial Class frmMDMDatenverarbetiung Me.Button1 = New System.Windows.Forms.Button() Me.btnKunde = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() - Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbx = New System.Windows.Forms.CheckBox() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label43 = New System.Windows.Forms.Label() @@ -64,12 +63,13 @@ Partial Class frmMDMDatenverarbetiung Me.pbPloseAnh_Proz = New System.Windows.Forms.ProgressBar() Me.lblPloseAnh_Proz = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() - Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label2 = New System.Windows.Forms.Label() - Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() @@ -144,7 +144,7 @@ Partial Class frmMDMDatenverarbetiung Me.Panel4.Controls.Add(Me.dat_Sum_Von) Me.Panel4.Location = New System.Drawing.Point(0, 67) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(583, 33) + Me.Panel4.Size = New System.Drawing.Size(417, 33) Me.Panel4.TabIndex = 28 ' 'Label46 @@ -409,31 +409,6 @@ Partial Class frmMDMDatenverarbetiung Me.Label4.TabIndex = 44 Me.Label4.Text = "Prüfsumme brutto:" ' - 'txtPruefsummeBrutto - ' - Me.txtPruefsummeBrutto._DateTimeOnly = False - Me.txtPruefsummeBrutto._numbersOnly = False - Me.txtPruefsummeBrutto._numbersOnlyKommastellen = "" - Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True - Me.txtPruefsummeBrutto._Prozent = False - Me.txtPruefsummeBrutto._ShortDateNew = False - Me.txtPruefsummeBrutto._ShortDateOnly = False - Me.txtPruefsummeBrutto._TimeOnly = False - Me.txtPruefsummeBrutto._TimeOnly_Seconds = False - Me.txtPruefsummeBrutto._value = "" - Me.txtPruefsummeBrutto._Waehrung = False - Me.txtPruefsummeBrutto._WaehrungZeichen = True - Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black - Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69) - Me.txtPruefsummeBrutto.MaxLineLength = -1 - Me.txtPruefsummeBrutto.MaxLines_Warning = "" - Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing - Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto" - Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20) - Me.txtPruefsummeBrutto.TabIndex = 43 - Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'cbx ' Me.cbx.AutoSize = True @@ -530,31 +505,6 @@ Partial Class frmMDMDatenverarbetiung Me.Label3.TabIndex = 38 Me.Label3.Text = "Prüfsumme netto:" ' - 'txtPruefsummeNetto - ' - Me.txtPruefsummeNetto._DateTimeOnly = False - Me.txtPruefsummeNetto._numbersOnly = False - Me.txtPruefsummeNetto._numbersOnlyKommastellen = "" - Me.txtPruefsummeNetto._numbersOnlyTrennzeichen = True - Me.txtPruefsummeNetto._Prozent = False - Me.txtPruefsummeNetto._ShortDateNew = False - Me.txtPruefsummeNetto._ShortDateOnly = False - Me.txtPruefsummeNetto._TimeOnly = False - Me.txtPruefsummeNetto._TimeOnly_Seconds = False - Me.txtPruefsummeNetto._value = "" - Me.txtPruefsummeNetto._Waehrung = False - Me.txtPruefsummeNetto._WaehrungZeichen = True - Me.txtPruefsummeNetto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtPruefsummeNetto.ForeColor = System.Drawing.Color.Black - Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 43) - Me.txtPruefsummeNetto.MaxLineLength = -1 - Me.txtPruefsummeNetto.MaxLines_Warning = "" - Me.txtPruefsummeNetto.MaxLines_Warning_Label = Nothing - Me.txtPruefsummeNetto.Name = "txtPruefsummeNetto" - Me.txtPruefsummeNetto.Size = New System.Drawing.Size(100, 20) - Me.txtPruefsummeNetto.TabIndex = 37 - Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Label2 ' Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -565,31 +515,6 @@ Partial Class frmMDMDatenverarbetiung Me.Label2.TabIndex = 36 Me.Label2.Text = "Anzahl:" ' - 'txtAnzahl - ' - Me.txtAnzahl._DateTimeOnly = False - Me.txtAnzahl._numbersOnly = False - Me.txtAnzahl._numbersOnlyKommastellen = "" - Me.txtAnzahl._numbersOnlyTrennzeichen = True - Me.txtAnzahl._Prozent = False - Me.txtAnzahl._ShortDateNew = False - Me.txtAnzahl._ShortDateOnly = False - Me.txtAnzahl._TimeOnly = False - Me.txtAnzahl._TimeOnly_Seconds = False - Me.txtAnzahl._value = "" - Me.txtAnzahl._Waehrung = False - Me.txtAnzahl._WaehrungZeichen = True - Me.txtAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtAnzahl.ForeColor = System.Drawing.Color.Black - Me.txtAnzahl.Location = New System.Drawing.Point(1051, 16) - Me.txtAnzahl.MaxLineLength = -1 - Me.txtAnzahl.MaxLines_Warning = "" - Me.txtAnzahl.MaxLines_Warning_Label = Nothing - Me.txtAnzahl.Name = "txtAnzahl" - Me.txtAnzahl.Size = New System.Drawing.Size(100, 20) - Me.txtAnzahl.TabIndex = 35 - Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'Button3 ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -627,6 +552,81 @@ Partial Class frmMDMDatenverarbetiung Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577) Me.MyDatagridview1.TabIndex = 0 ' + 'txtPruefsummeBrutto + ' + Me.txtPruefsummeBrutto._DateTimeOnly = False + Me.txtPruefsummeBrutto._numbersOnly = False + Me.txtPruefsummeBrutto._numbersOnlyKommastellen = "" + Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True + Me.txtPruefsummeBrutto._Prozent = False + Me.txtPruefsummeBrutto._ShortDateNew = False + Me.txtPruefsummeBrutto._ShortDateOnly = False + Me.txtPruefsummeBrutto._TimeOnly = False + Me.txtPruefsummeBrutto._TimeOnly_Seconds = False + Me.txtPruefsummeBrutto._value = "" + Me.txtPruefsummeBrutto._Waehrung = False + Me.txtPruefsummeBrutto._WaehrungZeichen = True + Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black + Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69) + Me.txtPruefsummeBrutto.MaxLineLength = -1 + Me.txtPruefsummeBrutto.MaxLines_Warning = "" + Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing + Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto" + Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20) + Me.txtPruefsummeBrutto.TabIndex = 43 + Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtPruefsummeNetto + ' + Me.txtPruefsummeNetto._DateTimeOnly = False + Me.txtPruefsummeNetto._numbersOnly = False + Me.txtPruefsummeNetto._numbersOnlyKommastellen = "" + Me.txtPruefsummeNetto._numbersOnlyTrennzeichen = True + Me.txtPruefsummeNetto._Prozent = False + Me.txtPruefsummeNetto._ShortDateNew = False + Me.txtPruefsummeNetto._ShortDateOnly = False + Me.txtPruefsummeNetto._TimeOnly = False + Me.txtPruefsummeNetto._TimeOnly_Seconds = False + Me.txtPruefsummeNetto._value = "" + Me.txtPruefsummeNetto._Waehrung = False + Me.txtPruefsummeNetto._WaehrungZeichen = True + Me.txtPruefsummeNetto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtPruefsummeNetto.ForeColor = System.Drawing.Color.Black + Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 43) + Me.txtPruefsummeNetto.MaxLineLength = -1 + Me.txtPruefsummeNetto.MaxLines_Warning = "" + Me.txtPruefsummeNetto.MaxLines_Warning_Label = Nothing + Me.txtPruefsummeNetto.Name = "txtPruefsummeNetto" + Me.txtPruefsummeNetto.Size = New System.Drawing.Size(100, 20) + Me.txtPruefsummeNetto.TabIndex = 37 + Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtAnzahl + ' + Me.txtAnzahl._DateTimeOnly = False + Me.txtAnzahl._numbersOnly = False + Me.txtAnzahl._numbersOnlyKommastellen = "" + Me.txtAnzahl._numbersOnlyTrennzeichen = True + Me.txtAnzahl._Prozent = False + Me.txtAnzahl._ShortDateNew = False + Me.txtAnzahl._ShortDateOnly = False + Me.txtAnzahl._TimeOnly = False + Me.txtAnzahl._TimeOnly_Seconds = False + Me.txtAnzahl._value = "" + Me.txtAnzahl._Waehrung = False + Me.txtAnzahl._WaehrungZeichen = True + Me.txtAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtAnzahl.ForeColor = System.Drawing.Color.Black + Me.txtAnzahl.Location = New System.Drawing.Point(1051, 16) + Me.txtAnzahl.MaxLineLength = -1 + Me.txtAnzahl.MaxLines_Warning = "" + Me.txtAnzahl.MaxLines_Warning_Label = Nothing + Me.txtAnzahl.Name = "txtAnzahl" + Me.txtAnzahl.Size = New System.Drawing.Size(100, 20) + Me.txtAnzahl.TabIndex = 35 + Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'frmMDMDatenverarbetiung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 64b91c6d..c22ee249 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -108,7 +108,10 @@ Public Class frmMDMDatenverarbetiung datum = SQL.getValueTxtBySql("select top (1) Abrechnungsdatum from Abrechnungsdatum", "ASFINAG") End If - genRGAtt_ASFINAG(abrechnungsDatum, datum) + + Dim inputKdNr = InputBox("Wenn einzelner Kunde abgerechnet werde soll, bitte KdNr eingeben" & vbNewLine & "Wenn keine KdNr angegeben wird, dann werden alle Kunden abgerechnet:", "Asfinag abrechen") + + genRGAtt_ASFINAG(abrechnungsDatum, datum, inputKdNr) initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked) End Select @@ -755,17 +758,22 @@ Public Class frmMDMDatenverarbetiung End Function - Function genRGAtt_ASFINAG(belegerstellungsdatum As DateTime, abrechnungsdatum As Date) As Boolean + Function genRGAtt_ASFINAG(belegerstellungsdatum As DateTime, abrechnungsdatum As Date, inputKdNr As String) As Boolean - If cbxASFINAGAbgerechnet.Checked = True Then + If cbxASFINAGAbgerechnet.Checked = False Then MsgBox("Bitte abgerechnete Daten auswählen!") Return False End If + Dim sqlWhere As String = "" + If inputKdNr <> "" Then + sqlWhere &= " AND Adressen.AdressenNr=" & inputKdNr + End If - Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT KundenNr, cardnumber FROM (SELECT Kreditkarten.KartenNr AS Kartennummer, Adressen.AdressenNr AS KundenNr FROM Adressen INNER JOIN Kreditkarten ON Adressen.AdressenNr = Kreditkarten.AdressenNr) as KUK INNER JOIN [tblAsfinagMaut] as Maut ON KUK.Kartennummer = Maut.cardnumber INNER JOIN Adressen ON KUK.KundenNr = Adressen.AdressenNr where Maut.receiptCreated = 0 Group by KundenNr, cardnumber ", "FMZOLL") + + Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT KundenNr, cardnumber FROM (SELECT Kreditkarten.KartenNr AS Kartennummer, Adressen.AdressenNr AS KundenNr FROM Adressen INNER JOIN Kreditkarten ON Adressen.AdressenNr = Kreditkarten.AdressenNr) as KUK INNER JOIN [tblAsfinagMaut] as Maut ON KUK.Kartennummer = Maut.cardnumber INNER JOIN Adressen ON KUK.KundenNr = Adressen.AdressenNr where Maut.receiptCreated = 0" & sqlWhere & "Group by KundenNr, cardnumber ", "FMZOLL") If dt_Main Is Nothing OrElse dt_Main.Rows.Count = 0 Then - MsgBox("Keine Daten!") + MsgBox("Keine Abrechnungsdaten vorhanden" & IIf(inputKdNr <> "", " für KundenNr: " & inputKdNr, "!")) Return False End If @@ -774,12 +782,12 @@ Public Class frmMDMDatenverarbetiung FROM Adressen INNER JOIN Kreditkarten ON Adressen.AdressenNr = Kreditkarten.AdressenNr) as KUK INNER JOIN [tblAsfinagMaut] as Maut ON KUK.Kartennummer = Maut.cardnumber INNER JOIN Adressen ON KUK.KundenNr = Adressen.AdressenNr - WHERE (Adressen.Rechnungsdruck)<>2", "FMZOLL") + WHERE 1 = 1" & sqlWhere, "FMZOLL") Dim dt_Main_CSV As DataTable = SQL.loadDgvBySql_Param("SELECT Adressen.AdressenNr, Maut.* FROM Adressen INNER JOIN (Kreditkarten INNER JOIN tblAsfinagMaut as Maut ON Kreditkarten.KartenNr = Maut.cardnumber) ON Adressen.AdressenNr = Kreditkarten.AdressenNr - WHERE Adressen.ASFINAGExportCSV = 1 + WHERE Adressen.ASFINAGExportCSV = 1 " & sqlWhere & " ORDER BY Adressen.AdressenNr, Maut.cardnumber, Maut.licenceplate, Maut.turnoverdate", "FMZOLL") Dim cnt = 0 @@ -787,12 +795,19 @@ Public Class frmMDMDatenverarbetiung Dim displayViewKunden = New DataView(dt_Main, "", "KundenNr", DataViewRowState.CurrentRows) Dim distinctDT_distKunden As DataTable = displayViewKunden.ToTable(True, "KundenNr") + Dim Info As String = "" + If inputKdNr = "" Then + Info = "Es wurden " & MyDatagridview1.Rows.Count & " Transaktionen von " & dt_Main.Rows.Count & " Kunden gefunden" + Else + Dim countTrans = SQL.getValueTxtBySql("SELECT count(cardnumber) FROM (SELECT Kreditkarten.KartenNr AS Kartennummer, Adressen.AdressenNr AS KundenNr FROM Adressen INNER JOIN Kreditkarten ON Adressen.AdressenNr = Kreditkarten.AdressenNr) as KUK INNER JOIN [tblAsfinagMaut] as Maut ON KUK.Kartennummer = Maut.cardnumber INNER JOIN Adressen ON KUK.KundenNr = Adressen.AdressenNr where Maut.receiptCreated = 0" & sqlWhere, "FMZOLL") + Info = "Es wurden " & countTrans & " Transaktionen von " & dt_Main.Rows.Count & " Kunden gefunden " + End If - If vbYes = MsgBox("Es wurden " & MyDatagridview1.Rows.Count & " Transaktionen von " & dt_Main.Rows.Count & " Kunden gefunden " & vbNewLine & " Möchten Sie die Anhänge erstellen?", vbYesNoCancel) Then - Dim dir = "C:\Users\d.breimaier\Desktop\Asfinag\Mautberichte" '"F:\FMZoll\Maut\AT\Anlagen\SDL" + If vbYes = MsgBox(Info & vbNewLine & "Möchten Sie die Rechnungen + Anhänge erstellen?", vbYesNoCancel) Then + Dim dir = "F:\FMZoll\Maut\AT\Anlagen" '"C:\Users\d.breimaier\Desktop\Asfinag\Mautberichte" - If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "") - Directory.CreateDirectory(dir) + 'If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "") + 'Directory.CreateDirectory(dir) If dt_Main_PDF IsNot Nothing AndAlso dt_Main_PDF.Rows.Count > 0 Then @@ -835,6 +850,7 @@ Public Class frmMDMDatenverarbetiung clmns &= dt_CSV_selected.Rows(i)(j).ToString.Replace(";", ",") & ";" Next outFile.WriteLine(clmns) + Next outFile.Close() Next @@ -850,10 +866,20 @@ Public Class frmMDMDatenverarbetiung If verarbOK Then - SQL.doSQL("UPDATE dbo.TTRBody SET belegerstellungsdatum = '" & belegerstellungsdatum & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <= '" & belegerstellungsdatum & "') AND (abrechnungsdatum = '" & abrechnungsdatum & "')", "ASFINAG") + If inputKdNr <> "" Then + Dim result As DataRow() = dt_Main.Select("KundenNr ='" & R_ASFINAG("KundenNr") & "'") + For Each row As DataRow In result + SQL.doSQL("UPDATE dbo.TTRBody SET belegerstellungsdatum = '" & belegerstellungsdatum & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <='" & belegerstellungsdatum & "') AND (abrechnungsdatum = '" & abrechnungsdatum & "') And belegerstellungsdatum is null And CardNumber = " & row.Item("cardnumber") & "", "ASFINAG") + Next + + Else + SQL.doSQL("UPDATE dbo.TTRBody SET belegerstellungsdatum = '" & belegerstellungsdatum & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <='" & belegerstellungsdatum & "') AND (abrechnungsdatum = '" & abrechnungsdatum & "') And belegerstellungsdatum is null", "ASFINAG") + End If + + Dim results As DataRow() = dt_Main.Select("KundenNr ='" & R_ASFINAG("KundenNr") & "'") For Each r As DataRow In results - SQL.doSQL("UPDATE [tblAsfinagMaut] SET receiptCreated = 1 WHERE cardnumber = " & r.Item("cardnumber") & "", "FMZOLL") + SQL.doSQL("UPDATE [tblAsfinagMaut] SET receiptCreated = 1 WHERE cardnumber = " & r.Item("cardnumber") & " AND receiptCreated = 0", "FMZOLL") Next End If @@ -1457,7 +1483,6 @@ Public Class frmMDMDatenverarbetiung rpt.lblSummeKennzeichen.Location = New PointF(rpt.lblSummeKennzeichen.Location.X + 4.5, rpt.lblSummeKennzeichen.Location.Y) 'rpt.lblSumKategorie.Location = New PointF(rpt.lblSumKategorie.Location.X + 4.5, rpt.lblSumKategorie.Location.Y) rpt.lblGessumme.Location = New PointF(rpt.lblGessumme.Location.X + 4.5, rpt.lblGessumme.Location.Y) - rpt.lblLand.Text = "AT" Dim sumNetto As Double = 0 Dim sumMWST As Double = 0 @@ -1479,6 +1504,7 @@ Public Class frmMDMDatenverarbetiung ' If cnt = 0 Then rpt.txtKunde.Text = SQL.isDbnullEmpty(rpt.Fields.Item("KundenNr").Value, "") rpt.txtKunde.Text &= " " & SQL.isDbnullEmpty(rpt.Fields.Item("Name 1").Value, "") + rpt.txtLand.Text = "AT" ' End If ' rpt.txtProduktBeschreibung.Text = sql.isDbnullEmpty(rpt.Fields.Item("BC_DESCR").Value, "") @@ -2605,8 +2631,8 @@ Public Class frmMDMDatenverarbetiung Private Function setFakturiert_ASFINAG() As Boolean 'Abrechnungsdatum setzen - If cbxASFINAGAbgerechnet.Checked = False Then - cbxASFINAGAbgerechnet.Checked = True + If cbxASFINAGAbgerechnet.Checked = True Then + cbxASFINAGAbgerechnet.Checked = False End If If MyDatagridview1.Rows.Count = 0 Then @@ -2659,8 +2685,8 @@ Public Class frmMDMDatenverarbetiung Private Sub Button10_Click(sender As Object, e As EventArgs) Handles bntDatumzuruecksetzen.Click - If cbxASFINAGAbgerechnet.Checked = True Then - cbxASFINAGAbgerechnet.Checked = False + If cbxASFINAGAbgerechnet.Checked = False Then + cbxASFINAGAbgerechnet.Checked = True End If If MyDatagridview1.Rows.Count = 0 Then @@ -2675,7 +2701,7 @@ Public Class frmMDMDatenverarbetiung If SQL.doSQL("DELETE FROM tblAsfinagMaut", "FMZOLL") Then MsgBox("Abrechnungsdatum zurückgesetzt!") End If - cbxASFINAGAbgerechnet.Checked = True + cbxASFINAGAbgerechnet.Checked = False 'initDgv_ASFINAG(cbxASFINAGNichtAbgerechnet.Checked) End If