diff --git a/SDL/Classes/cFiskaltrustClient_chilkat.vb b/SDL/Classes/cFiskaltrustClient_chilkat.vb index a9ff87db..4c8c6ff6 100644 --- a/SDL/Classes/cFiskaltrustClient_chilkat.vb +++ b/SDL/Classes/cFiskaltrustClient_chilkat.vb @@ -545,9 +545,9 @@ Public Class cFiskaltrustClient_chilkat 'To cancel a receipt, resend it with this flag added to the ftReceiptCase and inverse the cbPayItems OR cbChargeItems (This is not the same behavior as described in the general part — in Germany, this flag requires only one of cbPayItems or cbChargeItems to be negative, and both must not be negative at the same time)' 'https://docs.fiskaltrust.cloud/docs/poscreators/middleware-doc/germany/reference-tables/ftreceiptcase - If PayItemCasesIntern.Kasseneinzahlungen_Auszahlungen Then + 'If PayItemCasesIntern.Kasseneinzahlungen_Auszahlungen Then - End If + 'End If diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 31ec40fc..b243161e 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -918,7 +918,13 @@ Public Class usrCntlFaktAbrechnung If KUNDE_ERW.kde_BesonderheitenNeu Then rtbAbf_Besonderheiten.Size = txtBesonderheiten.Size - rtbAbf_Besonderheiten.init(kdFirmaRechnungAn.KdNr_value, , True, "VRR", "'ZOLL','ALLG','DISPO'") + + Select Case cboFiliale._value + Case "4801", "4802", "4813" + rtbAbf_Besonderheiten.init(kdFirmaRechnungAn.KdNr_value, "EXPORT/ATILLA", True, "EXPORT/ATILLA") + Case Else + rtbAbf_Besonderheiten.init(kdFirmaRechnungAn.KdNr_value,, True, "VRR", "'ZOLL','ALLG','DISPO'") + End Select rtbAbf_Besonderheiten.Visible = True Else rtbAbf_Besonderheiten.Visible = False diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb index 75e6f3e7..fcbeef4b 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.Designer.vb @@ -22,6 +22,7 @@ Partial Class usrcntlEORI_Antrag 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlEORI_Antrag)) Me.lblText = New System.Windows.Forms.Label() Me.pic = New System.Windows.Forms.PictureBox() Me.btnDown = New System.Windows.Forms.Button() @@ -66,6 +67,8 @@ Partial Class usrcntlEORI_Antrag Me.gebDatum = New System.Windows.Forms.DateTimePicker() Me.linkBMF = New System.Windows.Forms.LinkLabel() Me.cbxGebDatu = New System.Windows.Forms.CheckBox() + Me.txtEORIInfo = New System.Windows.Forms.TextBox() + Me.Label15 = New System.Windows.Forms.Label() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -675,12 +678,37 @@ Partial Class usrcntlEORI_Antrag Me.cbxGebDatu.UseVisualStyleBackColor = True Me.cbxGebDatu.Visible = False ' + 'txtEORIInfo + ' + Me.txtEORIInfo.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtEORIInfo.Location = New System.Drawing.Point(815, 83) + Me.txtEORIInfo.Multiline = True + Me.txtEORIInfo.Name = "txtEORIInfo" + Me.txtEORIInfo.ReadOnly = True + Me.txtEORIInfo.Size = New System.Drawing.Size(161, 121) + Me.txtEORIInfo.TabIndex = 75 + Me.txtEORIInfo.Text = resources.GetString("txtEORIInfo.Text") + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label15.ForeColor = System.Drawing.Color.Red + Me.Label15.Location = New System.Drawing.Point(815, 62) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(76, 20) + Me.Label15.TabIndex = 76 + Me.Label15.Text = "Achtung" + ' 'usrcntlEORI_Antrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.Label15) + Me.Controls.Add(Me.txtEORIInfo) Me.Controls.Add(Me.cbxGebDatu) Me.Controls.Add(Me.linkBMF) Me.Controls.Add(Me.gebDatum) @@ -776,4 +804,6 @@ Partial Class usrcntlEORI_Antrag Friend WithEvents gebDatum As DateTimePicker Friend WithEvents linkBMF As LinkLabel Friend WithEvents cbxGebDatu As CheckBox + Friend WithEvents txtEORIInfo As TextBox + Friend WithEvents Label15 As Label End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.resx b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.resx index 1af7de15..9ad69390 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.resx +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEORI_Antrag.resx @@ -117,4 +117,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Ab 1.10.2026 EORI-Nummer-Beantragung nur mehr über das Zoll-Portal möglich! Formularversion 0870 wird nur in Ausnahmefällen akzeptiert. +Sowohl Firmen als auch Privatpersonen benötigen eine gültige ELSTER-Login-Option (zB: Zertifikatsdatei). + +Link Zoll-Portal: https://www.zoll-portal.de/ +Link Elster: https://www.elster.de/eportal/start + + + + \ No newline at end of file diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 0049ddf9..691b2733 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/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb index 62057e05..050ab1d6 100644 --- a/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb +++ b/SDL/Speditionsbuch/Nacherfassung/frmNacherfassungNEU.vb @@ -112,6 +112,14 @@ Public Class frmNacherfassungNEU txtEndEmpf._displayWoelflKd = enableWoelfl txtFraechter._displayWoelflKd = enableWoelfl + Dim disableMDM As Boolean = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID = 7, True, False) + + txtEmpfaenger._hideMDMKd = disableMDM + txtAuftraggeber._hideMDMKd = disableMDM + txtAvisierer._hideMDMKd = disableMDM + txtEmpfaenger._hideMDMKd = disableMDM + txtEndEmpf._hideMDMKd = disableMDM + txtFraechter._hideMDMKd = disableMDM If SQL.getValueTxtBySql("SELECT count(*) FROM tblAbfertigungsartenFiliale WHERE Filialennr='" & cboFiliale._value & "'", "FMZOLL") > 0 Then ' cboAbfertigungsart.fillWithSQL("SELECT Abfertigungsarten.Abfertigungsart,[Abfertigungsbezeichnung] FROM [Abfertigungsarten] INNER JOIN tblAbfertigungsartenFiliale ON tblAbfertigungsartenFiliale.Abfertigungsart=Abfertigungsarten.Abfertigungsart where Filialennr=" & cboFiliale._value & "", True, "FMZOLL", True) @@ -612,16 +620,13 @@ Public Class frmNacherfassungNEU Case Else : where = " AND mit_firma NOT IN ('IMEX','UNISPED','AMBAR','FRONTOFFICE') " End Select - ' cboQuickStopMa.fillWithSQL("SELECT ID,cast(ID as nvarchar(3)) +' ' + Name as Name FROM Personal WHERE [Status]<>'L' ORDER BY Name ", False, "FMZOLL", True) - cboQuickStopMa.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " & - " FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND mit_abteilung='QS' AND [mit_gekuendigt]=0 " & where & " order by name", False, "ADMIN", True) - - 'ComboBox1.fillWithSQL("SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ORDER BY Abfertigungsart ", True, "FMZOLL") + cboQuickStopMa.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] + ' ('+ mit_abteilung + ')' as NAME FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND mit_ChatBenutzer = 1 and ISNULL(mit_TESTonly,0) = 0 AND [mit_gekuendigt]=0 and mit_abteilung in ('ZOLL', 'QS') " & where & " order by name", False, "ADMIN", True) Dim LänderSql = "SELECT LandKz as Kz,cast(LandKz as nvarchar(8)) + ' - ' + LandBez as Bez FROM [Länderverzeichnis für die Außenhandelsstatistik] " & " union " & " SELECT RIGHT('00'+CAST(LänderNr AS VARCHAR(2)),2) as Kz,RIGHT('00'+CAST(LänderNr AS VARCHAR(2)),2) + ' - ' + [LänderBez] as Bez FROM [Länder der Bundesrepublik Deutschland] " & " ORDER BY Kz " + cboVersendungsland.fillWithSQL(LänderSql, False, "FMZOLL", True) cboBestimmungsland.fillWithSQL(LänderSql, False, "FMZOLL", True) cbxWaehrung.fillWithSQL(" SELECT LandNr, isnull(Währungscode + ' - ' ,'') + LandBez + ' (' + cast(LandNr as varchar(8)) + ')' FROM [Länderverzeichnis für die Außenhandelsstatistik] ORDER BY case when Währungscode is null then 1 else 0 end,LandBez ", False, "FMZOLL", True) @@ -1793,6 +1798,7 @@ Class cSpedBuch_Aktendeckel VALUES.VG_MA = SQL.DLookup("[Name]", "Personal", "ID='" & SPEDBUCH.Personalnummer & "'", "FMZOLL", "") + VALUES.QS_MA = SQL.DLookup("mit_vname + ' ' + mit_nname", "tblMitarbeiter", "mit_id='" & SPEDBUCH.PersonalnummerQS & "'", "ADMIN", "") diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index b6145670..0bffba57 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -530,11 +530,10 @@ Public Class usrCntlSpeditionsBuchSuche ''' Case "ATILLA" : cboFiliale._allowedValuesFreiText = {"4801"} End Select - cboSB_Qs.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " & - " FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND mit_abteilung='QS' AND [mit_gekuendigt]=0 " & where & " order by name", False, "ADMIN", True) + cboSB_Qs.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] + ' ('+ mit_abteilung + ')' as NAME FROM [tblMitarbeiter] WHERE mit_niederlassung IN ('SUB','Suben') AND [mit_gekuendigt]=0 and mit_ChatBenutzer = 1 and ISNULL(mit_TESTonly,0) = 0 " & where & " order by name", False, "ADMIN", True) + + cboSB_TR.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME FROM [tblMitarbeiter] WHERE mit_firma IN ('VERIMEX') AND [mit_gekuendigt]=0 order by name", False, "ADMIN", True) - cboSB_TR.fillWithSQL("SELECT [mit_id],[mit_vname] + ' '+ [mit_nname] as NAME " & - " FROM [tblMitarbeiter] WHERE mit_firma IN ('VERIMEX') AND [mit_gekuendigt]=0 order by name", False, "ADMIN", True) btnDetailsuche.PerformClick() cboRolle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", "VermittlerKundenNr")) @@ -592,9 +591,6 @@ Public Class usrCntlSpeditionsBuchSuche End If - - - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen_Erlöse", "SDL") Then btnSpedBuchEinnahmen.Visible = True End If diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 7c979ecd..6ae60e2e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1197,7 +1197,7 @@ Public Class frmMDM_USTVAntrag End If - VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True + 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True If Not alreadyExists(USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_LandNr, USTV_POS) Then USTV_POS.UStVPo_Schnittstelle = True diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb index b6cd762b..5cd31a26 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -73,12 +73,23 @@ Public Class usrCntlATLAS_AnkunftsAnzeige cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='AA' and dySr_dy_Mandant='" & txtDyMandant.Text & "' and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "') and dySr_visible=1", False, "FMZOLL", True) cboStammreferenz.changeItem("") + If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then + For i As Integer = 0 To cboStammreferenz.Items.Count - 1 + If cboStammreferenz.Items(i).ToString().Contains("VERAG_WDH") Then + cboStammreferenz.SelectedIndex = i + Exit For + End If + Next - If cboStammreferenz.Items.Count = 2 Then + ElseIf cboStammreferenz.Items.Count = 2 Then cboStammreferenz.SelectedIndex = 1 End If + + + + End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index 929ebe67..2ef72a76 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -1616,7 +1616,7 @@ Public Class usrCntlBH REPLACE( REPLACE(da.da_name, 'Rechnung_', ''), '.pdf', ''), - 'Gutschrift_', '') AS RechnungsNr, da_name as Bezeichnung + 'Gutschrift_', '') AS RechnungsNr, da_name as Bezeichnung, da_date as Erstellungszeitpunkt FROM tblDatenarchiv da WHERE da.da_kategorie = 'Rechnungen' AND da.da_ordner = 'Firma_' + CAST(@FirmaID AS VARCHAR) @@ -1642,7 +1642,7 @@ Public Class usrCntlBH SELECT DISTINCT REPLACE( REPLACE(da.da_name, 'Sammelrechnung_', ''), - '.pdf', '') AS RechnungsNr, da_name as Bezeichnung + '.pdf', '') AS RechnungsNr, da_name as Bezeichnung, da_date as Erstellungszeitpunkt FROM tblDatenarchiv da WHERE da.da_kategorie = 'Rechnungen' AND da.da_ordner = 'Firma_' + CAST(@FirmaID AS VARCHAR) diff --git a/SDL/kunden/usrCntlKundenBesonderheiten.vb b/SDL/kunden/usrCntlKundenBesonderheiten.vb index 1e73695e..c28c15e5 100644 --- a/SDL/kunden/usrCntlKundenBesonderheiten.vb +++ b/SDL/kunden/usrCntlKundenBesonderheiten.vb @@ -1,7 +1,4 @@ -Imports DocumentFormat.OpenXml.Drawing -Imports DocumentFormat.OpenXml.Drawing.Charts - -Public Class usrCntlKundenBesonderheiten +Public Class usrCntlKundenBesonderheiten Dim kdNr As Integer = -1 Dim loaded = False diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 98bfa2b6..7462f41d 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -239,7 +239,7 @@ Public Class usrcntlFiskaluebersicht End If - If cbxLand._value = "DE" And ADRESSE.LandKz = "D" Or cbxLand._value = "AT" And ADRESSE.LandKz = "A" Then + If cbxLand._value = "DE" And ADRESSE.LandKz = "D" And cbxArt._value = "FI" Or cbxLand._value = "AT" And ADRESSE.LandKz = "A" And cbxArt._value = "FI" Then lblWarning.Text = "Fiskalart " & cbxLand._value & " für " & ADRESSE.LandKz & " nicht möglich!" Exit Sub End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 45bb9998..e73bf1c1 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -1002,11 +1002,8 @@ Public Class usrcntlKundeBearbeitenFull cboRechnungSprache.changeItem(0) cboProvisionStaffelArt.fillWithSQL("SELECT [PreislistenNr],[PreislistenBez] FROM [VERAG].[dbo].[tblPreislisten] WHERE Art='E' ORDER BY Preislistenbez", False, "FMZOLL", True) - cboFirma.fillWithSQL("SELECT tblFirma.Firma_ID, tblFirma.Firma_Bez FROM tblFirma ORDER BY tblFirma.Firma_ID", , "FMZOLL", True) - - cboFiliale.fillWithSQL("SELECT [FilialenNr],[Grenzstelle] FROM [Filialen] ORDER BY FilialenNr", True, "FMZOLL") - + Dim FirmaWhere As String = "" Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "IMEX" cboFiliale.changeItem("5501") @@ -1016,10 +1013,16 @@ Public Class usrcntlKundeBearbeitenFull cboFiliale.changeItem("5701") Case "ATILLA" cboFiliale.changeItem("4801") + FirmaWhere = " AND Firma_ID = 7" Case Else cboFiliale.changeItem("4803") End Select + + cboFirma.fillWithSQL("SELECT tblFirma.Firma_ID, tblFirma.Firma_Bez FROM tblFirma WHERE 1 = 1 " & FirmaWhere & " ORDER BY tblFirma.Firma_ID", , "FMZOLL", True) + + cboFiliale.fillWithSQL("SELECT [FilialenNr],[Grenzstelle] FROM [Filialen] ORDER BY FilialenNr", True, "FMZOLL") + cboAuswahl.Items.Clear() cboAuswahl.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AKTIV", "A")) cboAuswahl.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("INAKTIV", "I")) @@ -1340,11 +1343,13 @@ Public Class usrcntlKundeBearbeitenFull '--------------------- VERAG360---------------------------- - Case "400000-499999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + Case "200000-299999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") Case "160000-169999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") Case "303000-303999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") Case "130000-139999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") + + Case "400000-499999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") Case "150000-159999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") Case "140000-149999" : cbxFiBu.Checked = True : cboFirma.changeItem("19") : cboFiliale.changeItem("8001") diff --git a/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.Designer.vb b/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.Designer.vb index 102f3ea6..58933883 100644 --- a/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.Designer.vb +++ b/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.Designer.vb @@ -24,12 +24,12 @@ Partial Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER Private Sub InitializeComponent() Me.Label8 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.cbxExcel = New System.Windows.Forms.CheckBox() Me.cbx = New System.Windows.Forms.CheckBox() Me.lnlCnt = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.lblErr = New System.Windows.Forms.Label() Me.Label14 = New System.Windows.Forms.Label() - Me.cbxExcel = New System.Windows.Forms.CheckBox() Me.GroupBox2.SuspendLayout() Me.SuspendLayout() ' @@ -40,9 +40,9 @@ Partial Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER Me.Label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label8.Location = New System.Drawing.Point(3, 0) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(102, 17) + Me.Label8.Size = New System.Drawing.Size(223, 17) Me.Label8.TabIndex = 16 - Me.Label8.Text = "Abgabenliste" + Me.Label8.Text = "Abgabenlistenabgleich TRIER" ' 'GroupBox2 ' @@ -58,6 +58,16 @@ Partial Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER Me.GroupBox2.TabIndex = 15 Me.GroupBox2.TabStop = False ' + 'cbxExcel + ' + Me.cbxExcel.AutoSize = True + Me.cbxExcel.Location = New System.Drawing.Point(148, 76) + Me.cbxExcel.Name = "cbxExcel" + Me.cbxExcel.Size = New System.Drawing.Size(126, 17) + Me.cbxExcel.TabIndex = 36 + Me.cbxExcel.Text = "als EXCEL ausgeben" + Me.cbxExcel.UseVisualStyleBackColor = True + ' 'cbx ' Me.cbx.AutoSize = True @@ -111,16 +121,6 @@ Partial Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER Me.Label14.TabIndex = 5 Me.Label14.Text = "Prüft die ausgewähle Liste der Abgaben von Trier mit den fakturierten Datensätzen" & " ab." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Bei Differenz wird der Eintrag angezeigt." - ' - 'cbxExcel - ' - Me.cbxExcel.AutoSize = True - Me.cbxExcel.Location = New System.Drawing.Point(148, 76) - Me.cbxExcel.Name = "cbxExcel" - Me.cbxExcel.Size = New System.Drawing.Size(126, 17) - Me.cbxExcel.TabIndex = 36 - Me.cbxExcel.Text = "als EXCEL ausgeben" - Me.cbxExcel.UseVisualStyleBackColor = True ' 'usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER ' diff --git a/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb b/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb index dfa18a0d..458f614a 100644 --- a/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb +++ b/SDL/zoll/usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER.vb @@ -36,6 +36,16 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER If fd.ShowDialog = DialogResult.OK Then + + Dim dt_Dateneinlesung As New DataTable + dt_Dateneinlesung.Columns.Add("Datum") + dt_Dateneinlesung.Columns.Add("MRN") + dt_Dateneinlesung.Columns.Add("ATC") + dt_Dateneinlesung.Columns.Add("Betrag") + dt_Dateneinlesung.Columns.Add("Zollamt") + + + Dim dt As New DataTable dt.Columns.Add("AKTO") dt.Columns.Add("Faelligkeit") @@ -71,35 +81,52 @@ Public Class usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER End If + If line.Length = "79" AndAlso (line.Contains("ATC") Or line.Substring(30, 2).Trim.Contains("DE")) Then Dim zollamt As String = line.Substring(0, 28).Trim Dim atc As String = "" Dim mrn As String = "" - Dim sqlStringWhere = "" + ' Dim sqlStringWhere = "" If line.Contains("ATC") Then atc = line.Substring(28, 25).Trim - sqlStringWhere = "[Status]<>0 and DruckDatumZeit is not null and (left([RechnungsausgangPositionen].Belegdaten,21)='" & atc & "' or [RechnungsausgangPositionen].[Weitere_Reg_Nr] ='" & atc & "' ) AND [AufschubkontoNr]='" & AKTO & "'" + ' sqlStringWhere = "[Status]<>0 and DruckDatumZeit is not null and (left([RechnungsausgangPositionen].Belegdaten,21)='" & atc & "' or [RechnungsausgangPositionen].[Weitere_Reg_Nr] ='" & atc & "' ) AND [AufschubkontoNr]='" & AKTO & "'" ElseIf line.Substring(30, 2).Trim.Contains("DE") Then mrn = line.Substring(28, 25).Trim - sqlStringWhere = "[Status]<>0 and DruckDatumZeit is not null and left([RechnungsausgangPositionen].Belegdaten,21)='" & mrn & "' AND [AufschubkontoNr]='" & AKTO & "'" + ' sqlStringWhere = "[Status]<>0 and DruckDatumZeit is not null and left([RechnungsausgangPositionen].Belegdaten,21)='" & mrn & "' AND [AufschubkontoNr]='" & AKTO & "'" End If Dim datum As Date = CDate(line.Substring(53, 10).Trim) Dim betrag As Double = CDbl(line.Substring(63, 16).Trim) + Dim vorhandeneZeile As DataRow = dt_Dateneinlesung.AsEnumerable().FirstOrDefault(Function(r) r.Field(Of String)("MRN") = mrn AndAlso mrn <> "" OrElse r.Field(Of String)("ATC") = atc AndAlso atc <> "") - - Dim fakturiert = CDbl(SQL.DLookup("sum(Preis)", "Rechnungsausgang inner join [RechnungsausgangPositionen] On Rechnungsausgang.RK_ID=[RechnungsausgangPositionen].RK_ID", sqlStringWhere, "FMZOLL", "0")) - - Dim differenz = fakturiert - betrag - - If Not cbx.Checked OrElse differenz <> 0 Then - - erg &= zollamt & " - " & IIf(atc <> "", atc, mrn) & ": " & betrag & " | " & differenz & vbNewLine - dt.Rows.Add({AKTO, Faelligkeit, IIf(atc <> "", atc, mrn), datum, zollamt, betrag, fakturiert, differenz}) + If vorhandeneZeile IsNot Nothing Then + vorhandeneZeile("Betrag") = CDbl(vorhandeneZeile("Betrag")) + betrag + Else + dt_Dateneinlesung.Rows.Add({datum, mrn, atc, betrag, zollamt}) End If End If + + Next + + For Each r As DataRow In dt_Dateneinlesung.Rows + Dim SQLWHere = "" + If r.Item("ATC") <> "" Then + SQLWHere = "[Status]<>0 and DruckDatumZeit is not null and (left([RechnungsausgangPositionen].Belegdaten,21)='" & r.Item("ATC") & "' or [RechnungsausgangPositionen].[Weitere_Reg_Nr] ='" & r.Item("ATC").value & "' ) AND [AufschubkontoNr]='" & AKTO & "'" + ElseIf r.Item("MRN") <> "" Then + SQLWHere = "[Status]<>0 and DruckDatumZeit is not null and left([RechnungsausgangPositionen].Belegdaten,21)='" & r.Item("MRN") & "' AND [AufschubkontoNr]='" & AKTO & "'" + End If + + Dim fakturiert = CDbl(SQL.DLookup("sum(Preis)", "Rechnungsausgang inner join [RechnungsausgangPositionen] On Rechnungsausgang.RK_ID=[RechnungsausgangPositionen].RK_ID", SQLWHere, "FMZOLL", "0")) + + Dim differenz = fakturiert - r.Item("betrag") + + If Not cbx.Checked OrElse differenz <> 0 Then + + erg &= r.Item("Zollamt") & " - " & IIf(r.Item("ATC") <> "", r.Item("ATC"), r.Item("MRN")) & ": " & r.Item("Betrag") & " | " & differenz & vbNewLine + dt.Rows.Add({AKTO, Faelligkeit, IIf(r.Item("ATC") <> "", r.Item("ATC"), r.Item("MRN")), r.Item("Datum"), r.Item("Zollamt"), r.Item("Betrag"), fakturiert, differenz}) + End If cnt += 1 lnlCnt.Text = cnt '& "/" & Flines.Count Me.Refresh() diff --git a/SDL/zoll/usrCntlAuswertungenAufschub_Abgabenliste.Designer.vb b/SDL/zoll/usrCntlAuswertungenAufschub_Abgabenliste.Designer.vb index 416f7a81..7799b21c 100644 --- a/SDL/zoll/usrCntlAuswertungenAufschub_Abgabenliste.Designer.vb +++ b/SDL/zoll/usrCntlAuswertungenAufschub_Abgabenliste.Designer.vb @@ -46,9 +46,9 @@ Partial Class usrCntlAuswertungenAufschub_Abgabenliste Me.Label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark Me.Label8.Location = New System.Drawing.Point(3, 0) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(102, 17) + Me.Label8.Size = New System.Drawing.Size(128, 17) Me.Label8.TabIndex = 16 - Me.Label8.Text = "Abgabenliste" + Me.Label8.Text = "Abgabenliste DE" ' 'GroupBox2 ' diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index 076cf153..f8d2fe0f 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -261,20 +261,33 @@ Partial Class usrCntlZOLLAuswertungen Me.Button14 = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.TabPage6 = New System.Windows.Forms.TabPage() - Me.cbxCBAM_Detaildaten = New System.Windows.Forms.CheckBox() + Me.GroupBox6 = New System.Windows.Forms.GroupBox() + Me.cbxStahlverordnung_SNDdet = New System.Windows.Forms.CheckBox() + Me.Label105 = New System.Windows.Forms.Label() + Me.Button26 = New System.Windows.Forms.Button() + Me.von_stahlverordnung = New System.Windows.Forms.DateTimePicker() + Me.Label106 = New System.Windows.Forms.Label() + Me.Label108 = New System.Windows.Forms.Label() + Me.cbxQuelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.bis_stahlverordnung = New System.Windows.Forms.DateTimePicker() + Me.Label107 = New System.Windows.Forms.Label() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Label100 = New System.Windows.Forms.Label() - Me.cbxcbamQuelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label99 = New System.Windows.Forms.Label() - Me.bis_CBAM = New System.Windows.Forms.DateTimePicker() - Me.Label97 = New System.Windows.Forms.Label() - Me.excelCbam = New System.Windows.Forms.Button() - Me.Label96 = New System.Windows.Forms.Label() Me.von_CBAM = New System.Windows.Forms.DateTimePicker() - Me.pnl = New System.Windows.Forms.Panel() + Me.Label96 = New System.Windows.Forms.Label() + Me.excelCbam = New System.Windows.Forms.Button() + Me.bis_CBAM = New System.Windows.Forms.DateTimePicker() + Me.Label99 = New System.Windows.Forms.Label() + Me.cbxcbamQuelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxCBAM_Detaildaten = New System.Windows.Forms.CheckBox() Me.Label101 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() - Me.Label102 = New System.Windows.Forms.Label() Me.Label103 = New System.Windows.Forms.Label() + Me.Label102 = New System.Windows.Forms.Label() + Me.Label104 = New System.Windows.Forms.Label() + Me.Label97 = New System.Windows.Forms.Label() + Me.pnl = New System.Windows.Forms.Panel() + Me.PictureBox14 = New System.Windows.Forms.PictureBox() Me.GroupBox1.SuspendLayout() Me.grpDurmaz.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -318,7 +331,10 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox9.SuspendLayout() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage6.SuspendLayout() + Me.GroupBox6.SuspendLayout() + Me.GroupBox2.SuspendLayout() Me.pnl.SuspendLayout() + CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label3 @@ -1318,7 +1334,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(1092, 1829) + Me.tbcntr.Size = New System.Drawing.Size(1007, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1361,7 +1377,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(1084, 1803) + Me.TabPage1.Size = New System.Drawing.Size(999, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -2558,7 +2574,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(1101, 1803) + Me.TabPage2.Size = New System.Drawing.Size(1016, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True @@ -2588,7 +2604,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(1101, 1803) + Me.TabPage3.Size = New System.Drawing.Size(1016, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True @@ -2619,11 +2635,12 @@ Partial Class usrCntlZOLLAuswertungen ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.PictureBox14) 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(1101, 1803) + Me.TabPage4.Size = New System.Drawing.Size(999, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True @@ -2652,7 +2669,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(1084, 1803) + Me.TabPage5.Size = New System.Drawing.Size(1016, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2856,45 +2873,204 @@ Partial Class usrCntlZOLLAuswertungen ' 'TabPage6 ' - Me.TabPage6.Controls.Add(Me.Label103) - Me.TabPage6.Controls.Add(Me.Label102) - Me.TabPage6.Controls.Add(Me.Button2) - Me.TabPage6.Controls.Add(Me.Label101) - 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.GroupBox6) + Me.TabPage6.Controls.Add(Me.GroupBox2) + Me.TabPage6.Controls.Add(Me.Label104) 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(1084, 1803) + Me.TabPage6.Size = New System.Drawing.Size(999, 1803) Me.TabPage6.TabIndex = 5 - Me.TabPage6.Text = "CBAM" + Me.TabPage6.Text = "CBAM/Stahlverordnung" Me.TabPage6.UseVisualStyleBackColor = True ' - 'cbxCBAM_Detaildaten + 'GroupBox6 ' - Me.cbxCBAM_Detaildaten.AutoSize = True - Me.cbxCBAM_Detaildaten.Location = New System.Drawing.Point(13, 102) - 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 + Me.GroupBox6.Controls.Add(Me.cbxStahlverordnung_SNDdet) + Me.GroupBox6.Controls.Add(Me.Label105) + Me.GroupBox6.Controls.Add(Me.Button26) + Me.GroupBox6.Controls.Add(Me.von_stahlverordnung) + Me.GroupBox6.Controls.Add(Me.Label106) + Me.GroupBox6.Controls.Add(Me.Label108) + Me.GroupBox6.Controls.Add(Me.cbxQuelle) + Me.GroupBox6.Controls.Add(Me.bis_stahlverordnung) + Me.GroupBox6.Controls.Add(Me.Label107) + Me.GroupBox6.Location = New System.Drawing.Point(14, 341) + Me.GroupBox6.Name = "GroupBox6" + Me.GroupBox6.Size = New System.Drawing.Size(631, 148) + Me.GroupBox6.TabIndex = 44 + Me.GroupBox6.TabStop = False + ' + 'cbxStahlverordnung_SNDdet + ' + Me.cbxStahlverordnung_SNDdet.AutoSize = True + Me.cbxStahlverordnung_SNDdet.Location = New System.Drawing.Point(9, 81) + Me.cbxStahlverordnung_SNDdet.Name = "cbxStahlverordnung_SNDdet" + Me.cbxStahlverordnung_SNDdet.Size = New System.Drawing.Size(126, 17) + Me.cbxStahlverordnung_SNDdet.TabIndex = 34 + Me.cbxStahlverordnung_SNDdet.Text = "mit Sendunggsdetails" + Me.cbxStahlverordnung_SNDdet.UseVisualStyleBackColor = True + ' + 'Label105 + ' + Me.Label105.AutoSize = True + Me.Label105.Location = New System.Drawing.Point(6, 14) + Me.Label105.Name = "Label105" + Me.Label105.Size = New System.Drawing.Size(394, 13) + Me.Label105.TabIndex = 42 + Me.Label105.Text = "Liste der Kunden mit Stahlwaren Nachweise zum Land des Schmelzens / Gießens" + ' + 'Button26 + ' + Me.Button26.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button26.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button26.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button26.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button26.Location = New System.Drawing.Point(6, 103) + Me.Button26.Name = "Button26" + Me.Button26.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) + Me.Button26.Size = New System.Drawing.Size(121, 38) + Me.Button26.TabIndex = 35 + Me.Button26.Text = "Excel" + Me.Button26.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button26.UseVisualStyleBackColor = True + ' + 'von_stahlverordnung + ' + Me.von_stahlverordnung.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.von_stahlverordnung.Location = New System.Drawing.Point(113, 54) + Me.von_stahlverordnung.Name = "von_stahlverordnung" + Me.von_stahlverordnung.Size = New System.Drawing.Size(93, 20) + Me.von_stahlverordnung.TabIndex = 36 + ' + 'Label106 + ' + Me.Label106.AutoSize = True + Me.Label106.Location = New System.Drawing.Point(6, 38) + Me.Label106.Name = "Label106" + Me.Label106.Size = New System.Drawing.Size(37, 13) + Me.Label106.TabIndex = 41 + Me.Label106.Text = "Quelle" + ' + 'Label108 + ' + Me.Label108.AutoSize = True + Me.Label108.Location = New System.Drawing.Point(110, 38) + Me.Label108.Name = "Label108" + Me.Label108.Size = New System.Drawing.Size(38, 13) + Me.Label108.TabIndex = 37 + Me.Label108.Text = "Datum" + ' + 'cbxQuelle + ' + Me.cbxQuelle._allowedValuesFreiText = Nothing + Me.cbxQuelle._allowFreiText = False + Me.cbxQuelle._value = "" + Me.cbxQuelle.DropDownHeight = 100 + Me.cbxQuelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxQuelle.DropDownWidth = 100 + Me.cbxQuelle.FormattingEnabled = True + Me.cbxQuelle.IntegralHeight = False + Me.cbxQuelle.Location = New System.Drawing.Point(9, 54) + Me.cbxQuelle.Name = "cbxQuelle" + Me.cbxQuelle.Size = New System.Drawing.Size(85, 21) + Me.cbxQuelle.TabIndex = 40 + ' + 'bis_stahlverordnung + ' + Me.bis_stahlverordnung.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.bis_stahlverordnung.Location = New System.Drawing.Point(249, 54) + Me.bis_stahlverordnung.Name = "bis_stahlverordnung" + Me.bis_stahlverordnung.Size = New System.Drawing.Size(93, 20) + Me.bis_stahlverordnung.TabIndex = 38 + ' + 'Label107 + ' + Me.Label107.AutoSize = True + Me.Label107.Location = New System.Drawing.Point(220, 57) + Me.Label107.Name = "Label107" + Me.Label107.Size = New System.Drawing.Size(23, 13) + Me.Label107.TabIndex = 39 + Me.Label107.Text = "bis:" + ' + 'GroupBox2 + ' + Me.GroupBox2.Controls.Add(Me.Label100) + Me.GroupBox2.Controls.Add(Me.von_CBAM) + Me.GroupBox2.Controls.Add(Me.Label96) + Me.GroupBox2.Controls.Add(Me.excelCbam) + Me.GroupBox2.Controls.Add(Me.bis_CBAM) + Me.GroupBox2.Controls.Add(Me.Label99) + Me.GroupBox2.Controls.Add(Me.cbxcbamQuelle) + Me.GroupBox2.Controls.Add(Me.cbxCBAM_Detaildaten) + Me.GroupBox2.Controls.Add(Me.Label101) + Me.GroupBox2.Controls.Add(Me.Button2) + Me.GroupBox2.Controls.Add(Me.Label103) + Me.GroupBox2.Controls.Add(Me.Label102) + Me.GroupBox2.Location = New System.Drawing.Point(14, 29) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(652, 263) + Me.GroupBox2.TabIndex = 43 + Me.GroupBox2.TabStop = False ' 'Label100 ' Me.Label100.AutoSize = True - Me.Label100.Location = New System.Drawing.Point(10, 59) + Me.Label100.Location = New System.Drawing.Point(6, 41) Me.Label100.Name = "Label100" Me.Label100.Size = New System.Drawing.Size(37, 13) Me.Label100.TabIndex = 28 Me.Label100.Text = "Quelle" ' + 'von_CBAM + ' + Me.von_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.von_CBAM.Location = New System.Drawing.Point(113, 57) + Me.von_CBAM.Name = "von_CBAM" + Me.von_CBAM.Size = New System.Drawing.Size(93, 20) + Me.von_CBAM.TabIndex = 20 + ' + 'Label96 + ' + Me.Label96.AutoSize = True + Me.Label96.Location = New System.Drawing.Point(110, 41) + Me.Label96.Name = "Label96" + Me.Label96.Size = New System.Drawing.Size(38, 13) + Me.Label96.TabIndex = 21 + Me.Label96.Text = "Datum" + ' + '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(9, 107) + 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 + ' + 'bis_CBAM + ' + Me.bis_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.bis_CBAM.Location = New System.Drawing.Point(249, 57) + Me.bis_CBAM.Name = "bis_CBAM" + Me.bis_CBAM.Size = New System.Drawing.Size(93, 20) + Me.bis_CBAM.TabIndex = 25 + ' + 'Label99 + ' + Me.Label99.AutoSize = True + Me.Label99.Location = New System.Drawing.Point(220, 60) + Me.Label99.Name = "Label99" + Me.Label99.Size = New System.Drawing.Size(23, 13) + Me.Label99.TabIndex = 26 + Me.Label99.Text = "bis:" + ' 'cbxcbamQuelle ' Me.cbxcbamQuelle._allowedValuesFreiText = Nothing @@ -2905,27 +3081,75 @@ Partial Class usrCntlZOLLAuswertungen Me.cbxcbamQuelle.DropDownWidth = 100 Me.cbxcbamQuelle.FormattingEnabled = True Me.cbxcbamQuelle.IntegralHeight = False - Me.cbxcbamQuelle.Location = New System.Drawing.Point(13, 75) + Me.cbxcbamQuelle.Location = New System.Drawing.Point(9, 57) Me.cbxcbamQuelle.Name = "cbxcbamQuelle" Me.cbxcbamQuelle.Size = New System.Drawing.Size(85, 21) Me.cbxcbamQuelle.TabIndex = 27 ' - 'Label99 + 'cbxCBAM_Detaildaten ' - Me.Label99.AutoSize = True - Me.Label99.Location = New System.Drawing.Point(224, 78) - Me.Label99.Name = "Label99" - Me.Label99.Size = New System.Drawing.Size(23, 13) - Me.Label99.TabIndex = 26 - Me.Label99.Text = "bis:" + Me.cbxCBAM_Detaildaten.AutoSize = True + Me.cbxCBAM_Detaildaten.Location = New System.Drawing.Point(9, 84) + Me.cbxCBAM_Detaildaten.Name = "cbxCBAM_Detaildaten" + Me.cbxCBAM_Detaildaten.Size = New System.Drawing.Size(120, 17) + Me.cbxCBAM_Detaildaten.TabIndex = 29 + Me.cbxCBAM_Detaildaten.Text = "mit Sendungsdetails" + Me.cbxCBAM_Detaildaten.UseVisualStyleBackColor = True ' - 'bis_CBAM + 'Label101 ' - Me.bis_CBAM.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.bis_CBAM.Location = New System.Drawing.Point(253, 75) - Me.bis_CBAM.Name = "bis_CBAM" - Me.bis_CBAM.Size = New System.Drawing.Size(93, 20) - Me.bis_CBAM.TabIndex = 25 + Me.Label101.AutoSize = True + Me.Label101.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label101.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label101.Location = New System.Drawing.Point(6, 158) + Me.Label101.Name = "Label101" + Me.Label101.Size = New System.Drawing.Size(154, 17) + Me.Label101.TabIndex = 30 + Me.Label101.Text = "CBAM Kundenstatus" + ' + 'Button2 + ' + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button2.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(9, 211) + Me.Button2.Name = "Button2" + Me.Button2.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) + Me.Button2.Size = New System.Drawing.Size(121, 38) + Me.Button2.TabIndex = 31 + Me.Button2.Text = "Excel" + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.UseVisualStyleBackColor = True + ' + 'Label103 + ' + Me.Label103.AutoSize = True + Me.Label103.Location = New System.Drawing.Point(6, 16) + Me.Label103.Name = "Label103" + Me.Label103.Size = New System.Drawing.Size(225, 13) + Me.Label103.TabIndex = 33 + Me.Label103.Text = "Liste der Kunden mit CBAM-pflichtigen Waren " + ' + 'Label102 + ' + Me.Label102.AutoSize = True + Me.Label102.Location = New System.Drawing.Point(6, 182) + Me.Label102.Name = "Label102" + Me.Label102.Size = New System.Drawing.Size(192, 13) + Me.Label102.TabIndex = 32 + Me.Label102.Text = "Kundenliste mit aktuellem CBAM-Status" + ' + 'Label104 + ' + Me.Label104.AutoSize = True + Me.Label104.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label104.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label104.Location = New System.Drawing.Point(11, 321) + Me.Label104.Name = "Label104" + Me.Label104.Size = New System.Drawing.Size(210, 17) + Me.Label104.TabIndex = 34 + Me.Label104.Text = "Stahlverordnung 2026/1384" ' 'Label97 ' @@ -2938,90 +3162,24 @@ Partial Class usrCntlZOLLAuswertungen Me.Label97.TabIndex = 24 Me.Label97.Text = "CBAM Kundenliste" ' - '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, 125) - 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, 59) - 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, 75) - Me.von_CBAM.Name = "von_CBAM" - Me.von_CBAM.Size = New System.Drawing.Size(93, 20) - Me.von_CBAM.TabIndex = 20 - ' 'pnl ' Me.pnl.Controls.Add(Me.Label2) 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(1092, 57) + Me.pnl.Size = New System.Drawing.Size(1007, 57) Me.pnl.TabIndex = 23 ' - 'Label101 + 'PictureBox14 ' - Me.Label101.AutoSize = True - Me.Label101.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label101.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label101.Location = New System.Drawing.Point(10, 176) - Me.Label101.Name = "Label101" - Me.Label101.Size = New System.Drawing.Size(154, 17) - Me.Label101.TabIndex = 30 - Me.Label101.Text = "CBAM Kundenstatus" - ' - 'Button2 - ' - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button2.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button2.Location = New System.Drawing.Point(13, 229) - Me.Button2.Name = "Button2" - Me.Button2.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) - Me.Button2.Size = New System.Drawing.Size(121, 38) - Me.Button2.TabIndex = 31 - Me.Button2.Text = "Excel" - Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button2.UseVisualStyleBackColor = True - ' - 'Label102 - ' - Me.Label102.AutoSize = True - Me.Label102.Location = New System.Drawing.Point(10, 200) - Me.Label102.Name = "Label102" - Me.Label102.Size = New System.Drawing.Size(192, 13) - Me.Label102.TabIndex = 32 - Me.Label102.Text = "Kundenliste mit aktuellem CBAM-Status" - ' - 'Label103 - ' - Me.Label103.AutoSize = True - Me.Label103.Location = New System.Drawing.Point(10, 35) - Me.Label103.Name = "Label103" - Me.Label103.Size = New System.Drawing.Size(225, 13) - Me.Label103.TabIndex = 33 - Me.Label103.Text = "Liste der Kunden mit CBAM-pflichtigen Waren " + Me.PictureBox14.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.PictureBox14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox14.Location = New System.Drawing.Point(693, 3) + Me.PictureBox14.Name = "PictureBox14" + Me.PictureBox14.Size = New System.Drawing.Size(18, 19) + Me.PictureBox14.TabIndex = 131 + Me.PictureBox14.TabStop = False ' 'usrCntlZOLLAuswertungen ' @@ -3032,7 +3190,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(1092, 1174) + Me.Size = New System.Drawing.Size(1007, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.grpDurmaz.ResumeLayout(False) @@ -3093,8 +3251,13 @@ Partial Class usrCntlZOLLAuswertungen CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage6.ResumeLayout(False) Me.TabPage6.PerformLayout() + Me.GroupBox6.ResumeLayout(False) + Me.GroupBox6.PerformLayout() + Me.GroupBox2.ResumeLayout(False) + Me.GroupBox2.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -3351,4 +3514,17 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Label101 As Label Friend WithEvents Label102 As Label Friend WithEvents Label103 As Label + Friend WithEvents Label105 As Label + Friend WithEvents Label106 As Label + Friend WithEvents cbxQuelle As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label107 As Label + Friend WithEvents bis_stahlverordnung As DateTimePicker + Friend WithEvents Label108 As Label + Friend WithEvents von_stahlverordnung As DateTimePicker + Friend WithEvents Button26 As Button + Friend WithEvents Label104 As Label + Friend WithEvents GroupBox6 As GroupBox + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents cbxStahlverordnung_SNDdet As CheckBox + Friend WithEvents PictureBox14 As PictureBox End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index 52b0fbda..f66c5cd3 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -1,6 +1,7 @@ Imports System.Data.SqlTypes Imports System.IO Imports GrapeCity.DataVisualization.Chart +Imports org.BouncyCastle.Asn1.Misc Public Class usrCntlZOLLAuswertungen @@ -142,6 +143,13 @@ Public Class usrCntlZOLLAuswertungen cbxcbamQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELOTEC", "TELOTEC")) cbxcbamQuelle.SelectedIndex = 0 + cbxQuelle.Items.Clear() + cbxQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "DAKOSY")) + cbxQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DHF", "DHF")) + cbxQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DHF-UNISPED", "DHF-UNI")) + cbxQuelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("TELOTEC", "TELOTEC")) + cbxQuelle.SelectedIndex = 0 + Dim yearStart As Date = CDate("01.01." & Now.Year) von_CBAM.Value = yearStart bis_CBAM.Value = Now @@ -1044,47 +1052,28 @@ Public Class usrCntlZOLLAuswertungen 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" + Case "DAKOSY" : SQLString = getDAkosySQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked, "CBAM") : Quelle = "FMZOLL" + Case "DHF" : SQLString = getDHFSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked, "CBAM") : Quelle = "EZOLL" + Case "DHF-UNI" : SQLString = getDHFSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked, "CBAM") : Quelle = "EZOLL_UNISPED" + Case "TELOTEC" : SQLString = getTELOTECSQL(von_CBAM.Value, bis_CBAM.Value, cbxCBAM_Detaildaten.Checked, "CBAM") : Quelle = "FMZOLL" End Select Dim dt As DataTable = SQL.loadDgvBySql(SQLString, Quelle, 700) If dt IsNot Nothing Then - cProgramFunctions.genExcelFromDT_NEW(dt) + cProgramFunctions.genExcelFromDT_NEW(dt,,, "CBAM-Bericht aus " & cbxcbamQuelle._value & " " & von_CBAM.Value.ToShortDateString & " - " & bis_CBAM.Value.ToShortDateString) End If End Sub - Private Function getDAkosySQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean) + Private Function getDAkosySQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean, type As String) - 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 + Dim sqlWhere = "" - - 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 */ + Select Case type + Case "CBAM" + sqlWhere = " /* Eisen & Stahl */ ezaWP_WarennummerEZT Like '72%' Or ezaWP_WarennummerEZT Like '7301%' -- Schienen, Profile etc. Or ezaWP_WarennummerEZT Like '7302%' @@ -1109,7 +1098,77 @@ Left Join tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = ' Or ezaWP_WarennummerEZT Like '2716%' /* Wasserstoff */ - Or ezaWP_WarennummerEZT Like '280410%' + Or ezaWP_WarennummerEZT Like '280410%'" + + Case Else + sqlWhere = "ezaWP_WarennummerEZT LIKE '72081000%' OR ezaWP_WarennummerEZT LIKE '72082500%' OR + ezaWP_WarennummerEZT LIKE '72082600%' OR ezaWP_WarennummerEZT LIKE '72082700%' OR + ezaWP_WarennummerEZT LIKE '72083600%' OR ezaWP_WarennummerEZT LIKE '72083700%' OR + ezaWP_WarennummerEZT LIKE '72083800%' OR ezaWP_WarennummerEZT LIKE '72083900%' OR + ezaWP_WarennummerEZT LIKE '72084000%' OR ezaWP_WarennummerEZT LIKE '72085120%' OR + ezaWP_WarennummerEZT LIKE '72085191%' OR ezaWP_WarennummerEZT LIKE '72085198%' OR + ezaWP_WarennummerEZT LIKE '72085210%' OR ezaWP_WarennummerEZT LIKE '72085291%' OR + ezaWP_WarennummerEZT LIKE '72085299%' OR ezaWP_WarennummerEZT LIKE '72085310%' OR + ezaWP_WarennummerEZT LIKE '72085390%' OR ezaWP_WarennummerEZT LIKE '72085400%' OR + ezaWP_WarennummerEZT LIKE '72089020%' OR ezaWP_WarennummerEZT LIKE '72089080%' OR + ezaWP_WarennummerEZT LIKE '72091500%' OR ezaWP_WarennummerEZT LIKE '72091610%' OR + ezaWP_WarennummerEZT LIKE '72091690%' OR ezaWP_WarennummerEZT LIKE '72091710%' OR + ezaWP_WarennummerEZT LIKE '72091790%' OR ezaWP_WarennummerEZT LIKE '72091810%' OR + ezaWP_WarennummerEZT LIKE '72091891%' OR ezaWP_WarennummerEZT LIKE '72091899%' OR + ezaWP_WarennummerEZT LIKE '72092500%' OR ezaWP_WarennummerEZT LIKE '72092610%' OR + ezaWP_WarennummerEZT LIKE '72092690%' OR ezaWP_WarennummerEZT LIKE '72092710%' OR + ezaWP_WarennummerEZT LIKE '72092790%' OR ezaWP_WarennummerEZT LIKE '72092810%' OR + ezaWP_WarennummerEZT LIKE '72092890%' OR ezaWP_WarennummerEZT LIKE '72099020%' OR + ezaWP_WarennummerEZT LIKE '72099080%' OR ezaWP_WarennummerEZT LIKE '72101100%' OR + ezaWP_WarennummerEZT LIKE '72101220%' OR ezaWP_WarennummerEZT LIKE '72101280%' OR + ezaWP_WarennummerEZT LIKE '72102000%' OR ezaWP_WarennummerEZT LIKE '72103000%' OR + ezaWP_WarennummerEZT LIKE '72105000%' OR ezaWP_WarennummerEZT LIKE '72107010%' OR ezaWP_WarennummerEZT LIKE '72107080%' OR ezaWP_WarennummerEZT LIKE '72109030%' OR + ezaWP_WarennummerEZT LIKE '72109040%' OR ezaWP_WarennummerEZT LIKE '72109080%' OR ezaWP_WarennummerEZT LIKE '72111300%' OR ezaWP_WarennummerEZT LIKE '72111400%' OR + ezaWP_WarennummerEZT LIKE '72111900%' OR ezaWP_WarennummerEZT LIKE '72112320%' OR ezaWP_WarennummerEZT LIKE '72112330%' OR ezaWP_WarennummerEZT LIKE '72112380%' OR + ezaWP_WarennummerEZT LIKE '72112900%' OR ezaWP_WarennummerEZT LIKE '72119020%' OR ezaWP_WarennummerEZT LIKE '72119080%' OR ezaWP_WarennummerEZT LIKE '72121010%' OR + ezaWP_WarennummerEZT LIKE '72121090%' OR ezaWP_WarennummerEZT LIKE '72122000%' OR ezaWP_WarennummerEZT LIKE '72124020%' OR ezaWP_WarennummerEZT LIKE '72124080%' OR + ezaWP_WarennummerEZT LIKE '72125020%' OR ezaWP_WarennummerEZT LIKE '72125030%' OR ezaWP_WarennummerEZT LIKE '72125040%' OR ezaWP_WarennummerEZT LIKE '72125090%' OR + ezaWP_WarennummerEZT LIKE '72126000%' OR ezaWP_WarennummerEZT LIKE '72131000%' OR ezaWP_WarennummerEZT LIKE '72132000%' OR ezaWP_WarennummerEZT LIKE '72139110%' OR + ezaWP_WarennummerEZT LIKE '72139120%' OR ezaWP_WarennummerEZT LIKE '72139141%' OR ezaWP_WarennummerEZT LIKE '72139149%' OR ezaWP_WarennummerEZT LIKE '72139170%' OR ezaWP_WarennummerEZT LIKE '72139190%' OR ezaWP_WarennummerEZT LIKE '72139910%' OR ezaWP_WarennummerEZT LIKE '72139990%' OR ezaWP_WarennummerEZT LIKE '72142000%' OR ezaWP_WarennummerEZT LIKE '72143000%' OR ezaWP_WarennummerEZT LIKE '72149110%' OR ezaWP_WarennummerEZT LIKE '72149190%' OR ezaWP_WarennummerEZT LIKE '72149910%' OR ezaWP_WarennummerEZT LIKE '72149931%' OR ezaWP_WarennummerEZT LIKE '72149939%' OR ezaWP_WarennummerEZT LIKE '72149950%' OR ezaWP_WarennummerEZT LIKE '72149971%' OR ezaWP_WarennummerEZT LIKE '72149979%' OR ezaWP_WarennummerEZT LIKE '72149995%' OR ezaWP_WarennummerEZT LIKE '72151000%' + OR ezaWP_WarennummerEZT LIKE '72155011%' OR ezaWP_WarennummerEZT LIKE '72155019%' OR ezaWP_WarennummerEZT LIKE '72155080%' OR ezaWP_WarennummerEZT LIKE '72159000%' OR ezaWP_WarennummerEZT LIKE '72161000%' OR ezaWP_WarennummerEZT LIKE '72162100%' OR ezaWP_WarennummerEZT LIKE '72162200%' OR ezaWP_WarennummerEZT LIKE '72163110%' OR ezaWP_WarennummerEZT LIKE '72163190%' OR ezaWP_WarennummerEZT LIKE '72163211%' OR ezaWP_WarennummerEZT LIKE '72163219%' OR ezaWP_WarennummerEZT LIKE '72163291%' OR ezaWP_WarennummerEZT LIKE '72163299%' OR ezaWP_WarennummerEZT LIKE '72163310%' OR ezaWP_WarennummerEZT LIKE '72163390%' OR ezaWP_WarennummerEZT LIKE '72164010%' OR ezaWP_WarennummerEZT LIKE '72164090%' OR ezaWP_WarennummerEZT LIKE '72165010%' OR ezaWP_WarennummerEZT LIKE '72165091%' OR ezaWP_WarennummerEZT LIKE '72165099%' OR ezaWP_WarennummerEZT LIKE '72169900%' OR ezaWP_WarennummerEZT LIKE '72171010%' OR ezaWP_WarennummerEZT LIKE '72171031%' OR ezaWP_WarennummerEZT LIKE '72171039%' OR ezaWP_WarennummerEZT LIKE '72171050%' OR ezaWP_WarennummerEZT LIKE '72171090%' + OR ezaWP_WarennummerEZT LIKE '72172010%' OR ezaWP_WarennummerEZT LIKE '72172030%' OR ezaWP_WarennummerEZT LIKE '72172050%' OR ezaWP_WarennummerEZT LIKE '72172090%' OR ezaWP_WarennummerEZT LIKE '72173041%' OR ezaWP_WarennummerEZT LIKE '72173049%' OR ezaWP_WarennummerEZT LIKE '72173050%' OR ezaWP_WarennummerEZT LIKE '72173090%' OR ezaWP_WarennummerEZT LIKE '72179020%' OR ezaWP_WarennummerEZT LIKE '72179050%' OR ezaWP_WarennummerEZT LIKE '72179090%' OR + ezaWP_WarennummerEZT LIKE '72191100%' OR ezaWP_WarennummerEZT LIKE '72191210%' OR ezaWP_WarennummerEZT LIKE '72191290%' OR ezaWP_WarennummerEZT LIKE '72191310%' OR ezaWP_WarennummerEZT LIKE '72191390%' OR ezaWP_WarennummerEZT LIKE '72191410%' OR ezaWP_WarennummerEZT LIKE '72191490%' OR ezaWP_WarennummerEZT LIKE '72192110%' OR ezaWP_WarennummerEZT LIKE '72192190%' OR ezaWP_WarennummerEZT LIKE '72192210%' OR ezaWP_WarennummerEZT LIKE '72192290%' OR ezaWP_WarennummerEZT LIKE '72192300%' OR ezaWP_WarennummerEZT LIKE '72192400%' OR ezaWP_WarennummerEZT LIKE '72193100%' OR ezaWP_WarennummerEZT LIKE '72193210%' OR ezaWP_WarennummerEZT LIKE '72193290%' OR ezaWP_WarennummerEZT LIKE '72193310%' OR ezaWP_WarennummerEZT LIKE '72193390%' OR ezaWP_WarennummerEZT LIKE '72193410%' OR ezaWP_WarennummerEZT LIKE '72193490%' OR ezaWP_WarennummerEZT LIKE '72193510%' OR ezaWP_WarennummerEZT LIKE '72193590%' OR ezaWP_WarennummerEZT LIKE '72199020%' OR ezaWP_WarennummerEZT LIKE '72199080%' OR ezaWP_WarennummerEZT LIKE '72201100%' OR ezaWP_WarennummerEZT LIKE '72201200%' OR ezaWP_WarennummerEZT LIKE '72202021%' OR ezaWP_WarennummerEZT LIKE '72202029%' OR ezaWP_WarennummerEZT LIKE '72202041%' OR ezaWP_WarennummerEZT LIKE '72202049%' OR ezaWP_WarennummerEZT LIKE '72202081%' OR ezaWP_WarennummerEZT LIKE '72202089%' OR ezaWP_WarennummerEZT LIKE '72209020%' + OR ezaWP_WarennummerEZT LIKE '72209080%' OR ezaWP_WarennummerEZT LIKE '72210010%' OR ezaWP_WarennummerEZT LIKE '72210090%' OR ezaWP_WarennummerEZT LIKE '72221111%' + OR ezaWP_WarennummerEZT LIKE '72221119%' OR ezaWP_WarennummerEZT LIKE '72221181%' OR ezaWP_WarennummerEZT LIKE '72221189%' OR ezaWP_WarennummerEZT LIKE '72221910%' + OR ezaWP_WarennummerEZT LIKE '72221990%' OR ezaWP_WarennummerEZT LIKE '72222011%' OR ezaWP_WarennummerEZT LIKE '72222019%' OR ezaWP_WarennummerEZT LIKE '72222021%' + OR ezaWP_WarennummerEZT LIKE '72222029%' OR ezaWP_WarennummerEZT LIKE '72222031%' OR ezaWP_WarennummerEZT LIKE '72222039%' OR ezaWP_WarennummerEZT LIKE '72222081%' OR ezaWP_WarennummerEZT LIKE '72222089%' OR ezaWP_WarennummerEZT LIKE '72223051%' OR ezaWP_WarennummerEZT LIKE '72223091%' OR ezaWP_WarennummerEZT LIKE '72223097%' OR ezaWP_WarennummerEZT LIKE '72224010%' OR ezaWP_WarennummerEZT LIKE '72224050%' OR ezaWP_WarennummerEZT LIKE '72224090%' OR ezaWP_WarennummerEZT LIKE '72251910%' OR ezaWP_WarennummerEZT LIKE '72251990%' OR ezaWP_WarennummerEZT LIKE '72253010%' OR ezaWP_WarennummerEZT LIKE '72253030%' OR ezaWP_WarennummerEZT LIKE '72253090%' OR ezaWP_WarennummerEZT LIKE '72254012%' OR ezaWP_WarennummerEZT LIKE '72254015%' OR ezaWP_WarennummerEZT LIKE '72254040%' OR ezaWP_WarennummerEZT LIKE '72254060%' OR ezaWP_WarennummerEZT LIKE '72254090%' OR ezaWP_WarennummerEZT LIKE '72255020%' OR ezaWP_WarennummerEZT LIKE '72255080%' OR ezaWP_WarennummerEZT LIKE '72259100%' OR ezaWP_WarennummerEZT LIKE '72261910%' OR ezaWP_WarennummerEZT LIKE '72261980%' OR ezaWP_WarennummerEZT LIKE '72262000%' OR ezaWP_WarennummerEZT LIKE '72269120%' OR ezaWP_WarennummerEZT LIKE '72269191%' OR ezaWP_WarennummerEZT LIKE '72269199%' OR ezaWP_WarennummerEZT LIKE '72269200%' OR ezaWP_WarennummerEZT LIKE '72269910%' OR ezaWP_WarennummerEZT LIKE '72271000%' OR ezaWP_WarennummerEZT LIKE '72272000%' OR ezaWP_WarennummerEZT LIKE '72279010%' OR ezaWP_WarennummerEZT LIKE '72279050%' OR ezaWP_WarennummerEZT LIKE '72279095%' + OR ezaWP_WarennummerEZT LIKE '72281020%' OR ezaWP_WarennummerEZT LIKE '72281090%' OR ezaWP_WarennummerEZT LIKE '72282010%' OR ezaWP_WarennummerEZT LIKE '72282091%' OR ezaWP_WarennummerEZT LIKE '72282099%' OR ezaWP_WarennummerEZT LIKE '72283020%' OR ezaWP_WarennummerEZT LIKE '72283041%' OR ezaWP_WarennummerEZT LIKE '72283049%' OR ezaWP_WarennummerEZT LIKE '72283061%' OR ezaWP_WarennummerEZT LIKE '72283070%' OR ezaWP_WarennummerEZT LIKE '72283089%' OR ezaWP_WarennummerEZT LIKE '72285020%' OR ezaWP_WarennummerEZT LIKE '72285040%' OR ezaWP_WarennummerEZT LIKE '72285061%' OR ezaWP_WarennummerEZT LIKE '72285069%' OR ezaWP_WarennummerEZT LIKE '72285080%' OR ezaWP_WarennummerEZT LIKE '72286020%' OR ezaWP_WarennummerEZT LIKE '72286080%' OR ezaWP_WarennummerEZT LIKE '72287010%' OR ezaWP_WarennummerEZT LIKE '72287090%' OR ezaWP_WarennummerEZT LIKE '72288000%' OR ezaWP_WarennummerEZT LIKE '73011000%' OR ezaWP_WarennummerEZT LIKE '73021022%' OR ezaWP_WarennummerEZT LIKE '73021028%' OR ezaWP_WarennummerEZT LIKE '73021040%' OR ezaWP_WarennummerEZT LIKE '73021050%' OR ezaWP_WarennummerEZT LIKE '73024000%' OR ezaWP_WarennummerEZT LIKE '73041100%' OR ezaWP_WarennummerEZT LIKE '73041910%' OR ezaWP_WarennummerEZT LIKE '73041930%' OR ezaWP_WarennummerEZT LIKE '73041990%' OR ezaWP_WarennummerEZT LIKE '73042200%' OR ezaWP_WarennummerEZT LIKE '73042300%' + OR ezaWP_WarennummerEZT LIKE '73042400%' OR ezaWP_WarennummerEZT LIKE '73042910%' OR ezaWP_WarennummerEZT LIKE '73042930%' OR ezaWP_WarennummerEZT LIKE '73042990%' OR ezaWP_WarennummerEZT LIKE '73043120%' OR ezaWP_WarennummerEZT LIKE '73043180%' OR ezaWP_WarennummerEZT LIKE '73043950%' OR ezaWP_WarennummerEZT LIKE '73043982%' OR ezaWP_WarennummerEZT LIKE '73043983%' OR ezaWP_WarennummerEZT LIKE '73043988%' OR ezaWP_WarennummerEZT LIKE '73044100%' OR ezaWP_WarennummerEZT LIKE '73044983%' OR ezaWP_WarennummerEZT LIKE '73044985%' OR ezaWP_WarennummerEZT LIKE '73045181%' OR ezaWP_WarennummerEZT LIKE '73045189%' OR ezaWP_WarennummerEZT LIKE '73045930%' OR ezaWP_WarennummerEZT LIKE '73045982%' OR ezaWP_WarennummerEZT LIKE '73045983%' OR ezaWP_WarennummerEZT LIKE '73045989%' OR ezaWP_WarennummerEZT LIKE '73049000%' OR ezaWP_WarennummerEZT LIKE '73051100%' OR ezaWP_WarennummerEZT LIKE '73051200%' OR ezaWP_WarennummerEZT LIKE '73051900%' OR ezaWP_WarennummerEZT LIKE '73052000%' OR ezaWP_WarennummerEZT LIKE '73053100%' OR ezaWP_WarennummerEZT LIKE '73053900%' OR ezaWP_WarennummerEZT LIKE '73059000%' + OR ezaWP_WarennummerEZT LIKE '73061100%' OR ezaWP_WarennummerEZT LIKE '73061900%' OR ezaWP_WarennummerEZT LIKE '73062100%' OR ezaWP_WarennummerEZT LIKE '73062900%' OR ezaWP_WarennummerEZT LIKE '73063012%' OR ezaWP_WarennummerEZT LIKE '73063018%' OR ezaWP_WarennummerEZT LIKE '73063041%' OR ezaWP_WarennummerEZT LIKE '73063049%' OR ezaWP_WarennummerEZT LIKE '73063072%' OR ezaWP_WarennummerEZT LIKE '73063077%' OR ezaWP_WarennummerEZT LIKE '73063080%' OR ezaWP_WarennummerEZT LIKE '73064020%' OR ezaWP_WarennummerEZT LIKE '73064080%' OR ezaWP_WarennummerEZT LIKE '73065021%' OR ezaWP_WarennummerEZT LIKE '73065029%' OR ezaWP_WarennummerEZT LIKE '73065080%' OR ezaWP_WarennummerEZT LIKE '73066110%' OR ezaWP_WarennummerEZT LIKE '73066192%' OR ezaWP_WarennummerEZT LIKE '73066199%' OR ezaWP_WarennummerEZT LIKE '73066910%' OR ezaWP_WarennummerEZT LIKE '73066990%' OR ezaWP_WarennummerEZT LIKE '73069000%' " + + End Select + + + + 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 ( + " & sqlWhere & " ) GROUP BY @@ -1118,35 +1177,15 @@ Left Join tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = ' 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 + Private Function getDHFSQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean, type As String) - --, (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 " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[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 " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Adressen on Adressen.AdressenNr = Kunden.KundenNr - Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 - Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[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) + + Dim sqlWhere = "" + + Select Case type + Case "CBAM" + sqlWhere = " 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 @@ -1158,42 +1197,83 @@ Adressen.[E-Mail] as EMailKunde1, OR ComCd like '720241%' OR ComCd like '720249%' OR ComCd like '720260%' - OR ComCd like '280410%' - ) + OR ComCd like '280410%'" + + Case Else + sqlWhere = "ComCd LIKE '72081000%' OR ComCd LIKE '72082500%' OR + ComCd LIKE '72082600%' OR ComCd LIKE '72082700%' OR + ComCd LIKE '72083600%' OR ComCd LIKE '72083700%' OR + ComCd LIKE '72083800%' OR ComCd LIKE '72083900%' OR + ComCd LIKE '72084000%' OR ComCd LIKE '72085120%' OR + ComCd LIKE '72085191%' OR ComCd LIKE '72085198%' OR + ComCd LIKE '72085210%' OR ComCd LIKE '72085291%' OR + ComCd LIKE '72085299%' OR ComCd LIKE '72085310%' OR + ComCd LIKE '72085390%' OR ComCd LIKE '72085400%' OR + ComCd LIKE '72089020%' OR ComCd LIKE '72089080%' OR + ComCd LIKE '72091500%' OR ComCd LIKE '72091610%' OR + ComCd LIKE '72091690%' OR ComCd LIKE '72091710%' OR + ComCd LIKE '72091790%' OR ComCd LIKE '72091810%' OR + ComCd LIKE '72091891%' OR ComCd LIKE '72091899%' OR + ComCd LIKE '72092500%' OR ComCd LIKE '72092610%' OR + ComCd LIKE '72092690%' OR ComCd LIKE '72092710%' OR + ComCd LIKE '72092790%' OR ComCd LIKE '72092810%' OR + ComCd LIKE '72092890%' OR ComCd LIKE '72099020%' OR + ComCd LIKE '72099080%' OR ComCd LIKE '72101100%' OR + ComCd LIKE '72101220%' OR ComCd LIKE '72101280%' OR + ComCd LIKE '72102000%' OR ComCd LIKE '72103000%' OR + ComCd LIKE '72105000%' OR ComCd LIKE '72107010%' OR ComCd LIKE '72107080%' OR ComCd LIKE '72109030%' OR + ComCd LIKE '72109040%' OR ComCd LIKE '72109080%' OR ComCd LIKE '72111300%' OR ComCd LIKE '72111400%' OR + ComCd LIKE '72111900%' OR ComCd LIKE '72112320%' OR ComCd LIKE '72112330%' OR ComCd LIKE '72112380%' OR + ComCd LIKE '72112900%' OR ComCd LIKE '72119020%' OR ComCd LIKE '72119080%' OR ComCd LIKE '72121010%' OR + ComCd LIKE '72121090%' OR ComCd LIKE '72122000%' OR ComCd LIKE '72124020%' OR ComCd LIKE '72124080%' OR + ComCd LIKE '72125020%' OR ComCd LIKE '72125030%' OR ComCd LIKE '72125040%' OR ComCd LIKE '72125090%' OR + ComCd LIKE '72126000%' OR ComCd LIKE '72131000%' OR ComCd LIKE '72132000%' OR ComCd LIKE '72139110%' OR + ComCd LIKE '72139120%' OR ComCd LIKE '72139141%' OR ComCd LIKE '72139149%' OR ComCd LIKE '72139170%' OR ComCd LIKE '72139190%' OR ComCd LIKE '72139910%' OR ComCd LIKE '72139990%' OR ComCd LIKE '72142000%' OR ComCd LIKE '72143000%' OR ComCd LIKE '72149110%' OR ComCd LIKE '72149190%' OR ComCd LIKE '72149910%' OR ComCd LIKE '72149931%' OR ComCd LIKE '72149939%' OR ComCd LIKE '72149950%' OR ComCd LIKE '72149971%' OR ComCd LIKE '72149979%' OR ComCd LIKE '72149995%' OR ComCd LIKE '72151000%' OR ComCd LIKE '72155011%' OR ComCd LIKE '72155019%' OR ComCd LIKE '72155080%' OR ComCd LIKE '72159000%' OR ComCd LIKE '72161000%' OR ComCd LIKE '72162100%' OR ComCd LIKE '72162200%' OR ComCd LIKE '72163110%' OR ComCd LIKE '72163190%' OR ComCd LIKE '72163211%' OR ComCd LIKE '72163219%' OR ComCd LIKE '72163291%' OR ComCd LIKE '72163299%' OR ComCd LIKE '72163310%' OR ComCd LIKE '72163390%' OR ComCd LIKE '72164010%' OR ComCd LIKE '72164090%' OR ComCd LIKE '72165010%' OR ComCd LIKE '72165091%' OR ComCd LIKE '72165099%' OR ComCd LIKE '72169900%' OR ComCd LIKE '72171010%' OR ComCd LIKE '72171031%' OR ComCd LIKE '72171039%' OR ComCd LIKE '72171050%' OR ComCd LIKE '72171090%' + OR ComCd LIKE '72172010%' OR ComCd LIKE '72172030%' OR ComCd LIKE '72172050%' OR ComCd LIKE '72172090%' OR ComCd LIKE '72173041%' OR ComCd LIKE '72173049%' OR ComCd LIKE '72173050%' OR ComCd LIKE '72173090%' OR ComCd LIKE '72179020%' OR ComCd LIKE '72179050%' OR ComCd LIKE '72179090%' OR + ComCd LIKE '72191100%' OR ComCd LIKE '72191210%' OR ComCd LIKE '72191290%' OR ComCd LIKE '72191310%' OR ComCd LIKE '72191390%' OR ComCd LIKE '72191410%' OR ComCd LIKE '72191490%' OR ComCd LIKE '72192110%' OR ComCd LIKE '72192190%' OR ComCd LIKE '72192210%' OR ComCd LIKE '72192290%' OR ComCd LIKE '72192300%' OR ComCd LIKE '72192400%' OR ComCd LIKE '72193100%' OR ComCd LIKE '72193210%' OR ComCd LIKE '72193290%' OR ComCd LIKE '72193310%' OR ComCd LIKE '72193390%' OR ComCd LIKE '72193410%' OR ComCd LIKE '72193490%' OR ComCd LIKE '72193510%' OR ComCd LIKE '72193590%' OR ComCd LIKE '72199020%' OR ComCd LIKE '72199080%' OR ComCd LIKE '72201100%' OR ComCd LIKE '72201200%' OR ComCd LIKE '72202021%' OR ComCd LIKE '72202029%' OR ComCd LIKE '72202041%' OR ComCd LIKE '72202049%' OR ComCd LIKE '72202081%' OR ComCd LIKE '72202089%' OR ComCd LIKE '72209020%' + OR ComCd LIKE '72209080%' OR ComCd LIKE '72210010%' OR ComCd LIKE '72210090%' OR ComCd LIKE '72221111%' OR ComCd LIKE '72221119%' OR ComCd LIKE '72221181%' OR ComCd LIKE '72221189%' OR ComCd LIKE '72221910%' OR ComCd LIKE '72221990%' OR ComCd LIKE '72222011%' OR ComCd LIKE '72222019%' OR ComCd LIKE '72222021%' OR ComCd LIKE '72222029%' OR ComCd LIKE '72222031%' OR ComCd LIKE '72222039%' OR ComCd LIKE '72222081%' OR ComCd LIKE '72222089%' OR ComCd LIKE '72223051%' OR ComCd LIKE '72223091%' OR ComCd LIKE '72223097%' OR ComCd LIKE '72224010%' OR ComCd LIKE '72224050%' OR ComCd LIKE '72224090%' OR ComCd LIKE '72251910%' OR ComCd LIKE '72251990%' OR ComCd LIKE '72253010%' OR ComCd LIKE '72253030%' OR ComCd LIKE '72253090%' OR ComCd LIKE '72254012%' OR ComCd LIKE '72254015%' OR ComCd LIKE '72254040%' OR ComCd LIKE '72254060%' OR ComCd LIKE '72254090%' OR ComCd LIKE '72255020%' OR ComCd LIKE '72255080%' OR ComCd LIKE '72259100%' OR ComCd LIKE '72261910%' OR ComCd LIKE '72261980%' OR ComCd LIKE '72262000%' OR ComCd LIKE '72269120%' OR ComCd LIKE '72269191%' OR ComCd LIKE '72269199%' OR ComCd LIKE '72269200%' OR ComCd LIKE '72269910%' OR ComCd LIKE '72271000%' OR ComCd LIKE '72272000%' OR ComCd LIKE '72279010%' OR ComCd LIKE '72279050%' OR ComCd LIKE '72279095%' + OR ComCd LIKE '72281020%' OR ComCd LIKE '72281090%' OR ComCd LIKE '72282010%' OR ComCd LIKE '72282091%' OR ComCd LIKE '72282099%' OR ComCd LIKE '72283020%' OR ComCd LIKE '72283041%' OR ComCd LIKE '72283049%' OR ComCd LIKE '72283061%' OR ComCd LIKE '72283070%' OR ComCd LIKE '72283089%' OR ComCd LIKE '72285020%' OR ComCd LIKE '72285040%' OR ComCd LIKE '72285061%' OR ComCd LIKE '72285069%' OR ComCd LIKE '72285080%' OR ComCd LIKE '72286020%' OR ComCd LIKE '72286080%' OR ComCd LIKE '72287010%' OR ComCd LIKE '72287090%' OR ComCd LIKE '72288000%' OR ComCd LIKE '73011000%' OR ComCd LIKE '73021022%' OR ComCd LIKE '73021028%' OR ComCd LIKE '73021040%' OR ComCd LIKE '73021050%' OR ComCd LIKE '73024000%' OR ComCd LIKE '73041100%' OR ComCd LIKE '73041910%' OR ComCd LIKE '73041930%' OR ComCd LIKE '73041990%' OR ComCd LIKE '73042200%' OR ComCd LIKE '73042300%' OR ComCd LIKE '73042400%' OR ComCd LIKE '73042910%' OR ComCd LIKE '73042930%' OR ComCd LIKE '73042990%' OR ComCd LIKE '73043120%' OR ComCd LIKE '73043180%' OR ComCd LIKE '73043950%' OR ComCd LIKE '73043982%' OR ComCd LIKE '73043983%' OR ComCd LIKE '73043988%' OR ComCd LIKE '73044100%' OR ComCd LIKE '73044983%' OR ComCd LIKE '73044985%' OR ComCd LIKE '73045181%' OR ComCd LIKE '73045189%' OR ComCd LIKE '73045930%' OR ComCd LIKE '73045982%' OR ComCd LIKE '73045983%' OR ComCd LIKE '73045989%' OR ComCd LIKE '73049000%' OR ComCd LIKE '73051100%' OR ComCd LIKE '73051200%' OR ComCd LIKE '73051900%' OR ComCd LIKE '73052000%' OR ComCd LIKE '73053100%' OR ComCd LIKE '73053900%' OR ComCd LIKE '73059000%' OR ComCd LIKE '73061100%' OR ComCd LIKE '73061900%' OR ComCd LIKE '73062100%' OR ComCd LIKE '73062900%' OR ComCd LIKE '73063012%' OR ComCd LIKE '73063018%' OR ComCd LIKE '73063041%' OR ComCd LIKE '73063049%' OR ComCd LIKE '73063072%' OR ComCd LIKE '73063077%' OR ComCd LIKE '73063080%' OR ComCd LIKE '73064020%' OR ComCd LIKE '73064080%' OR ComCd LIKE '73065021%' OR ComCd LIKE '73065029%' OR ComCd LIKE '73065080%' OR ComCd LIKE '73066110%' OR ComCd LIKE '73066192%' OR ComCd LIKE '73066199%' OR ComCd LIKE '73066910%' OR ComCd LIKE '73066990%' OR ComCd LIKE '73069000%' " + + End Select + + + 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 " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[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 " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Adressen on Adressen.AdressenNr = Kunden.KundenNr + Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].Offerten on Offerten.KundenNr = Kunden.KundenNr And OffertenNr = 65 + Left Join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".[VERAG].[dbo].tblKundenKontakt on Kunden.KundenNr = kkd_KundenNr And kkd_kkaBez = 'Allgemein' + where DecDT between '" & von & "' AND '" & bis & "' + and ( " & sqlWhere & ") 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) + Private Function getTELOTECSQL(von As Date, bis As Date, mitDetaildatensaetze As Boolean, type As String) - 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' + Dim sqlWhere = "" - where 1=1 - -and - ( - left(Item_ComCd,4) IN (2523,2716,2808,2814,3102,3105,7201,7203,7318,7326,7601,7616) + Select Case type + Case "CBAM" + sqlWhere = " 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 @@ -1205,16 +1285,70 @@ and 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%' + OR Item_ComCd like '280410%' " - and telnam_aktuellsteNachricht=1 + Case Else + sqlWhere = "Item_ComCd LIKE '72081000%' OR Item_ComCd LIKE '72082500%' OR + Item_ComCd LIKE '72082600%' OR Item_ComCd LIKE '72082700%' OR + Item_ComCd LIKE '72083600%' OR Item_ComCd LIKE '72083700%' OR + Item_ComCd LIKE '72083800%' OR Item_ComCd LIKE '72083900%' OR + Item_ComCd LIKE '72084000%' OR Item_ComCd LIKE '72085120%' OR + Item_ComCd LIKE '72085191%' OR Item_ComCd LIKE '72085198%' OR + Item_ComCd LIKE '72085210%' OR Item_ComCd LIKE '72085291%' OR + Item_ComCd LIKE '72085299%' OR Item_ComCd LIKE '72085310%' OR + Item_ComCd LIKE '72085390%' OR Item_ComCd LIKE '72085400%' OR + Item_ComCd LIKE '72089020%' OR Item_ComCd LIKE '72089080%' OR + Item_ComCd LIKE '72091500%' OR Item_ComCd LIKE '72091610%' OR + Item_ComCd LIKE '72091690%' OR Item_ComCd LIKE '72091710%' OR + Item_ComCd LIKE '72091790%' OR Item_ComCd LIKE '72091810%' OR + Item_ComCd LIKE '72091891%' OR Item_ComCd LIKE '72091899%' OR + Item_ComCd LIKE '72092500%' OR Item_ComCd LIKE '72092610%' OR + Item_ComCd LIKE '72092690%' OR Item_ComCd LIKE '72092710%' OR + Item_ComCd LIKE '72092790%' OR Item_ComCd LIKE '72092810%' OR + Item_ComCd LIKE '72092890%' OR Item_ComCd LIKE '72099020%' OR + Item_ComCd LIKE '72099080%' OR Item_ComCd LIKE '72101100%' OR + Item_ComCd LIKE '72101220%' OR Item_ComCd LIKE '72101280%' OR + Item_ComCd LIKE '72102000%' OR Item_ComCd LIKE '72103000%' OR + Item_ComCd LIKE '72105000%' OR Item_ComCd LIKE '72107010%' OR Item_ComCd LIKE '72107080%' OR Item_ComCd LIKE '72109030%' OR + Item_ComCd LIKE '72109040%' OR Item_ComCd LIKE '72109080%' OR Item_ComCd LIKE '72111300%' OR Item_ComCd LIKE '72111400%' OR + Item_ComCd LIKE '72111900%' OR Item_ComCd LIKE '72112320%' OR Item_ComCd LIKE '72112330%' OR Item_ComCd LIKE '72112380%' OR + Item_ComCd LIKE '72112900%' OR Item_ComCd LIKE '72119020%' OR Item_ComCd LIKE '72119080%' OR Item_ComCd LIKE '72121010%' OR + Item_ComCd LIKE '72121090%' OR Item_ComCd LIKE '72122000%' OR Item_ComCd LIKE '72124020%' OR Item_ComCd LIKE '72124080%' OR + Item_ComCd LIKE '72125020%' OR Item_ComCd LIKE '72125030%' OR Item_ComCd LIKE '72125040%' OR Item_ComCd LIKE '72125090%' OR + Item_ComCd LIKE '72126000%' OR Item_ComCd LIKE '72131000%' OR Item_ComCd LIKE '72132000%' OR Item_ComCd LIKE '72139110%' OR + Item_ComCd LIKE '72139120%' OR Item_ComCd LIKE '72139141%' OR Item_ComCd LIKE '72139149%' OR Item_ComCd LIKE '72139170%' OR Item_ComCd LIKE '72139190%' OR Item_ComCd LIKE '72139910%' OR Item_ComCd LIKE '72139990%' OR Item_ComCd LIKE '72142000%' OR Item_ComCd LIKE '72143000%' OR Item_ComCd LIKE '72149110%' OR Item_ComCd LIKE '72149190%' OR Item_ComCd LIKE '72149910%' OR Item_ComCd LIKE '72149931%' OR Item_ComCd LIKE '72149939%' OR Item_ComCd LIKE '72149950%' OR Item_ComCd LIKE '72149971%' OR Item_ComCd LIKE '72149979%' OR Item_ComCd LIKE '72149995%' OR Item_ComCd LIKE '72151000%' OR Item_ComCd LIKE '72155011%' OR Item_ComCd LIKE '72155019%' OR Item_ComCd LIKE '72155080%' OR Item_ComCd LIKE '72159000%' OR Item_ComCd LIKE '72161000%' OR Item_ComCd LIKE '72162100%' OR Item_ComCd LIKE '72162200%' OR Item_ComCd LIKE '72163110%' OR Item_ComCd LIKE '72163190%' OR Item_ComCd LIKE '72163211%' OR Item_ComCd LIKE '72163219%' OR Item_ComCd LIKE '72163291%' OR Item_ComCd LIKE '72163299%' OR Item_ComCd LIKE '72163310%' OR Item_ComCd LIKE '72163390%' OR Item_ComCd LIKE '72164010%' OR Item_ComCd LIKE '72164090%' OR Item_ComCd LIKE '72165010%' OR Item_ComCd LIKE '72165091%' OR Item_ComCd LIKE '72165099%' OR Item_ComCd LIKE '72169900%' OR Item_ComCd LIKE '72171010%' OR Item_ComCd LIKE '72171031%' OR Item_ComCd LIKE '72171039%' OR Item_ComCd LIKE '72171050%' OR Item_ComCd LIKE '72171090%' + OR Item_ComCd LIKE '72172010%' OR Item_ComCd LIKE '72172030%' OR Item_ComCd LIKE '72172050%' OR Item_ComCd LIKE '72172090%' OR Item_ComCd LIKE '72173041%' OR Item_ComCd LIKE '72173049%' OR Item_ComCd LIKE '72173050%' OR Item_ComCd LIKE '72173090%' OR Item_ComCd LIKE '72179020%' OR Item_ComCd LIKE '72179050%' OR Item_ComCd LIKE '72179090%' OR + Item_ComCd LIKE '72191100%' OR Item_ComCd LIKE '72191210%' OR Item_ComCd LIKE '72191290%' OR Item_ComCd LIKE '72191310%' OR Item_ComCd LIKE '72191390%' OR Item_ComCd LIKE '72191410%' OR Item_ComCd LIKE '72191490%' OR Item_ComCd LIKE '72192110%' OR Item_ComCd LIKE '72192190%' OR Item_ComCd LIKE '72192210%' OR Item_ComCd LIKE '72192290%' OR Item_ComCd LIKE '72192300%' OR Item_ComCd LIKE '72192400%' OR Item_ComCd LIKE '72193100%' OR Item_ComCd LIKE '72193210%' OR Item_ComCd LIKE '72193290%' OR Item_ComCd LIKE '72193310%' OR Item_ComCd LIKE '72193390%' OR Item_ComCd LIKE '72193410%' OR Item_ComCd LIKE '72193490%' OR Item_ComCd LIKE '72193510%' OR Item_ComCd LIKE '72193590%' OR Item_ComCd LIKE '72199020%' OR Item_ComCd LIKE '72199080%' OR Item_ComCd LIKE '72201100%' OR Item_ComCd LIKE '72201200%' OR Item_ComCd LIKE '72202021%' OR Item_ComCd LIKE '72202029%' OR Item_ComCd LIKE '72202041%' OR Item_ComCd LIKE '72202049%' OR Item_ComCd LIKE '72202081%' OR Item_ComCd LIKE '72202089%' OR Item_ComCd LIKE '72209020%' + OR Item_ComCd LIKE '72209080%' OR Item_ComCd LIKE '72210010%' OR Item_ComCd LIKE '72210090%' OR Item_ComCd LIKE '72221111%' OR Item_ComCd LIKE '72221119%' OR Item_ComCd LIKE '72221181%' OR Item_ComCd LIKE '72221189%' OR Item_ComCd LIKE '72221910%' OR Item_ComCd LIKE '72221990%' OR Item_ComCd LIKE '72222011%' OR Item_ComCd LIKE '72222019%' OR Item_ComCd LIKE '72222021%' OR Item_ComCd LIKE '72222029%' OR Item_ComCd LIKE '72222031%' OR Item_ComCd LIKE '72222039%' OR Item_ComCd LIKE '72222081%' OR Item_ComCd LIKE '72222089%' OR Item_ComCd LIKE '72223051%' OR Item_ComCd LIKE '72223091%' OR Item_ComCd LIKE '72223097%' OR Item_ComCd LIKE '72224010%' OR Item_ComCd LIKE '72224050%' OR Item_ComCd LIKE '72224090%' OR Item_ComCd LIKE '72251910%' OR Item_ComCd LIKE '72251990%' OR Item_ComCd LIKE '72253010%' OR Item_ComCd LIKE '72253030%' OR Item_ComCd LIKE '72253090%' OR Item_ComCd LIKE '72254012%' OR Item_ComCd LIKE '72254015%' OR Item_ComCd LIKE '72254040%' OR Item_ComCd LIKE '72254060%' OR Item_ComCd LIKE '72254090%' OR Item_ComCd LIKE '72255020%' OR Item_ComCd LIKE '72255080%' OR Item_ComCd LIKE '72259100%' OR Item_ComCd LIKE '72261910%' OR Item_ComCd LIKE '72261980%' OR Item_ComCd LIKE '72262000%' OR Item_ComCd LIKE '72269120%' OR Item_ComCd LIKE '72269191%' OR Item_ComCd LIKE '72269199%' OR Item_ComCd LIKE '72269200%' OR Item_ComCd LIKE '72269910%' OR Item_ComCd LIKE '72271000%' OR Item_ComCd LIKE '72272000%' OR Item_ComCd LIKE '72279010%' OR Item_ComCd LIKE '72279050%' OR Item_ComCd LIKE '72279095%' + OR Item_ComCd LIKE '72281020%' OR Item_ComCd LIKE '72281090%' OR Item_ComCd LIKE '72282010%' OR Item_ComCd LIKE '72282091%' OR Item_ComCd LIKE '72282099%' OR Item_ComCd LIKE '72283020%' OR Item_ComCd LIKE '72283041%' OR Item_ComCd LIKE '72283049%' OR Item_ComCd LIKE '72283061%' OR Item_ComCd LIKE '72283070%' OR Item_ComCd LIKE '72283089%' OR Item_ComCd LIKE '72285020%' OR Item_ComCd LIKE '72285040%' OR Item_ComCd LIKE '72285061%' OR Item_ComCd LIKE '72285069%' OR Item_ComCd LIKE '72285080%' OR Item_ComCd LIKE '72286020%' OR Item_ComCd LIKE '72286080%' OR Item_ComCd LIKE '72287010%' OR Item_ComCd LIKE '72287090%' OR Item_ComCd LIKE '72288000%' OR Item_ComCd LIKE '73011000%' OR Item_ComCd LIKE '73021022%' OR Item_ComCd LIKE '73021028%' OR Item_ComCd LIKE '73021040%' OR Item_ComCd LIKE '73021050%' OR Item_ComCd LIKE '73024000%' OR Item_ComCd LIKE '73041100%' OR Item_ComCd LIKE '73041910%' OR Item_ComCd LIKE '73041930%' OR Item_ComCd LIKE '73041990%' OR Item_ComCd LIKE '73042200%' OR Item_ComCd LIKE '73042300%' OR Item_ComCd LIKE '73042400%' OR Item_ComCd LIKE '73042910%' OR Item_ComCd LIKE '73042930%' OR Item_ComCd LIKE '73042990%' OR Item_ComCd LIKE '73043120%' OR Item_ComCd LIKE '73043180%' OR Item_ComCd LIKE '73043950%' OR Item_ComCd LIKE '73043982%' OR Item_ComCd LIKE '73043983%' OR Item_ComCd LIKE '73043988%' OR Item_ComCd LIKE '73044100%' OR Item_ComCd LIKE '73044983%' OR Item_ComCd LIKE '73044985%' OR Item_ComCd LIKE '73045181%' OR Item_ComCd LIKE '73045189%' OR Item_ComCd LIKE '73045930%' OR Item_ComCd LIKE '73045982%' OR Item_ComCd LIKE '73045983%' OR Item_ComCd LIKE '73045989%' OR Item_ComCd LIKE '73049000%' OR Item_ComCd LIKE '73051100%' OR Item_ComCd LIKE '73051200%' OR Item_ComCd LIKE '73051900%' OR Item_ComCd LIKE '73052000%' OR Item_ComCd LIKE '73053100%' OR Item_ComCd LIKE '73053900%' OR Item_ComCd LIKE '73059000%' OR Item_ComCd LIKE '73061100%' OR Item_ComCd LIKE '73061900%' OR Item_ComCd LIKE '73062100%' OR Item_ComCd LIKE '73062900%' OR Item_ComCd LIKE '73063012%' OR Item_ComCd LIKE '73063018%' OR Item_ComCd LIKE '73063041%' OR Item_ComCd LIKE '73063049%' OR Item_ComCd LIKE '73063072%' OR Item_ComCd LIKE '73063077%' OR Item_ComCd LIKE '73063080%' OR Item_ComCd LIKE '73064020%' OR Item_ComCd LIKE '73064080%' OR Item_ComCd LIKE '73065021%' OR Item_ComCd LIKE '73065029%' OR Item_ComCd LIKE '73065080%' OR Item_ComCd LIKE '73066110%' OR Item_ComCd LIKE '73066192%' OR Item_ComCd LIKE '73066199%' OR Item_ComCd LIKE '73066910%' OR Item_ComCd LIKE '73066990%' OR Item_ComCd LIKE '73069000%' " - and telanm_ART ='EUA' - and dec_CreateDate between '" & von & "' AND '" & bis & "' + End Select - group by ConeeTra_TIN, Adressen.AdressenNr,Adressen.[Name 1],Adressen.[E-Mail],Adressen.[E-Mail2], kkd_Email, Offerten.OffertenNr, Kunden.FilialenNr" + + 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 ( " & sqlWhere & " ) 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 @@ -1235,6 +1369,38 @@ and End Sub + Private Sub Button26_Click(sender As Object, e As EventArgs) Handles Button26.Click + If cbxQuelle.SelectedIndex = 0 Then + cbxQuelle.Focus() + End If + + Dim SQLString As String = "" + Dim Quelle As String = "FMZOLL" + + Select Case cbxQuelle._value + Case "DAKOSY" : SQLString = getDAkosySQL(von_stahlverordnung.Value, bis_stahlverordnung.Value, cbxStahlverordnung_SNDdet.Checked, "STAHLVO") : Quelle = "FMZOLL" + Case "DHF" : SQLString = getDHFSQL(von_stahlverordnung.Value, bis_stahlverordnung.Value, cbxStahlverordnung_SNDdet.Checked, "STAHLVO") : Quelle = "EZOLL" + Case "DHF-UNI" : SQLString = getDHFSQL(von_stahlverordnung.Value, bis_stahlverordnung.Value, cbxStahlverordnung_SNDdet.Checked, "STAHLVO") : Quelle = "EZOLL_UNISPED" + Case "TELOTEC" : SQLString = getTELOTECSQL(von_stahlverordnung.Value, bis_stahlverordnung.Value, cbxStahlverordnung_SNDdet.Checked, "STAHLVO") : Quelle = "FMZOLL" + + End Select + + + Dim dt As DataTable = SQL.loadDgvBySql(SQLString, Quelle, 700) + If dt IsNot Nothing Then + cProgramFunctions.genExcelFromDT_NEW(dt,,, "Stahlverordnungsbericht aus " & cbxQuelle._value & " " & von_stahlverordnung.Value.ToShortDateString & " - " & bis_stahlverordnung.Value.ToShortDateString) + End If + End Sub + + Private Sub UsrCntlAuswertungenAufschub_Abgabenliste1_Load(sender As Object, e As EventArgs) Handles UsrCntlAuswertungenAufschub_Abgabenliste1.Load + + End Sub + + Private Sub PictureBox14_Click(sender As Object, e As EventArgs) Handles PictureBox14.Click + Dim webAddress As String = "https://wiki.verag.ag/de/software/aviso/howtos/Auswertungen#aufschubsdatenprüfung" + Process.Start(webAddress) + End Sub + diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb index ec8a1633..304bfdec 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/KdSearchBox.vb @@ -23,6 +23,7 @@ Public Class KdSearchBox Public Property _loadKdData As Boolean = False Public Property _hideIfListEmpty As Boolean = True Public Property _displayWoelflKd As Boolean = False + Public Property _hideMDMKd As Boolean = False Public Property _displayAVISO_Email As Boolean = False Public Property nurAktive As Boolean = True Public Property kdNrField As Control = Nothing @@ -522,6 +523,7 @@ Public Class KdSearchBox If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'" + If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'" SQLstr &= " order by Ordnungsbegriff " setDS(True, usrcntl.dgvKundenAktiv, SQL.loadDgvBySql(SQLstr, "FMZOLL"), topAnz) @@ -595,6 +597,7 @@ Public Class KdSearchBox End If If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'" + If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'" SQLstr &= " order by Ordnungsbegriff " setDS(False, usrcntl.dgvKundenInAktiv, SQL.loadDgvBySql(SQLstr, "FMZOLL"), 6) @@ -677,6 +680,7 @@ Public Class KdSearchBox End If If Not _displayWoelflKd Then SQLstrEnd &= " AND AdressenNr NOT LIKE '15%'" + If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'" Dim searchstring = SQLstr & SQLstrEnd & " order by Ordnungsbegriff " @@ -743,6 +747,7 @@ Public Class KdSearchBox If Not _displayWoelflKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%'" + If _hideMDMKd Then SQLstr &= " AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'" SQLstr &= " order by Ordnungsbegriff " setDS(False, usrcntl.dgvKundenInAktiv, SQL.loadDgvBySql(SQLstr, "FMZOLL"), 4) @@ -882,6 +887,12 @@ Public Class KdSearchBox sqlEnd.AppendLine(" AND AdressenNr NOT LIKE '15%'") End If + If _hideMDMKd Then + sqlEnd.AppendLine(" AND AdressenNr NOT LIKE '15%' AND AdressenNr NOT LIKE '14%'") + End If + + + sqlEnd.AppendLine(" ORDER BY Ordnungsbegriff") Return (selectPart & sqlEnd.ToString(), sqlEnd.ToString()) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb index 9fc84513..9743947c 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cAufschubKonten.vb @@ -2,6 +2,7 @@ Imports System.Data.SqlClient Imports System.Reflection +Imports com.sun.org.apache.xerces.internal.dom Public Class cAufschubKonten Property brgakto_id As Integer @@ -328,12 +329,7 @@ FROM If showMessage Then - MsgBox( - "Saldo zum Stichtag " & - datumBis.ToShortDateString() & - ":" & vbNewLine & - brgakto_gs_aktSaldo.ToString("N2") - ) + MsgBox("Saldo zum Stichtag " & datumBis.ToShortDateString() & ":" & vbNewLine & brgakto_gs_aktSaldo.ToString("N2")) End If @@ -350,7 +346,15 @@ FROM Try - Return SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,,,) + Dim refBetrag As Double = 0 + + Dim refBetagDB As String = SQL.getValueTxtBySql("select TOP (1) brgarefb_refbetrag from [tblBrgAufschubReferenzberaege] where [brgarefb_gsid]=" & brgakto_id & " and brgarefb_gs_aktiv = 1 And cast([brgarefb_gueltig_ab] as Date) <= '" & nowDate.ToShortDateString & "' order by [brgarefb_gueltig_ab] desc", "ADMIN",,, 0,) + + If refBetagDB <> "" AndAlso IsNumeric(refBetagDB) Then + refBetrag = CDbl(refBetagDB) + End If + + Return refBetrag Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 2a04c7c5..84c195ed 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -290,6 +290,7 @@ Public Class cDATENSERVER s = s.Replace("Ј", "J") 'cyrillic J s = s.Replace("Е", "E") 'cyrillic E s = s.Replace("?", "") + s = s.Replace("/", "") Dim temp = s s = Regex.Replace(s, "[бБвгГдДёЁжЖзЗиИйЙкКлЛмнпПртфФхХцЦчЧшШщЩъЪыЫьЬэЭюЮяЯ]", "").Replace("""", "") 'REMOVE cyrillic letters diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index dbc44b3c..ee804c1b 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -1039,6 +1039,7 @@ Public Class cTimasAPI dt.Columns.Add("Geschlecht", GetType(String)) dt.Columns.Add("Ausweis-Nr", GetType(Integer)) dt.Columns.Add("Info", GetType(String)) + 'dt.Columns.Add("AVISO-ID", GetType(Integer)) End If dt.Clear() @@ -1055,6 +1056,8 @@ Public Class cTimasAPI R("Geschlecht") = employee.StringOf("gender") R("Ausweis-Nr") = employee.IntOf("card") R("Info") = employee.StringOf("info") + 'R("AVISO-ID") = employee.IntOf("externid") + dt.Rows.Add(R) j = j + 1 End While diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb index abae6fa0..3b185388 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb @@ -240,7 +240,7 @@ Public Class cSyska_Interface Dim dt_Stamm As DataTable = getStammdaten(FiBuSchnittstelleNr) Dim postfix As String = "" If dt_Stamm IsNot Nothing AndAlso dt_Stamm.Rows.Count > 0 Then - If FiBuSchnittstelleNr = 19 Then postfix = "MDM_" + If FiBuSchnittstelleNr = 19 Then postfix = "_MDM" Dim fileKD As System.IO.StreamWriter Dim DateinameKD = "AVISO_DEBI_" & Now.ToString("ddMMyyyy_HHmm") & postfix & ".txt" fileKD = My.Computer.FileSystem.OpenTextFileWriter(pathKD & DateinameKD, True, System.Text.Encoding.GetEncoding("iso-8859-15")) diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index d3c35e40..a0113f44 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -1312,8 +1312,15 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Continue For End If - ' Keine doppelten Punkte - If localPart.Contains("..") Then + ' Keine führenden/abschließenden Punkte + If localPart.StartsWith("'") Then + invalid.Add(e) + Continue For + End If + + + ' Keine doppelten Punkte + If localPart.Contains("..") Then invalid.Add(e) Continue For End If @@ -1327,6 +1334,11 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Continue For End If + If domainAscii.EndsWith("'") Then + invalid.Add(e) + Continue For + End If + ' Domainlabels prüfen diff --git a/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb b/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb index b8892d5c..0d7e4950 100644 --- a/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb +++ b/VERAG_PROG_ALLGEMEIN/frmDatumsabfrage.vb @@ -36,12 +36,12 @@ Public Class frmDatumsabfrage - Public Datum As Date = CDate(Now.ToShortDateString) + Public Datum As Date = CDate(Now) Public exceptedCountries As String Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click Label1.Text = "" - If onlypastDate And CDate(dtp_date.Value) > CDate(Now.ToShortDateString) Then + If onlypastDate AndAlso CDate(dtp_date.Value) > CDate(Now) Then Label1.Text = "Muss heute oder früher sein!" Me.DialogResult = DialogResult.None Exit Sub @@ -60,7 +60,7 @@ Public Class frmDatumsabfrage End Sub Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click - Datum = CDate(Now.ToShortDateString) + Datum = CDate(Now) If panelLaender Then exceptedCountries = getValues()