Umbau Warenorte, Neues Feature Essensbestellungen, Sendungsvermerk bei GMVS
This commit is contained in:
@@ -10,8 +10,8 @@ Public Class frmWarenorte
|
||||
initDGVWarenort()
|
||||
cbxGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True)
|
||||
cbxGrenzstelle.changeItem("")
|
||||
cbxFirma.fillWithSQL("SELECT [Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('VERAG') ", False, "FMZOLL", True)
|
||||
cbxFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
|
||||
cbxFirma.fillWithSQL("SELECT [Firma_id],[Firma_Bez] FROM [tblFirma] WHERE ISNULL(Firma_Warenort,0) = 1 ", False, "FMZOLL", True)
|
||||
'cbxFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
|
||||
cbxFirmaChange.Items.AddRange(cbxFirma.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
|
||||
|
||||
End Sub
|
||||
@@ -21,7 +21,7 @@ Public Class frmWarenorte
|
||||
|
||||
lblWarning.Text = ""
|
||||
|
||||
Dim SQLString As String = "SELECT [wo_warenort] ,[wo_bezeichnung], [wo_aktiv], [wo_firma] FROM [tblWarenorte]"
|
||||
Dim SQLString As String = "SELECT [wo_id], [wo_warenort] ,[wo_bezeichnung], [wo_aktiv], [wo_firma] FROM [tblWarenorte]"
|
||||
Dim SQLWHere = ""
|
||||
If firma <> "" Then
|
||||
SQLWHere = " WHERE wo_firma = '" & firma & "'"
|
||||
@@ -40,30 +40,43 @@ Public Class frmWarenorte
|
||||
.RowHeadersVisible = False
|
||||
.ReadOnly = True
|
||||
.SelectionMode = DataGridViewSelectionMode.FullRowSelect
|
||||
.Columns("wo_id").Visible = False
|
||||
.Columns("wo_warenort").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("wo_warenort").HeaderText = "Warenort"
|
||||
.Columns("wo_bezeichnung").Visible = False
|
||||
.Columns("wo_aktiv").Visible = False
|
||||
'.Columns("wo_firma").Visible = False
|
||||
.Columns("wo_firma").HeaderText = "Firma"
|
||||
.Columns("wo_firma").Width = 70
|
||||
.Columns("wo_firma").Width = 100
|
||||
End With
|
||||
|
||||
|
||||
For Each row As DataGridViewRow In dgvWarenorteNew.Rows
|
||||
If Not IsDBNull(row.Cells("wo_aktiv").Value) Then
|
||||
If Not row.Cells("wo_aktiv").Value Then
|
||||
row.DefaultCellStyle.BackColor = Color.IndianRed
|
||||
|
||||
|
||||
If row.Cells("wo_firma").Value IsNot DBNull.Value AndAlso row.Cells("wo_firma").Value <> "" Then
|
||||
If CInt(row.Cells("wo_firma").Value) > 0 Then
|
||||
|
||||
Dim tmpFirma = New VERAG_PROG_ALLGEMEIN.cFirmen(row.Cells("wo_firma").Value)
|
||||
row.Cells("wo_firma").Value = tmpFirma.Firma_Bez.ToString
|
||||
End If
|
||||
End If
|
||||
|
||||
If Not IsDBNull(row.Cells("wo_aktiv").Value) Then
|
||||
If Not row.Cells("wo_aktiv").Value Then
|
||||
row.DefaultCellStyle.BackColor = Color.IndianRed
|
||||
End If
|
||||
End If
|
||||
|
||||
Next
|
||||
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
|
||||
|
||||
If checkIfFirmaIsFilled() = False Then Exit Sub
|
||||
If checkIfFirmaIsFilled(True) = False Then Exit Sub
|
||||
|
||||
Dim input = InputBox("Bitte geben Sie die Bezeichnung des neuen Warenorts ein:", "Warenort anlegen")
|
||||
If input <> "" Then
|
||||
@@ -76,6 +89,7 @@ Public Class frmWarenorte
|
||||
WarenortNew.wo_knnr = ""
|
||||
WarenortNew.wo_ort = ""
|
||||
WarenortNew.wo_reihenfolge = "-1"
|
||||
WarenortNew.wo_strasse = ""
|
||||
|
||||
If WarenortNew.SAVE() Then
|
||||
initDGVWarenort(cbxFirma._value)
|
||||
@@ -93,8 +107,10 @@ Public Class frmWarenorte
|
||||
Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
|
||||
If dgvWarenorteNew.SelectedRows.Count > 0 Then
|
||||
|
||||
If vbYes = MsgBox("Möchten Sie diesen Warenort " & dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value & " in " & dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value & " wirklich löschen?", vbYesNo) Then
|
||||
warenort.deleteWarenort(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value)
|
||||
Dim Warenort As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value)
|
||||
|
||||
If vbYes = MsgBox("Möchten Sie diesen Warenort " & Warenort.wo_warenort & " in " & Warenort.wo_firma & " wirklich löschen?", vbYesNo) Then
|
||||
Warenort.deleteWarenort(Warenort.wo_id)
|
||||
initDGVWarenort(cbxFirma._value)
|
||||
End If
|
||||
|
||||
@@ -105,7 +121,7 @@ Public Class frmWarenorte
|
||||
Private Function checkNameIsValid(name As String) As Boolean
|
||||
|
||||
If dgvWarenorteNew.Rows.Count = 0 Then Return True
|
||||
If checkIfFirmaIsFilled() = False Then Return False
|
||||
If checkIfFirmaIsFilled(False) = False Then Return False
|
||||
|
||||
|
||||
For Each row As DataGridViewRow In dgvWarenorteNew.Rows
|
||||
@@ -132,34 +148,26 @@ Public Class frmWarenorte
|
||||
|
||||
End If
|
||||
|
||||
Dim WarenortNew As cWarenorte
|
||||
Dim Warenort = New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value)
|
||||
|
||||
If dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Then
|
||||
WarenortNew = New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, DBNull.Value)
|
||||
Else
|
||||
WarenortNew = New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
txtWarenort.Text = WarenortNew.wo_warenort
|
||||
txtBezeichnung.Text = WarenortNew.wo_bezeichnung
|
||||
cbxAktiv.Checked = WarenortNew.wo_aktiv
|
||||
txtOrt.Text = WarenortNew.wo_ort
|
||||
cbxGrenzstelle.changeItem(WarenortNew.wo_grenzstelle)
|
||||
cbxFirmaChange.changeItem(WarenortNew.wo_firma)
|
||||
txtCluster.Text = WarenortNew.wo_cluster
|
||||
txtKennr.Text = WarenortNew.wo_knnr
|
||||
txtReihenfolge.Text = WarenortNew.wo_reihenfolge
|
||||
txtWarenort.Text = Warenort.wo_warenort
|
||||
txtBezeichnung.Text = Warenort.wo_bezeichnung
|
||||
cbxAktiv.Checked = Warenort.wo_aktiv
|
||||
txtOrt.Text = Warenort.wo_ort
|
||||
cbxGrenzstelle.changeItem(Warenort.wo_grenzstelle)
|
||||
cbxFirmaChange.changeItem(Warenort.wo_firma)
|
||||
txtCluster.Text = Warenort.wo_cluster
|
||||
txtKennr.Text = Warenort.wo_knnr
|
||||
txtReihenfolge.Text = Warenort.wo_reihenfolge
|
||||
txtStrasse.Text = Warenort.wo_strasse
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
|
||||
|
||||
checkIfFirmaIsFilled()
|
||||
|
||||
Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value)
|
||||
checkIfFirmaIsFilled(False)
|
||||
|
||||
Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value)
|
||||
|
||||
WarenortNew.wo_warenort = txtWarenort.Text
|
||||
WarenortNew.wo_bezeichnung = txtBezeichnung.Text
|
||||
@@ -170,6 +178,7 @@ Public Class frmWarenorte
|
||||
WarenortNew.wo_cluster = txtCluster.Text
|
||||
WarenortNew.wo_knnr = txtKennr.Text
|
||||
WarenortNew.wo_reihenfolge = txtReihenfolge.Text
|
||||
WarenortNew.wo_strasse = txtStrasse.Text
|
||||
|
||||
If cbxGrenzstelle._value = "" Then
|
||||
lblWarning.Text = "Grenzstelle muss ausgewählt werden!"
|
||||
@@ -193,13 +202,12 @@ Public Class frmWarenorte
|
||||
dgvWarenorteNew.SetOrder()
|
||||
End Sub
|
||||
|
||||
Private Function checkIfFirmaIsFilled()
|
||||
Private Function checkIfFirmaIsFilled(initialSave As Boolean)
|
||||
|
||||
|
||||
|
||||
If cbxFirma._value = "" Then
|
||||
If (dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing) Then
|
||||
|
||||
If (dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing) Or initialSave Then
|
||||
|
||||
lblWarning.Text = "Bitte Firma auswählen!"
|
||||
Return False
|
||||
|
||||
Reference in New Issue
Block a user