From 1d86aa1bb98304c30cf130216a5785fad685e806 Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 7 Oct 2020 08:06:26 +0200 Subject: [PATCH] =?UTF-8?q?Verbesserungen=20f=C3=BCr=20Mestan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UID/My Project/Resources.Designer.vb | 2 +- UID/My Project/Resources.resx | 2 +- UID/cBinding.vb | 2 +- UID/frmAuftragNEU.vb | 2 +- UID/frmDetails.vb | 6 +- UID/frmMain/frmMainV2.Designer.vb | 12 ++-- UID/frmMain/usrcntlAuftraege.Designer.vb | 72 ++++++++++++------------ UID/frmMain/usrcntlAuftraege.vb | 69 ++++++++++++++--------- UID/frmMain/usrcntlFirmen.vb | 16 +++++- 9 files changed, 107 insertions(+), 76 deletions(-) diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 1f3108a..02c0aca 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -424,7 +424,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.0.10.0 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.0.10.1 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index df06775..fed7945 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -155,7 +155,7 @@ ..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 1.0.10.0 + 1.0.10.1 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/UID/cBinding.vb b/UID/cBinding.vb index 7ac1294..f2add1d 100644 --- a/UID/cBinding.vb +++ b/UID/cBinding.vb @@ -87,7 +87,7 @@ Public Class cBinding Dim builder As New SqlCommandBuilder(bindingDataAdapter) If Not modrows = bindingDataAdapter.Update(bindingdataSet, tablename) Then - ' MsgBox(tablename & ": Es ist ein SQL-Fehler beim Updaten der Daten aufgetreten!") + 'MsgBox(tablename & ": Es ist ein SQL-Fehler beim Updaten der Daten aufgetreten!") End If Return True diff --git a/UID/frmAuftragNEU.vb b/UID/frmAuftragNEU.vb index fa34ac0..1efacfe 100644 --- a/UID/frmAuftragNEU.vb +++ b/UID/frmAuftragNEU.vb @@ -1734,7 +1734,7 @@ Public Class frmAuftragNEU Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnFrachtkostenrechner.Click frmFrachtkosten.Show() - AddHandler frmFrachtkosten.Disposed, AddressOf meEnabledTrue + 'AddHandler frmFrachtkosten.Disposed, AddressOf meEnabledTrue End Sub Private Sub meEnabledTrue() Me.Enabled = True diff --git a/UID/frmDetails.vb b/UID/frmDetails.vb index ac7cff5..008f4d4 100644 --- a/UID/frmDetails.vb +++ b/UID/frmDetails.vb @@ -1018,8 +1018,10 @@ Public Class frmDetails Try bindingDATA.bindingdataTable.Rows(0).Item("kd_FMZOLL_KdNr") = If(kdFirma.KdNrNullInt, DBNull.Value) 'MsgBox(kdFirma.KdNrNullInt) - If bindingDATA.updateBinding() AndAlso bindingOeZ.updateBinding Then - btnSave.Enabled = False + If bindingDATA.updateBinding() Then + If bindingOeZ.updateBinding Then + btnSave.Enabled = False + End If End If Catch ex As Exception MsgBox("Es ist ein Fehler aufgetreten: " & ex.Message) diff --git a/UID/frmMain/frmMainV2.Designer.vb b/UID/frmMain/frmMainV2.Designer.vb index ee9c32c..1696ec2 100644 --- a/UID/frmMain/frmMainV2.Designer.vb +++ b/UID/frmMain/frmMainV2.Designer.vb @@ -62,7 +62,7 @@ Partial Class frmMainV2 Me.PanOben.Dock = System.Windows.Forms.DockStyle.Top Me.PanOben.Location = New System.Drawing.Point(0, 0) Me.PanOben.Name = "PanOben" - Me.PanOben.Size = New System.Drawing.Size(1420, 48) + Me.PanOben.Size = New System.Drawing.Size(1587, 48) Me.PanOben.TabIndex = 15 ' 'btnFrachtkosten @@ -119,16 +119,16 @@ Partial Class frmMainV2 Me.PanUnten.Controls.Add(Me.btnCMR) Me.PanUnten.Controls.Add(Me.btnKasse) Me.PanUnten.Dock = System.Windows.Forms.DockStyle.Bottom - Me.PanUnten.Location = New System.Drawing.Point(0, 879) + Me.PanUnten.Location = New System.Drawing.Point(0, 935) Me.PanUnten.Name = "PanUnten" - Me.PanUnten.Size = New System.Drawing.Size(1420, 62) + Me.PanUnten.Size = New System.Drawing.Size(1587, 62) Me.PanUnten.TabIndex = 16 ' 'btnSchliessen ' Me.btnSchliessen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnSchliessen.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSchliessen.Location = New System.Drawing.Point(1328, 27) + Me.btnSchliessen.Location = New System.Drawing.Point(1495, 27) Me.btnSchliessen.Name = "btnSchliessen" Me.btnSchliessen.Size = New System.Drawing.Size(80, 23) Me.btnSchliessen.TabIndex = 34 @@ -195,7 +195,7 @@ Partial Class frmMainV2 Me.PanMain.Location = New System.Drawing.Point(0, 48) Me.PanMain.Margin = New System.Windows.Forms.Padding(0) Me.PanMain.Name = "PanMain" - Me.PanMain.Size = New System.Drawing.Size(1420, 831) + Me.PanMain.Size = New System.Drawing.Size(1587, 887) Me.PanMain.TabIndex = 17 ' 'UidDataSet1 @@ -208,7 +208,7 @@ Partial Class frmMainV2 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1420, 941) + Me.ClientSize = New System.Drawing.Size(1587, 997) Me.Controls.Add(Me.PanMain) Me.Controls.Add(Me.PanUnten) Me.Controls.Add(Me.PanOben) diff --git a/UID/frmMain/usrcntlAuftraege.Designer.vb b/UID/frmMain/usrcntlAuftraege.Designer.vb index f349f2f..d4f3b8b 100644 --- a/UID/frmMain/usrcntlAuftraege.Designer.vb +++ b/UID/frmMain/usrcntlAuftraege.Designer.vb @@ -22,7 +22,7 @@ Partial Class usrcntlAuftraege 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.PanTop = New System.Windows.Forms.Panel() Me.PanOben = New System.Windows.Forms.Panel() Me.btnReset = New System.Windows.Forms.Button() @@ -36,6 +36,7 @@ Partial Class usrcntlAuftraege Me.txtSuche = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() Me.PanButtons = New System.Windows.Forms.Panel() + Me.btnAddTo = New System.Windows.Forms.Button() Me.btnTrip = New System.Windows.Forms.Button() Me.btnSuchStat = New System.Windows.Forms.Button() Me.btnSuchAuswertung = New System.Windows.Forms.Button() @@ -76,7 +77,6 @@ Partial Class usrcntlAuftraege Me.Label10 = New System.Windows.Forms.Label() Me.cbxAbliefer = New System.Windows.Forms.CheckBox() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.btnAddTo = New System.Windows.Forms.Button() Me.PanTop.SuspendLayout() Me.PanOben.SuspendLayout() Me.pnlFilterAuftrag.SuspendLayout() @@ -98,7 +98,7 @@ Partial Class usrcntlAuftraege Me.PanTop.Location = New System.Drawing.Point(0, 0) Me.PanTop.Margin = New System.Windows.Forms.Padding(0) Me.PanTop.Name = "PanTop" - Me.PanTop.Size = New System.Drawing.Size(1093, 84) + Me.PanTop.Size = New System.Drawing.Size(1279, 84) Me.PanTop.TabIndex = 3 ' 'PanOben @@ -216,7 +216,7 @@ Partial Class usrcntlAuftraege ' Me.Panel1.BackColor = System.Drawing.Color.Transparent Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right - Me.Panel1.Location = New System.Drawing.Point(859, 0) + Me.Panel1.Location = New System.Drawing.Point(1045, 0) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(234, 84) Me.Panel1.TabIndex = 0 @@ -235,18 +235,33 @@ Partial Class usrcntlAuftraege Me.PanButtons.Controls.Add(Me.lblMs) Me.PanButtons.Controls.Add(Me.lblAnzahl) Me.PanButtons.Dock = System.Windows.Forms.DockStyle.Right - Me.PanButtons.Location = New System.Drawing.Point(994, 84) + Me.PanButtons.Location = New System.Drawing.Point(1180, 84) Me.PanButtons.Name = "PanButtons" - Me.PanButtons.Size = New System.Drawing.Size(99, 711) + Me.PanButtons.Size = New System.Drawing.Size(99, 743) Me.PanButtons.TabIndex = 1 ' + 'btnAddTo + ' + Me.btnAddTo.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.btnAddTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddTo.Image = Global.DISPO.My.Resources.Resources.links20 + Me.btnAddTo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAddTo.Location = New System.Drawing.Point(5, 367) + Me.btnAddTo.Name = "btnAddTo" + Me.btnAddTo.Size = New System.Drawing.Size(91, 33) + Me.btnAddTo.TabIndex = 36 + Me.btnAddTo.Text = "Hinzufügen" + Me.btnAddTo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAddTo.UseVisualStyleBackColor = True + Me.btnAddTo.Visible = False + ' 'btnTrip ' Me.btnTrip.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnTrip.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnTrip.Image = Global.DISPO.My.Resources.Resources.stift Me.btnTrip.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnTrip.Location = New System.Drawing.Point(5, 312) + Me.btnTrip.Location = New System.Drawing.Point(5, 328) Me.btnTrip.Name = "btnTrip" Me.btnTrip.Size = New System.Drawing.Size(91, 33) Me.btnTrip.TabIndex = 35 @@ -259,7 +274,7 @@ Partial Class usrcntlAuftraege Me.btnSuchStat.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnSuchStat.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSuchStat.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnSuchStat.Location = New System.Drawing.Point(5, 490) + Me.btnSuchStat.Location = New System.Drawing.Point(5, 506) Me.btnSuchStat.Name = "btnSuchStat" Me.btnSuchStat.Size = New System.Drawing.Size(91, 46) Me.btnSuchStat.TabIndex = 34 @@ -271,7 +286,7 @@ Partial Class usrcntlAuftraege Me.btnSuchAuswertung.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnSuchAuswertung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSuchAuswertung.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnSuchAuswertung.Location = New System.Drawing.Point(5, 438) + Me.btnSuchAuswertung.Location = New System.Drawing.Point(5, 454) Me.btnSuchAuswertung.Name = "btnSuchAuswertung" Me.btnSuchAuswertung.Size = New System.Drawing.Size(91, 46) Me.btnSuchAuswertung.TabIndex = 33 @@ -283,7 +298,7 @@ Partial Class usrcntlAuftraege Me.btnAuswertung.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnAuswertung.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAuswertung.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnAuswertung.Location = New System.Drawing.Point(5, 409) + Me.btnAuswertung.Location = New System.Drawing.Point(5, 425) Me.btnAuswertung.Name = "btnAuswertung" Me.btnAuswertung.Size = New System.Drawing.Size(91, 23) Me.btnAuswertung.TabIndex = 32 @@ -294,7 +309,7 @@ Partial Class usrcntlAuftraege ' Me.btnDuplicate.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnDuplicate.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDuplicate.Location = New System.Drawing.Point(5, 260) + Me.btnDuplicate.Location = New System.Drawing.Point(5, 276) Me.btnDuplicate.Name = "btnDuplicate" Me.btnDuplicate.Size = New System.Drawing.Size(91, 33) Me.btnDuplicate.TabIndex = 26 @@ -307,7 +322,7 @@ Partial Class usrcntlAuftraege Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDel.Image = Global.DISPO.My.Resources.Resources.del Me.btnDel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnDel.Location = New System.Drawing.Point(5, 221) + Me.btnDel.Location = New System.Drawing.Point(5, 237) Me.btnDel.Name = "btnDel" Me.btnDel.Size = New System.Drawing.Size(91, 33) Me.btnDel.TabIndex = 25 @@ -321,7 +336,7 @@ Partial Class usrcntlAuftraege Me.btnChange.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnChange.Image = Global.DISPO.My.Resources.Resources.stift Me.btnChange.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnChange.Location = New System.Drawing.Point(5, 169) + Me.btnChange.Location = New System.Drawing.Point(5, 185) Me.btnChange.Name = "btnChange" Me.btnChange.Size = New System.Drawing.Size(91, 33) Me.btnChange.TabIndex = 24 @@ -335,7 +350,7 @@ Partial Class usrcntlAuftraege Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnNew.Image = Global.DISPO.My.Resources.Resources.plus Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnNew.Location = New System.Drawing.Point(5, 130) + Me.btnNew.Location = New System.Drawing.Point(5, 146) Me.btnNew.Name = "btnNew" Me.btnNew.Size = New System.Drawing.Size(91, 33) Me.btnNew.TabIndex = 23 @@ -347,7 +362,7 @@ Partial Class usrcntlAuftraege ' Me.lblMs.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblMs.AutoSize = True - Me.lblMs.Location = New System.Drawing.Point(3, 698) + Me.lblMs.Location = New System.Drawing.Point(3, 730) Me.lblMs.Name = "lblMs" Me.lblMs.Size = New System.Drawing.Size(47, 13) Me.lblMs.TabIndex = 2 @@ -357,7 +372,7 @@ Partial Class usrcntlAuftraege ' Me.lblAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAnzahl.AutoSize = True - Me.lblAnzahl.Location = New System.Drawing.Point(3, 685) + Me.lblAnzahl.Location = New System.Drawing.Point(3, 717) Me.lblAnzahl.Name = "lblAnzahl" Me.lblAnzahl.Size = New System.Drawing.Size(39, 13) Me.lblAnzahl.TabIndex = 1 @@ -367,15 +382,15 @@ Partial Class usrcntlAuftraege ' Me.dgvAuftraege.AllowUserToAddRows = False Me.dgvAuftraege.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvAuftraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvAuftraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvAuftraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAuftraege.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvAuftraege.Location = New System.Drawing.Point(0, 0) Me.dgvAuftraege.Margin = New System.Windows.Forms.Padding(0) Me.dgvAuftraege.Name = "dgvAuftraege" Me.dgvAuftraege.ReadOnly = True - Me.dgvAuftraege.Size = New System.Drawing.Size(994, 535) + Me.dgvAuftraege.Size = New System.Drawing.Size(1180, 567) Me.dgvAuftraege.TabIndex = 0 ' 'txtAuftraggeber @@ -691,26 +706,11 @@ Partial Class usrcntlAuftraege ' Me.SplitContainer1.Panel2.BackColor = System.Drawing.Color.Transparent Me.SplitContainer1.Panel2.Controls.Add(Me.dgvAuftraege) - Me.SplitContainer1.Size = New System.Drawing.Size(994, 711) + Me.SplitContainer1.Size = New System.Drawing.Size(1180, 743) Me.SplitContainer1.SplitterDistance = 175 Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.TabIndex = 2 ' - 'btnAddTo - ' - Me.btnAddTo.Anchor = System.Windows.Forms.AnchorStyles.Right - Me.btnAddTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAddTo.Image = Global.DISPO.My.Resources.Resources.links20 - Me.btnAddTo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnAddTo.Location = New System.Drawing.Point(5, 351) - Me.btnAddTo.Name = "btnAddTo" - Me.btnAddTo.Size = New System.Drawing.Size(91, 33) - Me.btnAddTo.TabIndex = 36 - Me.btnAddTo.Text = "Hinzufügen" - Me.btnAddTo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnAddTo.UseVisualStyleBackColor = True - Me.btnAddTo.Visible = False - ' 'usrcntlAuftraege ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -723,7 +723,7 @@ Partial Class usrcntlAuftraege Me.DoubleBuffered = True Me.MinimumSize = New System.Drawing.Size(1000, 750) Me.Name = "usrcntlAuftraege" - Me.Size = New System.Drawing.Size(1093, 795) + Me.Size = New System.Drawing.Size(1279, 827) Me.PanTop.ResumeLayout(False) Me.PanOben.ResumeLayout(False) Me.PanOben.PerformLayout() diff --git a/UID/frmMain/usrcntlAuftraege.vb b/UID/frmMain/usrcntlAuftraege.vb index 5320a07..e5cc8df 100644 --- a/UID/frmMain/usrcntlAuftraege.vb +++ b/UID/frmMain/usrcntlAuftraege.vb @@ -142,7 +142,9 @@ atr_id when atr_TransportAuftragArt is null then '-' when atr_AuftragsArt = 'Handling' then '-' end as Transportunternehmen +,case when atr_AuftragsArt='TRANSPORT' THEN atr_ladest_plz ELSE atr_absender_plz END as atr_ladest_plz ,case when atr_AuftragsArt='TRANSPORT' THEN atr_ladest_firma ELSE atr_absender_firma END as atr_ladest_firma +,case when atr_AuftragsArt='TRANSPORT' THEN atr_entladest_plz ELSE atr_empfaenger_plz END as atr_entladest_plz ,case when atr_AuftragsArt='TRANSPORT' THEN atr_entladest_firma ELSE atr_empfaenger_firma END as atr_entladest_firma ,atr_abliefernachweis,atr_AuftragsArt,atr_FilialenNr ,atr_tripNr @@ -178,43 +180,51 @@ WHERE " & where & "" .Columns(0).Visible = False .Columns("atr_AuftragsArt").Visible = False - .Columns(1).Width = 70 - .Columns(1).HeaderText = "FrachtposNr." + .Columns("atr_frachtpos").Width = 70 + .Columns("atr_frachtpos").HeaderText = "FrachtposNr." - .Columns(2).Width = 70 - .Columns(2).HeaderText = "Datum" + .Columns("atr_datum").Width = 70 + .Columns("atr_datum").HeaderText = "Datum" - .Columns(3).MinimumWidth = 165 - .Columns(3).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns(3).FillWeight = 150 - .Columns(3).HeaderText = "Auftraggeber" + .Columns("atr_auftr_firma").MinimumWidth = 165 + .Columns("atr_auftr_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("atr_auftr_firma").FillWeight = 150 + .Columns("atr_auftr_firma").HeaderText = "Auftraggeber" - .Columns(4).MinimumWidth = 165 - .Columns(4).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns(4).FillWeight = 150 - .Columns(4).HeaderText = "Frachtführer Bis" + .Columns("atr_frachtf_firma").MinimumWidth = 165 + .Columns("atr_frachtf_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("atr_frachtf_firma").FillWeight = 150 + .Columns("atr_frachtf_firma").HeaderText = "Frachtführer Bis" .Columns("atr_frachtfAb_firma").MinimumWidth = 165 .Columns("atr_frachtfAb_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("atr_frachtfAb_firma").HeaderText = "Frachtführer Ab" - .Columns(6).MinimumWidth = 165 - .Columns(6).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns(6).HeaderText = "Transportunternehmen" + .Columns("Transportunternehmen").MinimumWidth = 165 + .Columns("Transportunternehmen").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("Transportunternehmen").HeaderText = "Transportunternehmen" - .Columns(7).MinimumWidth = 165 - .Columns(7).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns(7).HeaderText = "Ladestelle/Absender" + .Columns("atr_ladest_plz").HeaderText = "Lad PLZ" + .Columns("atr_ladest_plz").Width = 45 + .Columns("atr_ladest_plz").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - .Columns(8).MinimumWidth = 165 - .Columns(8).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns(8).HeaderText = "Entladest./Empfänger" + .Columns("atr_ladest_firma").MinimumWidth = 165 + .Columns("atr_ladest_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("atr_ladest_firma").HeaderText = "Ladestelle/Absender" - .Columns(9).Width = 60 - .Columns(9).HeaderText = "Abl.Nachw." - .Columns(9).ReadOnly = False - .Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("atr_entladest_plz").HeaderText = "Ent PLZ" + .Columns("atr_entladest_plz").Width = 45 + .Columns("atr_entladest_plz").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + + .Columns("atr_entladest_firma").MinimumWidth = 165 + .Columns("atr_entladest_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("atr_entladest_firma").HeaderText = "Entladest./Empfänger" + + .Columns("atr_abliefernachweis").Width = 60 + .Columns("atr_abliefernachweis").HeaderText = "Abl.Nachw." + .Columns("atr_abliefernachweis").ReadOnly = False + .Columns("atr_abliefernachweis").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter .Columns("atr_FilialenNr").Width = 60 .Columns("atr_FilialenNr").HeaderText = "Filiale" @@ -293,6 +303,8 @@ WHERE " & where & "" OR (atr_absender_firma Like '%" & txtLadestelle.Text.Replace("'", "") & "%') OR + (atr_ladest_plz Like '%" & txtLadestelle.Text.Replace("'", "") & "%') + OR (VERAG.dbo.Speditionsbuch.Absender Like '%" & txtLadestelle.Text.Replace("'", "") & "%'))" End If @@ -302,6 +314,8 @@ WHERE " & where & "" OR (atr_empfaenger_firma Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%') OR + (atr_entladest_plz Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%') + OR (VERAG.dbo.Speditionsbuch.Empfänger Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%'))" End If @@ -512,7 +526,7 @@ WHERE " & where & "" Select Case MsgBox("Soll der Eintrag wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?") Case vbYes - DISPO.delAuftrag(Convert.ToInt32(dgvAuftraege.CurrentRow.Cells(0).Value)) + DISPO.delAuftrag(Convert.ToInt32(dgvAuftraege.SelectedRows.Item(0).Cells(0).Value)) 'Tabelle_anzeigen() showDGVAuftraege() Case vbNo @@ -522,7 +536,8 @@ WHERE " & where & "" Private Sub btnDuplicate_Click(sender As Object, e As EventArgs) Handles btnDuplicate.Click Try - Dim AUFTRAG As New cDispoAuftraege(dgvAuftraege.CurrentRow.Cells(0).Value) + 'Dim AUFTRAG As New cDispoAuftraege(dgvAuftraege.CurrentRow.Cells(0).Value) + Dim AUFTRAG As New cDispoAuftraege(dgvAuftraege.SelectedRows.Item(0).Cells(0).Value) AUFTRAG.atr_id = -1 AUFTRAG.atr_datum = Now AUFTRAG.atr_frachtpos = Nothing diff --git a/UID/frmMain/usrcntlFirmen.vb b/UID/frmMain/usrcntlFirmen.vb index 0d540d2..3879eae 100644 --- a/UID/frmMain/usrcntlFirmen.vb +++ b/UID/frmMain/usrcntlFirmen.vb @@ -24,8 +24,22 @@ Public Class usrcntlFirmen cboRolle.Items.Add(New MyListItem("Entladestelle", "3")) cboRolle.Items.Add(New MyListItem("Frachtführer", "4")) cboRolle.Items.Add(New MyListItem("Transportunternehmen", "5")) - + FillcboLandWithLaender() showDGVKunden() + + End Sub + + Private Sub FillcboLandWithLaender() + cboLand.Items.Clear() + Dim Kundenlaender As New List(Of Object) + Dim vpasql As New VERAG_PROG_ALLGEMEIN.SQL + Kundenlaender = vpasql.loadCboBySql("SELECT DISTINCT kd_land FROM [tblKunden]", "DISPO") + + For Each Land As String In Kundenlaender + If Land.Length > 0 Then cboLand.Items.Add(Land) + Next + cboLand.Items.Add("-") + End Sub Private Sub initDGVKunden(bindingString As String)