Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO
This commit is contained in:
@@ -52,7 +52,7 @@ Public Class frmGesamtsicherheitenNEU
|
|||||||
Me.Text = "Gesamtsicherheit " & Standort
|
Me.Text = "Gesamtsicherheit " & Standort
|
||||||
|
|
||||||
|
|
||||||
cbx_Suche_Warenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
|
cbx_Suche_Warenort.fillWithSQL("SELECT [wo_warenort], [wo_bezeichnung] FROM [tblWarenorte] WHERE [wo_aktiv] ='1' ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
|
||||||
|
|
||||||
If setNullToZero(gessicherheitID) = "" Or Neu = True Then
|
If setNullToZero(gessicherheitID) = "" Or Neu = True Then
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ Public Class frmGesamtsicherheitenNEU
|
|||||||
panOverlay.Visible = True
|
panOverlay.Visible = True
|
||||||
|
|
||||||
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
|
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
|
||||||
cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_BezeichnungCBO] ", True, "AVISO", True)
|
cboWarenort.fillWithSQL("SELECT [wo_warenort], [wo_bezeichnung] FROM [tblWarenorte] WHERE [wo_aktiv] ='1' ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
|
||||||
|
|
||||||
If datum = Nothing Then datum = Date.Now
|
If datum = Nothing Then datum = Date.Now
|
||||||
nextGessicherheitID = -1
|
nextGessicherheitID = -1
|
||||||
@@ -766,7 +766,7 @@ Public Class frmGesamtsicherheitenNEU
|
|||||||
panOverlay.Visible = True
|
panOverlay.Visible = True
|
||||||
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
|
cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
|
||||||
cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
|
cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
|
||||||
cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
|
cboWarenort.fillWithSQL("SELECT [wo_warenort], [wo_bezeichnung] FROM [tblWarenorte] WHERE [wo_aktiv] ='1' ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
|
||||||
cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID)
|
cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID)
|
||||||
txtAbfertNum.Text = Me.Abfertigungsnummer
|
txtAbfertNum.Text = Me.Abfertigungsnummer
|
||||||
txtLKWID.Text = Me.LKWKZ
|
txtLKWID.Text = Me.LKWKZ
|
||||||
|
|||||||
Reference in New Issue
Block a user