From 906449aa323bc37e92f3946b8be1bd4f1e0e51db Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 18 Mar 2024 07:53:11 +0100 Subject: [PATCH] Mitarbeiter, Formular "Einfuhrverbot". --- .../usrcntlEinfuhrverbot.Designer.vb | 246 ++++++++++++++++++ .../usrcntlEinfuhrverbot.resx | 120 +++++++++ .../usrcntlEinfuhrverbot.vb | 89 +++++++ SDL/Formulare/KDFormulare/frmFormulare.vb | 39 ++- SDL/SDL.vbproj | 9 + .../frmKundenUebersichtZOLL.Designer.vb | 72 ++--- SDL/kunden/frmKundenUebersichtZOLL.vb | 4 +- VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb | 4 +- .../DATENSERVER/frmVorlagenUpload.vb | 4 +- 9 files changed, 543 insertions(+), 44 deletions(-) create mode 100644 SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.Designer.vb create mode 100644 SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.resx create mode 100644 SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.vb diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.Designer.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.Designer.vb new file mode 100644 index 00000000..7bd1599b --- /dev/null +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.Designer.vb @@ -0,0 +1,246 @@ + +Partial Class usrcntlEinfuhrverbot + 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 + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + '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.lblEinfuhrverbot = New System.Windows.Forms.Label() + Me.lbl = New System.Windows.Forms.Label() + Me.txtAdresse2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtAdresse1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.pic = New System.Windows.Forms.PictureBox() + Me.btnDown = New System.Windows.Forms.Button() + Me.btnUp = New System.Windows.Forms.Button() + Me.btnDel = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.txtFirma = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() + CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblEinfuhrverbot + ' + Me.lblEinfuhrverbot.AutoSize = True + Me.lblEinfuhrverbot.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblEinfuhrverbot.Location = New System.Drawing.Point(43, 9) + Me.lblEinfuhrverbot.Name = "lblEinfuhrverbot" + Me.lblEinfuhrverbot.Size = New System.Drawing.Size(117, 20) + Me.lblEinfuhrverbot.TabIndex = 1 + Me.lblEinfuhrverbot.Text = "Einfuhrverbot" + ' + 'lbl + ' + Me.lbl.AutoSize = True + Me.lbl.Location = New System.Drawing.Point(170, 37) + Me.lbl.Name = "lbl" + Me.lbl.Size = New System.Drawing.Size(78, 13) + Me.lbl.TabIndex = 6 + Me.lbl.Text = "Firmenwortlaut:" + ' + 'txtAdresse2 + ' + Me.txtAdresse2._DateTimeOnly = False + Me.txtAdresse2._numbersOnly = False + Me.txtAdresse2._numbersOnlyKommastellen = "" + Me.txtAdresse2._numbersOnlyTrennzeichen = True + Me.txtAdresse2._Prozent = False + Me.txtAdresse2._ShortDateNew = False + Me.txtAdresse2._ShortDateOnly = False + Me.txtAdresse2._TimeOnly = False + Me.txtAdresse2._TimeOnly_Seconds = False + Me.txtAdresse2._value = Nothing + Me.txtAdresse2._Waehrung = False + Me.txtAdresse2._WaehrungZeichen = True + Me.txtAdresse2.ForeColor = System.Drawing.Color.Black + Me.txtAdresse2.Location = New System.Drawing.Point(254, 73) + Me.txtAdresse2.MaxLineLength = -1 + Me.txtAdresse2.MaxLines_Warning = "" + Me.txtAdresse2.MaxLines_Warning_Label = Nothing + Me.txtAdresse2.Name = "txtAdresse2" + Me.txtAdresse2.Size = New System.Drawing.Size(709, 20) + Me.txtAdresse2.TabIndex = 13 + ' + 'txtAdresse1 + ' + Me.txtAdresse1._DateTimeOnly = False + Me.txtAdresse1._numbersOnly = False + Me.txtAdresse1._numbersOnlyKommastellen = "" + Me.txtAdresse1._numbersOnlyTrennzeichen = True + Me.txtAdresse1._Prozent = False + Me.txtAdresse1._ShortDateNew = False + Me.txtAdresse1._ShortDateOnly = False + Me.txtAdresse1._TimeOnly = False + Me.txtAdresse1._TimeOnly_Seconds = False + Me.txtAdresse1._value = Nothing + Me.txtAdresse1._Waehrung = False + Me.txtAdresse1._WaehrungZeichen = True + Me.txtAdresse1.ForeColor = System.Drawing.Color.Black + Me.txtAdresse1.Location = New System.Drawing.Point(254, 54) + Me.txtAdresse1.MaxLineLength = -1 + Me.txtAdresse1.MaxLines_Warning = "" + Me.txtAdresse1.MaxLines_Warning_Label = Nothing + Me.txtAdresse1.Name = "txtAdresse1" + Me.txtAdresse1.Size = New System.Drawing.Size(709, 20) + Me.txtAdresse1.TabIndex = 12 + ' + 'pic + ' + Me.pic.BackgroundImage = Global.SDL.My.Resources.Resources.pdf + Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.pic.Cursor = System.Windows.Forms.Cursors.Hand + Me.pic.Location = New System.Drawing.Point(5, 5) + Me.pic.Name = "pic" + Me.pic.Size = New System.Drawing.Size(32, 32) + Me.pic.TabIndex = 30 + Me.pic.TabStop = False + ' + 'btnDown + ' + Me.btnDown.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnDown.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten + Me.btnDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDown.Location = New System.Drawing.Point(976, 42) + Me.btnDown.Name = "btnDown" + Me.btnDown.Size = New System.Drawing.Size(25, 21) + Me.btnDown.TabIndex = 9 + Me.btnDown.UseVisualStyleBackColor = True + ' + 'btnUp + ' + Me.btnUp.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnUp.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben + Me.btnUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnUp.Location = New System.Drawing.Point(976, 22) + Me.btnUp.Name = "btnUp" + Me.btnUp.Size = New System.Drawing.Size(25, 21) + Me.btnUp.TabIndex = 4 + Me.btnUp.UseVisualStyleBackColor = True + ' + 'btnDel + ' + Me.btnDel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnDel.BackgroundImage = Global.SDL.My.Resources.Resources.del + Me.btnDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnDel.Location = New System.Drawing.Point(976, -1) + Me.btnDel.Name = "btnDel" + Me.btnDel.Size = New System.Drawing.Size(25, 21) + Me.btnDel.TabIndex = 0 + Me.btnDel.UseVisualStyleBackColor = True + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(170, 57) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(48, 13) + Me.Label1.TabIndex = 58 + Me.Label1.Text = "Adresse:" + ' + 'txtFirma + ' + Me.txtFirma._AlleFirmenCLUSTER = False + Me.txtFirma._AllowSetValue = True + Me.txtFirma._autoSizeGross = False + Me.txtFirma._display_Name1 = True + Me.txtFirma._displayAVISO_Email = False + Me.txtFirma._displayFullName = False + Me.txtFirma._displayWoelflKd = False + Me.txtFirma._hideIfListEmpty = True + Me.txtFirma._loadKdData = True + Me.txtFirma._searchName1 = True + Me.txtFirma._UseFIRMA = "" + Me.txtFirma._ValueKdAndName = False + Me.txtFirma.dgvpos = "LEFT" + Me.txtFirma.KdName = Nothing + Me.txtFirma.KdNr = "-1" + Me.txtFirma.kdNrField = Nothing + Me.txtFirma.KdNrNullInt = Nothing + Me.txtFirma.Location = New System.Drawing.Point(254, 35) + Me.txtFirma.Name = "txtFirma" + Me.txtFirma.nurAktive = True + Me.txtFirma.searchActive = True + Me.txtFirma.Size = New System.Drawing.Size(709, 20) + Me.txtFirma.TabIndex = 53 + Me.txtFirma.TIMER_SEARCH = True + Me.txtFirma.usrcntl = Nothing + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(44, 38) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(50, 13) + Me.Label4.TabIndex = 59 + Me.Label4.Text = "Sprache:" + ' + 'cboSprache + ' + Me.cboSprache._allowedValuesFreiText = Nothing + Me.cboSprache._allowFreiText = False + Me.cboSprache._value = "" + Me.cboSprache.FormattingEnabled = True + Me.cboSprache.Location = New System.Drawing.Point(47, 54) + Me.cboSprache.Name = "cboSprache" + Me.cboSprache.Size = New System.Drawing.Size(89, 21) + Me.cboSprache.TabIndex = 60 + ' + 'usrcntlEinfuhrverbot + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.WhiteSmoke + Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.cboSprache) + Me.Controls.Add(Me.lblEinfuhrverbot) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.txtFirma) + Me.Controls.Add(Me.btnDown) + Me.Controls.Add(Me.btnUp) + Me.Controls.Add(Me.btnDel) + Me.Controls.Add(Me.pic) + Me.Controls.Add(Me.txtAdresse2) + Me.Controls.Add(Me.txtAdresse1) + Me.Controls.Add(Me.lbl) + Me.Name = "usrcntlEinfuhrverbot" + Me.Size = New System.Drawing.Size(1000, 108) + CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents lblEinfuhrverbot As System.Windows.Forms.Label + Friend WithEvents lbl As System.Windows.Forms.Label + Friend WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents pic As System.Windows.Forms.PictureBox + Friend WithEvents btnDown As System.Windows.Forms.Button + Friend WithEvents btnUp As System.Windows.Forms.Button + Friend WithEvents btnDel As System.Windows.Forms.Button + Friend WithEvents Label1 As Label + Friend WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.KdSearchBox + Friend WithEvents Label4 As Label + Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox +End Class diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.resx b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.vb new file mode 100644 index 00000000..d264e8f4 --- /dev/null +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlEinfuhrverbot.vb @@ -0,0 +1,89 @@ +Public Class usrcntlEinfuhrverbot + Implements FormualrInterface + + Public Event CHANGED(name, value) + Public Event KDNR_CHANGED(kdnr) + Public Event DELETE(c As Control) + Public Event MOVE_UP(c As Control) + Public Event MOVE_DOWN(c As Control) + + Public KdNR As Integer = -1 + Public Sub ChangeKDNr(kdnr As Integer) _ + Implements FormualrInterface.ChangeKDNr + 'initKdNR(kdnr) + txtFirma.KdNr = kdnr + End Sub + + Sub initControlsHandler() + For Each c In Me.Controls + Select Case c.GetType.ToString + Case GetType(VERAG_PROG_ALLGEMEIN.MyTextBox).ToString + AddHandler DirectCast(c, VERAG_PROG_ALLGEMEIN.MyTextBox).Leave, Sub() + RaiseEvent CHANGED(c.name, c.text) + End Sub + Case GetType(VERAG_PROG_ALLGEMEIN.MyComboBox).ToString + AddHandler DirectCast(c, VERAG_PROG_ALLGEMEIN.MyComboBox).SelectedIndexChanged, Sub() + RaiseEvent CHANGED(c.name, c._value) + End Sub + Case GetType(TextBox).ToString + AddHandler DirectCast(c, TextBox).Leave, Sub() + RaiseEvent CHANGED(c.name, c.text) + End Sub + End Select + Next + End Sub + + Private Sub btnDel_Click(sender As Object, e As EventArgs) Handles btnDel.Click + RaiseEvent DELETE(Me) + End Sub + + Private Sub btnup_Click(sender As Object, e As EventArgs) Handles btnUp.Click + RaiseEvent MOVE_UP(Me) + End Sub + + Private Sub btnDown_Click(sender As Object, e As EventArgs) Handles btnDown.Click + RaiseEvent MOVE_DOWN(Me) + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) + + End Sub + + Private Sub usrcntlEinfuhrverbot_Load(sender As Object, e As EventArgs) Handles Me.Load + + txtFirma.initKdBox(Me.FindForm) + AddHandler txtFirma.PropertyChanged, Sub() + Me.KdNR = txtFirma.KdNr_value + If txtFirma.KdNr_value > 0 Then + If txtFirma.KdData_ADRESSEN IsNot Nothing Then + Dim ADRESSE = txtFirma.KdData_ADRESSEN + Dim KUNDE = txtFirma.KdData_KUNDE + txtFirma.Text = If(ADRESSE.Name_1, ADRESSE.Ordnungsbegriff) + txtAdresse1.Text = If(ADRESSE.Straße, "") + txtAdresse2.Text = (If(ADRESSE.LandKz, "") & " " & If(ADRESSE.PLZ, "") & " " & If(ADRESSE.Ort, "")).ToString.Trim + End If + End If + RaiseEvent KDNR_CHANGED(KdNR) + End Sub + initControlsHandler() + cboSprache.Items.Clear() + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Englisch", "EN")) + cboSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Türkisch", "TR")) + + cboSprache.changeItem("EN") + + If KdNR > 0 Then txtFirma.KdNr = KdNR + + End Sub + + Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click + FormularManagerNEU.genPDF(Me, True) + End Sub + + + + Private Sub PictureBox1_Click(sender As Object, e As EventArgs) + FormularManagerNEU.genPDF(Me, , , , True) + End Sub +End Class diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 3fdb8104..c77ef8fc 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -286,6 +286,7 @@ Public Class frmFormulare MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag Überwachungsdokument", FormularManagerArten.QS_UeDok)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Qualitätskontrolle Antrag", FormularManagerArten.Qualitaetskontrolle)) + MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Einfuhrverbot", FormularManagerArten.Einfuhrverbot)) ' MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VerpflichtungserklärungFahrer", FormularManagerArten.VerpflichtungserklärungFahrer)) @@ -788,7 +789,15 @@ Public Class frmFormulare MyFlowLayoutPanel1.Controls.Add(c) End If - + Case FormularManagerArten.Einfuhrverbot + Dim displayName = "" + Dim c As New usrcntlEinfuhrverbot + c.Width = MyFlowLayoutPanel1.Width - 6 + c.KdNR = KdNr + AddHandler c.DELETE, AddressOf ControlDELETE + AddHandler c.MOVE_UP, AddressOf ControlMoveUp + AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown + MyFlowLayoutPanel1.Controls.Add(c) Case Else '"VUB_AG", "VUB_CS" @@ -1282,10 +1291,6 @@ Public Class frmFormulare addForm(FormularManagerArten.Verzollungspreise, {"VZ_FISKAL_DE"}) addForm(FormularManagerArten.VUB_AG) addForm(FormularManagerArten.DE_InformationsblattFiskalverzollung) - - - - Case FormularVorlagenGruppe.NeukundeAT_IMEX MyFlowLayoutPanel1.Controls.Clear() addForm(FormularManagerArten.AT_Vollmacht_EV) @@ -1402,6 +1407,9 @@ Public Class FormularManagerNEU Case GetType(usrCntlZollbeschau).ToString retStr = FormularManagerNEU.Zollbeschau(c) + Case GetType(usrcntlEinfuhrverbot).ToString + retStr = FormularManagerNEU.Einfuhrverbot(c) + End Select If retStr <> "" Then striList.Add(retStr) @@ -2057,7 +2065,6 @@ Public Class FormularManagerNEU Case "AMBAR" - 'test rpt.txtFirmaInfo_VERAG.Visible = False rpt.txtFirmeninfo_ambar.Visible = True rpt.picVERAG.Image = My.Resources.ambar_simple1 @@ -5407,6 +5414,25 @@ Public Class FormularManagerNEU Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Zollstopp", listTowrite) End Function + + Shared Function Einfuhrverbot(usrcntl As usrcntlEinfuhrverbot) As String + Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager + + Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues) + + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtFirma.Text, 40, 150, 100, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse1.Text, 40, 155, 110, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrcntl.txtAdresse2.Text, 40, 160, 110, 20, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT)) + + Select Case usrcntl.cboSprache._value + Case "EN" + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Import_prohibition_EN", listTowrite) + Case Else + Return fm.fillPDF("DOKUMENTE", "VORLAGEN", "SONSTIGE", getUO2, "", "Import_prohibition_EN", listTowrite) + End Select + + End Function + Shared Function Bonitaetsauskunft(usrCntl As usrcntlCreditreformBoniAuskunft) As String Dim fm As New VERAG_PROG_ALLGEMEIN.cFormularManager @@ -5896,6 +5922,7 @@ Public Class FormularManagerArten Shared Property Zollbeschau_Protokoll = "Zollbeschau Protokoll" Shared Property Qualitaetskontrolle = "Qualitätskontrolle" + Shared Property Einfuhrverbot = "Einfuhrverbot" diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 55f759e5..f5bc7b2d 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -610,6 +610,12 @@ UserControl + + usrcntlEinfuhrverbot.vb + + + UserControl + usrcntlVollmacht_DE_indirekt.vb @@ -3113,6 +3119,9 @@ usrCntlQualitaetskontrolle.vb + + usrcntlEinfuhrverbot.vb + usrcntlVollmacht_DE_indirekt.vb diff --git a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb index 021f4a38..837ec64f 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb @@ -35,10 +35,12 @@ Partial Class frmKundenUebersichtZOLL Me.tabZolltarife = New System.Windows.Forms.TabPage() Me.pnlZollTarife = New System.Windows.Forms.Panel() Me.tabKundendaten = New System.Windows.Forms.TabPage() + Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() Me.tbcntrKundenDaten = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() Me.tbStatistik = New System.Windows.Forms.TabPage() Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button1 = New System.Windows.Forms.Button() @@ -93,6 +95,7 @@ Partial Class frmKundenUebersichtZOLL Me.Label40 = New System.Windows.Forms.Label() Me.tbSpeditionsbuch = New System.Windows.Forms.TabPage() Me.tbFiskaluebersicht = New System.Windows.Forms.TabPage() + Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht() Me.tbCBAM = New System.Windows.Forms.TabPage() Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() @@ -148,9 +151,7 @@ Partial Class frmKundenUebersichtZOLL Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht() - Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte() - Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht() + Me.EinfuhrverbotToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ContextMenuStrip1.SuspendLayout() Me.tabZolltarife.SuspendLayout() Me.tabKundendaten.SuspendLayout() @@ -223,6 +224,17 @@ Partial Class frmKundenUebersichtZOLL Me.tabKundendaten.TabIndex = 0 Me.tabKundendaten.Text = "Kundendaten" ' + 'usrcntlKundenuebersicht + ' + Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White + Me.usrcntlKundenuebersicht.BER_STUFE = 0 + Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill + Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) + Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) + Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" + Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691) + Me.usrcntlKundenuebersicht.TabIndex = 0 + ' 'ContextMenuStrip2 ' Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24) @@ -268,6 +280,16 @@ Partial Class frmKundenUebersichtZOLL Me.TabPage1.TabIndex = 2 Me.TabPage1.Text = "Offerte" ' + 'UsrCntlOfferte1 + ' + Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White + Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) + Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691) + Me.UsrCntlOfferte1.TabIndex = 0 + ' 'tbStatistik ' Me.tbStatistik.BackColor = System.Drawing.Color.White @@ -955,6 +977,15 @@ Partial Class frmKundenUebersichtZOLL Me.tbFiskaluebersicht.Text = "Fiskal-Analyse" Me.tbFiskaluebersicht.UseVisualStyleBackColor = True ' + 'UsrcntlFiskaluebersicht1 + ' + Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White + Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0) + Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1" + Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 697) + Me.UsrcntlFiskaluebersicht1.TabIndex = 0 + ' 'tbCBAM ' Me.tbCBAM.Location = New System.Drawing.Point(4, 25) @@ -1084,7 +1115,7 @@ Partial Class frmKundenUebersichtZOLL 'mneFormulare ' Me.mneFormulare.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19, Me.EORIAntragToolStripMenuItem}) + Me.mneFormulare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MANAGERToolStripMenuItem, Me.ToolStripSeparator3, Me.ToolStripMenuItem4, Me.ToolStripMenuItem9, Me.ToolStripMenuItem10, Me.ToolStripMenuItem14, Me.ToolStripMenuItem16, Me.ToolStripMenuItem17, Me.ToolStripMenuItem19, Me.EORIAntragToolStripMenuItem, Me.EinfuhrverbotToolStripMenuItem}) Me.mneFormulare.Enabled = False Me.mneFormulare.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.mneFormulare.ForeColor = System.Drawing.Color.White @@ -1468,35 +1499,11 @@ Partial Class frmKundenUebersichtZOLL Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr" Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" ' - 'usrcntlKundenuebersicht + 'EinfuhrverbotToolStripMenuItem ' - Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White - Me.usrcntlKundenuebersicht.BER_STUFE = 0 - Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill - Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3) - Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2) - Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht" - Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691) - Me.usrcntlKundenuebersicht.TabIndex = 0 - ' - 'UsrCntlOfferte1 - ' - Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White - Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2) - Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691) - Me.UsrCntlOfferte1.TabIndex = 0 - ' - 'UsrcntlFiskaluebersicht1 - ' - Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White - Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0) - Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1" - Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 697) - Me.UsrcntlFiskaluebersicht1.TabIndex = 0 + Me.EinfuhrverbotToolStripMenuItem.Name = "EinfuhrverbotToolStripMenuItem" + Me.EinfuhrverbotToolStripMenuItem.Size = New System.Drawing.Size(242, 22) + Me.EinfuhrverbotToolStripMenuItem.Text = "Einfuhrverbot" ' 'frmKundenUebersichtZOLL ' @@ -1669,4 +1676,5 @@ Partial Class frmKundenUebersichtZOLL Friend WithEvents EORIAntragToolStripMenuItem As ToolStripMenuItem Friend WithEvents tbCBAM As TabPage Friend WithEvents mnueCBAM As ToolStripMenuItem + Friend WithEvents EinfuhrverbotToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/kunden/frmKundenUebersichtZOLL.vb b/SDL/kunden/frmKundenUebersichtZOLL.vb index bf41889a..f20b6f27 100644 --- a/SDL/kunden/frmKundenUebersichtZOLL.vb +++ b/SDL/kunden/frmKundenUebersichtZOLL.vb @@ -1443,7 +1443,9 @@ Public Class frmKundenUebersichtZOLL changeTab(8, mnueStatistik) End Sub - + Private Sub EinfuhrverbotToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EinfuhrverbotToolStripMenuItem.Click + SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Einfuhrverbot, kdNr, {}) + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb index 870f0218..8ce9ed19 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb @@ -306,8 +306,8 @@ Public Class cMitarbeiter 'End Sub - Public Function LOAD(ByVal id As Integer) As Boolean - Dim sqlstr As String = "SELECT * FROM tblMitarbeiter WHERE mit_id = " & id & "" + Public Function LOAD(ByVal id As Integer, Optional isTimas As Boolean = False) As Boolean + Dim sqlstr As String = "SELECT * FROM tblMitarbeiter WHERE " & IIf(isTimas, "mit_timasId = " & id & "", "mit_id = " & id & "") ' adasdas() ' Dim d As VERAG_PROG_ALLGEMEIN.cMitarbeiter = Nothing Try diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.vb index 08306d92..1dc81a73 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.vb @@ -1,11 +1,9 @@ Public Class frmVorlagenUpload - - - Private Sub btnUpload_Click(sender As Object, e As EventArgs) Handles btnUpload.Click Try Dim cDATENSERVER As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(tzxtKategorie.Text, txtOrdner.Text, txtUnterordner1._value, txtUnterordner2._value, "", txtName.Text) + cDATENSERVER.da_vorlage = True If cDATENSERVER.uploadDataToDATENSERVERFileDialog() <> "" Then Me.Close() Catch ex As Exception MsgBox(ex.Message)