From d98d9950c3bf8b0eeb8893f475c4f20a83a5f05f Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 9 Aug 2019 12:38:33 +0200 Subject: [PATCH] 1.1.1.0 --- SDL/My Project/Resources.Designer.vb | 11 +- SDL/My Project/Resources.resx | 5 +- SDL/SDL.vbproj | 1 + SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb | 354 ++++++++++++++---- SDL/zoll/usrCntlZOLLAuswertungen.vb | 37 +- .../frmPDFScanList.Designer.vb | 2 +- .../frmPDFScanList.vb | 1 - .../usrcntlPDFScan.vb | 2 +- 8 files changed, 343 insertions(+), 70 deletions(-) diff --git a/SDL/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index ef74b2ce..131a1c78 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -1693,6 +1693,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property String1dasdasasdasd() As String + Get + Return ResourceManager.GetString("String1dasdasasdasd", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1952,7 +1961,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.1.0.9 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.1.1.0 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index 7ecb37e0..93989388 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -713,7 +713,7 @@ ..\Resources\Verag-Customs-Service-GMBH-Logo_sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 1.1.0.9 + 1.1.1.0 ..\Resources\chimes.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -724,4 +724,7 @@ ..\Resources\ok_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + \ No newline at end of file diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 487b5ac0..e10e42c8 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -201,6 +201,7 @@ + diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb index 19a29af7..ddefff3a 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb @@ -63,7 +63,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.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() @@ -113,6 +113,22 @@ Partial Class usrCntlZOLLAuswertungen Me.Label35 = New System.Windows.Forms.Label() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.Label52 = New System.Windows.Forms.Label() + Me.PictureBox6 = New System.Windows.Forms.PictureBox() + Me.GroupBox8 = New System.Windows.Forms.GroupBox() + Me.Label54 = New System.Windows.Forms.Label() + Me.txtStatEZoll_TC_Bis = New System.Windows.Forms.TextBox() + Me.txtStatEZoll_TC_Von = New System.Windows.Forms.TextBox() + 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() + Me.Label58 = New System.Windows.Forms.Label() + 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.Button11 = New System.Windows.Forms.Button() @@ -141,14 +157,15 @@ Partial Class usrCntlZOLLAuswertungen Me.datVonImex = New System.Windows.Forms.DateTimePicker() Me.Label43 = New System.Windows.Forms.Label() Me.TabPage2 = New System.Windows.Forms.TabPage() - Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.pnl = New System.Windows.Forms.Panel() Me.UsrCntlAuswertungenUIDPruefung1 = New SDL.usrCntlAuswertungenUIDPruefung() Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1 = New SDL.usrCntlAuswertungenKunden_Auftragsrueckgang() + Me.TabPage3 = New System.Windows.Forms.TabPage() Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1 = New SDL.usrCntlAuswertungenFiskal_IntrastatMeldung() Me.UsrCntlAuswertungenFiskalvertretung_42001 = New SDL.usrCntlAuswertungenFiskalvertretung_4200() + Me.TabPage4 = New System.Windows.Forms.TabPage() Me.UsrCntlAuswertungenAufschub_Abgabenliste1 = New SDL.usrCntlAuswertungenAufschub_Abgabenliste() + Me.pnl = New System.Windows.Forms.Panel() + Me.PictureBox7 = New System.Windows.Forms.PictureBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit() @@ -163,6 +180,8 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox5.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() + CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox8.SuspendLayout() Me.GroupBox7.SuspendLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtJahrAmbar, System.ComponentModel.ISupportInitialize).BeginInit() @@ -173,6 +192,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage3.SuspendLayout() Me.TabPage4.SuspendLayout() Me.pnl.SuspendLayout() + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label3 @@ -214,7 +234,7 @@ Partial Class usrCntlZOLLAuswertungen ' Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button4.Image = Global.SDL.My.Resources.Excel_logo + Me.Button4.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button4.Location = New System.Drawing.Point(6, 49) Me.Button4.Name = "Button4" @@ -377,7 +397,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label8.Location = New System.Drawing.Point(8, 413) + Me.Label8.Location = New System.Drawing.Point(8, 581) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(211, 17) Me.Label8.TabIndex = 12 @@ -397,7 +417,7 @@ Partial Class usrCntlZOLLAuswertungen 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, 425) + Me.GroupBox2.Location = New System.Drawing.Point(7, 593) Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Size = New System.Drawing.Size(705, 97) Me.GroupBox2.TabIndex = 11 @@ -416,8 +436,8 @@ Partial Class usrCntlZOLLAuswertungen ' 'picDurmaz ' - Me.picDurmaz.Image = Global.SDL.My.Resources.durmaz - Me.picDurmaz.InitialImage = Global.SDL.My.Resources.durmaz + Me.picDurmaz.Image = Global.SDL.My.Resources.Resources.durmaz + Me.picDurmaz.InitialImage = Global.SDL.My.Resources.Resources.durmaz Me.picDurmaz.Location = New System.Drawing.Point(470, 12) Me.picDurmaz.Name = "picDurmaz" Me.picDurmaz.Size = New System.Drawing.Size(221, 44) @@ -523,7 +543,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label16.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label16.Location = New System.Drawing.Point(8, 239) + Me.Label16.Location = New System.Drawing.Point(8, 269) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(264, 17) Me.Label16.TabIndex = 14 @@ -547,7 +567,7 @@ Partial Class usrCntlZOLLAuswertungen Me.GroupBox3.Controls.Add(Me.datEZOLLVon) Me.GroupBox3.Controls.Add(Me.Label24) Me.GroupBox3.Controls.Add(Me.Button1) - Me.GroupBox3.Location = New System.Drawing.Point(7, 251) + Me.GroupBox3.Location = New System.Drawing.Point(7, 281) Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Size = New System.Drawing.Size(705, 93) Me.GroupBox3.TabIndex = 13 @@ -568,7 +588,7 @@ Partial Class usrCntlZOLLAuswertungen ' Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button9.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button9.Image = Global.SDL.My.Resources.Excel_logo + Me.Button9.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button9.Location = New System.Drawing.Point(6, 49) Me.Button9.Name = "Button9" @@ -621,6 +641,9 @@ Partial Class usrCntlZOLLAuswertungen ' '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 @@ -715,7 +738,7 @@ Partial Class usrCntlZOLLAuswertungen ' 'pic ' - Me.pic.Image = Global.SDL.My.Resources.flagge_D + Me.pic.Image = Global.SDL.My.Resources.Resources.flagge_D Me.pic.Location = New System.Drawing.Point(278, 19) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(29, 16) @@ -725,8 +748,8 @@ Partial Class usrCntlZOLLAuswertungen ' 'PictureBox1 ' - Me.PictureBox1.Image = Global.SDL.My.Resources.flagge_A - Me.PictureBox1.Location = New System.Drawing.Point(278, 240) + Me.PictureBox1.Image = Global.SDL.My.Resources.Resources.flagge_A + Me.PictureBox1.Location = New System.Drawing.Point(278, 270) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(29, 16) Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -738,7 +761,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label17.AutoSize = True Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label17.Location = New System.Drawing.Point(8, 538) + Me.Label17.Location = New System.Drawing.Point(8, 706) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(198, 17) Me.Label17.TabIndex = 18 @@ -759,7 +782,7 @@ Partial Class usrCntlZOLLAuswertungen 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(7, 550) + Me.GroupBox4.Location = New System.Drawing.Point(7, 718) Me.GroupBox4.Name = "GroupBox4" Me.GroupBox4.Size = New System.Drawing.Size(705, 147) Me.GroupBox4.TabIndex = 17 @@ -789,8 +812,8 @@ Partial Class usrCntlZOLLAuswertungen ' 'PictureBox2 ' - Me.PictureBox2.Image = Global.SDL.My.Resources.Atilla - Me.PictureBox2.InitialImage = Global.SDL.My.Resources.durmaz + Me.PictureBox2.Image = Global.SDL.My.Resources.Resources.Atilla + Me.PictureBox2.InitialImage = Global.SDL.My.Resources.Resources.durmaz Me.PictureBox2.Location = New System.Drawing.Point(494, 12) Me.PictureBox2.Name = "PictureBox2" Me.PictureBox2.Size = New System.Drawing.Size(166, 44) @@ -893,7 +916,7 @@ Partial Class usrCntlZOLLAuswertungen ' 'PictureBox3 ' - Me.PictureBox3.Image = Global.SDL.My.Resources.flagge_D + Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.flagge_D Me.PictureBox3.Location = New System.Drawing.Point(349, 129) Me.PictureBox3.Name = "PictureBox3" Me.PictureBox3.Size = New System.Drawing.Size(29, 16) @@ -960,7 +983,7 @@ Partial Class usrCntlZOLLAuswertungen ' Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button8.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button8.Image = Global.SDL.My.Resources.Excel_logo + Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button8.Location = New System.Drawing.Point(6, 49) Me.Button8.Name = "Button8" @@ -1119,12 +1142,16 @@ 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(949, 1070) + Me.tbcntr.Size = New System.Drawing.Size(915, 1270) Me.tbcntr.TabIndex = 22 ' 'TabPage1 ' Me.TabPage1.AutoScroll = True + Me.TabPage1.Controls.Add(Me.PictureBox7) + Me.TabPage1.Controls.Add(Me.Label52) + 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.Label45) @@ -1148,17 +1175,184 @@ 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(941, 1044) + Me.TabPage1.Size = New System.Drawing.Size(907, 1244) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Bürgschaften" Me.TabPage1.UseVisualStyleBackColor = True + ' + 'Label52 + ' + Me.Label52.AutoSize = True + Me.Label52.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label52.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label52.Location = New System.Drawing.Point(8, 393) + Me.Label52.Name = "Label52" + Me.Label52.Size = New System.Drawing.Size(351, 17) + Me.Label52.TabIndex = 27 + Me.Label52.Text = "NCTS Gestellungskontrolle E-ZOLL - TELOTEC" + ' + 'PictureBox6 + ' + Me.PictureBox6.Image = Global.SDL.My.Resources.Resources.flagge_A + Me.PictureBox6.Location = New System.Drawing.Point(365, 393) + Me.PictureBox6.Name = "PictureBox6" + Me.PictureBox6.Size = New System.Drawing.Size(29, 16) + Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox6.TabIndex = 28 + Me.PictureBox6.TabStop = False + ' + 'GroupBox8 + ' + Me.GroupBox8.Controls.Add(Me.Label54) + Me.GroupBox8.Controls.Add(Me.txtStatEZoll_TC_Bis) + Me.GroupBox8.Controls.Add(Me.txtStatEZoll_TC_Von) + Me.GroupBox8.Controls.Add(Me.Label56) + Me.GroupBox8.Controls.Add(Me.Button12) + Me.GroupBox8.Controls.Add(Me.Label53) + Me.GroupBox8.Controls.Add(Me.cboBrgEZollTC) + Me.GroupBox8.Controls.Add(Me.Label55) + Me.GroupBox8.Controls.Add(Me.datEZOLL_TC_Bis) + Me.GroupBox8.Controls.Add(Me.Label57) + Me.GroupBox8.Controls.Add(Me.Label58) + Me.GroupBox8.Controls.Add(Me.datEZOLL_TC_Von) + Me.GroupBox8.Controls.Add(Me.Label59) + Me.GroupBox8.Location = New System.Drawing.Point(7, 405) + Me.GroupBox8.Name = "GroupBox8" + Me.GroupBox8.Size = New System.Drawing.Size(705, 93) + Me.GroupBox8.TabIndex = 26 + Me.GroupBox8.TabStop = False + ' + 'Label54 + ' + Me.Label54.AutoSize = True + Me.Label54.Location = New System.Drawing.Point(366, 76) + Me.Label54.Name = "Label54" + Me.Label54.Size = New System.Drawing.Size(10, 13) + Me.Label54.TabIndex = 25 + Me.Label54.Text = "-" + ' + 'txtStatEZoll_TC_Bis + ' + Me.txtStatEZoll_TC_Bis.Location = New System.Drawing.Point(376, 68) + Me.txtStatEZoll_TC_Bis.Name = "txtStatEZoll_TC_Bis" + Me.txtStatEZoll_TC_Bis.Size = New System.Drawing.Size(23, 20) + Me.txtStatEZoll_TC_Bis.TabIndex = 24 + Me.txtStatEZoll_TC_Bis.Text = "50" + ' + 'txtStatEZoll_TC_Von + ' + Me.txtStatEZoll_TC_Von.Location = New System.Drawing.Point(342, 68) + Me.txtStatEZoll_TC_Von.Name = "txtStatEZoll_TC_Von" + Me.txtStatEZoll_TC_Von.Size = New System.Drawing.Size(23, 20) + Me.txtStatEZoll_TC_Von.TabIndex = 23 + Me.txtStatEZoll_TC_Von.Text = "50" + ' + 'Label56 + ' + Me.Label56.AutoSize = True + Me.Label56.Location = New System.Drawing.Point(338, 54) + Me.Label56.Name = "Label56" + Me.Label56.Size = New System.Drawing.Size(40, 13) + Me.Label56.TabIndex = 22 + Me.Label56.Text = "Status:" + ' + 'Button12 + ' + Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button12.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button12.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button12.Location = New System.Drawing.Point(6, 13) + Me.Button12.Name = "Button12" + Me.Button12.Padding = New System.Windows.Forms.Padding(0, 0, 25, 0) + Me.Button12.Size = New System.Drawing.Size(121, 38) + Me.Button12.TabIndex = 20 + Me.Button12.Text = "Excel" + Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button12.UseVisualStyleBackColor = True + ' + 'Label53 + ' + Me.Label53.AutoSize = True + Me.Label53.Location = New System.Drawing.Point(434, 54) + Me.Label53.Name = "Label53" + Me.Label53.Size = New System.Drawing.Size(167, 13) + 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 + Me.Label55.Location = New System.Drawing.Point(569, 31) + Me.Label55.Name = "Label55" + Me.Label55.Size = New System.Drawing.Size(23, 13) + Me.Label55.TabIndex = 10 + Me.Label55.Text = "bis:" + ' + 'datEZOLL_TC_Bis + ' + Me.datEZOLL_TC_Bis.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.datEZOLL_TC_Bis.Location = New System.Drawing.Point(598, 28) + Me.datEZOLL_TC_Bis.Name = "datEZOLL_TC_Bis" + Me.datEZOLL_TC_Bis.Size = New System.Drawing.Size(93, 20) + Me.datEZOLL_TC_Bis.TabIndex = 9 + ' + 'Label57 + ' + Me.Label57.AutoSize = True + Me.Label57.Location = New System.Drawing.Point(436, 12) + Me.Label57.Name = "Label57" + Me.Label57.Size = New System.Drawing.Size(125, 13) + Me.Label57.TabIndex = 8 + Me.Label57.Text = "Anmeldungsdatum (Frist):" + ' + 'Label58 + ' + Me.Label58.AutoSize = True + Me.Label58.Location = New System.Drawing.Point(436, 31) + Me.Label58.Name = "Label58" + Me.Label58.Size = New System.Drawing.Size(28, 13) + Me.Label58.TabIndex = 8 + Me.Label58.Text = "von:" + ' + 'datEZOLL_TC_Von + ' + Me.datEZOLL_TC_Von.Format = System.Windows.Forms.DateTimePickerFormat.[Short] + Me.datEZOLL_TC_Von.Location = New System.Drawing.Point(470, 28) + Me.datEZOLL_TC_Von.Name = "datEZOLL_TC_Von" + Me.datEZOLL_TC_Von.Size = New System.Drawing.Size(93, 20) + Me.datEZOLL_TC_Von.TabIndex = 7 + ' + 'Label59 + ' + Me.Label59.AutoSize = True + Me.Label59.Location = New System.Drawing.Point(145, 12) + Me.Label59.Name = "Label59" + Me.Label59.Size = New System.Drawing.Size(278, 39) + Me.Label59.TabIndex = 5 + Me.Label59.Text = "Liefert eine Liste der nocht nicht gestellten Abfertigungen," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "wobei nach dem Gest" & + "llungsdatum im definierten Zeitraum" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "eingeschränkt wird." ' 'Label46 ' Me.Label46.AutoSize = True Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label46.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label46.Location = New System.Drawing.Point(10, 834) + Me.Label46.Location = New System.Drawing.Point(10, 1002) Me.Label46.Name = "Label46" Me.Label46.Size = New System.Drawing.Size(199, 17) Me.Label46.TabIndex = 25 @@ -1177,7 +1371,7 @@ Partial Class usrCntlZOLLAuswertungen 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(7, 849) + Me.GroupBox7.Location = New System.Drawing.Point(7, 1017) Me.GroupBox7.Name = "GroupBox7" Me.GroupBox7.Size = New System.Drawing.Size(705, 102) Me.GroupBox7.TabIndex = 24 @@ -1196,7 +1390,7 @@ Partial Class usrCntlZOLLAuswertungen ' 'PictureBox5 ' - Me.PictureBox5.Image = Global.SDL.My.Resources.ambar_simple + Me.PictureBox5.Image = Global.SDL.My.Resources.Resources.ambar_simple Me.PictureBox5.Location = New System.Drawing.Point(494, 12) Me.PictureBox5.Name = "PictureBox5" Me.PictureBox5.Size = New System.Drawing.Size(166, 44) @@ -1291,7 +1485,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label45.AutoSize = True Me.Label45.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label45.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label45.Location = New System.Drawing.Point(8, 386) + Me.Label45.Location = New System.Drawing.Point(8, 554) Me.Label45.Name = "Label45" Me.Label45.Size = New System.Drawing.Size(409, 17) Me.Label45.TabIndex = 23 @@ -1302,7 +1496,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Label44.AutoSize = True Me.Label44.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label44.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label44.Location = New System.Drawing.Point(10, 705) + Me.Label44.Location = New System.Drawing.Point(10, 873) Me.Label44.Name = "Label44" Me.Label44.Size = New System.Drawing.Size(182, 17) Me.Label44.TabIndex = 22 @@ -1321,7 +1515,7 @@ Partial Class usrCntlZOLLAuswertungen 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(7, 720) + Me.GroupBox6.Location = New System.Drawing.Point(7, 888) Me.GroupBox6.Name = "GroupBox6" Me.GroupBox6.Size = New System.Drawing.Size(705, 102) Me.GroupBox6.TabIndex = 18 @@ -1340,8 +1534,8 @@ Partial Class usrCntlZOLLAuswertungen ' 'PictureBox4 ' - Me.PictureBox4.Image = Global.SDL.My.Resources.IMEX_LOGO_simple - Me.PictureBox4.InitialImage = Global.SDL.My.Resources.durmaz + Me.PictureBox4.Image = Global.SDL.My.Resources.Resources.IMEX_LOGO_simple + Me.PictureBox4.InitialImage = Global.SDL.My.Resources.Resources.durmaz Me.PictureBox4.Location = New System.Drawing.Point(494, 12) Me.PictureBox4.Name = "PictureBox4" Me.PictureBox4.Size = New System.Drawing.Size(166, 44) @@ -1438,42 +1632,11 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(958, 1044) + Me.TabPage2.Size = New System.Drawing.Size(924, 1244) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Kunden" Me.TabPage2.UseVisualStyleBackColor = True ' - 'TabPage3 - ' - Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1) - Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskalvertretung_42001) - 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(958, 1044) - Me.TabPage3.TabIndex = 2 - Me.TabPage3.Text = "Fiskalvertretung" - Me.TabPage3.UseVisualStyleBackColor = True - ' - 'TabPage4 - ' - 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(958, 1044) - Me.TabPage4.TabIndex = 3 - Me.TabPage4.Text = "Aufschubdaten" - Me.TabPage4.UseVisualStyleBackColor = True - ' - '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(949, 57) - Me.pnl.TabIndex = 23 - ' 'UsrCntlAuswertungenUIDPruefung1 ' Me.UsrCntlAuswertungenUIDPruefung1.BackColor = System.Drawing.Color.White @@ -1492,6 +1655,18 @@ Partial Class usrCntlZOLLAuswertungen Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.Size = New System.Drawing.Size(0, 235) Me.UsrCntlAuswertungenKunden_Auftragsrueckgang1.TabIndex = 0 ' + 'TabPage3 + ' + Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1) + Me.TabPage3.Controls.Add(Me.UsrCntlAuswertungenFiskalvertretung_42001) + 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(924, 1244) + Me.TabPage3.TabIndex = 2 + Me.TabPage3.Text = "Fiskalvertretung" + Me.TabPage3.UseVisualStyleBackColor = True + ' 'UsrCntlAuswertungenFiskal_IntrastatMeldung1 ' Me.UsrCntlAuswertungenFiskal_IntrastatMeldung1.BackColor = System.Drawing.Color.White @@ -1508,6 +1683,16 @@ Partial Class usrCntlZOLLAuswertungen Me.UsrCntlAuswertungenFiskalvertretung_42001.Size = New System.Drawing.Size(708, 234) Me.UsrCntlAuswertungenFiskalvertretung_42001.TabIndex = 0 ' + 'TabPage4 + ' + 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(924, 1244) + Me.TabPage4.TabIndex = 3 + Me.TabPage4.Text = "Aufschubdaten" + Me.TabPage4.UseVisualStyleBackColor = True + ' 'UsrCntlAuswertungenAufschub_Abgabenliste1 ' Me.UsrCntlAuswertungenAufschub_Abgabenliste1.BackColor = System.Drawing.Color.White @@ -1516,6 +1701,26 @@ Partial Class usrCntlZOLLAuswertungen Me.UsrCntlAuswertungenAufschub_Abgabenliste1.Size = New System.Drawing.Size(708, 180) Me.UsrCntlAuswertungenAufschub_Abgabenliste1.TabIndex = 0 ' + '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(915, 57) + Me.pnl.TabIndex = 23 + ' + 'PictureBox7 + ' + Me.PictureBox7.Image = Global.SDL.My.Resources.Resources.IMEX_LOGO_simple + Me.PictureBox7.InitialImage = Global.SDL.My.Resources.Resources.durmaz + Me.PictureBox7.Location = New System.Drawing.Point(579, 387) + Me.PictureBox7.Name = "PictureBox7" + Me.PictureBox7.Size = New System.Drawing.Size(133, 24) + Me.PictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom + Me.PictureBox7.TabIndex = 26 + Me.PictureBox7.TabStop = False + ' 'usrCntlZOLLAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1525,7 +1730,7 @@ Partial Class usrCntlZOLLAuswertungen Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.pnl) Me.Name = "usrCntlZOLLAuswertungen" - Me.Size = New System.Drawing.Size(949, 926) + Me.Size = New System.Drawing.Size(915, 926) Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.GroupBox2.ResumeLayout(False) @@ -1546,6 +1751,9 @@ Partial Class usrCntlZOLLAuswertungen Me.tbcntr.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() + CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox8.ResumeLayout(False) + Me.GroupBox8.PerformLayout() Me.GroupBox7.ResumeLayout(False) Me.GroupBox7.PerformLayout() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() @@ -1559,6 +1767,7 @@ Partial Class usrCntlZOLLAuswertungen Me.TabPage4.ResumeLayout(False) Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -1689,4 +1898,21 @@ Partial Class usrCntlZOLLAuswertungen Friend WithEvents datVonAmbar As DateTimePicker Friend WithEvents Label51 As Label Friend WithEvents Label45 As Label + Friend WithEvents Label52 As Label + Friend WithEvents PictureBox6 As PictureBox + Friend WithEvents GroupBox8 As GroupBox + Friend WithEvents Button12 As Button + Friend WithEvents Label53 As Label + Friend WithEvents cboBrgEZollTC As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label55 As Label + Friend WithEvents datEZOLL_TC_Bis As DateTimePicker + Friend WithEvents Label57 As Label + Friend WithEvents Label58 As Label + Friend WithEvents datEZOLL_TC_Von As DateTimePicker + Friend WithEvents Label59 As Label + Friend WithEvents Label54 As Label + Friend WithEvents txtStatEZoll_TC_Bis As TextBox + Friend WithEvents txtStatEZoll_TC_Von As TextBox + Friend WithEvents Label56 As Label + Friend WithEvents PictureBox7 As PictureBox End Class diff --git a/SDL/zoll/usrCntlZOLLAuswertungen.vb b/SDL/zoll/usrCntlZOLLAuswertungen.vb index 0aacdbe8..fe7dcdae 100644 --- a/SDL/zoll/usrCntlZOLLAuswertungen.vb +++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb @@ -143,6 +143,14 @@ Public Class usrCntlZOLLAuswertungen cboBrgDy.SelectedIndex = 0 End Select + + cboBrgEZollTC.Items.Clear() + cboBrgEZollTC.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6")) + cboBrgEZollTC.SelectedIndex = 0 + + datEZOLL_TC_Von.Value = Now ' d.AddMonths(-3) + datEZOLL_TC_Bis.Value = Now.AddDays(3) + End Sub @@ -215,6 +223,20 @@ Public Class usrCntlZOLLAuswertungen End Function + Function getSQL_NCTS_EZOLL_TELOTEC(datVon As Date, datBis As Date, StatVon As String, StatBis As String, brg As String) ', Optional Warenbezeichnung As Boolean = False, Optional Gesamtrohmasse As Boolean = False + If brg <> "" Then + brg = " AND GRN = '" & brg & "' " + End If + + Dim sqlStr As String = "SELECT dec_CreateDate as Datum, Refs_LRN,telanm_CRN as CRN,telanm_Status as Status,([GVal]) as Betrag, telanm_ID as ID, telanm_ART as Art,GRN,ConeeTra_TIN as EORI,ConeeTra_Na as Empfänger,Represent_Na as Bearbeiter , convert(date,CtrlRslt_DLimit ,104) as Gestellungsfrist,GVal as Garantiewert + FROM tblTelotec_Sicherheit inner join [tblTelotec_Anmeldung] on telanm_id = telgrt_telanmId + WHERE [tblTelotec_Anmeldung].[CtrlRslt_DLimit] BETWEEN '" & datVon.ToShortDateString & " 00:00:00' AND '" & datBis.ToShortDateString & " 23:23:59' AND telanm_Status BETWEEN '" & StatVon & "' and '" & StatBis & "' AND [telnam_aktuellsteNachricht]=1 " & brg & " + ORDER BY convert(datetime, [CtrlRslt_DLimit], 103) ASC,convert(datetime, [dec_CreateDate], 103) ASC " + Return sqlStr + + End Function + + Public Function genDocAndExport_TKontrolleEZOLL(datvon As Date, datbis As Date, stat As String, brg As String, bestimmungszollstelleErreicht As Boolean, operatorId As String, Optional exportPDF As String = "", Optional exportEXCEL As String = "") As Boolean Dim sqlStr = getSQL_NCTS_EZOLL(datEZOLLVon.Text, datEZOLLBis.Text, DirectCast(cboEZOLLStatus.SelectedItem, VERAG_PROG_ALLGEMEIN.MyListItem).Value, cboEZOLLBrg._value, cbxBestimmungszollstelleErreicht.CheckState, operatorId) @@ -468,7 +490,20 @@ Public Class usrCntlZOLLAuswertungen datBisAmbar.Value = d.AddMonths(1).AddDays(-1) End Sub - Private Sub UsrCntlAuswertungenAufschub_Abgabenliste1_Load(sender As Object, e As EventArgs) Handles UsrCntlAuswertungenAufschub_Abgabenliste1.Load + + Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click + Dim sqlStr = getSQL_NCTS_EZOLL_TELOTEC(datEZOLL_TC_Von.Value, datEZOLL_TC_Bis.Value, txtStatEZoll_TC_Von.Text, txtStatEZoll_TC_Bis.Text, cboBrgEZollTC._value) + Dim dt As DataTable = SQL.loadDgvBySql(sqlStr, "FMZOLL") + If dt IsNot Nothing Then + cProgramFunctions.genExcelFromDT_NEW(dt) + End If + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.Designer.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.Designer.vb index 8270a929..68d385c4 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.Designer.vb @@ -61,7 +61,7 @@ Partial Class frmPDFScanList Me.cntxtMulti.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.cntxtMulti.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiScannenToolStripMenuItem, Me.DateiHochladenToolStripMenuItem, Me.ToolStripSeparator1, Me.KopierenZwischenablageToolStripMenuItem, Me.AlsEmailSendenToolStripMenuItem, Me.ToolStripSeparator2, Me.ArchivierenToolStripMenuItem}) Me.cntxtMulti.Name = "cntxt" - Me.cntxtMulti.Size = New System.Drawing.Size(218, 148) + Me.cntxtMulti.Size = New System.Drawing.Size(218, 126) ' 'DateiScannenToolStripMenuItem ' diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.vb index 081a9df5..2494a885 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/frmPDFScanList.vb @@ -60,5 +60,4 @@ Public Class frmPDFScanList If Me IsNot Form.ActiveForm Then Me.Close() End Sub - End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb index 84399b87..8d7d3884 100644 --- a/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb +++ b/VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb @@ -266,7 +266,7 @@ Public Class usrcntlPDFScan Dim outl As New Outlook.Application Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) - Mail.Attachments.Add(ii.coll_pfad, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) + Mail.Attachments.Add(ii.coll_pfad, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, ii.coll_bezeichnung & ".pdf") Mail.Display() Catch ex As Exception MsgBox("Fehler beim Öffnen der Mail!")