From 14a1543b3f0fd977ad8af82c2343bc8393db015d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 28 Dec 2022 12:02:07 +0100 Subject: [PATCH] =?UTF-8?q?Gesamtsicherheiten=20-=20Link=20zu=20Excel=20in?= =?UTF-8?q?=20neuem=20Ges-Men=C3=BC,=20GUI-=C3=84nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frmGesamtsicherheitenMenuNEU.Designer.vb | 32 +++++++++++++++---- Aviso/frmGesamtsicherheitenMenuNEU.vb | 30 +++++++++++++++-- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb index 24b8672..c445076 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb @@ -28,6 +28,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ExportCSV2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -64,7 +65,7 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblSaldo = New System.Windows.Forms.Label() Me.lblZollsatz = New System.Windows.Forms.Label() Me.lblReferenzwert = New System.Windows.Forms.Label() - Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.btnExcel = New VERAG_PROG_ALLGEMEIN.FlatButton() CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -82,14 +83,14 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.dgvListe.Location = New System.Drawing.Point(-3, 288) Me.dgvListe.Name = "dgvListe" Me.dgvListe.ReadOnly = True - Me.dgvListe.Size = New System.Drawing.Size(658, 427) + Me.dgvListe.Size = New System.Drawing.Size(658, 394) Me.dgvListe.TabIndex = 1 ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.ExportCSV2ToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 92) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 70) ' 'ExportCSVToolStripMenuItem ' @@ -103,6 +104,12 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.ExportCSV2ToolStripMenuItem.Size = New System.Drawing.Size(191, 22) Me.ExportCSV2ToolStripMenuItem.Text = "Export CSV Details" ' + 'SaldenNeuBerechnenToolStripMenuItem + ' + Me.SaldenNeuBerechnenToolStripMenuItem.Name = "SaldenNeuBerechnenToolStripMenuItem" + Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22) + Me.SaldenNeuBerechnenToolStripMenuItem.Text = "Salden neu berechnen" + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -655,17 +662,27 @@ Partial Class frmGesamtsicherheitenMenuNEU Me.lblReferenzwert.TabIndex = 6 Me.lblReferenzwert.Text = "Referenzwert: -" ' - 'SaldenNeuBerechnenToolStripMenuItem + 'btnExcel ' - Me.SaldenNeuBerechnenToolStripMenuItem.Name = "SaldenNeuBerechnenToolStripMenuItem" - Me.SaldenNeuBerechnenToolStripMenuItem.Size = New System.Drawing.Size(191, 22) - Me.SaldenNeuBerechnenToolStripMenuItem.Text = "Salden neu berechnen" + Me.btnExcel.allowBorder = False + Me.btnExcel.Anchor = System.Windows.Forms.AnchorStyles.Right + Me.btnExcel.BackColor = System.Drawing.Color.White + Me.btnExcel.FlatAppearance.BorderSize = 0 + Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnExcel.ForeColor = System.Drawing.Color.Black + Me.btnExcel.Location = New System.Drawing.Point(249, 688) + Me.btnExcel.Name = "btnExcel" + Me.btnExcel.Size = New System.Drawing.Size(105, 23) + Me.btnExcel.TabIndex = 35 + Me.btnExcel.Text = "altes Excel öffnen" + Me.btnExcel.UseVisualStyleBackColor = False ' 'frmGesamtsicherheitenMenuNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(658, 721) + Me.Controls.Add(Me.btnExcel) Me.Controls.Add(Me.dgvListe) Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -723,4 +740,5 @@ Partial Class frmGesamtsicherheitenMenuNEU Friend WithEvents btnOpenOver85Days As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents ExportCSV2ToolStripMenuItem As ToolStripMenuItem Friend WithEvents SaldenNeuBerechnenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents btnExcel As VERAG_PROG_ALLGEMEIN.FlatButton End Class diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index 73cbc6f..dbad815 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -1,5 +1,6 @@ Imports SDL Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class frmGesamtsicherheitenMenuNEU @@ -86,11 +87,11 @@ Public Class frmGesamtsicherheitenMenuNEU .Columns("gs_filialenNr").HeaderText = "Filiale" .Columns("gs_filialenNr").Width = 43 .Columns("gs_abfertigungsNr").HeaderText = "Abfert.Nr." - .Columns("gs_abfertigungsNr").Width = 107 + .Columns("gs_abfertigungsNr").Width = 70 .Columns("gs_datum").Width = 112 .Columns("gs_datum").HeaderText = "Datum" .Columns("gs_SicherheitsSaldo").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - .Columns("gs_SicherheitsSaldo").HeaderText = "Sicherheitssaldo" + .Columns("gs_SicherheitsSaldo").HeaderText = "offener S-Betrag" .Columns("gs_Warenort").Width = 96 .Columns("gs_Warenort").HeaderText = "Warenort" .Columns("gs_avisoId").Width = 96 @@ -125,7 +126,7 @@ Public Class frmGesamtsicherheitenMenuNEU For Each row As DataGridViewRow In dgvListe.Rows If Not IsDBNull(row.Cells("gs_SicherheitsSaldo").Value) Then If row.Cells("gs_SicherheitsSaldo").Value <> 0 And row.Cells("gs_SicherheitsSaldo").Value <> 0.01 And row.Cells("gs_SicherheitsSaldo").Value <> -0.01 Then - row.DefaultCellStyle.BackColor = Color.Red + row.DefaultCellStyle.BackColor = Color.IndianRed Else row.DefaultCellStyle.BackColor = Color.Green End If @@ -419,5 +420,28 @@ Public Class frmGesamtsicherheitenMenuNEU + End Sub + + Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles btnExcel.Click + + Select Case Standort + + Case "Verag GmbH" + Process.Start("https://file.verag.ag:5001/d/s/pkjsynkkXrTgPm85JLVFWAHem4NuF6IO/i4_Ss9mG9jR7hB4wStoIbzhvYzlJJJPv-BbegLJoGuQk") + + Case "VERAG AG" + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Gesamtsicherheit_VERAG_AG") + DS.OPEN_SINGLE_ORIG() + + Case "VERAG CS" + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "Gesamtsicherheit_VERAG_CS") + DS.OPEN_SINGLE_ORIG() + + Case "IMEX" + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "IMEX", "", "Gesamtsicherheit_IMEX") + DS.OPEN_SINGLE_ORIG() + + End Select + End Sub End Class