diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 342a82c6..a13659d6 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb b/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb index 6d86ea66..4e4b61b6 100644 --- a/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb +++ b/SDL/Reports/Zoll/rptKontrolleLKW_Dakosy.vb @@ -7,6 +7,7 @@ Public Class rptKontrolleLKW_Dakosy Public datVon As Date Public datBis As Date Public FIRMA As String = "ATILLA" + Public NCTSSystemDY As String = "NCTS5" Dim operatorID = "1" Dim kundenSQL As New kundenSQL Dim SUB_DATA As DataTable = Nothing @@ -58,33 +59,63 @@ Public Class rptKontrolleLKW_Dakosy firmaStr = " AND (ncts_ObjectName LIKE 'A20%' OR ncts_ObjectName LIKE '5701%' ) " Else 'ATILLA 'firmaStr = " AND ncts_ObjectName NOT LIKE 'DU%' " - firmaStr = " AND ncts_ObjectName LIKE '4801%' " + firmaStr = " AND (ncts_ObjectName LIKE '4801%' OR ncts_ObjectName LIKE '4802%' ) " End If ' If FIRMA = "ATILLA" Then operatorID = "'5','6'" - Dim sqlStr As String = " SELECT isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen, cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum,COUNT(*) ,isnull(SUM(nctsSA_AbgabenBetrag),0) as GarantieWert FROM tblDakosy_NCTSOut_Sicherheitsangaben inner join [VERAG].[dbo].[tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId " - sqlStr &= " WHERE cast ([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStr &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " - sqlStr &= " AND ncts_status BETWEEN 50 AND 60 " - sqlStr &= firmaStr - ' sqlStr &= " and vw.OperatorId IN (" & operatorID & ")" - sqlStr &= " group by cast([ncts_Trans_DatumZeit] as date),ncts_Befoerderungsmittel_KennzeichenAbgang" - sqlStr &= " order by cast([ncts_Trans_DatumZeit] as date)" + Dim sqlStr As String = "" + Dim sqlStrSUB As String = "" + Select Case NCTSSystemDY + Case "NCTS5" + sqlStr = " SELECT isnull(ncts_DepartureTransportMeans_1_IdentificationNumber,isnull(ncts_ActiveBorderTransportMeans_1_IdentificationNumber,'')) as Kennzeichen, cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum,COUNT(*) ,isnull(SUM(nctsGRT_AmountToBeCovered),0) as GarantieWert " + sqlStr &= " FROM tblDakosy_NCTSOut004_Guarantee inner join [tblDakosy_NCTSOut004] on ncts_Id = nctsGRT_NctsId " + sqlStr &= " WHERE cast ([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" + sqlStr &= " AND nctsGRT_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStr &= " AND ncts_status BETWEEN 50 AND 60 " + sqlStr &= firmaStr + ' sqlStr &= " and vw.OperatorId IN (" & operatorID & ")" + sqlStr &= " group by cast([ncts_Trans_DatumZeit] as date), isnull(ncts_DepartureTransportMeans_1_IdentificationNumber,isnull(ncts_ActiveBorderTransportMeans_1_IdentificationNumber,''))" + sqlStr &= " order by cast([ncts_Trans_DatumZeit] as date)" + + + + sqlStrSUB = " SELECT *, nctsGRT_AmountToBeCovered as nctsSA_AbgabenBetrag,nctsGRT_GRN as nctsSA_GRN, isnull(nctsGRT_AmountToBeCovered,0) as GarantieWert,isnull(ncts_DepartureTransportMeans_1_IdentificationNumber,isnull(ncts_ActiveBorderTransportMeans_1_IdentificationNumber,'')) as Kennzeichen,cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum " + sqlStrSUB &= " FROM tblDakosy_NCTSOut004_Guarantee inner join [tblDakosy_NCTSOut004] on ncts_Id = nctsGRT_NctsId " + sqlStrSUB &= " WHERE cast([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" + sqlStrSUB &= " AND nctsGRT_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStrSUB &= " AND ncts_status BETWEEN 50 AND 60 " + sqlStrSUB &= firmaStr + ' sqlStrSUB &= " and vw.OperatorId IN (" & operatorID & ")" + + sqlStrSUB &= " order by cast([ncts_Trans_DatumZeit] as date),ncts_ObjectName" + Case Else + sqlStr = " SELECT isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen, cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum,COUNT(*) ,isnull(SUM(nctsSA_AbgabenBetrag),0) as GarantieWert FROM tblDakosy_NCTSOut_Sicherheitsangaben inner join [VERAG].[dbo].[tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId " + sqlStr &= " WHERE cast ([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" + sqlStr &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStr &= " AND ncts_status BETWEEN 50 AND 60 " + sqlStr &= firmaStr + ' sqlStr &= " and vw.OperatorId IN (" & operatorID & ")" + sqlStr &= " group by cast([ncts_Trans_DatumZeit] as date),ncts_Befoerderungsmittel_KennzeichenAbgang" + sqlStr &= " order by cast([ncts_Trans_DatumZeit] as date)" + + + sqlStrSUB = " SELECT *, isnull(nctsSA_AbgabenBetrag,0) as GarantieWert,isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen,cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum FROM tblDakosy_NCTSOut_Sicherheitsangaben inner join [VERAG].[dbo].[tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId " + sqlStrSUB &= " WHERE cast([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" + sqlStrSUB &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " + sqlStrSUB &= " AND ncts_status BETWEEN 50 AND 60 " + sqlStrSUB &= firmaStr + ' sqlStrSUB &= " and vw.OperatorId IN (" & operatorID & ")" + + sqlStrSUB &= " order by cast([ncts_Trans_DatumZeit] as date),ncts_ObjectName" + + End Select + + ' MsgBox(sqlStr) Me.DataSource = kundenSQL.loadDgvBySql(sqlStr, "FMZOLL", 1000) - - Dim sqlStrSUB As String = " SELECT *, isnull(nctsSA_AbgabenBetrag,0) as GarantieWert,isnull(ncts_Befoerderungsmittel_KennzeichenAbgang,'') as Kennzeichen,cast([ncts_Trans_DatumZeit] as date) as AnmeldungsDatum FROM tblDakosy_NCTSOut_Sicherheitsangaben inner join [VERAG].[dbo].[tblDakosy_NCTSOut] on ncts_Id = nctsSA_NctsId " - sqlStrSUB &= " WHERE cast([ncts_Trans_DatumZeit] as date) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "'" - sqlStrSUB &= " AND nctsSA_GRN IN ( '" & brg_AT & "' , '" & brg_DE & "' , '" & brg_DE_NEU & "' ) " - sqlStrSUB &= " AND ncts_status BETWEEN 50 AND 60 " - sqlStrSUB &= firmaStr - ' sqlStrSUB &= " and vw.OperatorId IN (" & operatorID & ")" - - sqlStrSUB &= " order by cast([ncts_Trans_DatumZeit] as date),ncts_ObjectName" - SUB_DATA = kundenSQL.loadDgvBySql(sqlStrSUB, "FMZOLL", 1000) diff --git a/SDL/Reports/frmPrintLayout.vb b/SDL/Reports/frmPrintLayout.vb index d72460db..d4cdf199 100644 --- a/SDL/Reports/frmPrintLayout.vb +++ b/SDL/Reports/frmPrintLayout.vb @@ -145,12 +145,13 @@ Public Class frmPrintLayout Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous End Sub - Public Sub AuswertungKontrolleLKWDAKOSY(datvon, datbis, FIRMA) + Public Sub AuswertungKontrolleLKWDAKOSY(datvon, datbis, FIRMA, NCTSSystemDY) Me.Text = "Auswertung LKWs" Dim report As rptKontrolleLKW_Dakosy = New rptKontrolleLKW_Dakosy report.datVon = datvon report.datBis = datbis report.FIRMA = FIRMA + report.NCTSSystemDY = NCTSSystemDY report.erstelltVon = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME Viewer.LoadDocument(report) Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index e2874721..53ccccaf 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -5023,8 +5023,7 @@ - - + \\192.168.0.90\f\Zertifikate\signtool.exe sign /f \\192.168.0.90\f\Zertifikate\AL20231110.pfx /p zYGNNJRG+tzlw90Rz6NqOXnoeBycFCy07YcUsY5iD0M= "SDL.exe"