merge
This commit is contained in:
@@ -406,6 +406,7 @@ Public Class frmSendungsdetailsNEU
|
||||
Private Sub frmSendungsdetails_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
|
||||
Button23.Visible = True
|
||||
btnWWberechnen.Visible = False
|
||||
|
||||
If UNBOUND Then
|
||||
FlowLayoutPanel.Visible = False
|
||||
@@ -542,19 +543,19 @@ Public Class frmSendungsdetailsNEU
|
||||
If AVISO IsNot Nothing Then
|
||||
|
||||
If it.Tag.ToString = "???" Then
|
||||
SAVE_ME()
|
||||
AVISO.Grenzstelle = "???"
|
||||
AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString)
|
||||
cGlobal.Aktive_ID = AvisoId
|
||||
Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
|
||||
Dim f As New frmEintragAviso
|
||||
f.ShowDialog(frmGrayOut)
|
||||
frmGrayOut.Close()
|
||||
AVISO = AvisoDAL.LesenAviso(AvisoId, "")
|
||||
Else
|
||||
SAVE_ME()
|
||||
AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString)
|
||||
End If
|
||||
SAVE_ME()
|
||||
AVISO.Grenzstelle = "???"
|
||||
AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString)
|
||||
cGlobal.Aktive_ID = AvisoId
|
||||
Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
|
||||
Dim f As New frmEintragAviso
|
||||
f.ShowDialog(frmGrayOut)
|
||||
frmGrayOut.Close()
|
||||
AVISO = AvisoDAL.LesenAviso(AvisoId, "")
|
||||
Else
|
||||
SAVE_ME()
|
||||
AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString)
|
||||
End If
|
||||
Me.initDataBinding()
|
||||
|
||||
End If
|
||||
@@ -1549,6 +1550,9 @@ Public Class frmSendungsdetailsNEU
|
||||
End If
|
||||
|
||||
pnlT1.Controls.Add(usrcntl_ATB)
|
||||
|
||||
btnWWberechnen.Visible = True
|
||||
|
||||
End Select
|
||||
|
||||
cboAbfertigungsart_SelectedIndexChanged(cboAbfertigungsart, New EventArgs)
|
||||
@@ -1671,16 +1675,16 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
'Übergangsphase Aviso/Sendung
|
||||
If txtAvisierer.Text = "" And txtAvisierer.Enabled Then 'And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then
|
||||
If AVISO.Auftraggeber_KdNr > -1 Then
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Auftraggeber_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) Then
|
||||
txtAvisierer.KdNr = AVISO.Auftraggeber_KdNr
|
||||
If AVISO.Auftraggeber_KdNr > -1 Then
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Auftraggeber_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) Then
|
||||
txtAvisierer.KdNr = AVISO.Auftraggeber_KdNr
|
||||
End If
|
||||
Else
|
||||
txtAvisierer.KdNr_value = -1
|
||||
txtAvisiererKdNr.Text = ""
|
||||
txtAvisierer.Text = AVISO.Auftraggeber
|
||||
End If
|
||||
Else
|
||||
txtAvisierer.KdNr_value = -1
|
||||
txtAvisiererKdNr.Text = ""
|
||||
txtAvisierer.Text = AVISO.Auftraggeber
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
'Übergangsphase Aviso/Sendung
|
||||
@@ -3108,7 +3112,7 @@ Public Class frmSendungsdetailsNEU
|
||||
If cbxFremdspedition.Checked Then
|
||||
sperren = True
|
||||
ElseIf cboAbfertigungsart._value = "44" Then
|
||||
sperren = False
|
||||
sperren = False
|
||||
Else
|
||||
If cboFiliale._value <> "" Then
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
@@ -4194,7 +4198,7 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
|
||||
|
||||
Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvAnhang.SelectedRows(0).Cells("anh_docId").Value)
|
||||
Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvAnhang.SelectedRows(0).Cells("anh_docId").Value)
|
||||
If Not File.Exists(docPath) Then
|
||||
MsgBox("Die Datei existiert nicht!")
|
||||
Else
|
||||
@@ -7030,9 +7034,9 @@ Public Class frmSendungsdetailsNEU
|
||||
|
||||
|
||||
If lblGrenze.Text <> "" Then
|
||||
TextHTML = TextHTML.Replace("%VAR-GRENZE%", lblGrenze.Text & "<br>")
|
||||
Mail.Subject = Mail.Subject.Replace("%VAR-GRENZE%", lblGrenze.Text.Replace(vbCrLf, " "))
|
||||
End If
|
||||
TextHTML = TextHTML.Replace("%VAR-GRENZE%", lblGrenze.Text & "<br>")
|
||||
Mail.Subject = Mail.Subject.Replace("%VAR-GRENZE%", lblGrenze.Text.Replace(vbCrLf, " "))
|
||||
End If
|
||||
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger IsNot Nothing Then
|
||||
Mail.Subject = Mail.Subject.Replace("%Empfaenger%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger)
|
||||
@@ -7069,11 +7073,11 @@ Public Class frmSendungsdetailsNEU
|
||||
Mail.Subject = Mail.Subject.Replace("%AbfertigungsNr%", "")
|
||||
Mail.Subject = Mail.Subject.Replace("%Absender%", "")
|
||||
Mail.Subject = Mail.Subject.Replace("%Gewicht%", "")
|
||||
Mail.Subject = Mail.Subject.Replace("%ImEx%", "")
|
||||
Mail.Subject = Mail.Subject.Replace("%Zollstelle%", "")
|
||||
Mail.Subject = Mail.Subject.Replace("%ImEx%", "")
|
||||
Mail.Subject = Mail.Subject.Replace("%Zollstelle%", "")
|
||||
|
||||
|
||||
TextHTML = TextHTML.Replace("%LKW%", "")
|
||||
TextHTML = TextHTML.Replace("%LKW%", "")
|
||||
TextHTML = TextHTML.Replace("%LKWKennzeichen%", "")
|
||||
TextHTML = TextHTML.Replace("%Empfaenger%", "")
|
||||
TextHTML = TextHTML.Replace("%VAR-GRENZE%", "")
|
||||
@@ -7082,10 +7086,10 @@ Public Class frmSendungsdetailsNEU
|
||||
TextHTML = TextHTML.Replace("%AbfertigungsNr%", "")
|
||||
TextHTML = TextHTML.Replace("%Absender%", "")
|
||||
TextHTML = TextHTML.Replace("%Gewicht%", "")
|
||||
TextHTML = TextHTML.Replace("%ImEx%", "")
|
||||
TextHTML = TextHTML.Replace("%Zollstelle%", "")
|
||||
TextHTML = TextHTML.Replace("%ImEx%", "")
|
||||
TextHTML = TextHTML.Replace("%Zollstelle%", "")
|
||||
|
||||
For Each anh As DataGridViewRow In dgvAnhang.SelectedRows
|
||||
For Each anh As DataGridViewRow In dgvAnhang.SelectedRows
|
||||
Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(anh.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||
Next
|
||||
|
||||
@@ -7364,4 +7368,93 @@ Public Class frmSendungsdetailsNEU
|
||||
Panel22.BackColor = Color.FromArgb(255, 255, 192)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub btnWWberechnen_Click(sender As Object, e As EventArgs) Handles btnWWberechnen.Click
|
||||
Dim calcWarenwerte As Double = 0
|
||||
Dim vorpT1 = usrcntl_ATB.txtATBT1.Text
|
||||
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = "" Then
|
||||
txtWarenwertWaehrung.SET_VALUE("EUR")
|
||||
SAVE_ME()
|
||||
End If
|
||||
|
||||
If vorpT1 = "" Then
|
||||
MsgBox("Vorpapier/T1 muss eingetragen werden!")
|
||||
usrcntl_ATB.txtATBT1.Focus()
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung <> "EUR" Then
|
||||
MsgBox("Warenwert darf nur in EUR angegeben werden")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
|
||||
|
||||
For Each s As cSendungen In SENDUNG_LIST
|
||||
'nur Betrag EUR
|
||||
If s.tblSnd_Vorpapier = vorp Then
|
||||
If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.tblSnd_Warenwert > 0 AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
|
||||
calcWarenwerte += s.tblSnd_Warenwert
|
||||
Else
|
||||
MsgBox("Bei Sendung " & s.AbfertigungsNr & " ist der Warenwert nicht in EUR angegeben!")
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert Is Nothing Then
|
||||
SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = Math.Round(calcWarenwerte, 2)
|
||||
SAVE_ME()
|
||||
End If
|
||||
|
||||
|
||||
If Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
|
||||
MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechnerter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)
|
||||
|
||||
Else
|
||||
|
||||
Dim Standort As String = ""
|
||||
|
||||
|
||||
Select Case SENDUNG_LIST(CURRENT_INDEX).FilialenNr
|
||||
Case 4803, 4809
|
||||
Standort = "VERAG AG"
|
||||
Case 5601
|
||||
Standort = "Unisped GmbH"
|
||||
Case 5701
|
||||
Standort = "AMBAR"
|
||||
Case 4810,
|
||||
Standort = "VERAG GmbH"
|
||||
Case 5103
|
||||
Standort = "VERAG CS"
|
||||
Case 5501
|
||||
Standort = "IMEX"
|
||||
|
||||
End Select
|
||||
|
||||
|
||||
|
||||
Dim GesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
|
||||
|
||||
If GesSichRef Is Nothing Then
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
Dim saldo = GesSichRef.CalcSaldo()
|
||||
If calcWarenwerte > saldo Then
|
||||
MsgBox("Gestellung kann NICHT durchgeführt werden!" & vbNewLine & "Eingetragener Warenwert: " & calcWarenwerte & " übersteigt den vorhandenen Saldo von: " & saldo, MsgBoxStyle.Critical)
|
||||
Else
|
||||
MsgBox("Gestellung kann durchgeführt werden!")
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user