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

Feature: Offerten

Browse Source
This commit is contained in:
d.breimaier
2022-11-21 09:23:19 +01:00
parent 6140dc2c05
commit 579d56e057
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SDL/kunden/usrCntlOfferte.vb
View File

@@ -325,7 +325,7 @@ Public Class usrCntlOfferte
edit = False edit = False
handleEditMode(edit) handleEditMode(edit)
checkPerimissionsDGVDetails() checkPerimissionsDGVDetails()
If isStandard = False Then OfferteArchivieren() If isStandard = False Then OfferteArchivieren("Geändert")
OFFERTEBind.updateBinding() OFFERTEBind.updateBinding()
RaiseEvent OfferteChanged() RaiseEvent OfferteChanged()
End Sub End Sub
@@ -339,7 +339,7 @@ Public Class usrCntlOfferte
End Sub End Sub
Private Sub OfferteArchivieren() Private Sub OfferteArchivieren(Optional Art As String = "")
If DGVHasChaged = False Then Exit Sub If DGVHasChaged = False Then Exit Sub
currentOffertArchiv = New VERAG_PROG_ALLGEMEIN.cOfferteArchiv() currentOffertArchiv = New VERAG_PROG_ALLGEMEIN.cOfferteArchiv()
@@ -355,6 +355,7 @@ Public Class usrCntlOfferte
currentOffertArchiv.Gesperrt = currentOffert.Gesperrt currentOffertArchiv.Gesperrt = currentOffert.Gesperrt
currentOffertArchiv.Gesperrt_Datum = currentOffert.Gesperrt_Datum currentOffertArchiv.Gesperrt_Datum = currentOffert.Gesperrt_Datum
currentOffertArchiv.Gesperrt_Grund = currentOffert.Gesperrt_Grund currentOffertArchiv.Gesperrt_Grund = currentOffert.Gesperrt_Grund
currentOffertArchiv.Art = Art
Dim ofID As Integer = currentOffertArchiv.SAVERETURNID() Dim ofID As Integer = currentOffertArchiv.SAVERETURNID()
If ofID > 0 Then If ofID > 0 Then
@@ -386,16 +387,21 @@ Public Class usrCntlOfferte
End Sub End Sub
Private Sub btnStandardLaden_Click(sender As Object, e As EventArgs) Handles btnStandardLaden.Click Private Sub btnStandardLaden_Click(sender As Object, e As EventArgs) Handles btnStandardLaden.Click
Dim KUNDE As New VERAG_PROG_ALLGEMEIN.cKunde(kdNr)
Dim FIRMA_TMP = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(KUNDE.FilialenNr)
edit = True edit = True
handleEditMode(edit) handleEditMode(edit)
saveCurrentOffert() saveCurrentOffert()
OfferteArchivieren() OfferteArchivieren("Neuer Standard")
If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then
currentOffert.SAVE() currentOffert.SAVE()
currentOffert.LOAD_POSITIONEN() currentOffert.LOAD_POSITIONEN()
If currentOffert.POSITIONEN.Count = 0 Then ' If currentOffert.POSITIONEN.Count = 0 Then '
currentOffert.RESET_STANDARTOFFERTEN(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME) currentOffert.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, FIRMA_TMP)
End If End If
isStandard = True isStandard = True
@@ -434,7 +440,7 @@ Public Class usrCntlOfferte
cbxArchivierteOfferten.SelectedIndex = -1 cbxArchivierteOfferten.SelectedIndex = -1
cbxArchivierteOfferten.Items.Clear() cbxArchivierteOfferten.Items.Clear()
cbxArchivierteOfferten.Visible = True cbxArchivierteOfferten.Visible = True
cbxArchivierteOfferten.fillWithSQL("SELECT OfID, Cast([Archiviert am] AS DATE) as Archivierungsdatum FROM [tblOffertenArchiv] WHERE KundenNr='" & kdNr & "' and OffertenNr='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "'", True, "FMZOLL", True) cbxArchivierteOfferten.fillWithSQL("SELECT OfID, Concat(Cast([Archiviert am] AS DATE),' ' ,Art) as Archivierungsdatum, Art FROM [tblOffertenArchiv] WHERE KundenNr='" & kdNr & "' and OffertenNr='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "'", False, "FMZOLL", True)
fbtnBearbeiten.Visible = False fbtnBearbeiten.Visible = False
Else Else

2
VERAG_PROG_ALLGEMEIN/Classes/cOfferte.vb
View File

@@ -401,6 +401,7 @@ Public Class cOfferteArchiv
Property Gesperrt_Datum As Object = Nothing Property Gesperrt_Datum As Object = Nothing
Property Gesperrt_Grund As Object = Nothing Property Gesperrt_Grund As Object = Nothing
Property SSMA_TimeStamp As Object = Nothing Property SSMA_TimeStamp As Object = Nothing
Property Art As Object = Nothing
Property POSITIONEN As New List(Of cOffertPosition) '= Nothing Property POSITIONEN As New List(Of cOffertPosition) '= Nothing
Dim SQL As New SQL Dim SQL As New SQL
@@ -429,6 +430,7 @@ Public Class cOfferteArchiv
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt_Datum", Gesperrt_Datum)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt_Datum", Gesperrt_Datum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt_Grund", Gesperrt_Grund)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Gesperrt_Grund", Gesperrt_Grund))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SSMA_TimeStamp", SSMA_TimeStamp)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SSMA_TimeStamp", SSMA_TimeStamp))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Art", Art))
Return list Return list
End Function End Function