bugfix
This commit is contained in:
@@ -301,11 +301,11 @@ Public Class cIDS
|
||||
Dim str As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
str = str.Substring(0, str.Length - 1) 'wg. ','
|
||||
Return (" UPDATE tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ")
|
||||
Return (" UPDATE [tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode " & IIf(PARAM <> "" AndAlso VALUE <> "", " AND " & PARAM & "=" & VALUE, "") & " AND isnull(charged,0) = 0 ")
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
@@ -321,7 +321,7 @@ Public Class cIDS
|
||||
Dim values As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "" & i.Text & "],"
|
||||
str &= "[" & i.Text & "],"
|
||||
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
@@ -544,31 +544,31 @@ Public Class cIDS
|
||||
|
||||
Using cmd As New SqlCommand("SELECT
|
||||
tblIDSTransactionsNew.KdNrVERAG as Kundennummer,
|
||||
ISNULL(tblIDSTransactionsNew.OBONumber],ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) AS Rechnungsnummer,
|
||||
tblIDSTransactionsNew.YearMonthDay] AS Rechnungsdatum,
|
||||
SUM(tblIDSTransactionsNew.VATAmount]) AS Steuerbetrag
|
||||
ISNULL(tblIDSTransactionsNew.[OBONumber],ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) AS Rechnungsnummer,
|
||||
tblIDSTransactionsNew.[YearMonthDay] AS Rechnungsdatum,
|
||||
SUM(tblIDSTransactionsNew.[VATAmount]) AS Steuerbetrag
|
||||
FROM
|
||||
|
||||
tblIDSTransactionsNew
|
||||
INNER JOIN
|
||||
tbl_IDS_Länder
|
||||
ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode
|
||||
ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode
|
||||
WHERE
|
||||
tblIDSTransactionsNew.YearMonthDay] BETWEEN @von AND @bis
|
||||
tblIDSTransactionsNew.[YearMonthDay] BETWEEN @von AND @bis
|
||||
AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr
|
||||
AND tbl_IDS_Länder.Lieferland_ISO2] = @LandKZ
|
||||
AND tblIDSTransactionsNew.VATAmount] <> 0
|
||||
AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ
|
||||
AND tblIDSTransactionsNew.[VATAmount] <> 0
|
||||
" & IIf(Archiv, " ", " AND isnull(UStVAn_ID,0) = 0 ") & "
|
||||
GROUP BY
|
||||
tblIDSTransactionsNew.KdNrVERAG,
|
||||
tblIDSTransactionsNew.YearMonthDay],
|
||||
ISNULL(tblIDSTransactionsNew.OBONumber],
|
||||
ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber]))
|
||||
tblIDSTransactionsNew.[YearMonthDay],
|
||||
ISNULL(tblIDSTransactionsNew.[OBONumber],
|
||||
ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber]))
|
||||
ORDER BY
|
||||
tblIDSTransactionsNew.KdNrVERAG,
|
||||
tblIDSTransactionsNew.YearMonthDay],
|
||||
ISNULL(tblIDSTransactionsNew.OBONumber],
|
||||
ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber]));", conn)
|
||||
tblIDSTransactionsNew.[YearMonthDay],
|
||||
ISNULL(tblIDSTransactionsNew.[OBONumber],
|
||||
ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber]));", conn)
|
||||
|
||||
cmd.Parameters.AddWithValue("@LandKZ", LandKZ)
|
||||
cmd.Parameters.AddWithValue("@von", von)
|
||||
@@ -607,11 +607,11 @@ Public Class cIDS
|
||||
Return SQL.doSQLVarList("update tblIDSTransactionsNew set UStVAn_ID = @UStVAn_ID
|
||||
FROM tblIDSTransactionsNew
|
||||
INNER JOIN tbl_IDS_Länder
|
||||
ON tblIDSTransactionsNew.OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode
|
||||
ON tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode
|
||||
WHERE
|
||||
tblIDSTransactionsNew.YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.OBONumber], ISNULL(tblIDSTransactionsNew.VRNumber], tblIDSTransactionsNew.Paymentsummarynumber])) = @reNr
|
||||
tblIDSTransactionsNew.[YearMonthDay] = @reDat AND ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = @reNr
|
||||
AND tblIDSTransactionsNew.KdNrVERAG = @ids_kdNr
|
||||
AND tbl_IDS_Länder.Lieferland_ISO2] = @country", "FMZOLL",, list)
|
||||
AND tbl_IDS_Länder.[Lieferland_ISO2] = @country", "FMZOLL",, list)
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
End Try
|
||||
@@ -624,7 +624,7 @@ Public Class cIDS
|
||||
Shared apiSettingsloaded As Boolean = False
|
||||
Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Shared Function GET_PARAM_ByName(tcParam_name, TESTSYSTEM) As String
|
||||
Return SQL.getValueTxtBySql("SELECT TOP 1 Param_value] FROM tblPartnersystem_Paramter] WHERE Param_system='IDS' AND Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False))
|
||||
Return SQL.getValueTxtBySql("SELECT TOP 1 [Param_value] FROM [tblPartnersystem_Paramter] WHERE Param_system='IDS' AND [Param_name]='" & tcParam_name & "' AND Param_testsystem = " & IIf(TESTSYSTEM, 1, 0), , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(False))
|
||||
End Function
|
||||
|
||||
Shared Function getFTPConenction(ByRef API_String As String, ByRef API As DataTable, ByRef program As String) As Boolean
|
||||
@@ -770,11 +770,11 @@ Public Class cIDSInvoice
|
||||
Dim str As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
str = str.Substring(0, str.Length - 1) 'wg. ','
|
||||
Return (" UPDATE tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber")
|
||||
Return (" UPDATE [tblIDSInvoicesNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber")
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
@@ -788,7 +788,7 @@ Public Class cIDSInvoice
|
||||
Dim values As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "" & i.Text & "],"
|
||||
str &= "[" & i.Text & "],"
|
||||
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
@@ -1005,11 +1005,11 @@ Public Class cIDSInvoiceSplittedByCountry
|
||||
Dim str As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
str = str.Substring(0, str.Length - 1) 'wg. ','
|
||||
Return (" UPDATE tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country")
|
||||
Return (" UPDATE [tblIDSInvoicesNewSplittedByCountry] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND CustomerCode=@CustomerCode AND Invoicenumber=@Invoicenumber AND Country=@Country")
|
||||
|
||||
Catch ex As Exception
|
||||
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||
@@ -1023,7 +1023,7 @@ Public Class cIDSInvoiceSplittedByCountry
|
||||
Dim values As String = ""
|
||||
For Each i In list
|
||||
If Not i.isPrimaryParam Then
|
||||
str &= "" & i.Text & "],"
|
||||
str &= "[" & i.Text & "],"
|
||||
values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
|
||||
End If
|
||||
Next
|
||||
|
||||
Reference in New Issue
Block a user