Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -1583,7 +1583,7 @@ Class IDS_Transaktionen
 
     Public Function SAVE() As Boolean
 
-        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblIDS_Transaktionen WITH(updlock,serializable) WHERE TRS_NUM=@TRS_NUM  ) " &
+        Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblIDS_Transaktionen WITH(updlock,serializable) WHERE TRS_NUM=@TRS_NUM AND BC_INVO_DATE=@BC_INVO_DATE ) " &
                        " BEGIN " & getUpdateCmd() & " END " &
                        " Else " &
                        " BEGIN " & getInsertCmd() & " END " &
@@ -1624,7 +1624,7 @@ Class IDS_Transaktionen
                 End If
             Next
             str = str.Substring(0, str.Length - 1) 'wg. ','
-            Return (" UPDATE [tblIDS_Transaktionen] SET " & str & " WHERE TRS_NUM=@TRS_NUM")
+            Return (" UPDATE [tblIDS_Transaktionen] SET " & str & " WHERE TRS_NUM=@TRS_NUM AND BC_INVO_DATE=@BC_INVO_DATE")
 
         Catch ex As SqlException
             MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)

VERAG_PROG_ALLGEMEIN/Classes/cGrenzstelle.vb

@@ -12,6 +12,7 @@ Public Class cGrenzstelle
     Property grz_Cluster As Object = Nothing
     Property grz_Reihenfolge As Integer
     Property grz_Warenort As Boolean
+    Property grz_AvisoStatusVorOrt As Boolean
     Property grz_Zollamt As Boolean
     Property grz_Aktiv As Boolean
     Property grz_ZollamtDST As Object = Nothing
@@ -45,6 +46,7 @@ Public Class cGrenzstelle
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("grz_Aktiv", grz_Aktiv))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("grz_ZollamtDST", grz_ZollamtDST))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("grz_ZollamtBezeichnung", grz_ZollamtBezeichnung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("grz_AvisoStatusVorOrt", grz_AvisoStatusVorOrt))
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb

@@ -474,6 +474,7 @@ Public Class cSendungen
                     a.sndabr_anzahl = SQL.checkNullReturnValue(dr2.Item("sndabr_anzahl"), Nothing)
                     a.sndabr_einzelPreis = SQL.checkNullReturnValue(dr2.Item("sndabr_einzelPreis"), Nothing)
                     a.sndabr_preis = SQL.checkNullReturnValue(dr2.Item("sndabr_preis"), Nothing)
+                    a.sndabr_LeistungsNr = SQL.checkNullReturnValue(dr2.Item("sndabr_LeistungsNr"), Nothing)
 
                     Me.ABRECHNUNG.Add(a)
                 End While
@@ -846,6 +847,7 @@ Public Class cSendungAbrechnung
     Property sndabr_anzahl As Integer = Nothing
     Property sndabr_einzelPreis As Object = Nothing
     Property sndabr_preis As Object = Nothing
+    Property sndabr_LeistungsNr As Object = Nothing
 
     Dim SQL As New SQL
 
@@ -860,7 +862,7 @@ Public Class cSendungAbrechnung
         Me.sndabr_wert = sndabr_wert
     End Sub
 
-    Sub New(sndabr_sendId, sndabr_beteiligter, sndabr_abrArt, sndabr_wert, sndabr_bezeichnung, sndabr_anzahl, sndabr_einzelPreis, sndabr_preis)
+    Sub New(sndabr_sendId, sndabr_beteiligter, sndabr_abrArt, sndabr_wert, sndabr_bezeichnung, sndabr_anzahl, sndabr_einzelPreis, sndabr_preis, sndabr_LeistungsNr)
         Me.sndabr_sendId = sndabr_sendId
         Me.sndabr_beteiligter = sndabr_beteiligter
         Me.sndabr_abrArt = sndabr_abrArt
@@ -869,6 +871,7 @@ Public Class cSendungAbrechnung
         Me.sndabr_anzahl = sndabr_anzahl
         Me.sndabr_einzelPreis = sndabr_einzelPreis
         Me.sndabr_preis = sndabr_preis
+        Me.sndabr_LeistungsNr = sndabr_LeistungsNr
     End Sub
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -881,6 +884,7 @@ Public Class cSendungAbrechnung
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndabr_anzahl", sndabr_anzahl))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndabr_einzelPreis", sndabr_einzelPreis))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndabr_preis", sndabr_preis))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndabr_LeistungsNr", sndabr_LeistungsNr))
         Return list
     End Function
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb

@@ -873,7 +873,7 @@ Public Class cATEZ_NCTS_IN
 
                         While j < num
 
-                            Dim invoice As Chilkat.JsonObject = data.ObjectAt(0)
+                            Dim invoice As Chilkat.JsonObject = data.ObjectAt(j)
 
                             Dim R As DataRow = dt.NewRow
                             R("currency") = checkNullStr(invoice.StringOf("currency"))

VERAG_PROG_ALLGEMEIN/Schnittstellen/cHMRC.vb

@@ -60,6 +60,15 @@ Public Class cHMRC
                     cHMRCCredentials.CLIENT_ID = cHMRC_ENS.Client_ID
                     cHMRCCredentials.CLIENT_SECRET = cHMRC_ENS.Client_Secret
                 End If
+            Case "ATEZ_ENS"
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then
+
+                Else
+                    cHMRCCredentials.API_STRING = "https://api.service.hmrc.gov.uk"
+                    cHMRCCredentials.CLIENT_ID = "b28AgFVSAXkLPtnnlU1xTRXbMXoD"
+                    cHMRCCredentials.CLIENT_SECRET = "17dfde2d-2aa9-47a0-9a3a-160363b909c5"
+                End If
+
         End Select
         Return cHMRCCredentials
     End Function
@@ -1513,7 +1522,7 @@ Public Class cHMRC
 
 
 
-    Public Shared Function getTOKEN(APPLICATION, Optional forceNewToken = False, Optional saveAPPLICATION_NAME = "") As cHMRCToken
+    Public Shared Function getTOKEN(APPLICATION, Optional forceNewToken = False, Optional saveAPPLICATION_NAME = "", Optional otherHMRCAPPLICATION_NAME = "") As cHMRCToken
         If saveAPPLICATION_NAME = "" Then saveAPPLICATION_NAME = APPLICATION
 
         Dim TOKEN = New cHMRCToken(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, saveAPPLICATION_NAME)
@@ -1545,13 +1554,19 @@ Public Class cHMRC
             End Select
 
 
+            If otherHMRCAPPLICATION_NAME <> "" Then
+                HMRC_APPLICATION = otherHMRCAPPLICATION_NAME
+            End If
 
             If forceNewToken OrElse TOKEN.hasEntry = False OrElse TOKEN.token_BEARER_TOKEN Is Nothing OrElse TOKEN.token_BEARER_TOKEN = "" Then
                 'Neuer Token  
                 Dim AccessToken = ""
                 Dim RefreshToken = ""
+
+
                 grantAccess(AccessToken, RefreshToken, appl, HMRC_APPLICATION)
 
+
                 TOKEN.token_Application = saveAPPLICATION_NAME
                 TOKEN.token_BEARER_TOKEN = AccessToken
                 TOKEN.token_REFRESH_TOKEN = RefreshToken