Merge: Routen, AVISO-Ansicht
This commit is contained in:
@@ -1161,32 +1161,32 @@ Public Class frmHauptfenster
|
||||
" when [Status] =1 then 5 " &
|
||||
" else 1 " &
|
||||
" END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
|
||||
End If
|
||||
End If
|
||||
|
||||
'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " &
|
||||
' " FROM Aviso " &
|
||||
' " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
' " AND Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND (LetzterMitarbeiterId=@maId OR " & inBearbeitungSQL & ") " &
|
||||
' "ORDER BY case " &
|
||||
' " when [Status] =3 then 0 " &
|
||||
' " when [Status] =0 then 1 " &
|
||||
' " when [Status] =99 then 2 " &
|
||||
' " when [Status] =4 then 3 " &
|
||||
' " when [Status] =1 then 4 " &
|
||||
' " when [Status] =5 then 4 " &
|
||||
' " when [Status] =0 then 5 " &
|
||||
' " END, Ankunft"
|
||||
'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " &
|
||||
' " FROM Aviso " &
|
||||
' " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
' " AND Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND (LetzterMitarbeiterId=@maId OR " & inBearbeitungSQL & ") " &
|
||||
' "ORDER BY case " &
|
||||
' " when [Status] =3 then 0 " &
|
||||
' " when [Status] =0 then 1 " &
|
||||
' " when [Status] =99 then 2 " &
|
||||
' " when [Status] =4 then 3 " &
|
||||
' " when [Status] =1 then 4 " &
|
||||
' " when [Status] =5 then 4 " &
|
||||
' " when [Status] =0 then 5 " &
|
||||
' " END, Ankunft"
|
||||
|
||||
|
||||
'Public Const Status_Erfasst = 0
|
||||
'Public Const Status_Vorbereitet = 4
|
||||
'Public Const Status_Vorgeschrieben = 5
|
||||
'Public Const Status_Freigegeben = 1
|
||||
'Public Const Status_NichtEingetroffen = 2
|
||||
'Public Const Status_Ankunft = 3
|
||||
'Public Const Status_Erfasst = 0
|
||||
'Public Const Status_Vorbereitet = 4
|
||||
'Public Const Status_Vorgeschrieben = 5
|
||||
'Public Const Status_Freigegeben = 1
|
||||
'Public Const Status_NichtEingetroffen = 2
|
||||
'Public Const Status_Ankunft = 3
|
||||
|
||||
|
||||
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
|
||||
If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '? vlt hilfts...
|
||||
|
||||
@@ -4129,6 +4129,14 @@ Public Class frmHauptfenster
|
||||
Process.Start("https://www.bafa.de/DE/Aussenwirtschaft/Ausfuhrkontrolle/Gueterlisten/gueterlisten_node.html")
|
||||
End Sub
|
||||
|
||||
Private Sub RoutenverwaltungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RoutenverwaltungToolStripMenuItem.Click
|
||||
gridAviso.ClearSelection()
|
||||
gridMyAviso.ClearSelection()
|
||||
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 1
|
||||
Dim f As New frmNCTSRouten()
|
||||
f.ShowDialog(Me)
|
||||
End Sub
|
||||
|
||||
Private Sub DTBToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DTBToolStripMenuItem.Click
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = sender.text
|
||||
@@ -4579,64 +4587,64 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
|
||||
If GrenzstelleMail = "" And art <> 5 Then
|
||||
'----------------------------------------
|
||||
Exit Sub ' Wenn Grenzstelle leer / ??? --> Keine MAIL!
|
||||
'If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
|
||||
'----------------------------------------
|
||||
Exit Sub ' Wenn Grenzstelle leer / ??? --> Keine MAIL!
|
||||
'If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then GrenzstelleMail = "FO"
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then GrenzstelleMail = "UNI"
|
||||
|
||||
If GrenzstelleMail <> "" Then
|
||||
Dim Standort As New cStandort
|
||||
|
||||
Standort = Standorte.LesenStandort(0, GrenzstelleMail, "")
|
||||
|
||||
If Not IsNothing(Standort) Then
|
||||
Select Case art
|
||||
Case 1, 3
|
||||
If Standort.eMail_Ankunft_Betreff <> "" Then
|
||||
hBetreff = Standort.eMail_Ankunft_Betreff
|
||||
hBody = Standort.eMail_Ankunft_Text
|
||||
End If
|
||||
Case 2, 4
|
||||
If Standort.eMail_Freigabe_Betreff <> "" Then
|
||||
hBetreff = Standort.eMail_Freigabe_Betreff
|
||||
hBody = Standort.eMail_Freigabe_Text
|
||||
End If
|
||||
Case 5
|
||||
If Standort.eMail_Status_Betreff <> "" Then
|
||||
hBetreff = Standort.eMail_Status_Betreff
|
||||
hBody = Standort.eMail_Status_Text
|
||||
End If
|
||||
End Select
|
||||
End If
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then GrenzstelleMail = "FO"
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then GrenzstelleMail = "UNI"
|
||||
End If
|
||||
|
||||
If GrenzstelleMail <> "" Then
|
||||
Dim Standort As New cStandort
|
||||
|
||||
Standort = Standorte.LesenStandort(0, GrenzstelleMail, "")
|
||||
|
||||
If Not IsNothing(Standort) Then
|
||||
Select Case art
|
||||
Case 1, 3
|
||||
If Standort.eMail_Ankunft_Betreff <> "" Then
|
||||
hBetreff = Standort.eMail_Ankunft_Betreff
|
||||
hBody = Standort.eMail_Ankunft_Text
|
||||
End If
|
||||
Case 2, 4
|
||||
If Standort.eMail_Freigabe_Betreff <> "" Then
|
||||
hBetreff = Standort.eMail_Freigabe_Betreff
|
||||
hBody = Standort.eMail_Freigabe_Text
|
||||
End If
|
||||
Case 5
|
||||
If Standort.eMail_Status_Betreff <> "" Then
|
||||
hBetreff = Standort.eMail_Status_Betreff
|
||||
hBody = Standort.eMail_Status_Text
|
||||
End If
|
||||
End Select
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Dim anhaenge As New List(Of String)
|
||||
hBetreff = Platzhalter_ersetzen(hBetreff, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, 0, AVISO, KundenNr, anhaenge) ' art 0 damit nicht beim betreff auch die DY-Daten durchsuht werden und die Sendungsliste erstellt wird.
|
||||
hBody = Platzhalter_ersetzen(hBody, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, art, AVISO, KundenNr, anhaenge)
|
||||
Dim anhaenge As New List(Of String)
|
||||
hBetreff = Platzhalter_ersetzen(hBetreff, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, 0, AVISO, KundenNr, anhaenge) ' art 0 damit nicht beim betreff auch die DY-Daten durchsuht werden und die Sendungsliste erstellt wird.
|
||||
hBody = Platzhalter_ersetzen(hBody, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, art, AVISO, KundenNr, anhaenge)
|
||||
|
||||
|
||||
hBody = hBody.Replace("%0", "<br>")
|
||||
hBody = hBody.Replace("%0", "<br>")
|
||||
|
||||
hBody = hBody.Replace("%Firma", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) ' gibts noch nicht!
|
||||
hBody = hBody.Replace("%Firma", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) ' gibts noch nicht!
|
||||
|
||||
'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA '= "IMEX"
|
||||
' Case "VERAG"
|
||||
' Case "UNISPED"
|
||||
' hBody = hBody.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) 'hier der Ersatz
|
||||
'End Select
|
||||
'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA '= "IMEX"
|
||||
' Case "VERAG"
|
||||
' Case "UNISPED"
|
||||
' hBody = hBody.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) 'hier der Ersatz
|
||||
'End Select
|
||||
|
||||
Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_STATUSMAIL, art,,, KundenNr, AVISO.AvisoId)
|
||||
Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_STATUSMAIL, art,,, KundenNr, AVISO.AvisoId)
|
||||
|
||||
API.api_EMail = EMails
|
||||
API.api_EMailCC = EMails_CC
|
||||
API.api_EMailBCC = EMails_BCC
|
||||
API.api_EMailSubject = hBetreff
|
||||
API.api_EMailText = hBody
|
||||
API.api_EMailAttCnt = anhaenge.Count
|
||||
API.api_EMail = EMails
|
||||
API.api_EMailCC = EMails_CC
|
||||
API.api_EMailBCC = EMails_BCC
|
||||
API.api_EMailSubject = hBetreff
|
||||
API.api_EMailText = hBody
|
||||
API.api_EMailAttCnt = anhaenge.Count
|
||||
|
||||
|
||||
If ForceMail <> "" Then
|
||||
@@ -4672,25 +4680,25 @@ Public Class AvisoStatusFunctions
|
||||
AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, MailArt & txt, 46, , "(AUTO)")
|
||||
|
||||
Else
|
||||
API.UPDTAE_ERR()
|
||||
AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)")
|
||||
End If
|
||||
API.UPDTAE_ERR()
|
||||
AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)")
|
||||
End If
|
||||
|
||||
'OLD ----------------------------------
|
||||
If False Then
|
||||
Dim hMail As String = "mailto:" & EMails & "?subject=" & hBetreff
|
||||
If EMails_CC.ToString.Trim <> "" Then hMail += "&CC=" & EMails_CC
|
||||
If EMails_BCC.ToString.Trim <> "" Then hMail += "&BCC=" & EMails_BCC
|
||||
If hBody <> "" Then hMail += "&Body=" & hBody
|
||||
Try
|
||||
System.Diagnostics.Process.Start(hMail)
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW, "Beim Mail-Versenden ist ein Fehler aufgetreten")
|
||||
End Try
|
||||
End If
|
||||
' ----------------------------------
|
||||
End If
|
||||
|
||||
'OLD ----------------------------------
|
||||
If False Then
|
||||
Dim hMail As String = "mailto:" & EMails & "?subject=" & hBetreff
|
||||
If EMails_CC.ToString.Trim <> "" Then hMail += "&CC=" & EMails_CC
|
||||
If EMails_BCC.ToString.Trim <> "" Then hMail += "&BCC=" & EMails_BCC
|
||||
If hBody <> "" Then hMail += "&Body=" & hBody
|
||||
Try
|
||||
System.Diagnostics.Process.Start(hMail)
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW, "Beim Mail-Versenden ist ein Fehler aufgetreten")
|
||||
End Try
|
||||
End If
|
||||
' ----------------------------------
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -6063,10 +6071,10 @@ Public Class AvisoStatusFunctions
|
||||
|
||||
Dim AtcMrn = ""
|
||||
Dim DsId = ""
|
||||
Dim DsId2 = ""
|
||||
Dim frist = ""
|
||||
Dim gestellungsadresse = "<td><td/>"
|
||||
Dim found = False
|
||||
Dim DsId2 = ""
|
||||
Dim frist = ""
|
||||
Dim gestellungsadresse = "<td><td/>"
|
||||
Dim found = False
|
||||
Select Case s.tblSnd_Abfertigungsart_ID
|
||||
Case 5, 6, 18, 24, 32, 33, 34, 37, 40 'Versand
|
||||
gestellungsadresse = "<td>" & s.getNCTSAdress(True, True, False) & "</td>"
|
||||
@@ -6133,10 +6141,10 @@ Public Class AvisoStatusFunctions
|
||||
End If
|
||||
End If
|
||||
Case Else
|
||||
getDataFronDY_EZA(s.tblSnd_SendungID, AtcMrn, DsId, s.FilialenNr, s.AbfertigungsNr, DsId2)
|
||||
If s.tblSnd_Abfertigungsart_ID = 23 Then
|
||||
s.LOAD_HANDLING()
|
||||
For Each hd In s.HANDLING
|
||||
getDataFronDY_EZA(s.tblSnd_SendungID, AtcMrn, DsId, s.FilialenNr, s.AbfertigungsNr, DsId2)
|
||||
If s.tblSnd_Abfertigungsart_ID = 23 Then
|
||||
s.LOAD_HANDLING()
|
||||
For Each hd In s.HANDLING
|
||||
AtcMrn &= hd.sndhdg_nr & ", "
|
||||
Next
|
||||
If AtcMrn.EndsWith(", ") Then AtcMrn = AtcMrn.Substring(0, AtcMrn.Length - 2)
|
||||
|
||||
Reference in New Issue
Block a user