edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plose

Browse Source
This commit is contained in:
d.breimaier
2025-01-15 16:25:19 +01:00
parent acf7de39bc
commit a8375efde9
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
MDM_Worker/cPLOSE.vb
View File

@@ -251,7 +251,7 @@ Public Class cPLOSE
End Function End Function
Public Shared Function GET_Antraege_ByLieferantCode(ByRef LIST As List(Of cPLOSE_USTV_ANTR), LieferantCode As String, von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean Public Shared Function GET_Antraege_ByLieferantCode(ByRef LIST As List(Of cPLOSE_USTV_ANTR), LieferantCode As String, von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Boolean = False) As Boolean
Try Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -264,7 +264,7 @@ Public Class cPLOSE
where cast(plose_SupplierRechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr where cast(plose_SupplierRechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND plose_LieferantCode IN (" & LieferantCode & ") AND plose_LieferantCode IN (" & LieferantCode & ")
AND plp_Land ='" & Land & "' AND plp_Land ='" & Land & "'
/* " & If(Archiv IsNot Nothing, " AND plose_Archiv=@Archiv ", "") & "*/ " & IIf(Archiv, "", " AND plose_Archiv = 0") & "
group by [plose_SupplierRechnungsDatum],[plose_SupplierRechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung] group by [plose_SupplierRechnungsDatum],[plose_SupplierRechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung]
having sum(plose_MWSTBetrag)>0 having sum(plose_MWSTBetrag)>0
order by plose_SupplierRechnungsDatum order by plose_SupplierRechnungsDatum
@@ -273,7 +273,7 @@ Public Class cPLOSE
cmd.Parameters.AddWithValue("@von", von) cmd.Parameters.AddWithValue("@von", von)
cmd.Parameters.AddWithValue("@bis", bis) cmd.Parameters.AddWithValue("@bis", bis)
cmd.Parameters.AddWithValue("@AdressenNr", KundenNr) cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
While dr.Read While dr.Read
@@ -306,7 +306,7 @@ Public Class cPLOSE
End Function End Function
Public Shared Function GET_Antraege_ByLieferantCodeNULL(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean Public Shared Function GET_Antraege_ByLieferantCodeNULL(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Boolean = False) As Boolean
Try Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -319,7 +319,7 @@ Public Class cPLOSE
where cast(plose_SupplierRechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr where cast(plose_SupplierRechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND plose_LieferantCode is null AND plose_LieferantCode is null
AND plp_Land ='" & Land & "' AND plp_Land ='" & Land & "'
/* " & If(Archiv IsNot Nothing, " AND plose_Archiv=@Archiv ", "") & "*/ " & IIf(Archiv, "", " AND plose_Archiv = 0") & "
group by [plose_SupplierRechnungsDatum],[plose_SupplierRechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung] group by [plose_SupplierRechnungsDatum],[plose_SupplierRechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung]
having sum(plose_MWSTBetrag)>0 having sum(plose_MWSTBetrag)>0
order by plose_SupplierRechnungsDatum order by plose_SupplierRechnungsDatum
@@ -328,7 +328,7 @@ Public Class cPLOSE
cmd.Parameters.AddWithValue("@von", von) cmd.Parameters.AddWithValue("@von", von)
cmd.Parameters.AddWithValue("@bis", bis) cmd.Parameters.AddWithValue("@bis", bis)
cmd.Parameters.AddWithValue("@AdressenNr", KundenNr) cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
While dr.Read While dr.Read
@@ -367,7 +367,7 @@ Public Class cPLOSE
WHERE POS2.UStVPo_SchnittstellenNr=6 AND [plose_RechnungsNr] = POS2.UStVPo_ReNr AND [plose_RechnungsDatum]=POS2.UStVPo_ReDat ) = 0 " WHERE POS2.UStVPo_SchnittstellenNr=6 AND [plose_RechnungsNr] = POS2.UStVPo_ReNr AND [plose_RechnungsDatum]=POS2.UStVPo_ReDat ) = 0 "
End Function End Function
Public Shared Function GET_Antraege_PLOSE(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean Public Shared Function GET_Antraege_PLOSE(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Boolean = False) As Boolean
Try Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -380,8 +380,7 @@ Public Class cPLOSE
where cast(plose_RechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr where cast(plose_RechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr
AND plose_LieferantCode IN (0,1,7,9) AND plose_LieferantCode IN (0,1,7,9)
AND plp_Land ='" & Land & "' AND plp_Land ='" & Land & "'
/* " & If(Archiv IsNot Nothing, " AND plose_Archiv=@Archiv ", "") & "*/ " & IIf(Archiv, "", " AND plose_Archiv = 0") & "
group by [plose_RechnungsDatum],[plose_RechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung] group by [plose_RechnungsDatum],[plose_RechnungsNr],[plose_LieferantCode],[plose_Lieferant],[plose_WaehrungAbbuchung]
having sum(plose_MWSTBetrag)>0 having sum(plose_MWSTBetrag)>0
order by plose_RechnungsDatum order by plose_RechnungsDatum
@@ -390,7 +389,7 @@ Public Class cPLOSE
cmd.Parameters.AddWithValue("@von", von) cmd.Parameters.AddWithValue("@von", von)
cmd.Parameters.AddWithValue("@bis", bis) cmd.Parameters.AddWithValue("@bis", bis)
cmd.Parameters.AddWithValue("@AdressenNr", KundenNr) cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
While dr.Read While dr.Read
@@ -424,7 +423,7 @@ Public Class cPLOSE
End Function End Function
Public Shared Function GET_Antraege_PLOSE_NEU(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean Public Shared Function GET_Antraege_PLOSE_NEU(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Boolean = False) As Boolean
Try Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -438,7 +437,7 @@ Public Class cPLOSE
cmd.Parameters.AddWithValue("@von", von) cmd.Parameters.AddWithValue("@von", von)
cmd.Parameters.AddWithValue("@bis", bis) cmd.Parameters.AddWithValue("@bis", bis)
cmd.Parameters.AddWithValue("@AdressenNr", KundenNr) cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader() Dim dr = cmd.ExecuteReader()
While dr.Read While dr.Read
@@ -583,7 +582,7 @@ Public Class cPLOSE
Public Shared Function UPDATE_ARCHIV(von As Date, bis As Date, KundenNr As Integer, UStVAn_ID As Integer) As Boolean Public Shared Function UPDATE_ARCHIV(von As Date, bis As Date, KundenNr As Integer, UStVAn_ID As Integer, Optional plose_RechnungsNr As String = "", Optional proRechnung As Boolean = False) As Boolean
Try Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -592,16 +591,15 @@ Public Class cPLOSE
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("bis", bis)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("bis", bis))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("KundenNr", KundenNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_ID", UStVAn_ID)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_ID", UStVAn_ID))
If plose_RechnungsNr <> "" Then list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plose_RechnungsNr", plose_RechnungsNr))
Dim sqlUpdate = "UPDATE [tblPLOSE_Details]
Return SQL.doSQLVarList("
UPDATE [tblPLOSE_Details]
set plose_Archiv=1, [plose_ArchiviertDatum]=GETDATE(), UStVAn_ID = @UStVAn_ID set plose_Archiv=1, [plose_ArchiviertDatum]=GETDATE(), UStVAn_ID = @UStVAn_ID
FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer
INNER JOIN [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode] INNER JOIN [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode]
WHERE cast(plose_RechnungsDatum as date) between @von and @bis and AdressenNr=@KundenNr WHERE cast(plose_RechnungsDatum as date) between @von and @bis and AdressenNr=@KundenNr AND plose_LieferantCode IN (0,1,7,9) " & IIf(proRechnung AndAlso plose_RechnungsNr <> "", "AND plose_RechnungsNr=@plose_RechnungsNr", "")
AND plose_LieferantCode IN (0,1,7) --AND plp_Land ='IT' ", "FMZOLL",, list) 'warum nur IT???
Return SQL.doSQLVarList(sqlUpdate, "FMZOLL",, list)