neu
This commit is contained in:
@@ -88,11 +88,11 @@ Public Class cRKSV
|
||||
Return False
|
||||
End Function
|
||||
|
||||
Shared Function getKB(BELEG As EABeleg, PERSONAL As cPersonal, ByRef KBEntry As cKassenbuch, ByRef KBEntryGB As cKassenbuch) As Boolean
|
||||
Shared Function getKB(BELEG As EABeleg, PERSONAL As cPersonal, ByRef KBEntry As cKassenbuch, ByRef KBEntryGB As cKassenbuch, Firma As String) As Boolean
|
||||
Dim j1 = SQL.getValueTxtBySql("SELECT [JournalNr] FROM [tblKassenbuch] " &
|
||||
" WHERE [Mandant]='" & PERSONAL.Mandant & "' AND [Niederlassung]='" & PERSONAL.Niederlassung & "' AND [Benutzer]='" & PERSONAL.ID & "' AND [Geschäftsjahr]='" & cRKSV.getGJ(BELEG.BelegDat) & "' AND [BelegNr] ='" & BELEG.BelegNr & "' and Steuer <=0 AND Soll <> 0", "FMZOLL")
|
||||
" WHERE [Mandant]='" & PERSONAL.Mandant & "' AND [Niederlassung]='" & PERSONAL.Niederlassung & "' AND [Benutzer]='" & PERSONAL.ID & "' AND [Geschäftsjahr]='" & cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma) & "' AND [BelegNr] ='" & BELEG.BelegNr & "' and Steuer <=0 AND Soll <> 0", "FMZOLL")
|
||||
Dim j2 = SQL.getValueTxtBySql("SELECT [JournalNr] FROM [tblKassenbuch] " &
|
||||
" WHERE [Mandant]='" & PERSONAL.Mandant & "' AND [Niederlassung]='" & PERSONAL.Niederlassung & "' AND [Benutzer]='" & PERSONAL.ID & "' AND [Geschäftsjahr]='" & cRKSV.getGJ(BELEG.BelegDat) & "' AND [BelegNr] ='" & BELEG.BelegNr & "' and Steuer <=0 AND Haben <> 0", "FMZOLL")
|
||||
" WHERE [Mandant]='" & PERSONAL.Mandant & "' AND [Niederlassung]='" & PERSONAL.Niederlassung & "' AND [Benutzer]='" & PERSONAL.ID & "' AND [Geschäftsjahr]='" & cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma) & "' AND [BelegNr] ='" & BELEG.BelegNr & "' and Steuer <=0 AND Haben <> 0", "FMZOLL")
|
||||
Dim journalNr = ""
|
||||
Dim journalNrGB = ""
|
||||
|
||||
@@ -109,8 +109,8 @@ Public Class cRKSV
|
||||
Return False
|
||||
End If
|
||||
'J1 /j2 nicht ganz sicher...
|
||||
KBEntry = New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat), j2)
|
||||
KBEntryGB = New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat), j1)
|
||||
KBEntry = New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma), j2)
|
||||
KBEntryGB = New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma), j1)
|
||||
Return True
|
||||
End Function
|
||||
Shared Function getDEP(ByVal kasse_id As Integer, ByRef exportResult As String) As Boolean
|
||||
@@ -176,6 +176,302 @@ Public Class cRKSV
|
||||
Return kasse.rksv_ipAdresse
|
||||
'Return getRKSVLink(kasse.rksv_bez)
|
||||
End Function
|
||||
'Shared Function stornoRKSV_DE(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
|
||||
Shared Function stornoRKSV_DE(PERSONAL As cPersonal, BELEG As EABeleg, ByVal kasse As cRKSV_Kasse, 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
|
||||
|
||||
' MsgBox("0: ")
|
||||
Dim cashbox As String = kasse.rksv_KassaGuid '"VERAG_GMBH_KASSE_01" "KASSA 001"
|
||||
'Dim endpoint = New System.ServiceModel.EndpointAddress(getRKSVLink(kasse))
|
||||
' Dim m_com As VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient = New VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient("DSFinVKService", endpoint) '"http://ymgk028055.verag.ost.dmn:8733/DSFinVKService")
|
||||
|
||||
Dim m_com As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.DSFinVKServer = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.DSFinVKServer() 'PROBLEM??
|
||||
m_com.Url = "http://ymgk028055.verag.ost.dmn:8733/DSFinVKService"
|
||||
Dim [error] As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.ErrorCode
|
||||
Dim InitializeLibraryResultSpecified As Boolean
|
||||
' Dim [error] = "" 'm_com.InitializeLibrary(tbLicense.Text, "D:\Database\DSFinVK\dsfinvkdb.db3", "Administrator", "test", cashbox)
|
||||
m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified)
|
||||
|
||||
' MsgBox("1: " & [error])
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
If [error].ToString() <> "CASHBOX_ALREADY_MANAGED" Then '--> CASHBOX_ALREADY_MANAGED --> der Fehler darf auftreten, die Cashbox wird Serverseitig initialisert, hier nur der Versuch, falls das nciht geschehen ist... lt. Jan Mika / AITG
|
||||
MessageBox.Show([error].ToString(), "Error1", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
End If
|
||||
|
||||
' MsgBox("2")
|
||||
Dim BON_ID As Integer = 0
|
||||
Dim BON_IDSpecified = False
|
||||
Dim GetNextBON_IDResultSpecified = False
|
||||
m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified)
|
||||
'MsgBox("3: " & [error])
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
|
||||
'Dim BON_NR As Integer = 0
|
||||
'[error] = m_com.GetNextBON_NR(cashbox, BON_NR)
|
||||
|
||||
'If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
' MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
' Return False
|
||||
'End If
|
||||
|
||||
|
||||
' MsgBox("4")
|
||||
|
||||
'Rechnung beginnen
|
||||
|
||||
|
||||
Dim stornoVz = -1
|
||||
|
||||
|
||||
Dim bonkopfBegin As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin()
|
||||
|
||||
bonkopfBegin.Z_KASSE_ID = cashbox
|
||||
|
||||
bonkopfBegin.BEDIENER_ID = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID 'tbBEDIENER_ID.Text
|
||||
|
||||
bonkopfBegin.BEDIENER_NAME = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME 'tbBEDIENER_NAME.Text
|
||||
|
||||
bonkopfBegin.BON_ID = BON_ID.ToString()
|
||||
|
||||
bonkopfBegin.BON_NAME = "" 'tbBON_NAME.Text
|
||||
|
||||
bonkopfBegin.BON_NOTIZ = "" 'tbBON_NOTIZ.Text
|
||||
|
||||
bonkopfBegin.BON_NR = BON_ID
|
||||
|
||||
bonkopfBegin.BON_STORNO = 1 'If(cbBON_STORNO.Checked, "1", "0")
|
||||
|
||||
bonkopfBegin.BON_TYP = "Beleg" 'cmbBON_TYP.SelectedItem.ToString()
|
||||
|
||||
bonkopfBegin.KUNDE_ID = If(BELEG.KundenNr > 0, BELEG.KundenNr, "") 'tbKUNDE_ID.Text
|
||||
|
||||
bonkopfBegin.KUNDE_LAND = If(BELEG.LandKz, "") 'tbKUNDE_LAND.Text
|
||||
|
||||
bonkopfBegin.KUNDE_NAME = If(BELEG.Frachtführer, "") 'tbKUNDE_NAME.Text
|
||||
|
||||
bonkopfBegin.KUNDE_ORT = If(BELEG.Ort, "") 'tbKUNDE_ORT.Text
|
||||
|
||||
bonkopfBegin.KUNDE_PLZ = If(BELEG.PLZ, "") 'tbKUNDE_PLZ.Text
|
||||
|
||||
bonkopfBegin.KUNDE_STRASSE = If(BELEG.Straße, "") ' tbKUNDE_STRASSE.Text
|
||||
|
||||
bonkopfBegin.KUNDE_TYP = "" ' tbKUNDE_TYP.Text
|
||||
|
||||
bonkopfBegin.KUNDE_USTID = If(BELEG.UstIdKz, "") & If(BELEG.UstIdNr, "") ' tbKUNDE_USTID.Text
|
||||
|
||||
bonkopfBegin.TERMINAL_ID = "" 'tbTERMINAL_ID.Text
|
||||
|
||||
Dim transactionNumber As Integer = 0
|
||||
Dim transactionNumberSpecified As Boolean
|
||||
|
||||
Dim BeginReceiptResultSpecified As Boolean
|
||||
m_com.BeginReceipt(cashbox, bonkopfBegin, transactionNumber, transactionNumberSpecified, [error], BeginReceiptResultSpecified)
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error3", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
|
||||
' MsgBox("5 ANZ: " & BELEG.POS.Count)
|
||||
Dim cntZeile = 1
|
||||
Dim GES_BRUTTO As Double = 0
|
||||
For Each POS In BELEG.POS
|
||||
|
||||
'Bonposition hinzufügen
|
||||
Dim position As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonPosition = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonPosition()
|
||||
|
||||
position.AGENTUR_ID = -1 'Convert.ToInt32(dgvBonPos.Rows[m_dgvCurrentRow].Cells["AGENTUR_ID"].Value)
|
||||
|
||||
position.ARTIKELTEXT = POS.LeistungsBez 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["ARTIKELTEXT"].Value)
|
||||
|
||||
position.ART_NR = POS.LeistungsNr ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["ART_NR"].Value)
|
||||
|
||||
position.BON_ID = Convert.ToString(BON_ID)
|
||||
|
||||
position.EINHEIT = "Stk." ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["EINHEIT"].Value)
|
||||
|
||||
position.FAKTOR = 1 ' Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["FAKTOR"].Value)
|
||||
|
||||
position.GTIN = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GTIN"].Value)
|
||||
|
||||
position.GUTSCHEIN_NR = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GUTSCHEIN_NR"].Value)
|
||||
|
||||
position.GV_NAME = "" ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GV_NAME"].Value)
|
||||
|
||||
position.GV_TYP = "Umsatz" ' Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["GV_TYP"].Value)
|
||||
|
||||
position.INHAUS = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["INHAUS"].Value)
|
||||
|
||||
position.MENGE = POS.Anzahl 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["MENGE"].Value)
|
||||
|
||||
position.POS_TERMINAL_ID = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_TERMINAL_ID"].Value)
|
||||
|
||||
position.POS_ZEILE = cntZeile 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_ZEILE"].Value)
|
||||
|
||||
position.P_STORNO = 0 'Hier kein Storno, das wäre nur wenn eine Pos storniert wird...
|
||||
|
||||
position.STK_BR = POS.Preis 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["STK_BR"].Value)
|
||||
|
||||
position.WARENGR = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["WARENGR"].Value)
|
||||
|
||||
position.WARENGR_ID = "" 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["WARENGR_ID"].Value)
|
||||
|
||||
position.Z_KASSE_ID = cashbox 'Convert.ToString(dgvBonPos.Rows[m_dgvCurrentRow].Cells["Z_KASSE_ID"].Value)
|
||||
|
||||
' Beträge der Position
|
||||
|
||||
Dim position_vat = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonPosition_Ust()
|
||||
|
||||
position_vat.BON_ID = position.BON_ID
|
||||
|
||||
position_vat.POS_ZEILE = position.POS_ZEILE
|
||||
|
||||
Dim steuersatzID = 1
|
||||
Dim steuersatz As Double = SQL.getValueTxtBySql("SELECT [Steuersatz] FROM [tblSteuersätze] where nr='" & BELEG.Steuerschlüssel & "'", "FMZOLL")
|
||||
Select Case steuersatz
|
||||
Case 0.19 : steuersatzID = 1
|
||||
Case 0.07 : steuersatzID = 2
|
||||
Case 0.00 : steuersatzID = 6
|
||||
End Select
|
||||
' MsgBox(POS.Anzahl)
|
||||
' MsgBox(POS.Betrag)
|
||||
|
||||
position_vat.UST_SCHLUESSEL = steuersatzID 'm_com.GetTaxIds(cashbox,) 'Convert.ToInt32(dgvBonPos.Rows[m_dgvCurrentRow].Cells["UST_SCHLUESSEL"].Value)
|
||||
Dim steuerBetrag = POS.Betrag * position_vat.UST_SCHLUESSEL
|
||||
position_vat.POS_BRUTTO = POS.Betrag + steuerBetrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_BRUTTO"].Value)
|
||||
|
||||
position_vat.POS_NETTO = POS.Betrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_NETTO"].Value)
|
||||
|
||||
position_vat.POS_UST = steuerBetrag 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_UST"].Value)
|
||||
|
||||
position_vat.POS_BRUTTO *= stornoVz
|
||||
position_vat.POS_NETTO *= stornoVz
|
||||
position_vat.POS_UST *= stornoVz
|
||||
|
||||
Dim AddPositionToReceiptResultSpecified As Boolean
|
||||
m_com.AddPositionToReceipt(cashbox, position, position_vat, transactionNumber, transactionNumberSpecified, [error], AddPositionToReceiptResultSpecified)
|
||||
cntZeile += 1
|
||||
GES_BRUTTO += position_vat.POS_BRUTTO
|
||||
|
||||
Next
|
||||
' MsgBox("6: " & GES_BRUTTO)
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error4", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
|
||||
'Rechnung abschließen
|
||||
|
||||
Dim bonkopfFinish As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfFinish = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfFinish()
|
||||
|
||||
bonkopfFinish.Z_KASSE_ID = cashbox
|
||||
|
||||
bonkopfFinish.BON_ID = BON_ID
|
||||
|
||||
|
||||
|
||||
If Not Decimal.TryParse(GES_BRUTTO, bonkopfFinish.UMS_BRUTTO) Then
|
||||
bonkopfFinish.UMS_BRUTTO = 0.00
|
||||
End If
|
||||
|
||||
|
||||
bonkopfFinish.PROCESS_TYPE = "Kassenbeleg-V1"
|
||||
|
||||
bonkopfFinish.payment_currencies = {"EUR"}
|
||||
|
||||
bonkopfFinish.payment_types = {"Bar"}
|
||||
|
||||
bonkopfFinish.payment_per_currency = {GES_BRUTTO} '{0.0} 'BETRAG"!!!!!!!!!!!!
|
||||
|
||||
' MsgBox("6,1: ")
|
||||
|
||||
Dim FinishReceiptResult As Boolean = True
|
||||
Dim FinishReceiptResultSpecified As Boolean
|
||||
m_com.FinishReceipt(cashbox, bonkopfFinish, transactionNumber, FinishReceiptResult, [error], FinishReceiptResultSpecified)
|
||||
' MsgBox("6,2: ")
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error5", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
' Kassenabschluss anlegen über alle noch nicht abgeschlossenen Rechnungen zu dieser Kasse
|
||||
|
||||
' Error = m_com.CreateCashpointClosing(cashbox)
|
||||
|
||||
' ' DSFinV-K-Export
|
||||
|
||||
' Int from = 0
|
||||
|
||||
'Int to = 10
|
||||
|
||||
'Dim ret = m_com.ExportCSVFiles(from, to, tbSelectedFolder.Text, tbZipName.Text, True, True,
|
||||
|
||||
'true, true, true, true, true, true,
|
||||
|
||||
'true, true, true, true,
|
||||
|
||||
'true, true, true, true, true,
|
||||
|
||||
'true, true, true);
|
||||
|
||||
'If (ret == ErrorCode.OK) Then
|
||||
|
||||
'{
|
||||
|
||||
'MessageBox.Show("Die CSV Dateien wurden im Ordner " + tbSelectedFolder.Text + " angelegt und in die Zip-Datei " + tbZipName.Text + " gepackt.", "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
|
||||
'}
|
||||
|
||||
'Else
|
||||
|
||||
'{
|
||||
|
||||
'MessageBox.Show("Beim exportieren der CSV-Dateien ging etwas schief:\r\n" + ret.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
|
||||
'}
|
||||
' MsgBox("7")
|
||||
|
||||
Dim transactionNumberRet As String
|
||||
Dim serialNumber As String
|
||||
Dim signature As String
|
||||
Dim transactionStart As Date
|
||||
Dim transactionFinish As Date
|
||||
Dim sigCounter As String
|
||||
Dim transactionStartSpecified As Boolean
|
||||
Dim transactionFinishSpecified As Boolean
|
||||
Dim GetLastReceiptValuesResultSpecified As Boolean
|
||||
'
|
||||
m_com.GetLastReceiptValues(cashbox, transactionNumberRet, serialNumber, signature, transactionStart, transactionStartSpecified, transactionFinish, transactionFinishSpecified, sigCounter, [error], GetLastReceiptValuesResultSpecified)
|
||||
|
||||
' MsgBox("8")
|
||||
|
||||
Dim qrCode As String = String.Empty
|
||||
Dim mimeType As String = String.Empty
|
||||
Dim GetLastReceiptQrCodeResult As Boolean
|
||||
Dim GetLastReceiptQrCodeResultSpecified As Boolean
|
||||
m_com.GetLastReceiptQrCode(cashbox, qrCode, mimeType, GetLastReceiptQrCodeResult, GetLastReceiptQrCodeResultSpecified)
|
||||
|
||||
QR_CodeString = qrCode
|
||||
LastJWS = signature
|
||||
|
||||
|
||||
' MsgBox("9")
|
||||
If QR_CodeString.Length > 50 And LastJWS.Length > 50 Then
|
||||
Return True
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Es ist ein Fehler bei der Signatur aufgetreten (insertRKSV): " & vbNewLine & ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
Return False
|
||||
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
|
||||
|
||||
@@ -269,15 +565,15 @@ Public Class cRKSV
|
||||
End Function
|
||||
|
||||
'Beleg storno und Kassenbuch Gegenbuchung
|
||||
Shared Function STORNO(BELEG As EABeleg, ByVal grund As String, Optional stornoGegenbuchen As Boolean = False) As EABeleg
|
||||
Shared Function STORNO(BELEG As EABeleg, ByVal grund As String, Firma As String, Optional stornoGegenbuchen As Boolean = False) As EABeleg
|
||||
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 dt As DataTable = SQL.loadDgvBySql("SELECT * FROM tblKassenbuch WHERE [Mandant]='" & BELEG.Mandant & "' AND Niederlassung='" & BELEG.Niederlassung & "' AND Benutzer='" & BELEG.Benutzer & "' AND Geschäftsjahr='" & getGJ_FIRMA(BELEG.BelegDat, Firma) & "' AND BelegNr='" & BELEG.BelegNr & "'", "FMZOLL")
|
||||
' 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 = cRKSV.getNewJournalNr(BELEG) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
Dim KBEntry As New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ_FIRMA(BELEG.BelegDat, Firma), r("JournalNr"))
|
||||
KBEntry.JournalNr = cRKSV.getNewJournalNr(BELEG, Firma) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntry.BelegDat = BELEG.BelegDat
|
||||
KBEntry.Buchungsdatum = Now.ToShortDateString
|
||||
KBEntry.Soll = KBEntry.Soll * -1
|
||||
@@ -304,9 +600,9 @@ Public Class cRKSV
|
||||
Return BELEG
|
||||
End Function
|
||||
'Beleg storno und Kassenbuch Gegenbuchung
|
||||
Shared Function DELETE(BELEG As EABeleg) As Boolean
|
||||
Shared Function DELETE(BELEG As EABeleg, Firma As String) As Boolean
|
||||
Try
|
||||
Dim dt As DataTable = SQL.loadDgvBySql("DELETE 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 dt As DataTable = SQL.loadDgvBySql("DELETE FROM tblKassenbuch WHERE [Mandant]='" & BELEG.Mandant & "' AND Niederlassung='" & BELEG.Niederlassung & "' AND Benutzer='" & BELEG.Benutzer & "' AND Geschäftsjahr='" & getGJ_FIRMA(BELEG.BelegDat, Firma) & "' AND BelegNr='" & BELEG.BelegNr & "'", "FMZOLL")
|
||||
Return BELEG.DELETE()
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.Message)
|
||||
@@ -316,14 +612,14 @@ Public Class cRKSV
|
||||
End Function
|
||||
|
||||
|
||||
Shared Function STORNO_RUECKGAENGIG(BELEG As EABeleg, ByVal grund As String) As EABeleg
|
||||
Shared Function STORNO_RUECKGAENGIG(BELEG As EABeleg, ByVal grund As String, Firma 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 dt As DataTable = SQL.loadDgvBySql("SELECT * FROM tblKassenbuch WHERE [Mandant]='" & BELEG.Mandant & "' AND Niederlassung='" & BELEG.Niederlassung & "' AND Benutzer='" & BELEG.Benutzer & "' AND Geschäftsjahr='" & getGJ_FIRMA(BELEG.BelegDat, Firma) & "' AND BelegNr='" & BELEG.BelegNr & "'", "FMZOLL")
|
||||
' 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 = cRKSV.getNewJournalNr(BELEG) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
Dim KBEntry As New cKassenbuch("LOAD", BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, getGJ_FIRMA(BELEG.BelegDat, Firma), r("JournalNr"))
|
||||
KBEntry.JournalNr = cRKSV.getNewJournalNr(BELEG, Firma) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntry.BelegDat = BELEG.BelegDat
|
||||
KBEntry.Buchungsdatum = Now.ToShortDateString
|
||||
KBEntry.Soll = KBEntry.Soll * -1
|
||||
@@ -338,7 +634,8 @@ Public Class cRKSV
|
||||
End If
|
||||
Return BELEG
|
||||
End Function
|
||||
Shared Function getGJ(BelegDat As Date, Optional FIRMA As String = "") As Integer
|
||||
|
||||
Shared Function getGJ_FIRMA(BelegDat As Date, FIRMA As String) As Integer
|
||||
If FIRMA = "" Then FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Select Case FIRMA
|
||||
Case "IMEX", "FRONTOFFICE", "UNISPED", "AMBAR"
|
||||
@@ -349,6 +646,27 @@ Public Class cRKSV
|
||||
|
||||
End Function
|
||||
|
||||
Shared Function getGJ(BelegDat As Date, Optional FIRMA_ID As Integer = -1) As Integer
|
||||
'If FIRMA = "" Then FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
Select Case FIRMA_ID
|
||||
Case -1, 1, 3, 11, 7, 19, 15 'Abweichendes WJ
|
||||
Return IIf(BelegDat.Month = 1, BelegDat.Year - 1, BelegDat.Year)
|
||||
Case Else
|
||||
Return BelegDat.Year
|
||||
End Select
|
||||
End Function
|
||||
'Shared Function getGJ(BelegDat As Date, FIRMAId As String) As Integer
|
||||
|
||||
' If FIRMA = "" Then FIRMA = New VERAG_PROG_ALLGEMEIN.cFirmen()
|
||||
' Select Case FIRMA
|
||||
' Case "IMEX", "FRONTOFFICE", "UNISPED", "AMBAR"
|
||||
' Return BelegDat.Year
|
||||
' Case Else
|
||||
' Return IIf(BelegDat.Month = 1, BelegDat.Year - 1, BelegDat.Year)
|
||||
' End Select
|
||||
|
||||
'End Function
|
||||
|
||||
'Shared Function getGJ_ByRksvId(BelegDat As Date, RksvId As Integer) As Integer
|
||||
' Select Case RksvId
|
||||
' Case 1
|
||||
@@ -525,7 +843,9 @@ Public Class cRKSV
|
||||
|
||||
If KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv Then
|
||||
If BELEG.rksv_qr Is Nothing OrElse BELEG.rksv_qr = "" Then
|
||||
MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
|
||||
If KASSE.rksv_KassaGuid <> "KASSE_01" Then
|
||||
MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
|
||||
End If
|
||||
Else
|
||||
Dim bmpBytes As Byte() = Convert.FromBase64String(BELEG.rksv_qr)
|
||||
Dim MS As New System.IO.MemoryStream(bmpBytes)
|
||||
@@ -743,8 +1063,11 @@ Public Class cRKSV
|
||||
|
||||
|
||||
If KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv Then
|
||||
|
||||
If BELEG.rksv_qr Is Nothing OrElse BELEG.rksv_qr = "" Then
|
||||
MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
|
||||
If KASSE.rksv_KassaGuid <> "KASSE_01" Then
|
||||
MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
|
||||
End If
|
||||
Else
|
||||
Dim bmpBytes As Byte() = Convert.FromBase64String(BELEG.rksv_qr)
|
||||
Dim MS As New System.IO.MemoryStream(bmpBytes)
|
||||
@@ -843,7 +1166,7 @@ Public Class cRKSV
|
||||
End Function
|
||||
|
||||
|
||||
Public Shared Function printNULLBeleg(KASSE As cRKSV_Kasse, PERSONAL As cPersonal, AUTODRUCK As Boolean) As Boolean
|
||||
Public Shared Function printNULLBeleg(KASSE As cRKSV_Kasse, PERSONAL As cPersonal, AUTODRUCK As Boolean, Firma As String) As Boolean
|
||||
Try
|
||||
|
||||
If PERSONAL Is Nothing Then
|
||||
@@ -877,7 +1200,7 @@ Public Class cRKSV
|
||||
BELEG.Belegart = "0"
|
||||
BELEG.Name1 = "*** NULL-BELEG ***"
|
||||
BELEG.Steuerschlüssel = 3510
|
||||
BELEG.BelegNr = cRKSV.getNewBelegNr(BELEG) 'GJ.INCREASE_BELEG() 'Vergabe der Belegnummer '
|
||||
BELEG.BelegNr = cRKSV.getNewBelegNr(BELEG, Firma) '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
|
||||
@@ -896,7 +1219,7 @@ Public Class cRKSV
|
||||
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)
|
||||
cRKSV.DELETE(BELEG, KASSE.rksv_firma)
|
||||
End If
|
||||
MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
|
||||
' Me.Cursor = Cursors.Default
|
||||
@@ -907,14 +1230,13 @@ Public Class cRKSV
|
||||
End If
|
||||
KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
|
||||
End If
|
||||
Dim TESTFLAG = True
|
||||
If TESTFLAG Or KASSE.rksvDE_aktiv Then ' WENN für die Kasse die DEUTSCHLAND gilt
|
||||
|
||||
If KASSE.rksvDE_aktiv Then ' WENN für die Kasse die DEUTSCHLAND gilt
|
||||
Dim answer = ""
|
||||
|
||||
'*Nullbelg-POS*
|
||||
Dim POS As New EABelegPositionen
|
||||
POS.Abfertigungsart = "Sonstiges"
|
||||
POS.AbfertigungsNr = 10
|
||||
POS.Abfertigungsart = 10 '"Sonstiges"
|
||||
POS.Mandant = BELEG.Mandant
|
||||
POS.Niederlassung = BELEG.Niederlassung
|
||||
POS.Benutzer = BELEG.Benutzer
|
||||
@@ -931,12 +1253,13 @@ Public Class cRKSV
|
||||
POS.Anzahlmultiplikator = 1
|
||||
POS.Betrag = 0
|
||||
POS.Preisbindung = 0
|
||||
' POS.AbfertigungsNr = 000
|
||||
BELEG.POS.Add(POS)
|
||||
|
||||
If Not cRKSV_DE.insertRKSV_DE(PERSONAL, BELEG, KASSE, 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)
|
||||
cRKSV.DELETE(BELEG, KASSE.rksv_firma)
|
||||
End If
|
||||
MsgBox("Programmfehler bei der digitalen Signatur." & vbNewLine & vbNewLine & answer, MsgBoxStyle.Critical)
|
||||
' Me.Cursor = Cursors.Default
|
||||
@@ -946,8 +1269,15 @@ Public Class cRKSV
|
||||
Return False
|
||||
End If
|
||||
KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString)
|
||||
End If
|
||||
|
||||
'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
||||
If KASSE.rksv_KassaGuid = "KASSE_01" Then
|
||||
BELEG.rksv_jws = Nothing
|
||||
BELEG.rksv_qr = Nothing
|
||||
End If
|
||||
'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
||||
|
||||
End If
|
||||
|
||||
'RKSV-Daten beim Beleg ergänzen:
|
||||
BELEG.rksv_jws = LastJWS
|
||||
@@ -1024,7 +1354,9 @@ Public Class cRKSV
|
||||
|
||||
If (KASSE.rksv_aktiv Or KASSE.rksvDE_aktiv) And BELEG.rksv_BelegId > 0 Then
|
||||
If BELEG.rksv_qr Is Nothing OrElse BELEG.rksv_qr = "" Then
|
||||
MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
|
||||
If KASSE.rksv_KassaGuid <> "KASSE_01" Then
|
||||
MsgBox("Fehler: QR-Code wurde nicht richtig erstellt!")
|
||||
End If
|
||||
Else
|
||||
Dim bmpBytes As Byte() = Convert.FromBase64String(BELEG.rksv_qr)
|
||||
Dim MS As New System.IO.MemoryStream(bmpBytes)
|
||||
@@ -1425,27 +1757,27 @@ Public Class cRKSV
|
||||
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))
|
||||
Public Shared Function getNewBelegNr(BELEG As EABeleg, Firma As String) As Integer
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma))
|
||||
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))
|
||||
Public Shared Function getNewJournalNr(BELEG As EABeleg, Firma As String) As Integer
|
||||
Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma))
|
||||
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)
|
||||
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, Firma As String)
|
||||
Try
|
||||
If BELEG.POS.Count = 0 Then
|
||||
MsgBox("Keine Positionen gefunden")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Keine Beleg-Pos. gefunden.")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Keine Beleg-Pos. gefunden.", Firma)
|
||||
Return False
|
||||
End If
|
||||
' Belegnr!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
' Dim GJ = New cGeschaeftsjahr(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat))
|
||||
|
||||
BELEG.BelegNr = getNewBelegNr(BELEG) ' GJ.INCREASE_BELEG() 'Vergabe der Belegnummer'
|
||||
BELEG.BelegNr = getNewBelegNr(BELEG, Firma) ' 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
|
||||
@@ -1466,7 +1798,7 @@ Public Class cRKSV
|
||||
|
||||
If dtBetraege.Rows.Count = 0 Then
|
||||
MsgBox("ERROR: Beleg - Eintrag nicht gefunden. Abbruch!")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Beleg - Eintrag nicht gefunden.")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Beleg - Eintrag nicht gefunden.", Firma)
|
||||
|
||||
Return False
|
||||
End If
|
||||
@@ -1477,8 +1809,8 @@ Public Class cRKSV
|
||||
'################
|
||||
' EINTRAG: Kassenbuch
|
||||
'################
|
||||
Dim KBEntry As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat), JournalNr)
|
||||
KBEntry.JournalNr = getNewJournalNr(BELEG) ' GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
Dim KBEntry As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma), JournalNr)
|
||||
KBEntry.JournalNr = getNewJournalNr(BELEG, Firma) ' 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
|
||||
@@ -1524,18 +1856,18 @@ Public Class cRKSV
|
||||
" AND tblEABelegposition.FilialenNr='" & p.FilialenNr & "' AND tblEABelegposition.AbfertigungsNr='" & p.AbfertigungsNr & "'", "FMZOLL")
|
||||
If dtBetraegeGB.Rows.Count = 0 Then
|
||||
MsgBox("ERROR: Beleg-Position - Eintrag nicht gefunden. Abbruch!")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Beleg - Eintrag nicht gefunden.")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Beleg - Eintrag nicht gefunden.", Firma)
|
||||
|
||||
Return False
|
||||
End If
|
||||
If Not IsNumeric(dtBetraegeGB.Rows(0)("Gegenkonto")) OrElse dtBetraegeGB.Rows(0)("Gegenkonto") <= 0 Then
|
||||
MsgBox("ERROR: Gegenkonto nicht vorhanden. Abbruch!")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Gegenkonto nicht vorhanden.")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler: Gegenkonto nicht vorhanden.", Firma)
|
||||
Return False
|
||||
End If
|
||||
|
||||
Dim KBEntryGB As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ(BELEG.BelegDat), JournalNr)
|
||||
KBEntryGB.JournalNr = getNewJournalNr(BELEG) 'GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
Dim KBEntryGB As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma), JournalNr)
|
||||
KBEntryGB.JournalNr = getNewJournalNr(BELEG, Firma) 'GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntryGB.Konto = dtBetraegeGB.Rows(0)("Gegenkonto")
|
||||
KBEntryGB.Buchungstext = p.LeistungsBez
|
||||
KBEntryGB.Buchungsdatum = Now.ToShortDateString
|
||||
@@ -1568,9 +1900,9 @@ 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)
|
||||
Dim KBEntryST As New cKassenbuch(BELEG.Mandant, BELEG.Niederlassung, BELEG.Benutzer, cRKSV.getGJ_FIRMA(BELEG.BelegDat, Firma), JournalNr)
|
||||
|
||||
KBEntryST.JournalNr = getNewJournalNr(BELEG) 'GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntryST.JournalNr = getNewJournalNr(BELEG, Firma) 'GJ.INCREASE_JOURNAL() 'Vergabe der Journalnummer'
|
||||
KBEntryST.Konto = 8490
|
||||
KBEntryST.Buchungstext = "Rundungsdifferenz in Steuer"
|
||||
KBEntryST.Buchungsdatum = Now.ToShortDateString
|
||||
@@ -1609,7 +1941,7 @@ Public Class cRKSV
|
||||
|
||||
Catch ex As Exception
|
||||
MsgBox("ERROR: " & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
|
||||
cRKSV.STORNO(BELEG, "Programmfehler!")
|
||||
cRKSV.STORNO(BELEG, "Programmfehler!", Firma)
|
||||
|
||||
Return False
|
||||
End Try
|
||||
@@ -2081,34 +2413,36 @@ Public Class cRKSV_DE
|
||||
|
||||
Try
|
||||
|
||||
|
||||
' MsgBox("0: ")
|
||||
Dim cashbox As String = kasse.rksv_KassaGuid '"VERAG_GMBH_KASSE_01" "KASSA 001"
|
||||
'Dim endpoint = New System.ServiceModel.EndpointAddress(getRKSVLink(kasse))
|
||||
' Dim m_com As VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient = New VERAG_PROG_ALLGEMEIN.DSFinVKService.DSFinVKServerClient("DSFinVKService", endpoint) '"http://ymgk028055.verag.ost.dmn:8733/DSFinVKService")
|
||||
|
||||
Dim m_com As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.DSFinVKServer = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.DSFinVKServer() 'PROBLEM??
|
||||
|
||||
m_com.Url = "http://ymgk028055.verag.ost.dmn:8733/DSFinVKService"
|
||||
Dim [error] As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.ErrorCode
|
||||
Dim InitializeLibraryResultSpecified As Boolean
|
||||
' Dim [error] = "" 'm_com.InitializeLibrary(tbLicense.Text, "D:\Database\DSFinVK\dsfinvkdb.db3", "Administrator", "test", cashbox)
|
||||
m_com.InitializeLibrary("SQLGUIDE01.verag.ost.dmn", "itg_RKSV_DE", "dsfinvk", "dsfinvk#1337", cashbox, [error], InitializeLibraryResultSpecified)
|
||||
|
||||
MsgBox("1: " & [error])
|
||||
' MsgBox("1: " & [error])
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
If [error].ToString() <> "CASHBOX_ALREADY_MANAGED" Then '--> CASHBOX_ALREADY_MANAGED --> der Fehler darf auftreten, die Cashbox wird Serverseitig initialisert, hier nur der Versuch, falls das nciht geschehen ist... lt. Jan Mika / AITG
|
||||
MessageBox.Show([error].ToString(), "Error1", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
End If
|
||||
|
||||
MsgBox("2")
|
||||
' MsgBox("2")
|
||||
Dim BON_ID As Integer = 0
|
||||
Dim BON_IDSpecified = False
|
||||
Dim GetNextBON_IDResultSpecified = False
|
||||
m_com.GetNextBON_ID(cashbox, BON_ID, BON_IDSpecified, [error], GetNextBON_IDResultSpecified)
|
||||
MsgBox("3: " & [error])
|
||||
'MsgBox("3: " & [error])
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
MessageBox.Show([error].ToString(), "Error2", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
|
||||
@@ -2121,7 +2455,7 @@ Public Class cRKSV_DE
|
||||
'End If
|
||||
|
||||
|
||||
MsgBox("4")
|
||||
' MsgBox("4")
|
||||
|
||||
'Rechnung beginnen
|
||||
|
||||
@@ -2145,21 +2479,21 @@ Public Class cRKSV_DE
|
||||
|
||||
bonkopfBegin.BON_TYP = "Beleg" 'cmbBON_TYP.SelectedItem.ToString()
|
||||
|
||||
bonkopfBegin.KUNDE_ID = "" 'tbKUNDE_ID.Text
|
||||
bonkopfBegin.KUNDE_ID = If(BELEG.KundenNr > 0, BELEG.KundenNr, "") 'tbKUNDE_ID.Text
|
||||
|
||||
bonkopfBegin.KUNDE_LAND = "" 'tbKUNDE_LAND.Text
|
||||
bonkopfBegin.KUNDE_LAND = If(BELEG.LandKz, "") 'tbKUNDE_LAND.Text
|
||||
|
||||
bonkopfBegin.KUNDE_NAME = "" 'tbKUNDE_NAME.Text
|
||||
bonkopfBegin.KUNDE_NAME = If(BELEG.Frachtführer, "") 'tbKUNDE_NAME.Text
|
||||
|
||||
bonkopfBegin.KUNDE_ORT = "" 'tbKUNDE_ORT.Text
|
||||
bonkopfBegin.KUNDE_ORT = If(BELEG.Ort, "") 'tbKUNDE_ORT.Text
|
||||
|
||||
bonkopfBegin.KUNDE_PLZ = "" 'tbKUNDE_PLZ.Text
|
||||
bonkopfBegin.KUNDE_PLZ = If(BELEG.PLZ, "") 'tbKUNDE_PLZ.Text
|
||||
|
||||
bonkopfBegin.KUNDE_STRASSE = "" ' tbKUNDE_STRASSE.Text
|
||||
bonkopfBegin.KUNDE_STRASSE = If(BELEG.Straße, "") ' tbKUNDE_STRASSE.Text
|
||||
|
||||
bonkopfBegin.KUNDE_TYP = "" ' tbKUNDE_TYP.Text
|
||||
|
||||
bonkopfBegin.KUNDE_USTID = "" ' tbKUNDE_USTID.Text
|
||||
bonkopfBegin.KUNDE_USTID = If(BELEG.UstIdKz, "") & If(BELEG.UstIdNr, "") ' tbKUNDE_USTID.Text
|
||||
|
||||
bonkopfBegin.TERMINAL_ID = "" 'tbTERMINAL_ID.Text
|
||||
|
||||
@@ -2169,7 +2503,12 @@ Public Class cRKSV_DE
|
||||
Dim BeginReceiptResultSpecified As Boolean
|
||||
m_com.BeginReceipt(cashbox, bonkopfBegin, transactionNumber, transactionNumberSpecified, [error], BeginReceiptResultSpecified)
|
||||
|
||||
MsgBox("5 ANZ: " & BELEG.POS.Count)
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error3", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
|
||||
' MsgBox("5 ANZ: " & BELEG.POS.Count)
|
||||
Dim cntZeile = 1
|
||||
Dim GES_BRUTTO As Double = 0
|
||||
For Each POS In BELEG.POS
|
||||
@@ -2230,6 +2569,8 @@ Public Class cRKSV_DE
|
||||
Case 0.07 : steuersatzID = 2
|
||||
Case 0.00 : steuersatzID = 6
|
||||
End Select
|
||||
' MsgBox(POS.Anzahl)
|
||||
' MsgBox(POS.Betrag)
|
||||
|
||||
position_vat.UST_SCHLUESSEL = steuersatzID 'm_com.GetTaxIds(cashbox,) 'Convert.ToInt32(dgvBonPos.Rows[m_dgvCurrentRow].Cells["UST_SCHLUESSEL"].Value)
|
||||
Dim steuerBetrag = POS.Betrag * position_vat.UST_SCHLUESSEL
|
||||
@@ -2245,7 +2586,12 @@ Public Class cRKSV_DE
|
||||
GES_BRUTTO += position_vat.POS_BRUTTO
|
||||
|
||||
Next
|
||||
MsgBox("6")
|
||||
' MsgBox("6: " & GES_BRUTTO)
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error4", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
|
||||
'Rechnung abschließen
|
||||
|
||||
@@ -2268,12 +2614,19 @@ Public Class cRKSV_DE
|
||||
|
||||
bonkopfFinish.payment_types = {"Bar"}
|
||||
|
||||
bonkopfFinish.payment_per_currency = {119.0}
|
||||
bonkopfFinish.payment_per_currency = {GES_BRUTTO} '{0.0} 'BETRAG"!!!!!!!!!!!!
|
||||
|
||||
Dim FinishReceiptResult As Boolean
|
||||
' MsgBox("6,1: ")
|
||||
|
||||
Dim FinishReceiptResult As Boolean = True
|
||||
Dim FinishReceiptResultSpecified As Boolean
|
||||
m_com.FinishReceipt(cashbox, bonkopfFinish, transactionNumber, FinishReceiptResult, [error], FinishReceiptResultSpecified)
|
||||
' MsgBox("6,2: ")
|
||||
|
||||
If [error] <> VERAG_PROG_ALLGEMEIN.DSFinVKService.ErrorCode.OK Then
|
||||
MessageBox.Show([error].ToString(), "Error5", MessageBoxButtons.OK, MessageBoxIcon.[Error])
|
||||
Return False
|
||||
End If
|
||||
' Kassenabschluss anlegen über alle noch nicht abgeschlossenen Rechnungen zu dieser Kasse
|
||||
|
||||
' Error = m_com.CreateCashpointClosing(cashbox)
|
||||
@@ -2309,7 +2662,7 @@ Public Class cRKSV_DE
|
||||
'MessageBox.Show("Beim exportieren der CSV-Dateien ging etwas schief:\r\n" + ret.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
|
||||
'}
|
||||
MsgBox("7")
|
||||
' MsgBox("7")
|
||||
|
||||
Dim transactionNumberRet As String
|
||||
Dim serialNumber As String
|
||||
@@ -2323,7 +2676,7 @@ Public Class cRKSV_DE
|
||||
'
|
||||
m_com.GetLastReceiptValues(cashbox, transactionNumberRet, serialNumber, signature, transactionStart, transactionStartSpecified, transactionFinish, transactionFinishSpecified, sigCounter, [error], GetLastReceiptValuesResultSpecified)
|
||||
|
||||
MsgBox("8")
|
||||
' MsgBox("8")
|
||||
|
||||
Dim qrCode As String = String.Empty
|
||||
Dim mimeType As String = String.Empty
|
||||
@@ -2335,8 +2688,10 @@ Public Class cRKSV_DE
|
||||
LastJWS = signature
|
||||
|
||||
|
||||
MsgBox("9")
|
||||
|
||||
' MsgBox("9")
|
||||
If QR_CodeString.Length > 50 And LastJWS.Length > 50 Then
|
||||
Return True
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Es ist ein Fehler bei der Signatur aufgetreten (insertRKSV): " & vbNewLine & ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
|
||||
Reference in New Issue
Block a user