edv/DISPO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Verbesserungen für Mestan

Browse Source
This commit is contained in:
ms
2020-10-07 08:06:26 +02:00
parent c142858a98
commit 1d86aa1bb9
9 changed files with 107 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UID/My Project/Resources.Designer.vb generated
View File

@@ -424,7 +424,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 1.0.10.0 ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die 1.0.10.1 ähnelt.
'''</summary> '''</summary>
Friend ReadOnly Property Version() As String Friend ReadOnly Property Version() As String
Get Get

2
UID/My Project/Resources.resx
View File

@@ -155,7 +155,7 @@
<value>..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Version" xml:space="preserve"> <data name="Version" xml:space="preserve">
<value>1.0.10.0</value> <value>1.0.10.1</value>
</data> </data>
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

2
UID/cBinding.vb
View File

@@ -87,7 +87,7 @@ Public Class cBinding
Dim builder As New SqlCommandBuilder(bindingDataAdapter) Dim builder As New SqlCommandBuilder(bindingDataAdapter)
If Not modrows = bindingDataAdapter.Update(bindingdataSet, tablename) Then 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 End If
Return True Return True

2
UID/frmAuftragNEU.vb
View File

@@ -1734,7 +1734,7 @@ Public Class frmAuftragNEU
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnFrachtkostenrechner.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnFrachtkostenrechner.Click
frmFrachtkosten.Show() frmFrachtkosten.Show()
AddHandler frmFrachtkosten.Disposed, AddressOf meEnabledTrue 'AddHandler frmFrachtkosten.Disposed, AddressOf meEnabledTrue
End Sub End Sub
Private Sub meEnabledTrue() Private Sub meEnabledTrue()
Me.Enabled = True Me.Enabled = True

6
UID/frmDetails.vb
View File

@@ -1018,8 +1018,10 @@ Public Class frmDetails
Try Try
bindingDATA.bindingdataTable.Rows(0).Item("kd_FMZOLL_KdNr") = If(kdFirma.KdNrNullInt, DBNull.Value) bindingDATA.bindingdataTable.Rows(0).Item("kd_FMZOLL_KdNr") = If(kdFirma.KdNrNullInt, DBNull.Value)
'MsgBox(kdFirma.KdNrNullInt) 'MsgBox(kdFirma.KdNrNullInt)
If bindingDATA.updateBinding() AndAlso bindingOeZ.updateBinding Then If bindingDATA.updateBinding() Then
btnSave.Enabled = False If bindingOeZ.updateBinding Then
btnSave.Enabled = False
End If
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox("Es ist ein Fehler aufgetreten: " & ex.Message) MsgBox("Es ist ein Fehler aufgetreten: " & ex.Message)

12
UID/frmMain/frmMainV2.Designer.vb generated
View File

@@ -62,7 +62,7 @@ Partial Class frmMainV2
Me.PanOben.Dock = System.Windows.Forms.DockStyle.Top Me.PanOben.Dock = System.Windows.Forms.DockStyle.Top
Me.PanOben.Location = New System.Drawing.Point(0, 0) Me.PanOben.Location = New System.Drawing.Point(0, 0)
Me.PanOben.Name = "PanOben" 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 Me.PanOben.TabIndex = 15
' '
'btnFrachtkosten 'btnFrachtkosten
@@ -119,16 +119,16 @@ Partial Class frmMainV2
Me.PanUnten.Controls.Add(Me.btnCMR) Me.PanUnten.Controls.Add(Me.btnCMR)
Me.PanUnten.Controls.Add(Me.btnKasse) Me.PanUnten.Controls.Add(Me.btnKasse)
Me.PanUnten.Dock = System.Windows.Forms.DockStyle.Bottom 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.Name = "PanUnten"
Me.PanUnten.Size = New System.Drawing.Size(1420, 62) Me.PanUnten.Size = New System.Drawing.Size(1587, 62)
Me.PanUnten.TabIndex = 16 Me.PanUnten.TabIndex = 16
' '
'btnSchliessen 'btnSchliessen
' '
Me.btnSchliessen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) 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.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.Name = "btnSchliessen"
Me.btnSchliessen.Size = New System.Drawing.Size(80, 23) Me.btnSchliessen.Size = New System.Drawing.Size(80, 23)
Me.btnSchliessen.TabIndex = 34 Me.btnSchliessen.TabIndex = 34
@@ -195,7 +195,7 @@ Partial Class frmMainV2
Me.PanMain.Location = New System.Drawing.Point(0, 48) Me.PanMain.Location = New System.Drawing.Point(0, 48)
Me.PanMain.Margin = New System.Windows.Forms.Padding(0) Me.PanMain.Margin = New System.Windows.Forms.Padding(0)
Me.PanMain.Name = "PanMain" 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 Me.PanMain.TabIndex = 17
' '
'UidDataSet1 'UidDataSet1
@@ -208,7 +208,7 @@ Partial Class frmMainV2
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White 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.PanMain)
Me.Controls.Add(Me.PanUnten) Me.Controls.Add(Me.PanUnten)
Me.Controls.Add(Me.PanOben) Me.Controls.Add(Me.PanOben)

72
UID/frmMain/usrcntlAuftraege.Designer.vb generated
View File

@@ -22,7 +22,7 @@ Partial Class usrcntlAuftraege
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() 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.PanTop = New System.Windows.Forms.Panel()
Me.PanOben = New System.Windows.Forms.Panel() Me.PanOben = New System.Windows.Forms.Panel()
Me.btnReset = New System.Windows.Forms.Button() Me.btnReset = New System.Windows.Forms.Button()
@@ -36,6 +36,7 @@ Partial Class usrcntlAuftraege
Me.txtSuche = New System.Windows.Forms.TextBox() Me.txtSuche = New System.Windows.Forms.TextBox()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.PanButtons = 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.btnTrip = New System.Windows.Forms.Button()
Me.btnSuchStat = New System.Windows.Forms.Button() Me.btnSuchStat = New System.Windows.Forms.Button()
Me.btnSuchAuswertung = 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.Label10 = New System.Windows.Forms.Label()
Me.cbxAbliefer = New System.Windows.Forms.CheckBox() Me.cbxAbliefer = New System.Windows.Forms.CheckBox()
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.btnAddTo = New System.Windows.Forms.Button()
Me.PanTop.SuspendLayout() Me.PanTop.SuspendLayout()
Me.PanOben.SuspendLayout() Me.PanOben.SuspendLayout()
Me.pnlFilterAuftrag.SuspendLayout() Me.pnlFilterAuftrag.SuspendLayout()
@@ -98,7 +98,7 @@ Partial Class usrcntlAuftraege
Me.PanTop.Location = New System.Drawing.Point(0, 0) Me.PanTop.Location = New System.Drawing.Point(0, 0)
Me.PanTop.Margin = New System.Windows.Forms.Padding(0) Me.PanTop.Margin = New System.Windows.Forms.Padding(0)
Me.PanTop.Name = "PanTop" 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 Me.PanTop.TabIndex = 3
' '
'PanOben 'PanOben
@@ -216,7 +216,7 @@ Partial Class usrcntlAuftraege
' '
Me.Panel1.BackColor = System.Drawing.Color.Transparent Me.Panel1.BackColor = System.Drawing.Color.Transparent
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right 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.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(234, 84) Me.Panel1.Size = New System.Drawing.Size(234, 84)
Me.Panel1.TabIndex = 0 Me.Panel1.TabIndex = 0
@@ -235,18 +235,33 @@ Partial Class usrcntlAuftraege
Me.PanButtons.Controls.Add(Me.lblMs) Me.PanButtons.Controls.Add(Me.lblMs)
Me.PanButtons.Controls.Add(Me.lblAnzahl) Me.PanButtons.Controls.Add(Me.lblAnzahl)
Me.PanButtons.Dock = System.Windows.Forms.DockStyle.Right 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.Name = "PanButtons"
Me.PanButtons.Size = New System.Drawing.Size(99, 711) Me.PanButtons.Size = New System.Drawing.Size(99, 743)
Me.PanButtons.TabIndex = 1 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 'btnTrip
' '
Me.btnTrip.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnTrip.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.btnTrip.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnTrip.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnTrip.Image = Global.DISPO.My.Resources.Resources.stift Me.btnTrip.Image = Global.DISPO.My.Resources.Resources.stift
Me.btnTrip.ImageAlign = System.Drawing.ContentAlignment.MiddleRight 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.Name = "btnTrip"
Me.btnTrip.Size = New System.Drawing.Size(91, 33) Me.btnTrip.Size = New System.Drawing.Size(91, 33)
Me.btnTrip.TabIndex = 35 Me.btnTrip.TabIndex = 35
@@ -259,7 +274,7 @@ Partial Class usrcntlAuftraege
Me.btnSuchStat.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnSuchStat.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.btnSuchStat.FlatStyle = System.Windows.Forms.FlatStyle.Flat 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.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.Name = "btnSuchStat"
Me.btnSuchStat.Size = New System.Drawing.Size(91, 46) Me.btnSuchStat.Size = New System.Drawing.Size(91, 46)
Me.btnSuchStat.TabIndex = 34 Me.btnSuchStat.TabIndex = 34
@@ -271,7 +286,7 @@ Partial Class usrcntlAuftraege
Me.btnSuchAuswertung.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnSuchAuswertung.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.btnSuchAuswertung.FlatStyle = System.Windows.Forms.FlatStyle.Flat 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.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.Name = "btnSuchAuswertung"
Me.btnSuchAuswertung.Size = New System.Drawing.Size(91, 46) Me.btnSuchAuswertung.Size = New System.Drawing.Size(91, 46)
Me.btnSuchAuswertung.TabIndex = 33 Me.btnSuchAuswertung.TabIndex = 33
@@ -283,7 +298,7 @@ Partial Class usrcntlAuftraege
Me.btnAuswertung.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnAuswertung.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.btnAuswertung.FlatStyle = System.Windows.Forms.FlatStyle.Flat 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.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.Name = "btnAuswertung"
Me.btnAuswertung.Size = New System.Drawing.Size(91, 23) Me.btnAuswertung.Size = New System.Drawing.Size(91, 23)
Me.btnAuswertung.TabIndex = 32 Me.btnAuswertung.TabIndex = 32
@@ -294,7 +309,7 @@ Partial Class usrcntlAuftraege
' '
Me.btnDuplicate.Anchor = System.Windows.Forms.AnchorStyles.Right Me.btnDuplicate.Anchor = System.Windows.Forms.AnchorStyles.Right
Me.btnDuplicate.FlatStyle = System.Windows.Forms.FlatStyle.Flat 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.Name = "btnDuplicate"
Me.btnDuplicate.Size = New System.Drawing.Size(91, 33) Me.btnDuplicate.Size = New System.Drawing.Size(91, 33)
Me.btnDuplicate.TabIndex = 26 Me.btnDuplicate.TabIndex = 26
@@ -307,7 +322,7 @@ Partial Class usrcntlAuftraege
Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnDel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnDel.Image = Global.DISPO.My.Resources.Resources.del Me.btnDel.Image = Global.DISPO.My.Resources.Resources.del
Me.btnDel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight 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.Name = "btnDel"
Me.btnDel.Size = New System.Drawing.Size(91, 33) Me.btnDel.Size = New System.Drawing.Size(91, 33)
Me.btnDel.TabIndex = 25 Me.btnDel.TabIndex = 25
@@ -321,7 +336,7 @@ Partial Class usrcntlAuftraege
Me.btnChange.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnChange.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnChange.Image = Global.DISPO.My.Resources.Resources.stift Me.btnChange.Image = Global.DISPO.My.Resources.Resources.stift
Me.btnChange.ImageAlign = System.Drawing.ContentAlignment.MiddleRight 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.Name = "btnChange"
Me.btnChange.Size = New System.Drawing.Size(91, 33) Me.btnChange.Size = New System.Drawing.Size(91, 33)
Me.btnChange.TabIndex = 24 Me.btnChange.TabIndex = 24
@@ -335,7 +350,7 @@ Partial Class usrcntlAuftraege
Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnNew.Image = Global.DISPO.My.Resources.Resources.plus Me.btnNew.Image = Global.DISPO.My.Resources.Resources.plus
Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleRight 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.Name = "btnNew"
Me.btnNew.Size = New System.Drawing.Size(91, 33) Me.btnNew.Size = New System.Drawing.Size(91, 33)
Me.btnNew.TabIndex = 23 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lblMs.AutoSize = True 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.Name = "lblMs"
Me.lblMs.Size = New System.Drawing.Size(47, 13) Me.lblMs.Size = New System.Drawing.Size(47, 13)
Me.lblMs.TabIndex = 2 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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lblAnzahl.AutoSize = True 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.Name = "lblAnzahl"
Me.lblAnzahl.Size = New System.Drawing.Size(39, 13) Me.lblAnzahl.Size = New System.Drawing.Size(39, 13)
Me.lblAnzahl.TabIndex = 1 Me.lblAnzahl.TabIndex = 1
@@ -367,15 +382,15 @@ Partial Class usrcntlAuftraege
' '
Me.dgvAuftraege.AllowUserToAddRows = False Me.dgvAuftraege.AllowUserToAddRows = False
Me.dgvAuftraege.AllowUserToDeleteRows = 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)) DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvAuftraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.dgvAuftraege.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.dgvAuftraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAuftraege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAuftraege.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvAuftraege.Dock = System.Windows.Forms.DockStyle.Fill
Me.dgvAuftraege.Location = New System.Drawing.Point(0, 0) Me.dgvAuftraege.Location = New System.Drawing.Point(0, 0)
Me.dgvAuftraege.Margin = New System.Windows.Forms.Padding(0) Me.dgvAuftraege.Margin = New System.Windows.Forms.Padding(0)
Me.dgvAuftraege.Name = "dgvAuftraege" Me.dgvAuftraege.Name = "dgvAuftraege"
Me.dgvAuftraege.ReadOnly = True 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 Me.dgvAuftraege.TabIndex = 0
' '
'txtAuftraggeber 'txtAuftraggeber
@@ -691,26 +706,11 @@ Partial Class usrcntlAuftraege
' '
Me.SplitContainer1.Panel2.BackColor = System.Drawing.Color.Transparent Me.SplitContainer1.Panel2.BackColor = System.Drawing.Color.Transparent
Me.SplitContainer1.Panel2.Controls.Add(Me.dgvAuftraege) 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.SplitterDistance = 175
Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.SplitterWidth = 1
Me.SplitContainer1.TabIndex = 2 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 'usrcntlAuftraege
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -723,7 +723,7 @@ Partial Class usrcntlAuftraege
Me.DoubleBuffered = True Me.DoubleBuffered = True
Me.MinimumSize = New System.Drawing.Size(1000, 750) Me.MinimumSize = New System.Drawing.Size(1000, 750)
Me.Name = "usrcntlAuftraege" Me.Name = "usrcntlAuftraege"
Me.Size = New System.Drawing.Size(1093, 795) Me.Size = New System.Drawing.Size(1279, 827)
Me.PanTop.ResumeLayout(False) Me.PanTop.ResumeLayout(False)
Me.PanOben.ResumeLayout(False) Me.PanOben.ResumeLayout(False)
Me.PanOben.PerformLayout() Me.PanOben.PerformLayout()

69
UID/frmMain/usrcntlAuftraege.vb
View File

@@ -142,7 +142,9 @@ atr_id
when atr_TransportAuftragArt is null then '-' when atr_TransportAuftragArt is null then '-'
when atr_AuftragsArt = 'Handling' then '-' when atr_AuftragsArt = 'Handling' then '-'
end as Transportunternehmen 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_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 ,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_abliefernachweis,atr_AuftragsArt,atr_FilialenNr
,atr_tripNr ,atr_tripNr
@@ -178,43 +180,51 @@ WHERE " & where & ""
.Columns(0).Visible = False .Columns(0).Visible = False
.Columns("atr_AuftragsArt").Visible = False .Columns("atr_AuftragsArt").Visible = False
.Columns(1).Width = 70 .Columns("atr_frachtpos").Width = 70
.Columns(1).HeaderText = "FrachtposNr." .Columns("atr_frachtpos").HeaderText = "FrachtposNr."
.Columns(2).Width = 70 .Columns("atr_datum").Width = 70
.Columns(2).HeaderText = "Datum" .Columns("atr_datum").HeaderText = "Datum"
.Columns(3).MinimumWidth = 165 .Columns("atr_auftr_firma").MinimumWidth = 165
.Columns(3).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("atr_auftr_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns(3).FillWeight = 150 .Columns("atr_auftr_firma").FillWeight = 150
.Columns(3).HeaderText = "Auftraggeber" .Columns("atr_auftr_firma").HeaderText = "Auftraggeber"
.Columns(4).MinimumWidth = 165 .Columns("atr_frachtf_firma").MinimumWidth = 165
.Columns(4).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("atr_frachtf_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns(4).FillWeight = 150 .Columns("atr_frachtf_firma").FillWeight = 150
.Columns(4).HeaderText = "Frachtführer Bis" .Columns("atr_frachtf_firma").HeaderText = "Frachtführer Bis"
.Columns("atr_frachtfAb_firma").MinimumWidth = 165 .Columns("atr_frachtfAb_firma").MinimumWidth = 165
.Columns("atr_frachtfAb_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("atr_frachtfAb_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("atr_frachtfAb_firma").HeaderText = "Frachtführer Ab" .Columns("atr_frachtfAb_firma").HeaderText = "Frachtführer Ab"
.Columns(6).MinimumWidth = 165 .Columns("Transportunternehmen").MinimumWidth = 165
.Columns(6).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Transportunternehmen").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns(6).HeaderText = "Transportunternehmen" .Columns("Transportunternehmen").HeaderText = "Transportunternehmen"
.Columns(7).MinimumWidth = 165 .Columns("atr_ladest_plz").HeaderText = "Lad PLZ"
.Columns(7).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("atr_ladest_plz").Width = 45
.Columns(7).HeaderText = "Ladestelle/Absender" .Columns("atr_ladest_plz").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns(8).MinimumWidth = 165 .Columns("atr_ladest_firma").MinimumWidth = 165
.Columns(8).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("atr_ladest_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns(8).HeaderText = "Entladest./Empfänger" .Columns("atr_ladest_firma").HeaderText = "Ladestelle/Absender"
.Columns(9).Width = 60 .Columns("atr_entladest_plz").HeaderText = "Ent PLZ"
.Columns(9).HeaderText = "Abl.Nachw." .Columns("atr_entladest_plz").Width = 45
.Columns(9).ReadOnly = False .Columns("atr_entladest_plz").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
.Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.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").Width = 60
.Columns("atr_FilialenNr").HeaderText = "Filiale" .Columns("atr_FilialenNr").HeaderText = "Filiale"
@@ -293,6 +303,8 @@ WHERE " & where & ""
OR OR
(atr_absender_firma Like '%" & txtLadestelle.Text.Replace("'", "") & "%') (atr_absender_firma Like '%" & txtLadestelle.Text.Replace("'", "") & "%')
OR OR
(atr_ladest_plz Like '%" & txtLadestelle.Text.Replace("'", "") & "%')
OR
(VERAG.dbo.Speditionsbuch.Absender Like '%" & txtLadestelle.Text.Replace("'", "") & "%'))" (VERAG.dbo.Speditionsbuch.Absender Like '%" & txtLadestelle.Text.Replace("'", "") & "%'))"
End If End If
@@ -302,6 +314,8 @@ WHERE " & where & ""
OR OR
(atr_empfaenger_firma Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%') (atr_empfaenger_firma Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%')
OR OR
(atr_entladest_plz Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%')
OR
(VERAG.dbo.Speditionsbuch.Empfänger Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%'))" (VERAG.dbo.Speditionsbuch.Empfänger Like '%" & txtEntladeStelle.Text.Replace("'", "") & "%'))"
End If 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?") Select Case MsgBox("Soll der Eintrag wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?")
Case vbYes Case vbYes
DISPO.delAuftrag(Convert.ToInt32(dgvAuftraege.CurrentRow.Cells(0).Value)) DISPO.delAuftrag(Convert.ToInt32(dgvAuftraege.SelectedRows.Item(0).Cells(0).Value))
'Tabelle_anzeigen() 'Tabelle_anzeigen()
showDGVAuftraege() showDGVAuftraege()
Case vbNo Case vbNo
@@ -522,7 +536,8 @@ WHERE " & where & ""
Private Sub btnDuplicate_Click(sender As Object, e As EventArgs) Handles btnDuplicate.Click Private Sub btnDuplicate_Click(sender As Object, e As EventArgs) Handles btnDuplicate.Click
Try 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_id = -1
AUFTRAG.atr_datum = Now AUFTRAG.atr_datum = Now
AUFTRAG.atr_frachtpos = Nothing AUFTRAG.atr_frachtpos = Nothing

16
UID/frmMain/usrcntlFirmen.vb
View File

@@ -24,8 +24,22 @@ Public Class usrcntlFirmen
cboRolle.Items.Add(New MyListItem("Entladestelle", "3")) cboRolle.Items.Add(New MyListItem("Entladestelle", "3"))
cboRolle.Items.Add(New MyListItem("Frachtführer", "4")) cboRolle.Items.Add(New MyListItem("Frachtführer", "4"))
cboRolle.Items.Add(New MyListItem("Transportunternehmen", "5")) cboRolle.Items.Add(New MyListItem("Transportunternehmen", "5"))
FillcboLandWithLaender()
showDGVKunden() 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 End Sub
Private Sub initDGVKunden(bindingString As String) Private Sub initDGVKunden(bindingString As String)