From 444293a5646617e84e8bedfae39b366e54b3aa37 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 23 Jan 2025 22:30:28 +0100 Subject: [PATCH] EXG DB Tabelle Routine --- ADMIN.sln | 20 +-- DAKOSY_Worker/DAKOSY/ATLAS/EXG/cDakosyEXG.vb | 72 +++++------ DAKOSY_Worker/DAKOSY_Worker_lib.vbproj | 1 + MailSender/MailSender.vbproj | 4 - UID/ADMIN.vbproj | 6 - initATLASAufschubkonten/cWorker_AES_EXG.vb | 119 ++++++++++++++---- .../frmDYNachrichtenVerarbeitung.vb | 44 +++++++ 7 files changed, 187 insertions(+), 79 deletions(-) diff --git a/ADMIN.sln b/ADMIN.sln index fb63fbb..31502f9 100644 --- a/ADMIN.sln +++ b/ADMIN.sln @@ -23,8 +23,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ATILLA_Speditionsbuch", "AT EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DAKOSY_Worker_lib", "DAKOSY_Worker\DAKOSY_Worker_lib.vbproj", "{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MDM_Worker_lib", "MDM_Worker\MDM_Worker_lib.vbproj", "{2E4DBC09-E57B-4AC5-8554-6117D71F993B}" @@ -35,6 +33,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RKSV_DE", "RKSV_DE\RKSV_DE. EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MIC_Worker_lib", "MIC_Worker_lib\MIC_Worker_lib.vbproj", "{60833DC6-70ED-450A-B51F-4A953E67ADA0}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DAKOSY_Worker_lib", "DAKOSY_Worker\DAKOSY_Worker_lib.vbproj", "{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -123,14 +123,6 @@ Global {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|x64 - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|x64.ActiveCfg = Debug|Any CPU - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|x64.Build.0 = Debug|Any CPU - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|Any CPU.Build.0 = Release|Any CPU - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|x64.ActiveCfg = Release|Any CPU - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|x64.Build.0 = Release|Any CPU {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|Any CPU.Build.0 = Debug|Any CPU {5B947A66-009A-4BB6-B925-F84A01045095}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -171,6 +163,14 @@ Global {60833DC6-70ED-450A-B51F-4A953E67ADA0}.Release|Any CPU.Build.0 = Release|Any CPU {60833DC6-70ED-450A-B51F-4A953E67ADA0}.Release|x64.ActiveCfg = Release|Any CPU {60833DC6-70ED-450A-B51F-4A953E67ADA0}.Release|x64.Build.0 = Release|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|x64.ActiveCfg = Debug|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Debug|x64.Build.0 = Debug|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|Any CPU.Build.0 = Release|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|x64.ActiveCfg = Release|Any CPU + {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/EXG/cDakosyEXG.vb b/DAKOSY_Worker/DAKOSY/ATLAS/EXG/cDakosyEXG.vb index c6335ec..480937e 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/EXG/cDakosyEXG.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/EXG/cDakosyEXG.vb @@ -9,6 +9,7 @@ Public Class cDakosyEXG Property exg_dyaArt As String = "" Property exg_dyaAnmID As Integer + Property exg_Partnersystem As Object = Nothing Property exg_ANR As Object = Nothing Property exg_MRN As Object = Nothing @@ -371,6 +372,7 @@ Public Class cDakosyEXG list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("exg_Status_KEWILL_Equivalent", exg_Status_KEWILL_Equivalent)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("exg_dyaArt", exg_dyaArt)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("exg_dyaAnmID", exg_dyaAnmID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("exg_Partnersystem", exg_Partnersystem)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("exg_ANR", exg_ANR)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("exg_MRN", exg_MRN)) @@ -721,7 +723,7 @@ Public Class cDakosyEXG " Else " & " BEGIN " & getInsertCmd() & " End " & " commit tran " - + 'MsgBox(sqlstr) Dim exg_IdTMP = exg_Id exg_IdTMP = SQL.doSQLVarListID(exg_IdTMP, sqlstr, "FMZOLL", , list, , errHinweis) If exg_Id <= 0 Then exg_Id = exg_IdTMP @@ -842,41 +844,41 @@ Public Class cDakosyEXG End Function - Public Function LOADByAnmID(exg_dyaAnmID As String, loadALL As Boolean) As Boolean - Try - LOADByAnmID = False - If loadALL Then - exg_POSITION.Clear() - End If - Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EXG WHERE exg_dyaAnmID=@exg_dyaAnmID ", conn) - cmd.Parameters.AddWithValue("@exg_dyaAnmID", exg_dyaAnmID) - Dim dr = cmd.ExecuteReader() - If dr.Read Then - For Each l In getParameterList() - Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable) + 'Public Function LOADByBezugsNr(exg_ObjectName As String, loadALL As Boolean) As Boolean + ' Try + ' LOADByBezugsNr = False + ' If loadALL Then + ' exg_POSITION.Clear() + ' End If + ' Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + ' Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EXG WHERE exg_ObjectName=@exg_ObjectName ", conn) + ' cmd.Parameters.AddWithValue("@exg_ObjectName", exg_ObjectName) + ' Dim dr = cmd.ExecuteReader() + ' If dr.Read Then + ' For Each l In getParameterList() + ' Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable) - If dr.Item(l.Text) Is DBNull.Value Then - propInfo.SetValue(Me, Nothing) - Else - propInfo.SetValue(Me, dr.Item(l.Text)) - End If + ' If dr.Item(l.Text) Is DBNull.Value Then + ' propInfo.SetValue(Me, Nothing) + ' Else + ' propInfo.SetValue(Me, dr.Item(l.Text)) + ' End If - Next - If loadALL Then - LOAD_Position() - End If - LOADByAnmID = True - End If - dr.Close() - End Using - End Using - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - Return LOADByAnmID - End Function - Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean, Optional checkValidStatus As Boolean = False) As cDakosyEXG + ' Next + ' If loadALL Then + ' LOAD_Position() + ' End If + ' LOADByBezugsNr = True + ' End If + ' dr.Close() + ' End Using + ' End Using + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' End Try + ' Return LOADByBezugsNr + 'End Function + Shared Function LOADByBezugsNr(bezugsNr As String, loadALL As Boolean) As cDakosyEXG Try Dim EXG As New cDakosyEXG Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -884,7 +886,7 @@ Public Class cDakosyEXG Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() ' Using cmd As New SqlCommand("SELECT TOP 1 * FROM (SELECT * FROM tblDakosy_EXGOut WHERE exg_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND exg_status BETWEEN 40 and 90 ", "") & " ) AS T order by exg_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE exg_dyaAnmID=exg_dyaAnmID order by dySt_ts desc) desc,exg_LetzteBearbeitung desc ", conn) 'Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EXGOut WHERE exg_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND exg_status BETWEEN 40 and 90 ", "") & " order by exg_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] WHERE exg_dyaAnmID=exg_dyaAnmID order by dySt_ts desc) desc,exg_LetzteBearbeitung desc ", conn) - Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EXG WHERE exg_ObjectName LIKE @bezugsNr " & If(checkValidStatus, " AND exg_status BETWEEN 40 and 90 ", "") & " order by exg_LetzteBearbeitung desc", conn) + Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDakosy_EXG WHERE exg_ObjectName LIKE @bezugsNr order by exg_LetzteBearbeitung desc", conn) 'MsgBox("SELECT TOP 1 * FROM tblDakosy_EXGOut WHERE exg_ObjectName LIKE " & bezugsNr & " " & If(checkValidStatus, " AND exg_status BETWEEN 40 and 90 ", "") & " order by exg_status desc, (SELECT top 1 dySt_ts FROM [tblDakosy_Statusmeldungen] inner join tblDakosy_Zollanmeldungen on dy_id = dySt_dyId WHERE exg_dyaAnmID=dy_id order by dySt_ts desc) desc,exg_LetzteBearbeitung desc ") cmd.Parameters.AddWithValue("@bezugsNr", bezugsNr) Dim dr = cmd.ExecuteReader() diff --git a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj index 20b4c33..81f995f 100644 --- a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj +++ b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj @@ -88,6 +88,7 @@ + diff --git a/MailSender/MailSender.vbproj b/MailSender/MailSender.vbproj index 220e907..9f8df00 100644 --- a/MailSender/MailSender.vbproj +++ b/MailSender/MailSender.vbproj @@ -139,10 +139,6 @@ {a3b497bd-842c-4a2b-b398-ed1976849df1} VERAG_PROG_ALLGEMEIN - - {50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F} - DAKOSY_Worker_lib - {6eb4d3a4-3cf2-4651-9af9-ad5f727df403} ADMIN diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index c9f403b..b1bfd97 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -1134,12 +1134,6 @@ True - - - {50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f} - DAKOSY_Worker_lib - -