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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2022-03-19 22:52:06 +01:00
parent 9b001e5803
commit d9204781cf
139 changed files with 19394 additions and 3352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
SDL/Formulare/KDFormulare/frmFormulare.vb
View File

@@ -862,7 +862,7 @@ Public Class frmFormulare
If list.Count = 1 Then
dest_path = list(0)
Else
dest_path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath("VERAG_Formular.pdf", ".pdf", False, False)
dest_path = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf", ".pdf", False, False)
If Not FormularManagerNEU.MergePdfFiles(list, dest_path) Then
dest_path = "" : MsgBox("Fehler PDF")
End If
@@ -980,7 +980,7 @@ Public Class frmFormulare
If l.Mail_Subject <> "" Then Mail.Subject = l.Mail_Subject
Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "VERAG_Formular.pdf")
Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf")
Mail.Display()
Next
@@ -1013,7 +1013,7 @@ Public Class frmFormulare
Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", "")
End If
Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "VERAG_Formular.pdf")
Mail.Attachments.Add(dest_path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Formular.pdf")
Mail.Display()
End If
@@ -1483,6 +1483,7 @@ Public Class FormularManagerNEU
Case "WAI" : rpt.txtGrenzstelle.Text = "WAIDHAUS"
Case "SBG" : rpt.txtGrenzstelle.Text = "BAD REICHENHALL"
Case "SFD" : rpt.txtGrenzstelle.Text = "SPIELFELD"
Case "AMB" : rpt.txtGrenzstelle.Text = "AMBAR"
Case Else : rpt.txtGrenzstelle.Text = AVISO.Grenzstelle.Replace("???", "")
End Select
End If
@@ -1515,6 +1516,17 @@ Public Class FormularManagerNEU
rpt.txtFraechter.Text = AVISO.Auftraggeber
' rpt.txtFraechter.Text = If(AVISO.Frächter_KdNr <> "", AVISO.Frächter_KdNr & " ", "") & AVISO.Frächter
'rpt.TextBox19.Text = "Rechnung Fatura" 'Stern weg
Case "AMBAR"
rpt.txtFirmaInfo_VERAG.Visible = False
rpt.TextBox13.Visible = True
rpt.picVERAG.Image = My.Resources.ambar_simple
rpt.TextBox1.Text = rpt.TextBox1.Text.Replace("%Firma%", "AMBAR Logistic Services GmbH")
rpt.TextBox3.Text = rpt.TextBox3.Text.Replace("%Firma%", "AMBAR Logistic Services GmbH")
rpt.TextBox7.Text = rpt.TextBox7.Text.Replace("%Firma%", "AMBAR Logistic Services GmbH")
rpt.TextBox32.Text = "Avisierer (*):"
rpt.txtFraechter.Text = AVISO.Auftraggeber
' rpt.txtFraechter.Text = If(AVISO.Frächter_KdNr <> "", AVISO.Frächter_KdNr & " ", "") & AVISO.Frächter
'rpt.TextBox19.Text = "Rechnung Fatura" 'Stern weg
Case Else
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
Case "SBG" : ort = "Bad Reichenhall"
@@ -1563,22 +1575,31 @@ Public Class FormularManagerNEU
rpt.txtAnmerkung.Text = ""
Dim anmerkung = ""
Dim anmerkung2 = ""
Dim colliGewicht = ""
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX"
If If(SND.tblSnd_Colli, "") <> "" Then colliGewicht &= "Colli: " & SND.tblSnd_Colli & "; "
If If(SND.tblSnd_Gewicht, "") <> "" Then colliGewicht &= "Gewicht: " & SND.tblSnd_Gewicht & " kg"
If If(SND.tblSnd_AnmerkungDispoliste, "") <> String.Empty Then anmerkung &= If(SND.tblSnd_AnmerkungDispoliste, "").ToString.Trim
' If(SND.tblSnd_Anmerkung, "").ToString.Trim & vbNewLine & If(SND.tblSnd_AnmerkungDispoliste, "").ToString.Trim 'Übergangsphase: beide Txt
anmerkung = If(SND.tblSnd_AnmerkungDispoliste, "").ToString.Trim ' If(SND.tblSnd_Anmerkung, "").ToString.Trim & vbNewLine & If(SND.tblSnd_AnmerkungDispoliste, "").ToString.Trim 'Übergangsphase: beide Txt
Case "AMBAR"
If If(SND.tblSnd_Colli, "") <> "" Then colliGewicht &= "Colli: " & SND.tblSnd_Colli & "; "
If If(SND.tblSnd_Gewicht, "") <> "" Then colliGewicht &= "Gewicht: " & SND.tblSnd_Gewicht & " kg"
If If(SND.tblSnd_AnmerkungDispoliste, "") <> String.Empty Then anmerkung &= If(SND.tblSnd_AnmerkungDispoliste, "").ToString.Trim
If If(SND.tblSnd_Auftraggeber, "") <> String.Empty Then anmerkung2 &= "Auftraggeber: " & SND.tblSnd_Auftraggeber.ToString.Trim
Case Else
If If(SND.tblSnd_Colli, "") <> "" Then colliGewicht &= "Colli: " & SND.tblSnd_Colli & "; "
If If(SND.tblSnd_Gewicht, "") <> "" Then colliGewicht &= "Gewicht: " & SND.tblSnd_Gewicht & " kg"
anmerkung &= If(SND.tblSnd_AnmerkungDispoliste, "").ToString.Trim
If If(SND.tblSnd_AnmerkungDispoliste, "") <> String.Empty Then anmerkung &= If(SND.tblSnd_AnmerkungDispoliste, "").ToString.Trim
End Select
If SND.tblSnd_Fremdspedition Then
rpt.txtAbfertigungsart.Text = "FREMD"
rpt.txtPosNr.Text = SND.tblSnd_FremdspeditionText
@@ -1593,7 +1614,9 @@ Public Class FormularManagerNEU
rpt.txtAnmerkung.Text = rpt.txtAnmerkung.Text.Replace("; ;", "; ") 'Falls dpl-return war
End While
End If
If anmerkung2 <> "" Then
rpt.txtAnmerkung.Text = (rpt.txtAnmerkung.Text & vbNewLine & anmerkung2).Trim
End If
If SND.tblSnd_Abfertigungsart_ID > 0 Then
Select Case SND.tblSnd_Abfertigungsart_ID
Case 1 : rpt.txtAbfertigungsart.Text = "Zollabfertigung"