gestagteÄnderungen
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
|
||||
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
|
||||
Partial Class usrcntlGestellungsgarantie
|
||||
Inherits System.Windows.Forms.UserControl
|
||||
|
||||
'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
|
||||
<System.Diagnostics.DebuggerNonUserCode()> _
|
||||
<System.Diagnostics.DebuggerNonUserCode()>
|
||||
Protected Overrides Sub Dispose(ByVal disposing As Boolean)
|
||||
Try
|
||||
If disposing AndAlso components IsNot Nothing Then
|
||||
@@ -20,7 +20,7 @@ Partial Class usrcntlGestellungsgarantie
|
||||
'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
|
||||
'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
|
||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||
<System.Diagnostics.DebuggerStepThrough()> _
|
||||
<System.Diagnostics.DebuggerStepThrough()>
|
||||
Private Sub InitializeComponent()
|
||||
Me.lbl = New System.Windows.Forms.Label()
|
||||
Me.Label1 = New System.Windows.Forms.Label()
|
||||
@@ -657,10 +657,10 @@ Partial Class usrcntlGestellungsgarantie
|
||||
Friend WithEvents txtAnmerkung1 As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Friend WithEvents txtAnmerkung2 As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Friend WithEvents txtAnmerkung3 As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
|
||||
Public WithEvents txtAdresse1 As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents txtBestimmungszollamt As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents txtEORI As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents txtAdresse2 As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Public WithEvents txtFirma As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
End Class
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
Imports com.sun.xml.internal.ws.client
|
||||
Imports System.Web.UI.WebControls.Expressions
|
||||
Imports com.sun.tools.internal.ws.wsdl.document.mime
|
||||
Imports com.sun.xml.internal.ws.client
|
||||
|
||||
Public Class frmBonitaet
|
||||
|
||||
@@ -62,10 +64,26 @@ Public Class frmBonitaet
|
||||
End Sub
|
||||
|
||||
Private Sub frmBonitaet_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
|
||||
|
||||
|
||||
cboTool.Items.Clear()
|
||||
cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CreditSafe", "creditsafe"))
|
||||
cboTool.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Creditreform", "creditreform"))
|
||||
cboTool.changeItem("CreditSafe")
|
||||
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
|
||||
Case "IMEX" : cboTool.changeItem("CreditSafe")
|
||||
|
||||
|
||||
|
||||
Case Else : If Now.ToShortDateString >= DateTime.Parse("01/12/2022") Then
|
||||
cboTool.changeItem("CreditSafe")
|
||||
Else
|
||||
cboTool.changeItem("Creditreform")
|
||||
End If
|
||||
|
||||
End Select
|
||||
|
||||
txtCRDatum._value = Now
|
||||
cboRisikostufe.Items.Clear()
|
||||
|
||||
@@ -54,12 +54,14 @@
|
||||
' MsgBox(c._value)
|
||||
If c.enabled And c.checked Then
|
||||
Dim o As New VERAG_PROG_ALLGEMEIN.cOfferte(kdnr, c._value, False)
|
||||
o.Art = "Neuanlage"
|
||||
o.SAVE() 'speichern
|
||||
o.LOAD_POSITIONEN() 'positionen Laden
|
||||
If o.POSITIONEN.Count = 0 Then 'wenn keine POS --> neues Offert
|
||||
o.RESET_STANDARTOFFERTEN_FIRMA(VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME, FIRMA_TMP) '--> Standartofferten laden
|
||||
End If
|
||||
|
||||
|
||||
'SQL.doSQL("INSERT INTO Offertenpositionen WHERE KundenNr=" & kdnr & " AND [OffertenNr]=" & kdnr & "")
|
||||
|
||||
Else
|
||||
|
||||
58
SDL/kunden/usrCntlOfferte.Designer.vb
generated
58
SDL/kunden/usrCntlOfferte.Designer.vb
generated
@@ -56,17 +56,19 @@ Partial Class usrCntlOfferte
|
||||
Me.btnStandardLaden = New System.Windows.Forms.Button()
|
||||
Me.btnDeleteOfferte = New VERAG_PROG_ALLGEMEIN.FlatButton()
|
||||
Me.sbLeistungAdd = New VERAG_PROG_ALLGEMEIN.MySearchBox()
|
||||
Me.fbtnBearbeiten = New VERAG_PROG_ALLGEMEIN.FlatButton()
|
||||
Me.btnCreateOffert = New VERAG_PROG_ALLGEMEIN.FlatButton()
|
||||
Me.cbxArchivierteOfferten = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.cbxArchivierteOffertenAnzeigen = New System.Windows.Forms.CheckBox()
|
||||
Me.lblArchivierteOfferten = New System.Windows.Forms.Label()
|
||||
Me.lblEditMode = New System.Windows.Forms.Label()
|
||||
Me.btnOffertbearbeiten = New System.Windows.Forms.Button()
|
||||
Me.dgvOfferteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
|
||||
CType(Me.dgvOfferteDetails, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.cntxtAddSdl.SuspendLayout()
|
||||
Me.pnlSperre.SuspendLayout()
|
||||
Me.pnlEdit.SuspendLayout()
|
||||
CType(Me.dgvOfferteNew, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
'lblBesonderheiten
|
||||
@@ -137,7 +139,6 @@ Partial Class usrCntlOfferte
|
||||
'
|
||||
Me.dgvOfferte.AllowUserToAddRows = False
|
||||
Me.dgvOfferte.AllowUserToDeleteRows = False
|
||||
Me.dgvOfferte.AllowUserToOrderColumns = True
|
||||
Me.dgvOfferte.AllowUserToResizeRows = False
|
||||
DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
|
||||
Me.dgvOfferte.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
|
||||
@@ -512,21 +513,6 @@ Partial Class usrCntlOfferte
|
||||
Me.sbLeistungAdd.usrcntl = Nothing
|
||||
Me.sbLeistungAdd.Visible = False
|
||||
'
|
||||
'fbtnBearbeiten
|
||||
'
|
||||
Me.fbtnBearbeiten.allowBorder = False
|
||||
Me.fbtnBearbeiten.BackgroundImage = Global.SDL.My.Resources.Resources.stift
|
||||
Me.fbtnBearbeiten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
|
||||
Me.fbtnBearbeiten.FlatAppearance.BorderSize = 0
|
||||
Me.fbtnBearbeiten.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.fbtnBearbeiten.ForeColor = System.Drawing.Color.Black
|
||||
Me.fbtnBearbeiten.Location = New System.Drawing.Point(898, 5)
|
||||
Me.fbtnBearbeiten.Name = "fbtnBearbeiten"
|
||||
Me.fbtnBearbeiten.Size = New System.Drawing.Size(20, 20)
|
||||
Me.fbtnBearbeiten.TabIndex = 3
|
||||
Me.fbtnBearbeiten.UseVisualStyleBackColor = True
|
||||
Me.fbtnBearbeiten.Visible = False
|
||||
'
|
||||
'btnCreateOffert
|
||||
'
|
||||
Me.btnCreateOffert.allowBorder = False
|
||||
@@ -587,11 +573,44 @@ Partial Class usrCntlOfferte
|
||||
Me.lblEditMode.TabIndex = 28
|
||||
Me.lblEditMode.Text = "Edit Mode"
|
||||
'
|
||||
'btnOffertbearbeiten
|
||||
'
|
||||
Me.btnOffertbearbeiten.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.btnOffertbearbeiten.Location = New System.Drawing.Point(851, 4)
|
||||
Me.btnOffertbearbeiten.Name = "btnOffertbearbeiten"
|
||||
Me.btnOffertbearbeiten.Size = New System.Drawing.Size(100, 25)
|
||||
Me.btnOffertbearbeiten.TabIndex = 29
|
||||
Me.btnOffertbearbeiten.Text = "Offert bearbeiten"
|
||||
Me.btnOffertbearbeiten.UseVisualStyleBackColor = True
|
||||
Me.btnOffertbearbeiten.Visible = False
|
||||
'
|
||||
'dgvOfferteNew
|
||||
'
|
||||
Me.dgvOfferteNew.AKTUALISIERUNGS_INTERVALL = -1
|
||||
Me.dgvOfferteNew.AllowUserToAddRows = False
|
||||
Me.dgvOfferteNew.AllowUserToDeleteRows = False
|
||||
Me.dgvOfferteNew.AllowUserToOrderColumns = True
|
||||
Me.dgvOfferteNew.AllowUserToResizeRows = False
|
||||
Me.dgvOfferteNew.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
|
||||
Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
|
||||
Me.dgvOfferteNew.BackgroundColor = System.Drawing.Color.White
|
||||
Me.dgvOfferteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
|
||||
Me.dgvOfferteNew.Location = New System.Drawing.Point(0, 32)
|
||||
Me.dgvOfferteNew.MultiSelect = False
|
||||
Me.dgvOfferteNew.Name = "dgvOfferteNew"
|
||||
Me.dgvOfferteNew.ReadOnly = True
|
||||
Me.dgvOfferteNew.RowHeadersVisible = False
|
||||
Me.dgvOfferteNew.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
|
||||
Me.dgvOfferteNew.Size = New System.Drawing.Size(228, 347)
|
||||
Me.dgvOfferteNew.TabIndex = 30
|
||||
'
|
||||
'usrCntlOfferte
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.BackColor = System.Drawing.Color.White
|
||||
Me.Controls.Add(Me.dgvOfferteNew)
|
||||
Me.Controls.Add(Me.btnOffertbearbeiten)
|
||||
Me.Controls.Add(Me.lblEditMode)
|
||||
Me.Controls.Add(Me.lblArchivierteOfferten)
|
||||
Me.Controls.Add(Me.cbxArchivierteOffertenAnzeigen)
|
||||
@@ -603,7 +622,6 @@ Partial Class usrCntlOfferte
|
||||
Me.Controls.Add(Me.sbLeistungAdd)
|
||||
Me.Controls.Add(Me.btnDeleteLeistung)
|
||||
Me.Controls.Add(Me.btnAddLeistung)
|
||||
Me.Controls.Add(Me.fbtnBearbeiten)
|
||||
Me.Controls.Add(Me.btnCreateOffert)
|
||||
Me.Controls.Add(Me.Label11)
|
||||
Me.Controls.Add(Me.lblBesonderheiten)
|
||||
@@ -622,6 +640,7 @@ Partial Class usrCntlOfferte
|
||||
Me.pnlSperre.PerformLayout()
|
||||
Me.pnlEdit.ResumeLayout(False)
|
||||
Me.pnlEdit.PerformLayout()
|
||||
CType(Me.dgvOfferteNew, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.ResumeLayout(False)
|
||||
Me.PerformLayout()
|
||||
|
||||
@@ -633,7 +652,6 @@ Partial Class usrCntlOfferte
|
||||
Friend WithEvents dgvOfferteDetails As System.Windows.Forms.DataGridView
|
||||
Friend WithEvents dgvOfferte As System.Windows.Forms.DataGridView
|
||||
Friend WithEvents btnCreateOffert As VERAG_PROG_ALLGEMEIN.FlatButton
|
||||
Friend WithEvents fbtnBearbeiten As VERAG_PROG_ALLGEMEIN.FlatButton
|
||||
Friend WithEvents FlatButton5 As Button
|
||||
Friend WithEvents txtSperreGrund As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
Friend WithEvents txtSperreDat As VERAG_PROG_ALLGEMEIN.MyTextBox
|
||||
@@ -664,4 +682,6 @@ Partial Class usrCntlOfferte
|
||||
Friend WithEvents cbxArchivierteOffertenAnzeigen As CheckBox
|
||||
Friend WithEvents lblArchivierteOfferten As Label
|
||||
Friend WithEvents lblEditMode As Label
|
||||
Friend WithEvents btnOffertbearbeiten As Button
|
||||
Friend WithEvents dgvOfferteNew As VERAG_PROG_ALLGEMEIN.MyDatagridview
|
||||
End Class
|
||||
|
||||
@@ -51,7 +51,7 @@ Public Class usrCntlOfferte
|
||||
End If
|
||||
|
||||
|
||||
With dgvOfferte
|
||||
With dgvOfferteNew
|
||||
.DataSource = SQL.loadDgvBySql("SELECT Offerten.OffertenNr, cast(Offerten.OffertenNr as varchar(3)) + ' - ' + Offertenstamm.OffertenBez as OffertenBez ,Offerten.Besonderheiten FROM Offerten inner join Offertenstamm on [Offerten].OffertenNr=Offertenstamm.OffertenNr WHERE Offerten.KundenNr='" & kdNr & "' " & where & " ORDER BY Offerten.OffertenNr ", "FMZOLL")
|
||||
.Columns("OffertenNr").Visible = False
|
||||
.Columns("Besonderheiten").Visible = False
|
||||
@@ -140,6 +140,7 @@ Public Class usrCntlOfferte
|
||||
.Columns("Preisänderung").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopRight
|
||||
' .Columns("OffertenBez").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
' .Columns("OffertenBez").HeaderText = "Bezeichnung"
|
||||
|
||||
loaded = True
|
||||
End With
|
||||
|
||||
@@ -149,15 +150,14 @@ Public Class usrCntlOfferte
|
||||
|
||||
|
||||
|
||||
|
||||
Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferte.SelectionChanged
|
||||
Private Sub dgvOfferteDetails_SelectionChanged(sender As Object, e As EventArgs) Handles dgvOfferteNew.SelectionChanged
|
||||
|
||||
cbxArchivierteOffertenAnzeigen.Checked = False
|
||||
cbxArchivierteOfferten.Items.Clear()
|
||||
checkPermissions()
|
||||
If dgvOfferte.RowCount > 0 Then
|
||||
If dgvOfferteNew.RowCount > 0 Then
|
||||
|
||||
rtbBesonderheiten.Text = cSqlDb.checkNullStr(dgvOfferte.Rows(0).Cells("Besonderheiten").Value)
|
||||
rtbBesonderheiten.Text = cSqlDb.checkNullStr(dgvOfferteNew.Rows(0).Cells("Besonderheiten").Value)
|
||||
Else
|
||||
btnStandardLaden.Visible = False
|
||||
cbxArchivierteOfferten.Enabled = False
|
||||
@@ -165,8 +165,8 @@ Public Class usrCntlOfferte
|
||||
End If
|
||||
|
||||
|
||||
If dgvOfferte.SelectedRows.Count > 0 Then
|
||||
initDGVOfferteDetails(dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value)
|
||||
If dgvOfferteNew.SelectedRows.Count > 0 Then
|
||||
initDGVOfferteDetails(dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -197,8 +197,10 @@ Public Class usrCntlOfferte
|
||||
If f.ShowDialog() = DialogResult.OK Then
|
||||
initDGVOfferte()
|
||||
RaiseEvent OfferteChanged()
|
||||
dgvOfferte.Enabled = True
|
||||
dgvOfferteNew.Enabled = True
|
||||
isNew = True
|
||||
isStandard = False
|
||||
DGVHasChaged = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -251,13 +253,13 @@ Public Class usrCntlOfferte
|
||||
lblLeistunAddErr2.Visible = False
|
||||
Label3.Visible = False
|
||||
|
||||
If dgvOfferte.SelectedRows.Count <> 1 Then
|
||||
If dgvOfferteNew.SelectedRows.Count <> 1 Then
|
||||
Label3.Visible = True
|
||||
End If
|
||||
'Fehlerprüfung:
|
||||
'-------
|
||||
If cboLeistungenAdd._value = "" Then lblLeistunAddErr.Visible = True : Exit Sub
|
||||
If LeistungsBezexists(cboLeistungenAdd._value, MyTextBox1.Text, dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value) Then lblLeistunAddErr2.Visible = True : Exit Sub
|
||||
If LeistungsBezexists(cboLeistungenAdd._value, MyTextBox1.Text, dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value) Then lblLeistunAddErr2.Visible = True : Exit Sub
|
||||
'-------
|
||||
|
||||
Dim l As New VERAG_PROG_ALLGEMEIN.cLeistungen(cboLeistungenAdd._value)
|
||||
@@ -265,7 +267,7 @@ Public Class usrCntlOfferte
|
||||
o.KundenNr = kdNr
|
||||
o.LeistungsNr = l.LeistungsNr
|
||||
o.LeistungsBez = MyTextBox1.Text
|
||||
o.OffertenNr = dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value
|
||||
o.OffertenNr = dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value
|
||||
'o.Preis=l.preis
|
||||
o.BerechnungsartNr = l.BerechnungsartNr
|
||||
'o.Anzahl = l.m
|
||||
@@ -283,8 +285,6 @@ Public Class usrCntlOfferte
|
||||
initDGVOfferteDetails(o.OffertenNr)
|
||||
addLeistung = True
|
||||
End If
|
||||
DGVHasChaged = True
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -312,16 +312,32 @@ Public Class usrCntlOfferte
|
||||
dgvOfferteDetails.Rows(e.RowIndex).Cells("Sachbearbeiter").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
|
||||
dgvOfferteDetails.Rows(e.RowIndex).Cells("Geändert am").Value = Now
|
||||
DGVHasChaged = True
|
||||
saveCurrentOffert()
|
||||
If isNew = True Then
|
||||
|
||||
currentOffert.Art = "Neuanlage"
|
||||
currentOffert.SAVE()
|
||||
|
||||
Else
|
||||
|
||||
currentOffert.Art = "Geändert"
|
||||
currentOffert.SAVE()
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
'DGVHasChaged = True
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub btnDeleteOfferte_Click(sender As Object, e As EventArgs) Handles btnDeleteOfferte.Click
|
||||
If dgvOfferte.SelectedRows.Count = 1 Then
|
||||
If vbYes = MsgBox("Möchten Sie das Offert '" & dgvOfferte.SelectedRows(0).Cells("OffertenBez").Value & "' wirklich löschen", vbYesNoCancel) Then
|
||||
If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then
|
||||
If dgvOfferteNew.SelectedRows.Count = 1 Then
|
||||
If vbYes = MsgBox("Möchten Sie das Offert '" & dgvOfferteNew.SelectedRows(0).Cells("OffertenBez").Value & "' wirklich löschen", vbYesNoCancel) Then
|
||||
saveCurrentOffert()
|
||||
currentOffert.Art = "Gelöscht"
|
||||
currentOffert.SAVE()
|
||||
OfferteArchivieren()
|
||||
If SQL.doSQL("DELETE FROM Offerten where [KundenNr]='" & kdNr & "' AND [OffertenNr]='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then
|
||||
initDGVOfferte()
|
||||
RaiseEvent OfferteChanged()
|
||||
End If
|
||||
@@ -336,7 +352,7 @@ Public Class usrCntlOfferte
|
||||
checkPerimissionsDGVDetails()
|
||||
edit = False
|
||||
handleEditMode(edit)
|
||||
saveArchivierteOfferte()
|
||||
saveToArchive()
|
||||
|
||||
OFFERTEBind.updateBinding()
|
||||
RaiseEvent OfferteChanged()
|
||||
@@ -344,11 +360,10 @@ Public Class usrCntlOfferte
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub fbtnBearbeiten_Click(sender As Object, e As EventArgs) Handles fbtnBearbeiten.Click
|
||||
Private Sub btnOffertbearbeiten_Click(sender As Object, e As EventArgs) Handles btnOffertbearbeiten.Click
|
||||
|
||||
edit = True
|
||||
handleEditMode(edit)
|
||||
saveCurrentOffert()
|
||||
checkPerimissionsDGVDetails()
|
||||
|
||||
End Sub
|
||||
@@ -368,7 +383,7 @@ Public Class usrCntlOfferte
|
||||
currentOffertArchiv.Gesperrt = currentOffert.Gesperrt
|
||||
currentOffertArchiv.Gesperrt_Datum = currentOffert.Gesperrt_Datum
|
||||
currentOffertArchiv.Gesperrt_Grund = currentOffert.Gesperrt_Grund
|
||||
currentOffertArchiv.Art = Art
|
||||
currentOffertArchiv.Art = currentOffert.Art
|
||||
ofID = currentOffertArchiv.SAVERETURNID()
|
||||
|
||||
If ofID > 0 Then
|
||||
@@ -409,10 +424,10 @@ Public Class usrCntlOfferte
|
||||
handleEditMode(edit)
|
||||
saveCurrentOffert()
|
||||
|
||||
|
||||
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]='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "' ", "FMZOLL") Then
|
||||
isStandard = True
|
||||
isNew = True
|
||||
currentOffert.Art = "Neuer Standard"
|
||||
currentOffert.SAVE()
|
||||
currentOffert.LOAD_POSITIONEN()
|
||||
If currentOffert.POSITIONEN.Count = 0 Then '
|
||||
@@ -420,11 +435,12 @@ Public Class usrCntlOfferte
|
||||
|
||||
End If
|
||||
|
||||
'DGVHasChaged = False
|
||||
dgvOfferteNew.GetOrder()
|
||||
initDGVOfferte()
|
||||
dgvOfferteNew.SetOrder()
|
||||
RaiseEvent OfferteChanged()
|
||||
saveCurrentOffert()
|
||||
saveArchivierteOfferte()
|
||||
isStandard = True
|
||||
isNew = True
|
||||
End If
|
||||
|
||||
End Sub
|
||||
@@ -452,20 +468,20 @@ Public Class usrCntlOfferte
|
||||
|
||||
Private Sub cbxArchivierteOffertenAnzeigen_CheckedChanged(sender As Object, e As EventArgs) Handles cbxArchivierteOffertenAnzeigen.CheckedChanged
|
||||
|
||||
If dgvOfferte.SelectedRows.Count = 0 Then Exit Sub
|
||||
If dgvOfferteNew.SelectedRows.Count = 0 Then Exit Sub
|
||||
|
||||
If cbxArchivierteOffertenAnzeigen.Checked Then
|
||||
cbxArchivierteOfferten.SelectedIndex = -1
|
||||
cbxArchivierteOfferten.Items.Clear()
|
||||
cbxArchivierteOfferten.Visible = True
|
||||
cbxArchivierteOfferten.fillWithSQL("SELECT OfID, CONCAT(FORMAT([Archiviert am], 'dd-MM.yyyy HH:mm'),'-',Art) as Archivierungsoffert FROM [tblOffertenArchiv] WHERE KundenNr='" & kdNr & "' and OffertenNr='" & dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value & "'", False, "FMZOLL", True)
|
||||
fbtnBearbeiten.Visible = False
|
||||
cbxArchivierteOfferten.fillWithSQL("SELECT OfID, CONCAT(FORMAT([Archiviert am], 'dd-MM.yyyy HH:mm'),'-',Art) as Archivierungsoffert FROM [tblOffertenArchiv] WHERE KundenNr='" & kdNr & "' and OffertenNr='" & dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value & "'", False, "FMZOLL", True)
|
||||
btnOffertbearbeiten.Visible = False
|
||||
|
||||
Else
|
||||
lblArchivierteOfferten.Visible = False
|
||||
cbxArchivierteOfferten.Visible = False
|
||||
initDGVOfferteDetails(dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value)
|
||||
fbtnBearbeiten.Visible = True
|
||||
initDGVOfferteDetails(dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value)
|
||||
btnOffertbearbeiten.Visible = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
@@ -502,7 +518,6 @@ Public Class usrCntlOfferte
|
||||
|
||||
Private Sub initDGVOfferteDetailsArchived(OffertenId)
|
||||
|
||||
|
||||
loaded = False
|
||||
DGVHasChaged = False
|
||||
|
||||
@@ -570,8 +585,8 @@ Public Class usrCntlOfferte
|
||||
|
||||
Private Sub saveCurrentOffert()
|
||||
|
||||
dgvOfferte.Enabled = False
|
||||
currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(kdNr, dgvOfferte.SelectedRows(0).Cells("OffertenNr").Value, False)
|
||||
dgvOfferteNew.Enabled = False
|
||||
currentOffert = New VERAG_PROG_ALLGEMEIN.cOfferte(kdNr, dgvOfferteNew.SelectedRows(0).Cells("OffertenNr").Value, False)
|
||||
Dim orgDataTable As DataTable = dgvOfferteDetails.DataSource
|
||||
tmpDataTable = orgDataTable.Copy
|
||||
|
||||
@@ -585,15 +600,15 @@ Public Class usrCntlOfferte
|
||||
pnlEdit.Visible = False
|
||||
pnlSperre.Visible = False
|
||||
btnCreateOffert.Visible = False
|
||||
dgvOfferte.ReadOnly = True
|
||||
fbtnBearbeiten.Visible = False
|
||||
dgvOfferteNew.ReadOnly = True
|
||||
btnOffertbearbeiten.Visible = False
|
||||
btnStandardLaden.Visible = False
|
||||
cbxArchivierteOfferten.Enabled = False
|
||||
Else
|
||||
dgvOfferteDetails.AllowUserToAddRows = True
|
||||
dgvOfferteDetails.AllowUserToDeleteRows = True
|
||||
dgvOfferteDetails.RowHeadersVisible = True
|
||||
fbtnBearbeiten.Visible = True
|
||||
btnOffertbearbeiten.Visible = True
|
||||
btnStandardLaden.Visible = True
|
||||
cbxArchivierteOfferten.Enabled = True
|
||||
cbxArchivierteOffertenAnzeigen.Visible = True
|
||||
@@ -605,9 +620,9 @@ Public Class usrCntlOfferte
|
||||
End If
|
||||
|
||||
|
||||
If dgvOfferte.SelectedRows.Count = 0 Then
|
||||
If dgvOfferteNew.SelectedRows.Count = 0 Then
|
||||
|
||||
fbtnBearbeiten.Visible = False
|
||||
btnOffertbearbeiten.Visible = False
|
||||
btnStandardLaden.Visible = False
|
||||
cbxArchivierteOffertenAnzeigen.Visible = False
|
||||
|
||||
@@ -621,27 +636,26 @@ Public Class usrCntlOfferte
|
||||
lblEditMode.Visible = True
|
||||
cbxArchivierteOffertenAnzeigen.Enabled = False
|
||||
cbxArchivierteOffertenAnzeigen.Checked = False
|
||||
dgvOfferte.Enabled = False
|
||||
dgvOfferteNew.Enabled = False
|
||||
Else
|
||||
lblEditMode.Visible = False
|
||||
cbxArchivierteOffertenAnzeigen.Enabled = True
|
||||
dgvOfferte.Enabled = True
|
||||
dgvOfferteNew.Enabled = True
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub saveArchivierteOfferte(Optional forceSave As Boolean = False)
|
||||
|
||||
Private Sub saveToArchive()
|
||||
|
||||
If isNew = False AndAlso isStandard = False Or isNew AndAlso isStandard = False Then 'Neuanlage oder Anlage über "Standardoffert laden" speichern,
|
||||
If DGVHasChaged = False Then Exit Sub
|
||||
End If
|
||||
|
||||
If isStandard Then
|
||||
If DGVHasChaged = False AndAlso isNew Then
|
||||
OfferteArchivieren("Neuer Standard")
|
||||
If isNew Then
|
||||
OfferteArchivieren()
|
||||
isNew = False
|
||||
Exit Sub
|
||||
|
||||
End If
|
||||
isStandard = False
|
||||
@@ -649,13 +663,12 @@ Public Class usrCntlOfferte
|
||||
|
||||
If DGVHasChaged Then
|
||||
If isNew = False Then
|
||||
|
||||
OfferteArchivieren("Geändert")
|
||||
OfferteArchivieren()
|
||||
Exit Sub
|
||||
|
||||
Else
|
||||
If isNew Then
|
||||
OfferteArchivieren("Neuanlage")
|
||||
OfferteArchivieren()
|
||||
isNew = False
|
||||
End If
|
||||
|
||||
@@ -663,7 +676,8 @@ Public Class usrCntlOfferte
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
|
||||
End Class
|
||||
|
||||
Reference in New Issue
Block a user