From 8f213f07893fa1eb8a0d248660bd64fb07e16530 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 14 Oct 2022 16:20:30 +0200 Subject: [PATCH] Feature Gesamtsicherheiten: Refactorting und Einbau der neuen Funktionen --- Aviso/Aviso.vbproj | 20 +- Aviso/frmFrachtkostenBerechnen.Designer.vb | 10 +- ...r.vb => frmGesamtsicherheiten.Designer.vb} | 111 ++++-- ...esSich.resx => frmGesamtsicherheiten.resx} | 0 ...frmGesSich.vb => frmGesamtsicherheiten.vb} | 354 ++++++++++-------- ... => frmGesamtsicherheitenMenu.Designer.vb} | 4 +- ...nu.resx => frmGesamtsicherheitenMenu.resx} | 0 ...chMenu.vb => frmGesamtsicherheitenMenu.vb} | 149 ++++---- Aviso/frmHauptfenster.vb | 8 +- Aviso/frmSendungsdetailsNEU.vb | 1 + 10 files changed, 364 insertions(+), 293 deletions(-) rename Aviso/{frmGesSich.Designer.vb => frmGesamtsicherheiten.Designer.vb} (93%) rename Aviso/{frmGesSich.resx => frmGesamtsicherheiten.resx} (100%) rename Aviso/{frmGesSich.vb => frmGesamtsicherheiten.vb} (65%) rename Aviso/{frmGesSichMenu.Designer.vb => frmGesamtsicherheitenMenu.Designer.vb} (99%) rename Aviso/{frmGesSichMenu.resx => frmGesamtsicherheitenMenu.resx} (100%) rename Aviso/{frmGesSichMenu.vb => frmGesamtsicherheitenMenu.vb} (65%) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 4ce3075..d4d0dc3 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -606,16 +606,16 @@ Form - - frmGesSich.vb + + frmGesamtsicherheiten.vb - + Form - - frmGesSichMenu.vb + + frmGesamtsicherheitenMenu.vb - + Form @@ -1101,11 +1101,11 @@ frmGelangensbestaetigung.vb - - frmGesSich.vb + + frmGesamtsicherheiten.vb - - frmGesSichMenu.vb + + frmGesamtsicherheitenMenu.vb frmHauptfenster.vb diff --git a/Aviso/frmFrachtkostenBerechnen.Designer.vb b/Aviso/frmFrachtkostenBerechnen.Designer.vb index 9c4a0c2..fe095de 100644 --- a/Aviso/frmFrachtkostenBerechnen.Designer.vb +++ b/Aviso/frmFrachtkostenBerechnen.Designer.vb @@ -291,7 +291,7 @@ Partial Class frmFrachtkostenBerechnen Me.cbxLandNach.FormattingEnabled = True Me.cbxLandNach.Location = New System.Drawing.Point(255, 23) Me.cbxLandNach.Name = "cbxLandNach" - Me.cbxLandNach.Size = New System.Drawing.Size(35, 21) + Me.cbxLandNach.Size = New System.Drawing.Size(45, 21) Me.cbxLandNach.TabIndex = 6 ' 'cbxLandVon @@ -304,7 +304,7 @@ Partial Class frmFrachtkostenBerechnen Me.cbxLandVon.FormattingEnabled = True Me.cbxLandVon.Location = New System.Drawing.Point(75, 22) Me.cbxLandVon.Name = "cbxLandVon" - Me.cbxLandVon.Size = New System.Drawing.Size(35, 21) + Me.cbxLandVon.Size = New System.Drawing.Size(45, 21) Me.cbxLandVon.TabIndex = 3 ' 'txbCalcDistanceNichtEU @@ -516,7 +516,7 @@ Partial Class frmFrachtkostenBerechnen Me.txbVonOrt.MaxLines_Warning = "" Me.txbVonOrt.MaxLines_Warning_Label = Nothing Me.txbVonOrt.Name = "txbVonOrt" - Me.txbVonOrt.Size = New System.Drawing.Size(105, 20) + Me.txbVonOrt.Size = New System.Drawing.Size(106, 20) Me.txbVonOrt.TabIndex = 9 ' 'txbNachPLZ @@ -557,12 +557,12 @@ Partial Class frmFrachtkostenBerechnen Me.txbVonPLZ._Waehrung = False Me.txbVonPLZ._WaehrungZeichen = True Me.txbVonPLZ.ForeColor = System.Drawing.Color.Black - Me.txbVonPLZ.Location = New System.Drawing.Point(116, 23) + Me.txbVonPLZ.Location = New System.Drawing.Point(121, 23) Me.txbVonPLZ.MaxLineLength = -1 Me.txbVonPLZ.MaxLines_Warning = "" Me.txbVonPLZ.MaxLines_Warning_Label = Nothing Me.txbVonPLZ.Name = "txbVonPLZ" - Me.txbVonPLZ.Size = New System.Drawing.Size(64, 20) + Me.txbVonPLZ.Size = New System.Drawing.Size(60, 20) Me.txbVonPLZ.TabIndex = 4 ' 'tbNichtEUAnteil diff --git a/Aviso/frmGesSich.Designer.vb b/Aviso/frmGesamtsicherheiten.Designer.vb similarity index 93% rename from Aviso/frmGesSich.Designer.vb rename to Aviso/frmGesamtsicherheiten.Designer.vb index 7414cba..9bec5ad 100644 --- a/Aviso/frmGesSich.Designer.vb +++ b/Aviso/frmGesamtsicherheiten.Designer.vb @@ -1,5 +1,5 @@  -Partial Class frmGesSich +Partial Class frmGesamtsicherheiten Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -28,12 +28,14 @@ Partial Class frmGesSich Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesSich)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheiten)) Me.dgvGesamtsicherheitMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel2 = New System.Windows.Forms.Panel() Me.panOverlay = New System.Windows.Forms.Panel() + Me.cboWarenort = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.lblWarenort = New System.Windows.Forms.Label() Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnSave = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtLKWID = New System.Windows.Forms.TextBox() Me.txtAbfertNum = New System.Windows.Forms.TextBox() Me.Label18 = New System.Windows.Forms.Label() @@ -48,7 +50,7 @@ Partial Class frmGesSich Me.txtCRNDate = New System.Windows.Forms.TextBox() Me.txtMRNTime = New System.Windows.Forms.TextBox() Me.txtMRNDate = New System.Windows.Forms.TextBox() - Me.btnSave = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnSaveOben = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtCRNSicherheitsbetrag = New System.Windows.Forms.TextBox() Me.txtCRNWarenwert = New System.Windows.Forms.TextBox() Me.txtCRN = New System.Windows.Forms.TextBox() @@ -143,8 +145,10 @@ Partial Class frmGesSich 'panOverlay ' Me.panOverlay.BackColor = System.Drawing.SystemColors.ButtonHighlight + Me.panOverlay.Controls.Add(Me.cboWarenort) + Me.panOverlay.Controls.Add(Me.lblWarenort) Me.panOverlay.Controls.Add(Me.cboFiliale) - Me.panOverlay.Controls.Add(Me.FlatButton2) + Me.panOverlay.Controls.Add(Me.btnSave) Me.panOverlay.Controls.Add(Me.txtLKWID) Me.panOverlay.Controls.Add(Me.txtAbfertNum) Me.panOverlay.Controls.Add(Me.Label18) @@ -157,6 +161,30 @@ Partial Class frmGesSich Me.panOverlay.TabIndex = 2 Me.panOverlay.Visible = False ' + 'cboWarenort + ' + Me.cboWarenort._allowedValuesFreiText = Nothing + Me.cboWarenort._allowFreiText = False + Me.cboWarenort._value = "" + Me.cboWarenort.DropDownWidth = 300 + Me.cboWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboWarenort.FormattingEnabled = True + Me.cboWarenort.Location = New System.Drawing.Point(278, 64) + Me.cboWarenort.MaxLength = 4 + Me.cboWarenort.Name = "cboWarenort" + Me.cboWarenort.Size = New System.Drawing.Size(186, 24) + Me.cboWarenort.TabIndex = 9 + ' + 'lblWarenort + ' + Me.lblWarenort.AutoSize = True + Me.lblWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblWarenort.Location = New System.Drawing.Point(125, 68) + Me.lblWarenort.Name = "lblWarenort" + Me.lblWarenort.Size = New System.Drawing.Size(88, 20) + Me.lblWarenort.TabIndex = 8 + Me.lblWarenort.Text = "Warenort:" + ' 'cboFiliale ' Me.cboFiliale._allowedValuesFreiText = Nothing @@ -165,25 +193,25 @@ Partial Class frmGesSich Me.cboFiliale.DropDownWidth = 300 Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboFiliale.FormattingEnabled = True - Me.cboFiliale.Location = New System.Drawing.Point(279, 76) + Me.cboFiliale.Location = New System.Drawing.Point(279, 103) Me.cboFiliale.MaxLength = 4 Me.cboFiliale.Name = "cboFiliale" Me.cboFiliale.Size = New System.Drawing.Size(186, 24) Me.cboFiliale.TabIndex = 2 ' - 'FlatButton2 + 'btnSave ' - Me.FlatButton2.allowBorder = False - Me.FlatButton2.BackColor = System.Drawing.Color.Gainsboro - Me.FlatButton2.FlatAppearance.BorderSize = 0 - Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton2.ForeColor = System.Drawing.Color.Black - Me.FlatButton2.Location = New System.Drawing.Point(424, 232) - Me.FlatButton2.Name = "FlatButton2" - Me.FlatButton2.Size = New System.Drawing.Size(75, 23) - Me.FlatButton2.TabIndex = 7 - Me.FlatButton2.Text = "Speichern" - Me.FlatButton2.UseVisualStyleBackColor = False + Me.btnSave.allowBorder = False + Me.btnSave.BackColor = System.Drawing.Color.Gainsboro + Me.btnSave.FlatAppearance.BorderSize = 0 + Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSave.ForeColor = System.Drawing.Color.Black + Me.btnSave.Location = New System.Drawing.Point(424, 232) + Me.btnSave.Name = "btnSave" + Me.btnSave.Size = New System.Drawing.Size(75, 23) + Me.btnSave.TabIndex = 7 + Me.btnSave.Text = "Speichern" + Me.btnSave.UseVisualStyleBackColor = False ' 'txtLKWID ' @@ -197,7 +225,7 @@ Partial Class frmGesSich 'txtAbfertNum ' Me.txtAbfertNum.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtAbfertNum.Location = New System.Drawing.Point(279, 128) + Me.txtAbfertNum.Location = New System.Drawing.Point(279, 140) Me.txtAbfertNum.Margin = New System.Windows.Forms.Padding(0) Me.txtAbfertNum.Name = "txtAbfertNum" Me.txtAbfertNum.Size = New System.Drawing.Size(186, 24) @@ -217,7 +245,7 @@ Partial Class frmGesSich ' Me.Label17.AutoSize = True Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label17.Location = New System.Drawing.Point(68, 130) + Me.Label17.Location = New System.Drawing.Point(68, 142) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(181, 20) Me.Label17.TabIndex = 3 @@ -227,7 +255,7 @@ Partial Class frmGesSich ' Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label16.Location = New System.Drawing.Point(126, 80) + Me.Label16.Location = New System.Drawing.Point(126, 107) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(123, 20) Me.Label16.TabIndex = 1 @@ -239,6 +267,7 @@ Partial Class frmGesSich Me.btnClosePanOverlay.BackColor = System.Drawing.Color.White Me.btnClosePanOverlay.BackgroundImage = Global.AVISO.My.Resources.Resources.del2 Me.btnClosePanOverlay.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.btnClosePanOverlay.DialogResult = System.Windows.Forms.DialogResult.Cancel Me.btnClosePanOverlay.FlatAppearance.BorderSize = 0 Me.btnClosePanOverlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnClosePanOverlay.ForeColor = System.Drawing.Color.Black @@ -358,19 +387,19 @@ Partial Class frmGesSich Me.txtMRNDate.Size = New System.Drawing.Size(85, 24) Me.txtMRNDate.TabIndex = 21 ' - 'btnSave + 'btnSaveOben ' - Me.btnSave.allowBorder = False - Me.btnSave.BackColor = System.Drawing.Color.White - Me.btnSave.FlatAppearance.BorderSize = 0 - Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSave.ForeColor = System.Drawing.Color.Black - Me.btnSave.Location = New System.Drawing.Point(12, 12) - Me.btnSave.Name = "btnSave" - Me.btnSave.Size = New System.Drawing.Size(75, 23) - Me.btnSave.TabIndex = 0 - Me.btnSave.Text = "Speichern" - Me.btnSave.UseVisualStyleBackColor = False + Me.btnSaveOben.allowBorder = False + Me.btnSaveOben.BackColor = System.Drawing.Color.White + Me.btnSaveOben.FlatAppearance.BorderSize = 0 + Me.btnSaveOben.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSaveOben.ForeColor = System.Drawing.Color.Black + Me.btnSaveOben.Location = New System.Drawing.Point(12, 12) + Me.btnSaveOben.Name = "btnSaveOben" + Me.btnSaveOben.Size = New System.Drawing.Size(75, 23) + Me.btnSaveOben.TabIndex = 0 + Me.btnSaveOben.Text = "Speichern" + Me.btnSaveOben.UseVisualStyleBackColor = False ' 'txtCRNSicherheitsbetrag ' @@ -450,7 +479,7 @@ Partial Class frmGesSich Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew Me.lblZollsatz.Location = New System.Drawing.Point(1010, 37) Me.lblZollsatz.Name = "lblZollsatz" - Me.lblZollsatz.Size = New System.Drawing.Size(86, 16) + Me.lblZollsatz.Size = New System.Drawing.Size(85, 16) Me.lblZollsatz.TabIndex = 4 Me.lblZollsatz.Text = "Zollsatz: 12%" ' @@ -462,7 +491,7 @@ Partial Class frmGesSich Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew Me.lblReferenzwert.Location = New System.Drawing.Point(1010, 15) Me.lblReferenzwert.Name = "lblReferenzwert" - Me.lblReferenzwert.Size = New System.Drawing.Size(137, 16) + Me.lblReferenzwert.Size = New System.Drawing.Size(136, 16) Me.lblReferenzwert.TabIndex = 1 Me.lblReferenzwert.Text = "Referenzwert: €80.000" ' @@ -512,7 +541,7 @@ Partial Class frmGesSich Me.panOben.Controls.Add(Me.txtCRNDate) Me.panOben.Controls.Add(Me.txtMRNTime) Me.panOben.Controls.Add(Me.txtMRNDate) - Me.panOben.Controls.Add(Me.btnSave) + Me.panOben.Controls.Add(Me.btnSaveOben) Me.panOben.Controls.Add(Me.txtCRNSicherheitsbetrag) Me.panOben.Controls.Add(Me.txtCRNWarenwert) Me.panOben.Controls.Add(Me.txtCRN) @@ -794,7 +823,7 @@ Partial Class frmGesSich Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24) Me.txtFreitextOpen.TabIndex = 40 ' - 'frmGesSich + 'frmGesamtsicherheiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -804,7 +833,7 @@ Partial Class frmGesSich Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.MaximumSize = New System.Drawing.Size(1400, 815) Me.MinimumSize = New System.Drawing.Size(1400, 815) - Me.Name = "frmGesSich" + Me.Name = "frmGesamtsicherheiten" Me.Text = "frmGesSich" CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel2.ResumeLayout(False) @@ -827,7 +856,7 @@ Partial Class frmGesSich Friend WithEvents txtCRNDate As TextBox Friend WithEvents txtMRNTime As TextBox Friend WithEvents txtMRNDate As TextBox - Friend WithEvents btnSave As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnSaveOben As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents txtCRNSicherheitsbetrag As TextBox Friend WithEvents txtCRNWarenwert As TextBox Friend WithEvents txtCRN As TextBox @@ -860,7 +889,7 @@ Partial Class frmGesSich Friend WithEvents Label15 As Label Friend WithEvents txtPos As TextBox Friend WithEvents panOverlay As Panel - Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents btnSave As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents txtLKWID As TextBox Friend WithEvents txtAbfertNum As TextBox Friend WithEvents Label18 As Label @@ -872,4 +901,6 @@ Partial Class frmGesSich Friend WithEvents btnUpdateOpen As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents btnDeleteClose As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents btnDeleteOpen As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents cboWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents lblWarenort As Label End Class diff --git a/Aviso/frmGesSich.resx b/Aviso/frmGesamtsicherheiten.resx similarity index 100% rename from Aviso/frmGesSich.resx rename to Aviso/frmGesamtsicherheiten.resx diff --git a/Aviso/frmGesSich.vb b/Aviso/frmGesamtsicherheiten.vb similarity index 65% rename from Aviso/frmGesSich.vb rename to Aviso/frmGesamtsicherheiten.vb index 991f8d8..9203c07 100644 --- a/Aviso/frmGesSich.vb +++ b/Aviso/frmGesamtsicherheiten.vb @@ -1,21 +1,32 @@ Imports System.Reflection +Imports VERAG_PROG_ALLGEMEIN -Public Class frmGesSich +Public Class frmGesamtsicherheiten - Public Property GesamtsichNr As Integer - Public Property MakeDate As DateTime = Nothing + Public Property gessicherheitID As Integer + Public Property datum As DateTime = Nothing Property GesSichRef As cGesamtSicherheitsReferenz Property Standort As String = "" + Public ZollsatzMulti As Double = 0 + Public Saldo As Integer = 0 + Public Neu As Boolean = False + Public FilialNummer As Integer + Public Abfertigungsnummer As String + Public LKWID As String - Dim openopened As cSicherheit - dim closedopened as cSicherheit + Public warenortID As String + Dim openopened As cSicherheiten + + Dim closedopened As cSicherheiten + + Dim sicherheiten As cSicherheiten Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -27,16 +38,17 @@ Public Class frmGesSich Next ' MsgBox(dgv) LoadDGV() - GesSichRef.LoadStandort(Standort) + GesSichRef.LOAD() LoadStandort() End Sub Private Sub frmGesamtsicherheit_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If nixzunull(GesamtsichNr) = 0 Or Neu = True Then + If setNullToZero(gessicherheitID) = 0 Or Neu = True Then panOben.Enabled = False : panOben.Enabled = False panOverlay.Visible = True cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) - If MakeDate = Nothing Then MakeDate = Date.Now + cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True) + If datum = Nothing Then datum = Date.Now Else LoadDGV() End If @@ -57,15 +69,15 @@ Public Class frmGesSich Dim addtosqlstring As String = "" - Dim SQLStringMRN As String = "select GesamtSichID, Kennnummer, PosNr, DateTime, Warenwert, Sicherheitsbetrag, Saldo " & sqladd1 & " , Freitext from [tblGesamtsicherheit] where GesamtsichNr = '" & GesamtsichNr & "' and Art = 'Open' order by DateTime" + Dim SQLStringMRN As String = "select GesamtSichID, Kennnummer, PosNr, DateTime, Warenwert, Sicherheitsbetrag, Saldo " & sqladd1 & " , Freitext from [tblGesamtsicherheit] where GesamtsichNr = '" & gessicherheitID & "' and Art = 'Open' order by DateTime" dgvGesamtsicherheitMRN.SET_SQL(SQLStringMRN, "AVISO", ,) dgvGesamtsicherheitMRN.LOAD() - Dim SQLStringCRN As String = "select GesamtSichID, Kennnummer, DateTime, Warenwert, Sicherheitsbetrag, Saldo, Freitext from [tblGesamtsicherheit] where GesamtsichNr = '" & GesamtsichNr & "' and Art = 'Close' order by DateTime" + Dim SQLStringCRN As String = "select GesamtSichID, Kennnummer, DateTime, Warenwert, Sicherheitsbetrag, Saldo, Freitext from [tblGesamtsicherheit] where GesamtsichNr = '" & gessicherheitID & "' and Art = 'Close' order by DateTime" dgvGesamtsicherheitCRN.SET_SQL(SQLStringCRN, "AVISO", ,) dgvGesamtsicherheitCRN.LOAD() - Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where GesamtsichNr = '" & GesamtsichNr & "'" + Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where GesamtsichNr = '" & gessicherheitID & "'" Dim dt As New DataTable dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) @@ -203,7 +215,7 @@ Public Class frmGesSich End Sub - Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click + Private Sub btnSaveOben_Click(sender As Object, e As EventArgs) Handles btnSaveOben.Click Try Dim a As Date = Date.ParseExact(txtMRNDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) Dim b As Date = Date.ParseExact(txtMRNTime.Text, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo) @@ -231,29 +243,29 @@ Public Class frmGesSich Private Sub btnAddMRN_Click(sender As Object, e As EventArgs) Handles btnAddOpen.Click Try - Dim OPEN As New cSicherheit(Me) + Dim OPEN As New cSicherheiten(Me) With OPEN .Kennnummer = txtMRN.Text - .PosNr = Double.Parse(nixzunull(txtPos.Text)) - .DateTime = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) + .PosNr = Double.Parse(setNullToZero(txtPos.Text)) + .datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) .Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .standort = Me.Standort .Art = "OPEN" - .GesamtsichNr = Me.GesamtsichNr - .MakeDate = Me.MakeDate + .GesamtsichNr = Me.gessicherheitID + .erstellungsdatum = Me.datum .Freitext = Me.txtFreitextOpen.Text .saldo = GesSichRef.Saldo - .ATRJN = nixzunull(cboATR.SelectedItem) + .isATR = setNullToZero(cboATR.SelectedItem) End With If Neu = True Then OPEN.GesamtsichNr = AddNewGesamtSichNr() - Select Case TestIfExist(OPEN.Kennnummer, GesamtsichNr) + Select Case checkIfExist(OPEN.Kennnummer, gessicherheitID) Case "Neu" OPEN.Save() Case Else - MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & TestIfExist(OPEN.Kennnummer, GesamtsichNr) & "eingetragen") : OPEN.Save() + MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.Kennnummer, gessicherheitID) & "eingetragen") : OPEN.Save() End Select AfterButton() @@ -264,27 +276,27 @@ Public Class frmGesSich Private Sub btnAddCRN_Click(sender As Object, e As EventArgs) Handles btnAddClose.Click Try - Dim Close As New cSicherheit(Me) + Dim Close As New cSicherheiten(Me) With Close .Kennnummer = txtCRN.Text - .DateTime = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) + .datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) .Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .standort = Me.Standort .Art = "Close" - .GesamtsichNr = Me.GesamtsichNr - .MakeDate = Me.MakeDate + .GesamtsichNr = Me.gessicherheitID + .erstellungsdatum = Me.datum .Freitext = Me.txtFreitextClose.Text .saldo = GesSichRef.Saldo End With If Neu = True Then Close.GesamtsichNr = AddNewGesamtSichNr() - Select Case TestIfExist(Close.Kennnummer, GesamtsichNr) + Select Case checkIfExist(Close.Kennnummer, gessicherheitID) Case "Neu" Close.Save() Case Else - MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & TestIfExist(Close.Kennnummer, GesamtsichNr) & "eingetragen") : Exit Sub + MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(Close.Kennnummer, gessicherheitID) & "eingetragen") : Exit Sub End Select AfterButton() @@ -293,12 +305,12 @@ Public Class frmGesSich End Try End Sub - Function nixzunull(s As String, Optional type As String = "") + Function setNullToZero(s As String, Optional type As String = "") If s = "" Then - Dim O As Double = 0 + Dim zero As Double = 0 - Return O + Return zero Else Return s End If @@ -314,9 +326,9 @@ Public Class frmGesSich Dim dt As New DataTable dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True) Dim LetzteGesSichNum As Integer = dt.Rows(0).Item(0) - Me.GesamtsichNr = LetzteGesSichNum + 1 + Me.gessicherheitID = LetzteGesSichNum + 1 Me.Neu = False - Return Me.GesamtsichNr + Return Me.gessicherheitID End Function Public Sub EmptyTXT() @@ -327,8 +339,8 @@ Public Class frmGesSich cboATR.SelectedItem = Nothing End Sub - Public Function TestIfExist(KennnummerStr As String, Optional ByVal lkw As String = "") - If lkw = "" And Me.GesamtsichNr > 0 Then lkw = GesamtsichNr + Public Function checkIfExist(KennnummerStr As String, Optional ByVal lkw As String = "") + If lkw = "" And Me.gessicherheitID > 0 Then lkw = gessicherheitID Dim SQLString As String = "Select * from [tblGesamtsicherheit] where Kennnummer = '" & KennnummerStr & "'" Dim dt As New DataTable @@ -355,18 +367,26 @@ Public Class frmGesSich - Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles FlatButton2.Click + Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click, btnSaveOben.Click + Try - Me.FilialNummer = returnnothingehschonwissen(cboFiliale.SelectedItem, "Integer") + Me.FilialNummer = checkNothingValue(cboFiliale.SelectedItem, "Integer") Catch Me.FilialNummer = "0" End Try + If checkNothingValue(cboWarenort.SelectedItem, "String") Then + + Me.warenortID = cboWarenort.SelectedItem + Else + Me.warenortID = "" + End If + Me.Abfertigungsnummer = txtAbfertNum.Text Me.LKWID = txtLKWID.Text - If nixzunull(Me.GesamtsichNr) > 0 Then - Dim sqlstring = "Update [tblGesamtsicherheit] set FilialNummer = '" & Me.FilialNummer & "', Abfertigungsnummer = '" & Me.Abfertigungsnummer & "', LKWID = '" & Me.LKWID & "' WHERE GesamtSichNr = '" & Me.GesamtsichNr & "' " + If setNullToZero(Me.gessicherheitID) > 0 Then + Dim sqlstring = "Update [tblGesamtsicherheit] set FilialNummer = '" & Me.FilialNummer & "', Abfertigungsnummer = '" & Me.Abfertigungsnummer & "', LKWID = '" & Me.LKWID & "' WHERE GesamtSichNr = '" & Me.gessicherheitID & "' " SQL.doSQL(sqlstring, "AVISO") LoadDGV() End If @@ -375,7 +395,7 @@ Public Class frmGesSich panOverlay.Visible = False End Sub - Private Function returnnothingehschonwissen(obj As Object, Optional type As String = "String") + Private Function checkNothingValue(obj As Object, Optional type As String = "String") Select Case type Case "String" If obj Is Nothing Then @@ -396,16 +416,16 @@ Public Class frmGesSich Private Sub dgvGesamtsicherheitMRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitMRN.CellDoubleClick - Dim Sicherh As New cSicherheit - Sicherh.Load(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value) + Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value) + 'Sicherh.Load(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value) txtMRN.Text = Sicherh.Kennnummer txtPos.Text = Sicherh.PosNr txtMRNWarenwert.Text = Sicherh.Warenwert - txtFreitextOpen.Text = Sicherh.Freitext - cboATR.SelectedItem = Sicherh.ATRJN - txtMRNDate.Text = Sicherh.DateTime.ToString("dd.MM.yyyy") - txtMRNTime.Text = Sicherh.DateTime.ToString("HH:mm") + txtFreitextOpen.Text = Sicherh.freitext + cboATR.SelectedItem = Sicherh.isATR + txtMRNDate.Text = Sicherh.datum.ToString("dd.MM.yyyy") + txtMRNTime.Text = Sicherh.datum.ToString("HH:mm") openopened = Sicherh @@ -417,17 +437,17 @@ Public Class frmGesSich Private Sub btnUpdateOpen_Click(sender As Object, e As EventArgs) Handles btnUpdateOpen.Click With openopened .Kennnummer = txtMRN.Text - .PosNr = Double.Parse(nixzunull(txtPos.Text)) - .DateTime = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) + .PosNr = Double.Parse(setNullToZero(txtPos.Text)) + .datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) .Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .standort = Me.Standort .Art = "OPEN" - .GesamtsichNr = Me.GesamtsichNr + .GesamtsichNr = Me.gessicherheitID '.MakeDate = Me.MakeDate .Freitext = Me.txtFreitextOpen.Text '.saldo = GesSichRef.Saldo - .ATRJN = nixzunull(cboATR.SelectedItem) + .isATR = setNullToZero(cboATR.SelectedItem) End With openopened.Save() btnUpdateOpen.Visible = False @@ -436,10 +456,10 @@ Public Class frmGesSich AfterButton() End Sub - Private Sub FlatButton4_Click(sender As Object, e As EventArgs) Handles btnUpdateClose.Click + Private Sub btnDeleteClose_Click(sender As Object, e As EventArgs) Handles btnUpdateClose.Click With closedopened .Kennnummer = txtCRN.Text - .DateTime = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) + .datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) .Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .standort = Me.Standort @@ -455,14 +475,14 @@ Public Class frmGesSich Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitCRN.CellDoubleClick - Dim Sicherh As New cSicherheit - Sicherh.Load(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value) + Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value) + 'Sicherh.Load(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value) txtCRN.Text = Sicherh.Kennnummer txtCRNWarenwert.Text = Sicherh.Warenwert - txtFreitextClose.Text = Sicherh.Freitext - txtCRNDate.Text = Sicherh.DateTime.ToString("dd.MM.yyyy") - txtCRNTime.Text = Sicherh.DateTime.ToString("HH:mm") + txtFreitextClose.Text = Sicherh.freitext + txtCRNDate.Text = Sicherh.datum.ToString("dd.MM.yyyy") + txtCRNTime.Text = Sicherh.datum.ToString("HH:mm") closedopened = Sicherh @@ -483,7 +503,7 @@ Public Class frmGesSich End Try End Sub - Private Sub FlatButton4_Click_1(sender As Object, e As EventArgs) Handles btnDeleteClose.Click + Private Sub btnDeleteClose_Click_1(sender As Object, e As EventArgs) Handles btnDeleteClose.Click Try closedopened.Delete() btnUpdateClose.Visible = False @@ -503,130 +523,136 @@ Public Class frmGesSich txtLKWID.Text = Me.LKWID panOben.Enabled = False End Sub + + Private Sub btnClosePanOverlay_Click(sender As Object, e As EventArgs) Handles btnClosePanOverlay.Click + Close() + End Sub End Class -Public Class cSicherheit - Property GesamtSichID - Property Kennnummer As String - Property PosNr As Integer - Property DateTime As DateTime - Property MakeDate As DateTime - Property Warenwert As Double - Property Sicherheitsbetrag As Double - Property saldo As Double - Property standort As String - Property Art As String - Property GesamtsichNr As Integer - Property Ust As Integer - Property Freitext As String - Property FilialNummer As Integer - Property Abfertigungsnummer As String - Property LKWID As String - Property ATRJN As String = "" +'Public Class cSicherheit +' Property GesamtSichID As Object +' Property Kennnummer As String +' Property PosNr As Integer +' Property DateTime As DateTime +' Property MakeDate As DateTime +' Property Warenwert As Double +' Property Sicherheitsbetrag As Double +' Property saldo As Double +' Property standort As String +' Property Art As String +' Property GesamtsichNr As Integer +' Property Ust As Integer +' Property Freitext As String +' Property FilialNummer As Integer +' Property Abfertigungsnummer As String +' Property LKWID As String +' Property ATRJN As String = "" +' Property gs_warenort As String - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL +' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Public Sub New(Optional ByVal gessich As frmGesSich = Nothing) - If gessich IsNot Nothing Then - Me.FilialNummer = gessich.FilialNummer - Me.Abfertigungsnummer = gessich.Abfertigungsnummer - Me.LKWID = gessich.LKWID - Me.GesamtSichID = GenerateID() - End If - End Sub +' Public Sub New(Optional ByVal gessich As frmGesamtsicherheiten = Nothing) +' If gessich IsNot Nothing Then +' Me.FilialNummer = gessich.FilialNummer +' Me.Abfertigungsnummer = gessich.Abfertigungsnummer +' Me.LKWID = gessich.LKWID +' Me.gs_warenort = gessich.warenortID +' Me.GesamtSichID = GenerateID() +' End If +' End Sub - Public Function Load(GsID As String) - Me.GesamtSichID = GsID - Load() - End Function +' Public Function Load(GsID As String) +' Me.GesamtSichID = GsID +' Load() +' End Function - Public Function Load() - Dim dt As New DataTable - Dim sqlstring As String = "SELECT * FROM [AVISO].[dbo].[tblGesamtsicherheit] where GesamtsichID = '" & Me.GesamtSichID & "'" - dt = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True) - Dim test As cSicherheit = SQLEintraege.Loadinator(Me, dt) - ' MsgBox("") - End Function +' Public Function Load() +' Dim dt As New DataTable +' Dim sqlstring As String = "SELECT * FROM [AVISO].[dbo].[tblGesamtsicherheit] where GesamtsichID = '" & Me.GesamtSichID & "'" +' dt = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True) +' Dim test As cSicherheit = SQLEintraege.LoadEntities(Me, dt) +' ' MsgBox("") +' End Function - Public Function GenerateID() As String - Return Date.Now.ToString.Replace(".", "").Replace("-", "").Replace(",", "").Replace(" ", "").Replace(":", "") - End Function +' Public Function GenerateID() As String +' Return Date.Now.ToString.Replace(".", "").Replace("-", "").Replace(",", "").Replace(" ", "").Replace(":", "") +' End Function - Public Function Save() - 'MakeDate = frmGesSich.MakeDate - Dim ding As New List(Of SQLEintraege) - For Each prop As PropertyInfo In Me.GetType().GetProperties() - If prop.GetValue(Me, Nothing).GetType = GetType(Double) Then - ' MsgBox(prop.Name) - ding.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing).ToString.Replace(",", "."))) - Else - ding.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing))) - End If - ' ding.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing))) - Next +' Public Function Save() +' 'MakeDate = frmGesSich.MakeDate +' Dim entities As New List(Of SQLEintraege) +' For Each prop As PropertyInfo In Me.GetType().GetProperties() +' If prop.GetValue(Me, Nothing).GetType = GetType(Double) Then +' ' MsgBox(prop.Name) +' entities.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing).ToString.Replace(",", "."))) +' Else +' entities.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing))) +' End If +' ' entities.Add(New SQLEintraege(prop.Name, prop.GetValue(Me, Nothing))) +' Next - ''' - Dim dt As DataTable = SQL.loadDgvBySql("Select * from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO") - If dt.Rows.Count > 0 Then - Dim UpdateString As String = "" - For Each i In ding - If Not i.Spalte = "GesamtSichID" Then - UpdateString &= "[" & i.Spalte & "]='" & i.Wert & "'," - End If - Next - UpdateString = UpdateString.Substring(0, UpdateString.Length - 1) +' ''' +' Dim dt As DataTable = SQL.loadDgvBySql("Select * from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO") +' If dt.Rows.Count > 0 Then +' Dim UpdateString As String = "" +' For Each i In entities +' If Not i.Spalte = "GesamtSichID" Then +' UpdateString &= "[" & i.Spalte & "]='" & i.Wert & "'," +' End If +' Next +' UpdateString = UpdateString.Substring(0, UpdateString.Length - 1) - Dim sqlquery As String - sqlquery = "update [tblGesamtsicherheit] set " & UpdateString & " where GesamtSichID = '" & Me.GesamtSichID & "'" - SQL.doSQL(sqlquery, "AVISO") - Else +' Dim sqlquery As String +' sqlquery = "update [tblGesamtsicherheit] set " & UpdateString & " where GesamtSichID = '" & Me.GesamtSichID & "'" +' SQL.doSQL(sqlquery, "AVISO") +' Else - Dim text, value, insert As String - For Each i In ding - text &= i.Spalte & ", " - value &= "'" & i.Wert & "', " - Next - text = text.Substring(0, text.Length - 2) - value = value.Substring(0, value.Length - 2) +' Dim text, value, insert As String +' For Each i In entities +' text &= i.Spalte & ", " +' value &= "'" & i.Wert & "', " +' Next +' text = text.Substring(0, text.Length - 2) +' value = value.Substring(0, value.Length - 2) - insert = "(" & text & ") VALUES (" & value & ")" +' insert = "(" & text & ") VALUES (" & value & ")" - Dim sqlquery As String - sqlquery = "insert into [tblGesamtsicherheit] (" & text & ") VALUES (" & value & ")" - SQL.doSQL(sqlquery, "AVISO") - End If +' Dim sqlquery As String +' sqlquery = "insert into [tblGesamtsicherheit] (" & text & ") VALUES (" & value & ")" +' SQL.doSQL(sqlquery, "AVISO") +' End If - End Function +' End Function - Public Function Delete() - SQL.doSQL("delete from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO") - End Function +' Public Function Delete() +' SQL.doSQL("delete from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO") +' End Function -End Class +'End Class -Public Class SQLEintraege - Property Spalte As String - Property Wert As String - Public Sub New(_Spalte As String, _Wert As String) - Spalte = _Spalte - Wert = _Wert - End Sub +'Public Class SQLEintraege +' Property Spalte As String +' Property Wert As String +' Public Sub New(_Spalte As String, _Wert As String) +' Spalte = _Spalte +' Wert = _Wert +' End Sub - Public Shared Function Loadinator(Obj As Object, dt As DataTable) As Object - Try - For Each prop As PropertyInfo In Obj.GetType().GetProperties() - If dt.Rows(0).Item(prop.Name) IsNot Nothing And dt.Rows(0).Item(prop.Name) IsNot DBNull.Value Then - If dt.Rows(0).Item(prop.Name).GetType Is GetType(Decimal) Then - prop.SetValue(Obj, Double.Parse(dt.Rows(0).Item(prop.Name))) - Else - prop.SetValue(Obj, dt.Rows(0).Item(prop.Name)) - End If +' Public Shared Function LoadEntities(Obj As Object, dt As DataTable) As Object +' Try +' For Each prop As PropertyInfo In Obj.GetType().GetProperties() +' If dt.Rows(0).Item(prop.Name) IsNot Nothing And dt.Rows(0).Item(prop.Name) IsNot DBNull.Value Then +' If dt.Rows(0).Item(prop.Name).GetType Is GetType(Decimal) Then +' prop.SetValue(Obj, Double.Parse(dt.Rows(0).Item(prop.Name))) +' Else +' prop.SetValue(Obj, dt.Rows(0).Item(prop.Name)) +' End If - End If - Next - Return Obj - Catch ex As Exception - MsgBox(ex.Message) - End Try - End Function -End Class \ No newline at end of file +' End If +' Next +' Return Obj +' Catch ex As Exception +' MsgBox(ex.Message) +' End Try +' End Function +'End Class \ No newline at end of file diff --git a/Aviso/frmGesSichMenu.Designer.vb b/Aviso/frmGesamtsicherheitenMenu.Designer.vb similarity index 99% rename from Aviso/frmGesSichMenu.Designer.vb rename to Aviso/frmGesamtsicherheitenMenu.Designer.vb index 38c334a..f7c17d7 100644 --- a/Aviso/frmGesSichMenu.Designer.vb +++ b/Aviso/frmGesamtsicherheitenMenu.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class frmGesSichMenu +Partial Class frmGesamtsicherheitenMenu Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -23,7 +23,7 @@ Partial Class frmGesSichMenu _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesSichMenu)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenMenu)) Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() diff --git a/Aviso/frmGesSichMenu.resx b/Aviso/frmGesamtsicherheitenMenu.resx similarity index 100% rename from Aviso/frmGesSichMenu.resx rename to Aviso/frmGesamtsicherheitenMenu.resx diff --git a/Aviso/frmGesSichMenu.vb b/Aviso/frmGesamtsicherheitenMenu.vb similarity index 65% rename from Aviso/frmGesSichMenu.vb rename to Aviso/frmGesamtsicherheitenMenu.vb index 7ffe33d..552ed6c 100644 --- a/Aviso/frmGesSichMenu.vb +++ b/Aviso/frmGesamtsicherheitenMenu.vb @@ -1,6 +1,6 @@ Imports System.Reflection -Public Class frmGesSichMenu +Public Class frmGesamtsicherheitenMenu ' Public Zollsatz As Integer = 0 ' Public ZollsatzMulti As Double = 0 ' Public Referenzwert As Integer = 0 @@ -8,13 +8,16 @@ Public Class frmGesSichMenu 'Public Ust As Integer ' Public Saldo As Integer = 0 Public SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim GesSichRef As New cGesamtSicherheitsReferenz + 'Dim GesSichRef As New cGesamtSicherheitsReferenz + Dim GesSichRef As VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz + 'Public ATR As Boolean = False Public Property Standort As String = "" Private Sub frmGesamtsicherheiten_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load Me.Text = "Gesamtsicherheiten " & Standort frmHauptfenster.EnableDoubleBuffered(dgvListe) - GesSichRef.LoadStandort(Standort) + Dim GesSichRef As New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort) + 'GesSichRef.LOAD("standort", Standort) lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N") txtVon._ShortDateOnly = True @@ -42,21 +45,23 @@ Public Class frmGesSichMenu '" & sqladdon & " 'order by GesamtsichNr" - Dim sqlstring As String = " select * from (Select gesamtsichnr, MIN(Standort) as Standort, MIN(FilialNummer) as FilialNummer, min(Abfertigungsnummer) as Abfertigungsnummer, -max(LKWID) as LKWID, min (MakeDate) as Datum, FORMAT(SUM( -Case - when Art = 'Open' then (Sicherheitsbetrag * -1) - when Art = 'Close' then Sicherheitsbetrag -End) , 'C', 'de-DE')As SicherheitsSaldo -From (select * from (select GesamtsichNr as ding from [tblGesamtsicherheit] where -Freitext like '%" & txtSuchbegriff.Text & "%' OR -Abfertigungsnummer like '%" & txtSuchbegriff.Text & "%' OR -Kennnummer like '%" & txtSuchbegriff.Text & "%' OR -LKWID like '%" & txtSuchbegriff.Text & "%' -)as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.GesamtsichNr) as meh group by GesamtsichNr) as meh2 -Where Standort = '" & Standort & "' " & sqladdon & " -AND Datum > '" & Date.Parse(txtVon.Text) & "' -AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'" + Dim sqlstring As String = + " select * from (Select gs_gesamtsichnr, MIN(gs_standort) as Standort, MIN(gs_filialNr) as FilialNummer, min(gs_abfertigungsNr) as Abfertigungsnummer, + max(gs_LKWID) as LKWID, min (gs_datum) as Datum, FORMAT(SUM( + Case + when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) + when gs_art = 'Close' then gs_sicherheitsbetrag + End) , 'C', 'de-DE')As SicherheitsSaldo + + From (select * from (select gs_gsNr as ding from [tblGesamtsicherheit] where + gs_freitext like '%" & txtSuchbegriff.Text & "%' OR + gs_abfertigungsnummer like '%" & txtSuchbegriff.Text & "%' OR + gs_kennNr like '%" & txtSuchbegriff.Text & "%' OR + gs_LKWID like '%" & txtSuchbegriff.Text & "%' + ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.GesamtsichNr) as meh group by GesamtsichNr) as meh2 + Where Standort = '" & Standort & "' " & sqladdon & " + AND Datum > '" & Date.Parse(txtVon.Text) & "' + AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'" dgvListe.SET_SQL(sqlstring, "AVISO") dgvListe.LOAD() @@ -86,7 +91,7 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'" End Function Public Sub ShowStandort() - lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.Referenzwert.ToString("N") + lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.referenzwert.ToString("N") lblZollsatz.Text = "Zollsatz: " & GesSichRef.Zollsatz & "%" lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N") End Sub @@ -95,12 +100,12 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'" Private Sub OpenFRM(sender As Object, e As DataGridViewCellEventArgs) Handles dgvListe.CellDoubleClick - Dim frm As New frmGesSich + Dim frm As New frmGesamtsicherheiten With frm .GesSichRef = GesSichRef - .GesamtsichNr = dgvListe.CurrentRow.Cells("GesamtsichNr").Value + .gessicherheitID = dgvListe.CurrentRow.Cells("GesamtsichNr").Value .Standort = Me.Standort - .MakeDate = dgvListe.CurrentRow.Cells("Datum").Value + .datum = dgvListe.CurrentRow.Cells("Datum").Value .LKWID = dgvListe.CurrentRow.Cells("LKWID").Value .FilialNummer = dgvListe.CurrentRow.Cells("FilialNummer").Value .Abfertigungsnummer = dgvListe.CurrentRow.Cells("Abfertigungsnummer").Value @@ -116,11 +121,11 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'" End Sub Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click - Dim frm As New frmGesSich + Dim frm As New frmGesamtsicherheiten With frm .GesSichRef = GesSichRef .Standort = Me.Standort - .MakeDate = Date.Now + .datum = Date.Now '.ATR = GesSichRef.ATR '.Ust = GesSichRef.Ust '.UstEnabled = GesSichRef.UstEnabled @@ -228,55 +233,63 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'" End Function End Class -Public Class cGesamtSicherheitsReferenz - Public SQL As New VERAG_PROG_ALLGEMEIN.SQL +'Public Class cGesamtSicherheitsReferenz +' Public SQL As New VERAG_PROG_ALLGEMEIN.SQL - Property Zollsatz As Integer = 0 - Property ZollsatzMulti As Double = 0 - Property Referenzwert As Double = 0 - Property UstEnabled As Boolean = False - Property Ust As Integer - Property Saldo As Double = 0 - Property ATR As Boolean = False - Property Standort As String = "" +' Property Zollsatz As Integer = 0 +' Property ZollsatzMulti As Double = 0 +' Property Referenzwert As Double = 0 +' Property UstEnabled As Boolean = False +' Property Ust As Integer +' Property Saldo As Double = 0 +' Property ATR As Boolean = False +' Property Standort As String = "" - Public Sub LoadStandort(_Standort As String) - Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & _Standort & "'" - Dim dt As New DataTable - dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) - Zollsatz = dt.Rows(0).Item("Zollsatz") - Referenzwert = dt.Rows(0).Item("Referenzwert") - UstEnabled = dt.Rows(0).Item("UstEnabled") - Ust = dt.Rows(0).Item("Ust") - ATR = dt.Rows(0).Item("ATR") - ZollsatzMulti = Zollsatz / 100 - Saldo = dt.Rows(0).Item("aktSaldo") - Standort = _Standort - End Sub +' Public Sub LoadStandort(_Standort As String) +' 'Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & _Standort & "'" +' Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where gsr_standort = " & "'" & _Standort & "'" +' Dim dt As New DataTable +' dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) +' 'Zollsatz = dt.Rows(0).Item("Zollsatz") +' Zollsatz = dt.Rows(0).Item("gsr_zollsatz") +' 'Referenzwert = dt.Rows(0).Item("Referenzwert") +' Referenzwert = dt.Rows(0).Item("gsr_referenzwert") +' UstEnabled = dt.Rows(0).Item("gsr_ustEnabled") +' 'UstEnabled = dt.Rows(0).Item("UstEnabled") +' Ust = dt.Rows(0).Item("gsr_ust") +' 'Ust = dt.Rows(0).Item("Ust") +' ATR = dt.Rows(0).Item("gsr_ATR") +' 'ATR = dt.Rows(0).Item("ATR") +' ZollsatzMulti = Zollsatz / 100 +' Saldo = dt.Rows(0).Item("gsr_aktSaldo") +' 'Saldo = dt.Rows(0).Item("aktSaldo") +' Standort = _Standort +' End Sub - Public Function CalcSaldo() As String - Dim SaldoString As String = "select SUM( -case - when Art = 'Open' then (Sicherheitsbetrag * -1) - when Art = 'Close' then Sicherheitsbetrag -end) as SicherheitsSaldo -from [tblGesamtsicherheit] Where Standort = '" & Standort & "'" +' Public Function CalcSaldo() As String +' Dim SaldoString As String = +' "select SUM( +' case +' when gs_art = 'Open' then (gs_sicherheitsbetrag * -1) +' when gs_art = 'Close' then gs_sicherheitsbetrag +' end) as SicherheitsSaldo +' from [tblGesamtsicherheit] Where gs_standort = '" & Standort & "'" - Dim dt As New DataTable - Dim mrn As Double = 0 - dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True) - If dt.Rows(0).Item(0).ToString.Length > 0 Then - mrn = dt.Rows(0).Item(0) - End If +' Dim dt As New DataTable +' Dim mrn As Double = 0 +' dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True) +' If dt.Rows(0).Item(0).ToString.Length > 0 Then +' mrn = dt.Rows(0).Item(0) +' End If - Saldo = Referenzwert + mrn +' Saldo = Referenzwert + mrn - UpdateSaldo() - Return Saldo - End Function +' updateSaldo() +' Return Saldo +' End Functio - Public Function UpdateSaldo() - SQL.doSQL("Update [tblGesamtsicherheitReferenz] Set aktSaldo = '" & Saldo & "' WHERE Standort = '" & Standort & "'", "AVISO") - End Function +' Public Function updateSaldo() +' SQL.doSQL("Update [tblGesamtsicherheitReferenz] Set gsr_aktSaldo = '" & Saldo & "' WHERE gsr_Standort = '" & Standort & "'", "AVISO") +' End Function -End Class \ No newline at end of file +'End Class \ No newline at end of file diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index c47af49..3c5a621 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -3992,25 +3992,25 @@ Public Class frmHauptfenster End Sub Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragAGToolStripMenuItem.Click - Dim frm As New frmGesSichMenu + Dim frm As New frmGesamtsicherheitenMenu frm.Standort = "VERAG AG" frm.Show() End Sub Private Sub DEGesamtsicherheitVeragGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHToolStripMenuItem.Click - Dim frm As New frmGesSichMenu + Dim frm As New frmGesamtsicherheitenMenu frm.Standort = "Verag GmbH" frm.Show() End Sub Private Sub ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Click - Dim frm As New frmGesSichMenu + Dim frm As New frmGesamtsicherheitenMenu frm.Standort = "IMEX" frm.Show() End Sub Private Sub ATGesamtsicherheitVeragCSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragCSToolStripMenuItem.Click - Dim frm As New frmGesSichMenu + Dim frm As New frmGesamtsicherheitenMenu frm.Standort = "Verag CS" frm.Show() End Sub diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index d438610..7bdae7f 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5377,6 +5377,7 @@ Public Class frmSendungsdetailsNEU If frachkosten.ShowDialog() = DialogResult.OK Then txtFrachtkostenEU._value = frachkosten.EUAnteil txtFrachtkostenNichtEU._value = frachkosten.nichtEUAnteil + txtFrachtkostenGesamt._value = frachkosten.tbxGesamtfrachtkosten._value End If End Sub