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

Bugfix Gesamtsicherheiten II

Browse Source
This commit is contained in:
ms
2021-03-09 15:23:12 +01:00
parent c6423afb6a
commit 6e428cc58a
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aviso/My Project/Resources.Designer.vb generated
View File

@@ -1498,7 +1498,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 3.6.2.4 ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die 3.6.2.9 ähnelt.
'''</summary> '''</summary>
Friend ReadOnly Property Version() As String Friend ReadOnly Property Version() As String
Get Get

2
Aviso/My Project/Resources.resx
View File

@@ -536,7 +536,7 @@
<value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Version" xml:space="preserve"> <data name="Version" xml:space="preserve">
<value>3.6.2.4</value> <value>3.6.2.9</value>
</data> </data>
<data name="statusBtn_vorgeschrieben_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="statusBtn_vorgeschrieben_Aktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

19
Aviso/frmGesSich.vb
View File

@@ -2,7 +2,7 @@
Public Class frmGesSich Public Class frmGesSich
Public Property GesamtsichNr As String = "" Public Property GesamtsichNr As Integer
Public Property MakeDate As DateTime = Nothing Public Property MakeDate As DateTime = Nothing
Property GesSichRef As cGesamtSicherheitsReferenz Property GesSichRef As cGesamtSicherheitsReferenz
Property Standort As String = "" Property Standort As String = ""
@@ -32,7 +32,7 @@ Public Class frmGesSich
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 GesamtsichNr = "" Or Neu = True Then If nixzunull(GesamtsichNr) = 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)
@@ -50,8 +50,7 @@ Public Class frmGesSich
Public Sub LoadDGV() Public Sub LoadDGV()
lblSaldo.Text = "Saldo: € " & GesSichRef.Saldo.ToString("N") lblSaldo.Text = "Saldo: € " & GesSichRef.Saldo.ToString("N")
lblGestellungNr.Text = "Gesamtsicherheitsnummer: " & GesamtsichNr lblGestellungNr.Text = ""
Dim sqladd1 As String = "" Dim sqladd1 As String = ""
If GesSichRef.UstEnabled Then sqladd1 &= ", FORMAT(((Warenwert + Sicherheitsbetrag) * " & GesSichRef.Ust & "/100), 'C', 'de-DE') as Ust" If GesSichRef.UstEnabled Then sqladd1 &= ", FORMAT(((Warenwert + Sicherheitsbetrag) * " & GesSichRef.Ust & "/100), 'C', 'de-DE') as Ust"
If GesSichRef.ATR Then sqladd1 &= ", ATRJN" If GesSichRef.ATR Then sqladd1 &= ", ATRJN"
@@ -75,8 +74,8 @@ Public Class frmGesSich
Me.FilialNummer = dt.Rows(0).Item("FilialNummer") Me.FilialNummer = dt.Rows(0).Item("FilialNummer")
Me.Abfertigungsnummer = dt.Rows(0).Item("Abfertigungsnummer") Me.Abfertigungsnummer = dt.Rows(0).Item("Abfertigungsnummer")
If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= ", FilialNr: " & Me.FilialNummer If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer
If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= ", Abfertigungsnummer: " & Me.Abfertigungsnummer If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "Abfertigungsnummer: " & Me.Abfertigungsnummer
End If End If
@@ -122,9 +121,9 @@ Public Class frmGesSich
.Columns("Saldo").Visible = False .Columns("Saldo").Visible = False
Select Case GesSichRef.ATR Select Case GesSichRef.ATR
Case True Case True
.Columns("Kennnummer").HeaderText = "CRN"
Case Else
.Columns("Kennnummer").HeaderText = "ATC / MRN" .Columns("Kennnummer").HeaderText = "ATC / MRN"
Case Else
.Columns("Kennnummer").HeaderText = "CRN"
End Select End Select
.Columns("Kennnummer").Width = 120 .Columns("Kennnummer").Width = 120
.Columns("DateTime").Width = 140 .Columns("DateTime").Width = 140
@@ -329,7 +328,7 @@ Public Class frmGesSich
End Sub End Sub
Public Function TestIfExist(KennnummerStr As String, Optional ByVal lkw As String = "") Public Function TestIfExist(KennnummerStr As String, Optional ByVal lkw As String = "")
If lkw = "" And Me.GesamtsichNr.Length > 0 Then lkw = GesamtsichNr If lkw = "" And Me.GesamtsichNr > 0 Then lkw = GesamtsichNr
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
@@ -517,7 +516,7 @@ Public Class cSicherheit
Property saldo As Double Property saldo As Double
Property standort As String Property standort As String
Property Art As String Property Art As String
Property GesamtsichNr As String Property GesamtsichNr As Integer
Property Ust As Integer Property Ust As Integer
Property Freitext As String Property Freitext As String
Property FilialNummer As Integer Property FilialNummer As Integer