edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RO übersetzungen MDM Abholinfos, NCTS_TR ATEZ Anpassungen

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-02-02 13:05:54 +01:00
parent cf6e1fd0cb
commit c984590127
12 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb
View File

@@ -84,12 +84,12 @@ Public Class cAvisoBenachrichtigungen
End Function
Public Shared Function BESTAETIGEN_BENACHRICHTIGUNG_ALL(ab_AvisoID, onlytype) As Boolean
Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId=-1,ab_Bestaetigt_Datum=getDate() WHERE ab_AvisoID=" & ab_AvisoID & If(onlytype, " and ab_art='A' ", "")
Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "',ab_Bestaetigt_Datum=getDate() WHERE ab_AvisoID=" & ab_AvisoID & If(onlytype, " and ab_art='A' ", "")
Return SQL.doSQL(sqlstr, "AVISO")
End Function
Public Shared Function BESTAETIGEN_BENACHRICHTIGUNG_SND([ab_SendungID], onlytype) As Boolean
Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId=-1,ab_Bestaetigt_Datum=getDate() WHERE [ab_SendungID]=" & [ab_SendungID]
Dim sqlstr = " Update [tblAvisoBenachrichtigungen] SET ab_Status = 1,ab_Bestaetigt_MaId='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "',ab_Bestaetigt_Datum=getDate() WHERE [ab_SendungID]=" & [ab_SendungID]
Return SQL.doSQL(sqlstr, "AVISO")
End Function
@@ -235,3 +235,15 @@ Public Class cAvisoBenachrichtigungen
End Class
Public Class cAvisoBenachrichtigungenCodes
Public Shared Neukunde_bitte_Abklärung As Integer = 1
Public Shared Neukunde_abgeklärt As Integer = 2
Public Shared An_Abklärung As Integer = 3
Public Shared Abklärung_OK As Integer = 4
Public Shared Vermerke_Reminder As Integer = 5
Public Shared Vorauskasse_OK As Integer = 6
Public Shared ZOLL_Dokumentenbeschau As Integer = 7
End Class

10
VERAG_PROG_ALLGEMEIN/Classes/cEZB_Waehrungskurse.vb
View File

@@ -146,4 +146,14 @@ Public Class cEZB_Waehrungskurse
Return (New SQL).doSQL(sqlstr, "FMZOLL")
End Function
Shared Function GET_KURS(ezb_waehrungscode As String, datum As Date) As Double
Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & ezb_waehrungscode & "' and ezb_datum<='" & datum.ToShortTimeString & "' order by ezb_datum desc"
Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0)
End Function
Shared Function EXCHANGE(betrag As Double, waehrungscode As String, datum As Date) As Double
Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & waehrungscode & "' and ezb_datum<='" & datum.ToShortTimeString & "' order by ezb_datum desc"
Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0) * betrag
End Function
End Class

4
VERAG_PROG_ALLGEMEIN/Classes/cNCTS_TR.vb
View File

@@ -981,7 +981,9 @@ Public Class cNCTS_TR_Sicherheitsangaben
Property nctsSA_ArtCode As Object = Nothing
Property nctsSA_BezeichnungBescheinigun As Object = Nothing
Property nctsSA_AbgabenBetrag As Object = Nothing
Property nctsSA_AbgabenBetragFremdWaehrung As Object = Nothing
Property nctsSA_GRN As Object = Nothing
Property nctsSA_Waerung As Object = Nothing
Property nctsSA_Zugriffcode As Object = Nothing
Property nctsSA_TIN As Object = Nothing
@@ -1008,6 +1010,8 @@ Public Class cNCTS_TR_Sicherheitsangaben
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_BezeichnungBescheinigun", nctsSA_BezeichnungBescheinigun))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_AbgabenBetrag", nctsSA_AbgabenBetrag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_GRN", nctsSA_GRN))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_AbgabenBetragFremdWaehrung", nctsSA_AbgabenBetragFremdWaehrung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_Waerung", nctsSA_Waerung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_Zugriffcode", nctsSA_Zugriffcode))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("nctsSA_TIN", nctsSA_TIN))

3
VERAG_PROG_ALLGEMEIN/Schnittstellen/cNCTS_Helper.vb
View File

@@ -29,8 +29,7 @@
sqlatr &= " AND (SELECT COUNT(*) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND [dySt_status] = 50 AND CONVERT(date, [dySt_ergZeitpunkt] ,104 ) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "')>0 "
sqlatr &= " ORDER BY Datum "
Dim dt As DataTable = SQL.loadDgvBySql(sqlatr, "FMZOLL", 120)
' MsgBox(sqlatr)
'Bei IMEX kein E-ZOLL
If _COMPANY = "VERAG/ATILLA" Then
If _EZOLL Then

3
VERAG_PROG_ALLGEMEIN/cAllgemein.vb
View File

@@ -446,10 +446,9 @@ End Class
Public Class cNCTS_GUARANTEES
Public Shared TOBB() As String = {"17TR0004000032349", "20TR0004000069756", "13TR0004000009323", "21TR0004000097157", "12TR0004000004665", "15TR0004000020917",
"17TR0004000029518", "20DE0000000078205", "19IT01TR000003323", "21TR0004000079552", "21TR0004000078157", "21TR0004000090364", "21TR0004000092350", "20TR0004000069557",
"21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356"}
"21TR0004000097564", "21TR0004000084967", "19TR0004000056358", "19TR0004000053175", "19TR0004000053356", "22TR0004000126963", "22TR0004000114169", "19TR0004000059957", "21TR0004000097555"}
'old: {"15TR0004000020917", "12TR0004000004665", "17TR0004000032349", "17TR0004000029518"f, "21TR0004000079552", "21TR00x04000078157", "21TR0004000092350", "20TR0004000069756", "21TR0004000090364", "21TR0004000097157"}
Public Shared OREGON() As String = {"18DE0000000073276", "19DE0000000075520", "18DE0000000075520", "15TR0004000020500", "ITTR0000000000153", "21DE0000000079716", "21DE0000000081910"}
Public Shared VERAG() As String = {"17DE0000000071678", "05AT510000G000FP7"}