diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index cef18913..0ba57658 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/Reports/Zoll/rptKontrolleLKW.vb b/SDL/Reports/Zoll/rptKontrolleLKW.vb index 191974d0..93c06c60 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW.vb @@ -6,6 +6,7 @@ Imports System.Globalization Public Class rptKontrolleLKW Public datVon As Date Public datBis As Date + Public brg As String Public FIRMA As String = "DURMAZ" 'Public brg As String = "05DE0000000009345," 'default brg Public erstelltVon As String = "" @@ -47,6 +48,8 @@ Public Class rptKontrolleLKW Dim brg_DE As String = "05DE0000000009345" Dim brg_DE_NEU As String = "17DE0000000071678" + + Dim mandant = FIRMA If FIRMA = "DURMAZ" Then mandant = "SUW" If FIRMA = "ATILLA" Then mandant = "SUW" diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb b/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb index e7a16f6f..a0106622 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb @@ -7,6 +7,7 @@ Public Class rptKontrolleLKW_Dakosy Public datVon As Date Public datBis As Date Public FIRMA As String = "ATILLA" + Public BRG As String = "" Public NCTSSystemDY As String = "NCTS5" Dim operatorID = "1" Dim kundenSQL As New kundenSQL @@ -50,6 +51,7 @@ Public Class rptKontrolleLKW_Dakosy Dim brg_DE_NEU As String = "17DE0000000071678" + Dim firmaStr = "" If FIRMA = "DURMAZ" Then firmaStr = " AND (ncts_ObjectName LIKE 'DU%' OR ncts_firma='DURMAZ') " @@ -69,10 +71,16 @@ Public Class rptKontrolleLKW_Dakosy Select Case NCTSSystemDY Case "NCTS5" + + Dim whereBRG = " AND nctsGRT_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + If BRG <> "" Then + whereBRG = " AND nctsGRT_GRN IN ( '" & BRG & "') " + End If + sqlStr = " SELECT isnull(ncts_DepartureTransportMeans_1_IdentificationNumber,isnull(ncts_ActiveBorderTransportMeans_1_IdentificationNumber,'')) as Kennzeichen, cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum,COUNT(*) ,isnull(SUM(nctsGRT_AmountToBeCovered),0) as GarantieWert " sqlStr &= " FROM tblDakosy_NCTSOut004_Guarantee inner join [tblDakosy_NCTSOut004] on ncts_Id = nctsGRT_NctsId " sqlStr &= " WHERE cast ([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStr &= " AND nctsGRT_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStr &= whereBRG sqlStr &= " AND ncts_status BETWEEN 50 AND 60 " sqlStr &= firmaStr ' sqlStr &= " and vw.OperatorId IN (" & operatorID & ")" @@ -84,16 +92,22 @@ Public Class rptKontrolleLKW_Dakosy sqlStrSUB = " SELECT *, nctsGRT_AmountToBeCovered as nctsSA_AbgabenBetrag,nctsGRT_GRN as nctsSA_GRN, isnull(nctsGRT_AmountToBeCovered,0) as GarantieWert,isnull(ncts_DepartureTransportMeans_1_IdentificationNumber,isnull(ncts_ActiveBorderTransportMeans_1_IdentificationNumber,'')) as Kennzeichen,cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum " sqlStrSUB &= " FROM tblDakosy_NCTSOut004_Guarantee inner join [tblDakosy_NCTSOut004] on ncts_Id = nctsGRT_NctsId " sqlStrSUB &= " WHERE cast([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStrSUB &= " AND nctsGRT_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStrSUB &= whereBRG sqlStrSUB &= " AND ncts_status BETWEEN 50 AND 60 " sqlStrSUB &= firmaStr ' sqlStrSUB &= " and vw.OperatorId IN (" & operatorID & ")" sqlStrSUB &= " order by cast([ncts_Trans_DatumZeit] as date),ncts_ObjectName" Case Else + + Dim whereBRG = " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + If BRG <> "" Then + whereBRG = " AND nctsSA_GRN IN ( '" & BRG & "') " + End If + sqlStr = " SELECT isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen, cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum,COUNT(*) ,isnull(SUM(nctsSA_AbgabenBetrag),0) as GarantieWert FROM tblDakosy_NCTSOut_Sicherheitsangaben inner join [VERAG].[dbo].[tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId " sqlStr &= " WHERE cast ([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStr &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStr &= whereBRG sqlStr &= " AND ncts_status BETWEEN 50 AND 60 " sqlStr &= firmaStr ' sqlStr &= " and vw.OperatorId IN (" & operatorID & ")" @@ -103,7 +117,7 @@ Public Class rptKontrolleLKW_Dakosy sqlStrSUB = " SELECT *, isnull(nctsSA_AbgabenBetrag,0) as GarantieWert,isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen,cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum FROM tblDakosy_NCTSOut_Sicherheitsangaben inner join [VERAG].[dbo].[tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId " sqlStrSUB &= " WHERE cast([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStrSUB &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStrSUB &= whereBRG sqlStrSUB &= " AND ncts_status BETWEEN 50 AND 60 " sqlStrSUB &= firmaStr ' sqlStrSUB &= " and vw.OperatorId IN (" & operatorID & ")" diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb b/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb index cdba4ebb..1331606d 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_TELOTEC.vb @@ -7,6 +7,7 @@ Public Class rptKontrolleLKW_TELOTEC Public datVon As Date Public datBis As Date Public FIRMA As String = "ATILLA" + Public BRG As String = "" Dim operatorID = "1" Dim kundenSQL As New kundenSQL Dim SUB_DATA As DataTable = Nothing @@ -48,6 +49,12 @@ Public Class rptKontrolleLKW_TELOTEC Dim brg_DE As String = "05DE0000000009345" Dim brg_DE_NEU As String = "17DE0000000071678" + Dim whereBRG = " AND GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + If BRG <> "" Then + whereBRG = " AND GRN IN ( '" & BRG & "') " + End If + + Dim StatVon As String = "50" Dim StatBis As String = "60" @@ -57,7 +64,7 @@ Public Class rptKontrolleLKW_TELOTEC Dim sqlStr As String = "SELECT isnull([Transp_CrossIdnt],'X') as Kennzeichen,cast(Hea_AccDT as date) AnmeldungsDatum ,COUNT(*) ,SUM(GVal) as GarantieWert FROM tblTelotec_Sicherheit inner join [tblTelotec_Anmeldung] on telanm_id = telgrt_telanmId WHERE [tblTelotec_Anmeldung].[Hea_AccDT] BETWEEN '" & datVon.ToShortDateString & " 00:00:00' AND '" & datBis.ToShortDateString & " 23:23:59' AND telanm_Status BETWEEN '" & StatVon & "' and '" & StatBis & "' AND [telnam_aktuellsteNachricht]=1 - AND GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) + " & whereBRG & " AND tblTelotec_Anmeldung. [Mandant_ID]='" & FIRMA & "' group by cast(Hea_AccDT as date),[Transp_CrossIdnt] ORDER BY cast(Hea_AccDT as date)" @@ -83,7 +90,7 @@ Public Class rptKontrolleLKW_TELOTEC Dim sqlStrSUB As String = " SELECT isnull([Transp_CrossIdnt],'X') as Kennzeichen,cast(Hea_AccDT as date) AnmeldungsDatum, * FROM tblTelotec_Sicherheit inner join [tblTelotec_Anmeldung] on telanm_id = telgrt_telanmId WHERE [tblTelotec_Anmeldung].[Hea_AccDT] BETWEEN '" & datVon.ToShortDateString & " 00:00:00' AND '" & datBis.ToShortDateString & " 23:23:59' AND telanm_Status BETWEEN '" & StatVon & "' and '" & StatBis & "' AND [telnam_aktuellsteNachricht]=1 - AND GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) + " & whereBRG & " AND tblTelotec_Anmeldung. [Mandant_ID]='" & FIRMA & "' ORDER BY cast(Hea_AccDT as date)" diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb b/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb index 3ba60728..47cf8e2f 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_Zolaris.vb @@ -6,7 +6,9 @@ Imports System.Globalization Public Class rptKontrolleLKW_Zolaris Public datVon As Date Public datBis As Date + Public BRG As String = "" Public FIRMA As String = "ATILLA" + Public EZOLL_SRV As String = "EZOLL" Dim operatorID = "1" Dim kundenSQL As New kundenSQL Dim SUB_DATA As DataTable = Nothing @@ -49,31 +51,46 @@ Public Class rptKontrolleLKW_Zolaris Dim brg_DE_NEU As String = "17DE0000000071678" + Dim whereBRG = " AND GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + If BRG <> "" Then + whereBRG = " AND GRN IN ( '" & BRG & "') " + End If + 'If FIRMA = "DURMAZ" Then mandant = "SUW" If FIRMA = "ATILLA" Then operatorID = "'5','6'" If FIRMA = "DURMAZ" Then operatorID = "'8'" + Dim whereOperator = " and vw.OperatorId IN (" & operatorID & ") " + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Or BRG = "17DE0000000071270" Or BRG = "05AT500000G000EU9" Then + ' EZOLL_SRV = "EZOLL_UNISPED" --> Stimmt gar nciht, wenn ATILLA das VERAG DHF nutzt + ' whereOperator = " " + End If + + Dim sqlStr As String = " SELECT DepIdnt, vw.AnmeldungsDatum,COUNT(*) ,SUM(GarantieWert) as GarantieWert FROM ezoll.dbo.vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme as vw" sqlStr &= " inner join [ezoll].[dbo].[zsAnmTransp] on [zsAnmTransp].AnmID=vw.AnmID and vw.OperatorID=[zsAnmTransp].OperatorID" sqlStr &= " WHERE cast (vw.[AnmeldungsDatum] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStr &= " AND GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " - sqlStr &= " and vw.OperatorId IN (" & operatorID & ")" + sqlStr &= whereBRG + sqlStr &= whereOperator sqlStr &= " group by vw.AnmeldungsDatum,DepIdnt" sqlStr &= " order by vw.AnmeldungsDatum" - Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, "EZOLL", 1000) + ' MsgBox(sqlStr) + Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, EZOLL_SRV, 1000) Dim sqlStrSUB As String = " SELECT * FROM ezoll.dbo.vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme as vw" sqlStrSUB &= " inner join [zsAnmTransp] on [zsAnmTransp].AnmID=vw.AnmID and vw.OperatorID=[zsAnmTransp].OperatorID" sqlStrSUB &= " inner join [zzPersonal] on PersonalID =[zsAnmTransp].GeaendertVon and [zzPersonal].[KzAktiv] is not null " sqlStrSUB &= " WHERE cast (vw.[AnmeldungsDatum] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStrSUB &= " AND GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " - sqlStrSUB &= " and vw.OperatorId IN (" & operatorID & ")" + sqlStrSUB &= whereBRG + sqlStrSUB &= whereOperator sqlStrSUB &= " order by vw.AnmeldungsDatum" - SUB_DATA = kundenSQL.loadDgvBySql(sqlStrSUB, "EZOLL", 1000) + + SUB_DATA = kundenSQL.loadDgvBySql(sqlStrSUB, EZOLL_SRV, 1000) lblText1.Text = lblText1.Text & " - " & FIRMA diff --git a/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb b/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb index 250f555e..4094f2eb 100644 --- a/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb +++ b/SDL/Reports/Zoll/rptTGestellungskontrolleDY.vb @@ -5,6 +5,7 @@ Imports System.Globalization Public Class rptTGestellungskontrolleDY Public datVon As Date Public datBis As Date + Public FIRMA As String Public statVon As String = "50" Public statBis As String = "53" Public brg As String = "" 'default brg @@ -76,7 +77,12 @@ Public Class rptTGestellungskontrolleDY ' lblEmpfaenger.Text = CStr(Fields.Item("ArbNr").Value) lblEmpfaenger.Text = CStr(Fields.Item("Empfaenger").Value) lblBezugsnrValue.Text = CStr(Fields.Item("Bezugsnummer").Value) - lblGestDatValue.Text = If(Fields.Item("Gestellungsdatum").Value Is DBNull.Value, "", CStr(Fields.Item("Gestellungsdatum").Value)) + If Fields.Item("Gestellungsdatum").Value IsNot Nothing AndAlso Fields.Item("Gestellungsdatum").Value Is DBNull.Value Then + lblGestDatValue.Text = "" + Else + lblGestDatValue.Text = CStr(Fields.Item("Gestellungsdatum").Value) + End If + lblMRNValue.Text = CStr(Fields.Item("MRN").Value) lblSBValue.Text = CStr(Fields.Item("Sachbearbeiter").Value) lblBuergschaft.Text = CStr(Fields.Item("Buergschaft").Value) diff --git a/SDL/Reports/frmPrintLayout.vb b/SDL/Reports/frmPrintLayout.vb index d4cdf199..bc1e5f71 100644 --- a/SDL/Reports/frmPrintLayout.vb +++ b/SDL/Reports/frmPrintLayout.vb @@ -134,23 +134,25 @@ Public Class frmPrintLayout Viewer.LoadDocument(report) Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous End Sub - Public Sub AuswertungKontrolleLKWZOLARIS(datvon, datbis, FIRMA) + Public Sub AuswertungKontrolleLKWZOLARIS(datvon, datbis, FIRMA, brg) Me.Text = "Auswertung LKWs" Dim report As rptKontrolleLKW_Zolaris = New rptKontrolleLKW_Zolaris report.datVon = datvon report.datBis = datbis report.FIRMA = FIRMA + report.brg = brg report.erstelltVon = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME Viewer.LoadDocument(report) Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous End Sub - Public Sub AuswertungKontrolleLKWDAKOSY(datvon, datbis, FIRMA, NCTSSystemDY) + Public Sub AuswertungKontrolleLKWDAKOSY(datvon, datbis, FIRMA, NCTSSystemDY, BRG) Me.Text = "Auswertung LKWs" Dim report As rptKontrolleLKW_Dakosy = New rptKontrolleLKW_Dakosy report.datVon = datvon report.datBis = datbis report.FIRMA = FIRMA + report.BRG = BRG report.NCTSSystemDY = NCTSSystemDY report.erstelltVon = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME Viewer.LoadDocument(report) @@ -170,11 +172,12 @@ Public Class frmPrintLayout End Sub - Public Sub AuswertungKontrolleLKWTELOTEC(datvon, datbis, FIRMA) + Public Sub AuswertungKontrolleLKWTELOTEC(datvon, datbis, FIRMA, BRG) Me.Text = "Auswertung LKWs" Dim report As rptKontrolleLKW_TELOTEC = New rptKontrolleLKW_TELOTEC report.datVon = datvon report.datBis = datbis + report.BRG = BRG report.FIRMA = FIRMA report.erstelltVon = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME Viewer.LoadDocument(report) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.Designer.vb index 6081fa4c..6cd35812 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.Designer.vb @@ -24,13 +24,13 @@ Partial Class frmBU_Mahnlauf_Ausgabe Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmBU_Mahnlauf_Ausgabe)) Me.pnl = New System.Windows.Forms.Panel() + Me.cbxMailOffnen = New System.Windows.Forms.CheckBox() Me.btnPrint = New System.Windows.Forms.Button() Me.btnMail = New System.Windows.Forms.Button() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button1 = New System.Windows.Forms.Button() Me.Label6 = New System.Windows.Forms.Label() Me.btnPDF = New System.Windows.Forms.Button() - Me.cbxMailOffnen = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() Me.Panel1.SuspendLayout() Me.SuspendLayout() @@ -49,6 +49,16 @@ Partial Class frmBU_Mahnlauf_Ausgabe Me.pnl.Size = New System.Drawing.Size(384, 180) Me.pnl.TabIndex = 1 ' + 'cbxMailOffnen + ' + Me.cbxMailOffnen.AutoSize = True + Me.cbxMailOffnen.Location = New System.Drawing.Point(135, 158) + Me.cbxMailOffnen.Name = "cbxMailOffnen" + Me.cbxMailOffnen.Size = New System.Drawing.Size(78, 17) + Me.cbxMailOffnen.TabIndex = 56 + Me.cbxMailOffnen.Text = "Mail öffnen" + Me.cbxMailOffnen.UseVisualStyleBackColor = True + ' 'btnPrint ' Me.btnPrint.BackColor = System.Drawing.Color.Transparent @@ -137,16 +147,6 @@ Partial Class frmBU_Mahnlauf_Ausgabe Me.btnPDF.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnPDF.UseVisualStyleBackColor = False ' - 'cbxMailOffnen - ' - Me.cbxMailOffnen.AutoSize = True - Me.cbxMailOffnen.Location = New System.Drawing.Point(135, 158) - Me.cbxMailOffnen.Name = "cbxMailOffnen" - Me.cbxMailOffnen.Size = New System.Drawing.Size(78, 17) - Me.cbxMailOffnen.TabIndex = 56 - Me.cbxMailOffnen.Text = "Mail öffnen" - Me.cbxMailOffnen.UseVisualStyleBackColor = True - ' 'frmBU_Mahnlauf_Ausgabe ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.vb b/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.vb index bbaafeec..4e104ada 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf_Ausgabe.vb @@ -20,7 +20,7 @@ End Sub Private Sub btnMail_Click(sender As Object, e As EventArgs) Handles btnMail.Click - If cbxMailOffnen.Checked Then + If cbxMailOffnen.Checked Or cbxMailOffnen.Visible = False Then AUSGABE = "MAIL" Else AUSGABE = "MAIL_SEND" diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 2f8c0818..0924097a 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -2197,7 +2197,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index 5a5e073b..da377100 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class usrCntlZOLLAuswertungen Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class usrCntlZOLLAuswertungen 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.Label3 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() @@ -42,7 +42,7 @@ Partial Class usrCntlZOLLAuswertungen Me.btnNCTS = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.grpDurmaz = New System.Windows.Forms.GroupBox() Me.Button15 = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() Me.picDurmaz = New System.Windows.Forms.PictureBox() @@ -64,6 +64,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label19 = New System.Windows.Forms.Label() Me.cboEZOLLMandant = New System.Windows.Forms.ComboBox() Me.Label29 = New System.Windows.Forms.Label() + Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboEZOLLStatus = New System.Windows.Forms.ComboBox() Me.Label20 = New System.Windows.Forms.Label() Me.datEZOLLBis = New System.Windows.Forms.DateTimePicker() @@ -88,10 +89,11 @@ Partial Class usrCntlZOLLAuswertungen Me.Label27 = New System.Windows.Forms.Label() Me.datVonATILLA = New System.Windows.Forms.DateTimePicker() Me.Label28 = New System.Windows.Forms.Label() - Me.Button2 = New System.Windows.Forms.Button() Me.Label30 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.cboDYDatumArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label95 = New System.Windows.Forms.Label() + Me.cboDY_NCTS = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cbxSplittungNachPos = New System.Windows.Forms.CheckBox() Me.cbxAnrechnungRefBetrag = New System.Windows.Forms.CheckBox() Me.Button8 = New System.Windows.Forms.Button() @@ -112,6 +114,7 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Label98 = New System.Windows.Forms.Label() + Me.cboNCTSSystemDY = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.pic = New System.Windows.Forms.PictureBox() Me.Label88 = New System.Windows.Forms.Label() @@ -129,7 +132,7 @@ Partial Class usrCntlZOLLAuswertungen Me.datAuswertVon_NCTSTR_AWOR = New System.Windows.Forms.DateTimePicker() Me.Label93 = New System.Windows.Forms.Label() Me.PictureBox11 = New System.Windows.Forms.PictureBox() - Me.GroupBox12 = New System.Windows.Forms.GroupBox() + Me.grpUNISPED = New System.Windows.Forms.GroupBox() Me.Button23 = New System.Windows.Forms.Button() Me.PictureBox12 = New System.Windows.Forms.PictureBox() Me.txtJahr_NCTSTR_UNISPED = New System.Windows.Forms.NumericUpDown() @@ -142,8 +145,9 @@ Partial Class usrCntlZOLLAuswertungen Me.datAuswertVon_NCTSTR_UNISPED = New System.Windows.Forms.DateTimePicker() Me.Label87 = New System.Windows.Forms.Label() Me.Label76 = New System.Windows.Forms.Label() - Me.GroupBox11 = New System.Windows.Forms.GroupBox() + Me.grpVERIMEX = New System.Windows.Forms.GroupBox() Me.Label94 = New System.Windows.Forms.Label() + Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button22 = New System.Windows.Forms.Button() Me.Button19 = New System.Windows.Forms.Button() Me.Button18 = New System.Windows.Forms.Button() @@ -186,6 +190,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label56 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() + Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label55 = New System.Windows.Forms.Label() Me.datEZOLL_TC_Bis = New System.Windows.Forms.DateTimePicker() Me.Label57 = New System.Windows.Forms.Label() @@ -193,7 +198,7 @@ Partial Class usrCntlZOLLAuswertungen Me.datEZOLL_TC_Von = New System.Windows.Forms.DateTimePicker() Me.Label59 = New System.Windows.Forms.Label() Me.Label46 = New System.Windows.Forms.Label() - Me.GroupBox7 = New System.Windows.Forms.GroupBox() + Me.grpAMBAR = New System.Windows.Forms.GroupBox() Me.Button11 = New System.Windows.Forms.Button() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.txtJahrAmbar = New System.Windows.Forms.NumericUpDown() @@ -207,7 +212,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label51 = New System.Windows.Forms.Label() Me.Label45 = New System.Windows.Forms.Label() Me.Label44 = New System.Windows.Forms.Label() - Me.GroupBox6 = New System.Windows.Forms.GroupBox() + Me.grpIMEX = New System.Windows.Forms.GroupBox() Me.Button21 = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() Me.PictureBox4 = New System.Windows.Forms.PictureBox() @@ -246,12 +251,9 @@ Partial Class usrCntlZOLLAuswertungen Me.Button14 = New System.Windows.Forms.Button() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.pnl = New System.Windows.Forms.Panel() - Me.cboNCTSSystemDY = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboBrgEZollTC = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboDYDatumArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboDY_NCTS = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cboEZOLLBrg = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Button24 = New System.Windows.Forms.Button() + Me.Label36 = New System.Windows.Forms.Label() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() Me.UsrCntlAuswertungenEV_Veranlagungen1 = New SDL.usrCntlAuswertungenEV_Veranlagungen() @@ -260,7 +262,7 @@ Partial Class usrCntlZOLLAuswertungen Me.UsrCntlAuswertungenAufschub_AbgabenKontrolleTRIER1 = New SDL.usrCntlAuswertungenAufschub_AbgabenKontrolleTRIER() Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() Me.GroupBox1.SuspendLayout() - Me.GroupBox2.SuspendLayout() + Me.grpDurmaz.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtJahrDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox3.SuspendLayout() @@ -276,10 +278,10 @@ Partial Class usrCntlZOLLAuswertungen CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtJahr_NCTSTR_AWOR, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox12.SuspendLayout() + Me.grpUNISPED.SuspendLayout() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtJahr_NCTSTR_UNISPED, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox11.SuspendLayout() + Me.grpVERIMEX.SuspendLayout() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtJahr_NCTSTR, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() @@ -287,10 +289,10 @@ Partial Class usrCntlZOLLAuswertungen CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox8.SuspendLayout() - Me.GroupBox7.SuspendLayout() + Me.grpAMBAR.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtJahrAmbar, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox6.SuspendLayout() + Me.grpIMEX.SuspendLayout() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtJahrIMEX, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -512,32 +514,33 @@ Partial Class usrCntlZOLLAuswertungen Me.Label8.TabIndex = 12 Me.Label8.Text = "Auswertung LKW - DURMAZ" & Global.Microsoft.VisualBasic.ChrW(10) ' - 'GroupBox2 + 'grpDurmaz ' - Me.GroupBox2.Controls.Add(Me.Button15) - Me.GroupBox2.Controls.Add(Me.Button6) - Me.GroupBox2.Controls.Add(Me.picDurmaz) - Me.GroupBox2.Controls.Add(Me.txtJahrDurmaz) - Me.GroupBox2.Controls.Add(Me.cboMonatDurmaz) - Me.GroupBox2.Controls.Add(Me.Label9) - Me.GroupBox2.Controls.Add(Me.datBisDurmaz) - Me.GroupBox2.Controls.Add(Me.Label10) - Me.GroupBox2.Controls.Add(Me.Label12) - Me.GroupBox2.Controls.Add(Me.Label13) - Me.GroupBox2.Controls.Add(Me.datVonDurmaz) - Me.GroupBox2.Controls.Add(Me.Label14) - Me.GroupBox2.Controls.Add(Me.btnNCTSDurmaz) - Me.GroupBox2.Location = New System.Drawing.Point(7, 733) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(705, 145) - Me.GroupBox2.TabIndex = 11 - Me.GroupBox2.TabStop = False + Me.grpDurmaz.Controls.Add(Me.Button24) + Me.grpDurmaz.Controls.Add(Me.Button15) + Me.grpDurmaz.Controls.Add(Me.Button6) + Me.grpDurmaz.Controls.Add(Me.picDurmaz) + Me.grpDurmaz.Controls.Add(Me.txtJahrDurmaz) + Me.grpDurmaz.Controls.Add(Me.cboMonatDurmaz) + Me.grpDurmaz.Controls.Add(Me.Label9) + Me.grpDurmaz.Controls.Add(Me.datBisDurmaz) + Me.grpDurmaz.Controls.Add(Me.Label10) + Me.grpDurmaz.Controls.Add(Me.Label12) + Me.grpDurmaz.Controls.Add(Me.Label13) + Me.grpDurmaz.Controls.Add(Me.datVonDurmaz) + Me.grpDurmaz.Controls.Add(Me.Label14) + Me.grpDurmaz.Controls.Add(Me.btnNCTSDurmaz) + Me.grpDurmaz.Location = New System.Drawing.Point(7, 733) + Me.grpDurmaz.Name = "grpDurmaz" + Me.grpDurmaz.Size = New System.Drawing.Size(705, 145) + Me.grpDurmaz.TabIndex = 11 + Me.grpDurmaz.TabStop = False ' 'Button15 ' Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button15.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button15.Location = New System.Drawing.Point(6, 57) + Me.Button15.Location = New System.Drawing.Point(6, 16) Me.Button15.Name = "Button15" Me.Button15.Size = New System.Drawing.Size(121, 37) Me.Button15.TabIndex = 14 @@ -548,7 +551,7 @@ Partial Class usrCntlZOLLAuswertungen ' Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button6.Location = New System.Drawing.Point(6, 95) + Me.Button6.Location = New System.Drawing.Point(6, 54) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(121, 37) Me.Button6.TabIndex = 13 @@ -650,14 +653,16 @@ Partial Class usrCntlZOLLAuswertungen ' 'btnNCTSDurmaz ' + Me.btnNCTSDurmaz.Enabled = False Me.btnNCTSDurmaz.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnNCTSDurmaz.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.btnNCTSDurmaz.Location = New System.Drawing.Point(6, 19) + Me.btnNCTSDurmaz.Location = New System.Drawing.Point(133, 93) Me.btnNCTSDurmaz.Name = "btnNCTSDurmaz" Me.btnNCTSDurmaz.Size = New System.Drawing.Size(121, 37) Me.btnNCTSDurmaz.TabIndex = 4 Me.btnNCTSDurmaz.Text = "Auswertung starten" Me.btnNCTSDurmaz.UseVisualStyleBackColor = True + Me.btnNCTSDurmaz.Visible = False ' 'Label16 ' @@ -760,6 +765,20 @@ Partial Class usrCntlZOLLAuswertungen Me.Label29.TabIndex = 19 Me.Label29.Text = "Mandant:" ' + 'cboEZOLLBrg + ' + Me.cboEZOLLBrg._allowedValuesFreiText = Nothing + Me.cboEZOLLBrg._allowFreiText = False + Me.cboEZOLLBrg._value = "" + Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboEZOLLBrg.DropDownWidth = 350 + Me.cboEZOLLBrg.FormattingEnabled = True + Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) + Me.cboEZOLLBrg.Name = "cboEZOLLBrg" + Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) + Me.cboEZOLLBrg.TabIndex = 12 + ' 'cboEZOLLStatus ' Me.cboEZOLLStatus.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -856,6 +875,8 @@ Partial Class usrCntlZOLLAuswertungen ' 'GroupBox4 ' + Me.GroupBox4.Controls.Add(Me.Label36) + Me.GroupBox4.Controls.Add(Me.MyComboBox1) Me.GroupBox4.Controls.Add(Me.Button20) Me.GroupBox4.Controls.Add(Me.Button7) Me.GroupBox4.Controls.Add(Me.Button3) @@ -869,7 +890,6 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox4.Controls.Add(Me.Label27) Me.GroupBox4.Controls.Add(Me.datVonATILLA) Me.GroupBox4.Controls.Add(Me.Label28) - Me.GroupBox4.Controls.Add(Me.Button2) Me.GroupBox4.Location = New System.Drawing.Point(9, 893) Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Size = New System.Drawing.Size(705, 179) @@ -880,7 +900,7 @@ Partial Class usrCntlZOLLAuswertungen ' Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button20.Location = New System.Drawing.Point(6, 136) + Me.Button20.Location = New System.Drawing.Point(6, 95) Me.Button20.Name = "Button20" Me.Button20.Size = New System.Drawing.Size(121, 37) Me.Button20.TabIndex = 15 @@ -891,7 +911,7 @@ Partial Class usrCntlZOLLAuswertungen ' Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button7.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button7.Location = New System.Drawing.Point(6, 96) + Me.Button7.Location = New System.Drawing.Point(6, 55) Me.Button7.Name = "Button7" Me.Button7.Size = New System.Drawing.Size(121, 37) Me.Button7.TabIndex = 14 @@ -902,7 +922,7 @@ Partial Class usrCntlZOLLAuswertungen ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button3.Location = New System.Drawing.Point(6, 57) + Me.Button3.Location = New System.Drawing.Point(6, 16) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(121, 37) Me.Button3.TabIndex = 13 @@ -1001,17 +1021,6 @@ Partial Class usrCntlZOLLAuswertungen Me.Label28.TabIndex = 5 Me.Label28.Text = "Liefert eine Liste der im definierten Zeitraum verarbeiteten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Versandscheine (nac" & "h LKWs gruppiert)." - ' - '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.Location = New System.Drawing.Point(6, 19) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(121, 37) - Me.Button2.TabIndex = 4 - Me.Button2.Text = "Auswertung starten" & Global.Microsoft.VisualBasic.ChrW(10) & "(ATLAS)" - Me.Button2.UseVisualStyleBackColor = True ' 'Label30 ' @@ -1050,6 +1059,19 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox5.TabIndex = 19 Me.GroupBox5.TabStop = False ' + 'cboDYDatumArt + ' + Me.cboDYDatumArt._allowedValuesFreiText = Nothing + Me.cboDYDatumArt._allowFreiText = False + Me.cboDYDatumArt._value = "" + Me.cboDYDatumArt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDYDatumArt.DropDownWidth = 350 + Me.cboDYDatumArt.FormattingEnabled = True + Me.cboDYDatumArt.Location = New System.Drawing.Point(439, 9) + Me.cboDYDatumArt.Name = "cboDYDatumArt" + Me.cboDYDatumArt.Size = New System.Drawing.Size(234, 21) + Me.cboDYDatumArt.TabIndex = 39 + ' 'Label95 ' Me.Label95.AutoSize = True @@ -1059,6 +1081,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label95.TabIndex = 23 Me.Label95.Text = "NCTS-SYSTEM:" ' + 'cboDY_NCTS + ' + Me.cboDY_NCTS._allowedValuesFreiText = Nothing + Me.cboDY_NCTS._allowFreiText = False + Me.cboDY_NCTS._value = "" + Me.cboDY_NCTS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboDY_NCTS.DropDownWidth = 350 + Me.cboDY_NCTS.FormattingEnabled = True + Me.cboDY_NCTS.Location = New System.Drawing.Point(148, 117) + Me.cboDY_NCTS.Name = "cboDY_NCTS" + Me.cboDY_NCTS.Size = New System.Drawing.Size(252, 21) + Me.cboDY_NCTS.TabIndex = 22 + ' 'cbxSplittungNachPos ' Me.cbxSplittungNachPos.AutoSize = True @@ -1234,7 +1269,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(701, 1829) + Me.tbcntr.Size = New System.Drawing.Size(1347, 1829) Me.tbcntr.TabIndex = 22 ' 'TabPage1 @@ -1247,9 +1282,9 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Controls.Add(Me.Label82) Me.TabPage1.Controls.Add(Me.GroupBox13) Me.TabPage1.Controls.Add(Me.PictureBox11) - Me.TabPage1.Controls.Add(Me.GroupBox12) + Me.TabPage1.Controls.Add(Me.grpUNISPED) Me.TabPage1.Controls.Add(Me.Label76) - Me.TabPage1.Controls.Add(Me.GroupBox11) + Me.TabPage1.Controls.Add(Me.grpVERIMEX) Me.TabPage1.Controls.Add(Me.Label68) Me.TabPage1.Controls.Add(Me.PictureBox9) Me.TabPage1.Controls.Add(Me.GroupBox10) @@ -1258,10 +1293,10 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Controls.Add(Me.PictureBox6) Me.TabPage1.Controls.Add(Me.GroupBox8) Me.TabPage1.Controls.Add(Me.Label46) - Me.TabPage1.Controls.Add(Me.GroupBox7) + Me.TabPage1.Controls.Add(Me.grpAMBAR) Me.TabPage1.Controls.Add(Me.Label45) Me.TabPage1.Controls.Add(Me.Label44) - Me.TabPage1.Controls.Add(Me.GroupBox6) + Me.TabPage1.Controls.Add(Me.grpIMEX) Me.TabPage1.Controls.Add(Me.Label30) Me.TabPage1.Controls.Add(Me.PictureBox3) Me.TabPage1.Controls.Add(Me.Label16) @@ -1269,7 +1304,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage1.Controls.Add(Me.ComboBox4) Me.TabPage1.Controls.Add(Me.Label8) Me.TabPage1.Controls.Add(Me.Label35) - Me.TabPage1.Controls.Add(Me.GroupBox2) + Me.TabPage1.Controls.Add(Me.grpDurmaz) Me.TabPage1.Controls.Add(Me.GroupBox5) Me.TabPage1.Controls.Add(Me.GroupBox3) Me.TabPage1.Controls.Add(Me.Label17) @@ -1277,7 +1312,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(693, 1803) + Me.TabPage1.Size = New System.Drawing.Size(1339, 1803) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True @@ -1291,6 +1326,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label98.TabIndex = 39 Me.Label98.Text = "NCTS-SYSTEM (DAKOSY):" ' + 'cboNCTSSystemDY + ' + Me.cboNCTSSystemDY._allowedValuesFreiText = Nothing + Me.cboNCTSSystemDY._allowFreiText = False + Me.cboNCTSSystemDY._value = "" + Me.cboNCTSSystemDY.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboNCTSSystemDY.DropDownWidth = 350 + Me.cboNCTSSystemDY.FormattingEnabled = True + Me.cboNCTSSystemDY.Location = New System.Drawing.Point(448, 706) + Me.cboNCTSSystemDY.Name = "cboNCTSSystemDY" + Me.cboNCTSSystemDY.Size = New System.Drawing.Size(252, 21) + Me.cboNCTSSystemDY.TabIndex = 38 + ' 'Panel1 ' Me.Panel1.Controls.Add(Me.Label3) @@ -1466,24 +1514,24 @@ Partial Class usrCntlZOLLAuswertungen Me.PictureBox11.TabIndex = 34 Me.PictureBox11.TabStop = False ' - 'GroupBox12 + 'grpUNISPED ' - Me.GroupBox12.Controls.Add(Me.Button23) - Me.GroupBox12.Controls.Add(Me.PictureBox12) - Me.GroupBox12.Controls.Add(Me.txtJahr_NCTSTR_UNISPED) - Me.GroupBox12.Controls.Add(Me.cboMonat_NCTSTR_UNISPED) - Me.GroupBox12.Controls.Add(Me.Label83) - Me.GroupBox12.Controls.Add(Me.datAuswertBis_NCTSTR_UNISPED) - Me.GroupBox12.Controls.Add(Me.Label84) - Me.GroupBox12.Controls.Add(Me.Label85) - Me.GroupBox12.Controls.Add(Me.Label86) - Me.GroupBox12.Controls.Add(Me.datAuswertVon_NCTSTR_UNISPED) - Me.GroupBox12.Controls.Add(Me.Label87) - Me.GroupBox12.Location = New System.Drawing.Point(9, 1548) - Me.GroupBox12.Name = "GroupBox12" - Me.GroupBox12.Size = New System.Drawing.Size(705, 102) - Me.GroupBox12.TabIndex = 35 - Me.GroupBox12.TabStop = False + Me.grpUNISPED.Controls.Add(Me.Button23) + Me.grpUNISPED.Controls.Add(Me.PictureBox12) + Me.grpUNISPED.Controls.Add(Me.txtJahr_NCTSTR_UNISPED) + Me.grpUNISPED.Controls.Add(Me.cboMonat_NCTSTR_UNISPED) + Me.grpUNISPED.Controls.Add(Me.Label83) + Me.grpUNISPED.Controls.Add(Me.datAuswertBis_NCTSTR_UNISPED) + Me.grpUNISPED.Controls.Add(Me.Label84) + Me.grpUNISPED.Controls.Add(Me.Label85) + Me.grpUNISPED.Controls.Add(Me.Label86) + Me.grpUNISPED.Controls.Add(Me.datAuswertVon_NCTSTR_UNISPED) + Me.grpUNISPED.Controls.Add(Me.Label87) + Me.grpUNISPED.Location = New System.Drawing.Point(9, 1548) + Me.grpUNISPED.Name = "grpUNISPED" + Me.grpUNISPED.Size = New System.Drawing.Size(705, 102) + Me.grpUNISPED.TabIndex = 35 + Me.grpUNISPED.TabStop = False ' 'Button23 ' @@ -1599,28 +1647,28 @@ Partial Class usrCntlZOLLAuswertungen Me.Label76.TabIndex = 33 Me.Label76.Text = "Auswertung LKW - VERIMEX" ' - 'GroupBox11 + 'grpVERIMEX ' - Me.GroupBox11.Controls.Add(Me.Label94) - Me.GroupBox11.Controls.Add(Me.cboBRG_Verimex) - Me.GroupBox11.Controls.Add(Me.Button22) - Me.GroupBox11.Controls.Add(Me.Button19) - Me.GroupBox11.Controls.Add(Me.Button18) - Me.GroupBox11.Controls.Add(Me.PictureBox10) - Me.GroupBox11.Controls.Add(Me.txtJahr_NCTSTR) - Me.GroupBox11.Controls.Add(Me.cboMonat_NCTSTR) - Me.GroupBox11.Controls.Add(Me.Label77) - Me.GroupBox11.Controls.Add(Me.datAuswertBis_NCTSTR) - Me.GroupBox11.Controls.Add(Me.Label78) - Me.GroupBox11.Controls.Add(Me.Label79) - Me.GroupBox11.Controls.Add(Me.Label80) - Me.GroupBox11.Controls.Add(Me.datAuswertVon_NCTSTR) - Me.GroupBox11.Controls.Add(Me.Label81) - Me.GroupBox11.Location = New System.Drawing.Point(9, 1355) - Me.GroupBox11.Name = "GroupBox11" - Me.GroupBox11.Size = New System.Drawing.Size(705, 164) - Me.GroupBox11.TabIndex = 32 - Me.GroupBox11.TabStop = False + Me.grpVERIMEX.Controls.Add(Me.Label94) + Me.grpVERIMEX.Controls.Add(Me.cboBRG_Verimex) + Me.grpVERIMEX.Controls.Add(Me.Button22) + Me.grpVERIMEX.Controls.Add(Me.Button19) + Me.grpVERIMEX.Controls.Add(Me.Button18) + Me.grpVERIMEX.Controls.Add(Me.PictureBox10) + Me.grpVERIMEX.Controls.Add(Me.txtJahr_NCTSTR) + Me.grpVERIMEX.Controls.Add(Me.cboMonat_NCTSTR) + Me.grpVERIMEX.Controls.Add(Me.Label77) + Me.grpVERIMEX.Controls.Add(Me.datAuswertBis_NCTSTR) + Me.grpVERIMEX.Controls.Add(Me.Label78) + Me.grpVERIMEX.Controls.Add(Me.Label79) + Me.grpVERIMEX.Controls.Add(Me.Label80) + Me.grpVERIMEX.Controls.Add(Me.datAuswertVon_NCTSTR) + Me.grpVERIMEX.Controls.Add(Me.Label81) + Me.grpVERIMEX.Location = New System.Drawing.Point(9, 1355) + Me.grpVERIMEX.Name = "grpVERIMEX" + Me.grpVERIMEX.Size = New System.Drawing.Size(705, 164) + Me.grpVERIMEX.TabIndex = 32 + Me.grpVERIMEX.TabStop = False ' 'Label94 ' @@ -1631,6 +1679,19 @@ Partial Class usrCntlZOLLAuswertungen Me.Label94.TabIndex = 18 Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):" ' + 'cboBRG_Verimex + ' + Me.cboBRG_Verimex._allowedValuesFreiText = Nothing + Me.cboBRG_Verimex._allowFreiText = False + Me.cboBRG_Verimex._value = "" + Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBRG_Verimex.DropDownWidth = 350 + Me.cboBRG_Verimex.FormattingEnabled = True + Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) + Me.cboBRG_Verimex.Name = "cboBRG_Verimex" + Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) + Me.cboBRG_Verimex.TabIndex = 17 + ' 'Button22 ' Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2064,6 +2125,20 @@ Partial Class usrCntlZOLLAuswertungen Me.Label53.TabIndex = 13 Me.Label53.Text = "Bürgschaft (keine Auswahl = alle):" ' + 'cboBrgEZollTC + ' + Me.cboBrgEZollTC._allowedValuesFreiText = Nothing + Me.cboBrgEZollTC._allowFreiText = False + Me.cboBrgEZollTC._value = "" + Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboBrgEZollTC.DropDownWidth = 350 + Me.cboBrgEZollTC.FormattingEnabled = True + Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) + Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) + Me.cboBrgEZollTC.Name = "cboBrgEZollTC" + Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) + Me.cboBrgEZollTC.TabIndex = 12 + ' 'Label55 ' Me.Label55.AutoSize = True @@ -2128,24 +2203,24 @@ Partial Class usrCntlZOLLAuswertungen Me.Label46.TabIndex = 25 Me.Label46.Text = "Auswertung LKW - AMBAR" ' - 'GroupBox7 + 'grpAMBAR ' - Me.GroupBox7.Controls.Add(Me.Button11) - Me.GroupBox7.Controls.Add(Me.PictureBox5) - Me.GroupBox7.Controls.Add(Me.txtJahrAmbar) - Me.GroupBox7.Controls.Add(Me.cboMonatAmbar) - Me.GroupBox7.Controls.Add(Me.Label47) - Me.GroupBox7.Controls.Add(Me.datBisAmbar) - Me.GroupBox7.Controls.Add(Me.Label48) - Me.GroupBox7.Controls.Add(Me.Label49) - Me.GroupBox7.Controls.Add(Me.Label50) - Me.GroupBox7.Controls.Add(Me.datVonAmbar) - Me.GroupBox7.Controls.Add(Me.Label51) - Me.GroupBox7.Location = New System.Drawing.Point(9, 1223) - Me.GroupBox7.Name = "GroupBox7" - Me.GroupBox7.Size = New System.Drawing.Size(705, 102) - Me.GroupBox7.TabIndex = 24 - Me.GroupBox7.TabStop = False + Me.grpAMBAR.Controls.Add(Me.Button11) + Me.grpAMBAR.Controls.Add(Me.PictureBox5) + Me.grpAMBAR.Controls.Add(Me.txtJahrAmbar) + Me.grpAMBAR.Controls.Add(Me.cboMonatAmbar) + Me.grpAMBAR.Controls.Add(Me.Label47) + Me.grpAMBAR.Controls.Add(Me.datBisAmbar) + Me.grpAMBAR.Controls.Add(Me.Label48) + Me.grpAMBAR.Controls.Add(Me.Label49) + Me.grpAMBAR.Controls.Add(Me.Label50) + Me.grpAMBAR.Controls.Add(Me.datVonAmbar) + Me.grpAMBAR.Controls.Add(Me.Label51) + Me.grpAMBAR.Location = New System.Drawing.Point(9, 1223) + Me.grpAMBAR.Name = "grpAMBAR" + Me.grpAMBAR.Size = New System.Drawing.Size(705, 102) + Me.grpAMBAR.TabIndex = 24 + Me.grpAMBAR.TabStop = False ' 'Button11 ' @@ -2272,25 +2347,25 @@ Partial Class usrCntlZOLLAuswertungen Me.Label44.TabIndex = 22 Me.Label44.Text = "Auswertung LKW - IMEX" ' - 'GroupBox6 + 'grpIMEX ' - Me.GroupBox6.Controls.Add(Me.Button21) - Me.GroupBox6.Controls.Add(Me.Button10) - Me.GroupBox6.Controls.Add(Me.PictureBox4) - Me.GroupBox6.Controls.Add(Me.txtJahrIMEX) - Me.GroupBox6.Controls.Add(Me.cboMonatIMEX) - Me.GroupBox6.Controls.Add(Me.Label39) - Me.GroupBox6.Controls.Add(Me.datBisImex) - Me.GroupBox6.Controls.Add(Me.Label40) - Me.GroupBox6.Controls.Add(Me.Label41) - Me.GroupBox6.Controls.Add(Me.Label42) - Me.GroupBox6.Controls.Add(Me.datVonImex) - Me.GroupBox6.Controls.Add(Me.Label43) - Me.GroupBox6.Location = New System.Drawing.Point(9, 1094) - Me.GroupBox6.Name = "GroupBox6" - Me.GroupBox6.Size = New System.Drawing.Size(705, 102) - Me.GroupBox6.TabIndex = 18 - Me.GroupBox6.TabStop = False + Me.grpIMEX.Controls.Add(Me.Button21) + Me.grpIMEX.Controls.Add(Me.Button10) + Me.grpIMEX.Controls.Add(Me.PictureBox4) + Me.grpIMEX.Controls.Add(Me.txtJahrIMEX) + Me.grpIMEX.Controls.Add(Me.cboMonatIMEX) + Me.grpIMEX.Controls.Add(Me.Label39) + Me.grpIMEX.Controls.Add(Me.datBisImex) + Me.grpIMEX.Controls.Add(Me.Label40) + Me.grpIMEX.Controls.Add(Me.Label41) + Me.grpIMEX.Controls.Add(Me.Label42) + Me.grpIMEX.Controls.Add(Me.datVonImex) + Me.grpIMEX.Controls.Add(Me.Label43) + Me.grpIMEX.Location = New System.Drawing.Point(9, 1094) + Me.grpIMEX.Name = "grpIMEX" + Me.grpIMEX.Size = New System.Drawing.Size(705, 102) + Me.grpIMEX.TabIndex = 18 + Me.grpIMEX.TabStop = False ' 'Button21 ' @@ -2434,7 +2509,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(710, 1803) + Me.TabPage2.Size = New System.Drawing.Size(1356, 1803) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True @@ -2447,7 +2522,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(710, 1803) + Me.TabPage3.Size = New System.Drawing.Size(1356, 1803) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung" Me.TabPage3.UseVisualStyleBackColor = True @@ -2458,7 +2533,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Size = New System.Drawing.Size(710, 1803) + Me.TabPage4.Size = New System.Drawing.Size(1356, 1803) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "Aufschubdaten" Me.TabPage4.UseVisualStyleBackColor = True @@ -2471,7 +2546,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(710, 1803) + Me.TabPage5.Size = New System.Drawing.Size(1356, 1803) Me.TabPage5.TabIndex = 4 Me.TabPage5.Text = "UNISPED" Me.TabPage5.UseVisualStyleBackColor = True @@ -2679,88 +2754,41 @@ Partial Class usrCntlZOLLAuswertungen Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(701, 57) + Me.pnl.Size = New System.Drawing.Size(1347, 57) Me.pnl.TabIndex = 23 ' - 'cboNCTSSystemDY + 'Button24 ' - Me.cboNCTSSystemDY._allowedValuesFreiText = Nothing - Me.cboNCTSSystemDY._allowFreiText = False - Me.cboNCTSSystemDY._value = "" - Me.cboNCTSSystemDY.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboNCTSSystemDY.DropDownWidth = 350 - Me.cboNCTSSystemDY.FormattingEnabled = True - Me.cboNCTSSystemDY.Location = New System.Drawing.Point(448, 706) - Me.cboNCTSSystemDY.Name = "cboNCTSSystemDY" - Me.cboNCTSSystemDY.Size = New System.Drawing.Size(252, 21) - Me.cboNCTSSystemDY.TabIndex = 38 + Me.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button24.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button24.Location = New System.Drawing.Point(6, 93) + Me.Button24.Name = "Button24" + Me.Button24.Size = New System.Drawing.Size(121, 37) + Me.Button24.TabIndex = 16 + Me.Button24.Text = "Auswertung starten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(TELOTEC)" + Me.Button24.UseVisualStyleBackColor = True ' - 'cboBRG_Verimex + 'Label36 ' - Me.cboBRG_Verimex._allowedValuesFreiText = Nothing - Me.cboBRG_Verimex._allowFreiText = False - Me.cboBRG_Verimex._value = "" - Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBRG_Verimex.DropDownWidth = 350 - Me.cboBRG_Verimex.FormattingEnabled = True - Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120) - Me.cboBRG_Verimex.Name = "cboBRG_Verimex" - Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21) - Me.cboBRG_Verimex.TabIndex = 17 + Me.Label36.AutoSize = True + Me.Label36.Location = New System.Drawing.Point(183, 98) + Me.Label36.Name = "Label36" + Me.Label36.Size = New System.Drawing.Size(194, 13) + Me.Label36.TabIndex = 20 + Me.Label36.Text = "Bürgschaft (keine Auswahl = Standard):" ' - 'cboBrgEZollTC + 'MyComboBox1 ' - Me.cboBrgEZollTC._allowedValuesFreiText = Nothing - Me.cboBrgEZollTC._allowFreiText = False - Me.cboBrgEZollTC._value = "" - Me.cboBrgEZollTC.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboBrgEZollTC.DropDownWidth = 350 - Me.cboBrgEZollTC.FormattingEnabled = True - Me.cboBrgEZollTC.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboBrgEZollTC.Location = New System.Drawing.Point(437, 68) - Me.cboBrgEZollTC.Name = "cboBrgEZollTC" - Me.cboBrgEZollTC.Size = New System.Drawing.Size(201, 21) - Me.cboBrgEZollTC.TabIndex = 12 - ' - 'cboDYDatumArt - ' - Me.cboDYDatumArt._allowedValuesFreiText = Nothing - Me.cboDYDatumArt._allowFreiText = False - Me.cboDYDatumArt._value = "" - Me.cboDYDatumArt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDYDatumArt.DropDownWidth = 350 - Me.cboDYDatumArt.FormattingEnabled = True - Me.cboDYDatumArt.Location = New System.Drawing.Point(439, 9) - Me.cboDYDatumArt.Name = "cboDYDatumArt" - Me.cboDYDatumArt.Size = New System.Drawing.Size(234, 21) - Me.cboDYDatumArt.TabIndex = 39 - ' - 'cboDY_NCTS - ' - Me.cboDY_NCTS._allowedValuesFreiText = Nothing - Me.cboDY_NCTS._allowFreiText = False - Me.cboDY_NCTS._value = "" - Me.cboDY_NCTS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboDY_NCTS.DropDownWidth = 350 - Me.cboDY_NCTS.FormattingEnabled = True - Me.cboDY_NCTS.Location = New System.Drawing.Point(148, 117) - Me.cboDY_NCTS.Name = "cboDY_NCTS" - Me.cboDY_NCTS.Size = New System.Drawing.Size(252, 21) - Me.cboDY_NCTS.TabIndex = 22 - ' - 'cboEZOLLBrg - ' - Me.cboEZOLLBrg._allowedValuesFreiText = Nothing - Me.cboEZOLLBrg._allowFreiText = False - Me.cboEZOLLBrg._value = "" - Me.cboEZOLLBrg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboEZOLLBrg.DropDownWidth = 350 - Me.cboEZOLLBrg.FormattingEnabled = True - Me.cboEZOLLBrg.Items.AddRange(New Object() {"", "05AT510000G000FP7", "16AT520000G000VA6"}) - Me.cboEZOLLBrg.Location = New System.Drawing.Point(223, 69) - Me.cboEZOLLBrg.Name = "cboEZOLLBrg" - Me.cboEZOLLBrg.Size = New System.Drawing.Size(201, 21) - Me.cboEZOLLBrg.TabIndex = 12 + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox1.DropDownWidth = 350 + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(186, 112) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(221, 21) + Me.MyComboBox1.TabIndex = 19 ' 'UsrCntlAuswertungenUIDPruefung1 ' @@ -2777,7 +2805,7 @@ Partial Class usrCntlZOLLAuswertungen Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.BackColor = System.Drawing.Color.White Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Location = New System.Drawing.Point(6, 18) Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Name = "UsrCntlAuswertungenKunden_Auftragsrueckgang1" - Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(29, 235) + Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235) Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 ' 'UsrCntlAuswertungenEV_Veranlagungen1 @@ -2829,11 +2857,11 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(701, 1174) + Me.Size = New System.Drawing.Size(1347, 1174) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() - Me.GroupBox2.ResumeLayout(False) - Me.GroupBox2.PerformLayout() + Me.grpDurmaz.ResumeLayout(False) + Me.grpDurmaz.PerformLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtJahrDurmaz, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox3.ResumeLayout(False) @@ -2855,12 +2883,12 @@ Partial Class usrCntlZOLLAuswertungen CType(Me.PictureBox13, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtJahr_NCTSTR_AWOR, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox12.ResumeLayout(False) - Me.GroupBox12.PerformLayout() + Me.grpUNISPED.ResumeLayout(False) + Me.grpUNISPED.PerformLayout() CType(Me.PictureBox12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtJahr_NCTSTR_UNISPED, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox11.ResumeLayout(False) - Me.GroupBox11.PerformLayout() + Me.grpVERIMEX.ResumeLayout(False) + Me.grpVERIMEX.PerformLayout() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtJahr_NCTSTR, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() @@ -2870,12 +2898,12 @@ Partial Class usrCntlZOLLAuswertungen CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox8.ResumeLayout(False) Me.GroupBox8.PerformLayout() - Me.GroupBox7.ResumeLayout(False) - Me.GroupBox7.PerformLayout() + Me.grpAMBAR.ResumeLayout(False) + Me.grpAMBAR.PerformLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtJahrAmbar, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox6.ResumeLayout(False) - Me.GroupBox6.PerformLayout() + Me.grpIMEX.ResumeLayout(False) + Me.grpIMEX.PerformLayout() CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtJahrIMEX, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() @@ -2905,7 +2933,7 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox Friend WithEvents Label7 As System.Windows.Forms.Label Friend WithEvents Label8 As System.Windows.Forms.Label - Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox + Friend WithEvents grpDurmaz As System.Windows.Forms.GroupBox Friend WithEvents picDurmaz As System.Windows.Forms.PictureBox Friend WithEvents txtJahrDurmaz As System.Windows.Forms.NumericUpDown Friend WithEvents cboMonatDurmaz As System.Windows.Forms.ComboBox @@ -2952,7 +2980,6 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Label27 As System.Windows.Forms.Label Friend WithEvents datVonATILLA As System.Windows.Forms.DateTimePicker Friend WithEvents Label28 As System.Windows.Forms.Label - Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents cboEZOLLMandant As System.Windows.Forms.ComboBox Friend WithEvents Label29 As System.Windows.Forms.Label Friend WithEvents Button3 As System.Windows.Forms.Button @@ -2987,7 +3014,7 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents UsrCntlAuswertungenFiskalvertretung_42001 As SDL.usrCntlAuswertungenFiskalvertretung_4200 Friend WithEvents UsrCntlAuswertungenFiskal_IntrastatMeldung1 As SDL.usrCntlAuswertungenFiskal_IntrastatMeldung Friend WithEvents Label44 As System.Windows.Forms.Label - Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox + Friend WithEvents grpIMEX As System.Windows.Forms.GroupBox Friend WithEvents Button10 As System.Windows.Forms.Button Friend WithEvents PictureBox4 As System.Windows.Forms.PictureBox Friend WithEvents txtJahrIMEX As System.Windows.Forms.NumericUpDown @@ -3006,7 +3033,7 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents UsrCntlAuswertungenUIDPruefung1 As usrCntlAuswertungenUIDPruefung Friend WithEvents cbxWarenbezeichnung As CheckBox Friend WithEvents Label46 As Label - Friend WithEvents GroupBox7 As GroupBox + Friend WithEvents grpAMBAR As GroupBox Friend WithEvents Button11 As Button Friend WithEvents PictureBox5 As PictureBox Friend WithEvents txtJahrAmbar As NumericUpDown @@ -3077,7 +3104,7 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Label75 As Label Friend WithEvents Button17 As Button Friend WithEvents Label76 As Label - Friend WithEvents GroupBox11 As GroupBox + Friend WithEvents grpVERIMEX As GroupBox Friend WithEvents Button18 As Button Friend WithEvents PictureBox10 As PictureBox Friend WithEvents txtJahr_NCTSTR As NumericUpDown @@ -3109,7 +3136,7 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Label92 As Label Friend WithEvents datAuswertVon_NCTSTR_AWOR As DateTimePicker Friend WithEvents Label93 As Label - Friend WithEvents GroupBox12 As GroupBox + Friend WithEvents grpUNISPED As GroupBox Friend WithEvents Button23 As Button Friend WithEvents PictureBox12 As PictureBox Friend WithEvents txtJahr_NCTSTR_UNISPED As NumericUpDown @@ -3130,4 +3157,7 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents Label98 As Label Friend WithEvents cboNCTSSystemDY As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cboDYDatumArt As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Button24 As Button + Friend WithEvents Label36 As Label + Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index 96a4dba7..1f625d58 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -134,6 +134,8 @@ Public Class usrCntlZOLLAuswertungen cboDYDatumArt.SelectedIndex = 0 + + cboEZOLLBrg.Items.Clear() cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7")) @@ -174,9 +176,9 @@ Public Class usrCntlZOLLAuswertungen Case "IMEX" GroupBox1.Enabled = False GroupBox3.Enabled = False - GroupBox2.Enabled = False + grpDurmaz.Enabled = False GroupBox4.Enabled = False - GroupBox7.Enabled = False + grpAMBAR.Enabled = False cboBrgDy.Items.Clear() cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6")) @@ -188,12 +190,33 @@ Public Class usrCntlZOLLAuswertungen End If Case "UNISPED" - tbcntr.TabPages.Remove(TabPage1) + 'tbcntr.TabPages.Remove(TabPage1) tbcntr.TabPages.Remove(TabPage2) If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUSWERTUNGEN_EV-FISKAL", "SDL") Then tbcntr.TabPages.Remove(TabPage3) End If + + cboBrgDy.Items.Clear() + ' cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) + cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071270 - DE Brg (UNISPED)", "17DE0000000071270")) + cboBrgDy.SelectedIndex = 0 + + cboBrg_NCTSTR.Items.Clear() + cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071270 - DE Brg (UNISPED)", "17DE0000000071270")) + cboBrg_NCTSTR.SelectedIndex = 0 + + MyComboBox1.Items.Clear() + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071270 - DE Brg (UNISPED)", "17DE0000000071270")) + MyComboBox1.SelectedIndex = 0 + + grpIMEX.Enabled = False + grpDurmaz.Enabled = False + grpVERIMEX.Enabled = False + grpAMBAR.Enabled = False + GroupBox8.Enabled = False + GroupBox3.Enabled = False + ' tbcntr.TabPages.Remove(TabPage4) Case Else @@ -204,6 +227,7 @@ Public Class usrCntlZOLLAuswertungen cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7")) cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6")) cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092")) + cboBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071270 - DE Brg (UNISPED)", "17DE0000000071270")) cboBrgDy.SelectedIndex = 0 cboBrg_NCTSTR.Items.Clear() @@ -212,10 +236,21 @@ Public Class usrCntlZOLLAuswertungen cboBrg_NCTSTR.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7")) 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.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071270 - DE Brg (UNISPED)", "17DE0000000071270")) cboBrg_NCTSTR.SelectedIndex = 0 If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AUSWERTUNGEN_EV-FISKAL", "SDL") Then tbcntr.TabPages.Remove(TabPage3) End If + + + MyComboBox1.Items.Clear() + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071678 - DE Brg (NEU)", "17DE0000000071678")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05DE0000000009345 - DE Brg", "05DE0000000009345")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7")) + MyComboBox1.SelectedIndex = 0 + + End Select cboBrgEZollTC.Items.Clear() @@ -224,8 +259,21 @@ Public Class usrCntlZOLLAuswertungen cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg VERAG", "05AT510000G000FP7")) cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071678 - DE Brg (NEU)", "17DE0000000071678")) cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092")) + cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071270 - DE Brg (UNISPED)", "17DE0000000071270")) cboBrgEZollTC.SelectedIndex = 0 + + 'MyComboBox1.Items.Clear() + 'MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + + ''BRG übernehmen: + 'MyComboBox1.Items.AddRange(cboBrgDy.Items.Cast(Of String).ToArray()) + + + cboBRG_Verimex.SelectedIndex = 0 + + + datEZOLL_TC_Von.Value = Now ' d.AddMonths(-3) datEZOLL_TC_Bis.Value = Now.AddDays(3) @@ -285,6 +333,12 @@ Public Class usrCntlZOLLAuswertungen Case CheckState.Indeterminate : BestimmungErreichttxt = " " End Select + 'GEHT HIER NICHTTTTTTT + Dim EZOLL_SRV = "EZOLL" + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then + EZOLL_SRV = "EZOLL_UNISPED" + End If + If operatorId <> "" Then operatorId = " AND OperatorId = '" & operatorId & "' " End If @@ -337,7 +391,7 @@ Public Class usrCntlZOLLAuswertungen End Function - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Private Sub Button2_Click(sender As Object, e As EventArgs) Dim frmPrintLayout As New frmPrintLayout() frmPrintLayout.AuswertungKontrolleLKW(datVonATILLA.Text, datBisATILLA.Text, "ATILLA") frmPrintLayout.Show() @@ -347,7 +401,7 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click ' MsgBox("Diese Auswertung ist noch nicht verfügbar!") Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWZOLARIS(datVonATILLA.Text, datBisATILLA.Text, "ATILLA") + frmPrintLayout.AuswertungKontrolleLKWZOLARIS(datVonATILLA.Text, datBisATILLA.Text, "ATILLA", MyComboBox1._value) frmPrintLayout.Show() End Sub @@ -357,15 +411,6 @@ Public Class usrCntlZOLLAuswertungen - Private Sub Button5_Click(sender As Object, e As EventArgs, Optional exportPDF As String = "", Optional exportEXCEL As String = "") Handles Button5.Click - - Select Case cboDY_NCTS._value - Case "NCTS4" : doDY_NCTS4(exportPDF, exportEXCEL) - Case "NCTS5" : doDY_NCTS5(exportPDF, exportEXCEL) - End Select - - End Sub - Sub doDY_NCTS4(Optional exportPDF As String = "", Optional exportEXCEL As String = "") Dim sqlStr = "" @@ -376,6 +421,7 @@ Public Class usrCntlZOLLAuswertungen End If + Dim frmPrintLayout As New frmPrintLayout() frmPrintLayout.AuswertungTKontrolleDY(sqlStr, datVonDy.Text, datBisDy.Text, txtStatVonDy.Text, txtStatBisDy.Text, DirectCast(cboBrgDy.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, "") @@ -393,16 +439,20 @@ Public Class usrCntlZOLLAuswertungen Sub doDY_NCTS5(Optional exportPDF As String = "", Optional exportEXCEL As String = "") Dim sqlStr = "" + + If cbxSplittungNachPos.Checked Then sqlStr = getSQL_NCTS004_ATLAS_DY_POS(datVonDy.Text, datBisDy.Text, txtStatVonDy.Text, txtStatBisDy.Text, DirectCast(cboBrgDy.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, "", cbxAnrechnungRefBetrag.Checked, False) Else sqlStr = getSQL_NCTS004_ATLAS_DY(datVonDy.Text, datBisDy.Text, txtStatVonDy.Text, txtStatBisDy.Text, DirectCast(cboBrgDy.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, "", cbxAnrechnungRefBetrag.Checked, False) End If - Dim frmPrintLayout As New frmPrintLayout() frmPrintLayout.AuswertungTKontrolleDY(sqlStr, datVonDy.Text, datBisDy.Text, txtStatVonDy.Text, txtStatBisDy.Text, DirectCast(cboBrgDy.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, "") + + + If exportPDF = "" And exportEXCEL = "" Then frmPrintLayout.Show() Else @@ -462,7 +512,7 @@ Public Class usrCntlZOLLAuswertungen 'sql &= " ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],[ncts_GesamtRohmasse],[ncts_GesamtAnzahlPackstuecke] " sqlStr &= ",(SELECT COUNT(*) FROM tblDakosy_NCTSOut_Warenposition where nctsWP_NctsId=ncts_Id) as POS" If anrechnungsZP Then sqlStr &= ",(SELECT TOP (1) convert(date,[dySt_ergZeitpunkt] ,104) FROM [tblDakosy_Statusmeldungen] where dySt_dyId=[ncts_dyaAnmID] and [dySt_status] IN (53,60) order by dySt_status) as AnrechnungRef" - sqlStr &= " from tblDakosy_NCTSOut_Sicherheitsangaben inner join [VERAG].[dbo].[tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId" + sqlStr &= " from tblDakosy_NCTSOut_Sicherheitsangaben inner join [tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId" sqlStr &= " WHERE ncts_Status between '" & StatVon & "' and '" & Statbis & "' " sqlStr &= " " & brg & " " sqlStr &= " AND CAST(ncts_Wiedergestellungsdatum as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "' " @@ -501,7 +551,7 @@ Public Class usrCntlZOLLAuswertungen ' Dim sql As String = "SELECT ncts_MRN,ncts_Status,(nctsSA_AbgabenBetrag), ncts_dyaAnmID, ncts_ArtAnmeldung,nctsSA_GRN,ncts_Empfaenger_eori,ncts_Empfaenger_NLNR,ncts_Empfaenger_Name,ncts_Bearbeiter" Dim sqlStr = " SELECT '' as [Anzahl Verz], isnull(ncts_Status,'') as Status, '' as Niederlassung, isnull(ncts_ObjectName,'') as Bezugsnummer,'' as LfdNr, " If showANR Then sqlStr &= " isnull(ncts_ANR,'') as ArbNr," - sqlStr &= " isnull(ncts_Consignee_Name,isnull(ncts_Consignee_IdentificationNumber,'')) as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Trans_DatumZeit as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,isnull(ncts_LimitDate,'') as GestellungsFrist,[ncts_GestelltAm] as GestelltAm,isnull(nctsGRT_AmountToBeCovered,0) as [SichertheitsBetrag], isnull(nctsGRT_GRN,'') as Buergschaft " + sqlStr &= " isnull(ncts_Consignee_Name,isnull(ncts_Consignee_IdentificationNumber,'')) as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Trans_DatumZeit as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,isnull(ncts_LimitDate,'') as Gestellungsdatum,[ncts_GestelltAm] as GestelltAm,isnull(nctsGRT_AmountToBeCovered,0) as [Sichertheits-Betrag], isnull(nctsGRT_GRN,'') as Buergschaft " 'sql &= " ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],[ncts_GesamtRohmasse],[ncts_GesamtAnzahlPackstuecke] " sqlStr &= ",( SELECT COUNT(*) FROM tblDakosy_NCTSOut004_HouseConsignment_ConsignmentItem where ncts_Id = [nctsHCCI_NctsId]) as POS" If anrechnungsZP Then sqlStr &= ",isnull(ncts_Ankunft,ncts_Erledigung) as AnrechnungRef" @@ -575,7 +625,7 @@ Public Class usrCntlZOLLAuswertungen ' Dim sql As String = "SELECT ncts_MRN,ncts_Status,(nctsSA_AbgabenBetrag), ncts_dyaAnmID, ncts_ArtAnmeldung,nctsSA_GRN,ncts_Empfaenger_eori,ncts_Empfaenger_NLNR,ncts_Empfaenger_Name,ncts_Bearbeiter" Dim sqlStr = " SELECT '' as [Anzahl Verz], isnull(ncts_Status,'') as Status, '' as Niederlassung, isnull(ncts_ObjectName,'') as Bezugsnummer,'' as LfdNr," If showANR Then sqlStr &= " isnull(ncts_ANR,'') as ArbNr," - sqlStr &= " isnull(ncts_Empfaenger_Name,'') as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Trans_DatumZeit as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,[ncts_Wiedergestellungsdatum] as GestellungsFrist,[ncts_GestelltAm] as GestelltAm,isnull(nctsSA_AbgabenBetrag,0) as [SichertheitsBetrag], isnull(nctsSA_GRN,'') as Buergschaft " + sqlStr &= " isnull(ncts_Empfaenger_Name,'') as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Trans_DatumZeit as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,[ncts_Wiedergestellungsdatum] as GestellungsFrist,[ncts_GestelltAm] as GestelltAm,isnull(nctsSA_AbgabenBetrag,0) as [Sichertheits-Betrag], isnull(nctsSA_GRN,'') as Buergschaft " 'sql &= " ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],[ncts_GesamtRohmasse],[ncts_GesamtAnzahlPackstuecke] " sqlStr &= ", [nctsWP_PositionsNummer] as POS, [nctsWP_Warenbezeichnung] as Warenbezeichnung" If anrechnungsZP Then sqlStr &= ",(SELECT TOP (1) convert(date,[dySt_ergZeitpunkt] ,104) FROM [tblDakosy_Statusmeldungen] where dySt_dyId=[ncts_dyaAnmID] and [dySt_status] IN (53,60) order by dySt_status) as AnrechnungRef" @@ -618,7 +668,7 @@ Public Class usrCntlZOLLAuswertungen ' Dim sql As String = "SELECT ncts_MRN,ncts_Status,(nctsSA_AbgabenBetrag), ncts_dyaAnmID, ncts_ArtAnmeldung,nctsGRT_GRN,ncts_Empfaenger_eori,ncts_Empfaenger_NLNR,ncts_Empfaenger_Name,ncts_Bearbeiter" Dim sqlStr = " SELECT '' as [Anzahl Verz], isnull(ncts_Status,'') as Status, '' as Niederlassung, isnull(ncts_ObjectName,'') as Bezugsnummer,'' as LfdNr," If showANR Then sqlStr &= " isnull(ncts_ANR,'') as ArbNr," - sqlStr &= " isnull(ncts_Consignee_Name,isnull(ncts_Consignee_IdentificationNumber,'')) as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Trans_DatumZeit as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,ncts_LimitDate as GestellungsFrist,[ncts_GestelltAm] as GestelltAm,isnull(nctsGRT_AmountToBeCovered,0) as [SichertheitsBetrag], isnull(nctsGRT_GRN,'') as Buergschaft " + sqlStr &= " isnull(ncts_Consignee_Name,isnull(ncts_Consignee_IdentificationNumber,'')) as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Trans_DatumZeit as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,ncts_LimitDate as GestellungsFrist,[ncts_GestelltAm] as GestelltAm,isnull(nctsGRT_AmountToBeCovered,0) as [Sichertheits-Betrag], isnull(nctsGRT_GRN,'') as Buergschaft " 'sql &= " ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],ncts_GrossMass [ncts_GesamtRohmasse],'0' [ncts_GesamtAnzahlPackstuecke] " sqlStr &= ",[nctsHCCI_DeclarationGoodsItemNumber] as POS, nctsHCCI_DescriptionOfGoods as Warenbezeichnung" If anrechnungsZP Then sqlStr &= ",isnull(ncts_Ankunft,ncts_Erledigung) as AnrechnungRef" @@ -654,7 +704,7 @@ Public Class usrCntlZOLLAuswertungen ' Dim sql As String = "SELECT ncts_MRN,ncts_Status,(nctsSA_AbgabenBetrag), ncts_dyaAnmID, ncts_ArtAnmeldung,nctsSA_GRN,ncts_Empfaenger_eori,ncts_Empfaenger_NLNR,ncts_Empfaenger_Name,ncts_Bearbeiter" Dim sqlStr = " SELECT '' as [Anzahl Verz], isnull(ncts_Status,'') as Status, '' as Niederlassung, isnull(ncts_ObjectName,'') as Bezugsnummer,'' as LfdNr," If showANR Then sqlStr &= " isnull(ncts_ANR,'') as ArbNr," - sqlStr &= " isnull(ncts_Empfaenger_Name,'') as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Eroeffnung as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,[ncts_Wiedergestellungsdatum] as GestellungsFrist,[ncts_GestelltAm] as GestelltAm,isnull(nctsSA_AbgabenBetrag,0) as [SichertheitsBetrag], isnull(nctsSA_GRN,'') as Buergschaft " + sqlStr &= " isnull(ncts_Empfaenger_Name,'') as Empfaenger,isnull(ncts_MRN,'') as MRN,ncts_Eroeffnung as Antragsdatum,isnull(ncts_Bearbeiter,'') as Sachbearbeiter,[ncts_Wiedergestellungsdatum] as GestellungsFrist,[ncts_GestelltAm] as GestelltAm,isnull(nctsSA_AbgabenBetrag,0) as [Sichertheits-Betrag], isnull(nctsSA_GRN,'') as Buergschaft " 'sql &= " ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],[ncts_GesamtRohmasse],[ncts_GesamtAnzahlPackstuecke] " sqlStr &= ", [nctsWP_PositionsNummer] as POS, [nctsWP_Warenbezeichnung] as Warenbezeichnung" If anrechnungsZP Then sqlStr &= ", ncts_Ankunft as AnrechnungRef" @@ -671,13 +721,13 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonDurmaz.Text, datBisDurmaz.Text, "DURMAZ", cboNCTSSystemDY._value) + frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonDurmaz.Text, datBisDurmaz.Text, "DURMAZ", cboNCTSSystemDY._value, "") frmPrintLayout.Show() End Sub Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonATILLA.Text, datBisATILLA.Text, "ATILLA", cboNCTSSystemDY._value) + frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonATILLA.Text, datBisATILLA.Text, "ATILLA", cboNCTSSystemDY._value, MyComboBox1._value) frmPrintLayout.Show() End Sub @@ -727,6 +777,9 @@ Public Class usrCntlZOLLAuswertungen cProgramFunctions.genExcelFromDT_NEW(dt) End If End If + + + End Sub Function clearDTPosSiBetrag(dt2 As DataTable) As DataTable @@ -749,10 +802,10 @@ Public Class usrCntlZOLLAuswertungen 'Next Dim mrn = "" Dim cnt = 1 - dt.Columns("SichertheitsBetrag").ReadOnly = False + dt.Columns("Sichertheits-Betrag").ReadOnly = False For Each r As DataRow In dt.Rows If mrn = r("MRN") Then - r("SichertheitsBetrag") = "0" + r("Sichertheits-Betrag") = "0" cnt += 1 Else cnt = 1 @@ -789,7 +842,7 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonImex.Text, datBisImex.Text, "IMEX", cboNCTSSystemDY._value) + frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonImex.Text, datBisImex.Text, "IMEX", cboNCTSSystemDY._value, "") frmPrintLayout.Show() End Sub @@ -799,7 +852,7 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonAmbar.Text, datBisAmbar.Text, "AMBAR", cboNCTSSystemDY._value) + frmPrintLayout.AuswertungKontrolleLKWDAKOSY(datVonAmbar.Text, datBisAmbar.Text, "AMBAR", cboNCTSSystemDY._value, "") frmPrintLayout.Show() End Sub @@ -873,7 +926,7 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button15_Click(sender As Object, e As EventArgs) Handles Button15.Click ' MsgBox("Diese Auswertung ist noch nicht verfügbar!") Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWZOLARIS(datVonDurmaz.Text, datBisDurmaz.Text, "DURMAZ") + frmPrintLayout.AuswertungKontrolleLKWZOLARIS(datVonDurmaz.Text, datBisDurmaz.Text, "DURMAZ", "") frmPrintLayout.Show() End Sub @@ -906,13 +959,13 @@ Public Class usrCntlZOLLAuswertungen Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWTELOTEC(datVonATILLA.Text, datBisATILLA.Text, "ATILLA") + frmPrintLayout.AuswertungKontrolleLKWTELOTEC(datVonATILLA.Text, datBisATILLA.Text, "ATILLA", MyComboBox1._value) frmPrintLayout.Show() End Sub Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click Dim frmPrintLayout As New frmPrintLayout() - frmPrintLayout.AuswertungKontrolleLKWTELOTEC(datVonATILLA.Text, datBisATILLA.Text, "IMEX") + frmPrintLayout.AuswertungKontrolleLKWTELOTEC(datVonATILLA.Text, datBisATILLA.Text, "IMEX", "") frmPrintLayout.Show() End Sub @@ -949,5 +1002,66 @@ Public Class usrCntlZOLLAuswertungen frmPrintLayout.Show() End Sub + Private Sub Button24_Click(sender As Object, e As EventArgs) Handles Button24.Click + Dim frmPrintLayout As New frmPrintLayout() + frmPrintLayout.AuswertungKontrolleLKWTELOTEC(datVonDurmaz.Text, datBisDurmaz.Text, "DURMAZ", "") + frmPrintLayout.Show() + End Sub + + 'Private Sub Button32_Click(sender As Object, e As EventArgs) Handles Button32.Click + ' doDY_NCTS5(True, False, "UNISPED") + 'End Sub + 'Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + ' doDY_NCTS5(True, False, "") + 'End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + Select Case cboDY_NCTS._value + Case "NCTS4" : doDY_NCTS4() + Case "NCTS5" : doDY_NCTS5() + End Select + End Sub + + + 'Private Sub Button5_Click(sender As Object, e As EventArgs, Optional exportPDF As String = "", Optional exportEXCEL As String = "") Handles Button5.Click + ' Dim sqlStr = "" + + ' If cbxSplittungNachPos.Checked Then + ' sqlStr = getSQL_NCTS_ATLAS_DY_POS(datVonDy.Text, datBisDy.Text, txtStatVonDy.Text, txtStatBisDy.Text, DirectCast(cboBrgDy.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, "", cbxAnrechnungRefBetrag.Checked, False) + ' Else + ' sqlStr = getSQL_NCTS_ATLAS_DY(datVonDy.Text, datBisDy.Text, txtStatVonDy.Text, txtStatBisDy.Text, DirectCast(cboBrgDy.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, "", cbxAnrechnungRefBetrag.Checked, False) + ' End If + + + ' Dim frmPrintLayout As New frmPrintLayout() + ' frmPrintLayout.AuswertungTKontrolleDY(sqlStr, datVonDy.Text, datBisDy.Text, txtStatVonDy.Text, txtStatBisDy.Text, DirectCast(cboBrgDy.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, "") + + ' If exportPDF = "" And exportEXCEL = "" Then + ' frmPrintLayout.Show() + ' Else + ' AddHandler frmPrintLayout.Viewer.LoadCompleted, Sub() + ' If exportPDF <> "" Then ExportToPDF(frmPrintLayout.Viewer.Document, exportPDF) + ' If exportEXCEL <> "" Then ExportToExcel(frmPrintLayout.Viewer.Document, exportEXCEL) + ' End Sub + ' End If + 'End Sub + + + 'Private Sub Button5_Click(sender As Object, e As EventArgs, Optional exportPDF As String = "", Optional exportEXCEL As String = "") Handles Button5.Click + + ' Select Case cboDY_NCTS._value + ' Case "NCTS4" : doDY_NCTS4(exportPDF, exportEXCEL) + ' Case "NCTS5" : doDY_NCTS5(exportPDF, exportEXCEL) + ' End Select + + 'End Sub + + + 'Private Sub Button31_Click(sender As Object, e As EventArgs) Handles Button31.Click + ' Select Case cboDY_NCTS._value + ' ' Case "NCTS4" : doDY_NCTS4_XLS() + ' Case "NCTS5" : doDY_NCTS5_XLS("UNISPED") + ' End Select + 'End Sub End Class