This commit is contained in:
2019-10-28 09:30:39 +01:00
parent d29dc72b22
commit 6ae299259e
38 changed files with 2570 additions and 1168 deletions

View File

@@ -661,8 +661,7 @@ Public Class frmHauptfenster
Dim search = txtSuche.Text.Trim
If search <> "" Then
hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search &
"%' OR Frächter LIKE '%" & search & "%')"
hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' )"
End If
hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC"
@@ -815,13 +814,25 @@ Public Class frmHauptfenster
" AND Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND (LetzterMitarbeiterId=@maId OR " & inBearbeitungSQL & ") " &
"ORDER BY case " &
" when [Status] =3 then 0 " &
" when [Status] =1 then 1 " &
" 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
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...
@@ -2382,7 +2393,6 @@ Public Class frmHauptfenster
Private Sub VerzollungsunterlagenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerzollungsunterlagenToolStripMenuItem.Click
SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen)
End Sub
@@ -2663,8 +2673,30 @@ Public Class frmHauptfenster
SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.VerzollungsunterlagenBAR)
End Sub
Private Sub ToolStripMenuItem13_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem13.Click
Dim f As New SDL.frmPostEinschreiben
f.Show(Me)
End Sub
Private Sub UNISPEDToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UNISPEDToolStripMenuItem.Click
If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "UNISPED")) Then
showMeNew()
Else
MsgBox("Keine Berechtigung!")
End If
End Sub
Private Sub AMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARToolStripMenuItem.Click
If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "AMBAR")) Then
showMeNew()
Else
MsgBox("Keine Berechtigung!")
End If
End Sub
Private Sub VollständigesUpdateToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VollständigesUpdateToolStripMenuItem.Click
frmLogin.UpdateAVISO(True)
End Sub
End Class
Public Class AvisoStatusFunctions