From 4c9b75cc949edc1b2911c067483d63a17a607349 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 28 Mar 2025 09:10:44 +0100 Subject: [PATCH] IDS fix, Rundung Bankspesen, etc. --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/kunden/usrCntlCBAM.vb | 9 +--- SDL/seriendruck/usrCntlFakturierung.vb | 4 +- VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb | 61 +++++++++++++++----------- 4 files changed, 41 insertions(+), 37 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index f1b45f8d..55fdc5ac 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/kunden/usrCntlCBAM.vb b/SDL/kunden/usrCntlCBAM.vb index ea922f71..3c5ece05 100644 --- a/SDL/kunden/usrCntlCBAM.vb +++ b/SDL/kunden/usrCntlCBAM.vb @@ -1,9 +1,4 @@ - - -Imports javax.xml.bind.annotation -Imports VERAG_PROG_ALLGEMEIN.agsCustomsExchange - -Public Class usrCntlCBAM +Public Class usrCntlCBAM Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Public kdnr = -1 @@ -1173,7 +1168,7 @@ Public Class usrCntlCBAM End If Me.Cursor = Cursors.Default - End If + End If diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 83d5fb5e..3d07c10b 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -709,9 +709,9 @@ Public Class usrcntlFakturierung If sumCurrenRow > 0 Then - preis = Math.Round(sumCurrenRow * rowBS("Bankspesen %") + 0.5, 2) + preis = CInt(Math.Round(sumCurrenRow * rowBS("Bankspesen %") + 0.5, MidpointRounding.AwayFromZero)) Else - preis = Math.Round(0 - sumCurrenRow * rowBS("Bankspesen %") + 0.5, 2) + preis = CInt(Math.Round(0 - sumCurrenRow * rowBS("Bankspesen %") + 0.5, MidpointRounding.AwayFromZero)) End If Else diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb index 61982f87..fba37c1f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb @@ -247,36 +247,45 @@ Public Class cIDS Else + Try - Dim ymd = isleernothing((currentRow(0))) - Dim cc = isleernothing((currentRow(1))) - Dim pyn = isleernothing((currentRow(2))) - Dim occ = isleernothing((currentRow(5))) - Dim oc = isleernothing((currentRow(6))) - Dim ptc = isleernothing((currentRow(7))) - Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc) + Dim ymd = isleernothing((currentRow(0))) + Dim cc = isleernothing((currentRow(1))) + Dim pyn = isleernothing((currentRow(2))) + Dim occ = isleernothing((currentRow(5))) + Dim oc = isleernothing((currentRow(6))) + Dim ptc = isleernothing((currentRow(7))) + Dim ids As New cIDS(ymd, pyn, cc, occ, oc, ptc) - With ids - .YearMonthDay = isleernothing((currentRow(0))) - .CustomerCode = isleernothing((currentRow(1))) - .Paymentsummarynumber = isleernothing((currentRow(2))) - .CustomerName = isleernothing((currentRow(3))) - .OutletCountry = isleernothing((currentRow(4))) - .OutletCountryCode = isleernothing((currentRow(5))) - .OutletCode = isleernothing((currentRow(6))) - .ProductTypeCode = isleernothing((currentRow(7))) - .TransactionVolume = isleernothing((currentRow(8))) - .AmminclVAT = isleernothing((currentRow(9))) - .TotalNetAmount = isleernothing((currentRow(10))) - .VATAmount = isleernothing((currentRow(11))) - .avpriceexclVAT = isleernothing((currentRow(12))) - .VRNumber = isleernothing((currentRow(13))) - .OBONumber = isleernothing((currentRow(14))) + Dim avprive = isleernothing((currentRow(12))) + + With ids + .YearMonthDay = isleernothing((currentRow(0))) + .CustomerCode = isleernothing((currentRow(1))) + .Paymentsummarynumber = isleernothing((currentRow(2))) + .CustomerName = isleernothing((currentRow(3))) + .OutletCountry = isleernothing((currentRow(4))) + .OutletCountryCode = isleernothing((currentRow(5))) + .OutletCode = isleernothing((currentRow(6))) + .ProductTypeCode = isleernothing((currentRow(7))) + .TransactionVolume = isleernothing((currentRow(8))) + .AmminclVAT = isleernothing((currentRow(9))) + .TotalNetAmount = isleernothing((currentRow(10))) + .VATAmount = isleernothing((currentRow(11))) + .avpriceexclVAT = IIf(avprive <> "" AndAlso IsNumeric(avprive), avprive, 0) + .VRNumber = isleernothing((currentRow(13))) + .OBONumber = isleernothing((currentRow(14))) + + Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10)))) + .SAVE() + + End With + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try - Console.WriteLine("IDS: " & isleernothing((currentRow(1))) & " - " & lngRecordCount & " - " & isleernothing((currentRow(10)))) - .SAVE() - End With End If Loop