Bugfix -> Änderung NULL-Value bei Zufrieden in Besucherberichte
This commit is contained in:
@@ -1,16 +1,9 @@
|
||||
Imports System.ComponentModel
|
||||
Imports com.esendex.sdk
|
||||
Imports javax.validation.constraints
|
||||
Imports VERAG_PROG_ALLGEMEIN
|
||||
|
||||
Public Class frmBesuchsberichte
|
||||
Public Class frmBesuchsberichte
|
||||
|
||||
Public KdNr As Integer = -1
|
||||
Public bb_id As Integer = -1
|
||||
|
||||
|
||||
Dim BB As New VERAG_PROG_ALLGEMEIN.cBesuchsbericht
|
||||
|
||||
Sub New(bb_id, Optional kdNr = -1)
|
||||
|
||||
InitializeComponent()
|
||||
@@ -34,12 +27,11 @@ Public Class frmBesuchsberichte
|
||||
Else
|
||||
txtFirma.Enabled = True
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub frmBesuchsberichte_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
|
||||
kdFirma.initKdBox(Me)
|
||||
|
||||
cboKontaktart.Items.Clear()
|
||||
cboKontaktart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
|
||||
cboKontaktart.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Persönlich", "PERSON"))
|
||||
@@ -49,8 +41,8 @@ Public Class frmBesuchsberichte
|
||||
|
||||
cboZufrieden.Items.Clear()
|
||||
cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
|
||||
cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", True))
|
||||
cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", False))
|
||||
cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("JA", "True"))
|
||||
cboZufrieden.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEIN", "False"))
|
||||
cboZufrieden.changeItem("")
|
||||
|
||||
If KdNr > 0 Then
|
||||
@@ -71,17 +63,14 @@ Public Class frmBesuchsberichte
|
||||
UsrcntlPDFScanList1.Enabled = True
|
||||
'UsrcntlPDFScanList1.INIT(-1, "BESUCHSBERICHTE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, bb_id)
|
||||
UsrcntlPDFScanList1.INIT(BB.bb_KundenNr, "BESUCHSBERICHTE")
|
||||
|
||||
Else
|
||||
UsrcntlPDFScanList1.Enabled = False
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Sub setvalues(BB As VERAG_PROG_ALLGEMEIN.cBesuchsbericht)
|
||||
|
||||
kdFirma.Enabled = BB.bb_KundenNr <= 0
|
||||
kdFirma.KdNr = BB.bb_KundenNr
|
||||
datBesuchtAm._value = BB.bb_DatumBesuch
|
||||
@@ -104,12 +93,12 @@ Public Class frmBesuchsberichte
|
||||
cbxSprinter.Checked = BB.bb_LKW_Sprinter
|
||||
cbxSiloTank.Checked = BB.bb_LKW_SiloTank
|
||||
|
||||
|
||||
txtAuftraggeber.Text = If(BB.bb_Auftraggeber, "")
|
||||
txtTransportRoute.Text = If(BB.bb_Route, "")
|
||||
txtDerzeitigerLieferant.Text = If(BB.bb_DerzeitigerLieferant, "")
|
||||
cboZufrieden.changeItem(If(BB.bb_Zufrieden.ToString, Nothing))
|
||||
|
||||
'MsgBox("Before Set " & BB.bb_Zufrieden)
|
||||
cboZufrieden.changeItem(If(BB.bb_Zufrieden, ""))
|
||||
'MsgBox("After Set " & BB.bb_Zufrieden)
|
||||
|
||||
txtZufriedenNEIN.Text = If(BB.bb_ZufriedenNEIN, "")
|
||||
txtGarantie.Text = If(BB.bb_Garantie, "")
|
||||
@@ -149,14 +138,16 @@ Public Class frmBesuchsberichte
|
||||
BB.bb_Auftraggeber = txtAuftraggeber.Text
|
||||
BB.bb_Route = txtTransportRoute.Text
|
||||
BB.bb_DerzeitigerLieferant = txtDerzeitigerLieferant.Text
|
||||
'MsgBox("Before Get " & BB.bb_Zufrieden)
|
||||
BB.bb_Zufrieden = IIf(cboZufrieden._value = "", Nothing, cboZufrieden._value)
|
||||
'MsgBox("Before Get " & BB.bb_Zufrieden)
|
||||
|
||||
BB.bb_ZufriedenNEIN = txtZufriedenNEIN.Text
|
||||
BB.bb_Garantie = txtGarantie.Text
|
||||
BB.bb_Vermerk = txtVermerk.Text
|
||||
|
||||
BB.bb_Interesse_Zollabfertigung = cbxZollabfertigung.Checked
|
||||
BB.bb_Interesse_Brexit = cbxBrexit.Checked
|
||||
BB.bb_Interesse_Zollabfertigung = cbxBrexit.Checked
|
||||
BB.bb_Interesse_Parkplatz = cbxParkplatz.Checked
|
||||
BB.bb_Interesse_LagerUmschlag = cbxLagerUmschlag.Checked
|
||||
BB.bb_Interesse_Rola = cbxRola.Checked
|
||||
@@ -172,7 +163,6 @@ Public Class frmBesuchsberichte
|
||||
Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
|
||||
If getvalues(BB) Then
|
||||
UsrcntlPDFScanList1.Enabled = True
|
||||
btnPDFReport.Enabled = True
|
||||
'UsrcntlPDFScanList1.INIT(-1, "BESUCHSBERICHTE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, bb_id)
|
||||
UsrcntlPDFScanList1.INIT(BB.bb_KundenNr, "BESUCHSBERICHTE")
|
||||
End If
|
||||
@@ -180,7 +170,6 @@ Public Class frmBesuchsberichte
|
||||
|
||||
Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
|
||||
If getvalues(BB) Then
|
||||
btnPDFReport.Enabled = True
|
||||
Me.Close()
|
||||
End If
|
||||
End Sub
|
||||
@@ -221,8 +210,6 @@ Public Class frmBesuchsberichte
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ansprechpartner", BB.bb_Anpsprechpartner.ToString))
|
||||
|
||||
'list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firma", BB.bb_Firma.ToString))
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Firma", txtFirma.Text))
|
||||
|
||||
list.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Umatz", BB.bb_Umsatz)) 'ACHTUNG -> im Formular wurde das Feld "Umatz" benannt, nicht korrigieren!
|
||||
@@ -296,7 +283,7 @@ Public Class frmBesuchsberichte
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub kdFirma_PropertyChanged(sender As Object, e As PropertyChangedEventArgs) Handles kdFirma.PropertyChanged
|
||||
Private Sub kdFirma_PropertyChanged(sender As Object, e As EventArgs) Handles kdFirma.PropertyChanged
|
||||
|
||||
If kdFirma.KdNr_value > 0 AndAlso kdFirma.KdData_ADRESSEN IsNot Nothing AndAlso kdFirma.KdData_KUNDE IsNot Nothing Then
|
||||
|
||||
@@ -320,6 +307,6 @@ Public Class frmBesuchsberichte
|
||||
txtZufriedenNEIN.Clear()
|
||||
|
||||
End If
|
||||
End Sub
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
@@ -29,7 +29,7 @@ Public Class cBesuchsbericht
|
||||
Property bb_Auftraggeber As Object = Nothing
|
||||
Property bb_Route As Object = Nothing
|
||||
Property bb_DerzeitigerLieferant As Object = Nothing
|
||||
Property bb_Zufrieden As Boolean = Nothing
|
||||
Property bb_Zufrieden As Object = Nothing
|
||||
Property bb_ZufriedenNEIN As Object = Nothing
|
||||
Property bb_Garantie As Object = Nothing
|
||||
Property bb_Interesse_Zollabfertigung As Boolean = False
|
||||
|
||||
Reference in New Issue
Block a user