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

Feature Gesamtsicherheiten: Refactorting und Einbau der neuen Funktionen

Browse Source
This commit is contained in:
d.breimaier
2022-10-14 16:20:30 +02:00
parent 5961aa77b3
commit 8f213f0789
10 changed files with 364 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Aviso/Aviso.vbproj
View File

@@ -606,16 +606,16 @@
<Compile Include="frmGelangensbestaetigung.vb"> <Compile Include="frmGelangensbestaetigung.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="frmGesSich.Designer.vb"> <Compile Include="frmGesamtsicherheiten.Designer.vb">
<DependentUpon>frmGesSich.vb</DependentUpon> <DependentUpon>frmGesamtsicherheiten.vb</DependentUpon>
</Compile> </Compile>
<Compile Include="frmGesSich.vb"> <Compile Include="frmGesamtsicherheiten.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="frmGesSichMenu.Designer.vb"> <Compile Include="frmGesamtsicherheitenMenu.Designer.vb">
<DependentUpon>frmGesSichMenu.vb</DependentUpon> <DependentUpon>frmGesamtsicherheitenMenu.vb</DependentUpon>
</Compile> </Compile>
<Compile Include="frmGesSichMenu.vb"> <Compile Include="frmGesamtsicherheitenMenu.vb">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="frmHauptfenster.Designer.vb"> <Compile Include="frmHauptfenster.Designer.vb">
@@ -1101,11 +1101,11 @@
<EmbeddedResource Include="frmGelangensbestaetigung.resx"> <EmbeddedResource Include="frmGelangensbestaetigung.resx">
<DependentUpon>frmGelangensbestaetigung.vb</DependentUpon> <DependentUpon>frmGelangensbestaetigung.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmGesSich.resx"> <EmbeddedResource Include="frmGesamtsicherheiten.resx">
<DependentUpon>frmGesSich.vb</DependentUpon> <DependentUpon>frmGesamtsicherheiten.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmGesSichMenu.resx"> <EmbeddedResource Include="frmGesamtsicherheitenMenu.resx">
<DependentUpon>frmGesSichMenu.vb</DependentUpon> <DependentUpon>frmGesamtsicherheitenMenu.vb</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmHauptfenster.resx"> <EmbeddedResource Include="frmHauptfenster.resx">
<DependentUpon>frmHauptfenster.vb</DependentUpon> <DependentUpon>frmHauptfenster.vb</DependentUpon>

10
Aviso/frmFrachtkostenBerechnen.Designer.vb generated
View File

@@ -291,7 +291,7 @@ Partial Class frmFrachtkostenBerechnen
Me.cbxLandNach.FormattingEnabled = True Me.cbxLandNach.FormattingEnabled = True
Me.cbxLandNach.Location = New System.Drawing.Point(255, 23) Me.cbxLandNach.Location = New System.Drawing.Point(255, 23)
Me.cbxLandNach.Name = "cbxLandNach" 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 Me.cbxLandNach.TabIndex = 6
' '
'cbxLandVon 'cbxLandVon
@@ -304,7 +304,7 @@ Partial Class frmFrachtkostenBerechnen
Me.cbxLandVon.FormattingEnabled = True Me.cbxLandVon.FormattingEnabled = True
Me.cbxLandVon.Location = New System.Drawing.Point(75, 22) Me.cbxLandVon.Location = New System.Drawing.Point(75, 22)
Me.cbxLandVon.Name = "cbxLandVon" 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 Me.cbxLandVon.TabIndex = 3
' '
'txbCalcDistanceNichtEU 'txbCalcDistanceNichtEU
@@ -516,7 +516,7 @@ Partial Class frmFrachtkostenBerechnen
Me.txbVonOrt.MaxLines_Warning = "" Me.txbVonOrt.MaxLines_Warning = ""
Me.txbVonOrt.MaxLines_Warning_Label = Nothing Me.txbVonOrt.MaxLines_Warning_Label = Nothing
Me.txbVonOrt.Name = "txbVonOrt" 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 Me.txbVonOrt.TabIndex = 9
' '
'txbNachPLZ 'txbNachPLZ
@@ -557,12 +557,12 @@ Partial Class frmFrachtkostenBerechnen
Me.txbVonPLZ._Waehrung = False Me.txbVonPLZ._Waehrung = False
Me.txbVonPLZ._WaehrungZeichen = True Me.txbVonPLZ._WaehrungZeichen = True
Me.txbVonPLZ.ForeColor = System.Drawing.Color.Black 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.MaxLineLength = -1
Me.txbVonPLZ.MaxLines_Warning = "" Me.txbVonPLZ.MaxLines_Warning = ""
Me.txbVonPLZ.MaxLines_Warning_Label = Nothing Me.txbVonPLZ.MaxLines_Warning_Label = Nothing
Me.txbVonPLZ.Name = "txbVonPLZ" 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 Me.txbVonPLZ.TabIndex = 4
' '
'tbNichtEUAnteil 'tbNichtEUAnteil

111
Aviso/frmGesSich.Designer.vb → Aviso/frmGesamtsicherheiten.Designer.vb generated
View File

@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmGesSich Partial Class frmGesamtsicherheiten
Inherits System.Windows.Forms.Form Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. '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 DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 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 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.dgvGesamtsicherheitMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel()
Me.panOverlay = 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.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.txtLKWID = New System.Windows.Forms.TextBox()
Me.txtAbfertNum = New System.Windows.Forms.TextBox() Me.txtAbfertNum = New System.Windows.Forms.TextBox()
Me.Label18 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label()
@@ -48,7 +50,7 @@ Partial Class frmGesSich
Me.txtCRNDate = New System.Windows.Forms.TextBox() Me.txtCRNDate = New System.Windows.Forms.TextBox()
Me.txtMRNTime = New System.Windows.Forms.TextBox() Me.txtMRNTime = New System.Windows.Forms.TextBox()
Me.txtMRNDate = 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.txtCRNSicherheitsbetrag = New System.Windows.Forms.TextBox()
Me.txtCRNWarenwert = New System.Windows.Forms.TextBox() Me.txtCRNWarenwert = New System.Windows.Forms.TextBox()
Me.txtCRN = New System.Windows.Forms.TextBox() Me.txtCRN = New System.Windows.Forms.TextBox()
@@ -143,8 +145,10 @@ Partial Class frmGesSich
'panOverlay 'panOverlay
' '
Me.panOverlay.BackColor = System.Drawing.SystemColors.ButtonHighlight 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.cboFiliale)
Me.panOverlay.Controls.Add(Me.FlatButton2) Me.panOverlay.Controls.Add(Me.btnSave)
Me.panOverlay.Controls.Add(Me.txtLKWID) Me.panOverlay.Controls.Add(Me.txtLKWID)
Me.panOverlay.Controls.Add(Me.txtAbfertNum) Me.panOverlay.Controls.Add(Me.txtAbfertNum)
Me.panOverlay.Controls.Add(Me.Label18) Me.panOverlay.Controls.Add(Me.Label18)
@@ -157,6 +161,30 @@ Partial Class frmGesSich
Me.panOverlay.TabIndex = 2 Me.panOverlay.TabIndex = 2
Me.panOverlay.Visible = False 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 'cboFiliale
' '
Me.cboFiliale._allowedValuesFreiText = Nothing Me.cboFiliale._allowedValuesFreiText = Nothing
@@ -165,25 +193,25 @@ Partial Class frmGesSich
Me.cboFiliale.DropDownWidth = 300 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.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.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.MaxLength = 4
Me.cboFiliale.Name = "cboFiliale" Me.cboFiliale.Name = "cboFiliale"
Me.cboFiliale.Size = New System.Drawing.Size(186, 24) Me.cboFiliale.Size = New System.Drawing.Size(186, 24)
Me.cboFiliale.TabIndex = 2 Me.cboFiliale.TabIndex = 2
' '
'FlatButton2 'btnSave
' '
Me.FlatButton2.allowBorder = False Me.btnSave.allowBorder = False
Me.FlatButton2.BackColor = System.Drawing.Color.Gainsboro Me.btnSave.BackColor = System.Drawing.Color.Gainsboro
Me.FlatButton2.FlatAppearance.BorderSize = 0 Me.btnSave.FlatAppearance.BorderSize = 0
Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.FlatButton2.ForeColor = System.Drawing.Color.Black Me.btnSave.ForeColor = System.Drawing.Color.Black
Me.FlatButton2.Location = New System.Drawing.Point(424, 232) Me.btnSave.Location = New System.Drawing.Point(424, 232)
Me.FlatButton2.Name = "FlatButton2" Me.btnSave.Name = "btnSave"
Me.FlatButton2.Size = New System.Drawing.Size(75, 23) Me.btnSave.Size = New System.Drawing.Size(75, 23)
Me.FlatButton2.TabIndex = 7 Me.btnSave.TabIndex = 7
Me.FlatButton2.Text = "Speichern" Me.btnSave.Text = "Speichern"
Me.FlatButton2.UseVisualStyleBackColor = False Me.btnSave.UseVisualStyleBackColor = False
' '
'txtLKWID 'txtLKWID
' '
@@ -197,7 +225,7 @@ Partial Class frmGesSich
'txtAbfertNum '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.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.Margin = New System.Windows.Forms.Padding(0)
Me.txtAbfertNum.Name = "txtAbfertNum" Me.txtAbfertNum.Name = "txtAbfertNum"
Me.txtAbfertNum.Size = New System.Drawing.Size(186, 24) Me.txtAbfertNum.Size = New System.Drawing.Size(186, 24)
@@ -217,7 +245,7 @@ Partial Class frmGesSich
' '
Me.Label17.AutoSize = True 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.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.Name = "Label17"
Me.Label17.Size = New System.Drawing.Size(181, 20) Me.Label17.Size = New System.Drawing.Size(181, 20)
Me.Label17.TabIndex = 3 Me.Label17.TabIndex = 3
@@ -227,7 +255,7 @@ Partial Class frmGesSich
' '
Me.Label16.AutoSize = True 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.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.Name = "Label16"
Me.Label16.Size = New System.Drawing.Size(123, 20) Me.Label16.Size = New System.Drawing.Size(123, 20)
Me.Label16.TabIndex = 1 Me.Label16.TabIndex = 1
@@ -239,6 +267,7 @@ Partial Class frmGesSich
Me.btnClosePanOverlay.BackColor = System.Drawing.Color.White Me.btnClosePanOverlay.BackColor = System.Drawing.Color.White
Me.btnClosePanOverlay.BackgroundImage = Global.AVISO.My.Resources.Resources.del2 Me.btnClosePanOverlay.BackgroundImage = Global.AVISO.My.Resources.Resources.del2
Me.btnClosePanOverlay.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.btnClosePanOverlay.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
Me.btnClosePanOverlay.DialogResult = System.Windows.Forms.DialogResult.Cancel
Me.btnClosePanOverlay.FlatAppearance.BorderSize = 0 Me.btnClosePanOverlay.FlatAppearance.BorderSize = 0
Me.btnClosePanOverlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnClosePanOverlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnClosePanOverlay.ForeColor = System.Drawing.Color.Black 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.Size = New System.Drawing.Size(85, 24)
Me.txtMRNDate.TabIndex = 21 Me.txtMRNDate.TabIndex = 21
' '
'btnSave 'btnSaveOben
' '
Me.btnSave.allowBorder = False Me.btnSaveOben.allowBorder = False
Me.btnSave.BackColor = System.Drawing.Color.White Me.btnSaveOben.BackColor = System.Drawing.Color.White
Me.btnSave.FlatAppearance.BorderSize = 0 Me.btnSaveOben.FlatAppearance.BorderSize = 0
Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSaveOben.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnSave.ForeColor = System.Drawing.Color.Black Me.btnSaveOben.ForeColor = System.Drawing.Color.Black
Me.btnSave.Location = New System.Drawing.Point(12, 12) Me.btnSaveOben.Location = New System.Drawing.Point(12, 12)
Me.btnSave.Name = "btnSave" Me.btnSaveOben.Name = "btnSaveOben"
Me.btnSave.Size = New System.Drawing.Size(75, 23) Me.btnSaveOben.Size = New System.Drawing.Size(75, 23)
Me.btnSave.TabIndex = 0 Me.btnSaveOben.TabIndex = 0
Me.btnSave.Text = "Speichern" Me.btnSaveOben.Text = "Speichern"
Me.btnSave.UseVisualStyleBackColor = False Me.btnSaveOben.UseVisualStyleBackColor = False
' '
'txtCRNSicherheitsbetrag 'txtCRNSicherheitsbetrag
' '
@@ -450,7 +479,7 @@ Partial Class frmGesSich
Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew Me.lblZollsatz.ForeColor = System.Drawing.Color.Honeydew
Me.lblZollsatz.Location = New System.Drawing.Point(1010, 37) Me.lblZollsatz.Location = New System.Drawing.Point(1010, 37)
Me.lblZollsatz.Name = "lblZollsatz" 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.TabIndex = 4
Me.lblZollsatz.Text = "Zollsatz: 12%" Me.lblZollsatz.Text = "Zollsatz: 12%"
' '
@@ -462,7 +491,7 @@ Partial Class frmGesSich
Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew Me.lblReferenzwert.ForeColor = System.Drawing.Color.Honeydew
Me.lblReferenzwert.Location = New System.Drawing.Point(1010, 15) Me.lblReferenzwert.Location = New System.Drawing.Point(1010, 15)
Me.lblReferenzwert.Name = "lblReferenzwert" 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.TabIndex = 1
Me.lblReferenzwert.Text = "Referenzwert: €80.000" Me.lblReferenzwert.Text = "Referenzwert: €80.000"
' '
@@ -512,7 +541,7 @@ Partial Class frmGesSich
Me.panOben.Controls.Add(Me.txtCRNDate) Me.panOben.Controls.Add(Me.txtCRNDate)
Me.panOben.Controls.Add(Me.txtMRNTime) Me.panOben.Controls.Add(Me.txtMRNTime)
Me.panOben.Controls.Add(Me.txtMRNDate) 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.txtCRNSicherheitsbetrag)
Me.panOben.Controls.Add(Me.txtCRNWarenwert) Me.panOben.Controls.Add(Me.txtCRNWarenwert)
Me.panOben.Controls.Add(Me.txtCRN) Me.panOben.Controls.Add(Me.txtCRN)
@@ -794,7 +823,7 @@ Partial Class frmGesSich
Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24) Me.txtFreitextOpen.Size = New System.Drawing.Size(256, 24)
Me.txtFreitextOpen.TabIndex = 40 Me.txtFreitextOpen.TabIndex = 40
' '
'frmGesSich 'frmGesamtsicherheiten
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font 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.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MaximumSize = New System.Drawing.Size(1400, 815) Me.MaximumSize = New System.Drawing.Size(1400, 815)
Me.MinimumSize = New System.Drawing.Size(1400, 815) Me.MinimumSize = New System.Drawing.Size(1400, 815)
Me.Name = "frmGesSich" Me.Name = "frmGesamtsicherheiten"
Me.Text = "frmGesSich" Me.Text = "frmGesSich"
CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvGesamtsicherheitMRN, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel2.ResumeLayout(False) Me.Panel2.ResumeLayout(False)
@@ -827,7 +856,7 @@ Partial Class frmGesSich
Friend WithEvents txtCRNDate As TextBox Friend WithEvents txtCRNDate As TextBox
Friend WithEvents txtMRNTime As TextBox Friend WithEvents txtMRNTime As TextBox
Friend WithEvents txtMRNDate 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 txtCRNSicherheitsbetrag As TextBox
Friend WithEvents txtCRNWarenwert As TextBox Friend WithEvents txtCRNWarenwert As TextBox
Friend WithEvents txtCRN As TextBox Friend WithEvents txtCRN As TextBox
@@ -860,7 +889,7 @@ Partial Class frmGesSich
Friend WithEvents Label15 As Label Friend WithEvents Label15 As Label
Friend WithEvents txtPos As TextBox Friend WithEvents txtPos As TextBox
Friend WithEvents panOverlay As Panel 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 txtLKWID As TextBox
Friend WithEvents txtAbfertNum As TextBox Friend WithEvents txtAbfertNum As TextBox
Friend WithEvents Label18 As Label Friend WithEvents Label18 As Label
@@ -872,4 +901,6 @@ Partial Class frmGesSich
Friend WithEvents btnUpdateOpen As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents btnUpdateOpen As VERAG_PROG_ALLGEMEIN.FlatButton
Friend WithEvents btnDeleteClose As VERAG_PROG_ALLGEMEIN.FlatButton Friend WithEvents btnDeleteClose As VERAG_PROG_ALLGEMEIN.FlatButton
Friend WithEvents btnDeleteOpen 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 End Class

0
Aviso/frmGesSich.resx → Aviso/frmGesamtsicherheiten.resx
View File

380
Aviso/frmGesSich.vb → Aviso/frmGesamtsicherheiten.vb
View File

@@ -1,21 +1,32 @@
Imports System.Reflection Imports System.Reflection
Imports VERAG_PROG_ALLGEMEIN
Public Class frmGesSich Public Class frmGesamtsicherheiten
Public Property GesamtsichNr As Integer Public Property gessicherheitID As Integer
Public Property MakeDate As DateTime = Nothing Public Property datum As DateTime = Nothing
Property GesSichRef As cGesamtSicherheitsReferenz Property GesSichRef As cGesamtSicherheitsReferenz
Property Standort As String = "" Property Standort As String = ""
Public ZollsatzMulti As Double = 0 Public ZollsatzMulti As Double = 0
Public Saldo As Integer = 0 Public Saldo As Integer = 0
Public Neu As Boolean = False Public Neu As Boolean = False
Public FilialNummer As Integer Public FilialNummer As Integer
Public Abfertigungsnummer As String Public Abfertigungsnummer As String
Public LKWID As String Public LKWID As String
Dim openopened As cSicherheit Public warenortID As String
dim closedopened as cSicherheit
Dim openopened As cSicherheiten
Dim closedopened As cSicherheiten
Dim sicherheiten As cSicherheiten
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -27,16 +38,17 @@ Public Class frmGesSich
Next Next
' MsgBox(dgv) ' MsgBox(dgv)
LoadDGV() LoadDGV()
GesSichRef.LoadStandort(Standort) GesSichRef.LOAD()
LoadStandort() LoadStandort()
End Sub End Sub
Private Sub frmGesamtsicherheit_Load(sender As Object, e As EventArgs) Handles MyBase.Load 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 panOben.Enabled = False : panOben.Enabled = False
panOverlay.Visible = True 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) 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 Else
LoadDGV() LoadDGV()
End If End If
@@ -57,15 +69,15 @@ Public Class frmGesSich
Dim addtosqlstring As String = "" 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.SET_SQL(SQLStringMRN, "AVISO", ,)
dgvGesamtsicherheitMRN.LOAD() 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.SET_SQL(SQLStringCRN, "AVISO", ,)
dgvGesamtsicherheitCRN.LOAD() 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 Dim dt As New DataTable
dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
@@ -203,7 +215,7 @@ Public Class frmGesSich
End Sub 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 Try
Dim a As Date = Date.ParseExact(txtMRNDate.Text, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo) 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) 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 Private Sub btnAddMRN_Click(sender As Object, e As EventArgs) Handles btnAddOpen.Click
Try Try
Dim OPEN As New cSicherheit(Me) Dim OPEN As New cSicherheiten(Me)
With OPEN With OPEN
.Kennnummer = txtMRN.Text .Kennnummer = txtMRN.Text
.PosNr = Double.Parse(nixzunull(txtPos.Text)) .PosNr = Double.Parse(setNullToZero(txtPos.Text))
.DateTime = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) .datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
.Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
.Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
.standort = Me.Standort .standort = Me.Standort
.Art = "OPEN" .Art = "OPEN"
.GesamtsichNr = Me.GesamtsichNr .GesamtsichNr = Me.gessicherheitID
.MakeDate = Me.MakeDate .erstellungsdatum = Me.datum
.Freitext = Me.txtFreitextOpen.Text .Freitext = Me.txtFreitextOpen.Text
.saldo = GesSichRef.Saldo .saldo = GesSichRef.Saldo
.ATRJN = nixzunull(cboATR.SelectedItem) .isATR = setNullToZero(cboATR.SelectedItem)
End With End With
If Neu = True Then OPEN.GesamtsichNr = AddNewGesamtSichNr() If Neu = True Then OPEN.GesamtsichNr = AddNewGesamtSichNr()
Select Case TestIfExist(OPEN.Kennnummer, GesamtsichNr) Select Case checkIfExist(OPEN.Kennnummer, gessicherheitID)
Case "Neu" Case "Neu"
OPEN.Save() OPEN.Save()
Case Else 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 End Select
AfterButton() AfterButton()
@@ -264,27 +276,27 @@ Public Class frmGesSich
Private Sub btnAddCRN_Click(sender As Object, e As EventArgs) Handles btnAddClose.Click Private Sub btnAddCRN_Click(sender As Object, e As EventArgs) Handles btnAddClose.Click
Try Try
Dim Close As New cSicherheit(Me) Dim Close As New cSicherheiten(Me)
With Close With Close
.Kennnummer = txtCRN.Text .Kennnummer = txtCRN.Text
.DateTime = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) .datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
.Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
.Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
.standort = Me.Standort .standort = Me.Standort
.Art = "Close" .Art = "Close"
.GesamtsichNr = Me.GesamtsichNr .GesamtsichNr = Me.gessicherheitID
.MakeDate = Me.MakeDate .erstellungsdatum = Me.datum
.Freitext = Me.txtFreitextClose.Text .Freitext = Me.txtFreitextClose.Text
.saldo = GesSichRef.Saldo .saldo = GesSichRef.Saldo
End With End With
If Neu = True Then Close.GesamtsichNr = AddNewGesamtSichNr() If Neu = True Then Close.GesamtsichNr = AddNewGesamtSichNr()
Select Case TestIfExist(Close.Kennnummer, GesamtsichNr) Select Case checkIfExist(Close.Kennnummer, gessicherheitID)
Case "Neu" Case "Neu"
Close.Save() Close.Save()
Case Else 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 End Select
AfterButton() AfterButton()
@@ -293,12 +305,12 @@ Public Class frmGesSich
End Try End Try
End Sub End Sub
Function nixzunull(s As String, Optional type As String = "") Function setNullToZero(s As String, Optional type As String = "")
If s = "" Then If s = "" Then
Dim O As Double = 0 Dim zero As Double = 0
Return O Return zero
Else Else
Return s Return s
End If End If
@@ -314,9 +326,9 @@ Public Class frmGesSich
Dim dt As New DataTable Dim dt As New DataTable
dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True) dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
Dim LetzteGesSichNum As Integer = dt.Rows(0).Item(0) Dim LetzteGesSichNum As Integer = dt.Rows(0).Item(0)
Me.GesamtsichNr = LetzteGesSichNum + 1 Me.gessicherheitID = LetzteGesSichNum + 1
Me.Neu = False Me.Neu = False
Return Me.GesamtsichNr Return Me.gessicherheitID
End Function End Function
Public Sub EmptyTXT() Public Sub EmptyTXT()
@@ -327,8 +339,8 @@ Public Class frmGesSich
cboATR.SelectedItem = Nothing cboATR.SelectedItem = Nothing
End Sub End Sub
Public Function TestIfExist(KennnummerStr As String, Optional ByVal lkw As String = "") Public Function checkIfExist(KennnummerStr As String, Optional ByVal lkw As String = "")
If lkw = "" And Me.GesamtsichNr > 0 Then lkw = GesamtsichNr If lkw = "" And Me.gessicherheitID > 0 Then lkw = gessicherheitID
Dim SQLString As String = "Select * from [tblGesamtsicherheit] where Kennnummer = '" & KennnummerStr & "'" Dim SQLString As String = "Select * from [tblGesamtsicherheit] where Kennnummer = '" & KennnummerStr & "'"
Dim dt As New DataTable 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 Try
Me.FilialNummer = returnnothingehschonwissen(cboFiliale.SelectedItem, "Integer") Me.FilialNummer = checkNothingValue(cboFiliale.SelectedItem, "Integer")
Catch Catch
Me.FilialNummer = "0" Me.FilialNummer = "0"
End Try End Try
If checkNothingValue(cboWarenort.SelectedItem, "String") Then
Me.warenortID = cboWarenort.SelectedItem
Else
Me.warenortID = ""
End If
Me.Abfertigungsnummer = txtAbfertNum.Text Me.Abfertigungsnummer = txtAbfertNum.Text
Me.LKWID = txtLKWID.Text Me.LKWID = txtLKWID.Text
If nixzunull(Me.GesamtsichNr) > 0 Then If setNullToZero(Me.gessicherheitID) > 0 Then
Dim sqlstring = "Update [tblGesamtsicherheit] set FilialNummer = '" & Me.FilialNummer & "', Abfertigungsnummer = '" & Me.Abfertigungsnummer & "', LKWID = '" & Me.LKWID & "' WHERE GesamtSichNr = '" & Me.GesamtsichNr & "' " Dim sqlstring = "Update [tblGesamtsicherheit] set FilialNummer = '" & Me.FilialNummer & "', Abfertigungsnummer = '" & Me.Abfertigungsnummer & "', LKWID = '" & Me.LKWID & "' WHERE GesamtSichNr = '" & Me.gessicherheitID & "' "
SQL.doSQL(sqlstring, "AVISO") SQL.doSQL(sqlstring, "AVISO")
LoadDGV() LoadDGV()
End If End If
@@ -375,7 +395,7 @@ Public Class frmGesSich
panOverlay.Visible = False panOverlay.Visible = False
End Sub 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 Select Case type
Case "String" Case "String"
If obj Is Nothing Then 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 Private Sub dgvGesamtsicherheitMRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitMRN.CellDoubleClick
Dim Sicherh As New cSicherheit Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value)
Sicherh.Load(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value) 'Sicherh.Load(dgvGesamtsicherheitMRN.CurrentRow.Cells("GesamtSichID").Value)
txtMRN.Text = Sicherh.Kennnummer txtMRN.Text = Sicherh.Kennnummer
txtPos.Text = Sicherh.PosNr txtPos.Text = Sicherh.PosNr
txtMRNWarenwert.Text = Sicherh.Warenwert txtMRNWarenwert.Text = Sicherh.Warenwert
txtFreitextOpen.Text = Sicherh.Freitext txtFreitextOpen.Text = Sicherh.freitext
cboATR.SelectedItem = Sicherh.ATRJN cboATR.SelectedItem = Sicherh.isATR
txtMRNDate.Text = Sicherh.DateTime.ToString("dd.MM.yyyy") txtMRNDate.Text = Sicherh.datum.ToString("dd.MM.yyyy")
txtMRNTime.Text = Sicherh.DateTime.ToString("HH:mm") txtMRNTime.Text = Sicherh.datum.ToString("HH:mm")
openopened = Sicherh openopened = Sicherh
@@ -417,17 +437,17 @@ Public Class frmGesSich
Private Sub btnUpdateOpen_Click(sender As Object, e As EventArgs) Handles btnUpdateOpen.Click Private Sub btnUpdateOpen_Click(sender As Object, e As EventArgs) Handles btnUpdateOpen.Click
With openopened With openopened
.Kennnummer = txtMRN.Text .Kennnummer = txtMRN.Text
.PosNr = Double.Parse(nixzunull(txtPos.Text)) .PosNr = Double.Parse(setNullToZero(txtPos.Text))
.DateTime = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text) .datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
.Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Warenwert = Double.Parse(txtMRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
.Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtMRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
.standort = Me.Standort .standort = Me.Standort
.Art = "OPEN" .Art = "OPEN"
.GesamtsichNr = Me.GesamtsichNr .GesamtsichNr = Me.gessicherheitID
'.MakeDate = Me.MakeDate '.MakeDate = Me.MakeDate
.Freitext = Me.txtFreitextOpen.Text .Freitext = Me.txtFreitextOpen.Text
'.saldo = GesSichRef.Saldo '.saldo = GesSichRef.Saldo
.ATRJN = nixzunull(cboATR.SelectedItem) .isATR = setNullToZero(cboATR.SelectedItem)
End With End With
openopened.Save() openopened.Save()
btnUpdateOpen.Visible = False btnUpdateOpen.Visible = False
@@ -436,10 +456,10 @@ Public Class frmGesSich
AfterButton() AfterButton()
End Sub 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 With closedopened
.Kennnummer = txtCRN.Text .Kennnummer = txtCRN.Text
.DateTime = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text) .datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
.Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".") .Warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
.Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".") .Sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
.standort = Me.Standort .standort = Me.Standort
@@ -455,14 +475,14 @@ Public Class frmGesSich
Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitCRN.CellDoubleClick Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitCRN.CellDoubleClick
Dim Sicherh As New cSicherheit Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value)
Sicherh.Load(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value) 'Sicherh.Load(dgvGesamtsicherheitCRN.CurrentRow.Cells("GesamtSichID").Value)
txtCRN.Text = Sicherh.Kennnummer txtCRN.Text = Sicherh.Kennnummer
txtCRNWarenwert.Text = Sicherh.Warenwert txtCRNWarenwert.Text = Sicherh.Warenwert
txtFreitextClose.Text = Sicherh.Freitext txtFreitextClose.Text = Sicherh.freitext
txtCRNDate.Text = Sicherh.DateTime.ToString("dd.MM.yyyy") txtCRNDate.Text = Sicherh.datum.ToString("dd.MM.yyyy")
txtCRNTime.Text = Sicherh.DateTime.ToString("HH:mm") txtCRNTime.Text = Sicherh.datum.ToString("HH:mm")
closedopened = Sicherh closedopened = Sicherh
@@ -483,7 +503,7 @@ Public Class frmGesSich
End Try End Try
End Sub 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 Try
closedopened.Delete() closedopened.Delete()
btnUpdateClose.Visible = False btnUpdateClose.Visible = False
@@ -503,130 +523,136 @@ Public Class frmGesSich
txtLKWID.Text = Me.LKWID txtLKWID.Text = Me.LKWID
panOben.Enabled = False panOben.Enabled = False
End Sub End Sub
End Class
Public Class cSicherheit Private Sub btnClosePanOverlay_Click(sender As Object, e As EventArgs) Handles btnClosePanOverlay.Click
Property GesamtSichID Close()
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 = ""
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 End Sub
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 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
'''
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 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)
insert = "(" & text & ") VALUES (" & value & ")"
Dim sqlquery As String
sqlquery = "insert into [tblGesamtsicherheit] (" & text & ") VALUES (" & value & ")"
SQL.doSQL(sqlquery, "AVISO")
End If
End Function
Public Function Delete()
SQL.doSQL("delete from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO")
End Function
End Class End Class
Public Class SQLEintraege 'Public Class cSicherheit
Property Spalte As String ' Property GesamtSichID As Object
Property Wert As String ' Property Kennnummer As String
Public Sub New(_Spalte As String, _Wert As String) ' Property PosNr As Integer
Spalte = _Spalte ' Property DateTime As DateTime
Wert = _Wert ' Property MakeDate As DateTime
End Sub ' 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
Public Shared Function Loadinator(Obj As Object, dt As DataTable) As Object ' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
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 ' Public Sub New(Optional ByVal gessich As frmGesamtsicherheiten = Nothing)
Next ' If gessich IsNot Nothing Then
Return Obj ' Me.FilialNummer = gessich.FilialNummer
Catch ex As Exception ' Me.Abfertigungsnummer = gessich.Abfertigungsnummer
MsgBox(ex.Message) ' Me.LKWID = gessich.LKWID
End Try ' Me.gs_warenort = gessich.warenortID
End Function ' Me.GesamtSichID = GenerateID()
End Class ' End If
' End Sub
' 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.LoadEntities(Me, dt)
' ' MsgBox("")
' 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 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 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 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 & ")"
' Dim sqlquery As String
' sqlquery = "insert into [tblGesamtsicherheit] (" & text & ") VALUES (" & value & ")"
' SQL.doSQL(sqlquery, "AVISO")
' End If
' End Function
' Public Function Delete()
' SQL.doSQL("delete from [tblGesamtsicherheit] where GesamtSichID = '" & Me.GesamtSichID & "'", "AVISO")
' End Function
'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 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

4
Aviso/frmGesSichMenu.Designer.vb → Aviso/frmGesamtsicherheitenMenu.Designer.vb generated
View File

@@ -1,5 +1,5 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _ <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
Partial Class frmGesSichMenu Partial Class frmGesamtsicherheitenMenu
Inherits System.Windows.Forms.Form Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
@@ -23,7 +23,7 @@ Partial Class frmGesSichMenu
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() 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.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton()

0
Aviso/frmGesSichMenu.resx → Aviso/frmGesamtsicherheitenMenu.resx
View File

149
Aviso/frmGesSichMenu.vb → Aviso/frmGesamtsicherheitenMenu.vb
View File

@@ -1,6 +1,6 @@
Imports System.Reflection Imports System.Reflection
Public Class frmGesSichMenu Public Class frmGesamtsicherheitenMenu
' Public Zollsatz As Integer = 0 ' Public Zollsatz As Integer = 0
' Public ZollsatzMulti As Double = 0 ' Public ZollsatzMulti As Double = 0
' Public Referenzwert As Integer = 0 ' Public Referenzwert As Integer = 0
@@ -8,13 +8,16 @@ Public Class frmGesSichMenu
'Public Ust As Integer 'Public Ust As Integer
' Public Saldo As Integer = 0 ' Public Saldo As Integer = 0
Public SQL As New VERAG_PROG_ALLGEMEIN.SQL 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 ATR As Boolean = False
Public Property Standort As String = "" Public Property Standort As String = ""
Private Sub frmGesamtsicherheiten_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmGesamtsicherheiten_Menu_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Me.Text = "Gesamtsicherheiten " & Standort Me.Text = "Gesamtsicherheiten " & Standort
frmHauptfenster.EnableDoubleBuffered(dgvListe) 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") lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
txtVon._ShortDateOnly = True txtVon._ShortDateOnly = True
@@ -42,21 +45,23 @@ Public Class frmGesSichMenu
'" & sqladdon & " '" & sqladdon & "
'order by GesamtsichNr" 'order by GesamtsichNr"
Dim sqlstring As String = " select * from (Select gesamtsichnr, MIN(Standort) as Standort, MIN(FilialNummer) as FilialNummer, min(Abfertigungsnummer) as Abfertigungsnummer, Dim sqlstring As String =
max(LKWID) as LKWID, min (MakeDate) as Datum, FORMAT(SUM( " select * from (Select gs_gesamtsichnr, MIN(gs_standort) as Standort, MIN(gs_filialNr) as FilialNummer, min(gs_abfertigungsNr) as Abfertigungsnummer,
Case max(gs_LKWID) as LKWID, min (gs_datum) as Datum, FORMAT(SUM(
when Art = 'Open' then (Sicherheitsbetrag * -1) Case
when Art = 'Close' then Sicherheitsbetrag when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
End) , 'C', 'de-DE')As SicherheitsSaldo when gs_art = 'Close' then gs_sicherheitsbetrag
From (select * from (select GesamtsichNr as ding from [tblGesamtsicherheit] where End) , 'C', 'de-DE')As SicherheitsSaldo
Freitext like '%" & txtSuchbegriff.Text & "%' OR
Abfertigungsnummer like '%" & txtSuchbegriff.Text & "%' OR From (select * from (select gs_gsNr as ding from [tblGesamtsicherheit] where
Kennnummer like '%" & txtSuchbegriff.Text & "%' OR gs_freitext like '%" & txtSuchbegriff.Text & "%' OR
LKWID like '%" & txtSuchbegriff.Text & "%' gs_abfertigungsnummer like '%" & txtSuchbegriff.Text & "%' OR
)as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.GesamtsichNr) as meh group by GesamtsichNr) as meh2 gs_kennNr like '%" & txtSuchbegriff.Text & "%' OR
Where Standort = '" & Standort & "' " & sqladdon & " gs_LKWID like '%" & txtSuchbegriff.Text & "%'
AND Datum > '" & Date.Parse(txtVon.Text) & "' ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.GesamtsichNr) as meh group by GesamtsichNr) as meh2
AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'" 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.SET_SQL(sqlstring, "AVISO")
dgvListe.LOAD() dgvListe.LOAD()
@@ -86,7 +91,7 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
End Function End Function
Public Sub ShowStandort() Public Sub ShowStandort()
lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.Referenzwert.ToString("N") lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.referenzwert.ToString("N")
lblZollsatz.Text = "Zollsatz: " & GesSichRef.Zollsatz & "%" lblZollsatz.Text = "Zollsatz: " & GesSichRef.Zollsatz & "%"
lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N") lblSaldo.Text = "Saldo: €" & Decimal.Parse(GesSichRef.CalcSaldo()).ToString("N")
End Sub 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 Private Sub OpenFRM(sender As Object, e As DataGridViewCellEventArgs) Handles dgvListe.CellDoubleClick
Dim frm As New frmGesSich Dim frm As New frmGesamtsicherheiten
With frm With frm
.GesSichRef = GesSichRef .GesSichRef = GesSichRef
.GesamtsichNr = dgvListe.CurrentRow.Cells("GesamtsichNr").Value .gessicherheitID = dgvListe.CurrentRow.Cells("GesamtsichNr").Value
.Standort = Me.Standort .Standort = Me.Standort
.MakeDate = dgvListe.CurrentRow.Cells("Datum").Value .datum = dgvListe.CurrentRow.Cells("Datum").Value
.LKWID = dgvListe.CurrentRow.Cells("LKWID").Value .LKWID = dgvListe.CurrentRow.Cells("LKWID").Value
.FilialNummer = dgvListe.CurrentRow.Cells("FilialNummer").Value .FilialNummer = dgvListe.CurrentRow.Cells("FilialNummer").Value
.Abfertigungsnummer = dgvListe.CurrentRow.Cells("Abfertigungsnummer").Value .Abfertigungsnummer = dgvListe.CurrentRow.Cells("Abfertigungsnummer").Value
@@ -116,11 +121,11 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
End Sub End Sub
Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click 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 With frm
.GesSichRef = GesSichRef .GesSichRef = GesSichRef
.Standort = Me.Standort .Standort = Me.Standort
.MakeDate = Date.Now .datum = Date.Now
'.ATR = GesSichRef.ATR '.ATR = GesSichRef.ATR
'.Ust = GesSichRef.Ust '.Ust = GesSichRef.Ust
'.UstEnabled = GesSichRef.UstEnabled '.UstEnabled = GesSichRef.UstEnabled
@@ -228,55 +233,63 @@ AND Datum < '" & Date.Parse(txtbis.Text).AddDays(1).AddSeconds(-1) & "'"
End Function End Function
End Class End Class
Public Class cGesamtSicherheitsReferenz 'Public Class cGesamtSicherheitsReferenz
Public SQL As New VERAG_PROG_ALLGEMEIN.SQL ' Public SQL As New VERAG_PROG_ALLGEMEIN.SQL
Property Zollsatz As Integer = 0 ' Property Zollsatz As Integer = 0
Property ZollsatzMulti As Double = 0 ' Property ZollsatzMulti As Double = 0
Property Referenzwert As Double = 0 ' Property Referenzwert As Double = 0
Property UstEnabled As Boolean = False ' Property UstEnabled As Boolean = False
Property Ust As Integer ' Property Ust As Integer
Property Saldo As Double = 0 ' Property Saldo As Double = 0
Property ATR As Boolean = False ' Property ATR As Boolean = False
Property Standort As String = "" ' Property Standort As String = ""
Public Sub LoadStandort(_Standort As String) ' Public Sub LoadStandort(_Standort As String)
Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & _Standort & "'" ' 'Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where Standort = " & "'" & _Standort & "'"
Dim dt As New DataTable ' Dim StandortSqlString As String = "select * from [tblGesamtsicherheitReferenz] where gsr_standort = " & "'" & _Standort & "'"
dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True) ' Dim dt As New DataTable
Zollsatz = dt.Rows(0).Item("Zollsatz") ' dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
Referenzwert = dt.Rows(0).Item("Referenzwert") ' 'Zollsatz = dt.Rows(0).Item("Zollsatz")
UstEnabled = dt.Rows(0).Item("UstEnabled") ' Zollsatz = dt.Rows(0).Item("gsr_zollsatz")
Ust = dt.Rows(0).Item("Ust") ' 'Referenzwert = dt.Rows(0).Item("Referenzwert")
ATR = dt.Rows(0).Item("ATR") ' Referenzwert = dt.Rows(0).Item("gsr_referenzwert")
ZollsatzMulti = Zollsatz / 100 ' UstEnabled = dt.Rows(0).Item("gsr_ustEnabled")
Saldo = dt.Rows(0).Item("aktSaldo") ' 'UstEnabled = dt.Rows(0).Item("UstEnabled")
Standort = _Standort ' Ust = dt.Rows(0).Item("gsr_ust")
End Sub ' '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 ' Public Function CalcSaldo() As String
Dim SaldoString As String = "select SUM( ' Dim SaldoString As String =
case ' "select SUM(
when Art = 'Open' then (Sicherheitsbetrag * -1) ' case
when Art = 'Close' then Sicherheitsbetrag ' when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
end) as SicherheitsSaldo ' when gs_art = 'Close' then gs_sicherheitsbetrag
from [tblGesamtsicherheit] Where Standort = '" & Standort & "'" ' end) as SicherheitsSaldo
' from [tblGesamtsicherheit] Where gs_standort = '" & Standort & "'"
Dim dt As New DataTable ' Dim dt As New DataTable
Dim mrn As Double = 0 ' Dim mrn As Double = 0
dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True) ' dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
If dt.Rows(0).Item(0).ToString.Length > 0 Then ' If dt.Rows(0).Item(0).ToString.Length > 0 Then
mrn = dt.Rows(0).Item(0) ' mrn = dt.Rows(0).Item(0)
End If ' End If
Saldo = Referenzwert + mrn ' Saldo = Referenzwert + mrn
UpdateSaldo() ' updateSaldo()
Return Saldo ' Return Saldo
End Function ' End Functio
Public Function UpdateSaldo() ' Public Function updateSaldo()
SQL.doSQL("Update [tblGesamtsicherheitReferenz] Set aktSaldo = '" & Saldo & "' WHERE Standort = '" & Standort & "'", "AVISO") ' SQL.doSQL("Update [tblGesamtsicherheitReferenz] Set gsr_aktSaldo = '" & Saldo & "' WHERE gsr_Standort = '" & Standort & "'", "AVISO")
End Function ' End Function
End Class 'End Class

8
Aviso/frmHauptfenster.vb
View File

@@ -3992,25 +3992,25 @@ Public Class frmHauptfenster
End Sub End Sub
Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragAGToolStripMenuItem.Click 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.Standort = "VERAG AG"
frm.Show() frm.Show()
End Sub End Sub
Private Sub DEGesamtsicherheitVeragGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DEGesamtsicherheitVeragGmbHToolStripMenuItem.Click 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.Standort = "Verag GmbH"
frm.Show() frm.Show()
End Sub End Sub
Private Sub ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem.Click 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.Standort = "IMEX"
frm.Show() frm.Show()
End Sub End Sub
Private Sub ATGesamtsicherheitVeragCSToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATGesamtsicherheitVeragCSToolStripMenuItem.Click 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.Standort = "Verag CS"
frm.Show() frm.Show()
End Sub End Sub

1
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -5377,6 +5377,7 @@ Public Class frmSendungsdetailsNEU
If frachkosten.ShowDialog() = DialogResult.OK Then If frachkosten.ShowDialog() = DialogResult.OK Then
txtFrachtkostenEU._value = frachkosten.EUAnteil txtFrachtkostenEU._value = frachkosten.EUAnteil
txtFrachtkostenNichtEU._value = frachkosten.nichtEUAnteil txtFrachtkostenNichtEU._value = frachkosten.nichtEUAnteil
txtFrachtkostenGesamt._value = frachkosten.tbxGesamtfrachtkosten._value
End If End If
End Sub End Sub