neu
This commit is contained in:
@@ -5,7 +5,7 @@ Imports GrapeCity.ActiveReports
|
||||
Public Class cRKSV
|
||||
Shared SQL As New SQL
|
||||
|
||||
Shared Function insertRKSV(ByVal kasse As String, CompanyGUID As String, ByVal umsatzZaehler As Double, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String) As Boolean
|
||||
Shared Function insertRKSV(ByVal kasse As cRKSV_Kasse, CompanyGUID As String, ByVal umsatzZaehler As Double, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, TEST As Boolean, ByRef answer As String) As Boolean
|
||||
'
|
||||
Try
|
||||
|
||||
@@ -20,7 +20,8 @@ Public Class cRKSV
|
||||
|
||||
credentials.Username = "Admin"
|
||||
credentials.Password = "verag#2"
|
||||
credentials.CashboxID = kasse '"VERAG-SUB-KASSE-ZOLL"
|
||||
credentials.CashboxID = kasse.rksv_bez
|
||||
'"VERAG-SUB-KASSE-ZOLL"
|
||||
credentials.CompanyGUID = CompanyGUID ' "9119d9ae-f549-4a0f-a50f-0500ec7ca059"
|
||||
|
||||
Dim jws As String = String.Empty
|
||||
@@ -161,15 +162,16 @@ Public Class cRKSV
|
||||
Return True
|
||||
End Function
|
||||
|
||||
Shared Function getRKSVLink(ByVal kasse As String) As String
|
||||
If kasse = "FRONT-OFFICE-SUB-KASSE" Then
|
||||
Return "http://192.168.0.25:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl"
|
||||
End If
|
||||
Return "http://192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl"
|
||||
End Function
|
||||
'Shared Function getRKSVLink(ByVal kasse As String) As String
|
||||
' If kasse = "FRONT-OFFICE-SUB-KASSE" Then
|
||||
' Return "http://192.168.0.25:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl"
|
||||
' End If
|
||||
' Return "http://192.168.0.106:8733/Design_Time_Addresses/RKSVCompleteServer/Service1/?singleWsdl"
|
||||
'End Function
|
||||
|
||||
Shared Function getRKSVLink(ByVal kasse As cRKSV_Kasse) As String
|
||||
Return getRKSVLink(kasse.rksv_bez)
|
||||
Return kasse.rksv_ipAdresse
|
||||
'Return getRKSVLink(kasse.rksv_bez)
|
||||
End Function
|
||||
Shared Function stornoRKSV(ByVal kasse As cRKSV_Kasse, ByVal belegDat As DateTime, ByVal steuerSchluessel As Integer, ByVal RKSV_Beleg_Id As Integer, ByVal summeBRUTTO As Double, ByRef QR_CodeString As String, ByRef LastJWS As String, ByRef answer As String) As Boolean
|
||||
Try
|
||||
@@ -268,11 +270,11 @@ Public Class cRKSV
|
||||
If (Not BELEG.gebuchtStorno) Or stornoGegenbuchen Then
|
||||
' MsgBox("SELECT * FROM tblKassenbuch WHERE [Mandant]='" & BELEG.Mandant & "' AND Niederlassung='" & BELEG.Niederlassung & "' AND Benutzer='" & BELEG.Benutzer & "' AND Geschäftsjahr='" & getGJ(BELEG.BelegDat) & "' AND BelegNr='" & BELEG.BelegNr & "'")
|
||||
Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM tblKassenbuch WHERE [Mandant]='" & BELEG.Mandant & "' AND Niederlassung='" & BELEG.Niederlassung & "' AND Benutzer='" & BELEG.Benutzer & "' AND Geschäftsjahr='" & getGJ(BELEG.BelegDat) & "' AND BelegNr='" & BELEG.BelegNr & "'", "FMZOLL")
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ(BELEG.BelegDat))
|
||||
' Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ(BELEG.BelegDat))
|
||||
If dt IsNot Nothing Then
|
||||
For Each r In dt.Rows
|
||||
Dim KBEntry As New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ(BELEG.BelegDat), r("JournalNr"))
|
||||
KBEntry.JournalNr = GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer
|
||||
KBEntry.JournalNr = cRKSV.getNewJournalNr(BELEG) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntry.BelegDat = BELEG.BelegDat
|
||||
KBEntry.Buchungsdatum = Now.ToShortDateString
|
||||
KBEntry.Soll = KBEntry.Soll * -1
|
||||
@@ -314,11 +316,11 @@ Public Class cRKSV
|
||||
Shared Function STORNO_RUECKGAENGIG(BELEG As EABeleg, ByVal grund As String) As EABeleg
|
||||
If BELEG.gebuchtStorno Then
|
||||
Dim dt As DataTable = SQL.loadDgvBySql("SELECT * FROM tblKassenbuch WHERE [Mandant]='" & BELEG.Mandant & "' AND Niederlassung='" & BELEG.Niederlassung & "' AND Benutzer='" & BELEG.Benutzer & "' AND Geschäftsjahr='" & getGJ(BELEG.BelegDat) & "' AND BelegNr='" & BELEG.BelegNr & "'", "FMZOLL")
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ(BELEG.BelegDat))
|
||||
' Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ(BELEG.BelegDat))
|
||||
If dt IsNot Nothing Then
|
||||
For Each r In dt.Rows
|
||||
Dim KBEntry As New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ(BELEG.BelegDat), r("JournalNr"))
|
||||
KBEntry.JournalNr = GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer
|
||||
KBEntry.JournalNr = cRKSV.getNewJournalNr(BELEG) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntry.BelegDat = BELEG.BelegDat
|
||||
KBEntry.Buchungsdatum = Now.ToShortDateString
|
||||
KBEntry.Soll = KBEntry.Soll * -1
|
||||
@@ -829,14 +831,14 @@ Public Class cRKSV
|
||||
End If
|
||||
|
||||
Dim BELEG As New EABeleg(PERSONAL.Mandant, PERSONAL.Niederlassung, PERSONAL.ID)
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
|
||||
' Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
|
||||
|
||||
BELEG.Ordnungsbegriff = "*** NULL-BELEG ***"
|
||||
BELEG.Beleg_TYP = "0"
|
||||
BELEG.Belegart = "0"
|
||||
BELEG.Name1 = "*** NULL-BELEG ***"
|
||||
BELEG.Steuerschlüssel = 3510
|
||||
BELEG.BelegNr = GJ.INCREASE_BELEG() 'Vergabe der Belegnummer
|
||||
BELEG.BelegNr = cRKSV.getNewBelegNr(BELEG) 'GJ.INCREASE_BELEG() 'Vergabe der Belegnummer '
|
||||
' Beleg noch nicht gespeichert.... BELEG.DEL_POS_List()' Positionen löschen, da BelegNr Neu vergeben
|
||||
For Each p In BELEG.POS
|
||||
p.BelegNr = BELEG.BelegNr
|
||||
@@ -852,7 +854,7 @@ Public Class cRKSV
|
||||
If KASSE.rksv_aktiv Then ' WENN für die Kasse die RKSV gilt
|
||||
Dim answer = ""
|
||||
|
||||
If Not cRKSV.insertRKSV(KASSE.rksv_bez, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, 0, QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service
|
||||
If Not cRKSV.insertRKSV(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, 0, QR_CodeString, LastJWS, TESTBUCHUNG, answer) Then 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service
|
||||
If Not TESTBUCHUNG Then
|
||||
KASSE.DECREASE_BELEG_UMSATZ(oldBelegZaehler, summe * -1)
|
||||
cRKSV.DELETE(BELEG)
|
||||
@@ -1342,6 +1344,16 @@ Public Class cRKSV
|
||||
Public Shared Function SpedBuchExists(FilialenNr As Integer, AbfertigungsNr As Integer) As Boolean
|
||||
Return (CInt(SQL.getValueTxtBySql("SELECT count(*) FROM Speditionsbuch WHERE FilialenNr=" & FilialenNr & " AND AbfertigungsNr=" & AbfertigungsNr & " ", "FMZOLL")) > 0)
|
||||
End Function
|
||||
|
||||
Public Shared Function getNewBelegNr(BELEG As EABeleg) As Integer
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
|
||||
Return GJ.INCREASE_BELEG()
|
||||
End Function
|
||||
Public Shared Function getNewJournalNr(BELEG As EABeleg) As Integer
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
|
||||
Return GJ.INCREASE_JOURNAL()
|
||||
End Function
|
||||
|
||||
Public Shared Function insertKB(PERSONAL As cPersonal, BELEG As EABeleg, RKSV_id As Integer, RKSV_Beleg_Id As Integer, RKSV_aktiv As Integer, ByRef JournalNr As Integer)
|
||||
Try
|
||||
If BELEG.POS.Count = 0 Then
|
||||
@@ -1351,10 +1363,11 @@ Public Class cRKSV
|
||||
End If
|
||||
' Belegnr!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
|
||||
' Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
|
||||
|
||||
BELEG.BelegNr = GJ.INCREASE_BELEG() 'Vergabe der Belegnummer
|
||||
BELEG.BelegNr = getNewBelegNr(BELEG) ' GJ.INCREASE_BELEG() 'Vergabe der Belegnummer'
|
||||
' Beleg noch nicht gespeichert.... BELEG.DEL_POS_List()' Positionen löschen, da BelegNr Neu vergeben
|
||||
|
||||
For Each p In BELEG.POS
|
||||
p.BelegNr = BELEG.BelegNr
|
||||
Next
|
||||
@@ -1385,7 +1398,7 @@ Public Class cRKSV
|
||||
' EINTRAG: Kassenbuch
|
||||
'################
|
||||
Dim KBEntry As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat), JournalNr)
|
||||
KBEntry.JournalNr = GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer
|
||||
KBEntry.JournalNr = getNewJournalNr(BELEG) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
' KBEntry.JournalNr = fktJournalNr(rst1!Mandant, rst1!Niederlassung, rst1!Benutzer, rst1!BelegDat)
|
||||
KBEntry.Konto = PERSONAL.KassenbuchNr
|
||||
If BELEG.FilialenNr = -1 Or BELEG.AbfertigungsNr = -1 Then
|
||||
@@ -1442,7 +1455,7 @@ Public Class cRKSV
|
||||
End If
|
||||
|
||||
Dim KBEntryGB As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat), JournalNr)
|
||||
KBEntryGB.JournalNr = GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer
|
||||
KBEntryGB.JournalNr = getNewJournalNr(BELEG) 'GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntryGB.Konto = dtBetraegeGB.Rows(0)("Gegenkonto")
|
||||
KBEntryGB.Buchungstext = p.LeistungsBez
|
||||
KBEntryGB.Buchungsdatum = Now.ToShortDateString
|
||||
@@ -1477,7 +1490,7 @@ Public Class cRKSV
|
||||
If IsNumeric(BELEG.Steuerschlüssel) AndAlso BELEG.Steuerschlüssel > 0 And SteuerBetrag - curSteuerbetrag <> 0 Then
|
||||
Dim KBEntryST As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat), JournalNr)
|
||||
|
||||
KBEntryST.JournalNr = GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer
|
||||
KBEntryST.JournalNr = getNewJournalNr(BELEG) 'GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntryST.Konto = 8490
|
||||
KBEntryST.Buchungstext = "Rundungsdifferenz in Steuer"
|
||||
KBEntryST.Buchungsdatum = Now.ToShortDateString
|
||||
|
||||
@@ -17,7 +17,8 @@ Public Class cRKSV_Kasse
|
||||
Property rksv_ITG_id As Object = Nothing
|
||||
Property rksv_AesKey As Object = Nothing
|
||||
Property rksv_KassaGuid As Object = Nothing
|
||||
|
||||
Property rksv_ipAdresse As Object = Nothing
|
||||
|
||||
|
||||
Dim SQL As New SQL
|
||||
|
||||
@@ -208,6 +209,7 @@ Public Class cRKSV_Kasse
|
||||
Me.rksv_ITG_id = cSqlDb.checkNullReturnValue(dr.Item("rksv_ITG_id"), Nothing)
|
||||
Me.rksv_AesKey = cSqlDb.checkNullReturnValue(dr.Item("rksv_AesKey"), Nothing)
|
||||
Me.rksv_KassaGuid = cSqlDb.checkNullReturnValue(dr.Item("rksv_KassaGuid"), Nothing)
|
||||
Me.rksv_ipAdresse = cSqlDb.checkNullReturnValue(dr.Item("rksv_ipAdresse"), Nothing)
|
||||
|
||||
End If
|
||||
dr.Close()
|
||||
@@ -237,6 +239,7 @@ Public Class cRKSV_Kasse
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_ITG_id", rksv_ITG_id))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_AesKey", rksv_AesKey))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_KassaGuid", rksv_KassaGuid))
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("rksv_ipAdresse", rksv_ipAdresse))
|
||||
|
||||
Return list
|
||||
End Function
|
||||
|
||||
Reference in New Issue
Block a user