Umbau Warenorte, Neues Feature Essensbestellungen, Sendungsvermerk bei GMVS

2023-01-11 14:49:31 +01:00
parent 39837250f1
commit bdee5e1176
8 changed files with 376 additions and 126 deletions
--- a/Aviso/frmWarenorte.Designer.vb
+++ b/Aviso/frmWarenorte.Designer.vb
@@ -40,15 +40,17 @@ Partial Class frmWarenorte
        Me.Label7 = New System.Windows.Forms.Label()
        Me.txtKennr = New System.Windows.Forms.TextBox()
        Me.cbxAktiv = New System.Windows.Forms.CheckBox()
-        Me.cbxGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.txtCluster = New System.Windows.Forms.TextBox()
        Me.mainPanel = New System.Windows.Forms.Panel()
+        Me.txtStrasse = New System.Windows.Forms.TextBox()
+        Me.Label10 = New System.Windows.Forms.Label()
        Me.cbxFirmaChange = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label = New System.Windows.Forms.Label()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.txtReihenfolge = New System.Windows.Forms.TextBox()
        Me.btnSave = New System.Windows.Forms.Button()
+        Me.cbxGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.dgvWarenorteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.pnlTop.SuspendLayout()
        Me.mainPanel.SuspendLayout()
@@ -104,6 +106,7 @@ Partial Class frmWarenorte
        Me.cbxFirma._allowedValuesFreiText = Nothing
        Me.cbxFirma._allowFreiText = False
        Me.cbxFirma._value = ""
+        Me.cbxFirma.DropDownWidth = 150
        Me.cbxFirma.FormattingEnabled = True
        Me.cbxFirma.Location = New System.Drawing.Point(417, 15)
        Me.cbxFirma.Name = "cbxFirma"
@@ -115,7 +118,7 @@ Partial Class frmWarenorte
        Me.btnAdd.BackgroundImage = Global.AVISO.My.Resources.Resources.plus
        Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAdd.Location = New System.Drawing.Point(97, 283)
+        Me.btnAdd.Location = New System.Drawing.Point(128, 283)
        Me.btnAdd.Name = "btnAdd"
        Me.btnAdd.Size = New System.Drawing.Size(24, 20)
        Me.btnAdd.TabIndex = 97
@@ -126,7 +129,7 @@ Partial Class frmWarenorte
        Me.btnDelete.BackgroundImage = Global.AVISO.My.Resources.Resources.del
        Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnDelete.Location = New System.Drawing.Point(120, 283)
+        Me.btnDelete.Location = New System.Drawing.Point(151, 283)
        Me.btnDelete.Name = "btnDelete"
        Me.btnDelete.Size = New System.Drawing.Size(24, 20)
        Me.btnDelete.TabIndex = 96
@@ -167,7 +170,7 @@ Partial Class frmWarenorte
        'Label5
        '
        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(137, 63)
+        Me.Label5.Location = New System.Drawing.Point(137, 59)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(21, 13)
        Me.Label5.TabIndex = 7
@@ -175,15 +178,15 @@ Partial Class frmWarenorte
        '
        'txtOrt
        '
-        Me.txtOrt.Location = New System.Drawing.Point(140, 79)
+        Me.txtOrt.Location = New System.Drawing.Point(140, 75)
        Me.txtOrt.Name = "txtOrt"
        Me.txtOrt.Size = New System.Drawing.Size(100, 20)
-        Me.txtOrt.TabIndex = 6
+        Me.txtOrt.TabIndex = 5
        '
        'Label6
        '
        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(16, 164)
+        Me.Label6.Location = New System.Drawing.Point(262, 114)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(65, 13)
        Me.Label6.TabIndex = 9
@@ -203,34 +206,22 @@ Partial Class frmWarenorte
        Me.txtKennr.Location = New System.Drawing.Point(140, 130)
        Me.txtKennr.Name = "txtKennr"
        Me.txtKennr.Size = New System.Drawing.Size(100, 20)
-        Me.txtKennr.TabIndex = 10
+        Me.txtKennr.TabIndex = 8
        '
        'cbxAktiv
        '
        Me.cbxAktiv.AutoSize = True
-        Me.cbxAktiv.Location = New System.Drawing.Point(293, 8)
+        Me.cbxAktiv.Location = New System.Drawing.Point(268, 9)
        Me.cbxAktiv.Name = "cbxAktiv"
        Me.cbxAktiv.Size = New System.Drawing.Size(50, 17)
-        Me.cbxAktiv.TabIndex = 12
+        Me.cbxAktiv.TabIndex = 3
        Me.cbxAktiv.Text = "Aktiv"
        Me.cbxAktiv.UseVisualStyleBackColor = True
        '
-        'cbxGrenzstelle
-        '
-        Me.cbxGrenzstelle._allowedValuesFreiText = Nothing
-        Me.cbxGrenzstelle._allowFreiText = False
-        Me.cbxGrenzstelle._value = ""
-        Me.cbxGrenzstelle.DropDownWidth = 120
-        Me.cbxGrenzstelle.FormattingEnabled = True
-        Me.cbxGrenzstelle.Location = New System.Drawing.Point(19, 180)
-        Me.cbxGrenzstelle.Name = "cbxGrenzstelle"
-        Me.cbxGrenzstelle.Size = New System.Drawing.Size(100, 21)
-        Me.cbxGrenzstelle.TabIndex = 14
-        '
        'Label8
        '
        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(16, 63)
+        Me.Label8.Location = New System.Drawing.Point(265, 59)
        Me.Label8.Name = "Label8"
        Me.Label8.Size = New System.Drawing.Size(39, 13)
        Me.Label8.TabIndex = 16
@@ -238,13 +229,15 @@ Partial Class frmWarenorte
        '
        'txtCluster
        '
-        Me.txtCluster.Location = New System.Drawing.Point(19, 79)
+        Me.txtCluster.Location = New System.Drawing.Point(268, 75)
        Me.txtCluster.Name = "txtCluster"
        Me.txtCluster.Size = New System.Drawing.Size(100, 20)
-        Me.txtCluster.TabIndex = 15
+        Me.txtCluster.TabIndex = 6
        '
        'mainPanel
        '
+        Me.mainPanel.Controls.Add(Me.txtStrasse)
+        Me.mainPanel.Controls.Add(Me.Label10)
        Me.mainPanel.Controls.Add(Me.cbxFirmaChange)
        Me.mainPanel.Controls.Add(Me.Label)
        Me.mainPanel.Controls.Add(Me.Label9)
@@ -263,11 +256,27 @@ Partial Class frmWarenorte
        Me.mainPanel.Controls.Add(Me.Label5)
        Me.mainPanel.Controls.Add(Me.txtKennr)
        Me.mainPanel.Controls.Add(Me.Label6)
-        Me.mainPanel.Location = New System.Drawing.Point(150, 54)
+        Me.mainPanel.Location = New System.Drawing.Point(181, 55)
        Me.mainPanel.Name = "mainPanel"
        Me.mainPanel.Size = New System.Drawing.Size(368, 242)
        Me.mainPanel.TabIndex = 17
        '
+        'txtStrasse
+        '
+        Me.txtStrasse.Location = New System.Drawing.Point(19, 75)
+        Me.txtStrasse.Name = "txtStrasse"
+        Me.txtStrasse.Size = New System.Drawing.Size(100, 20)
+        Me.txtStrasse.TabIndex = 4
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Location = New System.Drawing.Point(16, 59)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(42, 13)
+        Me.Label10.TabIndex = 23
+        Me.Label10.Text = "Strasse"
+        '
        'cbxFirmaChange
        '
        Me.cbxFirmaChange._allowedValuesFreiText = Nothing
@@ -276,7 +285,7 @@ Partial Class frmWarenorte
        Me.cbxFirmaChange.DropDownWidth = 120
        Me.cbxFirmaChange.Enabled = False
        Me.cbxFirmaChange.FormattingEnabled = True
-        Me.cbxFirmaChange.Location = New System.Drawing.Point(140, 180)
+        Me.cbxFirmaChange.Location = New System.Drawing.Point(19, 175)
        Me.cbxFirmaChange.Name = "cbxFirmaChange"
        Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21)
        Me.cbxFirmaChange.TabIndex = 21
@@ -285,7 +294,7 @@ Partial Class frmWarenorte
        'Label
        '
        Me.Label.AutoSize = True
-        Me.Label.Location = New System.Drawing.Point(137, 164)
+        Me.Label.Location = New System.Drawing.Point(16, 159)
        Me.Label.Name = "Label"
        Me.Label.Size = New System.Drawing.Size(32, 13)
        Me.Label.TabIndex = 20
@@ -306,17 +315,29 @@ Partial Class frmWarenorte
        Me.txtReihenfolge.Location = New System.Drawing.Point(19, 130)
        Me.txtReihenfolge.Name = "txtReihenfolge"
        Me.txtReihenfolge.Size = New System.Drawing.Size(100, 20)
-        Me.txtReihenfolge.TabIndex = 18
+        Me.txtReihenfolge.TabIndex = 7
        '
        'btnSave
        '
        Me.btnSave.Location = New System.Drawing.Point(281, 207)
        Me.btnSave.Name = "btnSave"
        Me.btnSave.Size = New System.Drawing.Size(75, 23)
-        Me.btnSave.TabIndex = 17
+        Me.btnSave.TabIndex = 10
        Me.btnSave.Text = "Speichern"
        Me.btnSave.UseVisualStyleBackColor = True
        '
+        'cbxGrenzstelle
+        '
+        Me.cbxGrenzstelle._allowedValuesFreiText = Nothing
+        Me.cbxGrenzstelle._allowFreiText = False
+        Me.cbxGrenzstelle._value = ""
+        Me.cbxGrenzstelle.DropDownWidth = 120
+        Me.cbxGrenzstelle.FormattingEnabled = True
+        Me.cbxGrenzstelle.Location = New System.Drawing.Point(265, 130)
+        Me.cbxGrenzstelle.Name = "cbxGrenzstelle"
+        Me.cbxGrenzstelle.Size = New System.Drawing.Size(100, 21)
+        Me.cbxGrenzstelle.TabIndex = 9
+        '
        'dgvWarenorteNew
        '
        Me.dgvWarenorteNew.AKTUALISIERUNGS_INTERVALL = -1
@@ -326,7 +347,7 @@ Partial Class frmWarenorte
        Me.dgvWarenorteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvWarenorteNew.Location = New System.Drawing.Point(0, 49)
        Me.dgvWarenorteNew.Name = "dgvWarenorteNew"
-        Me.dgvWarenorteNew.Size = New System.Drawing.Size(144, 254)
+        Me.dgvWarenorteNew.Size = New System.Drawing.Size(175, 254)
        Me.dgvWarenorteNew.TabIndex = 98
        '
        'frmWarenorte
@@ -378,4 +399,6 @@ Partial Class frmWarenorte
    Friend WithEvents dgvWarenorteNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents cbxFirmaChange As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label As Label
+    Friend WithEvents txtStrasse As TextBox
+    Friend WithEvents Label10 As Label
 End Class