Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO
This commit is contained in:
@@ -46,14 +46,14 @@ Public Class usrctlStatVERIMEX
|
|||||||
End Select
|
End Select
|
||||||
|
|
||||||
With dgvAbfertigungTR
|
With dgvAbfertigungTR
|
||||||
Dim sqlstr = "SELECT mit_vname + ' ' + mit_nname as Mitarbeiter ,sum(tblSnd_anzahlHandling) as Versandscheine ,sum(tblSnd_anzahlHandlingPos) as Positionen ,count(distinct(avisoid)) as LKW
|
Dim sqlstr = "SELECT mit_vname + ' ' + mit_nname as Mitarbeiter ,sum(tblSnd_AbfertigungTRAnzahl) as Versandscheine ,sum(tblSnd_AbfertigungTRAnzahlPos) as Positionen ,count(distinct(avisoid)) as LKW
|
||||||
FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbfertigungTR_MA
|
FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbfertigungTR_MA
|
||||||
" & innerJoinFiliale & "
|
" & innerJoinFiliale & "
|
||||||
where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "' and tblSnd_AbfertigungTR_MA is not null
|
where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "' and tblSnd_AbfertigungTR_MA is not null
|
||||||
" & whereFiliale & "
|
" & whereFiliale & "
|
||||||
group by mit_vname,mit_nname"
|
group by mit_vname,mit_nname"
|
||||||
'früher: Datum statt tblSnd_AbfertigungTR
|
'früher: Datum statt tblSnd_AbfertigungTR
|
||||||
|
'MsgBox(sqlstr)
|
||||||
dgvAbfertigungTR.DataSource = SQL.loadDgvBySql(sqlstr, "AVISO")
|
dgvAbfertigungTR.DataSource = SQL.loadDgvBySql(sqlstr, "AVISO")
|
||||||
|
|
||||||
End With
|
End With
|
||||||
@@ -76,11 +76,11 @@ Public Class usrctlStatVERIMEX
|
|||||||
|
|
||||||
|
|
||||||
Dim print As New frmPrintLayout
|
Dim print As New frmPrintLayout
|
||||||
print.Text = "Speditionsbericht"
|
print.Text = "Speditionsbericht"
|
||||||
|
|
||||||
Dim rpt As New rptStat_VERIMEX_AbklTR
|
Dim rpt As New rptStat_VERIMEX_AbklTR
|
||||||
|
|
||||||
rpt.DataSource = dgvAbklaerungTR.DataSource
|
rpt.DataSource = dgvAbklaerungTR.DataSource
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -92,39 +92,39 @@ Public Class usrctlStatVERIMEX
|
|||||||
End If
|
End If
|
||||||
|
|
||||||
Dim sum = 0
|
Dim sum = 0
|
||||||
rpt.lblUeberschrift.Text = "Sendungserfassung TR " & datStatVon.Text & " bis " & datStatBis.Text
|
rpt.lblUeberschrift.Text = "Sendungserfassung TR " & datStatVon.Text & " bis " & datStatBis.Text
|
||||||
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
|
rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
|
||||||
'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
|
'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & " / " & PERSONAL.Niederlassung
|
||||||
|
|
||||||
'Dim cnt As Integer = 0
|
'Dim cnt As Integer = 0
|
||||||
rpt.lblDat.Text = Now.ToLongDateString
|
rpt.lblDat.Text = Now.ToLongDateString
|
||||||
Dim sumSnd As Integer = 0
|
Dim sumSnd As Integer = 0
|
||||||
Dim sumLKW As Integer = 0
|
Dim sumLKW As Integer = 0
|
||||||
|
|
||||||
|
|
||||||
AddHandler rpt.Detail.Format, Sub()
|
AddHandler rpt.Detail.Format, Sub()
|
||||||
'rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString
|
'rpt.lblVon.Text = CDate(rpt.Fields.Item("von").Value).ToShortDateString
|
||||||
'rpt.lblBis.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString
|
'rpt.lblBis.Text = CDate(rpt.Fields.Item("bis").Value).ToShortDateString
|
||||||
rpt.lblAnzSnd.Text = rpt.Fields.Item("Sendungen").Value
|
rpt.lblAnzSnd.Text = rpt.Fields.Item("Sendungen").Value
|
||||||
rpt.lblAnzLKW.Text = rpt.Fields.Item("LKW").Value
|
rpt.lblAnzLKW.Text = rpt.Fields.Item("LKW").Value
|
||||||
|
|
||||||
rpt.lblMitarbeiter.Text = rpt.Fields.Item("Mitarbeiter").Value
|
rpt.lblMitarbeiter.Text = rpt.Fields.Item("Mitarbeiter").Value
|
||||||
|
|
||||||
sumSnd += CInt(rpt.Fields.Item("Sendungen").Value)
|
sumSnd += CInt(rpt.Fields.Item("Sendungen").Value)
|
||||||
sumLKW += CInt(rpt.Fields.Item("LKW").Value)
|
sumLKW += CInt(rpt.Fields.Item("LKW").Value)
|
||||||
End Sub
|
End Sub
|
||||||
AddHandler rpt.GroupHeader1.Format, Sub()
|
AddHandler rpt.GroupHeader1.Format, Sub()
|
||||||
' If CheckBox1.Checked Then rpt.lblFiliale.Text = SQL.getValueTxtBySql("SELECT CAST(FilialenNr as varchar (4)) + ' ' + Grenzstelle FROM filialen WHERE FilialenNr='" & rpt.Fields.Item("FilialenNr").Value & "'", "FMZOLL")
|
' If CheckBox1.Checked Then rpt.lblFiliale.Text = SQL.getValueTxtBySql("SELECT CAST(FilialenNr as varchar (4)) + ' ' + Grenzstelle FROM filialen WHERE FilialenNr='" & rpt.Fields.Item("FilialenNr").Value & "'", "FMZOLL")
|
||||||
sumSnd = 0
|
sumSnd = 0
|
||||||
sumLKW = 0
|
sumLKW = 0
|
||||||
End Sub
|
End Sub
|
||||||
AddHandler rpt.GroupFooter1.Format, Sub()
|
AddHandler rpt.GroupFooter1.Format, Sub()
|
||||||
rpt.lblAnzSndSum.Text = sumSnd
|
rpt.lblAnzSndSum.Text = sumSnd
|
||||||
rpt.lblAnzLKWSum.Text = sumLKW
|
rpt.lblAnzLKWSum.Text = sumLKW
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
print.Viewer.LoadDocument(rpt)
|
print.Viewer.LoadDocument(rpt)
|
||||||
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
|
print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
|
||||||
print.Show()
|
print.Show()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
@@ -173,16 +173,16 @@ Public Class usrctlStatVERIMEX
|
|||||||
|
|
||||||
Dim whereFiliale = ""
|
Dim whereFiliale = ""
|
||||||
Dim innerJoinFiliale = ""
|
Dim innerJoinFiliale = ""
|
||||||
Select Case cboFirma._value
|
Select Case cboFirma._value
|
||||||
Case ""
|
Case ""
|
||||||
Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 "
|
Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 "
|
||||||
Case Else
|
Case Else
|
||||||
whereFiliale = " and Filialen.Firma='" & cboFirma._value & "' "
|
whereFiliale = " and Filialen.Firma='" & cboFirma._value & "' "
|
||||||
innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
|
innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
|
||||||
End Select
|
End Select
|
||||||
|
|
||||||
|
|
||||||
Dim sqlstr = "SELECT (Select isnull(Filialen.firma,'') FROM [FMZOLL\SQLFMZOLL].VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
|
Dim sqlstr = "SELECT (Select isnull(Filialen.firma,'') FROM [FMZOLL\SQLFMZOLL].VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
|
||||||
mit_vname + ' ' + mit_nname as Mitarbeiter, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSnd_Empfaenger as Empfänger, tblSnd_Colli Colli, tblSnd_Gewicht Gewicht, tblSnd_Abfertigungsart_ID Abfertigungsart, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
|
mit_vname + ' ' + mit_nname as Mitarbeiter, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSnd_Empfaenger as Empfänger, tblSnd_Colli Colli, tblSnd_Gewicht Gewicht, tblSnd_Abfertigungsart_ID Abfertigungsart, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
|
||||||
FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
|
FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
|
||||||
" & innerJoinFiliale & "
|
" & innerJoinFiliale & "
|
||||||
@@ -215,7 +215,7 @@ Public Class usrctlStatVERIMEX
|
|||||||
innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
|
innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
|
||||||
End Select
|
End Select
|
||||||
|
|
||||||
Dim sqlstr = "SELECT mit_vname + ' ' + mit_nname as Mitarbeiter ,tblSnd_anzahlHandling as AnzahlVersandscheine ,tblSnd_anzahlHandlingPos as AnzahlPositionen, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
|
Dim sqlstr = "SELECT mit_vname + ' ' + mit_nname as Mitarbeiter ,tblSnd_AbfertigungTRAnzahl as AnzahlVersandscheine ,tblSnd_AbfertigungTRAnzahlPos as AnzahlPositionen, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
|
||||||
FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbfertigungTR_MA
|
FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbfertigungTR_MA
|
||||||
" & innerJoinFiliale & "
|
" & innerJoinFiliale & "
|
||||||
where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "' and tblSnd_AbfertigungTR_MA is not null
|
where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "' and tblSnd_AbfertigungTR_MA is not null
|
||||||
|
|||||||
@@ -6172,8 +6172,8 @@ Public Class AvisoStatusFunctions
|
|||||||
' Return False
|
' Return False
|
||||||
'End If
|
'End If
|
||||||
|
|
||||||
SENDUNG_TMP.tblSnd_anzahlHandling = anzahl
|
SENDUNG_TMP.tblSnd_AbfertigungTRAnzahl = anzahl
|
||||||
SENDUNG_TMP.tblSnd_anzahlHandlingPos = anzahlPos
|
SENDUNG_TMP.tblSnd_AbfertigungTRAnzahlPos = anzahlPos
|
||||||
|
|
||||||
If SENDUNG_TMP.tblSnd_AbfertigungTR Is Nothing Then
|
If SENDUNG_TMP.tblSnd_AbfertigungTR Is Nothing Then
|
||||||
SENDUNG_TMP.tblSnd_AbfertigungTR_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
|
SENDUNG_TMP.tblSnd_AbfertigungTR_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
|
||||||
|
|||||||
Reference in New Issue
Block a user