From 2c03e163bbd52b1c3a7708c79951dc5133a4d952 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 20 Sep 2023 17:06:08 +0200 Subject: [PATCH] Attila Importassistent --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmATEZ_NCTS.vb | 18 ++++++++++++---- Aviso/frmGesamtsicherheitenNEU.vb | 10 +++++++++ Aviso/usrcntlAktDetailsATILLANeu.Designer.vb | 22 ++++++++++++++++++-- Aviso/usrcntlAktDetailsATILLANeu.resx | 8 +++++++ Aviso/usrcntlAktDetailsATILLANeu.vb | 11 ++++++++++ 6 files changed, 65 insertions(+), 8 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 3636290..4d677ad 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index 7ea99b6..5c445fc 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -92,7 +92,7 @@ Public Class frmATEZ_NCTS Exit Sub End If - If atez_data.status = "Sent" Then + If atez_data.status = "Sent" Then Exit Sub End If @@ -193,9 +193,19 @@ Public Class frmATEZ_NCTS End If - If Not atez.setJson(atezData) Then MsgBox("Fehler beim Erstellen der Daten" & vbNewLine & "Vorgang abgebrochen!") + If Not atez.setJson(atezData) Then + MsgBox("Fehler beim Erstellen der Daten" & vbNewLine & "Vorgang abgebrochen!") + atezData.status = "Failure" + atezData.fehlerbeschreibung = "Fehler beim Erstellen der Daten" + Return atezData.SAVE + End If - If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then MsgBox("Fehler beim Erstellen der PDF-Daten, kein Anhang ausgewählt!" & vbNewLine & "Vorgang abgebrochen!") + If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then + MsgBox("Fehler beim Erstellen der PDF-Daten!" & vbNewLine & "Vorgang abgebrochen!") + atezData.status = "Failure" + atezData.fehlerbeschreibung = "Fehler beim Erstellen der PDF-Daten!" + Return atezData.SAVE + End If Dim azetId = atez.SendRequestWithAuthHeader("application/json", failreDesc) @@ -226,7 +236,7 @@ Public Class frmATEZ_NCTS atezData.atezId = IIf(azetId IsNot Nothing, azetId, "") Return atezData.SAVE() - End If + End If End Function diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 361a04d..0876d51 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -591,6 +591,8 @@ Public Class frmGesamtsicherheitenNEU End If + + If checkNothingValue(txtSicherheitSicherheitsbetrag.Text, "Double") IsNot Nothing Then Dim sichBetr As Double = Double.Parse(txtSicherheitSicherheitsbetrag.Text) If checkSaldo(sichBetr, True) = False Then Exit Sub @@ -600,6 +602,14 @@ Public Class frmGesamtsicherheitenNEU Dim limit As Integer = Integer.Parse(setNullToZero(txtAnzahlPos.Text)) + If (limit > 10) Then + Dim result As MsgBoxResult = MsgBox("Sollen wirklich " & limit & "Positionen angelegt werden?", vbYesNoCancel) + If result <> vbYes Then + txtAnzahlPos.Focus() + Exit Sub + End If + End If + For count As Integer = 1 To limit attachPosNrToExistingATB = False diff --git a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb index 145cdf6..4fc7ab4 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb @@ -156,6 +156,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AusZwischenablageEinfügenPasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.btnImportAssi = New System.Windows.Forms.Button() Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla() Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() @@ -549,6 +550,7 @@ Partial Class usrcntlAktDetailsATILLANeu ' 'Panel5 ' + Me.Panel5.Controls.Add(Me.btnImportAssi) Me.Panel5.Controls.Add(Me.btnQuckScan) Me.Panel5.Controls.Add(Me.Button11) Me.Panel5.Controls.Add(Me.Button4) @@ -579,9 +581,9 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button11.Image = CType(resources.GetObject("Button11.Image"), System.Drawing.Image) Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button11.Location = New System.Drawing.Point(97, 1) + Me.Button11.Location = New System.Drawing.Point(90, 1) Me.Button11.Name = "Button11" - Me.Button11.Size = New System.Drawing.Size(76, 37) + Me.Button11.Size = New System.Drawing.Size(83, 37) Me.Button11.TabIndex = 111 Me.Button11.Text = "CMR" Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1725,6 +1727,21 @@ Partial Class usrcntlAktDetailsATILLANeu Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30) Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)" ' + 'btnImportAssi + ' + Me.btnImportAssi.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnImportAssi.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnImportAssi.Image = CType(resources.GetObject("btnImportAssi.Image"), System.Drawing.Image) + Me.btnImportAssi.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnImportAssi.Location = New System.Drawing.Point(1, 0) + Me.btnImportAssi.Name = "btnImportAssi" + Me.btnImportAssi.Size = New System.Drawing.Size(85, 38) + Me.btnImportAssi.TabIndex = 112 + Me.btnImportAssi.Text = "Import-Assistent" + Me.btnImportAssi.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnImportAssi.UseVisualStyleBackColor = True + ' 'UsrCntlVermerkeATilla1 ' Me.UsrCntlVermerkeATilla1.AutoScroll = True @@ -1914,4 +1931,5 @@ Partial Class usrcntlAktDetailsATILLANeu Friend WithEvents Panel10 As Panel Friend WithEvents Label12 As Label Friend WithEvents Button12 As Button + Friend WithEvents btnImportAssi As Button End Class diff --git a/Aviso/usrcntlAktDetailsATILLANeu.resx b/Aviso/usrcntlAktDetailsATILLANeu.resx index e555ba4..1438032 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.resx +++ b/Aviso/usrcntlAktDetailsATILLANeu.resx @@ -132,6 +132,14 @@ kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V + kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw + fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx + mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index bf53431..d83d6cf 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -1706,4 +1706,15 @@ Public Class usrcntlAktDetailsATILLANeu End If End If End Sub + + Private Sub btnImportAssi_Click(sender As Object, e As EventArgs) Handles btnImportAssi.Click + 'loadDataInLIST() + 'SAVE_ME() + + Dim f As New frmSendungAnhangImport(AvisoID, SENDUNG_LIST(0).tblSnd_SendungID) + f.ShowDialog(Me) + 'VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AvisoID) 'LÄDT alle SENDUNGSDATEN + reload(AvisoID) + 'initDataBinding() + End Sub End Class