KI_upload

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -1318,7 +1318,7 @@ Public Class frmMDM_USTVAntrag
     End Function
 
 
-    Shared Function loadUSTVFrom_ATEZ_KI(UStVAn_ID As Integer, Antrag_LandKz As String, atez_api As cATEZ_NCTS_IN, daid As Integer, pageCount As Integer, documentType As String) As Boolean
+    Shared Function loadUSTVFrom_ATEZ_KI(UStVAn_ID As Integer, Antrag_LandKz As String, atez_api As cATEZ_NCTS_IN, daid As Integer, pageCount As Integer, documentType As String, deleteOrigPDF As Boolean) As Boolean
         Try
 
             Dim bytSchnittstellenNr = -1
@@ -1368,7 +1368,7 @@ Public Class frmMDM_USTVAntrag
                         If f.ShowDialog = DialogResult.OK Then
 
 
-                            Dim DS_ORIG_alreadyDeleted As Boolean = False
+                            Dim DS_ORIG_alreadyDeleted = Not deleteOrigPDF 'ist wirklich so richtig!
                             Dim DS_ORIG As New cDATENSERVER(daid)
                             Dim fi_orig As New FileInfo(DS_ORIG.GET_TOP1_PATH())
 
@@ -2947,6 +2947,14 @@ Public Class frmMDM_USTVAntrag
 
     Private Sub scanUSTVA_FileAdded(id As String, path As String, name As String) Handles scanUSTVA.FileAdded
         btnPDFauslesen.Enabled = scanUSTVA.getDS.da_id > 0
+        cbxKIUploaddelete.Enabled = btnPDFauslesen.Enabled
+
+    End Sub
+
+    Private Sub scanUSTVA_FileDeleted() Handles scanUSTVA.FileDeleted
+        btnPDFauslesen.Enabled = False
+        cbxKIUploaddelete.Enabled = btnPDFauslesen.Enabled
+
     End Sub
 
     Private Sub mnuItemKIUPLOAD_Clicked(sender As Object, e As EventArgs)
@@ -2974,15 +2982,18 @@ Public Class frmMDM_USTVAntrag
                         If vbYes = MsgBox("Möchten Sie die Rechnungsdaten der " & item.Text & " per ATEZ-API auslesen lassen?", vbYesNoCancel) Then
 
                             'document_type = vat_invoice or receipt
-                            loadUSTVFrom_ATEZ_KI(UStVAn_ID, Antrag_LandKz, atez_api, scanUSTVA.getDS().da_id, pdfR.NumberOfPages, item.Name)
+                            loadUSTVFrom_ATEZ_KI(UStVAn_ID, Antrag_LandKz, atez_api, scanUSTVA.getDS().da_id, pdfR.NumberOfPages, item.Name, cbxKIUploaddelete.Checked)
 
                             initScanUSTVA()
 
                         End If
 
                     Else
-                        DS.DELETE_COMPLETE()
-                        initScanUSTVA()
+                        If cbxKIUploaddelete.Checked Then
+                            DS.DELETE_COMPLETE()
+                            initScanUSTVA()
+
+                        End If
 
                     End If
                     init()
@@ -3043,6 +3054,7 @@ Public Class frmMDM_USTVAntrag
 
         scanUSTVA.INIT(USTV_ANTRAG.UStVAn_KuNr, "MDM", "USTVA_KI_" & USTV_ANTRAG.UStVAn_ID)
         btnPDFauslesen.Enabled = scanUSTVA.getDS().da_id > 0
+        cbxKIUploaddelete.Enabled = btnPDFauslesen.Enabled
 
 
     End Sub

VERAG_PROG_ALLGEMEIN/Benutzerdefinierte Steuerelemente/usrcntlPDFScan.vb

@@ -23,6 +23,7 @@ Public Class usrcntlPDFScan
 
 
     Public Event FileAdded(id As String, path As String, name As String)
+    Public Event FileDeleted()
 
     Private Sub usrcntlPDFScan_Layout(sender As Object, e As LayoutEventArgs) Handles Me.Layout
         Me.txt.Text = _TEXT_PDF
@@ -363,6 +364,7 @@ Public Class usrcntlPDFScan
             'DatenserverIDCollection.DELETE(DatenserverIDCollection.LIST(0).coll_daId)
             '''  DatenserverIDCollection.Clear()
             initPdf()
+            RaiseEvent FileDeleted()
         End If
     End Sub