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

1.0.9.0

Browse Source
This commit is contained in:
ms
2019-08-14 09:53:04 +02:00
parent b626b931ab
commit 41a24b77fc
8 changed files with 104 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,7 +415,7 @@ Namespace My.Resources
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 1.0.8.9 ähnelt.
''' Sucht eine lokalisierte Zeichenfolge, die 1.0.9.0 ähnelt.
'''</summary>
Friend ReadOnly Property Version() As String
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>
</data>
<data name="Version" xml:space="preserve">
<value>1.0.8.9</value>
<value>1.0.9.0</value>
</data>
<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>

12
UID/cDispoAuftraege.vb
View File

@@ -519,11 +519,23 @@ Public Class cDispoAuftraege
End Using
End Using
LoadOeffnungszeiten()
LoadEntUNDLadeStelle()
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
End Sub
Public Sub LoadEntUNDLadeStelle()
Dim usrcntlEntladestelle As New DISPO.usrcntlAdresse
usrcntlEntladestelle.setByID(Me.atr_entladest_id)
Me.avisoentlade = DISPO.getAvisoFromKundeByIds(usrcntlEntladestelle.BET_ID)
Dim usrcntlLadestelle As New DISPO.usrcntlAdresse
usrcntlLadestelle.setByID(Me.atr_ladest_id)
Me.avisolade = DISPO.getAvisoFromKundeByIds(usrcntlLadestelle.BET_ID)
End Sub
Public Sub LOAD_BHRG()
Try

70
UID/frmAuftragNEU.Designer.vb generated
View File

@@ -85,6 +85,7 @@ Partial Class frmAuftragNEU
Me.dgvLadungen = New System.Windows.Forms.DataGridView()
Me.Label18 = New System.Windows.Forms.Label()
Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.btnRemoveFromTrip = New System.Windows.Forms.Button()
Me.btnAddToTrip = New System.Windows.Forms.Button()
Me.btnShowTrip = New System.Windows.Forms.Button()
Me.lblTrip = New System.Windows.Forms.Label()
@@ -209,7 +210,6 @@ Partial Class frmAuftragNEU
Me.DataGridViewTextBoxColumn11 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.cboTransportauftragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtFrachtpos = New DISPO.MyTextBox(Me.components)
Me.btnRemoveFromTrip = New System.Windows.Forms.Button()
Me.grpNew.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -373,7 +373,7 @@ Partial Class frmAuftragNEU
Me.btnCancel.Location = New System.Drawing.Point(218, 713)
Me.btnCancel.Name = "btnCancel"
Me.btnCancel.Size = New System.Drawing.Size(88, 36)
Me.btnCancel.TabIndex = 16
Me.btnCancel.TabIndex = 25
Me.btnCancel.Text = "Abbrechen"
Me.btnCancel.UseVisualStyleBackColor = True
'
@@ -383,7 +383,7 @@ Partial Class frmAuftragNEU
Me.btnOK.Location = New System.Drawing.Point(124, 713)
Me.btnOK.Name = "btnOK"
Me.btnOK.Size = New System.Drawing.Size(88, 36)
Me.btnOK.TabIndex = 15
Me.btnOK.TabIndex = 24
Me.btnOK.Text = "OK"
Me.btnOK.UseVisualStyleBackColor = True
'
@@ -393,7 +393,7 @@ Partial Class frmAuftragNEU
Me.btnSave.Location = New System.Drawing.Point(8, 713)
Me.btnSave.Name = "btnSave"
Me.btnSave.Size = New System.Drawing.Size(88, 36)
Me.btnSave.TabIndex = 14
Me.btnSave.TabIndex = 23
Me.btnSave.Text = "Speichern"
Me.btnSave.UseVisualStyleBackColor = True
'
@@ -471,7 +471,7 @@ Partial Class frmAuftragNEU
Me.Button3.Location = New System.Drawing.Point(967, 426)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(73, 35)
Me.Button3.TabIndex = 577
Me.Button3.TabIndex = 15
Me.Button3.Text = " BAR"
Me.Button3.UseVisualStyleBackColor = True
'
@@ -484,7 +484,7 @@ Partial Class frmAuftragNEU
Me.Button2.Location = New System.Drawing.Point(406, 426)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(73, 35)
Me.Button2.TabIndex = 576
Me.Button2.TabIndex = 6
Me.Button2.Text = " BAR"
Me.Button2.UseVisualStyleBackColor = True
'
@@ -533,7 +533,7 @@ Partial Class frmAuftragNEU
Me.txtBeladung.MaxLines_Warning_Label = Nothing
Me.txtBeladung.Name = "txtBeladung"
Me.txtBeladung.Size = New System.Drawing.Size(106, 20)
Me.txtBeladung.TabIndex = 34
Me.txtBeladung.TabIndex = 21
'
'txtEntladung
'
@@ -554,7 +554,7 @@ Partial Class frmAuftragNEU
Me.txtEntladung.MaxLines_Warning_Label = Nothing
Me.txtEntladung.Name = "txtEntladung"
Me.txtEntladung.Size = New System.Drawing.Size(106, 20)
Me.txtEntladung.TabIndex = 30
Me.txtEntladung.TabIndex = 12
'
'usrcntlAuftraggeber
'
@@ -607,7 +607,7 @@ Partial Class frmAuftragNEU
Me.txtFrachtfAb_tatKosten.MaxLines_Warning_Label = Nothing
Me.txtFrachtfAb_tatKosten.Name = "txtFrachtfAb_tatKosten"
Me.txtFrachtfAb_tatKosten.Size = New System.Drawing.Size(130, 20)
Me.txtFrachtfAb_tatKosten.TabIndex = 36
Me.txtFrachtfAb_tatKosten.TabIndex = 22
'
'txtFrachtf_tatKosten
'
@@ -627,7 +627,7 @@ Partial Class frmAuftragNEU
Me.txtFrachtf_tatKosten.MaxLines_Warning_Label = Nothing
Me.txtFrachtf_tatKosten.Name = "txtFrachtf_tatKosten"
Me.txtFrachtf_tatKosten.Size = New System.Drawing.Size(130, 20)
Me.txtFrachtf_tatKosten.TabIndex = 33
Me.txtFrachtf_tatKosten.TabIndex = 13
'
'Label97
'
@@ -672,7 +672,7 @@ Partial Class frmAuftragNEU
Me.Button12.Location = New System.Drawing.Point(671, 325)
Me.Button12.Name = "Button12"
Me.Button12.Size = New System.Drawing.Size(94, 22)
Me.Button12.TabIndex = 8
Me.Button12.TabIndex = 500
Me.Button12.Text = "VERAG SUB"
Me.Button12.UseVisualStyleBackColor = True
'
@@ -683,7 +683,7 @@ Partial Class frmAuftragNEU
Me.Button11.Location = New System.Drawing.Point(110, 325)
Me.Button11.Name = "Button11"
Me.Button11.Size = New System.Drawing.Size(94, 22)
Me.Button11.TabIndex = 6
Me.Button11.TabIndex = 500
Me.Button11.Text = "VERAG SUB"
Me.Button11.UseVisualStyleBackColor = True
'
@@ -719,14 +719,14 @@ Partial Class frmAuftragNEU
Me.txtFrachtfAb_AnhNutzlast.Location = New System.Drawing.Point(774, 487)
Me.txtFrachtfAb_AnhNutzlast.Name = "txtFrachtfAb_AnhNutzlast"
Me.txtFrachtfAb_AnhNutzlast.Size = New System.Drawing.Size(135, 20)
Me.txtFrachtfAb_AnhNutzlast.TabIndex = 28
Me.txtFrachtfAb_AnhNutzlast.TabIndex = 20
'
'txtFrachtfAb_AnhKz
'
Me.txtFrachtfAb_AnhKz.Location = New System.Drawing.Point(669, 487)
Me.txtFrachtfAb_AnhKz.Name = "txtFrachtfAb_AnhKz"
Me.txtFrachtfAb_AnhKz.Size = New System.Drawing.Size(106, 20)
Me.txtFrachtfAb_AnhKz.TabIndex = 27
Me.txtFrachtfAb_AnhKz.TabIndex = 19
'
'Label78
'
@@ -742,21 +742,21 @@ Partial Class frmAuftragNEU
Me.txtFrachtfAb_LkwArt.Location = New System.Drawing.Point(908, 468)
Me.txtFrachtfAb_LkwArt.Name = "txtFrachtfAb_LkwArt"
Me.txtFrachtfAb_LkwArt.Size = New System.Drawing.Size(132, 20)
Me.txtFrachtfAb_LkwArt.TabIndex = 22
Me.txtFrachtfAb_LkwArt.TabIndex = 18
'
'txtFrachtfAb_LkwNutzlast
'
Me.txtFrachtfAb_LkwNutzlast.Location = New System.Drawing.Point(774, 468)
Me.txtFrachtfAb_LkwNutzlast.Name = "txtFrachtfAb_LkwNutzlast"
Me.txtFrachtfAb_LkwNutzlast.Size = New System.Drawing.Size(135, 20)
Me.txtFrachtfAb_LkwNutzlast.TabIndex = 21
Me.txtFrachtfAb_LkwNutzlast.TabIndex = 17
'
'txtFrachtfAb_LkwKr
'
Me.txtFrachtfAb_LkwKr.Location = New System.Drawing.Point(669, 468)
Me.txtFrachtfAb_LkwKr.Name = "txtFrachtfAb_LkwKr"
Me.txtFrachtfAb_LkwKr.Size = New System.Drawing.Size(106, 20)
Me.txtFrachtfAb_LkwKr.TabIndex = 20
Me.txtFrachtfAb_LkwKr.TabIndex = 16
'
'Label83
'
@@ -800,14 +800,14 @@ Partial Class frmAuftragNEU
Me.txtAnhNutzlast.Location = New System.Drawing.Point(215, 486)
Me.txtAnhNutzlast.Name = "txtAnhNutzlast"
Me.txtAnhNutzlast.Size = New System.Drawing.Size(135, 20)
Me.txtAnhNutzlast.TabIndex = 25
Me.txtAnhNutzlast.TabIndex = 11
'
'txtAnhKz
'
Me.txtAnhKz.Location = New System.Drawing.Point(110, 486)
Me.txtAnhKz.Name = "txtAnhKz"
Me.txtAnhKz.Size = New System.Drawing.Size(106, 20)
Me.txtAnhKz.TabIndex = 24
Me.txtAnhKz.TabIndex = 10
'
'Label32
'
@@ -823,21 +823,21 @@ Partial Class frmAuftragNEU
Me.txtLkwArt.Location = New System.Drawing.Point(349, 467)
Me.txtLkwArt.Name = "txtLkwArt"
Me.txtLkwArt.Size = New System.Drawing.Size(130, 20)
Me.txtLkwArt.TabIndex = 18
Me.txtLkwArt.TabIndex = 9
'
'txtLkwNutzlast
'
Me.txtLkwNutzlast.Location = New System.Drawing.Point(215, 467)
Me.txtLkwNutzlast.Name = "txtLkwNutzlast"
Me.txtLkwNutzlast.Size = New System.Drawing.Size(135, 20)
Me.txtLkwNutzlast.TabIndex = 17
Me.txtLkwNutzlast.TabIndex = 8
'
'txtLkwKz
'
Me.txtLkwKz.Location = New System.Drawing.Point(110, 467)
Me.txtLkwKz.Name = "txtLkwKz"
Me.txtLkwKz.Size = New System.Drawing.Size(106, 20)
Me.txtLkwKz.TabIndex = 16
Me.txtLkwKz.TabIndex = 7
'
'Label34
'
@@ -869,7 +869,7 @@ Partial Class frmAuftragNEU
Me.usrCntlFrachtfAb.Location = New System.Drawing.Point(564, 317)
Me.usrCntlFrachtfAb.Name = "usrCntlFrachtfAb"
Me.usrCntlFrachtfAb.Size = New System.Drawing.Size(482, 129)
Me.usrCntlFrachtfAb.TabIndex = 7
Me.usrCntlFrachtfAb.TabIndex = 14
'
'Ladung
'
@@ -953,6 +953,17 @@ Partial Class frmAuftragNEU
Me.TabPage3.TabIndex = 3
Me.TabPage3.Text = "Transportauftrag"
'
'btnRemoveFromTrip
'
Me.btnRemoveFromTrip.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnRemoveFromTrip.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnRemoveFromTrip.Location = New System.Drawing.Point(482, 325)
Me.btnRemoveFromTrip.Name = "btnRemoveFromTrip"
Me.btnRemoveFromTrip.Size = New System.Drawing.Size(88, 36)
Me.btnRemoveFromTrip.TabIndex = 581
Me.btnRemoveFromTrip.Text = "von Trip entfernen"
Me.btnRemoveFromTrip.UseVisualStyleBackColor = True
'
'btnAddToTrip
'
Me.btnAddToTrip.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2035,7 +2046,7 @@ Partial Class frmAuftragNEU
Me.btnFrachtkostenrechner.Location = New System.Drawing.Point(943, 713)
Me.btnFrachtkostenrechner.Name = "btnFrachtkostenrechner"
Me.btnFrachtkostenrechner.Size = New System.Drawing.Size(126, 36)
Me.btnFrachtkostenrechner.TabIndex = 17
Me.btnFrachtkostenrechner.TabIndex = 26
Me.btnFrachtkostenrechner.Text = "Frachtkostenrechner"
Me.btnFrachtkostenrechner.UseVisualStyleBackColor = True
'
@@ -2181,17 +2192,6 @@ Partial Class frmAuftragNEU
Me.txtFrachtpos.Size = New System.Drawing.Size(129, 23)
Me.txtFrachtpos.TabIndex = 18
'
'btnRemoveFromTrip
'
Me.btnRemoveFromTrip.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnRemoveFromTrip.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnRemoveFromTrip.Location = New System.Drawing.Point(482, 325)
Me.btnRemoveFromTrip.Name = "btnRemoveFromTrip"
Me.btnRemoveFromTrip.Size = New System.Drawing.Size(88, 36)
Me.btnRemoveFromTrip.TabIndex = 581
Me.btnRemoveFromTrip.Text = "von Trip entfernen"
Me.btnRemoveFromTrip.UseVisualStyleBackColor = True
'
'frmAuftragNEU
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

12
UID/frmAuftragNEU.resx
View File

@@ -224,6 +224,18 @@
<metadata name="DataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="DataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="btnBuchh2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAACQpJREFUaEPl

2
UID/frmAuftragNEU.vb
View File

@@ -2220,7 +2220,7 @@ Public Class frmAuftragNEU
Dim frmSecureLoginKassenbuch As New SDL.frmSecureLoginKassenbuch
If frmSecureLoginKassenbuch.ShowDialog(Me) = Windows.Forms.DialogResult.OK Then
PERSONAL = frmSecureLoginKassenbuch.PERSONAL
Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, "E")
Dim frmBeleg As New SDL.frmBelegNeu(PERSONAL, Nothing, "E")
' frmBeleg.AvisoID = AvisoId
frmBeleg.SendungID = Nothing

1
UID/frmLogin.Designer.vb generated
View File

@@ -223,6 +223,7 @@ Partial Class frmLogin
Me.Controls.Add(Me.Panel1)
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.KeyPreview = True
Me.Name = "frmLogin"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Login"

45
UID/frmLogin.vb
View File

@@ -34,10 +34,10 @@
End Sub
Private Sub frmLogin_Load(sender As Object, e As EventArgs) Handles Me.Load
If sAppPath Like "*\bin\Debug" Then
txtUser.Text = "sebastian"
txtPwd.Text = "verag#3"
End If
'If sAppPath Like "*\bin\Debug" Then
' txtUser.Text = "sebastian"
' txtPwd.Text = "verag#3"
'End If
If TESTSYSTEM Then lblTestsystem.Visible = True
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = TESTSYSTEM
'Dim tmp As String
@@ -87,5 +87,42 @@
Private Sub txtUser_TextChanged(sender As Object, e As EventArgs) Handles txtUser.TextChanged
End Sub
Private Sub frmLogin_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
If e.Modifiers = Keys.Control And e.KeyCode = Keys.T Then
' MsgBox(Environment.MachineName)
TESTSYSTEM = Not TESTSYSTEM
initstart()
If Environment.MachineName = "YLPS023046" Then
txtUser.Text = "ADMIN"
txtPwd.Text = "verag#2"
ElseIf Environment.MachineName = "NBMIESENBECK" Then
txtUser.Text = "sebastian"
txtPwd.Text = "verag#3"
End If
End If
End Sub
Sub initstart()
'DEV FMZOLL
If TESTSYSTEM Then
' cGlobal.ConnStrFMZOLL = VERAG_PROG_ALLGEMEIN.My.MySettings.Default.FMZOLLConnectionString
lblTestsystem.Visible = True
Else
lblTestsystem.Visible = False
End If
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = TESTSYSTEM
' txtSachbear.Text = ""
'txtKennwort.Text = ""
txtUser.Text = SystemInformation.UserName
txtUser.Focus()
End Sub
End Class