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

atez KI-Upload

Browse Source
This commit is contained in:
d.breimaier
2025-05-14 12:30:18 +02:00
parent ee356b44d9
commit a53cd730d3
7 changed files with 106 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SDL/Creditsafe/usrcntlVAT_ATEZ.Designer.vb generated
View File

@@ -38,6 +38,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Label3 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label()
Me.dgvVAT = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.dgvVAT = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.cboLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.lblPagecount = New System.Windows.Forms.Label()
CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvVAT, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout() Me.SuspendLayout()
' '
@@ -51,6 +52,7 @@ Partial Class usrcntlVAT_ATEZ
Me.lblUID.Size = New System.Drawing.Size(40, 13) Me.lblUID.Size = New System.Drawing.Size(40, 13)
Me.lblUID.TabIndex = 1 Me.lblUID.TabIndex = 1
Me.lblUID.Text = "UID-Nr" Me.lblUID.Text = "UID-Nr"
Me.lblUID.Visible = False
' '
'txtUID 'txtUID
' '
@@ -60,6 +62,7 @@ Partial Class usrcntlVAT_ATEZ
Me.txtUID.Name = "txtUID" Me.txtUID.Name = "txtUID"
Me.txtUID.Size = New System.Drawing.Size(134, 23) Me.txtUID.Size = New System.Drawing.Size(134, 23)
Me.txtUID.TabIndex = 3 Me.txtUID.TabIndex = 3
Me.txtUID.Visible = False
' '
'txtFirma 'txtFirma
' '
@@ -70,6 +73,7 @@ Partial Class usrcntlVAT_ATEZ
Me.txtFirma.Name = "txtFirma" Me.txtFirma.Name = "txtFirma"
Me.txtFirma.Size = New System.Drawing.Size(173, 23) Me.txtFirma.Size = New System.Drawing.Size(173, 23)
Me.txtFirma.TabIndex = 1 Me.txtFirma.TabIndex = 1
Me.txtFirma.Visible = False
' '
'lblFirma 'lblFirma
' '
@@ -80,6 +84,7 @@ Partial Class usrcntlVAT_ATEZ
Me.lblFirma.Size = New System.Drawing.Size(32, 13) Me.lblFirma.Size = New System.Drawing.Size(32, 13)
Me.lblFirma.TabIndex = 3 Me.lblFirma.TabIndex = 3
Me.lblFirma.Text = "Firma" Me.lblFirma.Text = "Firma"
Me.lblFirma.Visible = False
' '
'lblLand 'lblLand
' '
@@ -90,6 +95,7 @@ Partial Class usrcntlVAT_ATEZ
Me.lblLand.Size = New System.Drawing.Size(31, 13) Me.lblLand.Size = New System.Drawing.Size(31, 13)
Me.lblLand.TabIndex = 5 Me.lblLand.TabIndex = 5
Me.lblLand.Text = "Land" Me.lblLand.Text = "Land"
Me.lblLand.Visible = False
' '
'lblWarning 'lblWarning
' '
@@ -121,6 +127,7 @@ Partial Class usrcntlVAT_ATEZ
Me.txtStrasse.Name = "txtStrasse" Me.txtStrasse.Name = "txtStrasse"
Me.txtStrasse.Size = New System.Drawing.Size(163, 23) Me.txtStrasse.Size = New System.Drawing.Size(163, 23)
Me.txtStrasse.TabIndex = 101 Me.txtStrasse.TabIndex = 101
Me.txtStrasse.Visible = False
' '
'Label1 'Label1
' '
@@ -132,6 +139,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Label1.Size = New System.Drawing.Size(42, 13) Me.Label1.Size = New System.Drawing.Size(42, 13)
Me.Label1.TabIndex = 100 Me.Label1.TabIndex = 100
Me.Label1.Text = "Strasse" Me.Label1.Text = "Strasse"
Me.Label1.Visible = False
' '
'txtPLZ 'txtPLZ
' '
@@ -141,6 +149,7 @@ Partial Class usrcntlVAT_ATEZ
Me.txtPLZ.Name = "txtPLZ" Me.txtPLZ.Name = "txtPLZ"
Me.txtPLZ.Size = New System.Drawing.Size(84, 23) Me.txtPLZ.Size = New System.Drawing.Size(84, 23)
Me.txtPLZ.TabIndex = 103 Me.txtPLZ.TabIndex = 103
Me.txtPLZ.Visible = False
' '
'Label2 'Label2
' '
@@ -152,6 +161,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Label2.Size = New System.Drawing.Size(27, 13) Me.Label2.Size = New System.Drawing.Size(27, 13)
Me.Label2.TabIndex = 102 Me.Label2.TabIndex = 102
Me.Label2.Text = "PLZ" Me.Label2.Text = "PLZ"
Me.Label2.Visible = False
' '
'txtOrt 'txtOrt
' '
@@ -161,6 +171,7 @@ Partial Class usrcntlVAT_ATEZ
Me.txtOrt.Name = "txtOrt" Me.txtOrt.Name = "txtOrt"
Me.txtOrt.Size = New System.Drawing.Size(155, 23) Me.txtOrt.Size = New System.Drawing.Size(155, 23)
Me.txtOrt.TabIndex = 105 Me.txtOrt.TabIndex = 105
Me.txtOrt.Visible = False
' '
'Label3 'Label3
' '
@@ -172,6 +183,7 @@ Partial Class usrcntlVAT_ATEZ
Me.Label3.Size = New System.Drawing.Size(21, 13) Me.Label3.Size = New System.Drawing.Size(21, 13)
Me.Label3.TabIndex = 104 Me.Label3.TabIndex = 104
Me.Label3.Text = "Ort" Me.Label3.Text = "Ort"
Me.Label3.Visible = False
' '
'dgvVAT 'dgvVAT
' '
@@ -204,6 +216,18 @@ Partial Class usrcntlVAT_ATEZ
Me.cboLand.Name = "cboLand" Me.cboLand.Name = "cboLand"
Me.cboLand.Size = New System.Drawing.Size(58, 24) Me.cboLand.Size = New System.Drawing.Size(58, 24)
Me.cboLand.TabIndex = 99 Me.cboLand.TabIndex = 99
Me.cboLand.Visible = False
'
'lblPagecount
'
Me.lblPagecount.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.lblPagecount.AutoSize = True
Me.lblPagecount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
Me.lblPagecount.Location = New System.Drawing.Point(827, 37)
Me.lblPagecount.Name = "lblPagecount"
Me.lblPagecount.Size = New System.Drawing.Size(43, 13)
Me.lblPagecount.TabIndex = 106
Me.lblPagecount.Text = "Seiten: "
' '
'usrcntlVAT_ATEZ 'usrcntlVAT_ATEZ
' '
@@ -211,6 +235,7 @@ Partial Class usrcntlVAT_ATEZ
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.AutoScroll = True Me.AutoScroll = True
Me.BackColor = System.Drawing.Color.White Me.BackColor = System.Drawing.Color.White
Me.Controls.Add(Me.lblPagecount)
Me.Controls.Add(Me.txtOrt) Me.Controls.Add(Me.txtOrt)
Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.txtPLZ) Me.Controls.Add(Me.txtPLZ)
@@ -248,4 +273,5 @@ Partial Class usrcntlVAT_ATEZ
Friend WithEvents Label2 As Label Friend WithEvents Label2 As Label
Friend WithEvents txtOrt As TextBox Friend WithEvents txtOrt As TextBox
Friend WithEvents Label3 As Label Friend WithEvents Label3 As Label
Friend WithEvents lblPagecount As Label
End Class End Class

29
SDL/Creditsafe/usrcntlVAT_ATEZ.vb
View File

@@ -76,6 +76,9 @@ Public Class usrcntlVAT_ATEZ
dataTable.Columns.Add("status", GetType(String)) dataTable.Columns.Add("status", GetType(String))
dataTable.Columns.Add("invoice_date", GetType(DateTime)) dataTable.Columns.Add("invoice_date", GetType(DateTime))
dataTable.Columns.Add("document_count", GetType(Integer)) dataTable.Columns.Add("document_count", GetType(Integer))
dataTable.Columns.Add("total_pages", GetType(Integer))
dataTable.Columns.Add("doc_index", GetType(Integer))
dataTable.Columns.Add("page_count", GetType(Integer))
End Sub End Sub
@@ -85,6 +88,9 @@ Public Class usrcntlVAT_ATEZ
If dgvVAT.Columns.Count > 0 Then If dgvVAT.Columns.Count > 0 Then
lblPagecount.Text &= dgvVAT.Rows(0).Cells("total_pages").Value
With dgvVAT With dgvVAT
.RowHeadersWidth = 10 .RowHeadersWidth = 10
.Columns("count").HeaderText = "#" .Columns("count").HeaderText = "#"
@@ -109,8 +115,14 @@ Public Class usrcntlVAT_ATEZ
.Columns("status").HeaderText = "Status" .Columns("status").HeaderText = "Status"
.Columns("invoice_date").Width = 100 .Columns("invoice_date").Width = 100
.Columns("invoice_date").HeaderText = "Rechnungsdatum" .Columns("invoice_date").HeaderText = "Rechnungsdatum"
.Columns("document_count").HeaderText = "Seite" .Columns("document_count").HeaderText = "Dok.#"
.Columns("document_count").Width = 50 .Columns("document_count").Width = 50
.Columns("page_count").HeaderText = "Seiten"
.Columns("page_count").Width = 50
.Columns("total_pages").Visible = False
.Columns("doc_index").Visible = False
End With End With
For Each row As DataGridViewRow In dgvVAT.Rows For Each row As DataGridViewRow In dgvVAT.Rows
@@ -170,7 +182,10 @@ Public Class usrcntlVAT_ATEZ
IIf(IsDBNull(row.Cells("total_VAT_amount").Value), "", row.Cells("total_VAT_amount").Value), IIf(IsDBNull(row.Cells("total_VAT_amount").Value), "", row.Cells("total_VAT_amount").Value),
IIf(IsDBNull(row.Cells("invoice_date").Value) Or Not IsDate(row.Cells("invoice_date").Value), Nothing, CDate(row.Cells("invoice_date").Value)), IIf(IsDBNull(row.Cells("invoice_date").Value) Or Not IsDate(row.Cells("invoice_date").Value), Nothing, CDate(row.Cells("invoice_date").Value)),
IIf(IsDBNull(row.Cells("status").Value), "", row.Cells("status").Value), IIf(IsDBNull(row.Cells("status").Value), "", row.Cells("status").Value),
IIf(IsDBNull(row.Cells("document_count").Value), "", row.Cells("document_count").Value)) IIf(IsDBNull(row.Cells("document_count").Value), "", row.Cells("document_count").Value),
IIf(IsDBNull(row.Cells("total_pages").Value), "", row.Cells("total_pages").Value),
IIf(IsDBNull(row.Cells("doc_index").Value), "", row.Cells("doc_index").Value),
IIf(IsDBNull(row.Cells("page_count").Value), "", row.Cells("page_count").Value))
Next Next
If va.status.ToLower <> "success" Then If va.status.ToLower <> "success" Then
@@ -207,9 +222,13 @@ Public Class usrcntlVAT_ATEZ
Public Property total_VAT_amount As String Public Property total_VAT_amount As String
Public Property status As String Public Property status As String
Public Property document_count As Integer Public Property document_count As Integer
Public Property total_pages As Integer
Public Property page_count As Integer
Public Property doc_index As Integer
Public Sub New(_count As Integer, _currency As String, _invoice_id As String, _seller_VAT_id As String, _seller_address_city As String, _seller_address_country As String, _seller_address_postcode As String, _seller_address_street As String, _seller_name As String, _total_VAT_amount As String, _invoice_date As DateTime, _status As String, _document_count As Integer)
Public Sub New(_count As Integer, _currency As String, _invoice_id As String, _seller_VAT_id As String, _seller_address_city As String, _seller_address_country As String, _seller_address_postcode As String, _seller_address_street As String, _seller_name As String, _total_VAT_amount As String, _invoice_date As DateTime, _status As String, _document_count As Integer, _total_pages As Integer, _doc_index As Integer, _page_count As Integer)
count = _count count = _count
currency = _currency currency = _currency
invoice_id = _invoice_id invoice_id = _invoice_id
@@ -223,7 +242,9 @@ Public Class usrcntlVAT_ATEZ
invoice_date = _invoice_date invoice_date = _invoice_date
status = _status status = _status
document_count = _document_count document_count = _document_count
total_pages = _total_pages
page_count = _page_count
doc_index = _doc_index
End Sub End Sub

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.4.0.0")> <Assembly: AssemblyVersion("1.4.0.1")>
<Assembly: AssemblyFileVersion("1.4.0.0")> <Assembly: AssemblyFileVersion("1.4.0.1")>

36
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -1377,10 +1377,13 @@ Public Class frmMDM_USTVAntrag
dt.Columns.Add("invoice_date", GetType(String)) dt.Columns.Add("invoice_date", GetType(String))
dt.Columns.Add("status", GetType(String)) dt.Columns.Add("status", GetType(String))
dt.Columns.Add("document_count", GetType(Integer)) dt.Columns.Add("document_count", GetType(Integer))
dt.Columns.Add("doc_index", GetType(Integer))
dt.Columns.Add("page_count", GetType(Integer))
dt.Columns.Add("total_pages", GetType(Integer))
End If End If
Dim failreDesc As String Dim failreDesc As String
Dim authResp = atez_api.authenticate("VAT", "client1", "password") Dim authResp = atez_api.authenticate("VAT", "client1", "password", documentType)
Dim resp Dim resp
If authResp <> "200" Then If authResp <> "200" Then
MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp) MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
@@ -1391,7 +1394,7 @@ Public Class frmMDM_USTVAntrag
If atez_api.setJsonVAT(documentType, daid) Then If atez_api.setJsonVAT(documentType, daid) Then
resp = atez_api.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt) resp = atez_api.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt, documentType)
If dt.Rows.Count > 0 Then If dt.Rows.Count > 0 Then
@@ -1433,7 +1436,7 @@ Public Class frmMDM_USTVAntrag
If pageCount = r.Cells("document_count").Value Then If pageCount = r.Cells("page_count").Value Then
USTV_POS.UStVPo_daId_loeschbar = True USTV_POS.UStVPo_daId_loeschbar = True
Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("yyyyMMdd"), fi_orig.Name, USTV_ANTRAG.UStVAn_KuNr, False) Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("yyyyMMdd"), fi_orig.Name, USTV_ANTRAG.UStVAn_KuNr, False)
@@ -1450,7 +1453,7 @@ Public Class frmMDM_USTVAntrag
'todo: Logik Aufsplittung des PDF in Teilpdfs 'todo: Logik Aufsplittung des PDF in Teilpdfs
Dim pagestart = 0 Dim pagestart = 0
For Each pages As DataRow In dt.Rows For Each pages As DataRow In dt.Rows
pagestart += CInt(pages.Item("document_count")) pagestart += CInt(pages.Item("page_count"))
If pages.Item("count") = r.Cells("count").Value Then Exit For If pages.Item("count") = r.Cells("count").Value Then Exit For
Next Next
@@ -1459,7 +1462,7 @@ Public Class frmMDM_USTVAntrag
Dim TMP_Path_Old = fi_orig.FullName Dim TMP_Path_Old = fi_orig.FullName
Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(fi_orig.Name, fi_orig.Extension,, True, "USTVA_POS") Dim TMP_Path_New = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(fi_orig.Name, fi_orig.Extension,, True, "USTVA_POS")
VERAG_PROG_ALLGEMEIN.cAllgemein.ExtractPdfPages(TMP_Path_Old, TMP_Path_New, pagestart, r.Cells("document_count").Value) VERAG_PROG_ALLGEMEIN.cAllgemein.ExtractPdfPages(TMP_Path_Old, TMP_Path_New, pagestart, r.Cells("page_count").Value)
Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("yyyyMMdd"), fi_orig.Name, USTV_ANTRAG.UStVAn_KuNr, False) Dim DS_NEW As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "ATEZ_KI", Now.Year, Now.ToString("yyyyMMdd"), fi_orig.Name, USTV_ANTRAG.UStVAn_KuNr, False)
@@ -1596,12 +1599,12 @@ Public Class frmMDM_USTVAntrag
Else Else
Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag() Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag()
Dim ADR As New cAdressen(KundenNr) Dim ADR As New cAdressen(KundenNr)
Dim ERW As New cKundenErweitert(KundenNr) Dim ERW As New cKundenErweitert(KundenNr)
Dim FIRMA As New cFirmen(1) 'Nr 1 weil Kontodaten von Verag..... Dim FIRMA As New cFirmen(1) 'Nr 1 weil Kontodaten von Verag.....
If KundenNr <0 Then If KundenNr < 0 Then
MsgBox("Kunde auswählen!") MsgBox("Kunde auswählen!")
Exit Sub Exit Sub
End If End If
@@ -1633,16 +1636,29 @@ Public Class frmMDM_USTVAntrag
'check if already existing 'überschneidungen prüfen!!!! 'check if already existing 'überschneidungen prüfen!!!!
Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql("Select UStVAn_ID,UStVAn_ReDatvon, UStVAn_ReDatBis from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " Dim dt_existingUSTVA As DataTable = SQL.loadDgvBySql("Select UStVAn_ID,UStVAn_ReDatvon, UStVAn_ReDatBis, UStVAn_AntragEingereichtAm from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & "
AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' or cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "' ) and (cast(UStVAn_ReDatBis as date) < '" & CDate(txtBis._value).ToShortDateString & "' or cast(UStVAn_ReDatvon as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL") AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' or cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "' ) and (cast(UStVAn_ReDatBis as date) < '" & CDate(txtBis._value).ToShortDateString & "' or cast(UStVAn_ReDatvon as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL")
'Dim anzUSTVA = CInt((New SQL).getValueTxtBySql("Select count(*) from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & " 'Dim anzUSTVA = CInt((New SQL).getValueTxtBySql("Select count(*) from tblUStVAntrag where UStvAN_KuNr = " & KundenNr & " and (isnull(UStVAn_AntragArt,'MWST') = '" & cboAntragArt._value & "' or UStVAn_AntragArt = '') and UStVAn_LandNr = " & USTV_ANTRAG.UStVAn_LandNr & "
' AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "') or (cast(UStVAn_ReDatvon as date) < '" & CDate(txtBis._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL")) ' AND not ((cast(UStVAn_ReDatvon as date) > '" & CDate(txtVon._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) <= '" & CDate(txtVon._value).ToShortDateString & "') or (cast(UStVAn_ReDatvon as date) < '" & CDate(txtBis._value).ToShortDateString & "' and cast(UStVAn_ReDatBis as date) >= '" & CDate(txtBis._value).ToShortDateString & "'))", "FMZOLL"))
If dt_existingUSTVA.Rows.Count = 1 Then If dt_existingUSTVA.Rows.Count = 1 Then
If Not vbYes = MsgBox("Es existiert bereits ein" & cboAntragArt._value & " -Eintrag von " & dt_existingUSTVA.Rows(0).Item("UStVAn_ReDatvon") & " - " & dt_existingUSTVA.Rows(0).Item("UStVAn_ReDatbis") & " von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString & vbNewLine & "Trotzdem Antrag speichern?", vbYesNoCancel) Then Exit Sub
Dim eingereicht As String = IIf(Not IsDBNull(dt_existingUSTVA.Rows(0).Item("UStVAn_AntragEingereichtAm")) AndAlso IsDate(dt_existingUSTVA.Rows(0).Item("UStVAn_AntragEingereichtAm")), " EINGEREICHTER ", "")
Dim result As MsgBoxResult = MsgBox("Es existiert bereits ein " & eingereicht & cboAntragArt._value & "-Eintrag von " & dt_existingUSTVA.Rows(0).Item("UStVAn_ReDatvon") & " - " & dt_existingUSTVA.Rows(0).Item("UStVAn_ReDatbis") & " von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString & vbNewLine & "Ja = Antrag speichern" & vbNewLine & "Nein = existierenden Antrag öffnen", vbYesNoCancel)
Select Case result
Case MsgBoxResult.Cancel : Exit Sub
Case MsgBoxResult.No
Me.Close()
Dim frm = New frmMDM_USTVAntrag(dt_existingUSTVA.Rows(0).Item("UStVAn_ID"))
frm.ShowDialog()
Exit Sub
End Select
ElseIf dt_existingUSTVA.Rows.Count > 1 Then ElseIf dt_existingUSTVA.Rows.Count > 1 Then
If Not vbYes = MsgBox("Es existiert bereits mind. ein " & cboAntragArt._value & " -Eintrag in diesem Zeitbereich von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString & vbNewLine & "Trotzdem Antrag speichern?", vbYesNoCancel) Then Exit Sub If Not vbYes = MsgBox("Es existiert bereits mind. ein " & cboAntragArt._value & "-Eintrag in diesem Zeitbereich von " & ADR.Name_1 & " für " & cbxLand.SelectedItem.ToString & vbNewLine & "Trotzdem Antrag speichern?", vbYesNoCancel) Then Exit Sub
End If End If

2
SDL/USTV/frmUSTVoffeneAntraege.vb
View File

@@ -1,4 +1,5 @@
Imports System.Windows.Documents Imports System.Windows.Documents
Imports VERAG_PROG_ALLGEMEIN
Public Class frmUSTVoffeneAntraege Public Class frmUSTVoffeneAntraege
@@ -959,6 +960,7 @@ Public Class frmUSTVoffeneAntraege
If MyDatagridview1.SelectedRows(0).Cells("antragExisitiert").Value > 0 AndAlso Not MyDatagridview1.SelectedRows(0).Cells("eingereicht").Value Then If MyDatagridview1.SelectedRows(0).Cells("antragExisitiert").Value > 0 AndAlso Not MyDatagridview1.SelectedRows(0).Cells("eingereicht").Value Then
Dim frm = New frmMDM_USTVAntrag(MyDatagridview1.SelectedRows(0).Cells("antragExisitiert").Value) Dim frm = New frmMDM_USTVAntrag(MyDatagridview1.SelectedRows(0).Cells("antragExisitiert").Value)
frm.ShowDialog() frm.ShowDialog()

14
SDL/USTV/ustCntlUSTV_AntragPosition.vb
View File

@@ -108,7 +108,7 @@ Public Class ustCntlUSTV_AntragPosition
If da_id > -1 Then If da_id > -1 Then
scanSonstiges.INIT_daId(da_id) scanSonstiges.INIT_daId(da_id)
scanSonstiges.Enabled = UStV_POS.UStVPo_daId_loeschbar 'Not UStV_POS.UStVPo_SchnittstellenNr > 0 scanSonstiges.Enabled = UStV_POS.UStVPo_daId_loeschbar 'Not UStV_POS.UStVPo_SchnittstellenNr > 0
btnAPIUbload.Enabled = UStV_POS.UStVPo_daId_loeschbar btnAPIUbload.Enabled = True 'hochladbar aber nicht einfügen lassen! UStV_POS.UStVPo_daId_loeschbar
Else Else
scanSonstiges.INIT(kdnr, "MDM", "MDM_DATEN", "USTVA_" & UStV_POS.UStVAn_ID & "_" & UStV_POS.UStVPo_ID) scanSonstiges.INIT(kdnr, "MDM", "MDM_DATEN", "USTVA_" & UStV_POS.UStVAn_ID & "_" & UStV_POS.UStVPo_ID)
'scanSonstiges.INIT_daId(da_id) 'scanSonstiges.INIT_daId(da_id)
@@ -659,10 +659,13 @@ Public Class ustCntlUSTV_AntragPosition
dt.Columns.Add("invoice_date", GetType(String)) dt.Columns.Add("invoice_date", GetType(String))
dt.Columns.Add("status", GetType(String)) dt.Columns.Add("status", GetType(String))
dt.Columns.Add("document_count", GetType(Integer)) dt.Columns.Add("document_count", GetType(Integer))
dt.Columns.Add("page_count", GetType(Integer))
dt.Columns.Add("doc_index", GetType(Integer))
dt.Columns.Add("total_pages", GetType(Integer))
End If End If
Dim failreDesc As String Dim failreDesc As String
Dim authResp = API.authenticate("VAT", "client1", "password") Dim authResp = API.authenticate("VAT", "client1", "password", item.Name)
Dim resp Dim resp
If authResp <> "200" Then If authResp <> "200" Then
MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp) MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
@@ -673,13 +676,14 @@ Public Class ustCntlUSTV_AntragPosition
'document_type = vat_invoice or receipt 'document_type = vat_invoice or receipt
If API.setJsonVAT(item.Name, UStV_POS.UStVPo_daId) Then If API.setJsonVAT(item.Name, UStV_POS.UStVPo_daId) Then
resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt) resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST", dt, item.Name)
If dt.Rows.Count > 0 Then If dt.Rows.Count > 0 Then
Dim f As New frmVAT_ATEZ() Dim f As New frmVAT_ATEZ()
f.usrcntlVAT_ATEZ1.btnUebernehmen.Enabled = UStV_POS.UStVPo_daId_loeschbar 'NUR ÜBERNEHMEN WENN LÖSCHBAR!
f.usrcntlVAT_ATEZ1.initDGV(dt) f.usrcntlVAT_ATEZ1.initDGV(dt)
If f.ShowDialog = DialogResult.OK Then If f.ShowDialog = DialogResult.OK Then
txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date txtRgDatum.Text = f.usrcntlVAT_ATEZ1.va.invoice_date
@@ -774,8 +778,8 @@ Public Class ustCntlUSTV_AntragPosition
Private Sub btnAPIUbload_Click(sender As Object, e As EventArgs) Handles btnAPIUbload.Click Private Sub btnAPIUbload_Click(sender As Object, e As EventArgs) Handles btnAPIUbload.Click
If Not cnS_KIUPLOAD.Items.ContainsKey("vat_invoice") Then If Not cnS_KIUPLOAD.Items.ContainsKey("invoice") Then
Dim vat = New ToolStripMenuItem() With {.Text = "MWST-Rechnung(en)", .Name = "vat_invoice", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} Dim vat = New ToolStripMenuItem() With {.Text = "MWST-Rechnung(en)", .Name = "invoice", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
cnS_KIUPLOAD.Items.Add(vat) cnS_KIUPLOAD.Items.Add(vat)
AddHandler vat.Click, AddressOf mnuItemKIUPLOAD_Clicked AddHandler vat.Click, AddressOf mnuItemKIUPLOAD_Clicked
End If End If

22
VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
View File

@@ -748,7 +748,7 @@ Public Class cATEZ_NCTS_IN
End Function End Function
Shared Function authenticate(program As String, Optional client_id As String = "", Optional grant_type As String = "") As String Shared Function authenticate(program As String, Optional client_id As String = "", Optional grant_type As String = "", Optional documentType As String = "") As String
Dim myUri As String = API_STRING Dim myUri As String = API_STRING
Dim contentType = "application/json" Dim contentType = "application/json"
@@ -756,7 +756,10 @@ Public Class cATEZ_NCTS_IN
Select Case program Select Case program
Case "NCTS" : myUri &= "/api/tds/auth/" Case "NCTS" : myUri &= "/api/tds/auth/"
Case "VAT" : myUri &= "/token" : contentType = "application/x-www-form-urlencoded" : useBody = False Case "VAT"
If documentType <> "" Then myUri = myUri.Replace("invoice", documentType)
myUri &= "/token" : contentType = "application/x-www-form-urlencoded" : useBody = False
@@ -769,7 +772,7 @@ Public Class cATEZ_NCTS_IN
End Function End Function
Shared Function SendRequestWithAuthHeader(acceptContentType As String, ByRef failureDesc As String, myUrl As String, Method As String, Optional dt As DataTable = Nothing) As String Shared Function SendRequestWithAuthHeader(acceptContentType As String, ByRef failureDesc As String, myUrl As String, Method As String, Optional dt As DataTable = Nothing, Optional documentType As String = "") As String
Try Try
VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
@@ -780,6 +783,9 @@ Public Class cATEZ_NCTS_IN
Dim bTls As Boolean = True Dim bTls As Boolean = True
Dim port As Integer = 443 Dim port As Integer = 443
Dim bAutoReconnect As Boolean = True Dim bAutoReconnect As Boolean = True
If documentType <> "" Then API_STRING = API_STRING.Replace("invoice", documentType)
success = rest.Connect(API_STRING, port, bTls, bAutoReconnect) success = rest.Connect(API_STRING, port, bTls, bAutoReconnect)
If (success <> True) Then If (success <> True) Then
Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason) Debug.WriteLine("ConnectFailReason: " & rest.ConnectFailReason)
@@ -949,9 +955,10 @@ Public Class cATEZ_NCTS_IN
Dim invoice As Chilkat.JsonObject = jsonResult.ObjectAt(j) Dim invoice As Chilkat.JsonObject = jsonResult.ObjectAt(j)
Dim R As DataRow = dt.NewRow Dim R As DataRow = dt.NewRow
Dim totalAmonut As String = invoice.StringOf("total_VAT_amount").Replace(".", ",")
R("count") = j + 1 R("count") = j + 1
R("currency") = checkNullStr(invoice.StringOf("currency")) R("currency") = checkNullStr(invoice.StringOf("currency"))
Dim totalAmonut As String = invoice.StringOf("total_VAT_amount").Replace(".", ",")
R("total_VAT_amount") = CDbl(checkNulDbl(totalAmonut)) R("total_VAT_amount") = CDbl(checkNulDbl(totalAmonut))
R("invoice_id") = checkNullStr(invoice.StringOf("invoice_id")) R("invoice_id") = checkNullStr(invoice.StringOf("invoice_id"))
R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date")) R("invoice_date") = checkNullStr(invoice.StringOf("invoice_date"))
@@ -963,6 +970,9 @@ Public Class cATEZ_NCTS_IN
R("seller_address_street") = checkNullStr(invoice.StringOf("seller_address_street")) R("seller_address_street") = checkNullStr(invoice.StringOf("seller_address_street"))
R("status") = checkNullStr(jsonResult.StringOf("status")) R("status") = checkNullStr(jsonResult.StringOf("status"))
R("document_count") = checkNulInt(jsonResult.IntOf("document_count")) R("document_count") = checkNulInt(jsonResult.IntOf("document_count"))
R("doc_index") = checkNulInt(jsonResult.IntOf("doc_index"))
R("page_count") = checkNulInt(jsonResult.IntOf("page_count"))
R("total_pages") = checkNulInt(jsonResult.IntOf("total_pages"))
dt.Rows.Add(R) dt.Rows.Add(R)
@@ -976,10 +986,10 @@ Public Class cATEZ_NCTS_IN
Return jsonResult.StringOf("atezId") Return jsonResult.StringOf("atezId")
End If
End If End If
End If
Catch ex As WebException Catch ex As WebException
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)