neu

2020-09-23 07:24:25 +02:00
parent 89d8e0a3a8
commit ce31c2c398
84 changed files with 4953 additions and 554 deletions
--- a/SDL/zoll/usrCntlZollArtikel.Designer.vb
+++ b/SDL/zoll/usrCntlZollArtikel.Designer.vb
@@ -23,8 +23,8 @@ Partial Class usrCntlZollArtikel
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.pnlFilter = New System.Windows.Forms.Panel()
        Me.dgvZollArtikel = New System.Windows.Forms.DataGridView()
        Me.cntxtRightClick = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -39,6 +39,7 @@ Partial Class usrCntlZollArtikel
        Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ExcelEinlesenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ExcelListeÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.TabelleInExcelÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.btnEdit = New System.Windows.Forms.Button()
        Me.btnNew = New System.Windows.Forms.Button()
        Me.btnDel = New System.Windows.Forms.Button()
@@ -54,7 +55,7 @@ Partial Class usrCntlZollArtikel
        Me.btnTarifnummerKopieren = New System.Windows.Forms.Button()
        Me.cntxtVermerk = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.TabelleInExcelÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.btnDelAll = New System.Windows.Forms.Button()
        CType(Me.dgvZollArtikel, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.cntxtRightClick.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -79,8 +80,8 @@ Partial Class usrCntlZollArtikel
        Me.dgvZollArtikel.AllowUserToAddRows = False
        Me.dgvZollArtikel.AllowUserToDeleteRows = False
        Me.dgvZollArtikel.AllowUserToResizeRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvZollArtikel.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvZollArtikel.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
        Me.dgvZollArtikel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvZollArtikel.ContextMenuStrip = Me.cntxtRightClick
        Me.dgvZollArtikel.Dock = System.Windows.Forms.DockStyle.Fill
@@ -130,6 +131,7 @@ Partial Class usrCntlZollArtikel
        'Panel1
        '
        Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
+        Me.Panel1.Controls.Add(Me.btnDelAll)
        Me.Panel1.Controls.Add(Me.btnRefresh)
        Me.Panel1.Controls.Add(Me.lblTestsystem)
        Me.Panel1.Controls.Add(Me.btnExcel)
@@ -146,7 +148,7 @@ Partial Class usrCntlZollArtikel
        'btnRefresh
        '
        Me.btnRefresh.allowBorder = False
-        Me.btnRefresh.BackgroundImage = Global.SDL.My.Resources.refresh
+        Me.btnRefresh.BackgroundImage = Global.SDL.My.Resources.Resources.refresh
        Me.btnRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnRefresh.FlatAppearance.BorderSize = 0
        Me.btnRefresh.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -176,7 +178,7 @@ Partial Class usrCntlZollArtikel
        Me.btnExcel.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
        Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnExcel.ForeColor = System.Drawing.Color.Black
-        Me.btnExcel.Image = Global.SDL.My.Resources.Excel_logo
+        Me.btnExcel.Image = Global.SDL.My.Resources.Resources.Excel_logo
        Me.btnExcel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnExcel.Location = New System.Drawing.Point(576, 3)
        Me.btnExcel.Name = "btnExcel"
@@ -190,7 +192,7 @@ Partial Class usrCntlZollArtikel
        '
        Me.cntxtExcel.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExcelEinlesenToolStripMenuItem, Me.ExcelListeÖffnenToolStripMenuItem, Me.TabelleInExcelÖffnenToolStripMenuItem})
        Me.cntxtExcel.Name = "cntxtExcel"
-        Me.cntxtExcel.Size = New System.Drawing.Size(192, 92)
+        Me.cntxtExcel.Size = New System.Drawing.Size(192, 70)
        '
        'ExcelEinlesenToolStripMenuItem
        '
@@ -204,12 +206,18 @@ Partial Class usrCntlZollArtikel
        Me.ExcelListeÖffnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
        Me.ExcelListeÖffnenToolStripMenuItem.Text = "Excel Liste öffnen"
        '
+        'TabelleInExcelÖffnenToolStripMenuItem
+        '
+        Me.TabelleInExcelÖffnenToolStripMenuItem.Name = "TabelleInExcelÖffnenToolStripMenuItem"
+        Me.TabelleInExcelÖffnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
+        Me.TabelleInExcelÖffnenToolStripMenuItem.Text = "Tabelle in Excel öffnen"
+        '
        'btnEdit
        '
        Me.btnEdit.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
        Me.btnEdit.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnEdit.ForeColor = System.Drawing.Color.Black
-        Me.btnEdit.Image = Global.SDL.My.Resources.stift
+        Me.btnEdit.Image = Global.SDL.My.Resources.Resources.stift
        Me.btnEdit.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnEdit.Location = New System.Drawing.Point(314, 3)
        Me.btnEdit.Name = "btnEdit"
@@ -224,7 +232,7 @@ Partial Class usrCntlZollArtikel
        Me.btnNew.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
        Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnNew.ForeColor = System.Drawing.Color.Black
-        Me.btnNew.Image = Global.SDL.My.Resources.plus
+        Me.btnNew.Image = Global.SDL.My.Resources.Resources.plus
        Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnNew.Location = New System.Drawing.Point(191, 3)
        Me.btnNew.Name = "btnNew"
@@ -239,7 +247,7 @@ Partial Class usrCntlZollArtikel
        Me.btnDel.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
        Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnDel.ForeColor = System.Drawing.Color.Black
-        Me.btnDel.Image = Global.SDL.My.Resources.del
+        Me.btnDel.Image = Global.SDL.My.Resources.Resources.del
        Me.btnDel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnDel.Location = New System.Drawing.Point(437, 3)
        Me.btnDel.Name = "btnDel"
@@ -252,7 +260,7 @@ Partial Class usrCntlZollArtikel
        'FlatButton1
        '
        Me.FlatButton1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.FlatButton1.BackgroundImage = Global.SDL.My.Resources.plus
+        Me.FlatButton1.BackgroundImage = Global.SDL.My.Resources.Resources.plus
        Me.FlatButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.FlatButton1.ForeColor = System.Drawing.Color.Black
@@ -278,14 +286,14 @@ Partial Class usrCntlZollArtikel
        Me.dgvKdVermerke.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells
        Me.dgvKdVermerke.BackgroundColor = System.Drawing.Color.White
        Me.dgvKdVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvKdVermerke.DefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvKdVermerke.DefaultCellStyle = DataGridViewCellStyle1
        Me.dgvKdVermerke.Location = New System.Drawing.Point(156, 3)
        Me.dgvKdVermerke.Name = "dgvKdVermerke"
        Me.dgvKdVermerke.RowHeadersVisible = False
@@ -299,7 +307,7 @@ Partial Class usrCntlZollArtikel
        Me.btnAtlas.FlatAppearance.BorderSize = 0
        Me.btnAtlas.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnAtlas.ForeColor = System.Drawing.Color.Black
-        Me.btnAtlas.Image = Global.SDL.My.Resources.transfer
+        Me.btnAtlas.Image = Global.SDL.My.Resources.Resources.transfer
        Me.btnAtlas.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnAtlas.Location = New System.Drawing.Point(550, 204)
        Me.btnAtlas.Name = "btnAtlas"
@@ -396,11 +404,20 @@ Partial Class usrCntlZollArtikel
        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(118, 22)
        Me.ToolStripMenuItem1.Text = "Löschen"
        '
-        'TabelleInExcelÖffnenToolStripMenuItem
+        'btnDelAll
        '
-        Me.TabelleInExcelÖffnenToolStripMenuItem.Name = "TabelleInExcelÖffnenToolStripMenuItem"
-        Me.TabelleInExcelÖffnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
-        Me.TabelleInExcelÖffnenToolStripMenuItem.Text = "Tabelle in Excel öffnen"
+        Me.btnDelAll.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
+        Me.btnDelAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDelAll.ForeColor = System.Drawing.Color.Black
+        Me.btnDelAll.Image = Global.SDL.My.Resources.Resources.del
+        Me.btnDelAll.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnDelAll.Location = New System.Drawing.Point(740, 4)
+        Me.btnDelAll.Name = "btnDelAll"
+        Me.btnDelAll.Size = New System.Drawing.Size(126, 27)
+        Me.btnDelAll.TabIndex = 24
+        Me.btnDelAll.Text = "Alle Löschen"
+        Me.btnDelAll.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnDelAll.UseVisualStyleBackColor = True
        '
        'usrCntlZollArtikel
        '
@@ -459,4 +476,5 @@ Partial Class usrCntlZollArtikel
    Friend WithEvents cntxtVermerk As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents ToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents TabelleInExcelÖffnenToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents btnDelAll As Button
 End Class
--- a/SDL/zoll/usrCntlZollArtikel.resx
+++ b/SDL/zoll/usrCntlZollArtikel.resx
@@ -121,7 +121,7 @@
    <value>122, 17</value>
  </metadata>
  <metadata name="cntxtExcel.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>17, 23</value>
  </metadata>
  <metadata name="cntxtVermerk.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>255, 17</value>
--- a/SDL/zoll/usrCntlZollArtikel.vb
+++ b/SDL/zoll/usrCntlZollArtikel.vb
@@ -30,6 +30,7 @@ Public Class usrCntlZollArtikel
            btnNew.Enabled = True
            btnEdit.Enabled = True
            btnDel.Enabled = True
+            btnDelAll.Enabled = True
            btnExcel.Enabled = True
            '   btnAtlas.Visible = True
            editAllowed = True
@@ -37,6 +38,7 @@ Public Class usrCntlZollArtikel
            btnNew.Visible = False
            btnEdit.Visible = False
            btnDel.Visible = False
+            btnDelAll.Visible = False
            btnExcel.Visible = False
            '   btnAtlas.Enabled = False
            editAllowed = False
@@ -380,6 +382,20 @@ Public Class usrCntlZollArtikel
                End If
            End If
        End If
+
+        'If dgvZollArtikel.SelectedRows.Count > 0 Then
+        '    If vbYes = MsgBox("Möchten Sie '" & dgvZollArtikel.SelectedRows.Count & "' Einträge wirklich löschen?", vbYesNoCancel) Then
+        '        For Each r In dgvZollArtikel.SelectedRows
+        '            If dgvZollArtikel.CurrentRow.Selected Then
+        '                If vbYes = MsgBox("Möchten Sie den Eintrag wirklich löschen?", vbYesNoCancel) Then
+        '                    dgvZollArtikel.Rows.Remove(dgvZollArtikel.CurrentRow)
+        '                    save()
+        '                End If
+        '            End If
+        '        Next
+        '    End If
+        'End If
+
    End Sub

    Private Sub save()
@@ -596,7 +612,7 @@ Public Class usrCntlZollArtikel
                            If Not myArray(i, 3) Is Nothing Then
                                If myArray(i, 3).ToString().Length > 200 Then c = True : fehler(i, 3, myArray(i, 3).ToString())
                            End If
-                            If myArray(i, 4) Is Nothing Or myArray(i, 4).ToString() = "" Or myArray(i, 4).ToString().Length > 11 Or Not IsNumeric(myArray(i, 4).ToString()) Then c = True : fehler(i, 4, myArray(i, 4).ToString())
+                            If myArray(i, 4) Is Nothing Or myArray(i, 4).ToString() = "" Or myArray(i, 4).ToString().Replace(" ", "").Replace(".", "").Length > 11 Or Not IsNumeric(myArray(i, 4).ToString().Replace(" ", "").Replace(".", "")) Then c = True : fehler(i, 4, myArray(i, 4).ToString())
                            If myArray(i, 5) Is Nothing Or myArray(i, 5).ToString() = "" Or myArray(i, 5).ToString().Length > 60 Then c = True : fehler(i, 5, myArray(i, 5).ToString())
                            If myArray(i, 6) Is Nothing Or myArray(i, 6).ToString() = "" Or myArray(i, 6).ToString().Length > 240 Then c = True : fehler(i, 6, myArray(i, 6).ToString())

@@ -619,7 +635,7 @@ Public Class usrCntlZollArtikel
                            a.Artikelnummer = myArray(i, 1).ToString
                            If Not myArray(i, 2) Is Nothing Then a.Dynamische_Ergänzung_1 = myArray(i, 2).ToString
                            If Not myArray(i, 3) Is Nothing Then a.Dynamische_Ergänzung_2 = myArray(i, 3).ToString
-                            a.Warencodenummer = myArray(i, 4).ToString
+                            a.Warencodenummer = myArray(i, 4).ToStringReplace(" ", "").Replace(".", "")
                            a.Kurzbezeichnung = myArray(i, 5).ToString
                            a.Warenbeschreibung = myArray(i, 6).ToString
                            a.Verarbeitungskennzeichen = "0"
@@ -824,4 +840,13 @@ Public Class usrCntlZollArtikel
    Private Sub TabelleInExcelÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TabelleInExcelÖffnenToolStripMenuItem.Click
        FUNC.genExcelFromDGV_NEW(dgvZollArtikel)
    End Sub
+
+    Private Sub btnDelAll_Click(sender As Object, e As EventArgs) Handles btnDelAll.Click
+        If vbYes = MsgBox("Möchten Sie wirklich ALLE Einträge löschen (" & dgvZollArtikel.RowCount & ")?", vbYesNoCancel) Then
+            Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+            If SQL.doSQL("DELETE [tblZollArtikel] where KundenNr='" & kdnr & "'", "FMZOLL") Then
+                initSearch()
+            End If
+        End If
+    End Sub
 End Class