atez KI-Upload
This commit is contained in:
@@ -1377,10 +1377,13 @@ Public Class frmMDM_USTVAntrag
|
||||
dt.Columns.Add("invoice_date", GetType(String))
|
||||
dt.Columns.Add("status", GetType(String))
|
||||
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
|
||||
|
||||
Dim failreDesc As String
|
||||
Dim authResp = atez_api.authenticate("VAT", "client1", "password")
|
||||
Dim authResp = atez_api.authenticate("VAT", "client1", "password", documentType)
|
||||
Dim resp
|
||||
If authResp <> "200" Then
|
||||
MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
|
||||
@@ -1391,7 +1394,7 @@ Public Class frmMDM_USTVAntrag
|
||||
|
||||
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
|
||||
@@ -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
|
||||
|
||||
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
|
||||
Dim pagestart = 0
|
||||
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
|
||||
Next
|
||||
|
||||
@@ -1459,7 +1462,7 @@ Public Class frmMDM_USTVAntrag
|
||||
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")
|
||||
|
||||
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)
|
||||
@@ -1596,12 +1599,12 @@ Public Class frmMDM_USTVAntrag
|
||||
|
||||
Else
|
||||
|
||||
Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag()
|
||||
Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag()
|
||||
Dim ADR As New cAdressen(KundenNr)
|
||||
Dim ERW As New cKundenErweitert(KundenNr)
|
||||
Dim FIRMA As New cFirmen(1) 'Nr 1 weil Kontodaten von Verag.....
|
||||
|
||||
If KundenNr <0 Then
|
||||
If KundenNr < 0 Then
|
||||
MsgBox("Kunde auswählen!")
|
||||
Exit Sub
|
||||
End If
|
||||
@@ -1633,16 +1636,29 @@ Public Class frmMDM_USTVAntrag
|
||||
'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")
|
||||
|
||||
'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"))
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
Imports System.Windows.Documents
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
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
|
||||
|
||||
|
||||
Dim frm = New frmMDM_USTVAntrag(MyDatagridview1.SelectedRows(0).Cells("antragExisitiert").Value)
|
||||
frm.ShowDialog()
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ Public Class ustCntlUSTV_AntragPosition
|
||||
If da_id > -1 Then
|
||||
scanSonstiges.INIT_daId(da_id)
|
||||
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
|
||||
scanSonstiges.INIT(kdnr, "MDM", "MDM_DATEN", "USTVA_" & UStV_POS.UStVAn_ID & "_" & UStV_POS.UStVPo_ID)
|
||||
'scanSonstiges.INIT_daId(da_id)
|
||||
@@ -659,10 +659,13 @@ Public Class ustCntlUSTV_AntragPosition
|
||||
dt.Columns.Add("invoice_date", GetType(String))
|
||||
dt.Columns.Add("status", GetType(String))
|
||||
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
|
||||
|
||||
Dim failreDesc As String
|
||||
Dim authResp = API.authenticate("VAT", "client1", "password")
|
||||
Dim authResp = API.authenticate("VAT", "client1", "password", item.Name)
|
||||
Dim resp
|
||||
If authResp <> "200" Then
|
||||
MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp)
|
||||
@@ -673,13 +676,14 @@ Public Class ustCntlUSTV_AntragPosition
|
||||
'document_type = vat_invoice or receipt
|
||||
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
|
||||
|
||||
|
||||
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)
|
||||
If f.ShowDialog = DialogResult.OK Then
|
||||
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
|
||||
|
||||
|
||||
If Not cnS_KIUPLOAD.Items.ContainsKey("vat_invoice") Then
|
||||
Dim vat = New ToolStripMenuItem() With {.Text = "MWST-Rechnung(en)", .Name = "vat_invoice", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
|
||||
If Not cnS_KIUPLOAD.Items.ContainsKey("invoice") Then
|
||||
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)
|
||||
AddHandler vat.Click, AddressOf mnuItemKIUPLOAD_Clicked
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user