RMC, Bearbeiten, Nacherfassung Leihgeld, etc.
This commit is contained in:
@@ -45,6 +45,8 @@ Public Class cAdressen
|
||||
Property MWSTVorauszahlung As Object = Nothing
|
||||
Property PLOSEKundenNr As Object = Nothing
|
||||
|
||||
Property weitereWölflKundenNr As Object = Nothing
|
||||
|
||||
|
||||
Public hasEntry = False
|
||||
Shared SQL As New SQL
|
||||
@@ -139,6 +141,7 @@ Public Class cAdressen
|
||||
' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SSMA_TimeStamp", SSMA_TimeStamp))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("MWSTVorauszahlung", MWSTVorauszahlung))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PLOSEKundenNr", PLOSEKundenNr))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("weitereWölflKundenNr", weitereWölflKundenNr))
|
||||
|
||||
Return list
|
||||
End Function
|
||||
@@ -311,7 +314,7 @@ Public Class cAdressen
|
||||
|
||||
Try
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
|
||||
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND WölflKundenNr = " & woelflKdNr, conn)
|
||||
Using cmd As New SqlCommand("Select TOP(1) * FROM Adressen WHERE (UstIdKz + UstIdNr='" & UIDNr & "' or Steuernummer ='" & UIDNr & "') AND WölflKundenNr = " & woelflKdNr & " OR weitereWölflKundenNr " & woelflKdNr, conn)
|
||||
|
||||
Dim dr = cmd.ExecuteReader()
|
||||
If dr.Read Then
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
Imports System.Data.SqlClient
|
||||
Imports System.IO
|
||||
Imports System.Reflection
|
||||
|
||||
Public Class cRMC
|
||||
@@ -177,7 +176,7 @@ Public Class cRMC
|
||||
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
|
||||
|
||||
Using cmd As New SqlCommand(" SELECT rmc_reDatum,rmc_kdNr,[rmc_reNr],sum([rmc_betragNetto])[rmc_betragNetto],sum([rmc_betragMWST])[rmc_betragMWST] ,sum([rmc_betragBrutto] )[rmc_betragBrutto], [rmc_waehrung], sum([rmc_euroBrutto])[rmc_euroBrutto], rmc_daId, isnull(rmc_daId_InvAtt,0) as rmc_daId_InvAtt FROM [tblRMCImport]
|
||||
INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr]
|
||||
INNER JOIN Adressen as adr on rmc_kdNr=adr.[WölflKundenNr] or rmc_kdNr=adr.[weitereWölflKundenNr]
|
||||
where cast(rmc_reDatum as date) between @von and @bis and AdressenNr=@AdressenNr
|
||||
AND rmc_landKZ ='" & LandKZ & "'" & IIf(Not Archiv, " And rmc_archiv = 0 ", "") & "
|
||||
group by rmc_reDatum,rmc_kdNr,[rmc_reNr],[rmc_waehrung], rmc_daId, isnull(rmc_daId_InvAtt,0)
|
||||
|
||||
Reference in New Issue
Block a user