test
This commit is contained in:
@@ -10,6 +10,8 @@ Imports System.Drawing.Drawing2D
|
||||
Imports SDL
|
||||
Imports Microsoft.Office.Interop
|
||||
Imports Spire.Pdf.Texts
|
||||
Imports System.Net
|
||||
Imports System.Text
|
||||
|
||||
|
||||
'Imports UID
|
||||
@@ -164,6 +166,7 @@ Public Class frmHauptfenster
|
||||
|
||||
VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL
|
||||
|
||||
|
||||
EnableDoubleBuffered(gridAviso)
|
||||
EnableDoubleBuffered(gridMyAviso)
|
||||
'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
@@ -372,7 +375,7 @@ Public Class frmHauptfenster
|
||||
|
||||
End If
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then
|
||||
Button12.Visible = True
|
||||
btnE_Aviso.Visible = True
|
||||
Label22.Visible = True
|
||||
initEAviso()
|
||||
End If
|
||||
@@ -609,8 +612,8 @@ Public Class frmHauptfenster
|
||||
Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo)
|
||||
If a = vbYes Then
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_nname.ToLower = "celan" Then 'aktuell hardcoded, wenn Zeit ist dynamisch (per SQL-tbl)
|
||||
Dim f As New frmZEButtons("in")
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasMehrereFirmen Then
|
||||
Dim f As New frmZEButtons("in", VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasFirmen)
|
||||
f.ShowDialog()
|
||||
f.BringToFront()
|
||||
Else
|
||||
@@ -656,7 +659,7 @@ Public Class frmHauptfenster
|
||||
Dim bfont = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold)
|
||||
With gridAviso
|
||||
|
||||
.Columns("AvisoID").Visible = False 'AvisoID nicht anzeigen
|
||||
' .Columns("AvisoID").Visible = False 'AvisoID nicht anzeigen
|
||||
|
||||
If Fullscreen Then
|
||||
.Columns("Datum").Visible = True 'Mitarb. nicht anzeigen
|
||||
@@ -679,6 +682,9 @@ Public Class frmHauptfenster
|
||||
.Columns("Status").Width = 25
|
||||
.Columns("Status").HeaderText = "St."
|
||||
|
||||
.Columns("AvisoID").Width = 60
|
||||
.Columns("AvisoID").HeaderText = "LKW-Id"
|
||||
|
||||
.Columns("LetzterMitarbeiter").Width = 135
|
||||
.Columns("LetzterMitarbeiter").HeaderText = "akt. Mitarb"
|
||||
|
||||
@@ -760,6 +766,17 @@ Public Class frmHauptfenster
|
||||
.Columns("LKW_fertig").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
.Columns("LKW_fertig").DefaultCellStyle.Font = bfont
|
||||
|
||||
If cboGrenzstelle._value = "NEU" Then
|
||||
.Columns("VerwahrungStatus").Width = 55
|
||||
.Columns("VerwahrungStatus").HeaderText = "Kontrolle"
|
||||
.Columns("VerwahrungStatus").DefaultCellStyle.ForeColor = Color.White
|
||||
.Columns("VerwahrungStatus").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
.Columns("VerwahrungStatus").DefaultCellStyle.Font = bfont
|
||||
.Columns("VerwahrungStatus").Visible = True
|
||||
Else
|
||||
.Columns("VerwahrungStatus").Visible = False
|
||||
End If
|
||||
|
||||
.Columns("Info").Visible = False
|
||||
.Columns("Info").MinimumWidth = 200
|
||||
.Columns("Info").HeaderText = "Info (Einträge bis zum Status ERFASST)"
|
||||
@@ -810,6 +827,13 @@ Public Class frmHauptfenster
|
||||
'Else
|
||||
'r.Cells("LKW_fertig").Style.BackColor = Color.White
|
||||
End If
|
||||
If r.Cells("VerwahrungStatus").Value = "OK" Then
|
||||
r.Cells("VerwahrungStatus").Style.ForeColor = Color.White
|
||||
r.Cells("VerwahrungStatus").Style.BackColor = Color.Green
|
||||
'Else
|
||||
'r.Cells("LKW_fertig").Style.BackColor = Color.White
|
||||
End If
|
||||
|
||||
|
||||
Next
|
||||
End With
|
||||
@@ -886,127 +910,222 @@ Public Class frmHauptfenster
|
||||
|
||||
Dim datumseinschr = ""
|
||||
Dim top = "TOP 1000 "
|
||||
'Bei ANKUNFT nicht nach Datum einschränken
|
||||
If tbcntrAviso.SelectedTab Is tabAnkunft Or tbcntrAviso.SelectedTab Is tabErfasst Or tbcntrAviso.SelectedTab Is tabVorbereitet Or tbcntrAviso.SelectedTab Is tabVorgeschrieben Then
|
||||
pnlTime.Visible = False
|
||||
Else
|
||||
pnlTime.Visible = True
|
||||
Select Case MyComboBox1._value
|
||||
Case UStatus_none
|
||||
top = " TOP 1000 "
|
||||
Case UStatus_AVEingang : datumseinschr &= " AND AvisoEingang >= " & SQLDatum(dtpVon.Value) & " AND AvisoEingang < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Erfasst : datumseinschr &= " AND Datum >= " & SQLDatum(dtpVon.Value) & " AND Datum < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Vorgeschrieben : datumseinschr &= " AND Vorgeschrieben >= " & SQLDatum(dtpVon.Value) & " AND Vorgeschrieben < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Vorbereitet : datumseinschr &= " AND Vorbereitet >= " & SQLDatum(dtpVon.Value) & " AND Vorbereitet < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Ankunft : datumseinschr &= " AND Ankunft >= " & SQLDatum(dtpVon.Value) & " AND Ankunft < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Freigegeben : datumseinschr &= " AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
End Select
|
||||
End If
|
||||
|
||||
If pnlSearch.Visible Then
|
||||
top = " TOP 1000 "
|
||||
End If
|
||||
Dim hSQL As String = ""
|
||||
If CheckBox1.Checked Then
|
||||
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
'--- LKW ---
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Dim hSQL As String = "SELECT " & top & " AvisoID, Status, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter,CASE WHEN [ZOLLDigitalEingereicht] = 1 THEN 'DE' ELSE CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, "
|
||||
hSQL &= " Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen,isnull(Transportmittelart,'')Transportmittelart"
|
||||
hSQL &= " FROM Aviso "
|
||||
hSQL &= " WHERE 1=1 "
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" And cbxCluster.Checked Then
|
||||
hSQL &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
|
||||
Else
|
||||
hSQL &= " AND FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' "
|
||||
End If
|
||||
If pnlSearch.Visible Then
|
||||
Dim srchkrit = False
|
||||
Dim hSQLSnd = ""
|
||||
hSQLSnd &= " AND ( SELECT COUNT(*) FROM tblSendungen where tblSnd_AvisoId=AvisoId "
|
||||
If txtEmpfänger.Text <> "" Then hSQLSnd &= " AND tblSnd_Empfaenger LIKE '" & txtEmpfänger.Text.Replace("*", "%") & "%' " : srchkrit = True
|
||||
If txtAbsender.Text <> "" Then hSQLSnd &= " AND tblSnd_Absender LIKE '" & txtAbsender.Text.Replace("*", "%") & "%' " : srchkrit = True
|
||||
If txtAuftraggeber.Text <> "" Then hSQLSnd &= " AND tblSnd_Auftraggeber LIKE '" & txtAuftraggeber.Text.Replace("*", "%") & "%' " : srchkrit = True
|
||||
If txtKdAuftragsnr.Text <> "" Then hSQLSnd &= " AND (tblSnd_KdAuftragsNr LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrAvisierer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrEmpfaenger LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrFrachtfuehrer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%') " : srchkrit = True
|
||||
If cboFiliale._value <> "" Then hSQLSnd &= " AND FilialenNr ='" & cboFiliale._value & "'" : srchkrit = True
|
||||
If txtAbfertigungsnummer.Text <> "" Then hSQLSnd &= " AND AbfertigungsNr LIKE '" & txtAbfertigungsnummer.Text.Replace("*", "%") & "' " : srchkrit = True
|
||||
If txtDyRef.Text <> "" Then hSQLSnd &= " AND tblSnd_DakosyRef LIKE '" & txtDyRef.Text.Replace("*", "%") & "' " : srchkrit = True
|
||||
hSQLSnd &= " ) > 0 "
|
||||
If srchkrit = True Then hSQL &= hSQLSnd
|
||||
If txtlkwId.Text <> "" Then hSQL &= " AND AvisoID LIKE '" & txtlkwId.Text.Replace("*", "%") & "' "
|
||||
|
||||
If cbxAlle.Checked = False Then
|
||||
Dim statWhere = ""
|
||||
If cbxErfasst.Checked Then statWhere &= Status_Erfasst & ","
|
||||
If cbxVorb.Checked Then statWhere &= Status_Vorbereitet & ","
|
||||
If cbxVorg.Checked Then statWhere &= Status_Vorgeschrieben & ","
|
||||
If cbxAnkunft.Checked Then statWhere &= Status_Ankunft & ","
|
||||
If cbxFreigabe.Checked Then statWhere &= Status_Freigegeben & ","
|
||||
If cbxNE.Checked Then statWhere &= Status_NichtEingetroffen & ","
|
||||
If statWhere.EndsWith(",") Then statWhere = statWhere.Substring(0, statWhere.Length - 1)
|
||||
If statWhere <> "" Then hSQL &= " AND Status IN ( " & statWhere & " ) " Else hSQL &= " AND 1<>1 "
|
||||
'Bei ANKUNFT nicht nach Datum einschränken
|
||||
If tbcntrAviso.SelectedTab Is tabAnkunft Or tbcntrAviso.SelectedTab Is tabErfasst Or tbcntrAviso.SelectedTab Is tabVorbereitet Or tbcntrAviso.SelectedTab Is tabVorgeschrieben Then
|
||||
pnlTime.Visible = False
|
||||
Else
|
||||
pnlTime.Visible = True
|
||||
Select Case MyComboBox1._value
|
||||
Case UStatus_none
|
||||
top = " TOP 1000 "
|
||||
Case UStatus_AVEingang : datumseinschr &= " AND AvisoEingang >= " & SQLDatum(dtpVon.Value) & " AND AvisoEingang < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Erfasst : datumseinschr &= " AND Datum >= " & SQLDatum(dtpVon.Value) & " AND Datum < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Vorgeschrieben : datumseinschr &= " AND Vorgeschrieben >= " & SQLDatum(dtpVon.Value) & " AND Vorgeschrieben < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Vorbereitet : datumseinschr &= " AND Vorbereitet >= " & SQLDatum(dtpVon.Value) & " AND Vorbereitet < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Ankunft : datumseinschr &= " AND Ankunft >= " & SQLDatum(dtpVon.Value) & " AND Ankunft < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
Case Status_Freigegeben : datumseinschr &= " AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1))
|
||||
End Select
|
||||
End If
|
||||
End If
|
||||
|
||||
hSQL &= datumseinschr
|
||||
If pnlSearch.Visible Then
|
||||
top = " TOP 1000 "
|
||||
End If
|
||||
|
||||
|
||||
If cboGrenzstelle._value = "ALLE_WO" Then
|
||||
hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) "
|
||||
hSQL = "SELECT " & top & " Status, AvisoID, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter,CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],CASE WHEN [ZOLLDigitalEingereicht] = 1 THEN 'DE' WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, "
|
||||
hSQL &= " Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen,isnull(Transportmittelart,'')Transportmittelart"
|
||||
hSQL &= " FROM Aviso "
|
||||
hSQL &= " WHERE 1=1 "
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" And cbxCluster.Checked Then
|
||||
hSQL &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
|
||||
Else
|
||||
hSQL &= " AND FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' "
|
||||
End If
|
||||
If pnlSearch.Visible Then
|
||||
Dim srchkrit = False
|
||||
Dim hSQLSnd = ""
|
||||
hSQLSnd &= " AND ( SELECT COUNT(*) FROM tblSendungen where tblSnd_AvisoId=AvisoId "
|
||||
If txtEmpfänger.Text <> "" Then hSQLSnd &= " AND tblSnd_Empfaenger LIKE '" & txtEmpfänger.Text.Replace("*", "%") & "%' " : srchkrit = True
|
||||
If txtAbsender.Text <> "" Then hSQLSnd &= " AND tblSnd_Absender LIKE '" & txtAbsender.Text.Replace("*", "%") & "%' " : srchkrit = True
|
||||
If txtAuftraggeber.Text <> "" Then hSQLSnd &= " AND tblSnd_Auftraggeber LIKE '" & txtAuftraggeber.Text.Replace("*", "%") & "%' " : srchkrit = True
|
||||
If txtKdAuftragsnr.Text <> "" Then hSQLSnd &= " AND (tblSnd_KdAuftragsNr LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrAvisierer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrEmpfaenger LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrFrachtfuehrer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%') " : srchkrit = True
|
||||
If cboFiliale._value <> "" Then hSQLSnd &= " AND FilialenNr ='" & cboFiliale._value & "'" : srchkrit = True
|
||||
If txtAbfertigungsnummer.Text <> "" Then hSQLSnd &= " AND AbfertigungsNr LIKE '" & txtAbfertigungsnummer.Text.Replace("*", "%") & "' " : srchkrit = True
|
||||
If txtDyRef.Text <> "" Then hSQLSnd &= " AND tblSnd_DakosyRef LIKE '" & txtDyRef.Text.Replace("*", "%") & "' " : srchkrit = True
|
||||
hSQLSnd &= " ) > 0 "
|
||||
If srchkrit = True Then hSQL &= hSQLSnd
|
||||
If txtlkwId.Text <> "" Then hSQL &= " AND AvisoID LIKE '" & txtlkwId.Text.Replace("*", "%") & "' "
|
||||
|
||||
If cbxAlle.Checked = False Then
|
||||
Dim statWhere = ""
|
||||
If cbxErfasst.Checked Then statWhere &= Status_Erfasst & ","
|
||||
If cbxVorb.Checked Then statWhere &= Status_Vorbereitet & ","
|
||||
If cbxVorg.Checked Then statWhere &= Status_Vorgeschrieben & ","
|
||||
If cbxAnkunft.Checked Then statWhere &= Status_Ankunft & ","
|
||||
If cbxFreigabe.Checked Then statWhere &= Status_Freigegeben & ","
|
||||
If cbxNE.Checked Then statWhere &= Status_NichtEingetroffen & ","
|
||||
If statWhere.EndsWith(",") Then statWhere = statWhere.Substring(0, statWhere.Length - 1)
|
||||
If statWhere <> "" Then hSQL &= " AND Status IN ( " & statWhere & " ) " Else hSQL &= " AND 1<>1 "
|
||||
End If
|
||||
End If
|
||||
|
||||
hSQL &= datumseinschr
|
||||
|
||||
|
||||
If cboGrenzstelle._value = "ALLE_WO" Then
|
||||
hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) "
|
||||
|
||||
Else
|
||||
' If SucheStandort <> "" Then hSQL += " AND Grenzstelle = '" & SucheStandort & "'"
|
||||
If cboGrenzstelle._value <> "" Then hSQL += " AND Grenzstelle = '" & cboGrenzstelle._value & "'"
|
||||
' Bestimmungs.ZST
|
||||
If cboGrenzstelle._value = "???" And txtBestimmungszollstelle._value <> "" Then
|
||||
hSQL += " AND Zollstelle = '" & txtBestimmungszollstelle._value & "'"
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
If cboImEx._value <> "" Then
|
||||
Select Case cboImEx._value
|
||||
Case "IMPORT" : hSQL += " AND (ImEx = '" & cboImEx._value & "' OR ImEx = '' )"
|
||||
Case "EXPORT" : hSQL += " AND ImEx = '" & cboImEx._value & "'"
|
||||
End Select
|
||||
|
||||
End If 'Then hSQL += " AND ImEx = '" & cboImEx._value & "'"
|
||||
If cboTeams.Text <> "" Then hSQL += " AND TeamId = '" & cboTeams._value & "'"
|
||||
|
||||
'je nach Auswahl SQL anpassen
|
||||
If tbcntrAviso.SelectedTab Is tabAlle Then
|
||||
'alle
|
||||
'Falls Freigabe/NE bei "ALLE" eingeschränkt werden sollte::: 'hSQL += " AND (Status NOT IN (1,2) OR (Status=1 AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1)) & ") OR (Status=2 AND [Datum] >= " & SQLDatum(dtpVon.Value) & " AND [Datum] < " & SQLDatum(dtpBis.Value.AddDays(1)) & "))"
|
||||
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabErfasst Then 'Erfasst
|
||||
hSQL += " AND Status = 0"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabVorbereitet Then 'Vorbereitet
|
||||
hSQL += " AND Status = 4"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabVorgeschrieben Then 'Vorgeschrieben
|
||||
hSQL += " AND Status = 5"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabAnkunft Then 'Ankunft
|
||||
hSQL += " AND Status = 3"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabFreigegeben Then 'Freigegeben
|
||||
hSQL += " AND Status = 1"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabVERIMEX Then 'Nicht Eingetroffen
|
||||
hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabINDONESIEN Then 'Nicht Eingetroffen
|
||||
hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabNichtEingetroffen Then 'Nicht Eingetroffen
|
||||
hSQL += " AND Status = 2"
|
||||
End If
|
||||
|
||||
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 & "%' OR DakosyRef LIKE '%" & search & "%' )"
|
||||
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And search.Length = 8 Then 'AbfertigungsNr Suche für ATILLA, length, damit nicht unnötig der Verweis zu tblSendungen hergestellt wird --> performance
|
||||
' hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' OR (SELECT count(*) FROM tblSendungen WHERE AbfertigungsNr LIKE '%" & search & "%' AND FilialenNr=4801 AND tblSnd_AvisoID=AvisoId)>0 ) "
|
||||
'Else
|
||||
' 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
|
||||
End If
|
||||
|
||||
|
||||
hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC"
|
||||
|
||||
|
||||
Else
|
||||
' If SucheStandort <> "" Then hSQL += " AND Grenzstelle = '" & SucheStandort & "'"
|
||||
If cboGrenzstelle._value <> "" Then hSQL += " AND Grenzstelle = '" & cboGrenzstelle._value & "'"
|
||||
' Bestimmungs.ZST
|
||||
If cboGrenzstelle._value = "???" And txtBestimmungszollstelle._value <> "" Then
|
||||
hSQL += " AND Zollstelle = '" & txtBestimmungszollstelle._value & "'"
|
||||
|
||||
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
'--- Sendung ---
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
|
||||
If cboMyAvisoAnzeige._value <> "" Then
|
||||
If cboMyAvisoAnzeige._value = "ALLE" Then
|
||||
' inBearbeitungSQL = " 1=1 " 'ALLE
|
||||
inBearbeitungSQL = " ( (tblSendungen.[tblSnd_TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) OR (Aviso.[TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND tblSendungen.[tblSnd_TeamId] is null)) OR [tblSendungen].tblSnd_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR tblSendungen.LetzterMitarbeiterId=@maId) "
|
||||
ElseIf cboMyAvisoAnzeige._value = "T1" Then
|
||||
inBearbeitungSQL = " tblSnd_Abfertigungsart_ID=5 "
|
||||
'NUR VERAG/IMEX:
|
||||
inBearbeitungSQL &= " AND FilialenNr IN (SELECT FilialenNr FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE Filialen.FilialenNr=tblSendungen.FilialenNr and Filialen.Firma IN ('VERAG','IMEX')) "
|
||||
ElseIf cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
|
||||
If cboMyAvisoAnzeige._value = "27" Then ' TEAM SALZBURG
|
||||
inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId
|
||||
OR Grenzstelle IN('SBG') OR (tblSendungen.FilialenNr IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66)) ) "
|
||||
Else
|
||||
inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
|
||||
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
hSQL = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " &
|
||||
" ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " &
|
||||
" FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " &
|
||||
" WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
hSQLFirma & " AND ( " & inBearbeitungSQL & ") "
|
||||
|
||||
If cboImEx._value <> "" Then
|
||||
Select Case cboImEx._value
|
||||
Case "IMPORT" : hSQL += " AND (ImEx = '" & cboImEx._value & "' OR ImEx = '' )"
|
||||
Case "EXPORT" : hSQL += " AND ImEx = '" & cboImEx._value & "'"
|
||||
Select Case cboMy_VB.CheckState
|
||||
Case CheckState.Checked : hSQL &= " AND tblSnd_Vorgeschrieben is not null "
|
||||
Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorgeschrieben is null "
|
||||
' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null "
|
||||
End Select
|
||||
Select Case cboMy_QS.CheckState
|
||||
Case CheckState.Checked : hSQL &= " AND tblSnd_Vorbereitet is not null "
|
||||
Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorbereitet is null "
|
||||
' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null "
|
||||
End Select
|
||||
If cboMy_Grenzstelle._value = "ALLE_WO" Then
|
||||
hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) "
|
||||
|
||||
End If 'Then hSQL += " AND ImEx = '" & cboImEx._value & "'"
|
||||
If cboTeams.Text <> "" Then hSQL += " AND TeamId = '" & cboTeams._value & "'"
|
||||
Else
|
||||
|
||||
'je nach Auswahl SQL anpassen
|
||||
If tbcntrAviso.SelectedTab Is tabAlle Then
|
||||
'alle
|
||||
'Falls Freigabe/NE bei "ALLE" eingeschränkt werden sollte::: 'hSQL += " AND (Status NOT IN (1,2) OR (Status=1 AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1)) & ") OR (Status=2 AND [Datum] >= " & SQLDatum(dtpVon.Value) & " AND [Datum] < " & SQLDatum(dtpBis.Value.AddDays(1)) & "))"
|
||||
If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then hSQL &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'"
|
||||
If cboMy_Grenzstelle._value = "ALLE_BACK" Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
|
||||
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabErfasst Then 'Erfasst
|
||||
hSQL += " AND Status = 0"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabVorbereitet Then 'Vorbereitet
|
||||
hSQL += " AND Status = 4"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabVorgeschrieben Then 'Vorgeschrieben
|
||||
hSQL += " AND Status = 5"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabAnkunft Then 'Ankunft
|
||||
hSQL += " AND Status = 3"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabFreigegeben Then 'Freigegeben
|
||||
hSQL += " AND Status = 1"
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabVERIMEX Then 'Nicht Eingetroffen
|
||||
hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabINDONESIEN Then 'Nicht Eingetroffen
|
||||
hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN
|
||||
ElseIf tbcntrAviso.SelectedTab Is tabNichtEingetroffen Then 'Nicht Eingetroffen
|
||||
hSQL += " AND Status = 2"
|
||||
End If
|
||||
End If
|
||||
|
||||
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 & "%' OR DakosyRef LIKE '%" & search & "%' )"
|
||||
If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') "
|
||||
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And search.Length = 8 Then 'AbfertigungsNr Suche für ATILLA, length, damit nicht unnötig der Verweis zu tblSendungen hergestellt wird --> performance
|
||||
' hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' OR (SELECT count(*) FROM tblSendungen WHERE AbfertigungsNr LIKE '%" & search & "%' AND FilialenNr=4801 AND tblSnd_AvisoID=AvisoId)>0 ) "
|
||||
'Else
|
||||
' hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' )"
|
||||
'Farbe
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
Select Case btnColor.BackColor
|
||||
Case Color.Red
|
||||
hSQL &= " AND (Status = 3 ) "
|
||||
Case Color.Orange
|
||||
' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE() AS DATE) ) ) "
|
||||
hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(DATEADD(DAY, " & getDaysVorschreiben(1) & ",GETDATE()) AS DATE) ) ) "
|
||||
Case Color.Yellow
|
||||
hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY," & getDaysVorschreiben(2) & ",GETDATE()) AS DATE) AND cast(DATEADD(DAY," & getDaysVorschreiben(3) & ",GETDATE()) AS DATE) ) ) "
|
||||
End Select
|
||||
End If
|
||||
''Farbe
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then
|
||||
' Select Case btnColor.BackColor
|
||||
' Case Color.Red
|
||||
' hSQL &= " AND (Status = 3 OR (Status IN (0, 3, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE)<= cast(GETDATE() AS DATE) ) or VoraussichtlichesEintreffen is null) "
|
||||
' Case Color.Orange
|
||||
' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) = cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) "
|
||||
' Case Color.Yellow
|
||||
' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 2,GETDATE()) AS DATE) AND cast(DATEADD(DAY, 3,GETDATE()) AS DATE) ) ) "
|
||||
' End Select
|
||||
'End If
|
||||
|
||||
'hSQL &= " AND (Grenzstelle ='???' OR Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen!
|
||||
' Funktioniert nciht, wg. WO
|
||||
|
||||
hSQL &= " ORDER BY case " & " when [Status] =3 then 0 " & " when [Status] =1 then 5 " & " else 1 " & " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
|
||||
|
||||
End If
|
||||
|
||||
|
||||
hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC"
|
||||
' MsgBox(hSQL)
|
||||
'If hSort = "" Then
|
||||
'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC"
|
||||
@@ -1026,10 +1145,14 @@ Public Class frmHauptfenster
|
||||
'AVISOBinding.initBinding(hSQL, "Aviso")
|
||||
'gridAviso.DataSource = AVISOBinding.bindingSource
|
||||
|
||||
' MsgBox(hSQL)
|
||||
'MsgBox(DirectCast(gridAviso.DataSource, DataTable).Rows.Count)
|
||||
'Grid neu designen
|
||||
|
||||
gridAviso_SpaltenFestlegen()
|
||||
|
||||
If CheckBox1.Checked Then
|
||||
gridAviso_SpaltenFestlegen()
|
||||
End If
|
||||
|
||||
'Tabelle Kommt/Geht bereinigen
|
||||
If gridAviso.RowCount = 0 Then
|
||||
gridAviso.DataSource = Nothing
|
||||
@@ -1258,7 +1381,7 @@ Public Class frmHauptfenster
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
'--- LKW ---
|
||||
'----------------------------------------------------------------------------------------------------------------------------------
|
||||
sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe,LetzterMitarbeiterId AS maId, LetzterMitarbeiterId ,/* CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,*/LetzterMitarbeiter,AvisoTVHinweis " &
|
||||
sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe,LetzterMitarbeiterId AS maId, LetzterMitarbeiterId ,/* CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,*/LetzterMitarbeiter,AvisoTVHinweis " &
|
||||
" FROM Aviso " &
|
||||
" WHERE ( Status IN (0, 3, 4, 5,6,7) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
sqlStrFirma & " AND (LetzterMitarbeiterId=@maId) "
|
||||
@@ -1310,7 +1433,7 @@ Public Class frmHauptfenster
|
||||
End If
|
||||
End If
|
||||
|
||||
sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " &
|
||||
sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " &
|
||||
" ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " &
|
||||
" FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " &
|
||||
" WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " &
|
||||
@@ -1481,7 +1604,16 @@ Public Class frmHauptfenster
|
||||
.Columns("LKW_fertig").HeaderText = "OK"
|
||||
.Columns("LKW_fertig").DefaultCellStyle.ForeColor = Color.White
|
||||
.Columns("LKW_fertig").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
'.Columns("LKW_fertig").DefaultCellStyle.Font = bfont
|
||||
|
||||
If cboGrenzstelle._value = "NEU" Then
|
||||
.Columns("VerwahrungStatus").Width = 55
|
||||
.Columns("VerwahrungStatus").HeaderText = "Kontrolle"
|
||||
.Columns("VerwahrungStatus").DefaultCellStyle.ForeColor = Color.White
|
||||
.Columns("VerwahrungStatus").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
.Columns("VerwahrungStatus").Visible = True
|
||||
Else
|
||||
.Columns("VerwahrungStatus").Visible = False
|
||||
End If
|
||||
|
||||
If gridMyAviso.RowCount = 0 Then gridMyAviso.Columns.Clear() : Exit Sub
|
||||
|
||||
@@ -1611,6 +1743,7 @@ Public Class frmHauptfenster
|
||||
End If
|
||||
|
||||
|
||||
If r.Cells("VerwahrungStatus").Value = "OK" Then r.Cells("LKW_fertig").Style.BackColor = Color.Green
|
||||
If r.Cells("LKW_fertig").Value = "OK" Then r.Cells("LKW_fertig").Style.BackColor = Color.FromArgb(0, 54, 128)
|
||||
If r.Cells("LKW_fertig").Value = "DE" Then r.Cells("LKW_fertig").Style.BackColor = Color.Green
|
||||
If r.Cells("Dauer").Value > 120 Then r.Cells("DauerText").Style.ForeColor = Color.Red
|
||||
@@ -1691,7 +1824,7 @@ Public Class frmHauptfenster
|
||||
' MsgBox(ex.Message)
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
' Grid_aktiv = True
|
||||
' Grid_aktiv = True
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -2840,6 +2973,9 @@ Public Class frmHauptfenster
|
||||
|
||||
|
||||
tbcntrAviso.Width = Panel1.Width
|
||||
|
||||
TabControl1.Location = New Point(tbcntrAviso.Location.X + getTbControlWidth(tbcntrAviso) + 80, TabControl1.Location.Y)
|
||||
TabControl1.SelectedIndex = -1
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me)
|
||||
|
||||
BürgschaftenExcelToolStripMenuItem.Visible = False
|
||||
@@ -2857,8 +2993,20 @@ Public Class frmHauptfenster
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Function getTbControlWidth(tbcntr) As Integer
|
||||
Dim totalWidth As Integer = 0
|
||||
|
||||
' Durchlaufe alle TabPages und summiere die Breite der Tabs
|
||||
For i As Integer = 0 To tbcntr.TabCount - 1
|
||||
totalWidth += tbcntr.GetTabRect(i).Width
|
||||
Next
|
||||
|
||||
Return totalWidth
|
||||
End Function
|
||||
|
||||
WithEvents timerStart As New Timer
|
||||
|
||||
Private Sub timerStart_Tick(sender As Object, e As EventArgs) Handles timerStart.Tick
|
||||
@@ -2921,8 +3069,8 @@ Public Class frmHauptfenster
|
||||
' If SplitContainer1.Panel2.Width > 700 And (SplitContainer1.Width - 760) > 0 Then
|
||||
' SplitContainer1.SplitterDistance = SplitContainer1.Width - 760
|
||||
' End If
|
||||
If SplitContainer1.Panel2.Width > 700 And (SplitContainer1.Width - 630) > 0 Then
|
||||
SplitContainer1.SplitterDistance = SplitContainer1.Width - 630
|
||||
If SplitContainer1.Panel2.Width > 700 And (SplitContainer1.Width - 660) > 0 Then
|
||||
SplitContainer1.SplitterDistance = SplitContainer1.Width - 660
|
||||
End If
|
||||
|
||||
End Sub
|
||||
@@ -3437,7 +3585,7 @@ Public Class frmHauptfenster
|
||||
Public Sub showHideDetails()
|
||||
If sd <> SplitContainer1.SplitterDistance Or SplitContainer1.Panel2.Size.Width = 15 Then
|
||||
SplitContainer1.SplitterDistance = sd
|
||||
SplitContainer1.Panel2MinSize = 300
|
||||
SplitContainer1.Panel2MinSize = 600 '300
|
||||
Fullscreen = False
|
||||
Else
|
||||
SplitContainer1.Panel2MinSize = 15
|
||||
@@ -3631,7 +3779,7 @@ Public Class frmHauptfenster
|
||||
Grid_aktiv = True
|
||||
End Sub
|
||||
|
||||
Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click
|
||||
Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click, CheckBox1.CheckedChanged
|
||||
Aviso_anzeigen("")
|
||||
End Sub
|
||||
|
||||
@@ -4245,7 +4393,7 @@ Public Class frmHauptfenster
|
||||
Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click, Label22.Click
|
||||
Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnE_Aviso.Click, Label22.Click
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Dim f As New frm_eAVISO
|
||||
f.Show()
|
||||
@@ -4803,8 +4951,87 @@ Public Class frmHauptfenster
|
||||
End Sub
|
||||
|
||||
Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
|
||||
Dim resp = GetDataFromSharePoint("https://dpdhl.sharepoint.com/sites/FRTTR-Verag", "TruckList", "al@verag.ag", "Muellerskuh1!")
|
||||
MsgBox(resp)
|
||||
'saveLukowaPDFsFromTherefore()
|
||||
End Sub
|
||||
|
||||
saveLukowaPDFsFromTherefore()
|
||||
|
||||
|
||||
Public Function GetDataFromSharePoint(siteUrl As String, listName As String, username As String, password As String) As String
|
||||
'' SharePoint-URL und Liste konfigurieren
|
||||
'Dim requestUrl As String = siteUrl & "/_api/web/lists/getbytitle('" & listName & "')/items"
|
||||
|
||||
'' Authentifizierung: Benutzername und Passwort als Basis64
|
||||
'Dim credentials As String = Convert.ToBase64String(Encoding.ASCII.GetBytes(username & ":" & password))
|
||||
|
||||
'' HTTP-Anfrage vorbereiten
|
||||
'Dim request As HttpWebRequest = CType(WebRequest.Create(requestUrl), HttpWebRequest)
|
||||
'request.Method = "GET"
|
||||
'request.Accept = "application/json;odata=verbose"
|
||||
'request.Headers("Authorization") = "Basic " & credentials
|
||||
|
||||
'Try
|
||||
' ' Antwort von SharePoint erhalten
|
||||
' Using response As HttpWebResponse = CType(request.GetResponse(), HttpWebResponse)
|
||||
' Using reader As New StreamReader(response.GetResponseStream())
|
||||
' Dim jsonResponse As String = reader.ReadToEnd()
|
||||
' Return jsonResponse
|
||||
' End Using
|
||||
' End Using
|
||||
'Catch ex As WebException
|
||||
' ' Fehlerbehandlung
|
||||
' Return "Fehler: " & ex.Message
|
||||
'End Try
|
||||
' 1. Zugriffstoken abrufen
|
||||
|
||||
|
||||
'-------------------------------------
|
||||
|
||||
|
||||
|
||||
' Dim authority As String = $"https://login.microsoftonline.com/{tenantId}"
|
||||
' Dim scopes As String() = {"https://graph.microsoft.com/.default"}
|
||||
|
||||
' ' Authentifizierung mit dem vertraulichen Client
|
||||
' Dim app As IConfidentialClientApplication = ConfidentialClientApplicationBuilder.Create(clientId).
|
||||
' WithClientSecret(clientSecret).
|
||||
' WithAuthority(New Uri(authority)).
|
||||
' Build()
|
||||
|
||||
' ' Token abrufen
|
||||
' Dim authResult = Await app.AcquireTokenForClient(scopes).ExecuteAsync()
|
||||
|
||||
'' 2. Zugriff auf SharePoint
|
||||
'Dim requestUrl As String = $"{siteUrl}/_api/web/lists/getbytitle('{listName}')/items"
|
||||
' Using client As New HttpClient()
|
||||
' client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", authResult.AccessToken)
|
||||
' client.DefaultRequestHeaders.Accept.Add(New MediaTypeWithQualityHeaderValue("application/json"))
|
||||
|
||||
' ' GET-Anfrage an SharePoint senden
|
||||
' Dim response As HttpResponseMessage = Await client.GetAsync(requestUrl)
|
||||
|
||||
' ' Antwort prüfen und zurückgeben
|
||||
' If response.IsSuccessStatusCode Then
|
||||
' Dim jsonResponse As String = Await response.Content.ReadAsStringAsync()
|
||||
' Return jsonResponse
|
||||
' Else
|
||||
' Return $"Fehler: {response.StatusCode} - {response.ReasonPhrase}"
|
||||
' End If
|
||||
' End Using
|
||||
End Function
|
||||
|
||||
Private Sub Button7_Click_1(sender As Object, e As EventArgs) Handles Button7.Click
|
||||
|
||||
|
||||
Dim f As New frmSendungsdetailsNEU
|
||||
|
||||
Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, f.SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen
|
||||
NEW_SND.SAVE(False) 'Insert neue Sendung
|
||||
f.SENDUNG_LIST.Add(NEW_SND)
|
||||
|
||||
f.UNBOUND = True
|
||||
f.Show()
|
||||
End Sub
|
||||
|
||||
Private Sub TVEditorNewToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TVEditorNewToolStripMenuItem.Click
|
||||
@@ -4891,6 +5118,24 @@ Public Class AvisoStatusFunctions
|
||||
Next
|
||||
End Sub
|
||||
|
||||
Public Function printQR_CODE(aviso As VERAG_PROG_ALLGEMEIN.cAviso) As Boolean
|
||||
If aviso Is Nothing Then Return False
|
||||
|
||||
Select Case aviso.Grenzstelle
|
||||
Case "NEU", "DTB", "NKN"
|
||||
Dim rpt As New rptQRSendung_VerwahrungApp(aviso, Nothing)
|
||||
Dim printer = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_BON
|
||||
If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("BON", True)
|
||||
If printer = "" Then printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True)
|
||||
|
||||
'If printer = "" Then
|
||||
SDL.cProgramFunctions.printRpt(rpt, printer, True)
|
||||
Return True
|
||||
' End If
|
||||
End Select
|
||||
|
||||
Return False
|
||||
End Function
|
||||
Public Function setAnkunft(AvisoID) As Boolean
|
||||
|
||||
If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
|
||||
@@ -4961,7 +5206,7 @@ Public Class AvisoStatusFunctions
|
||||
'Fahrer Handy-Nr.
|
||||
Dim frmAnkunftSetzen As New frmAnkunftSetzen(Aviso)
|
||||
If frmAnkunftSetzen.ShowDialog() = DialogResult.Cancel Then
|
||||
Return -1 'Abbrechen
|
||||
Return False 'Abbrechen
|
||||
End If
|
||||
'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
|
||||
' If Aviso.Grenzstelle.Replace("???", "") <> "" Then
|
||||
@@ -4996,6 +5241,8 @@ Public Class AvisoStatusFunctions
|
||||
End If
|
||||
|
||||
|
||||
'Verwahrungs-Ticket Drucken, wenn parameter
|
||||
printQR_CODE(Aviso)
|
||||
'Ticket Drucken, wenn parameter
|
||||
If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("TICKET_ANKUNFT") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("TICKET_ANKUNFT", "AVISO") Then
|
||||
Dim rpt As New rptQRAviso(Aviso)
|
||||
|
||||
Reference in New Issue
Block a user