From 1d3a50cf3c679fa7778334322e4a505b77295729 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 19 Oct 2022 09:47:25 +0200 Subject: [PATCH 1/3] Gesamtsicherheitspositionen --- SDL/My Project/AssemblyInfo.vb | 4 ++-- VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 0c9f977a..8904d736 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 11e6bb31..366cef84 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -334,7 +334,7 @@ - + From f078413d5cc7255c383d9dd85a92825207ef7c3e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 19 Oct 2022 17:05:11 +0200 Subject: [PATCH 2/3] Feature_Gesamtsicherheiten --- .../Classes/cGesamtsicherheitsPositionen.vb | 21 +++++++++++-------- VERAG_PROG_ALLGEMEIN/cSicherheiten.vb | 15 +++++++++++++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb index 75500cb2..c8e65ee3 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb @@ -22,9 +22,10 @@ Public Class cGesamtsicherheitsPositionen Dim SQL As New SQL - Sub New(gsp_gspPosId) + Sub New(gsp_gsId, gsp_gspPosId) + Me.gsp_gsId = gsp_gsId Me.gsp_gspPosId = gsp_gspPosId - LOAD() + 'LOAD() End Sub Sub New() @@ -33,7 +34,7 @@ Public Class cGesamtsicherheitsPositionen Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_gspPosId", gsp_gspPosId,, True)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_gspPosId", gsp_gspPosId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_gsId", gsp_gsId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_warenwert", gsp_warenwert)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_sicherheitsbetrag", gsp_sicherheitsbetrag)) @@ -54,20 +55,20 @@ Public Class cGesamtsicherheitsPositionen Public Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() - Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblGesamtsicherheitsPositionen] WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId ) " & + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblGesamtsicherheitsPositionen WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId ) " & " BEGIN " & getUpdateCmd() & " END " & " Else " & " BEGIN " & getInsertCmd() & " END " & " commit tran " - Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + Return SQL.doSQLVarList(sqlstr, "AVISO", , list) End Function Public Sub LOAD() Try hasEntry = False - Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheitsPositionen] WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId ", conn) + Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO() + Using cmd As New SqlCommand("SELECT * FROM tblGesamtsicherheitsPositionen WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId ", conn) cmd.Parameters.AddWithValue("@gsp_gspPosId", gsp_gspPosId) cmd.Parameters.AddWithValue("@gsp_gsId", gsp_gsId) Dim dr = cmd.ExecuteReader() @@ -105,7 +106,7 @@ Public Class cGesamtsicherheitsPositionen End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [[tblGesamtsicherheitsPositionen]] SET " & str & " WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId") + Return (" UPDATE [tblGesamtsicherheitsPositionen] SET " & str & " WHERE gsp_gspPosId=@gsp_gspPosId AND gsp_gsId=@gsp_gsId") Catch ex As Exception MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -135,7 +136,9 @@ Public Class cGesamtsicherheitsPositionen End Function - + Public Function Delete() + SQL.doSQL("delete from [tblGesamtsicherheitsPositionen] where gsp_gsId = '" & gsp_gsId & "' AND gsp_gspPosId = '" & gsp_gspPosId & "' ", "AVISO") + End Function End Class diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index 179baa7f..06394692 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -78,6 +78,21 @@ Public Class cSicherheiten Return SQL.doSQLVarList(sqlstr, "AVISO", , list) End Function + Public Function SAVEOBJECT() As Integer + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM [tblGesamtsicherheit] WHERE gs_gsId=@gs_gsId) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + gs_gsId = SQL.doSQLVarListID(gs_gsId, sqlstr, "AVISO", , list) + Return gs_gsId + End Function + + + Public Sub LOAD() Try hasEntry = False From 7e25fb4872b21ebf1207beb09204ff52e7e57794 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 21 Oct 2022 17:02:35 +0200 Subject: [PATCH 3/3] feature_gesamtsicherheiten --- .../Classes/cGesamtsicherheitsPositionen.vb | 7 ++++--- VERAG_PROG_ALLGEMEIN/cSicherheiten.vb | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb b/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb index c8e65ee3..82bafc58 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cGesamtsicherheitsPositionen.vb @@ -15,8 +15,7 @@ Public Class cGesamtsicherheitsPositionen Property gsp_abfertigungsNr As Object = Nothing Property gsp_ATCNr As Object = Nothing Property gsp_MRNNr As Object = Nothing - - + Property gsp_erstellungsdatum As DateTime Public hasEntry = False @@ -25,7 +24,7 @@ Public Class cGesamtsicherheitsPositionen Sub New(gsp_gsId, gsp_gspPosId) Me.gsp_gsId = gsp_gsId Me.gsp_gspPosId = gsp_gspPosId - 'LOAD() + LOAD() End Sub Sub New() @@ -46,6 +45,8 @@ Public Class cGesamtsicherheitsPositionen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_abfertigungsNr", gsp_abfertigungsNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_ATCNr", gsp_ATCNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_MRNNr", gsp_MRNNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gsp_erstellungsdatum", gsp_erstellungsdatum)) + Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index 06394692..141483a0 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -18,7 +18,7 @@ Public Class cSicherheiten Property gs_freitext As String Property gs_filialenNr As Integer Property gs_abfertigungsnr As String - Property gs_LKWID As String + Property gs_LKWKZ As String Property gs_atr As String = "" Property gs_warenort As String Property gs_warenwertFix As Object @@ -54,7 +54,7 @@ Public Class cSicherheiten list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_freitext", gs_freitext)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_filialenNr", gs_filialenNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_abfertigungsnr", gs_abfertigungsnr)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_LKWID", gs_LKWID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_LKWKZ", gs_LKWKZ)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_atr", gs_atr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_warenort", gs_warenort)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_warenwertFix", gs_warenwertFix))