From 66922965d3220d7cf3d71dbaaf093404c9bcbbc3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 17 Oct 2024 16:44:16 +0200 Subject: [PATCH] =?UTF-8?q?Gesamtsicherheiten,=20Streamreader=20in=20PDF?= =?UTF-8?q?=20schlie=C3=9Fen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/Anhänge/frmSendungAnhangImport.vb | 6 ++--- Aviso/My Project/AssemblyInfo.vb | 4 ++-- Aviso/frmGesamtsicherheitenNEU.Designer.vb | 20 ++++++++--------- Aviso/frmGesamtsicherheitenNEU.vb | 26 +++++++++++----------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index fac6788..94024d4 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -6,7 +6,6 @@ Imports Spire.Pdf.Conversion.Compression Imports Spire.Pdf.Exporting Imports VERAG_PROG_ALLGEMEIN - Public Class frmSendungAnhangImport Public AvisoId As Integer @@ -128,7 +127,6 @@ Public Class frmSendungAnhangImport Try - 'If PdfViewer IsNot Nothing AndAlso PdfViewer.IsDocumentLoaded Then ' PdfViewer.CloseDocument() 'End If @@ -142,13 +140,15 @@ Public Class frmSendungAnhangImport WebBrowser.Visible = (loc <> "") WebBrowser.Navigate(loc) Else - + WebBrowser.Visible = False PdfViewer.Visible = (loc <> "") Dim data = File.ReadAllBytes(loc) Dim pdfStream = New MemoryStream(data) PdfViewer.LoadFromStream(pdfStream) + pdfStream.Close() + 'NOT WORKING 'PdfViewer.LoadFromFile(loc) NOT WORKING diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 6c780f7..243e579 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/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index 548360b..f4fc5b8 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -315,10 +315,10 @@ Partial Class frmGesamtsicherheitenNEU 'txtATCaendern ' Me.txtATCaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtATCaendern.Location = New System.Drawing.Point(95, 40) + Me.txtATCaendern.Location = New System.Drawing.Point(117, 40) Me.txtATCaendern.Margin = New System.Windows.Forms.Padding(0) Me.txtATCaendern.Name = "txtATCaendern" - Me.txtATCaendern.Size = New System.Drawing.Size(186, 24) + Me.txtATCaendern.Size = New System.Drawing.Size(164, 24) Me.txtATCaendern.TabIndex = 60 ' 'Label34 @@ -327,9 +327,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label34.Location = New System.Drawing.Point(10, 40) Me.Label34.Name = "Label34" - Me.Label34.Size = New System.Drawing.Size(80, 20) + Me.Label34.Size = New System.Drawing.Size(104, 20) Me.Label34.TabIndex = 5 - Me.Label34.Text = "ATC/MRN" + Me.Label34.Text = "Reg-Nr./MRN" ' 'FlatButton4 ' @@ -400,9 +400,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label32.Location = New System.Drawing.Point(10, 40) Me.Label32.Name = "Label32" - Me.Label32.Size = New System.Drawing.Size(61, 20) + Me.Label32.Size = New System.Drawing.Size(60, 20) Me.Label32.TabIndex = 5 - Me.Label32.Text = "ATB-Nr" + Me.Label32.Text = "Reg-Nr" ' 'FlatButton2 ' @@ -1524,9 +1524,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label12.ForeColor = System.Drawing.SystemColors.ButtonHighlight Me.Label12.Location = New System.Drawing.Point(819, 191) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(64, 13) + Me.Label12.Size = New System.Drawing.Size(77, 13) Me.Label12.TabIndex = 19 - Me.Label12.Text = "ATC / MRN" + Me.Label12.Text = "Reg-Nr / MRN" ' 'Label6 ' @@ -1584,9 +1584,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label1.ForeColor = System.Drawing.SystemColors.ButtonHighlight Me.Label1.Location = New System.Drawing.Point(76, 191) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(70, 13) + Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 13 - Me.Label1.Text = "ATB Nummer" + Me.Label1.Text = "Reg. Nr." ' 'txtPosFreitext ' diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 43eff63..fb74bc3 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -148,7 +148,7 @@ Public Class frmGesamtsicherheitenNEU Case True If Standort = "Verag GmbH" Then - .Columns("gs_ATBNr").HeaderText = "ATB" + .Columns("gs_ATBNr").HeaderText = "Reg-Nr." Else .Columns("gs_ATBNr").HeaderText = "T1 MRN" End If @@ -164,7 +164,7 @@ Public Class frmGesamtsicherheitenNEU Case Else If Standort = "Verag GmbH" Then - .Columns("gs_ATBNr").HeaderText = "ATB" + .Columns("gs_ATBNr").HeaderText = "Reg-Nr." Else .Columns("gs_ATBNr").HeaderText = "T1 MRN" End If @@ -228,7 +228,7 @@ Public Class frmGesamtsicherheitenNEU Next - Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'ATB Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' + Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'Reg-Nr. Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt' From [tblGesamtsicherheit] Where [gs_gsnr] In (" & gsnr & ") and isnull(gs_warenwert,0) <> 0 @@ -305,7 +305,7 @@ Public Class frmGesamtsicherheitenNEU Next - Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'ATB Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', + Dim SQLStringSicherheit As String = "select [gs_ATBNr] as 'Reg-Nr. Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt', [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext from [tblGesamtsicherheit] inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId @@ -319,7 +319,7 @@ Public Class frmGesamtsicherheitenNEU dtSicherheiten.Columns.Add("SSaldo") Dim drFirst = dtSicherheiten.NewRow - drFirst.Item("ATB Verwahrlager") = "Uebertrag vom " & datumVon + drFirst.Item("Reg-Nr. Verwahrlager") = "Uebertrag vom " & datumVon drFirst.Item("SSaldo") = CDbl(dtSicherheiten.Rows(0).Item("Saldo")) dtSicherheiten.Rows.InsertAt(drFirst, 0) @@ -344,7 +344,7 @@ Public Class frmGesamtsicherheitenNEU Next Dim drLast = dtSicherheiten.NewRow - drLast.Item("ATB Verwahrlager") = "Saldo zum " & datumBis + drLast.Item("Reg-Nr. Verwahrlager") = "Saldo zum " & datumBis drLast.Item("SSaldo") = CDbl(dtSicherheiten.Rows(dtSicherheiten.Rows.Count - 1).Item("SSaldo")) dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count) @@ -411,7 +411,7 @@ Public Class frmGesamtsicherheitenNEU Select Case currentGesSichRef.brgakto_gs_ATR Case True If Standort = "Verag GmbH" Then - .Columns("gsp_ATCNr").HeaderText = "ATC / MRN" + .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN" ElseIf Standort = "VERAG AG" Then .Columns("gsp_ATCNr").HeaderText = "T1 CRN" Else @@ -420,7 +420,7 @@ Public Class frmGesamtsicherheitenNEU Case Else If Standort = "Verag GmbH" Then - .Columns("gsp_ATCNr").HeaderText = "CRN / MRN" + .Columns("gsp_ATCNr").HeaderText = "Reg-Nr. / MRN" ElseIf Standort = "VERAG AG" Then .Columns("gsp_ATCNr").HeaderText = "T1 CRN" Else @@ -1615,7 +1615,7 @@ Public Class frmGesamtsicherheitenNEU End If If mutlitpleATBNr Then - lblWarningATB.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. ATB-Nummern markiert!" + lblWarningATB.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. Reg-Nr. markiert!" Else lblWarningATB.Text = "" End If @@ -1648,7 +1648,7 @@ Public Class frmGesamtsicherheitenNEU End If If mutlitpleATCNr Then - lblATCwarning.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. ATC-Nummern markiert!" + lblATCwarning.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. Reg-Nr.Nummern markiert!" Else lblATCwarning.Text = "" End If @@ -1701,7 +1701,7 @@ Public Class frmGesamtsicherheitenNEU Private Sub FlatButton3_Click(sender As Object, e As EventArgs) Handles FlatButton3.Click If txtATCaendern.Text = "" Then - MsgBox("Bitte ATC/MRN-Nr angeben!") + MsgBox("Bitte Reg/MRN-Nr angeben!") Exit Sub End If @@ -1836,10 +1836,10 @@ Public Class frmGesamtsicherheitenNEU Private Sub changeLabel(Optional isATR As Boolean = True) If Standort = "Verag GmbH" Then - Label1.Text = "ATB Nummer" + Label1.Text = "Reg-Nr." If isATR Then - Label12.Text = "ATC / MRN" + Label12.Text = "Reg-Nr. / MRN" Else Label12.Text = "CRN / MRN"