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
2019-11-26 14:39:09 +01:00
parent 490ef4a702
commit ca1cc4f8fa
52 changed files with 8152 additions and 4542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
View File

@@ -653,15 +653,20 @@ Public Class SQL
Return Nothing
End Function
Public Function getFMZOLLKdNrFromEORI(ByVal eori As String) As String
Dim s As String = ""
Function getFirmaWhere()
Dim where = ""
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : where &= " AND [FilialenNr]='5501' "
Case Else : where &= " AND isnull([FilialenNr],0)<>'5501' "
Case "UNISPED" : where &= " AND [FilialenNr]='5601' "
Case "AMBAR" : where &= " AND [FilialenNr]='5701' "
Case "FRONTOFFICE" : where &= " AND [FilialenNr]='5801' "
Case Else : where &= " AND isnull([FilialenNr],0) NOT IN ('5501','5601','5701','5801') "
End Select
Return where
End Function
Public Function getFMZOLLKdNrFromEORI(ByVal eori As String) As String
Dim s As String = ""
Dim where = getFirmaWhere()
Try
Dim conn As SqlConnection = GetNewOpenConnectionFMZOLL()
@@ -904,11 +909,7 @@ Public Class SQL
Public Function getATLASKdNrFromZollNr(ByVal ZollNr As String) As String
Dim s As String = ""
Dim where = ""
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : where &= " AND [FilialenNr]='5501' "
Case Else : where &= " AND isnull([FilialenNr],0)<>'5501' "
End Select
Dim where = getFirmaWhere()
Try
Dim conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL

10
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -61,9 +61,9 @@ Public Class cAdressen
Public Shared Function getHoechsteKdNr(NrKr_von As Integer, NrKr_bis As Integer) As Integer
Try
Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("select isnull(min([AdressenNr]) +1," & NrKr_von & ") as AdressenNr from [Adressen] a INNER JOIN Kunden ON Kundennr=adressennr where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' AND not exists ( select * from [Adressen] b where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' and a.[AdressenNr] +1 = b.[AdressenNr]) AND KundenNr NOT IN (([AdressenNr]) +1) ", conn)
Using cmd As New SqlCommand("select isnull(min([AdressenNr]) +1," & NrKr_von & ") as AdressenNr from [Adressen] a INNER JOIN Kunden ON Kundennr=adressennr where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' AND not exists ( select * from [Adressen] b where AdressenNr between '" & NrKr_von & "' AND '" & NrKr_bis & "' and a.[AdressenNr] +1 = b.[AdressenNr]) AND KundenNr NOT IN (([AdressenNr]) +1) ", conn)
'Using cmd As New SqlCommand("SELECT isnull(max([AdressenNr])," & NrKr_von & ") as AdressenNr FROM Adressen WHERE AdressenNr BETWEEN '" & NrKr_von & "' AND '" & NrKr_bis & "' ", conn)
Dim dr = cmd.ExecuteReader()
If dr.HasRows Then
@@ -176,7 +176,7 @@ Public Class cAdressen
Public Sub LOAD()
Dim test = ""
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("SELECT * FROM Adressen WHERE AdressenNr=@AdressenNr ", conn)
cmd.Parameters.AddWithValue("@AdressenNr", AdressenNr)
@@ -224,7 +224,7 @@ Public Class cAdressen
Public Function doesOrdnungsbegriffExist() As Boolean
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)
Using cmd As New SqlCommand("SELECT count(*) FROM Adressen WHERE Ordnungsbegriff=@Ordnungsbegriff ", conn)
cmd.Parameters.AddWithValue("@Ordnungsbegriff", Ordnungsbegriff)
@@ -263,7 +263,7 @@ Public Class cAdressen
End Function
Public Shared Function getNewAdressenNr752000() As Integer
Return (New SQL).getValueTxtBySql("SELECT isnull(MAX (Adressennr),752000)+1 FROM [VERAG].[dbo].[Adressen] where [AdressenNr]>752000 and [AdressenNr]<800000", "FMZOLL")
Return (New SQL).getValueTxtBySql("SELECT isnull(MAX (Adressennr),752000)+1 FROM [Adressen] where [AdressenNr]>752000 and [AdressenNr]<800000", "FMZOLL")
End Function
Public Function getInsertCmd() As String

9
VERAG_PROG_ALLGEMEIN/Classes/cAvisoAnhaenge.vb
View File

@@ -10,6 +10,9 @@ Public Class cAvisoAnhaenge
Property anh_Art As Object = Nothing
Property anh_Typ As String
Property anh_Reihenfolge As Integer = 99
Property anh_LaufzettelDruck As Boolean = False
Public hasEntry As Boolean = False
Dim SQL As New SQL
@@ -46,6 +49,7 @@ Public Class cAvisoAnhaenge
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Art", anh_Art))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Typ", anh_Typ))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_Reihenfolge", anh_Reihenfolge))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("anh_LaufzettelDruck", anh_LaufzettelDruck))
Return list
End Function
@@ -161,4 +165,9 @@ Public Class cAvisoAnhaenge
Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
End Function
Public Shared Function toggleLaufzettelDruck(id As Integer) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
Dim sqlstr = " UPDATE [tblAvisoAnhaenge] SET [anh_LaufzettelDruck] = 1 - [anh_LaufzettelDruck] WHERE anh_id=" & id
Return (New VERAG_PROG_ALLGEMEIN.SQL).doSQL(sqlstr, "AVISO")
End Function
End Class

2
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -50,6 +50,7 @@ Public Class cMitarbeiter
Property mit_AliasAD_Domain As Object = Nothing
Property mit_AliasAD_Username As Object = Nothing
Property mit_teamId As Object = Nothing
Sub New()
@@ -121,6 +122,7 @@ Public Class cMitarbeiter
If Not dr.Item("mit_TELOTEC_SB") Is DBNull.Value Then Me.mit_TELOTEC_SB = dr.Item("mit_TELOTEC_SB")
If Not dr.Item("mit_AliasAD_Domain") Is DBNull.Value Then Me.mit_AliasAD_Domain = dr.Item("mit_AliasAD_Domain")
If Not dr.Item("mit_AliasAD_Username") Is DBNull.Value Then Me.mit_AliasAD_Username = dr.Item("mit_AliasAD_Username")
If Not dr.Item("mit_teamId") Is DBNull.Value Then Me.mit_teamId = dr.Item("mit_teamId")

43
VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
View File

@@ -65,6 +65,15 @@ Public Class cSendungen
Property tblSnd_Warenwert As Object = Nothing
Property tblSnd_WarenwertWaehrung As Object = Nothing
Property tblSnd_Status As Integer = 0
Property tblSnd_Vorbereitet As Object = Nothing
Property tblSnd_Vorgeschrieben As Object = Nothing
Property LetzterMitarbeiter As Object = Nothing
Property LetzterMitarbeiterId As Object = Nothing
Property tblSnd_VG_MA As Object = Nothing
Property ABRECHNUNG As New List(Of cSendungAbrechnung)
Property HANDLING As New List(Of cSendHandling)
@@ -116,6 +125,13 @@ Public Class cSendungen
Me.tblSnd_inBearbeitung = False
Me.tblSnd_aufschub = ""
If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then
Me.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
End If
Me.LetzterMitarbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
Me.LetzterMitarbeiterId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
If FilialenNr IsNot Nothing Then Me.FilialenNr = FilialenNr
If AbfertigungsNr IsNot Nothing Then Me.AbfertigungsNr = AbfertigungsNr
If UnterNr IsNot Nothing Then Me.UnterNr = UnterNr
@@ -226,6 +242,13 @@ Public Class cSendungen
Me.tblSnd_Warenwert = SQL.checkNullReturnValue(dr.Item("tblSnd_Warenwert"), Nothing)
Me.tblSnd_WarenwertWaehrung = SQL.checkNullReturnValue(dr.Item("tblSnd_WarenwertWaehrung"), Nothing)
Me.tblSnd_Status = SQL.checkNullReturnValue(dr.Item("tblSnd_Status"), Nothing)
Me.tblSnd_Vorbereitet = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorbereitet"), Nothing)
Me.tblSnd_Vorgeschrieben = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorgeschrieben"), Nothing)
Me.LetzterMitarbeiter = SQL.checkNullReturnValue(dr.Item("LetzterMitarbeiter"), Nothing)
Me.LetzterMitarbeiterId = SQL.checkNullReturnValue(dr.Item("LetzterMitarbeiterId"), Nothing)
Me.tblSnd_VG_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_VG_MA"), Nothing)
End If
dr.Close()
@@ -291,6 +314,8 @@ Public Class cSendungen
a.sndhdg_abrArt = SQL.checkNullReturnValue(dr2.Item("sndhdg_abrArt"), Nothing)
a.sndhdg_nr = SQL.checkNullReturnValue(dr2.Item("sndhdg_nr"), Nothing)
a.sndhdg_colli = SQL.checkNullReturnValue(dr2.Item("sndhdg_colli"), 0)
a.sndhdg_gewicht = SQL.checkNullReturnValue(dr2.Item("sndhdg_gewicht"), 0)
Me.HANDLING.Add(a)
End While
dr2.Close()
@@ -369,6 +394,12 @@ Public Class cSendungen
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_ATCMRN_Fremd", tblSnd_ATCMRN_Fremd))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Warenwert", tblSnd_Warenwert))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_WarenwertWaehrung", tblSnd_WarenwertWaehrung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Status", tblSnd_Status))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorbereitet", tblSnd_Vorbereitet))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorgeschrieben", tblSnd_Vorgeschrieben))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LetzterMitarbeiter", LetzterMitarbeiter))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("LetzterMitarbeiterId", LetzterMitarbeiterId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_VG_MA", tblSnd_VG_MA))
Return list
@@ -537,6 +568,8 @@ Public Class cSendHandling
Property sndhdg_sendId As Integer = Nothing
Property sndhdg_abrArt As String = Nothing
Property sndhdg_nr As String = Nothing
Property sndhdg_colli As Double = 0
Property sndhdg_gewicht As Double = 0
Dim SQL As New SQL
@@ -545,16 +578,20 @@ Public Class cSendHandling
Me.sndhdg_sendId = sndhdg_sendId
End Sub
Sub New(sndhdg_sendId, sndabr_beteiligter, sndabr_abrArt, sndabr_wert)
Sub New(sndhdg_sendId, sndabr_beteiligter, sndabr_abrArt, sndabr_wert, sndhdg_colli, sndhdg_gewicht)
Me.sndhdg_sendId = sndhdg_sendId
Me.sndhdg_abrArt = sndhdg_abrArt
Me.sndhdg_nr = sndhdg_nr
Me.sndhdg_colli = sndhdg_colli
Me.sndhdg_gewicht = sndhdg_gewicht
End Sub
Sub New(sndhdg_sendId, sndhdg_abrArt, sndhdg_nr)
Sub New(sndhdg_sendId, sndhdg_abrArt, sndhdg_nr, sndhdg_colli, sndhdg_gewicht)
Me.sndhdg_sendId = sndhdg_sendId
Me.sndhdg_abrArt = sndhdg_abrArt
Me.sndhdg_nr = sndhdg_nr
Me.sndhdg_colli = sndhdg_colli
Me.sndhdg_gewicht = sndhdg_gewicht
End Sub
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
@@ -562,6 +599,8 @@ Public Class cSendHandling
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_sendId", sndhdg_sendId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_abrArt", sndhdg_abrArt))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_nr", sndhdg_nr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_colli", sndhdg_colli))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("sndhdg_gewicht", sndhdg_gewicht))
Return list
End Function