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

ATEZ

Browse Source
This commit is contained in:
d.breimaier
2023-09-15 13:49:30 +02:00
parent 18d7b44d5c
commit f767b78d92
5 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/My Project/AssemblyInfo.vb
View File

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

12
Aviso/frmATEZ_NCTS.Designer.vb generated
View File

@@ -84,7 +84,7 @@ Partial Class frmATEZ_NCTS
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopCenter
Me.Button1.Location = New System.Drawing.Point(154, 757)
Me.Button1.Location = New System.Drawing.Point(154, 772)
Me.Button1.Margin = New System.Windows.Forms.Padding(2)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(159, 42)
@@ -134,7 +134,6 @@ Partial Class frmATEZ_NCTS
Me.pnlHead.Controls.Add(Me.Label4)
Me.pnlHead.Controls.Add(Me.sbBestimmungsZollstelle)
Me.pnlHead.Controls.Add(Me.Label3)
Me.pnlHead.Controls.Add(Me.dgvAnhaenge)
Me.pnlHead.Controls.Add(Me.Label9)
Me.pnlHead.Controls.Add(Me.sbAbgangZollstelle)
Me.pnlHead.Controls.Add(Me.txtDyMandant)
@@ -143,7 +142,7 @@ Partial Class frmATEZ_NCTS
Me.pnlHead.Controls.Add(Me.lblBezugsnummer)
Me.pnlHead.Location = New System.Drawing.Point(3, 2)
Me.pnlHead.Name = "pnlHead"
Me.pnlHead.Size = New System.Drawing.Size(478, 750)
Me.pnlHead.Size = New System.Drawing.Size(478, 601)
Me.pnlHead.TabIndex = 112
'
'Label2
@@ -863,10 +862,10 @@ Partial Class frmATEZ_NCTS
Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.columnName})
Me.dgvAnhaenge.Location = New System.Drawing.Point(13, 589)
Me.dgvAnhaenge.Location = New System.Drawing.Point(3, 609)
Me.dgvAnhaenge.Name = "dgvAnhaenge"
Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvAnhaenge.Size = New System.Drawing.Size(463, 158)
Me.dgvAnhaenge.Size = New System.Drawing.Size(478, 158)
Me.dgvAnhaenge.TabIndex = 112
'
'columnName
@@ -956,9 +955,10 @@ Partial Class frmATEZ_NCTS
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.ClientSize = New System.Drawing.Size(484, 810)
Me.ClientSize = New System.Drawing.Size(484, 819)
Me.Controls.Add(Me.pnlHead)
Me.Controls.Add(Me.Button1)
Me.Controls.Add(Me.dgvAnhaenge)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmATEZ_NCTS"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen

82
Aviso/frmATEZ_NCTS.vb
View File

@@ -1,4 +1,6 @@
Imports DocumentFormat.OpenXml.Vml.Presentation
Imports System.Web.UI.WebControls
Imports com.esendex.sdk.sent
Imports DocumentFormat.OpenXml.Vml.Presentation
Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers
Imports GrapeCity.ActiveReports.ReportsCore.Tools
Imports Newtonsoft.Json.Linq
@@ -77,10 +79,24 @@ Public Class frmATEZ_NCTS
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Try
If atez_data.status = "Sent" Then
If Button1.Text = "JSON" Then
If Not atez.setJson(atez_data) Then MsgBox("Fehler beim Erstellen der Daten")
atez.setJsonPDF(atez_data, dgvAnhaenge)
Dim data As New DataObject()
data.SetData(DataFormats.Text, atez_data.json)
Clipboard.SetDataObject(data)
Me.Cursor = Cursors.Default
MsgBox("JSON-Daten in Zwischenablage gespeichert")
Exit Sub
End If
If atez_data.status = "Sent" Then
Exit Sub
End If
If Not checkAttachment() Then
Exit Sub
End If
@@ -118,12 +134,14 @@ Public Class frmATEZ_NCTS
.Guarantee_GRN = "" 'leer
.erstellerId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
'For Each doc As DataGridViewRow In dgvAnhaenge.Rows
' Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value)
' If isSelected Then
' .selectedDocuments &= doc.Cells("anh_docId").Value & ", "
' End If
'Next
If .selectedDocuments <> "" Then .selectedDocuments = ""
For Each doc As DataGridViewRow In dgvAnhaenge.Rows
Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value)
If isSelected Then
.selectedDocuments &= doc.Cells("anh_docId").Value & ", "
End If
Next
.SAVE()
@@ -156,8 +174,21 @@ Public Class frmATEZ_NCTS
Dim authResp = atez.authenticate()
If authResp <> "200" Then
failreDesc = "Authentifizierung fehlgeschlagen - " & authResp & vbNewLine & "Vorgang abgebrochen/wiederholen!"
lblInfo.Text = failreDesc
failreDesc = "Authentifizierung fehlgeschlagen"
lblInfo.Text = failreDesc & " - " & authResp & vbNewLine & "Vorgang abgebrochen" & vbNewLine & " Bitte wiederholen!"
Dim resultAuthentifizierung As MsgBoxResult = MsgBox("Fehler beim Authentifizieren" & vbNewLine & failreDesc & vbNewLine & "Soll NCTS als Entwurf gespeichert werden?", vbYesNoCancel)
If resultAuthentifizierung = vbYes Then
atezData.status = "Draft"
atezData.fehlerbeschreibung = failreDesc
Return atezData.SAVE()
Else
atezData.status = "Failure"
atezData.fehlerbeschreibung = failreDesc
Return atezData.SAVE()
End If
Return False
End If
@@ -166,7 +197,6 @@ Public Class frmATEZ_NCTS
If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then MsgBox("Fehler beim Erstellen der PDF-Daten, kein Anhang ausgewählt!" & vbNewLine & "Vorgang abgebrochen!")
'MsgBox(atezData.json)
Dim azetId = atez.SendRequestWithAuthHeader("application/json", failreDesc)
If failreDesc <> "" Then
@@ -253,7 +283,7 @@ Public Class frmATEZ_NCTS
End Select
initSeachboxes()
initAttachment()
cboProzedur.Items.Clear()
@@ -270,11 +300,11 @@ Public Class frmATEZ_NCTS
If id > 0 Then
atez_data = New cATEZ_NCTS_DATA(id)
initAttachment()
If atez_data.atezId <> "" Then
lblInfo.Text = "Atez-ID " & atez_data.atezId
Else
lblInfo.Text = "Status: " & atez_data.status
lblInfo.Text = "Status: " & IIf(atez_data.fehlerbeschreibung <> "", atez_data.status & "- " & atez_data.fehlerbeschreibung, atez_data.status)
End If
@@ -309,12 +339,15 @@ Public Class frmATEZ_NCTS
Button1.Text = "An ATEZ senden -->"
pnlHead.Enabled = True
Button1.Enabled = True
initAttachment()
'initAttachment()
Else
Button1.Text = "JSON"
pnlHead.Enabled = False
dgvAnhaenge.ReadOnly = True
Button1.Enabled = True
End If
@@ -324,6 +357,7 @@ Public Class frmATEZ_NCTS
Else
atez_data = New cATEZ_NCTS_DATA()
initAttachment()
Button1.Text = "An ATEZ senden -->"
pnlHead.Enabled = True
@@ -361,7 +395,7 @@ Public Class frmATEZ_NCTS
sbDurchgangszollstelle6.SET_VALUE(If(AVISO.Durchgangszollstelle6, ""))
End If
'initAttachment()
End Sub
Sub initAttachment()
@@ -393,7 +427,7 @@ Public Class frmATEZ_NCTS
Dim col As DataColumn
col = dt.Columns.Add("anh_selekt", GetType(Boolean))
col.SetOrdinal(0)
dgvAnhaenge.Columns.Clear()
dgvAnhaenge.DataSource = dt
If dgvAnhaenge.RowCount = 0 Then dgvAnhaenge.Columns.Clear() : Exit Sub
@@ -408,7 +442,7 @@ Public Class frmATEZ_NCTS
.Columns("anh_id").Visible = False 'VermerkID nicht anzeigenconMenuVermerke
.Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen
.Columns("anh_selekt").MinimumWidth = 50
.Columns("anh_selekt").MinimumWidth = 10
.Columns("anh_selekt").HeaderText = "ausgewählt"
.Columns("anh_selekt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -431,6 +465,18 @@ Public Class frmATEZ_NCTS
End With
If atez_data IsNot Nothing AndAlso atez_data.selectedDocuments <> "" Then
For Each doc As DataGridViewRow In dgvAnhaenge.Rows
If atez_data.selectedDocuments.Contains(doc.Cells("anh_docId").Value) Then
doc.Cells("anh_selekt").Value = True
End If
Next
End If
End Sub

9
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -6415,15 +6415,20 @@ Public Class frmSendungsdetailsNEU
Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp
If e.KeyCode = Keys.Delete Then
If dgvATEZNCTS.SelectedRows.Count > 0 Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If dgvATEZNCTS.SelectedRows(0).Cells("Status").Value = "Sent" Then
MsgBox("Bereits gesendete Request können nicht gelöscht werden!")
Exit Sub
End If
If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then
Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value)
atez.delete()
initdgvATEZ()
End If
End If
End If
End If
End If
End Sub
Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click

6
Aviso/usrcntlAktDetailsATILLANeu.vb
View File

@@ -1690,7 +1690,11 @@ Public Class usrcntlAktDetailsATILLANeu
Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp
If e.KeyCode = Keys.Delete Then
If dgvATEZNCTS.SelectedRows.Count > 0 Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) AndAlso dgvATEZNCTS.SelectedRows(0).Cells("Status").Value <> "Sent" Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If dgvATEZNCTS.SelectedRows(0).Cells("Status").Value = "Sent" Then
MsgBox("Bereits gesendete Request können nicht gelöscht werden!")
Exit Sub
End If
If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then
Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value)
atez.delete()