Bugfixes, Anzeige Packstücke und Gewicht, More Speeeeeeeed
This commit is contained in:
2
UID/My Project/Resources.Designer.vb
generated
2
UID/My Project/Resources.Designer.vb
generated
@@ -434,7 +434,7 @@ Namespace My.Resources
|
|||||||
End Property
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Zeichenfolge, die 1.0.10.5 ähnelt.
|
''' Sucht eine lokalisierte Zeichenfolge, die 1.0.10.8 ähnelt.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
Friend ReadOnly Property Version() As String
|
Friend ReadOnly Property Version() As String
|
||||||
Get
|
Get
|
||||||
|
|||||||
@@ -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.5</value>
|
<value>1.0.10.8</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>
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ where "
|
|||||||
Public Shared von, bis As Date
|
Public Shared von, bis As Date
|
||||||
Property CustomButtons As String = ""
|
Property CustomButtons As String = ""
|
||||||
Property Trip As cTrips = Nothing
|
Property Trip As cTrips = Nothing
|
||||||
|
Property Loaded As Boolean = False
|
||||||
|
|
||||||
|
|
||||||
Private Sub usrcntlAuftraege_Load(sender As Object, e As EventArgs) Handles Me.Load
|
Private Sub usrcntlAuftraege_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||||
@@ -98,6 +99,7 @@ where "
|
|||||||
|
|
||||||
If Not Me.CustomButtons = "" Then DoCustomButtons()
|
If Not Me.CustomButtons = "" Then DoCustomButtons()
|
||||||
|
|
||||||
|
Loaded = True
|
||||||
showDGVAuftraege()
|
showDGVAuftraege()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -161,10 +163,13 @@ end as Transportunternehmen
|
|||||||
,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_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
|
||||||
|
,lad_anzahl as Pkg
|
||||||
|
,lad_BruttoKg as BruttoGew
|
||||||
,atr_abliefernachweis,atr_AuftragsArt,atr_FilialenNr
|
,atr_abliefernachweis,atr_AuftragsArt,atr_FilialenNr
|
||||||
,atr_tripNr
|
,atr_tripNr
|
||||||
FROM (" & DispoDBO & " as dispoauftraege
|
FROM (" & DispoDBO & " as dispoauftraege
|
||||||
left join VERAG.dbo.Speditionsbuch on atr_speditionsbuchNr = Speditionsbuch.FilialenNr AND atr_frachtpos = Speditionsbuch.AbfertigungsNr)
|
left join VERAG.dbo.Speditionsbuch on atr_speditionsbuchNr = Speditionsbuch.FilialenNr AND atr_frachtpos = Speditionsbuch.AbfertigungsNr)
|
||||||
|
left join [sqlguide01.verag.ost.dmn].[DISPO].[dbo].[tblLadungen] on atr_id = [tblLadungen].lad_atrid
|
||||||
--left join VERAG.dbo.Rechnungsausgang on atr_speditionsbuchNr = Rechnungsausgang.FilialenNr AND atr_frachtpos = Rechnungsausgang.AbfertigungsNr)
|
--left join VERAG.dbo.Rechnungsausgang on atr_speditionsbuchNr = Rechnungsausgang.FilialenNr AND atr_frachtpos = Rechnungsausgang.AbfertigungsNr)
|
||||||
--left join VERAG.dbo.Vorkosten on atr_speditionsbuchNr = Vorkosten.FilialenNr AND atr_frachtpos = Vorkosten.AbfertigungsNr)
|
--left join VERAG.dbo.Vorkosten on atr_speditionsbuchNr = Vorkosten.FilialenNr AND atr_frachtpos = Vorkosten.AbfertigungsNr)
|
||||||
WHERE " & where & ""
|
WHERE " & where & ""
|
||||||
@@ -236,6 +241,11 @@ WHERE " & where & ""
|
|||||||
.Columns("atr_entladest_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
.Columns("atr_entladest_firma").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||||
.Columns("atr_entladest_firma").HeaderText = "Entladest./Empfänger"
|
.Columns("atr_entladest_firma").HeaderText = "Entladest./Empfänger"
|
||||||
|
|
||||||
|
.Columns("Pkg").Width = 40
|
||||||
|
.Columns("Pkg").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||||
|
|
||||||
|
.Columns("BruttoGew").Width = 65
|
||||||
|
|
||||||
.Columns("atr_abliefernachweis").Width = 60
|
.Columns("atr_abliefernachweis").Width = 60
|
||||||
.Columns("atr_abliefernachweis").HeaderText = "Abl.Nachw."
|
.Columns("atr_abliefernachweis").HeaderText = "Abl.Nachw."
|
||||||
.Columns("atr_abliefernachweis").ReadOnly = False
|
.Columns("atr_abliefernachweis").ReadOnly = False
|
||||||
@@ -386,7 +396,7 @@ WHERE " & where & ""
|
|||||||
|
|
||||||
|
|
||||||
Private Sub DateVONorBIS_ValueChanged(sender As Object, e As EventArgs) Handles DateVON.ValueChanged, DateBIS.ValueChanged
|
Private Sub DateVONorBIS_ValueChanged(sender As Object, e As EventArgs) Handles DateVON.ValueChanged, DateBIS.ValueChanged
|
||||||
showDGVAuftraege()
|
If Loaded = True Then showDGVAuftraege()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub btnDetailSuche_Click(sender As Object, e As EventArgs) Handles btnDetailSuche.Click
|
Private Sub btnDetailSuche_Click(sender As Object, e As EventArgs) Handles btnDetailSuche.Click
|
||||||
@@ -472,7 +482,7 @@ WHERE " & where & ""
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub cboAuftragsart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAuftragsart.SelectedIndexChanged, cboFiliale.SelectedIndexChanged, cbxAbliefer.CheckedChanged, txtSuche.TextChanged, txtAuftraggeber.TextChanged, txtFrachtfuehrerBis.TextChanged, txtFrachtfuehrerAb.TextChanged, txtTransportunternehmen.TextChanged, txtLadestelle.TextChanged, txtEntladeStelle.TextChanged
|
Private Sub cboAuftragsart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAuftragsart.SelectedIndexChanged, cboFiliale.SelectedIndexChanged, cbxAbliefer.CheckedChanged, txtSuche.TextChanged, txtAuftraggeber.TextChanged, txtFrachtfuehrerBis.TextChanged, txtFrachtfuehrerAb.TextChanged, txtTransportunternehmen.TextChanged, txtLadestelle.TextChanged, txtEntladeStelle.TextChanged
|
||||||
showDGVAuftraege()
|
If Loaded = True Then showDGVAuftraege()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub btnReset_Click(sender As Object, e As EventArgs) Handles btnReset.Click
|
Private Sub btnReset_Click(sender As Object, e As EventArgs) Handles btnReset.Click
|
||||||
|
|||||||
Reference in New Issue
Block a user