From 09b4144da5f4ded927c4dcd031ed6969e12c5e7e Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Tue, 6 Aug 2024 23:04:37 +0200 Subject: [PATCH] EV --- ...tlAuswertungenEV_Veranlagungen.Designer.vb | 94 ++++++++++++------- .../usrCntlAuswertungenEV_Veranlagungen.vb | 14 ++- SDL/zoll/usrCntlZOLLAuswertungen.vb | 13 ++- 3 files changed, 79 insertions(+), 42 deletions(-) diff --git a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.Designer.vb b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.Designer.vb index 8a175d86..bb052c23 100644 --- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.Designer.vb +++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.Designer.vb @@ -24,6 +24,8 @@ Partial Class usrCntlAuswertungenEV_Veranlagungen Private Sub InitializeComponent() Me.Label8 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.kdKunde = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.lblCnt2 = New System.Windows.Forms.Label() Me.txtJahr = New System.Windows.Forms.NumericUpDown() Me.cboMonat = New System.Windows.Forms.ComboBox() @@ -37,8 +39,8 @@ Partial Class usrCntlAuswertungenEV_Veranlagungen Me.lblErr = New System.Windows.Forms.Label() Me.Label14 = New System.Windows.Forms.Label() Me.lblCnt = New System.Windows.Forms.Label() - Me.kdKunde = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.Label1 = New System.Windows.Forms.Label() + Me.cboEzollSRV = New System.Windows.Forms.ComboBox() + Me.Label2 = New System.Windows.Forms.Label() Me.GroupBox2.SuspendLayout() CType(Me.txtJahr, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -56,6 +58,8 @@ Partial Class usrCntlAuswertungenEV_Veranlagungen ' 'GroupBox2 ' + Me.GroupBox2.Controls.Add(Me.Label2) + Me.GroupBox2.Controls.Add(Me.cboEzollSRV) Me.GroupBox2.Controls.Add(Me.Label1) Me.GroupBox2.Controls.Add(Me.kdKunde) Me.GroupBox2.Controls.Add(Me.lblCnt2) @@ -77,6 +81,43 @@ Partial Class usrCntlAuswertungenEV_Veranlagungen Me.GroupBox2.TabIndex = 15 Me.GroupBox2.TabStop = False ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(145, 63) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(41, 13) + Me.Label1.TabIndex = 45 + Me.Label1.Text = "Kunde:" + ' + 'kdKunde + ' + Me.kdKunde._AlleFirmenCLUSTER = True + Me.kdKunde._AllowSetValue = True + Me.kdKunde._autoSizeGross = False + Me.kdKunde._display_Name1 = False + Me.kdKunde._displayAVISO_Email = False + Me.kdKunde._displayFullName = False + Me.kdKunde._displayWoelflKd = False + Me.kdKunde._hideIfListEmpty = True + Me.kdKunde._loadKdData = False + Me.kdKunde._searchName1 = True + Me.kdKunde._UseFIRMA = "" + Me.kdKunde._ValueKdAndName = True + Me.kdKunde.dgvpos = "LEFT" + Me.kdKunde.KdName = "" + Me.kdKunde.KdNr = "-1" + Me.kdKunde.kdNrField = Nothing + Me.kdKunde.KdNrNullInt = Nothing + Me.kdKunde.Location = New System.Drawing.Point(186, 60) + Me.kdKunde.Name = "kdKunde" + Me.kdKunde.nurAktive = True + Me.kdKunde.searchActive = True + Me.kdKunde.Size = New System.Drawing.Size(177, 20) + Me.kdKunde.TabIndex = 44 + Me.kdKunde.TIMER_SEARCH = True + Me.kdKunde.usrcntl = Nothing + ' 'lblCnt2 ' Me.lblCnt2.Location = New System.Drawing.Point(52, 69) @@ -198,41 +239,24 @@ Partial Class usrCntlAuswertungenEV_Veranlagungen Me.lblCnt.Text = "99/99" Me.lblCnt.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'kdKunde + 'cboEzollSRV ' - Me.kdKunde._AlleFirmenCLUSTER = True - Me.kdKunde._AllowSetValue = True - Me.kdKunde._autoSizeGross = False - Me.kdKunde._display_Name1 = False - Me.kdKunde._displayAVISO_Email = False - Me.kdKunde._displayFullName = False - Me.kdKunde._displayWoelflKd = False - Me.kdKunde._hideIfListEmpty = True - Me.kdKunde._loadKdData = False - Me.kdKunde._UseFIRMA = "" - Me.kdKunde._ValueKdAndName = True - Me.kdKunde.dgvpos = "LEFT" - Me.kdKunde.KdName = Nothing - Me.kdKunde.KdNr = "-1" - Me.kdKunde.kdNrField = Nothing - Me.kdKunde.KdNrNullInt = Nothing - Me.kdKunde.Location = New System.Drawing.Point(186, 60) - Me.kdKunde.Name = "kdKunde" - Me.kdKunde.nurAktive = True - Me.kdKunde.searchActive = True - Me.kdKunde.Size = New System.Drawing.Size(177, 20) - Me.kdKunde.TabIndex = 44 - Me.kdKunde.TIMER_SEARCH = True - Me.kdKunde.usrcntl = Nothing + Me.cboEzollSRV.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboEzollSRV.FormattingEnabled = True + Me.cboEzollSRV.Items.AddRange(New Object() {"VERAG", "UNISPED"}) + Me.cboEzollSRV.Location = New System.Drawing.Point(470, 59) + Me.cboEzollSRV.Name = "cboEzollSRV" + Me.cboEzollSRV.Size = New System.Drawing.Size(87, 21) + Me.cboEzollSRV.TabIndex = 46 ' - 'Label1 + 'Label2 ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(145, 63) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(41, 13) - Me.Label1.TabIndex = 45 - Me.Label1.Text = "Kunde:" + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(397, 62) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(67, 13) + Me.Label2.TabIndex = 47 + Me.Label2.Text = "eZoll-Server:" ' 'usrCntlAuswertungenEV_Veranlagungen ' @@ -267,4 +291,6 @@ Partial Class usrCntlAuswertungenEV_Veranlagungen Friend WithEvents lblCnt2 As Label Friend WithEvents Label1 As Label Friend WithEvents kdKunde As VERAG_PROG_ALLGEMEIN.KdSearchBox + Friend WithEvents Label2 As Label + Friend WithEvents cboEzollSRV As ComboBox End Class diff --git a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb index 4321dcb4..f406a236 100644 --- a/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb +++ b/SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb @@ -43,8 +43,12 @@ Public Class usrCntlAuswertungenEV_Veranlagungen For Each r In dt.Rows lblCnt.Text = cnt & "/ " & dt.Rows.Count Me.Refresh() - genExcelKd(r("kde_KundenNr"), folderpath, r("Name")) - cnt += 1 + Dim EZOLL_SQLSRV = "EZOLL" + If cboEzollSRV.Text = "UNISPED" Then + EZOLL_SQLSRV = "EZOLL_UNISPED" + End If + genExcelKd(r("kde_KundenNr"), EZOLL_SQLSRV, folderpath, r("Name")) Then + cnt += 1 Next End If End If @@ -54,7 +58,7 @@ Public Class usrCntlAuswertungenEV_Veranlagungen Me.Cursor = Cursors.Default End Sub - Sub genExcelKd(KdNr, sPath, Optional EmpfName = "") + Sub genExcelKd(KdNr, sPath, EZOLL_SQLSRV, Optional EmpfName = "") Dim dt As DataTable = SQL.loadDgvBySql("SELECT [FilialenNr],[AbfertigungsNr],[UnterNr],Empfänger FROM [Speditionsbuch] where (EmpfängerKundenNr='" & KdNr & "' OR VermittlerKundenNr='" & KdNr & "') and cast(Abfertigungsdatum as date) between '" & datAuswertVon.Value & "' and '" & datAuswertBis.Value & "' and Abfertigungsart=38 ORDER BY Abfertigungsdatum ", "FMZOLL") lblCnt2.Text = "" @@ -145,14 +149,14 @@ Public Class usrCntlAuswertungenEV_Veranlagungen 'EUST Dim dtEUST = SQL.loadDgvBySql("select sum(base) Base,sum(Amnt)Amnt FROM ztIMsgGdsItemDutyCalc as GDS inner join zzAktivitaet as AKT on GDS.OperatorID=AKT.OperatorID AND GDS.LizenzNr=AKT.LizenzNr AND GDS.IMsgID=AKT.IMsgID inner join zsAnmRefs as ANM on ANM.LizenzNr=AKT.LizenzNr And ANM.OperatorID=AKT.OperatorID And ANM.AnmID=AKT.AnmID - where Ty IN ('5EV') and LRN LIKE '" & BezugsNr & "' AND ErledigungsTypID LIKE 'F%'", "EZOLL") + where Ty IN ('5EV') and LRN LIKE '" & BezugsNr & "' AND ErledigungsTypID LIKE 'F%'", EZOLL_SQLSRV) If dtEUST IsNot Nothing AndAlso dtEUST.Rows.Count >= 0 Then If dtEUST(0)("Base") IsNot DBNull.Value Then EUST_Basis = dtEUST(0)("Base") If dtEUST(0)("Amnt") IsNot DBNull.Value Then EUST_5EV = dtEUST(0)("Amnt") End If 'Handelsrechnungen - For Each rg In SQL.DLookupArray("distinct(DRef)", "[zsAnmGdsItemDocCerts] As DOC inner join zsAnmRefs As ANM On ANM.LizenzNr=DOC.LizenzNr And ANM.OperatorID=DOC.OperatorID And ANM.AnmID=DOC.AnmID", "(LRN = '" & BezugsNr & "') and DocCd IN ('N380','N325')", "EZOLL", "DRef") + For Each rg In SQL.DLookupArray("distinct(DRef)", "[zsAnmGdsItemDocCerts] As DOC inner join zsAnmRefs As ANM On ANM.LizenzNr=DOC.LizenzNr And ANM.OperatorID=DOC.OperatorID And ANM.AnmID=DOC.AnmID", "(LRN = '" & BezugsNr & "') and DocCd IN ('N380','N325')", EZOLL_SQLSRV, "DRef") handelsrechnungen &= semi & rg : semi = "," Next End Select diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index fa152894..96a4dba7 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -183,12 +183,17 @@ Public Class usrCntlZOLLAuswertungen cboBrgDy.SelectedIndex = 0 tbcntr.TabPages.Remove(TabPage2) - tbcntr.TabPages.Remove(TabPage3) + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUSWERTUNGEN_EV-FISKAL", "SDL") Then + tbcntr.TabPages.Remove(TabPage3) + End If Case "UNISPED" tbcntr.TabPages.Remove(TabPage1) tbcntr.TabPages.Remove(TabPage2) - tbcntr.TabPages.Remove(TabPage3) + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUSWERTUNGEN_EV-FISKAL", "SDL") Then + tbcntr.TabPages.Remove(TabPage3) + End If + ' tbcntr.TabPages.Remove(TabPage4) Case Else @@ -208,7 +213,9 @@ Public Class usrCntlZOLLAuswertungen cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6")) cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092")) cboBrg_NCTSTR.SelectedIndex = 0 - + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUSWERTUNGEN_EV-FISKAL", "SDL") Then + tbcntr.TabPages.Remove(TabPage3) + End If End Select cboBrgEZollTC.Items.Clear()