From e9ce8f66c88bd6d3217ea4c5280c4e3a22f0e68b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 17 Dec 2025 11:21:05 +0100 Subject: [PATCH] Offert, Sicherheiten, etc. --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/usrCntlOfferte.vb | 8 +- .../usrCntlAuswertungenCBAM_DE.Designer.vb | 1 + SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb | 278 +++++++++++++----- SDL/zoll/usrCntlZOLLAuswertungen.vb | 198 ++++++++++++- VERAG_PROG_ALLGEMEIN/cSicherheiten.vb | 55 +++- 6 files changed, 455 insertions(+), 89 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 6847d078..55a9f384 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/usrCntlOfferte.vb b/SDL/kunden/usrCntlOfferte.vb index 460ebb17..9f075350 100644 --- a/SDL/kunden/usrCntlOfferte.vb +++ b/SDL/kunden/usrCntlOfferte.vb @@ -361,7 +361,7 @@ Public Class usrCntlOfferte If loaded = True Then dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("OFFERTE_DATIEREN", "SDL") Then dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now + dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now DGVHasChaged = True 'saveCurrentOffert() If isNew Then @@ -620,13 +620,7 @@ Public Class usrCntlOfferte If edit Then c.ReadOnly = False handleEditMode(edit) - Else - c.ReadOnly = True - handleEditMode(edit) End If - Else - c.ReadOnly = True - End If End If diff --git a/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb b/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb index 0805c458..b71784a3 100644 --- a/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb +++ b/SDL/zoll/usrCntlAuswertungenCBAM_DE.Designer.vb @@ -239,6 +239,7 @@ Partial Class usrCntlAuswertungenCBAM_DE ' Me.Controls.Add(Me.Label8) Me.Controls.Add(Me.GroupBox2) + Me.Name = "usrCntlAuswertungenCBAM_DE" Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() CType(Me.txtJahr, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index fb5fd71c..35ff3ed6 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -231,15 +231,8 @@ Partial Class usrCntlZOLLAuswertungen Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() - Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() - Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label60 = New System.Windows.Forms.Label() Me.GroupBox9 = New System.Windows.Forms.GroupBox() @@ -261,6 +254,23 @@ Partial Class usrCntlZOLLAuswertungen Me.Button14 = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.pnl = New System.Windows.Forms.Panel() + Me.TabPage6 = New System.Windows.Forms.TabPage() + Me.excelCbam = New System.Windows.Forms.Button() + Me.Label96 = New System.Windows.Forms.Label() + Me.von_CBAM = New System.Windows.Forms.DateTimePicker() + Me.Label97 = New System.Windows.Forms.Label() + Me.Label99 = New System.Windows.Forms.Label() + Me.bis_CBAM = New System.Windows.Forms.DateTimePicker() + Me.cbxcbamQuelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label100 = New System.Windows.Forms.Label() + Me.cbxCBAM_Detaildaten = New System.Windows.Forms.CheckBox() + Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() + Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() + Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() + Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.GroupBox1.SuspendLayout() Me.grpDurmaz.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -304,6 +314,7 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox9.SuspendLayout() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnl.SuspendLayout() + Me.TabPage6.SuspendLayout() Me.SuspendLayout() ' 'Label3 @@ -1298,11 +1309,12 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Controls.Add(Me.TabPage5) + Me.tbcntr.Controls.Add(Me.TabPage6) Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Top Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1211, 1829) + Me.tbcntr.Size = New System.Drawing.Size(1126, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1345,7 +1357,7 @@ Partial Class usrCntlZOLLAuswertungen 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(1203, 1803) + Me.TabPage1.Size = New System.Drawing.Size(1135, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -2542,27 +2554,11 @@ Partial Class usrCntlZOLLAuswertungen 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(1203, 1803) + Me.TabPage2.Size = New System.Drawing.Size(1135, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenUIDPruefung1 - ' - Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) - Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" - Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) - Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 - ' - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(708, 235) - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 - ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenEV_Veranlagungen1) @@ -2571,62 +2567,22 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(1220, 1803) + Me.TabPage3.Size = New System.Drawing.Size(1135, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenEV_Veranlagungen1 - ' - Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) - Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" - Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) - Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 - ' - 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 - ' - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) - Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 - ' - 'UsrCntlAuswertungenFiskalvertretung_42001 - ' - Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" - Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) - Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 - ' 'TabPage4 ' Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1) Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(1220, 1803) + Me.TabPage4.Size = New System.Drawing.Size(1135, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True ' - 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 - ' - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) - Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 - ' - 'UsrCntlAuswertungenAufschub_Abgabenliste1 - ' - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) - Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 - ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label60) @@ -2635,7 +2591,7 @@ Partial Class usrCntlZOLLAuswertungen 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(1220, 1803) + Me.TabPage5.Size = New System.Drawing.Size(1135, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2843,9 +2799,177 @@ Partial Class usrCntlZOLLAuswertungen Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1211, 57) + Me.pnl.Size = New System.Drawing.Size(1126, 57) Me.pnl.TabIndex = 23 ' + 'TabPage6 + ' + Me.TabPage6.Controls.Add(Me.cbxCBAM_Detaildaten) + Me.TabPage6.Controls.Add(Me.Label100) + Me.TabPage6.Controls.Add(Me.cbxcbamQuelle) + Me.TabPage6.Controls.Add(Me.Label99) + Me.TabPage6.Controls.Add(Me.bis_CBAM) + Me.TabPage6.Controls.Add(Me.Label97) + Me.TabPage6.Controls.Add(Me.excelCbam) + Me.TabPage6.Controls.Add(Me.Label96) + Me.TabPage6.Controls.Add(Me.von_CBAM) + Me.TabPage6.Location = New System.Drawing.Point(4, 22) + Me.TabPage6.Name = "TabPage6" + Me.TabPage6.Size = New System.Drawing.Size(1118, 1803) + Me.TabPage6.TabIndex = 5 + Me.TabPage6.Text = "CBAM" + Me.TabPage6.UseVisualStyleBackColor = True + ' + 'excelCbam + ' + Me.excelCbam.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.excelCbam.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.excelCbam.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.excelCbam.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.excelCbam.Location = New System.Drawing.Point(13, 103) + Me.excelCbam.Name = "excelCbam" + Me.excelCbam.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) + Me.excelCbam.Size = New System.Drawing.Size(121, 38) + Me.excelCbam.TabIndex = 22 + Me.excelCbam.Text = "Excel" + Me.excelCbam.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.excelCbam.UseVisualStyleBackColor = True + ' + 'Label96 + ' + Me.Label96.AutoSize = True + Me.Label96.Location = New System.Drawing.Point(114, 37) + Me.Label96.Name = "Label96" + Me.Label96.Size = New System.Drawing.Size(38, 13) + Me.Label96.TabIndex = 21 + Me.Label96.Text = "Datum" + ' + 'von_CBAM + ' + Me.von_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.von_CBAM.Location = New System.Drawing.Point(117, 53) + Me.von_CBAM.Name = "von_CBAM" + Me.von_CBAM.Size = New System.Drawing.Size(93, 20) + Me.von_CBAM.TabIndex = 20 + ' + 'Label97 + ' + Me.Label97.AutoSize = True + Me.Label97.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label97.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label97.Location = New System.Drawing.Point(10, 9) + Me.Label97.Name = "Label97" + Me.Label97.Size = New System.Drawing.Size(140, 17) + Me.Label97.TabIndex = 24 + Me.Label97.Text = "CBAM Kundenliste" + ' + 'Label99 + ' + Me.Label99.AutoSize = True + Me.Label99.Location = New System.Drawing.Point(224, 56) + Me.Label99.Name = "Label99" + Me.Label99.Size = New System.Drawing.Size(23, 13) + Me.Label99.TabIndex = 26 + Me.Label99.Text = "bis:" + ' + 'bis_CBAM + ' + Me.bis_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.bis_CBAM.Location = New System.Drawing.Point(253, 53) + Me.bis_CBAM.Name = "bis_CBAM" + Me.bis_CBAM.Size = New System.Drawing.Size(93, 20) + Me.bis_CBAM.TabIndex = 25 + ' + 'cbxcbamQuelle + ' + Me.cbxcbamQuelle._allowedValuesFreiText = Nothing + Me.cbxcbamQuelle._allowFreiText = False + Me.cbxcbamQuelle._value = "" + Me.cbxcbamQuelle.DropDownHeight = 100 + Me.cbxcbamQuelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxcbamQuelle.DropDownWidth = 100 + Me.cbxcbamQuelle.FormattingEnabled = True + Me.cbxcbamQuelle.IntegralHeight = False + Me.cbxcbamQuelle.Location = New System.Drawing.Point(13, 53) + Me.cbxcbamQuelle.Name = "cbxcbamQuelle" + Me.cbxcbamQuelle.Size = New System.Drawing.Size(85, 21) + Me.cbxcbamQuelle.TabIndex = 27 + ' + 'Label100 + ' + Me.Label100.AutoSize = True + Me.Label100.Location = New System.Drawing.Point(10, 37) + Me.Label100.Name = "Label100" + Me.Label100.Size = New System.Drawing.Size(37, 13) + Me.Label100.TabIndex = 28 + Me.Label100.Text = "Quelle" + ' + 'cbxCBAM_Detaildaten + ' + Me.cbxCBAM_Detaildaten.AutoSize = True + Me.cbxCBAM_Detaildaten.Location = New System.Drawing.Point(13, 80) + Me.cbxCBAM_Detaildaten.Name = "cbxCBAM_Detaildaten" + Me.cbxCBAM_Detaildaten.Size = New System.Drawing.Size(126, 17) + Me.cbxCBAM_Detaildaten.TabIndex = 29 + Me.cbxCBAM_Detaildaten.Text = "mit Sendunggsdetails" + Me.cbxCBAM_Detaildaten.UseVisualStyleBackColor = True + ' + 'UsrCntlAuswertungenUIDPruefung1 + ' + Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenUIDPruefung1.Location = New System.Drawing.Point(6, 259) + Me.UsrCntlAuswertungenUIDPruefung1.Name = "UsrCntlAuswertungenUIDPruefung1" + Me.UsrCntlAuswertungenUIDPruefung1.Size = New System.Drawing.Size(708, 176) + Me.UsrCntlAuswertungenUIDPruefung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenKunden_Auftragsrueckgang1 + ' + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(708, 235) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 + ' + 'UsrCntlAuswertungenEV_Veranlagungen1 + ' + Me.UsrCntlAuswertungenEV_Veranlagungen1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenEV_Veranlagungen1.Location = New System.Drawing.Point(3, 568) + Me.UsrCntlAuswertungenEV_Veranlagungen1.Name = "UsrCntlAuswertungenEV_Veranlagungen1" + Me.UsrCntlAuswertungenEV_Veranlagungen1.Size = New System.Drawing.Size(708, 105) + Me.UsrCntlAuswertungenEV_Veranlagungen1.TabIndex = 2 + ' + 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 + ' + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Location = New System.Drawing.Point(3, 327) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Name = "UsrCntlAuswertungenFiskal_IntrastatMeldung1" + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.Size = New System.Drawing.Size(708, 235) + Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.TabIndex = 1 + ' + 'UsrCntlAuswertungenFiskalvertretung_42001 + ' + Me.UsrCntlAuswertungenFiskalvertretung_42001.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenFiskalvertretung_42001.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenFiskalvertretung_42001.Name = "UsrCntlAuswertungenFiskalvertretung_42001" + Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) + Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 + ' + 'UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 + ' + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Location = New System.Drawing.Point(3, 149) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Name = "UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1" + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.Size = New System.Drawing.Size(708, 120) + Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1.TabIndex = 1 + ' + 'UsrCntlAuswertungenAufschub_Abgabenliste1 + ' + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Location = New System.Drawing.Point(3, 22) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Name = "UsrCntlAuswertungenAufschub_Abgabenliste1" + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) + Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 + ' 'usrCntlZOLLAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2855,7 +2979,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(1211, 1174) + Me.Size = New System.Drawing.Size(1126, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.grpDurmaz.ResumeLayout(False) @@ -2916,6 +3040,8 @@ Partial Class usrCntlZOLLAuswertungen CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + Me.TabPage6.ResumeLayout(False) + Me.TabPage6.PerformLayout() Me.ResumeLayout(False) End Sub @@ -3158,4 +3284,14 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Button24 As Button Friend WithEvents Label36 As Label Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents TabPage6 As TabPage + Friend WithEvents Label100 As Label + Friend WithEvents cbxcbamQuelle As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label99 As Label + Friend WithEvents bis_CBAM As DateTimePicker + Friend WithEvents Label97 As Label + Friend WithEvents excelCbam As Button + Friend WithEvents Label96 As Label + Friend WithEvents von_CBAM As DateTimePicker + Friend WithEvents cbxCBAM_Detaildaten As CheckBox End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index dc5b2196..3c0fed25 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -1,4 +1,5 @@ Imports System.IO +Imports GrapeCity.DataVisualization.Chart Public Class usrCntlZOLLAuswertungen @@ -133,8 +134,16 @@ Public Class usrCntlZOLLAuswertungen cboDYDatumArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Eröffnungsdatum", "OPEN")) cboDYDatumArt.SelectedIndex = 0 + cbxcbamQuelle.Items.Clear() + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "DAKOSY")) + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DHF", "DHF")) + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DHF-UNISPED", "DHF-UNI")) + cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELOTEC", "TELOTEC")) + cbxcbamQuelle.SelectedIndex = 0 - + Dim yearStart As Date = CDate("01.01." & Now.Year) + von_CBAM.Value = yearStart + bis_CBAM.Value = Now cboEZOLLBrg.Items.Clear() cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) @@ -1031,6 +1040,193 @@ Public Class usrCntlZOLLAuswertungen End Sub + Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles excelCbam.Click + + If cbxcbamQuelle.SelectedIndex = 0 Then + cbxcbamQuelle.Focus() + End If + + Dim SQLString As String = "" + Dim Quelle As String = "FMZOLL" + + Select Case cbxcbamQuelle._value + Case "DAKOSY" : SQLString = getDAkosySQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "FMZOLL" + Case "DHF" : SQLString = getDHFSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "EZOLL" + Case "DHF-UNI" : SQLString = getDHFSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "EZOLL_UNISPED" + Case "TELOTEC" : SQLString = getTELOTECSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked) : Quelle = "FMZOLL" + + End Select + + + Dim dt As DataTable = SQL.loadDgvBySql(SQLString, Quelle, 700) + If dt IsNot Nothing Then + cProgramFunctions.genExcelFromDT_NEW(dt) + End If + + End Sub + + Private Function getDAkosySQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean) + + Return "SELECT + Empfaenger.ezaAd_TeilnehmerEORI AS EmpfängerEORI, + Adressen.AdressenNr as KundenNr, + Adressen.[Name 1] as Kunde," & IIf(mitDetaildatensaetze, " COUNT(DISTINCT eza_ANR) As Anzahl_Anmeldungen,COUNT(*) As Anzahl_Positionen,SUM(ezaWP_Eigenmasse) As Summe_Eigenmasse,SUM(ezaWP_Artikelpreis) As Summe_Rechnungspreis, MAX(eza_Anmeldedatum) As Letzte_Anmeldung,MIN(eza_Anmeldedatum) As Erste_Anmeldung, ", "") & "kkd_Email as Email, + Adressen.[E-Mail] as EMailKunde1, + Adressen.[E-Mail2] as EMailKunde2, + isnull(Offerten.OffertenNr, '-') as Offert, + Kunden.FilialenNr as FilialenNr + + + From [VERAG].[dbo].[tblDakosy_EZA] +INNER Join tblDakosy_EZA_Warenposition ON ezaWP_EzaId = eza_Id +Left Join tblDakosy_EZA_Adressen AS Empfaenger ON Empfaenger.ezaAd_EZAId = eza_Id And Empfaenger.ezaAd_AdressTyp = 'CN' + Left Join Kunden on Kunden.EORITIN = Empfaenger.ezaAd_TeilnehmerEORI +Left Join Adressen on Adressen.AdressenNr = Kunden.KundenNr +Left Join Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 +Left Join tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + + WHERE + ISNULL(eza_anmeldedatum, eza_Trans_DatumZeit) + BETWEEN '" & von & "' AND '" & bis & "' + And eza_status BETWEEN 41 And 60 + And ( + /* Eisen & Stahl */ + ezaWP_WarennummerEZT Like '72%' + Or ezaWP_WarennummerEZT Like '7301%' -- Schienen, Profile etc. + Or ezaWP_WarennummerEZT Like '7302%' + Or ezaWP_WarennummerEZT Like '7303%' + Or ezaWP_WarennummerEZT Like '7304%' + Or ezaWP_WarennummerEZT Like '7305%' + Or ezaWP_WarennummerEZT Like '7306%' + + /* Zement */ + Or ezaWP_WarennummerEZT Like '2523%' + + /* Aluminium */ + Or ezaWP_WarennummerEZT Like '76%' + + /* Düngemittel */ + Or ezaWP_WarennummerEZT Like '3102%' + Or ezaWP_WarennummerEZT Like '3103%' + Or ezaWP_WarennummerEZT Like '3104%' + Or ezaWP_WarennummerEZT Like '3105%' + + /* Elektrizität */ + Or ezaWP_WarennummerEZT Like '2716%' + + /* Wasserstoff */ + Or ezaWP_WarennummerEZT Like '280410%' + ) + + GROUP BY + Empfaenger.ezaAd_TeilnehmerEORI,Adressen.AdressenNr, Adressen.[Name 1],Adressen.[E-Mail],Adressen.[E-Mail2], kkd_Email, Offerten.OffertenNr, Kunden.FilialenNr" + + + End Function + + Private Function getDHFSQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean) + + Return " select + (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID ))EORI_Empfänger, + Adressen.AdressenNr as KundenNr, + Adressen.[Name 1] as Kunde, " & IIf(mitDetaildatensaetze, "COUNT(DISTINCT CRN) As Anzahl_Anmeldungen, COUNT(*) As Anzahl_Positionen,MAX(DecDT) As Letzte_Anmeldung,MIN(DecDT) As Erste_Anmeldung,SUM(Net) As Summe_Eigenmasse,SUM(ItVal) As Summe_Rechnungspreis, ", "") & + "kkd_Email as Email, +Adressen.[E-Mail] as EMailKunde1, + Adressen.[E-Mail2] as EMailKunde2, + isnull(Offerten.OffertenNr, '-') as Offert, + Kunden.FilialenNr as FilialenNr + + + --, (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID ))EORI_Empfänger + --, (SELECT Na FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID ))Empfänger + from zsAnmRefs + inner join zsAnmGdsitem on zsAnmRefs.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmRefs.AnmID=zsAnmGdsitem.AnmID and zsAnmRefs.VorgangID=zsAnmGdsitem.VorgangID and zsAnmRefs.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmHea on zsAnmHea.LizenzNr=zsAnmGdsitem.LizenzNr and zsAnmHea.AnmID=zsAnmGdsitem.AnmID and zsAnmHea.VorgangID=zsAnmGdsitem.VorgangID and zsAnmHea.OperatorID=zsAnmGdsitem.OperatorID + inner join zsAnmDeclarant on zsAnmHea.LizenzNr=zsAnmDeclarant.LizenzNr and zsAnmHea.AnmID=zsAnmDeclarant.AnmID and zsAnmHea.VorgangID=zsAnmDeclarant.VorgangID and zsAnmHea.OperatorID=zsAnmDeclarant.OperatorID + inner join zsAnmTransp on zsAnmHea.LizenzNr=zsAnmTransp.LizenzNr and zsAnmHea.AnmID=zsAnmTransp.AnmID and zsAnmHea.VorgangID=zsAnmTransp.VorgangID and zsAnmHea.OperatorID=zsAnmTransp.OperatorID + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].[Kunden] on Kunden.EORITIN = (SELECT TIN FROM zsAnmConeeTra WHERE (zsAnmConeeTra.LizenzNr = zsAnmHea.LizenzNr ) And (zsAnmConeeTra.OperatorID =zsAnmHea.OperatorID ) And (zsAnmConeeTra.VorgangID = zsAnmHea.VorgangID ) And (zsAnmConeeTra.AnmID = zsAnmHea.AnmID )) + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Adressen on Adressen.AdressenNr = Kunden.KundenNr + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 + Left Join [FMZOLL\SQLFMZOLL].[VERAG].[dbo].tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + where DecDT between '" & von & "' AND '" & bis & "' + + and + ( + left(ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(ComCd,4) between 7301 and 7311 + OR left(ComCd,4) between 7205 and 7229 + OR left(ComCd,4) between 7603 and 7614 + OR ComCd like '25070080%' + OR ComCd like '283421%' + OR ComCd like '260112%' + OR ComCd like '720211%' + OR ComCd like '720219%' + OR ComCd like '720241%' + OR ComCd like '720249%' + OR ComCd like '720260%' + OR ComCd like '280410%' + ) + and ComCd not like '310560%' + and crn is not null + + + group by TIN, Adressen.AdressenNr ,Adressen.[Name 1],Adressen.[E-Mail],Adressen.[E-Mail2], kkd_Email, Offerten.OffertenNr, Kunden.FilialenNr, zsAnmHea.LizenzNr, zsAnmHea.OperatorID, zsAnmHea.VorgangID, zsAnmHea.AnmID" + + + End Function + + Private Function getTELOTECSQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean) + + Return " SELECT + ConeeTra_TIN as EmpfängerEORI, + Adressen.AdressenNr as KundenNr, + Adressen.[Name 1] as Kunde," & IIf(mitDetaildatensaetze, " COUNT(DISTINCT telanm_CRN) As Anzahl_Anmeldungen,COUNT(*) As Anzahl_Positionen,MAX(dec_CreateDate) As Letzte_Anmeldung,MIN(dec_CreateDate) As Erste_Anmeldung,SUM(dec_TotNet) As Summe_Eigenmasse,SUM(ValData_InvVal) As Summe_Rechnungspreis, ", "") & + "kkd_Email as Email, +Adressen.[E-Mail] as EMailKunde1, + Adressen.[E-Mail2] as EMailKunde2, + isnull(Offerten.OffertenNr, '-') as Offert, + Kunden.FilialenNr as FilialenNr + + + FROM [VERAG].[dbo].[tblTelotec_Anmeldung] + inner join tblTelotec_Positionsdaten on telpos_telanmId=telanm_id +Left Join Kunden on Kunden.EORITIN = ConeeTra_TIN +Left Join Adressen on Adressen.AdressenNr = Kunden.KundenNr +Left Join Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 +Left Join tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + + where 1=1 + +and + ( + left(Item_ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + OR left(Item_ComCd,4) between 7301 and 7311 + OR left(Item_ComCd,4) between 7205 and 7229 + OR left(Item_ComCd,4) between 7603 and 7614 + OR Item_ComCd like '25070080%' + OR Item_ComCd like '283421%' + OR Item_ComCd like '260112%' + OR Item_ComCd like '720211%' + OR Item_ComCd like '720219%' + OR Item_ComCd like '720241%' + OR Item_ComCd like '720249%' + OR Item_ComCd like '720260%' + OR Item_ComCd like '280410%' + ) + and Item_ComCd not like '310560%' + + and telnam_aktuellsteNachricht=1 + + and telanm_ART ='EUA' + and dec_CreateDate between '" & von & "' AND '" & bis & "' + + group by ConeeTra_TIN, Adressen.AdressenNr,Adressen.[Name 1],Adressen.[E-Mail],Adressen.[E-Mail2], kkd_Email, Offerten.OffertenNr, Kunden.FilialenNr" + + + End Function + + + 'Private Sub Button5_Click(sender As Object, e As EventArgs, Optional exportPDF As String = "", Optional exportEXCEL As String = "") Handles Button5.Click ' Dim sqlStr = "" diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index dd4ce49f..19438430 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -40,6 +40,13 @@ Public Class cSicherheiten LOAD() End Sub + Sub New(gs_gsID, gs_posNr, gs_posSubNr) + Me.gs_gsId = gs_gsID + Me.gs_posNr = gs_posNr + Me.gs_posSubNr = gs_posSubNr + LOADSubNr() + End Sub + Sub New(gs_gsNr) Me.gs_gsNr = gs_gsNr LOADGSNR() @@ -49,7 +56,7 @@ Public Class cSicherheiten End Sub - Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Function getParameterList(Optional WithoutPosSubNr As Boolean = False) As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_gsId", gs_gsId,, True)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_ATBNr", gs_ATBNr)) @@ -76,7 +83,7 @@ Public Class cSicherheiten list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_zuletztgeandert", gs_zuletztgeandert)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_MRNNr", gs_MRNNr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr)) + If Not WithoutPosSubNr Then list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr)) Return list End Function @@ -110,19 +117,21 @@ Public Class cSicherheiten - Public Function UPDATEWithNewPosNr() As Integer + Public Function UPDATEWithNewPosNr(Optional ingorePosSubNr As Boolean = False) As Integer - Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList(ingorePosSubNr) - Dim sqlstr = " BEGIN " & getUpdateCmd() & " END " + Dim sqlstr = " BEGIN " & getUpdateCmd(ingorePosSubNr) & " END " - gs_gsId = SQL.doSQLVarListID(gs_gsId, sqlstr, "AVISO", , List) + gs_gsId = SQL.doSQLVarListID(gs_gsId, sqlstr, "AVISO", , list) Return gs_gsId End Function + + Public Sub LOAD() Try hasEntry = False @@ -152,6 +161,36 @@ Public Class cSicherheiten End Try End Sub + Public Sub LOADSubNr() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO() + Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheit] WHERE gs_gsId=@gs_gsId AND gs_posNr=@gs_posNr AND gs_posSubNr=@gs_posSubNr ", conn) + cmd.Parameters.AddWithValue("@gs_gsID", gs_gsId) + cmd.Parameters.AddWithValue("@gs_posNr", gs_posNr) + cmd.Parameters.AddWithValue("@gs_posSubNr", gs_posSubNr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + Public Sub LOADGSNR() Try @@ -184,9 +223,9 @@ Public Class cSicherheiten - Public Function getUpdateCmd() As String + Public Function getUpdateCmd(Optional ingorePosSubNr As Boolean = False) As String Try - Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList(ingorePosSubNr) Dim str As String = "" For Each i In list