From a83a8b02c942a323b2d4c414c43247fce98b35ae Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 24 Nov 2022 23:22:10 +0100 Subject: [PATCH] RKSV DE --- SDL/Classes/cRKSV.vb | 59 ++++++++++++++++++++++------------- SDL/cProgramFunctions.vb | 5 ++- SDL/kassenbuch/frmBelegNeu.vb | 3 +- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index 076bb88f..ca694860 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -2427,7 +2427,7 @@ Public Class cRKSV_DE ' 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 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 @@ -2437,17 +2437,28 @@ Public Class cRKSV_DE 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 + + + 'BelegNr wird von RKSV übernommen + Dim BON_ID As Integer = 0 + If False Then + + 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 + Else + ' MsgBox(RKSV_Beleg_Id) + BON_ID = RKSV_Beleg_Id End If + 'Dim BON_NR As Integer = 0 '[error] = m_com.GetNextBON_NR(cashbox, BON_NR) @@ -2455,11 +2466,12 @@ Public Class cRKSV_DE ' MessageBox.Show([error].ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.[Error]) ' Return False 'End If - - ' MsgBox("4") - 'Rechnung beginnen + + '------------------------------------------------------------------------------------- + '--------------------------------- Rechnung beginnen --------------------------------- + '------------------------------------------------------------------------------------- Dim bonkopfBegin As VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin = New VERAG_PROG_ALLGEMEIN.RKSV_DE_DSFinVKService.BonKopfBegin() @@ -2475,7 +2487,7 @@ Public Class cRKSV_DE bonkopfBegin.BON_NOTIZ = "" 'tbBON_NOTIZ.Text - bonkopfBegin.BON_NR = BON_ID + bonkopfBegin.BON_NR = bonkopfBegin.BON_ID bonkopfBegin.BON_STORNO = storno 'If(cbBON_STORNO.Checked, "1", "0") @@ -2575,12 +2587,11 @@ Public Class cRKSV_DE ' 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) + Dim steuerBetrag As Double = POS.Betrag * steuersatz + position_vat.POS_BRUTTO = Convert.ToDecimal(POS.Betrag + steuerBetrag) 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_BRUTTO"].Value) + position_vat.POS_NETTO = Convert.ToDecimal(POS.Betrag) 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_NETTO"].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_UST = Convert.ToDecimal(steuerBetrag) 'Convert.ToDecimal(dgvBonPos.Rows[m_dgvCurrentRow].Cells["POS_UST"].Value) Dim AddPositionToReceiptResultSpecified As Boolean m_com.AddPositionToReceipt(cashbox, position, position_vat, transactionNumber, transactionNumberSpecified, [error], AddPositionToReceiptResultSpecified) @@ -2603,11 +2614,15 @@ Public Class cRKSV_DE bonkopfFinish.BON_ID = BON_ID - - - If Not Decimal.TryParse(GES_BRUTTO, bonkopfFinish.UMS_BRUTTO) Then + Try + bonkopfFinish.UMS_BRUTTO = Convert.ToDecimal(GES_BRUTTO) + Catch ex As Exception bonkopfFinish.UMS_BRUTTO = 0.00 - End If + End Try + + 'If Not Decimal.TryParse(GES_BRUTTO, bonkopfFinish.UMS_BRUTTO) Then + ' bonkopfFinish.UMS_BRUTTO = 0.00 + 'End If bonkopfFinish.PROCESS_TYPE = "Kassenbeleg-V1" diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 593def0f..66b934af 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -475,12 +475,11 @@ Public Class cProgramFunctions - Public Shared Sub initDrucker(cboPrinter As ComboBox, Optional srch As String = "") + Public Shared Sub initDrucker(cboPrinter As ComboBox, Optional srch As String = "", Optional usePRINTER_LIST As Boolean = True) ' alle installierten Drucker ermitteln und ' in in ein ArrayList-Objekt speichern Dim sPrinters As ArrayList - - If VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST IsNot Nothing Then + If usePRINTER_LIST AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST IsNot Nothing Then sPrinters = VERAG_PROG_ALLGEMEIN.cAllgemein.PRINTER_LIST Else sPrinters = New ArrayList diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index d55ca55e..ab3aafe3 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -820,6 +820,7 @@ Public Class frmBelegNeu ' Dim TEST_KASSE = (BELEG.Niederlassung = "WAI") If KASSE.rksvDE_aktiv Then ' WENN für die Kasse die RKSV DEUTSCHLAND gilt Dim answer = "" + If Not cRKSV_DE.insertRKSV_DE(PERSONAL, BELEG, KASSE, RKSV_Beleg_Id, If(EA = "E", summeBRUTTO, summeBRUTTO * -1), 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, If(EA = "E", summeBRUTTO * -1, summeBRUTTO)) @@ -831,7 +832,7 @@ Public Class frmBelegNeu KASSE.SET_LAST_QR_JWS(LastJWS, QR_CodeString) 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - If KASSE.rksv_KassaGuid = "KASSE_01" Then + If KASSE.rksv_KassaGuid = "KASSE_01" Then 'Testkasse BELEG.rksv_jws = Nothing BELEG.rksv_qr = Nothing End If