Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -117,4 +117,16 @@
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<metadata name="pos.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="leistung.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="stk.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
<metadata name="preis.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
</root>
|
||||
@@ -137,14 +137,14 @@
|
||||
|
||||
Private Sub usrCntlZollbeschau_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
Label16.Text = Rolle.ToString
|
||||
txtTimeZoll1.Text = "00:00"
|
||||
txtTimeZoll2.Text = "00:00"
|
||||
txtTimeZoll1.Enabled = False
|
||||
txtTimeZoll2.Enabled = False
|
||||
txtDurationZoll1.Enabled = False
|
||||
txtDurationZoll2.Enabled = False
|
||||
initControlsHandler()
|
||||
txtAnsprechpartnerVERAG.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
|
||||
txtBeschauDat.Text = Date.Today.ToString("dd.MM.yyyy")
|
||||
txtVZDatum.Text = Date.Today.ToString("dd.MM.yyyy")
|
||||
loadDGV()
|
||||
calcPreis()
|
||||
|
||||
If IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl) Then
|
||||
txtDW.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_durchwahl
|
||||
@@ -158,8 +158,6 @@
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
|
||||
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
|
||||
If KdNR > 0 Then
|
||||
Dim f As New frmKundenUebersichtZOLL(KdNR)
|
||||
@@ -170,20 +168,11 @@
|
||||
|
||||
Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged
|
||||
txtZoll1Date._value = CDate(sender.value).ToShortDateString
|
||||
If txtZoll1Date._value <> "" Then
|
||||
txtTimeZoll1.Enabled = True
|
||||
Else
|
||||
txtTimeZoll1.Enabled = False
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker2.ValueChanged
|
||||
txtZoll2Date._value = CDate(sender.value).ToShortDateString
|
||||
If txtZoll2Date._value <> "" Then
|
||||
txtTimeZoll2.Enabled = True
|
||||
Else
|
||||
txtTimeZoll2.Enabled = False
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub dtpBeschauDat_ValueChanged(sender As Object, e As EventArgs) Handles dtpBeschauDat.ValueChanged
|
||||
@@ -195,4 +184,77 @@
|
||||
Private Sub DateTimePicker3_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker3.ValueChanged
|
||||
txtVZDatum._value = CDate(sender.value).ToShortDateString
|
||||
End Sub
|
||||
|
||||
Private Sub txtZoll1Date_ValueChanged() Handles txtZoll1Date.ValueChanged
|
||||
If txtZoll1Date._value <> "" Then
|
||||
txtDurationZoll1.Enabled = True
|
||||
txtTimeZoll1.Enabled = True
|
||||
If txtTimeZoll1.Text = "" Then txtTimeZoll1.Text = Date.Now.ToString("HH:mm")
|
||||
If txtDurationZoll1.Text = "" Then txtDurationZoll1.Text = "00:00"
|
||||
Else
|
||||
txtDurationZoll1.Enabled = False
|
||||
txtTimeZoll1.Enabled = False
|
||||
txtTimeZoll1.Text = ""
|
||||
txtDurationZoll1.Text = ""
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub txtZoll2Date_ValueChanged() Handles txtZoll2Date.ValueChanged
|
||||
If txtZoll2Date._value <> "" Then
|
||||
txtDurationZoll2.Enabled = True
|
||||
txtTimeZoll2.Enabled = True
|
||||
If txtTimeZoll2.Text = "" Then txtTimeZoll2.Text = Date.Now.ToString("HH:mm")
|
||||
If txtDurationZoll2.Text = "" Then txtDurationZoll2.Text = "00:00"
|
||||
Else
|
||||
|
||||
txtDurationZoll2.Enabled = False
|
||||
txtTimeZoll2.Enabled = False
|
||||
txtTimeZoll2.Text = ""
|
||||
txtDurationZoll2.Text = ""
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub loadDGV()
|
||||
|
||||
dgvPositionen.Rows.Add(1, "Vorbereitung Waren zum Zollbeschau durch Ambar", 1, 60)
|
||||
dgvPositionen.Rows.Add(2, "Mehraufwandskosten")
|
||||
dgvPositionen.Rows.Add(3, "Lagereingang (Mindessatz 30€); (pro Palette 10€)")
|
||||
dgvPositionen.Rows.Add(4, "Lagerung pro KW 10€/Palette; KW: ")
|
||||
dgvPositionen.Rows.Add(5, "Lagerausgang (pro Palette 10€) ")
|
||||
dgvPositionen.Rows.Add(6, "Verpackungsmaterial je nach Bedarf (Kartonagen, Klebeband, Wickelfolie, Paletten)")
|
||||
dgvPositionen.Rows.Add(7, "Händische Abladung (mind-satz. 80€, Stundenpau. bei 2 Person. 50€ pro Stunde/Person, gilt bei Lose-/Kartonwaren ohne Palettierung ")
|
||||
dgvPositionen.Rows.Add(8, "Samstagzuschlag/Spätzuschlag ab 17 Uhr (Mindestsatz 30€)")
|
||||
dgvPositionen.Rows.Add(9, "Bürgschaftskosten Verwahrlager 1% vom Warenwert")
|
||||
|
||||
End Sub
|
||||
|
||||
Private Function calcPreis() As Double
|
||||
|
||||
Dim gesamtpreis As Double = 0
|
||||
|
||||
For Each r As DataGridViewRow In dgvPositionen.Rows
|
||||
If (IsNumeric(r.Cells(2).Value) AndAlso IsNumeric(r.Cells(3).Value)) Then
|
||||
gesamtpreis += r.Cells(2).Value * r.Cells(3).Value
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
lblgesamtpreis.Text = "Gesamtpreis: " & gesamtpreis & " €"
|
||||
Return gesamtpreis
|
||||
|
||||
|
||||
End Function
|
||||
|
||||
Private Sub dgvPositionen_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dgvPositionen.CellValueChanged
|
||||
|
||||
If e.ColumnIndex = 3 Or e.ColumnIndex = 2 Then
|
||||
calcPreis()
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub dgvPositionen_DefaultValuesNeeded(sender As Object, e As DataGridViewRowEventArgs) Handles dgvPositionen.DefaultValuesNeeded
|
||||
|
||||
e.Row.Cells("pos").Value = dgvPositionen.Rows.Count
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
@@ -3588,12 +3588,13 @@ Public Class FormularManagerNEU
|
||||
|
||||
Dim listTowrite As New List(Of VERAG_PROG_ALLGEMEIN.cPDFWriteValues)
|
||||
Dim top = 3
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnsprechpartnerVERAG.Text, 145, 47 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFilialNr.Text & "/" & usrCntl.txtAbfNr.Text, 40, 47 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtT1.Text, 145, 52 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtATB.Text, 145, 57 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtATC.Text, 145, 62 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVZDatum.Text, 120, 72 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtVZDatum.Text, 145, 72 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtZollagent.Text, 40, 82 + top, 55, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFrächter.Text, 40, 88 + top, 55, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
@@ -3602,23 +3603,57 @@ Public Class FormularManagerNEU
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtZollb2.Text, 40, 103 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtBeschauDat.Text, 141, 82 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtBeschauDat.Text, 135, 82 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLKWKennz.Text, 135, 88 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 135, 93 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll1Date.Text <> "", usrCntl.txtZoll1Date.Text & " " & usrCntl.txtTimeZoll1.Text, ""), 135, 97 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll2Date.Text <> "", usrCntl.txtZoll2Date.Text & " " & usrCntl.txtTimeZoll2.Text, ""), 135, 102 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
Dim newTimeZoll1 As DateTime
|
||||
If usrCntl.txtDurationZoll1.Text <> "" Then
|
||||
newTimeZoll1 = DateTime.ParseExact(usrCntl.txtTimeZoll1.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
|
||||
Dim newDuration As DateTime
|
||||
newDuration = DateTime.ParseExact(usrCntl.txtDurationZoll1.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
|
||||
newTimeZoll1 = newTimeZoll1.AddHours(newDuration.ToString("HH"))
|
||||
newTimeZoll1 = newTimeZoll1.AddMinutes(newDuration.ToString("mm"))
|
||||
End If
|
||||
|
||||
Dim newTimeZoll2 As DateTime
|
||||
If usrCntl.txtDurationZoll2.Text <> "" Then
|
||||
newTimeZoll2 = DateTime.ParseExact(usrCntl.txtTimeZoll2.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
|
||||
Dim newDuration As DateTime
|
||||
newDuration = DateTime.ParseExact(usrCntl.txtDurationZoll2.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
|
||||
newTimeZoll2 = newTimeZoll2.AddHours(newDuration.ToString("HH"))
|
||||
newTimeZoll2 = newTimeZoll2.AddMinutes(newDuration.ToString("mm"))
|
||||
End If
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll1Date.Text <> "", usrCntl.txtZoll1Date.Text & " ", "") & IIf(usrCntl.txtTimeZoll1.Text <> "" AndAlso usrCntl.txtDurationZoll1.Text <> "", usrCntl.txtTimeZoll1.Text & " - " & newTimeZoll1.ToString("HH:mm"), ""), 135, 98 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(IIf(usrCntl.txtZoll1Date.Text <> "", usrCntl.txtZoll2Date.Text & " ", "") & IIf(usrCntl.txtTimeZoll2.Text <> "" AndAlso usrCntl.txtDurationZoll2.Text <> "", usrCntl.txtTimeZoll2.Text & " - " & newTimeZoll2.ToString("HH:mm"), ""), 135, 103 + top, 135, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtInfo.Text, 16, 120 + top, 135, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
|
||||
'Sendungsdaten
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnzVerp.Text, 130, 130 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtGewicht.Text, 160, 130 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtWarenbez.Text, 42, 146 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAnzVerp.Text, 132, 136 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtGewicht.Text, 157, 136 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtWarenbez.Text, 28, 136 + top, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
|
||||
|
||||
|
||||
'Tabelle
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("60 €", 122, 151 + top, 150, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues("60 €", 122, 199 + top, 200, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
|
||||
If usrCntl.dgvPositionen.Rows.Count() > 0 Then
|
||||
Dim x = 154
|
||||
For i As Integer = 0 To usrCntl.dgvPositionen.Rows.Count() - 1
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.dgvPositionen.Rows(i).Cells("pos").Value, 17, x + top, 10, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.dgvPositionen.Rows(i).Cells("leistung").Value, 24, x + top, 138, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.dgvPositionen.Rows(i).Cells("stk").Value, 165, x + top, 20, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.dgvPositionen.Rows(i).Cells("preis").Value, 185, x + top, 20, 6, "", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
x += 5
|
||||
Next
|
||||
|
||||
End If
|
||||
|
||||
listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.lblgesamtpreis.Text, 150, 217 + top, 40, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
|
||||
|
||||
|
||||
Dim ort As String = ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user