feature_implementierung frachkostenberechnung

2022-10-10 14:14:49 +02:00
parent fe6bcdb8eb
commit 89edda0a7d
6 changed files with 6691 additions and 2 deletions
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -828,6 +828,12 @@
    <Compile Include="frmZollstopp.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmFrachtkostenBerechnen.Designer.vb">
+      <DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmFrachtkostenBerechnen.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="GVMS\frmGVMS.Designer.vb">
      <DependentUpon>frmGVMS.vb</DependentUpon>
    </Compile>
@@ -1201,6 +1207,9 @@
    <EmbeddedResource Include="frmZollstopp.resx">
      <DependentUpon>frmZollstopp.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmFrachtkostenBerechnen.resx">
+      <DependentUpon>frmFrachtkostenBerechnen.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="GVMS\frmGVMS.resx">
      <DependentUpon>frmGVMS.vb</DependentUpon>
    </EmbeddedResource>
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.8.0.10")>
-<Assembly: AssemblyFileVersion("3.8.0.10")>
+<Assembly: AssemblyVersion("3.8.1.4")>
+<Assembly: AssemblyFileVersion("3.8.1.4")>
--- a/Aviso/frmFrachtkostenBerechnen.Designer.vb
+++ b/Aviso/frmFrachtkostenBerechnen.Designer.vb
@@ -0,0 +1,287 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmFrachtkostenBerechnen
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFrachtkostenBerechnen))
+        Me.lblVon = New System.Windows.Forms.Label()
+        Me.lblNach = New System.Windows.Forms.Label()
+        Me.cbxVon = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cbxNach = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.btnOK = New System.Windows.Forms.Button()
+        Me.tbEUAnteil = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.tbNichtEUAnteil = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.lblEUAnteil = New System.Windows.Forms.Label()
+        Me.lblNichtEUAnteil = New System.Windows.Forms.Label()
+        Me.txbVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txbNach = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.lblRohmasse = New System.Windows.Forms.Label()
+        Me.lblFrachtfaktor = New System.Windows.Forms.Label()
+        Me.btnCalculate = New System.Windows.Forms.Button()
+        Me.SuspendLayout()
+        '
+        'lblVon
+        '
+        Me.lblVon.AutoSize = True
+        Me.lblVon.Location = New System.Drawing.Point(5, 9)
+        Me.lblVon.Name = "lblVon"
+        Me.lblVon.Size = New System.Drawing.Size(64, 13)
+        Me.lblVon.TabIndex = 0
+        Me.lblVon.Text = "Abgangsort:"
+        '
+        'lblNach
+        '
+        Me.lblNach.AutoSize = True
+        Me.lblNach.Location = New System.Drawing.Point(229, 6)
+        Me.lblNach.Name = "lblNach"
+        Me.lblNach.Size = New System.Drawing.Size(84, 13)
+        Me.lblNach.TabIndex = 1
+        Me.lblNach.Text = "Bestimmungsort:"
+        '
+        'cbxVon
+        '
+        Me.cbxVon._allowedValuesFreiText = Nothing
+        Me.cbxVon._allowFreiText = False
+        Me.cbxVon._value = ""
+        Me.cbxVon.Enabled = False
+        Me.cbxVon.FormattingEnabled = True
+        Me.cbxVon.Location = New System.Drawing.Point(74, 6)
+        Me.cbxVon.Name = "cbxVon"
+        Me.cbxVon.Size = New System.Drawing.Size(121, 21)
+        Me.cbxVon.TabIndex = 2
+        '
+        'cbxNach
+        '
+        Me.cbxNach._allowedValuesFreiText = Nothing
+        Me.cbxNach._allowFreiText = False
+        Me.cbxNach._value = ""
+        Me.cbxNach.Enabled = False
+        Me.cbxNach.FormattingEnabled = True
+        Me.cbxNach.Location = New System.Drawing.Point(319, 6)
+        Me.cbxNach.Name = "cbxNach"
+        Me.cbxNach.Size = New System.Drawing.Size(121, 21)
+        Me.cbxNach.TabIndex = 3
+        '
+        'btnCancel
+        '
+        Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.btnCancel.Location = New System.Drawing.Point(10, 170)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.TabIndex = 4
+        Me.btnCancel.Text = "Abbrechen"
+        Me.btnCancel.UseVisualStyleBackColor = True
+        '
+        'btnOK
+        '
+        Me.btnOK.AccessibleRole = System.Windows.Forms.AccessibleRole.ComboBox
+        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.btnOK.Location = New System.Drawing.Point(365, 170)
+        Me.btnOK.Name = "btnOK"
+        Me.btnOK.Size = New System.Drawing.Size(75, 23)
+        Me.btnOK.TabIndex = 5
+        Me.btnOK.Text = "OK"
+        Me.btnOK.UseVisualStyleBackColor = True
+        '
+        'tbEUAnteil
+        '
+        Me.tbEUAnteil._DateTimeOnly = False
+        Me.tbEUAnteil._numbersOnly = False
+        Me.tbEUAnteil._numbersOnlyKommastellen = ""
+        Me.tbEUAnteil._numbersOnlyTrennzeichen = True
+        Me.tbEUAnteil._Prozent = False
+        Me.tbEUAnteil._ShortDateNew = False
+        Me.tbEUAnteil._ShortDateOnly = False
+        Me.tbEUAnteil._TimeOnly = False
+        Me.tbEUAnteil._TimeOnly_Seconds = False
+        Me.tbEUAnteil._value = ""
+        Me.tbEUAnteil._Waehrung = False
+        Me.tbEUAnteil._WaehrungZeichen = True
+        Me.tbEUAnteil.ForeColor = System.Drawing.Color.Black
+        Me.tbEUAnteil.Location = New System.Drawing.Point(340, 91)
+        Me.tbEUAnteil.MaxLineLength = -1
+        Me.tbEUAnteil.MaxLines_Warning = ""
+        Me.tbEUAnteil.MaxLines_Warning_Label = Nothing
+        Me.tbEUAnteil.Name = "tbEUAnteil"
+        Me.tbEUAnteil.Size = New System.Drawing.Size(100, 20)
+        Me.tbEUAnteil.TabIndex = 6
+        '
+        'tbNichtEUAnteil
+        '
+        Me.tbNichtEUAnteil._DateTimeOnly = False
+        Me.tbNichtEUAnteil._numbersOnly = False
+        Me.tbNichtEUAnteil._numbersOnlyKommastellen = ""
+        Me.tbNichtEUAnteil._numbersOnlyTrennzeichen = True
+        Me.tbNichtEUAnteil._Prozent = False
+        Me.tbNichtEUAnteil._ShortDateNew = False
+        Me.tbNichtEUAnteil._ShortDateOnly = False
+        Me.tbNichtEUAnteil._TimeOnly = False
+        Me.tbNichtEUAnteil._TimeOnly_Seconds = False
+        Me.tbNichtEUAnteil._value = ""
+        Me.tbNichtEUAnteil._Waehrung = False
+        Me.tbNichtEUAnteil._WaehrungZeichen = True
+        Me.tbNichtEUAnteil.ForeColor = System.Drawing.Color.Black
+        Me.tbNichtEUAnteil.Location = New System.Drawing.Point(340, 121)
+        Me.tbNichtEUAnteil.MaxLineLength = -1
+        Me.tbNichtEUAnteil.MaxLines_Warning = ""
+        Me.tbNichtEUAnteil.MaxLines_Warning_Label = Nothing
+        Me.tbNichtEUAnteil.Name = "tbNichtEUAnteil"
+        Me.tbNichtEUAnteil.Size = New System.Drawing.Size(100, 20)
+        Me.tbNichtEUAnteil.TabIndex = 7
+        '
+        'lblEUAnteil
+        '
+        Me.lblEUAnteil.AutoSize = True
+        Me.lblEUAnteil.Location = New System.Drawing.Point(229, 98)
+        Me.lblEUAnteil.Name = "lblEUAnteil"
+        Me.lblEUAnteil.Size = New System.Drawing.Size(51, 13)
+        Me.lblEUAnteil.TabIndex = 8
+        Me.lblEUAnteil.Text = "EU Anteil"
+        '
+        'lblNichtEUAnteil
+        '
+        Me.lblNichtEUAnteil.AutoSize = True
+        Me.lblNichtEUAnteil.Location = New System.Drawing.Point(229, 124)
+        Me.lblNichtEUAnteil.Name = "lblNichtEUAnteil"
+        Me.lblNichtEUAnteil.Size = New System.Drawing.Size(79, 13)
+        Me.lblNichtEUAnteil.TabIndex = 9
+        Me.lblNichtEUAnteil.Text = "Nicht EU Anteil"
+        '
+        'txbVon
+        '
+        Me.txbVon._DateTimeOnly = False
+        Me.txbVon._numbersOnly = False
+        Me.txbVon._numbersOnlyKommastellen = ""
+        Me.txbVon._numbersOnlyTrennzeichen = True
+        Me.txbVon._Prozent = False
+        Me.txbVon._ShortDateNew = False
+        Me.txbVon._ShortDateOnly = False
+        Me.txbVon._TimeOnly = False
+        Me.txbVon._TimeOnly_Seconds = False
+        Me.txbVon._value = ""
+        Me.txbVon._Waehrung = False
+        Me.txbVon._WaehrungZeichen = True
+        Me.txbVon.ForeColor = System.Drawing.Color.Black
+        Me.txbVon.Location = New System.Drawing.Point(74, 33)
+        Me.txbVon.MaxLineLength = -1
+        Me.txbVon.MaxLines_Warning = ""
+        Me.txbVon.MaxLines_Warning_Label = Nothing
+        Me.txbVon.Name = "txbVon"
+        Me.txbVon.Size = New System.Drawing.Size(121, 20)
+        Me.txbVon.TabIndex = 10
+        '
+        'txbNach
+        '
+        Me.txbNach._DateTimeOnly = False
+        Me.txbNach._numbersOnly = False
+        Me.txbNach._numbersOnlyKommastellen = ""
+        Me.txbNach._numbersOnlyTrennzeichen = True
+        Me.txbNach._Prozent = False
+        Me.txbNach._ShortDateNew = False
+        Me.txbNach._ShortDateOnly = False
+        Me.txbNach._TimeOnly = False
+        Me.txbNach._TimeOnly_Seconds = False
+        Me.txbNach._value = ""
+        Me.txbNach._Waehrung = False
+        Me.txbNach._WaehrungZeichen = True
+        Me.txbNach.ForeColor = System.Drawing.Color.Black
+        Me.txbNach.Location = New System.Drawing.Point(319, 33)
+        Me.txbNach.MaxLineLength = -1
+        Me.txbNach.MaxLines_Warning = ""
+        Me.txbNach.MaxLines_Warning_Label = Nothing
+        Me.txbNach.Name = "txbNach"
+        Me.txbNach.Size = New System.Drawing.Size(121, 20)
+        Me.txbNach.TabIndex = 11
+        '
+        'lblRohmasse
+        '
+        Me.lblRohmasse.AutoSize = True
+        Me.lblRohmasse.Location = New System.Drawing.Point(5, 102)
+        Me.lblRohmasse.Name = "lblRohmasse"
+        Me.lblRohmasse.Size = New System.Drawing.Size(57, 13)
+        Me.lblRohmasse.TabIndex = 12
+        Me.lblRohmasse.Text = "Rohmasse"
+        '
+        'lblFrachtfaktor
+        '
+        Me.lblFrachtfaktor.AutoSize = True
+        Me.lblFrachtfaktor.Location = New System.Drawing.Point(5, 128)
+        Me.lblFrachtfaktor.Name = "lblFrachtfaktor"
+        Me.lblFrachtfaktor.Size = New System.Drawing.Size(73, 13)
+        Me.lblFrachtfaktor.TabIndex = 13
+        Me.lblFrachtfaktor.Text = "Faktor pro KG"
+        '
+        'btnCalculate
+        '
+        Me.btnCalculate.AccessibleRole = System.Windows.Forms.AccessibleRole.ComboBox
+        Me.btnCalculate.Location = New System.Drawing.Point(365, 147)
+        Me.btnCalculate.Name = "btnCalculate"
+        Me.btnCalculate.Size = New System.Drawing.Size(75, 23)
+        Me.btnCalculate.TabIndex = 14
+        Me.btnCalculate.Text = "Berechnen"
+        Me.btnCalculate.UseVisualStyleBackColor = True
+        '
+        'frmFrachtkostenBerechnen
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(450, 205)
+        Me.Controls.Add(Me.btnCalculate)
+        Me.Controls.Add(Me.lblFrachtfaktor)
+        Me.Controls.Add(Me.lblRohmasse)
+        Me.Controls.Add(Me.txbNach)
+        Me.Controls.Add(Me.txbVon)
+        Me.Controls.Add(Me.lblNichtEUAnteil)
+        Me.Controls.Add(Me.lblEUAnteil)
+        Me.Controls.Add(Me.tbNichtEUAnteil)
+        Me.Controls.Add(Me.tbEUAnteil)
+        Me.Controls.Add(Me.btnOK)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Controls.Add(Me.cbxNach)
+        Me.Controls.Add(Me.cbxVon)
+        Me.Controls.Add(Me.lblNach)
+        Me.Controls.Add(Me.lblVon)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmFrachtkostenBerechnen"
+        Me.Text = "Frachtkosten berechnen"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents lblVon As Label
+    Friend WithEvents lblNach As Label
+    Friend WithEvents cbxVon As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cbxNach As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents btnCancel As Button
+    Friend WithEvents btnOK As Button
+    Friend WithEvents tbEUAnteil As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents tbNichtEUAnteil As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblEUAnteil As Label
+    Friend WithEvents lblNichtEUAnteil As Label
+    Friend WithEvents txbVon As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents txbNach As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblRohmasse As Label
+    Friend WithEvents lblFrachtfaktor As Label
+    Friend WithEvents btnCalculate As Button
+End Class
--- a/Aviso/frmFrachtkostenBerechnen.resx
+++ b/Aviso/frmFrachtkostenBerechnen.resx
--- a/Aviso/frmFrachtkostenBerechnen.vb
+++ b/Aviso/frmFrachtkostenBerechnen.vb
@@ -0,0 +1,50 @@
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmFrachtkostenBerechnen
+
+    Dim absenderID As Integer
+    Dim empfaengerID As Integer
+    Dim origin As String
+    Dim destination As String
+
+
+    Sub New(absID As String, empfID As String)
+
+        InitializeComponent()
+        absenderID = CInt(absID)
+        empfaengerID = CInt(empfID)
+
+
+    End Sub
+
+
+    Private Sub frmFrachtkotenBerechnen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        txbVon.fillWithSQL("SELECT  ISNULL([LandKz],'-') AS  , ISNULL([PLZ],'-'), ISNULL([Ort],''), ISNULL([Straße],'-') FROM [VERAG].[dbo].[Adressen] where AdressenNr = '" & absenderID & "'")
+        txbNach.fillWithSQL("SELECT  ISNULL([LandKz],'-') AS  , ISNULL([PLZ],'-'), ISNULL([Ort],''), ISNULL([Straße],'-') FROM [VERAG].[dbo].[Adressen] where AdressenNr = '" & empfaengerID & "'")
+
+
+    End Sub
+
+    Sub calculateFreight()
+
+        Dim duration = ""
+        Dim distance = ""
+
+        'If ALLG.sbAbgangZollstelle._value <> "" Then
+        '    origin = ALLG.sbAbgangZollstelle._value.Substring(0, 2) & " " & ALLG.sbAbgangZollstelle.Text
+        'End If
+
+
+        'Dim usrCntlEmpf = ADRESSEN.usrCntlEmpfaenger
+        destination &= usrCntlEmpf.txtStrasse.Text & " "
+        destination &= usrCntlEmpf.sbLand._value & " "
+        destination &= usrCntlEmpf.txtPlz.Text & " "
+        destination &= usrCntlEmpf.txtOrt.Text & " "
+
+
+        VERAG_PROG_ALLGEMEIN.cGoogleAPI.GoogleDistance(origin, destination, duration, "", distance)
+
+    End Sub
+
+End Class
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -5309,4 +5309,13 @@ Public Class frmSendungsdetailsNEU
        End Try
        Me.Cursor = Cursors.Default
    End Sub
+
+    Sub calculateFreightcost()
+
+        Dim frmFrachtkostenBerechnen = New frmFrachtkostenBerechnen(txtAbsenderKdNr._value, txtEmpfaengerKdNr._value)
+
+        If frmFrachtkostenBerechnen.ShowDialog() = DialogResult.OK Then
+            ' TODO -> Übergabe Parameter Frachtanteil
+        End If
+    End Sub
 End Class