merge
This commit is contained in:
1327
Aviso/frmSendungsdetailsNEU.Designer.vb
generated
1327
Aviso/frmSendungsdetailsNEU.Designer.vb
generated
File diff suppressed because it is too large
Load Diff
@@ -423,7 +423,7 @@ Public Class frmSendungsdetailsNEU
|
|||||||
|
|
||||||
Sub NEXT_SENDUNG()
|
Sub NEXT_SENDUNG()
|
||||||
loadDataInLIST()
|
loadDataInLIST()
|
||||||
If CURRENT_INDEX + 1 <SENDUNG_LIST.Count Then
|
If CURRENT_INDEX + 1 < SENDUNG_LIST.Count Then
|
||||||
CURRENT_INDEX += 1
|
CURRENT_INDEX += 1
|
||||||
initDataBinding()
|
initDataBinding()
|
||||||
' initButtons()
|
' initButtons()
|
||||||
@@ -7683,6 +7683,21 @@ Public Class frmSendungsdetailsNEU
|
|||||||
TextHTML = TextHTML.Replace("%LKW%", AVISO.LKW_Nr)
|
TextHTML = TextHTML.Replace("%LKW%", AVISO.LKW_Nr)
|
||||||
TextHTML = TextHTML.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
|
TextHTML = TextHTML.Replace("%LKWKennzeichen%", AVISO.LKW_Nr)
|
||||||
|
|
||||||
|
If AVISO.VORPAPIERE IsNot Nothing AndAlso AVISO.VORPAPIERE.Count > 0 Then
|
||||||
|
Dim VorpapierNr As String = ""
|
||||||
|
|
||||||
|
For Each VORP In AVISO.VORPAPIERE
|
||||||
|
VorpapierNr &= VORP.vp_Nr & ","
|
||||||
|
Next
|
||||||
|
|
||||||
|
If VorpapierNr <> "" AndAlso VorpapierNr.ToString.EndsWith(",") Then
|
||||||
|
VorpapierNr = VorpapierNr.Substring(0, VorpapierNr.Length - 1)
|
||||||
|
End If
|
||||||
|
|
||||||
|
TextHTML = TextHTML.Replace("%VorpapierNr%", VorpapierNr)
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
If AVISO.VoraussichtlichesEintreffen IsNot Nothing Then
|
If AVISO.VoraussichtlichesEintreffen IsNot Nothing Then
|
||||||
TextHTML = TextHTML.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString)
|
TextHTML = TextHTML.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString)
|
||||||
Mail.Subject = Mail.Subject.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString)
|
Mail.Subject = Mail.Subject.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString)
|
||||||
@@ -7772,6 +7787,7 @@ Public Class frmSendungsdetailsNEU
|
|||||||
TextHTML = TextHTML.Replace("%Gewicht%", "")
|
TextHTML = TextHTML.Replace("%Gewicht%", "")
|
||||||
TextHTML = TextHTML.Replace("%ImEx%", "")
|
TextHTML = TextHTML.Replace("%ImEx%", "")
|
||||||
TextHTML = TextHTML.Replace("%Zollstelle%", "")
|
TextHTML = TextHTML.Replace("%Zollstelle%", "")
|
||||||
|
TextHTML = TextHTML.Replace("T1.: %VorpapierNr%", "")
|
||||||
|
|
||||||
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)
|
Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(anh.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
|
||||||
@@ -8416,7 +8432,7 @@ Public Class frmSendungsdetailsNEU
|
|||||||
Me.Cursor = Cursors.Default
|
Me.Cursor = Cursors.Default
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub SUMAToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SUMAToolStripMenuItem.Click
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user