From 9d963d9e92792df7ebbde5fe4d17cf97d983c7ab Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 5 Sep 2023 21:42:34 +0200 Subject: [PATCH 1/2] Atilla 4802 --- SDL/Fakturierung/usrCntlFaktAbrechnung.vb | 2 +- SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb | 104 +++++++++---------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index f49a665c..8f41c78d 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -1772,7 +1772,7 @@ Public Class usrCntlFaktAbrechnung Sub initFirma() Select Case cboFiliale._value Case "4805" : cboFirma.changeItem(11) : RECHNUNG.Firma_ID = 11 - Case "4801" : cboFirma.changeItem(7) : RECHNUNG.Firma_ID = 7 + Case "4801", "4802" : cboFirma.changeItem(7) : RECHNUNG.Firma_ID = 7 Case "5501" : cboFirma.changeItem(20) : RECHNUNG.Firma_ID = 20 '' Case "4819" : cboFirma.changeItem(4) : RECHNUNG.Firma_ID = 4 diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index b0a1da93..3cf8ade3 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -64,7 +64,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label19 = New System.Windows.Forms.Label() Me.cboEZOLLMandant = New System.Windows.Forms.ComboBox() Me.Label29 = New System.Windows.Forms.Label() - Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboEZOLLStatus = New System.Windows.Forms.ComboBox() Me.Label20 = New System.Windows.Forms.Label() Me.datEZOLLBis = New System.Windows.Forms.DateTimePicker() @@ -142,7 +141,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label76 = New System.Windows.Forms.Label() Me.GroupBox11 = New System.Windows.Forms.GroupBox() Me.Label94 = New System.Windows.Forms.Label() - Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button22 = New System.Windows.Forms.Button() Me.Button19 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() @@ -185,7 +183,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label56 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() - Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label55 = New System.Windows.Forms.Label() Me.datEZOLL_TC_Bis = New System.Windows.Forms.DateTimePicker() Me.Label57 = New System.Windows.Forms.Label() @@ -247,6 +244,9 @@ 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.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() @@ -754,20 +754,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label29.TabIndex = 19 Me.Label29.Text = "Mandant:" ' - 'cboEZOLLBrg - ' - Me.cboEZOLLBrg._allowedValuesFreiText = Nothing - Me.cboEZOLLBrg._allowFreiText = False - Me.cboEZOLLBrg._value = "" - Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboEZOLLBrg.DropDownWidth = 350 - Me.cboEZOLLBrg.FormattingEnabled = True - Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) - Me.cboEZOLLBrg.Name = "cboEZOLLBrg" - Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) - Me.cboEZOLLBrg.TabIndex = 12 - ' 'cboEZOLLStatus ' Me.cboEZOLLStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -1240,7 +1226,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(643, 1829) + Me.tbcntr.Size = New System.Drawing.Size(609, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1283,7 +1269,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(635, 1803) + Me.TabPage1.Size = New System.Drawing.Size(601, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -1607,19 +1593,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label94.TabIndex = 18 Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):" ' - 'cboBRG_Verimex - ' - Me.cboBRG_Verimex._allowedValuesFreiText = Nothing - Me.cboBRG_Verimex._allowFreiText = False - Me.cboBRG_Verimex._value = "" - Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBRG_Verimex.DropDownWidth = 350 - Me.cboBRG_Verimex.FormattingEnabled = True - Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) - Me.cboBRG_Verimex.Name = "cboBRG_Verimex" - Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) - Me.cboBRG_Verimex.TabIndex = 17 - ' 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2053,20 +2026,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label53.TabIndex = 13 Me.Label53.Text = "Bürgschaft (keine Auswahl = alle):" ' - 'cboBrgEZollTC - ' - Me.cboBrgEZollTC._allowedValuesFreiText = Nothing - Me.cboBrgEZollTC._allowFreiText = False - Me.cboBrgEZollTC._value = "" - Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBrgEZollTC.DropDownWidth = 350 - Me.cboBrgEZollTC.FormattingEnabled = True - Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) - Me.cboBrgEZollTC.Name = "cboBrgEZollTC" - Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) - Me.cboBrgEZollTC.TabIndex = 12 - ' 'Label55 ' Me.Label55.AutoSize = True @@ -2447,7 +2406,7 @@ 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(652, 1803) + Me.TabPage2.Size = New System.Drawing.Size(618, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True @@ -2460,7 +2419,7 @@ 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(652, 1803) + Me.TabPage3.Size = New System.Drawing.Size(618, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True @@ -2471,7 +2430,7 @@ Partial Class usrCntlZOLLAuswertungen 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(652, 1803) + Me.TabPage4.Size = New System.Drawing.Size(618, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True @@ -2484,7 +2443,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(652, 1803) + Me.TabPage5.Size = New System.Drawing.Size(618, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2692,9 +2651,50 @@ 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(643, 57) + Me.pnl.Size = New System.Drawing.Size(609, 57) Me.pnl.TabIndex = 23 ' + 'cboBRG_Verimex + ' + Me.cboBRG_Verimex._allowedValuesFreiText = Nothing + Me.cboBRG_Verimex._allowFreiText = False + Me.cboBRG_Verimex._value = "" + Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBRG_Verimex.DropDownWidth = 350 + Me.cboBRG_Verimex.FormattingEnabled = True + Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) + Me.cboBRG_Verimex.Name = "cboBRG_Verimex" + Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) + Me.cboBRG_Verimex.TabIndex = 17 + ' + 'cboBrgEZollTC + ' + Me.cboBrgEZollTC._allowedValuesFreiText = Nothing + Me.cboBrgEZollTC._allowFreiText = False + Me.cboBrgEZollTC._value = "" + Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBrgEZollTC.DropDownWidth = 350 + Me.cboBrgEZollTC.FormattingEnabled = True + Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) + Me.cboBrgEZollTC.Name = "cboBrgEZollTC" + Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) + Me.cboBrgEZollTC.TabIndex = 12 + ' + 'cboEZOLLBrg + ' + Me.cboEZOLLBrg._allowedValuesFreiText = Nothing + Me.cboEZOLLBrg._allowFreiText = False + Me.cboEZOLLBrg._value = "" + Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboEZOLLBrg.DropDownWidth = 350 + Me.cboEZOLLBrg.FormattingEnabled = True + Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) + Me.cboEZOLLBrg.Name = "cboEZOLLBrg" + Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) + Me.cboEZOLLBrg.TabIndex = 12 + ' 'UsrCntlAuswertungenUIDPruefung1 ' Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White @@ -2762,7 +2762,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(643, 1445) + Me.Size = New System.Drawing.Size(609, 1445) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.GroupBox2.ResumeLayout(False) From 0fc8b416cb59cb7189dafff3df7ea814677daf3e Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 7 Sep 2023 11:29:56 +0200 Subject: [PATCH 2/2] DATENSERVER Datenarchivarchiv --- SDL/SDL.vbproj | 2 +- .../usrCntlSpeditionsBuchSuche.vb | 14 +- SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb | 234 +++++++++--------- SDL/zoll/usrCntlZOLLAuswertungen.vb | 1 + .../DATENSERVER/cDATENSERVER.vb | 68 ++++- .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 1 + 6 files changed, 196 insertions(+), 124 deletions(-) diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 48d93652..baede251 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -90,7 +90,7 @@ false - Test.pfx + SDL_TemporaryKey.pfx diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index cba03172..9d946753 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -376,7 +376,12 @@ Public Class usrCntlSpeditionsBuchSuche cboSachbearbeiter.fillWithSQL("SELECT ID,/*cast(ID as nvarchar(3)) +' ' + Name as*/ Name FROM Personal WHERE [Status]<>'L' " & sbWhere & " ORDER BY Name ", False, "FMZOLL", True) - cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN(4801,4802) ORDER BY FilialenNr ", True, "FMZOLL", True) + Else + cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) + End If + ' cboFilialeHandling.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) ' txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) txtZollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) @@ -390,6 +395,9 @@ Public Class usrCntlSpeditionsBuchSuche cboFiliale.fillWithSQL("SELECT FilialenNr, Grenzstelle FROM Filialen WHERE Fil_Status='A' AND FilialenNr IN ('" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "'" & whereCluster & ") ORDER BY FilialenNr ", True, "FMZOLL", True) ' cboFiliale._allowedValuesFreiText = {VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE, 5801} + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + cboFiliale._allowedValuesFreiText = {4801, 4802} + cboFiliale.Enabled = True Else cboFiliale._allowedValuesFreiText = {VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE} cboFiliale.Enabled = False @@ -959,7 +967,7 @@ Public Class usrCntlSpeditionsBuchSuche Dim sqlstr As String = "" sqlstr &= " SELECT Aviso.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch INNER JOIN " & AVISOSERVER & " on Aviso.avisoid=Speditionsbuch.AvisoID WHERE PersonalnummerQS is not null " - sqlstr &= " and FilialenNr NOT IN ( 4801,4806 ) " + sqlstr &= " and FilialenNr NOT IN ( 4801,4802,4806 ) " Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() & " GROUP BY Aviso.[Grenzstelle]" & " ORDER BY Anzahl DESC", @@ -1351,7 +1359,7 @@ Public Class usrCntlSpeditionsBuchSuche DataGridView.Columns.Clear() Dim sqlstr As String = "" sqlstr &= " SELECT Aviso.[Grenzstelle], SUM(Speditionsbuch.Abfertigungsanzahl) as Anzahl FROM Speditionsbuch INNER JOIN " & AVISOSERVER & " on Aviso.avisoid=Speditionsbuch.AvisoID WHERE Abfertigungsart IN (26,28) " - sqlstr &= " AND Aviso.[Grenzstelle] <> 'SFD' and FilialenNr NOT IN ( 4801,4806 ) " + sqlstr &= " AND Aviso.[Grenzstelle] <> 'SFD' and FilialenNr NOT IN ( 4801,4802,4806 ) " Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr & getSpedBuchWhere() & " GROUP BY Aviso.[Grenzstelle]" & " ORDER BY Anzahl DESC", diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index 3cf8ade3..4a16597d 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -64,6 +64,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label19 = New System.Windows.Forms.Label() Me.cboEZOLLMandant = New System.Windows.Forms.ComboBox() Me.Label29 = New System.Windows.Forms.Label() + Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboEZOLLStatus = New System.Windows.Forms.ComboBox() Me.Label20 = New System.Windows.Forms.Label() Me.datEZOLLBis = New System.Windows.Forms.DateTimePicker() @@ -141,6 +142,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label76 = New System.Windows.Forms.Label() Me.GroupBox11 = New System.Windows.Forms.GroupBox() Me.Label94 = New System.Windows.Forms.Label() + Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button22 = New System.Windows.Forms.Button() Me.Button19 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() @@ -183,6 +185,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label56 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() + Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label55 = New System.Windows.Forms.Label() Me.datEZOLL_TC_Bis = New System.Windows.Forms.DateTimePicker() Me.Label57 = New System.Windows.Forms.Label() @@ -221,8 +224,15 @@ Partial Class usrCntlZOLLAuswertungen Me.pic = 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() @@ -244,16 +254,6 @@ 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.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() - 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.GroupBox2.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -754,6 +754,20 @@ Partial Class usrCntlZOLLAuswertungen Me.Label29.TabIndex = 19 Me.Label29.Text = "Mandant:" ' + 'cboEZOLLBrg + ' + Me.cboEZOLLBrg._allowedValuesFreiText = Nothing + Me.cboEZOLLBrg._allowFreiText = False + Me.cboEZOLLBrg._value = "" + Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboEZOLLBrg.DropDownWidth = 350 + Me.cboEZOLLBrg.FormattingEnabled = True + Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) + Me.cboEZOLLBrg.Name = "cboEZOLLBrg" + Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) + Me.cboEZOLLBrg.TabIndex = 12 + ' 'cboEZOLLStatus ' Me.cboEZOLLStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -1226,7 +1240,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.Location = New System.Drawing.Point(0, 57) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(609, 1829) + Me.tbcntr.Size = New System.Drawing.Size(774, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1269,7 +1283,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(601, 1803) + Me.TabPage1.Size = New System.Drawing.Size(766, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -1593,6 +1607,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label94.TabIndex = 18 Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):" ' + 'cboBRG_Verimex + ' + Me.cboBRG_Verimex._allowedValuesFreiText = Nothing + Me.cboBRG_Verimex._allowFreiText = False + Me.cboBRG_Verimex._value = "" + Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBRG_Verimex.DropDownWidth = 350 + Me.cboBRG_Verimex.FormattingEnabled = True + Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) + Me.cboBRG_Verimex.Name = "cboBRG_Verimex" + Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) + Me.cboBRG_Verimex.TabIndex = 17 + ' 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2026,6 +2053,20 @@ Partial Class usrCntlZOLLAuswertungen Me.Label53.TabIndex = 13 Me.Label53.Text = "Bürgschaft (keine Auswahl = alle):" ' + 'cboBrgEZollTC + ' + Me.cboBrgEZollTC._allowedValuesFreiText = Nothing + Me.cboBrgEZollTC._allowFreiText = False + Me.cboBrgEZollTC._value = "" + Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBrgEZollTC.DropDownWidth = 350 + Me.cboBrgEZollTC.FormattingEnabled = True + Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) + Me.cboBrgEZollTC.Name = "cboBrgEZollTC" + Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) + Me.cboBrgEZollTC.TabIndex = 12 + ' 'Label55 ' Me.Label55.AutoSize = True @@ -2406,11 +2447,29 @@ 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(618, 1803) + Me.TabPage2.Size = New System.Drawing.Size(601, 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.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + 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(0, 235) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 + ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenEV_Veranlagungen1) @@ -2419,22 +2478,62 @@ 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(618, 1803) + Me.TabPage3.Size = New System.Drawing.Size(601, 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(618, 1803) + Me.TabPage4.Size = New System.Drawing.Size(601, 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) @@ -2443,7 +2542,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(618, 1803) + Me.TabPage5.Size = New System.Drawing.Size(601, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2651,108 +2750,9 @@ 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(609, 57) + Me.pnl.Size = New System.Drawing.Size(774, 57) Me.pnl.TabIndex = 23 ' - 'cboBRG_Verimex - ' - Me.cboBRG_Verimex._allowedValuesFreiText = Nothing - Me.cboBRG_Verimex._allowFreiText = False - Me.cboBRG_Verimex._value = "" - Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBRG_Verimex.DropDownWidth = 350 - Me.cboBRG_Verimex.FormattingEnabled = True - Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) - Me.cboBRG_Verimex.Name = "cboBRG_Verimex" - Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) - Me.cboBRG_Verimex.TabIndex = 17 - ' - 'cboBrgEZollTC - ' - Me.cboBrgEZollTC._allowedValuesFreiText = Nothing - Me.cboBrgEZollTC._allowFreiText = False - Me.cboBrgEZollTC._value = "" - Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBrgEZollTC.DropDownWidth = 350 - Me.cboBrgEZollTC.FormattingEnabled = True - Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) - Me.cboBrgEZollTC.Name = "cboBrgEZollTC" - Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) - Me.cboBrgEZollTC.TabIndex = 12 - ' - 'cboEZOLLBrg - ' - Me.cboEZOLLBrg._allowedValuesFreiText = Nothing - Me.cboEZOLLBrg._allowFreiText = False - Me.cboEZOLLBrg._value = "" - Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboEZOLLBrg.DropDownWidth = 350 - Me.cboEZOLLBrg.FormattingEnabled = True - Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) - Me.cboEZOLLBrg.Name = "cboEZOLLBrg" - Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) - Me.cboEZOLLBrg.TabIndex = 12 - ' - '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.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - 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(0, 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!) @@ -2762,7 +2762,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(609, 1445) + Me.Size = New System.Drawing.Size(774, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.GroupBox2.ResumeLayout(False) diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index 481e5a3d..eb17afe8 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -127,6 +127,7 @@ Public Class usrCntlZOLLAuswertungen cboBRG_Verimex.Items.Clear() cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) + ' cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE VERAG", "'17DE0000000071678','05DE0000000009345','05AT510000G000FP7'")) cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071678 - DE Brg (NEU)", "17DE0000000071678")) cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05DE0000000009345 - DE Brg", "05DE0000000009345")) cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7")) diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index f3d1515e..593c17ae 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -27,6 +27,10 @@ Public Class cDATENSERVER Public Property DATA_LIST As New cDatenserverIDCollectionList Dim rootDir = "" + Dim rootDirARCHIVARCHIV = "" + + Dim TopMax = 0 + Dim SQL As New SQL ' Public LAST_ID = -1 @@ -34,11 +38,19 @@ Public Class cDATENSERVER Sub New(da_id) Me.da_id = da_id Me.rootDir = DATENVERVER_OPTIONS.initRootDir() + Me.rootDirARCHIVARCHIV = DATENVERVER_OPTIONS.initRootDirArchivArchiv() LOADById() End Sub - + Sub New(da_kategorie, da_ordner, Optional TopMax = 0) + Me.rootDir = DATENVERVER_OPTIONS.initRootDir() + Me.da_KundenNr = da_KundenNr + Me.da_vorlage = 0 '(da_KundenNr <= 0) + Me.da_kategorie = da_kategorie + Me.da_ordner = da_ordner + LOAD() + End Sub Sub New(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name, Optional da_KundenNr = 0) Me.rootDir = DATENVERVER_OPTIONS.initRootDir() @@ -54,7 +66,7 @@ Public Class cDATENSERVER End Sub - Sub New(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name, da_KundenNr, da_multifiles) + Sub New(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name, da_KundenNr, da_multifiles, Optional TopMax = 0) Me.rootDir = DATENVERVER_OPTIONS.initRootDir() Me.da_KundenNr = da_KundenNr Me.da_vorlage = 0 '(da_KundenNr <= 0) @@ -65,6 +77,8 @@ Public Class cDATENSERVER Me.da_uOrdner3 = replaceInvalidCahr(If(da_uOrdner3, "")) Me.da_name = da_name Me.da_multifiles = da_multifiles + Me.TopMax = TopMax + LOAD() End Sub @@ -104,8 +118,10 @@ Public Class cDATENSERVER Try DATA_LIST = New cDatenserverIDCollectionList Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Dim top = "" + If TopMax > 0 Then top = " TOP (" & TopMax & ") " 'MsgBox("SELECT * FROM tblDatenarchiv WHERE da_KundenNr = '" & Me.da_KundenNr & "' And da_kategorie = '" & Me.da_kategorie & "' And da_ordner ='" & Me.da_ordner & "' AND da_uOrdner1= '" & Me.da_uOrdner1 & "' AND da_uOrdner2= '" & Me.da_uOrdner2 & "' AND da_uOrdner3= '" & Me.da_uOrdner3 & "' AND da_name='" & Me.da_name & "' ") - Using cmd As New SqlCommand("SELECT * FROM tblDatenarchiv WHERE da_KundenNr = @da_KundenNr AND da_kategorie = @da_kategorie AND da_ordner=@da_ordner AND da_uOrdner1= @da_uOrdner1 AND da_uOrdner2= @da_uOrdner2 AND da_uOrdner3= @da_uOrdner3 AND da_name=@da_name ", conn) + Using cmd As New SqlCommand("SELECT " & TopMax & " * FROM tblDatenarchiv WHERE da_KundenNr = @da_KundenNr AND da_kategorie = @da_kategorie AND da_ordner=@da_ordner AND da_uOrdner1= @da_uOrdner1 AND da_uOrdner2= @da_uOrdner2 AND da_uOrdner3= @da_uOrdner3 AND da_name=@da_name ", conn) cmd.Parameters.AddWithValue("@da_KundenNr", Me.da_KundenNr) ' cmd.Parameters.AddWithValue("@da_vorlage", Me.da_vorlage) cmd.Parameters.AddWithValue("@da_kategorie", Me.da_kategorie) @@ -162,6 +178,35 @@ Public Class cDATENSERVER Return False End Function + Function moveTo_ARCHIVARCHIV() + Dim oldDIR = DATENVERVER_OPTIONS.getDescPath(rootDir, da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_KundenNr, "", "", True) + + Dim newDIR = DATENVERVER_OPTIONS.getDescPath(rootDirARCHIVARCHIV, da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_KundenNr, "", "", True) + + Try + ' My.Computer.FileSystem.RenameDirectory(oldDIR, newname) + For Each li In DATA_LIST.LIST + + MsgBox(oldDIR) + MsgBox(newDIR) + + Dim newPfad = li.coll_pfad.Replace(oldDIR, newDIR) + MsgBox(li.coll_pfad) + MsgBox(newPfad) + If Not IO.Directory.Exists(newDIR) Then IO.Directory.CreateDirectory(newDIR) + My.Computer.FileSystem.CopyFile(li.coll_pfad, newPfad, True) + My.Computer.FileSystem.DeleteFile(li.coll_pfad) + li.coll_pfad = newPfad + If Not li.UPDATE() Then + Return False + End If + Next + Return UPDATE() + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + Return False + End Function Function UPDATE() As Boolean Try @@ -1857,6 +1902,9 @@ Public Class DATENVERVER_OPTIONS Return False End Function + Shared Function initRootDirArchivArchiv() As String + initRootDirArchivArchiv = getRootDirArchivArchiv() + End Function Shared Function initRootDir() As String initRootDir = getRootDir() End Function @@ -1885,6 +1933,20 @@ Public Class DATENVERVER_OPTIONS End If End If End Function + Shared Function getRootDirArchivArchiv(Optional TESTSYSTEM = Nothing) As String + + + Dim TS = If(TESTSYSTEM IsNot Nothing, TESTSYSTEM, VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM) + + If TS Then + ' getRootDir = "\\192.168.0.91\DATENARCHIV\DATENARCHIV_TESTSYSTEM\" + getRootDirArchivArchiv = "\\stor01.verag.ost.dmn\DATENARCHIVArchiv\DATENARCHIV_TESTSYSTEM\" + Else + ' getRootDir = "\\192.168.0.91\DATENARCHIV\" + getRootDirArchivArchiv = "\\stor01.verag.ost.dmn\DATENARCHIVArchiv\" + End If + + End Function Shared Function getDescPath(rootDir, kategorie, ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, kdnr, bezeichnung, endung, Optional onlyordner = False) As String diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 016aba99..f7cd01d9 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -658,6 +658,7 @@ Public Class cATEZ_NCTS_IN ncts.json = jsonData.Emit() + MsgBox(ncts.json) Return success