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

fix

Browse Source
This commit is contained in:
d.breimaier
2026-08-31 10:22:39 +02:00
parent a912be044a
commit b171558cbe
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -5,7 +5,6 @@ Imports System.Web.UI.WebControls.Expressions
Imports System.Windows.Documents Imports System.Windows.Documents
Imports itextsharp.text.pdf Imports itextsharp.text.pdf
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Imports TAlex.WPF.Helpers
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Public Class frmMDM_USTVAntrag Public Class frmMDM_USTVAntrag
@@ -26,6 +25,7 @@ Public Class frmMDM_USTVAntrag
Dim GesamtUSteuer As Double Dim GesamtUSteuer As Double
Dim looked As Boolean = False Dim looked As Boolean = False
Dim suppressSelectionChanged = False Dim suppressSelectionChanged = False
Dim suppressSelectionFirstTime = True
Sub New(UStVAn_ID) Sub New(UStVAn_ID)
@@ -54,7 +54,9 @@ Public Class frmMDM_USTVAntrag
Sub init(Optional posIndex As Integer = -1, Optional Lieferant As String = "") Sub init(Optional posIndex As Integer = -1, Optional Lieferant As String = "")
suppressSelectionChanged = True
If Not suppressSelectionFirstTime Then suppressSelectionChanged = True
suppressSelectionFirstTime = False
pnlBody.AutoScroll = False pnlBody.AutoScroll = False
@@ -356,10 +358,10 @@ Public Class frmMDM_USTVAntrag
End If End If
End If End If
If dgvUSTVPositionen.Rows.Count = 1 Then 'If dgvUSTVPositionen.Rows.Count = 1 Then
posIndex = dgvUSTVPositionen.Rows.Count ' posIndex = dgvUSTVPositionen.Rows.Count
suppressSelectionChanged = False ' suppressSelectionChanged = False
End If 'End If
If posIndex > 0 Then If posIndex > 0 Then
@@ -2070,7 +2072,7 @@ Public Class frmMDM_USTVAntrag
Else Else
UstCntlUSTV_AntragPosition1.reset() UstCntlUSTV_AntragPosition1.reset(Antrag_LandKz)
UstCntlUSTV_AntragPosition1.Enabled = False UstCntlUSTV_AntragPosition1.Enabled = False
End If End If
@@ -2327,7 +2329,7 @@ Public Class frmMDM_USTVAntrag
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnNeuerEintrag.Click Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnNeuerEintrag.Click
UstCntlUSTV_AntragPosition1.reset() UstCntlUSTV_AntragPosition1.reset(Antrag_LandKz)
UstCntlUSTV_AntragPosition1.UStV_POS = New cUStVPositionen(UStVAn_ID) UstCntlUSTV_AntragPosition1.UStV_POS = New cUStVPositionen(UStVAn_ID)
UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr
UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_interneNr = USTV_ANTRAG.getMaxPosinterneNr

7
SDL/USTV/ustCntlUSTV_AntragPosition.vb
View File

@@ -22,7 +22,7 @@ Public Class ustCntlUSTV_AntragPosition
RaiseEvent EV_NEXT() RaiseEvent EV_NEXT()
End Sub End Sub
Sub reset() Sub reset(Antrag_LandKz As String)
txtRgDatum._value = "" txtRgDatum._value = ""
txtRgNr._value = "" txtRgNr._value = ""
btnLeistenderSave.Visible = False btnLeistenderSave.Visible = False
@@ -46,6 +46,7 @@ Public Class ustCntlUSTV_AntragPosition
txtOrt.Text = "" txtOrt.Text = ""
txtLand.Text = "" txtLand.Text = ""
txtUIDNr.Text = "" txtUIDNr.Text = ""
Me.Antrag_LandKz = Antrag_LandKz
_gridAktiv = True _gridAktiv = True
@@ -60,6 +61,7 @@ Public Class ustCntlUSTV_AntragPosition
_gridAktiv = False _gridAktiv = False
btnLeistenderSave.Visible = False btnLeistenderSave.Visible = False
Me.Antrag_LandKz = Antrag_LandKz Me.Antrag_LandKz = Antrag_LandKz
Me.UStV_POS = UStV_POS Me.UStV_POS = UStV_POS
Me._kundenNr = kdnr Me._kundenNr = kdnr
cbxAPI.Checked = If(UStV_POS.UStVPo_Schnittstelle, False) cbxAPI.Checked = If(UStV_POS.UStVPo_Schnittstelle, False)
@@ -254,8 +256,7 @@ Public Class ustCntlUSTV_AntragPosition
Dim filter As String = "UstV_aktiv = 1" Dim filter As String = "UstV_aktiv = 1"
If cbxAntragsfilter.Checked AndAlso Not String.IsNullOrWhiteSpace(Antrag_LandKz) Then If cbxAntragsfilter.Checked AndAlso Not String.IsNullOrWhiteSpace(Antrag_LandKz) Then
filter &= " AND LEFT(UstV_Leistender_UstNr, 2) = '" & filter &= " AND LEFT(UstV_Leistender_UstNr, 2) = '" & Antrag_LandKz.Replace("'", "''") & "'"
Antrag_LandKz.Replace("'", "''") & "'"
End If End If
sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender],[UStV_Leistender] AS Leistender,[UstV_Leistender_PLZ] AS PLZ,([UstV_Leistender_Strasse] + ' ' + [UstV_Leistender_StrasseNr]) AS Strasse,[UstV_Leistender_Stadt] AS Stadt FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"}) sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender],[UStV_Leistender] AS Leistender,[UstV_Leistender_PLZ] AS PLZ,([UstV_Leistender_Strasse] + ' ' + [UstV_Leistender_StrasseNr]) AS Strasse,[UstV_Leistender_Stadt] AS Stadt FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})