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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2021-09-14 13:00:45 +02:00
parent 0a0ac4a065
commit 13f28aa1d8
16 changed files with 373 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
VERAG_PROG_ALLGEMEIN/cAllgemein.vb
View File

@@ -19,7 +19,7 @@ Public Class cAllgemein
Public Shared AVISO_SERVER As String = "[SQLGUIDE01.verag.ost.dmn]" '"[SQLGUIDE01.verag.ost.dmn]"
Public Shared FMZOLL_SERVER As String = "[FMZOLL\SQLFMZOLL]" '"[SQLGUIDE01.verag.ost.dmn]"
'Public Shared FMZOLL_ATLAS_Datensicherung As String = "\\192.168.0.91\f\FMZoll\Datensicherung\atlas\atlas\fssouzb"
Public Shared FMZOLL_ATLAS_Datensicherung As String = "\\share01\F\FMZoll\Datensicherung\atlas\atlas\fssouzb"
Public Shared FMZOLL_ATLAS_Datensicherung_OLD As String = "\\share01\F\FMZoll\Datensicherung\atlas\atlas\fssouzb"
Public Shared BÜRO As String
@@ -54,6 +54,8 @@ Public Class cAllgemein
Shared SQL As New SQL
Public Shared MITARBEITER As cMitarbeiter
Public Shared FIRMEN As List(Of cFirmen)
Public Shared FILIALEN As List(Of cFilialen)
Public Const LeerDatum As Date = #12/30/1899# 'wird als leerer Datumswert verwendet, da sonst Probleme bei Null/Date
Public Shared Sub LOAD_DATA()
@@ -106,6 +108,8 @@ Public Class cAllgemein
End If
LOAD_PARAM()
LOAD_TRANSLATE()
LOAD_FIRMEN()
LOAD_FILIALEN()
If TESTSYSTEM Then
AVISO_SERVER = "[DEVELOPER\DEVSQL]"
FMZOLL_SERVER = "[DEVELOPER\DEVSQL]"
@@ -120,6 +124,12 @@ Public Class cAllgemein
Public Shared Sub LOAD_PARAM()
PARAMS = New cParameterList(PROGID, FIRMA)
End Sub
Public Shared Sub LOAD_FIRMEN()
FIRMEN = cFirmen.LOAD_LIST
End Sub
Public Shared Sub LOAD_FILIALEN()
FILIALEN = cFilialen.LOAD_LIST
End Sub
Public Shared Sub LOAD_TRANSLATE()
TRANSLATE = New cTranslate_LIST(PROGID)
@@ -249,7 +259,9 @@ Public Class cAllgemein
Public Shared Function getFirmaFromFiliale2(FilialenNr As Object, Optional usedefaultFirma As Boolean = True, Optional defaultFIRMA As String = "VERAG") As String
Dim FirmaTMP = ""
If FilialenNr IsNot Nothing AndAlso IsNumeric(FilialenNr) Then
FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE FilialenNr='" & FilialenNr & "' ", "FMZOLL")
' FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE FilialenNr='" & FilialenNr & "' ", "FMZOLL")
Dim FILIALE = FILIALEN.Find(Function(x) x.FilialenNr = FilialenNr)
If FILIALE IsNot Nothing Then FirmaTMP = If(FILIALE.Firma, "")
End If
If usedefaultFirma AndAlso FirmaTMP = "" Then FirmaTMP = defaultFIRMA
Return FirmaTMP
@@ -259,7 +271,9 @@ Public Class cAllgemein
Public Shared Function getFirmaFromFiliale(FilialenNr As Object, Optional defaultVERAG As Boolean = True) As String
Dim FirmaTMP = ""
If FilialenNr IsNot Nothing AndAlso IsNumeric(FilialenNr) Then
FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE FilialenNr='" & FilialenNr & "' AND ( Firma='" & FIRMA & "' OR Cluster='" & CLUSTER & "')", "FMZOLL")
' FirmaTMP = SQL.getValueTxtBySql("SELECT TOP 1 [Firma] FROM [Filialen] WHERE FilialenNr='" & FilialenNr & "' AND ( Firma='" & FIRMA & "' OR Cluster='" & CLUSTER & "')", "FMZOLL")
Dim FILIALE = FILIALEN.Find(Function(x) x.FilialenNr = FilialenNr And (x.Firma = FIRMA Or x.Cluster = CLUSTER))
If FILIALE IsNot Nothing Then FirmaTMP = If(FILIALE.Firma, "")
End If
If defaultVERAG AndAlso FirmaTMP = "" Then FirmaTMP = "VERAG"
Return FirmaTMP