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
2020-11-05 07:59:47 +01:00
parent dcb3cea10e
commit 3b532b0a10
37 changed files with 2804 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
View File

@@ -874,6 +874,15 @@ Public Class cQSAufträge
Property QS_Abfertigungsart_Anzahl As Integer = 0
End Class
Public Class cAvisoVorpapier
Property vp_AvisoId As Integer
Property vp_Art As String = "T1"
Property vp_Nr As String = ""
End Class
Public Class cAviso
Property AvisoID As Integer
Property Datum As Date
@@ -933,6 +942,7 @@ Public Class cAviso
Property Warenort As Boolean = False
Public VORPAPIERE As New List(Of cAvisoVorpapier)
Shared Function getAvisoById(hID, Optional hSQL = "") As cAviso
Dim AVISODAL As New cAvisoDAL
@@ -978,6 +988,22 @@ Public Class cAviso
End Sub
Sub LOAD_Vorpapiere()
If AvisoID <= 0 Then Exit Sub
VORPAPIERE.Clear()
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt = SQL.loadDgvBySql("SELECT * FROM tblAvisoVorpapier WHERE vp_AvisoId='" & AvisoID & "'", "AVISO")
If dt IsNot Nothing Then
For Each r In dt.Rows
Dim VP As New cAvisoVorpapier
VP.vp_AvisoId = AvisoID
VP.vp_Nr = r("vp_Nr")
VP.vp_Art = r("vp_Art")
VORPAPIERE.Add(VP)
Next
End If
End Sub
End Class
@@ -1448,6 +1474,22 @@ Public Class cAvisoDAL
End Function
Public Function SpeichernAvisoVorpapiere(ByVal AvisoId As Integer, VORPAPIERE As List(Of cAvisoVorpapier)) As Boolean
SpeichernAvisoVorpapiere = True
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
If SQL.doSQL("DELETE tblAvisoVorpapier WHERE [vp_AvisoId]='" & AvisoId & "'", "AVISO") Then
For Each VP In VORPAPIERE
If Not SQL.doSQL("INSERT INTO tblAvisoVorpapier (vp_AvisoId, vp_Art,vp_Nr) VALUES ('" & AvisoId & "','" & VP.vp_Art & "','" & VP.vp_Nr & "') ", "AVISO") Then SpeichernAvisoVorpapiere = False
Next
Else
SpeichernAvisoVorpapiere = True = False
End If
End Function
Public Function setQSAufträge(ByVal daten As List(Of cQSAufträge)) As Boolean
For Each d As cQSAufträge In daten
Dim conn As SqlConnection = cDatenbankAVISO.GetNewOpenConnection()

39
VERAG_PROG_ALLGEMEIN/Classes/cSendungen.vb
View File

@@ -89,6 +89,12 @@ Public Class cSendungen
Property tblSnd_AbklaerungTR As Object = Nothing
Property tblSnd_AbklaerungTR_MA As Object = Nothing
Property tblSnd_ATB_Nr As Object = Nothing
Property tblSnd_ATB_T1 As Object = Nothing
Property tblSnd_Vorpapier As Object = Nothing
Property tblSnd_Vorpapier_Pos As Object = Nothing
Public saveSachbearbeiter As Boolean = False
@@ -116,6 +122,22 @@ Public Class cSendungen
Dim SQL As New SQL
Shared Function VP_Enum(ByVal SENDUNG_LIST As List(Of cSendungen)) As List(Of String)
Dim list = New List(Of String)
If SENDUNG_LIST IsNot Nothing Then
For Each s In SENDUNG_LIST
If If(s.tblSnd_Vorpapier, "") <> "" Then
Dim found = False
For Each l In list
If l = s.tblSnd_Vorpapier Then found = True
Next
If found = False Then list.Add(s.tblSnd_Vorpapier)
End If
Next
End If
Return list
End Function
Shared Sub LOAD_LIST(ByRef SENDUNG_LIST As List(Of cSendungen), ByRef CURRENT_INDEX As Integer, AvisoId As Integer, Optional allowchangeCurrIndex As Boolean = True)
If SENDUNG_LIST Is Nothing Then SENDUNG_LIST = New List(Of cSendungen)
SENDUNG_LIST.Clear()
@@ -125,6 +147,15 @@ Public Class cSendungen
Next
If allowchangeCurrIndex Then CURRENT_INDEX = IIf(SENDUNG_LIST.Count > 0, 0, -1)
End Sub
Shared Sub LOAD_LIST_VP(ByRef SENDUNG_LIST As List(Of cSendungen), ByRef CURRENT_INDEX As Integer, AvisoId As Integer, Vorpapier As String, Optional allowchangeCurrIndex As Boolean = True)
If SENDUNG_LIST Is Nothing Then SENDUNG_LIST = New List(Of cSendungen)
SENDUNG_LIST.Clear()
Dim SQL As New SQL
For Each r In SQL.loadDgvBySql("SELECT tblSnd_SendungID FROM tblSendungen WHERE tblSnd_AvisoID=" & AvisoId & " AND tblSnd_Vorpapier='" & Vorpapier & "' ORDER BY tblSnd_PosUnterNr,tblSnd_SendungID", "AVISO").Rows
SENDUNG_LIST.Add(New VERAG_PROG_ALLGEMEIN.cSendungen(r("tblSnd_SendungID")))
Next
If allowchangeCurrIndex Then CURRENT_INDEX = IIf(SENDUNG_LIST.Count > 0, 0, -1)
End Sub
Public Sub New(tblSnd_AvisoID, currentHisId, Optional FilialenNr = Nothing, Optional AbfertigungsNr = Nothing, Optional UnterNr = Nothing, Optional tblSnd_anzahlHandling = Nothing)
Me.tblSnd_SendungID = -1
@@ -277,6 +308,10 @@ Public Class cSendungen
Me.VORSYSTEM_Id = SQL.checkNullReturnValue(dr.Item("VORSYSTEM_Id"), Nothing)
Me.tblSnd_AbklaerungTR = SQL.checkNullReturnValue(dr.Item("tblSnd_AbklaerungTR"), Nothing)
Me.tblSnd_AbklaerungTR_MA = SQL.checkNullReturnValue(dr.Item("tblSnd_AbklaerungTR_MA"), Nothing)
Me.tblSnd_ATB_Nr = SQL.checkNullReturnValue(dr.Item("tblSnd_ATB_Nr"), Nothing)
Me.tblSnd_ATB_T1 = SQL.checkNullReturnValue(dr.Item("tblSnd_ATB_T1"), Nothing)
Me.tblSnd_Vorpapier = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier"), Nothing)
Me.tblSnd_Vorpapier_Pos = SQL.checkNullReturnValue(dr.Item("tblSnd_Vorpapier_Pos"), Nothing)
End If
@@ -449,6 +484,10 @@ Public Class cSendungen
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VORSYSTEM_Id", VORSYSTEM_Id))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_AbklaerungTR", tblSnd_AbklaerungTR))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_AbklaerungTR_MA", tblSnd_AbklaerungTR_MA))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_ATB_Nr", tblSnd_ATB_Nr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_ATB_T1", tblSnd_ATB_T1))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier", tblSnd_Vorpapier))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("tblSnd_Vorpapier_Pos", tblSnd_Vorpapier_Pos))

39
VERAG_PROG_ALLGEMEIN/Classes/cSpeditionsbuch.vb
View File

@@ -361,6 +361,45 @@ Public Class cSpeditionsbuch
' Return Nothing
End Sub
Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False) As cSpeditionsbuch 'PROBLEM!
Try
Dim SPEDBUCH As New cSpeditionsbuch
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT TOP 1 * FROM Speditionsbuch WHERE ([AtlasBezNrEZA]=@bezugsNr OR [AtlasBezNrNCTS]=@bezugsNr )", conn)
cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each l In SPEDBUCH.getParameterList()
Dim propInfo As PropertyInfo = SPEDBUCH.GetType.GetProperty(l.Scalarvariable)
If dr.Item(l.Text) Is DBNull.Value Then
propInfo.SetValue(SPEDBUCH, Nothing)
Else
propInfo.SetValue(SPEDBUCH, dr.Item(l.Text))
End If
Next
If loadALL Then
SPEDBUCH.LOAD_VORKOSTEN()
SPEDBUCH.LOAD_ENDEMPFAENGER()
End If
dr.Close()
SPEDBUCH.hasEntry = True
Return SPEDBUCH
End If
dr.Close()
End Using
End Using
Catch ex As Exception
MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
End Try
Return Nothing
End Function
Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)

4
VERAG_PROG_ALLGEMEIN/Schnittstellen/VERAG/IN_EZA/cVERAG_in_eza.vb
View File

@@ -734,8 +734,8 @@ Public Class cVERAG_in_eza
Public Property ContainerNr3 As String = ""
Public Property ContainerNr4 As String = ""
Public Property FreightCostsEU As String = ""
Public Property FreightCostsNonEU As String = ""
Public Property FreightCostsEU As Object = Nothing
Public Property FreightCostsNonEU As Object = Nothing
Public Property POSITIONS As New List(Of cVERAG_in_eza_position)