diff --git a/.vs/EDOKAApp/v16/.suo b/.vs/EDOKAApp/v16/.suo index 9355572..42a053b 100644 Binary files a/.vs/EDOKAApp/v16/.suo and b/.vs/EDOKAApp/v16/.suo differ diff --git a/BusinessFacade/bin/EDOKALib.BusinessFacade.dll b/BusinessFacade/bin/EDOKALib.BusinessFacade.dll index 7b65161..78928ed 100644 Binary files a/BusinessFacade/bin/EDOKALib.BusinessFacade.dll and b/BusinessFacade/bin/EDOKALib.BusinessFacade.dll differ diff --git a/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb b/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb index 3147c7e..02396a1 100644 Binary files a/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb and b/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb differ diff --git a/BusinessFacade/bin/EDOKALib.Common.dll b/BusinessFacade/bin/EDOKALib.Common.dll index e990118..789b226 100644 Binary files a/BusinessFacade/bin/EDOKALib.Common.dll and b/BusinessFacade/bin/EDOKALib.Common.dll differ diff --git a/BusinessFacade/bin/EDOKALib.Common.pdb b/BusinessFacade/bin/EDOKALib.Common.pdb index e0cbf48..adeaed5 100644 Binary files a/BusinessFacade/bin/EDOKALib.Common.pdb and b/BusinessFacade/bin/EDOKALib.Common.pdb differ diff --git a/BusinessFacade/bin/EDOKALib.DataAccess.dll b/BusinessFacade/bin/EDOKALib.DataAccess.dll index 7d43cab..912df00 100644 Binary files a/BusinessFacade/bin/EDOKALib.DataAccess.dll and b/BusinessFacade/bin/EDOKALib.DataAccess.dll differ diff --git a/BusinessFacade/bin/EDOKALib.DataAccess.pdb b/BusinessFacade/bin/EDOKALib.DataAccess.pdb index ad9044f..6f3b0e4 100644 Binary files a/BusinessFacade/bin/EDOKALib.DataAccess.pdb and b/BusinessFacade/bin/EDOKALib.DataAccess.pdb differ diff --git a/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache b/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache index cc66dfc..e46e0d2 100644 Binary files a/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache and b/BusinessFacade/obj/Debug/BusinessFacade.vbproj.AssemblyReference.cache differ diff --git a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll index 7b65161..78928ed 100644 Binary files a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll and b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll differ diff --git a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb index 3147c7e..02396a1 100644 Binary files a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb and b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb differ diff --git a/Common/bin/EDOKALib.Common.dll b/Common/bin/EDOKALib.Common.dll index e990118..789b226 100644 Binary files a/Common/bin/EDOKALib.Common.dll and b/Common/bin/EDOKALib.Common.dll differ diff --git a/Common/bin/EDOKALib.Common.pdb b/Common/bin/EDOKALib.Common.pdb index e0cbf48..adeaed5 100644 Binary files a/Common/bin/EDOKALib.Common.pdb and b/Common/bin/EDOKALib.Common.pdb differ diff --git a/Common/obj/Debug/EDOKALib.Common.dll b/Common/obj/Debug/EDOKALib.Common.dll index e990118..789b226 100644 Binary files a/Common/obj/Debug/EDOKALib.Common.dll and b/Common/obj/Debug/EDOKALib.Common.dll differ diff --git a/Common/obj/Debug/EDOKALib.Common.pdb b/Common/obj/Debug/EDOKALib.Common.pdb index e0cbf48..adeaed5 100644 Binary files a/Common/obj/Debug/EDOKALib.Common.pdb and b/Common/obj/Debug/EDOKALib.Common.pdb differ diff --git a/DataAccess/bin/EDOKALib.Common.dll b/DataAccess/bin/EDOKALib.Common.dll index e990118..789b226 100644 Binary files a/DataAccess/bin/EDOKALib.Common.dll and b/DataAccess/bin/EDOKALib.Common.dll differ diff --git a/DataAccess/bin/EDOKALib.Common.pdb b/DataAccess/bin/EDOKALib.Common.pdb index e0cbf48..adeaed5 100644 Binary files a/DataAccess/bin/EDOKALib.Common.pdb and b/DataAccess/bin/EDOKALib.Common.pdb differ diff --git a/DataAccess/bin/EDOKALib.DataAccess.dll b/DataAccess/bin/EDOKALib.DataAccess.dll index 7d43cab..912df00 100644 Binary files a/DataAccess/bin/EDOKALib.DataAccess.dll and b/DataAccess/bin/EDOKALib.DataAccess.dll differ diff --git a/DataAccess/bin/EDOKALib.DataAccess.pdb b/DataAccess/bin/EDOKALib.DataAccess.pdb index ad9044f..6f3b0e4 100644 Binary files a/DataAccess/bin/EDOKALib.DataAccess.pdb and b/DataAccess/bin/EDOKALib.DataAccess.pdb differ diff --git a/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache b/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache index 2c6f3f1..75c6e18 100644 Binary files a/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache and b/DataAccess/obj/Debug/DataAccess.vbproj.AssemblyReference.cache differ diff --git a/DataAccess/obj/Debug/EDOKALib.DataAccess.dll b/DataAccess/obj/Debug/EDOKALib.DataAccess.dll index 7d43cab..912df00 100644 Binary files a/DataAccess/obj/Debug/EDOKALib.DataAccess.dll and b/DataAccess/obj/Debug/EDOKALib.DataAccess.dll differ diff --git a/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb b/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb index ad9044f..6f3b0e4 100644 Binary files a/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb and b/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb differ diff --git a/EDOKA/DB/Generierte DB Objekte/clsBarcodeetikette.vb b/EDOKA/DB/Generierte DB Objekte/clsBarcodeetikette.vb index 04b757d..c5c4bd9 100644 --- a/EDOKA/DB/Generierte DB Objekte/clsBarcodeetikette.vb +++ b/EDOKA/DB/Generierte DB Objekte/clsBarcodeetikette.vb @@ -19,8 +19,8 @@ Namespace edokadb Private m_bAktiv As SqlBoolean Private m_daErstellt_am, m_daMutiert_am As SqlDateTime - Private m_iMutierer, m_iMandantnr, m_iBarcodenr As SqlInt32 - Private m_sDokumentid As SqlString + Private m_iMutierer, m_iMandantnr, m_iBarcodenr As SqlInt32 + Private m_sDokumentid As SqlString #End Region @@ -53,8 +53,8 @@ Namespace edokadb ' ///
  • iErrorCode
    • ' /// ' /// - Overrides Public Function Insert() As Boolean - Dim scmCmdToExecute As SqlCommand = New SqlCommand() + Public Overrides Function Insert() As Boolean + Dim scmCmdToExecute As SqlCommand = New SqlCommand() scmCmdToExecute.CommandText = "dbo.[pr_barcodeetikette_Insert]" scmCmdToExecute.CommandType = CommandType.StoredProcedure @@ -69,7 +69,7 @@ Namespace edokadb scmCmdToExecute.Parameters.Add(New SqlParameter("@daerstellt_am", SqlDbType.DateTime, 8, ParameterDirection.Input, True, 23, 3, "", DataRowVersion.Proposed, m_daErstellt_am)) scmCmdToExecute.Parameters.Add(New SqlParameter("@damutiert_am", SqlDbType.DateTime, 8, ParameterDirection.Input, True, 23, 3, "", DataRowVersion.Proposed, m_daMutiert_am)) scmCmdToExecute.Parameters.Add(New SqlParameter("@imutierer", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, m_iMutierer)) - scmCmdToExecute.Parameters.Add(new SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) + scmCmdToExecute.Parameters.Add(New SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) If m_bMainConnectionIsCreatedLocal Then ' // Open connection. @@ -82,7 +82,7 @@ Namespace edokadb ' // Execute query. scmCmdToExecute.ExecuteNonQuery() - m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) + m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then ' // Throw error. @@ -92,7 +92,7 @@ Namespace edokadb Return True Catch ex As Exception ' // some error occured. Bubble it to caller and encapsulate Exception object - Throw New Exception("clsBarcodeetikette::Insert::Error occured." + ex.Message, ex) + Throw New Exception("clsBarcodeetikette::Insert::Error occured." + ex.Message, ex) Finally If m_bMainConnectionIsCreatedLocal Then ' // Close connection. @@ -123,8 +123,8 @@ Namespace edokadb ' ///
  • iErrorCode
    • ' /// ' /// - Overrides Public Function Update() As Boolean - Dim scmCmdToExecute As SqlCommand = New SqlCommand() + Public Overrides Function Update() As Boolean + Dim scmCmdToExecute As SqlCommand = New SqlCommand() scmCmdToExecute.CommandText = "dbo.[pr_barcodeetikette_Update]" scmCmdToExecute.CommandType = CommandType.StoredProcedure @@ -139,7 +139,7 @@ Namespace edokadb scmCmdToExecute.Parameters.Add(New SqlParameter("@daerstellt_am", SqlDbType.DateTime, 8, ParameterDirection.Input, True, 23, 3, "", DataRowVersion.Proposed, m_daErstellt_am)) scmCmdToExecute.Parameters.Add(New SqlParameter("@damutiert_am", SqlDbType.DateTime, 8, ParameterDirection.Input, True, 23, 3, "", DataRowVersion.Proposed, m_daMutiert_am)) scmCmdToExecute.Parameters.Add(New SqlParameter("@imutierer", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, m_iMutierer)) - scmCmdToExecute.Parameters.Add(new SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) + scmCmdToExecute.Parameters.Add(New SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) If m_bMainConnectionIsCreatedLocal Then ' // Open connection. @@ -152,83 +152,83 @@ Namespace edokadb ' // Execute query. scmCmdToExecute.ExecuteNonQuery() - m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) - - If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then - ' // Throw error. - Throw New Exception("Stored Procedure 'pr_barcodeetikette_Update' reported the ErrorCode: " & m_iErrorCode.ToString()) - End If - - Return True - Catch ex As Exception - ' // some error occured. Bubble it to caller and encapsulate Exception object - Throw New Exception("clsBarcodeetikette::Update::Error occured.", ex) - Finally - If m_bMainConnectionIsCreatedLocal Then - ' // Close connection. - m_scoMainConnection.Close() - End If - scmCmdToExecute.Dispose() - End Try - End Function - - - ' /// - ' /// Purpose: Delete method. This method will Delete one existing row in the database, based on the Primary Key. - ' /// - ' /// True if succeeded, otherwise an Exception is thrown. - ' /// - ' /// Properties needed for this method: - ' /// - ' /// Properties set after a succesful call of this method: - ' /// - ' /// - Public Overrides Function Delete() As Boolean - Dim scmCmdToExecute As SqlCommand = New SqlCommand() - scmCmdToExecute.CommandText = "dbo.[pr_barcodeetikette_Delete]" - scmCmdToExecute.CommandType = CommandType.StoredProcedure - - ' // Use base class' connection object - scmCmdToExecute.Connection = m_scoMainConnection - - Try - scmCmdToExecute.Parameters.Add(New SqlParameter("@ibarcodenr", SqlDbType.Int, 4, ParameterDirection.Input, False, 10, 0, "", DataRowVersion.Proposed, m_iBarcodenr)) - scmCmdToExecute.Parameters.Add(New SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) - - If m_bMainConnectionIsCreatedLocal Then - ' // Open connection. - m_scoMainConnection.Open() - Else - If m_cpMainConnectionProvider.bIsTransactionPending Then - scmCmdToExecute.Transaction = m_cpMainConnectionProvider.stCurrentTransaction - End If - End If - - ' // Execute query. - scmCmdToExecute.ExecuteNonQuery() - m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) - - If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then - ' // Throw error. - Throw New Exception("Stored Procedure 'pr_barcodeetikette_Delete' reported the ErrorCode: " & m_iErrorCode.ToString()) - End If - - Return True - Catch ex As Exception - ' // some error occured. Bubble it to caller and encapsulate Exception object - Throw New Exception("clsBarcodeetikette::Delete::Error occured.", ex) - Finally - If m_bMainConnectionIsCreatedLocal Then - ' // Close connection. - m_scoMainConnection.Close() - End If - scmCmdToExecute.Dispose() - End Try - End Function + m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) + + If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then + ' // Throw error. + Throw New Exception("Stored Procedure 'pr_barcodeetikette_Update' reported the ErrorCode: " & m_iErrorCode.ToString()) + End If + + Return True + Catch ex As Exception + ' // some error occured. Bubble it to caller and encapsulate Exception object + Throw New Exception("clsBarcodeetikette::Update::Error occured.", ex) + Finally + If m_bMainConnectionIsCreatedLocal Then + ' // Close connection. + m_scoMainConnection.Close() + End If + scmCmdToExecute.Dispose() + End Try + End Function + + + ' /// + ' /// Purpose: Delete method. This method will Delete one existing row in the database, based on the Primary Key. + ' /// + ' /// True if succeeded, otherwise an Exception is thrown. + ' /// + ' /// Properties needed for this method: + ' /// + ' /// Properties set after a succesful call of this method: + ' /// + ' /// + Public Overrides Function Delete() As Boolean + Dim scmCmdToExecute As SqlCommand = New SqlCommand() + scmCmdToExecute.CommandText = "dbo.[pr_barcodeetikette_Delete]" + scmCmdToExecute.CommandType = CommandType.StoredProcedure + + ' // Use base class' connection object + scmCmdToExecute.Connection = m_scoMainConnection + + Try + scmCmdToExecute.Parameters.Add(New SqlParameter("@ibarcodenr", SqlDbType.Int, 4, ParameterDirection.Input, False, 10, 0, "", DataRowVersion.Proposed, m_iBarcodenr)) + scmCmdToExecute.Parameters.Add(New SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) + + If m_bMainConnectionIsCreatedLocal Then + ' // Open connection. + m_scoMainConnection.Open() + Else + If m_cpMainConnectionProvider.bIsTransactionPending Then + scmCmdToExecute.Transaction = m_cpMainConnectionProvider.stCurrentTransaction + End If + End If + + ' // Execute query. + scmCmdToExecute.ExecuteNonQuery() + m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) + + If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then + ' // Throw error. + Throw New Exception("Stored Procedure 'pr_barcodeetikette_Delete' reported the ErrorCode: " & m_iErrorCode.ToString()) + End If + + Return True + Catch ex As Exception + ' // some error occured. Bubble it to caller and encapsulate Exception object + Throw New Exception("clsBarcodeetikette::Delete::Error occured.", ex) + Finally + If m_bMainConnectionIsCreatedLocal Then + ' // Close connection. + m_scoMainConnection.Close() + End If + scmCmdToExecute.Dispose() + End Try + End Function ' /// @@ -253,19 +253,108 @@ Namespace edokadb ' /// ' /// Will fill all properties corresponding with a field in the table with the value of the row selected. ' /// - Overrides Public Function SelectOne() As DataTable + Public Overrides Function SelectOne() As DataTable Dim scmCmdToExecute As SqlCommand = New SqlCommand() scmCmdToExecute.CommandText = "dbo.[pr_barcodeetikette_SelectOne]" scmCmdToExecute.CommandType = CommandType.StoredProcedure - Dim dtToReturn As DataTable = new DataTable("barcodeetikette") - Dim sdaAdapter As SqlDataAdapter = new SqlDataAdapter(scmCmdToExecute) + Dim dtToReturn As DataTable = New DataTable("barcodeetikette") + Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute) ' // Use base class' connection object scmCmdToExecute.Connection = m_scoMainConnection Try - scmCmdToExecute.Parameters.Add(new SqlParameter("@ibarcodenr", SqlDbType.Int, 4, ParameterDirection.Input, False, 10, 0, "", DataRowVersion.Proposed, m_iBarcodenr)) - scmCmdToExecute.Parameters.Add(new SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) + scmCmdToExecute.Parameters.Add(New SqlParameter("@ibarcodenr", SqlDbType.Int, 4, ParameterDirection.Input, False, 10, 0, "", DataRowVersion.Proposed, m_iBarcodenr)) + scmCmdToExecute.Parameters.Add(New SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) + + If m_bMainConnectionIsCreatedLocal Then + ' // Open connection. + m_scoMainConnection.Open() + Else + If m_cpMainConnectionProvider.bIsTransactionPending Then + scmCmdToExecute.Transaction = m_cpMainConnectionProvider.stCurrentTransaction + End If + End If + + ' // Execute query. + sdaAdapter.Fill(dtToReturn) + m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) + + If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then + ' // Throw error. + Throw New Exception("Stored Procedure 'pr_barcodeetikette_SelectOne' reported the ErrorCode: " & m_iErrorCode.ToString()) + End If + + If dtToReturn.Rows.Count > 0 Then + m_iBarcodenr = New SqlInt32(CType(dtToReturn.Rows(0)("barcodenr"), Integer)) + If dtToReturn.Rows(0)("dokumentid") Is System.DBNull.Value Then + m_sDokumentid = SqlString.Null + Else + m_sDokumentid = New SqlString(CType(dtToReturn.Rows(0)("dokumentid"), String)) + End If + If dtToReturn.Rows(0)("mandantnr") Is System.DBNull.Value Then + m_iMandantnr = SqlInt32.Null + Else + m_iMandantnr = New SqlInt32(CType(dtToReturn.Rows(0)("mandantnr"), Integer)) + End If + If dtToReturn.Rows(0)("aktiv") Is System.DBNull.Value Then + m_bAktiv = SqlBoolean.Null + Else + m_bAktiv = New SqlBoolean(CType(dtToReturn.Rows(0)("aktiv"), Boolean)) + End If + If dtToReturn.Rows(0)("erstellt_am") Is System.DBNull.Value Then + m_daErstellt_am = SqlDateTime.Null + Else + m_daErstellt_am = New SqlDateTime(CType(dtToReturn.Rows(0)("erstellt_am"), Date)) + End If + If dtToReturn.Rows(0)("mutiert_am") Is System.DBNull.Value Then + m_daMutiert_am = SqlDateTime.Null + Else + m_daMutiert_am = New SqlDateTime(CType(dtToReturn.Rows(0)("mutiert_am"), Date)) + End If + If dtToReturn.Rows(0)("mutierer") Is System.DBNull.Value Then + m_iMutierer = SqlInt32.Null + Else + m_iMutierer = New SqlInt32(CType(dtToReturn.Rows(0)("mutierer"), Integer)) + End If + End If + Return dtToReturn + Catch ex As Exception + ' // some error occured. Bubble it to caller and encapsulate Exception object + Throw New Exception("clsBarcodeetikette::SelectOne::Error occured.", ex) + Finally + If m_bMainConnectionIsCreatedLocal Then + ' // Close connection. + m_scoMainConnection.Close() + End If + scmCmdToExecute.Dispose() + sdaAdapter.Dispose() + End Try + End Function + + + ' /// + ' /// Purpose: SelectAll method. This method will Select all rows from the table. + ' /// + ' /// DataTable object if succeeded, otherwise an Exception is thrown. + ' /// + ' /// Properties set after a succesful call of this method: + ' /// + ' /// + Public Overrides Function SelectAll() As DataTable + Dim scmCmdToExecute As SqlCommand = New SqlCommand() + scmCmdToExecute.CommandText = "dbo.[pr_barcodeetikette_SelectAll]" + scmCmdToExecute.CommandType = CommandType.StoredProcedure + Dim dtToReturn As DataTable = New DataTable("barcodeetikette") + Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute) + + ' // Use base class' connection object + scmCmdToExecute.Connection = m_scoMainConnection + + Try + scmCmdToExecute.Parameters.Add(New SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) If m_bMainConnectionIsCreatedLocal Then ' // Open connection. @@ -278,115 +367,26 @@ Namespace edokadb ' // Execute query. sdaAdapter.Fill(dtToReturn) - m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) - - If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then - ' // Throw error. - Throw New Exception("Stored Procedure 'pr_barcodeetikette_SelectOne' reported the ErrorCode: " & m_iErrorCode.ToString()) - End If - - If dtToReturn.Rows.Count > 0 Then - m_iBarcodenr = New SqlInt32(CType(dtToReturn.Rows(0)("barcodenr"), Integer)) - If dtToReturn.Rows(0)("dokumentid") Is System.DBNull.Value Then - m_sDokumentid = SqlString.Null - Else - m_sDokumentid = New SqlString(CType(dtToReturn.Rows(0)("dokumentid"), String)) - End If - If dtToReturn.Rows(0)("mandantnr") Is System.DBNull.Value Then - m_iMandantnr = SqlInt32.Null - Else - m_iMandantnr = New SqlInt32(CType(dtToReturn.Rows(0)("mandantnr"), Integer)) - End If - If dtToReturn.Rows(0)("aktiv") Is System.DBNull.Value Then - m_bAktiv = SqlBoolean.Null - Else - m_bAktiv = New SqlBoolean(CType(dtToReturn.Rows(0)("aktiv"), Boolean)) - End If - If dtToReturn.Rows(0)("erstellt_am") Is System.DBNull.Value Then - m_daErstellt_am = SqlDateTime.Null - Else - m_daErstellt_am = New SqlDateTime(CType(dtToReturn.Rows(0)("erstellt_am"), Date)) - End If - If dtToReturn.Rows(0)("mutiert_am") Is System.DBNull.Value Then - m_daMutiert_am = SqlDateTime.Null - Else - m_daMutiert_am = New SqlDateTime(CType(dtToReturn.Rows(0)("mutiert_am"), Date)) - End If - If dtToReturn.Rows(0)("mutierer") Is System.DBNull.Value Then - m_iMutierer = SqlInt32.Null - Else - m_iMutierer = New SqlInt32(CType(dtToReturn.Rows(0)("mutierer"), Integer)) - End If - End If - Return dtToReturn - Catch ex As Exception - ' // some error occured. Bubble it to caller and encapsulate Exception object - Throw New Exception("clsBarcodeetikette::SelectOne::Error occured.", ex) - Finally - If m_bMainConnectionIsCreatedLocal Then - ' // Close connection. - m_scoMainConnection.Close() - End If - scmCmdToExecute.Dispose() - sdaAdapter.Dispose() - End Try - End Function - - - ' /// - ' /// Purpose: SelectAll method. This method will Select all rows from the table. - ' /// - ' /// DataTable object if succeeded, otherwise an Exception is thrown. - ' /// - ' /// Properties set after a succesful call of this method: - ' /// - ' /// - Public Overrides Function SelectAll() As DataTable - Dim scmCmdToExecute As SqlCommand = New SqlCommand() - scmCmdToExecute.CommandText = "dbo.[pr_barcodeetikette_SelectAll]" - scmCmdToExecute.CommandType = CommandType.StoredProcedure - Dim dtToReturn As DataTable = New DataTable("barcodeetikette") - Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute) - - ' // Use base class' connection object - scmCmdToExecute.Connection = m_scoMainConnection - - Try - scmCmdToExecute.Parameters.Add(New SqlParameter("@iErrorCode", SqlDbType.Int, 4, ParameterDirection.Output, True, 10, 0, "", DataRowVersion.Proposed, m_iErrorCode)) - - If m_bMainConnectionIsCreatedLocal Then - ' // Open connection. - m_scoMainConnection.Open() - Else - If m_cpMainConnectionProvider.bIsTransactionPending Then - scmCmdToExecute.Transaction = m_cpMainConnectionProvider.stCurrentTransaction - End If - End If - - ' // Execute query. - sdaAdapter.Fill(dtToReturn) - m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) - - If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then - ' // Throw error. - Throw New Exception("Stored Procedure 'pr_barcodeetikette_SelectAll' reported the ErrorCode: " & m_iErrorCode.ToString()) - End If - - Return dtToReturn - Catch ex As Exception - ' // some error occured. Bubble it to caller and encapsulate Exception object - Throw New Exception("clsBarcodeetikette::SelectAll::Error occured.", ex) - Finally - If m_bMainConnectionIsCreatedLocal Then - ' // Close connection. - m_scoMainConnection.Close() - End If - scmCmdToExecute.Dispose() - sdaAdapter.Dispose() - End Try - End Function + m_iErrorCode = New SqlInt32(CType(scmCmdToExecute.Parameters.Item("@iErrorCode").Value, SqlInt32)) + + If Not m_iErrorCode.Equals(New SqlInt32(LLBLError.AllOk)) Then + ' // Throw error. + Throw New Exception("Stored Procedure 'pr_barcodeetikette_SelectAll' reported the ErrorCode: " & m_iErrorCode.ToString()) + End If + + Return dtToReturn + Catch ex As Exception + ' // some error occured. Bubble it to caller and encapsulate Exception object + Throw New Exception("clsBarcodeetikette::SelectAll::Error occured.", ex) + Finally + If m_bMainConnectionIsCreatedLocal Then + ' // Close connection. + m_scoMainConnection.Close() + End If + scmCmdToExecute.Dispose() + sdaAdapter.Dispose() + End Try + End Function #Region " Class Property Declarations " diff --git a/EDOKA/EDEX/Banklagernd/frmBLDruck.resx b/EDOKA/EDEX/Banklagernd/frmBLDruck.resx index 03d3192..66f3957 100644 --- a/EDOKA/EDEX/Banklagernd/frmBLDruck.resx +++ b/EDOKA/EDEX/Banklagernd/frmBLDruck.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADK - DwAAAk1TRnQBSQFMAgEBCQEAARwBAQEcAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBCQEAASQBAQEkAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -262,7 +262,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>Style6{}EvenRow{BackColor:White;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style13{}Style9{}OddRow{BackColor:224, 224, 224;}Style1{}Style5{}FilterBar{}Normal{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style2{}Editor{}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}RecordSelector{AlignImage:Center;}Footer{}Style10{AlignHorz:Near;}Style12{}Style3{}Style7{}Style4{}Caption{AlignHorz:Center;}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style11{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.DropdownView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>76</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 36, 76</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.DropdownView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 38, 78</ClientArea></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>Style6{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}EvenRow{BackColor:White;}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style13{}Style9{}OddRow{BackColor:224, 224, 224;}Style1{}Style5{}FilterBar{}Normal{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Editor{}HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}RecordSelector{AlignImage:Center;}Footer{}Style12{}Style3{}Style7{}Style4{}Caption{AlignHorz:Center;}Style11{}Heading{Wrap:True;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style10{AlignHorz:Near;}Style2{}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.DropdownView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" RecordSelectors="False" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>76</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 36, 76</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.DropdownView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 38, 78</ClientArea></Blob> 504, 141 @@ -304,7 +304,7 @@ - <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}FilterBar{BackColor:255, 255, 192;}Heading{AlignVert:Center;Border:Raised,,1, 1, 1, 1;ForeColor:ControlText;BackColor:Control;Wrap:True;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style6{}Style1{}Caption{AlignHorz:Center;}Style2{}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>257</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 422, 257</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 424, 259</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> + <?xml version="1.0"?><Blob><Styles type="C1.Win.C1TrueDBGrid.Design.ContextWrapper"><Data>HighlightRow{ForeColor:HighlightText;BackColor:Highlight;}Style8{}Style7{}Style2{}EvenRow{BackColor:White;}Normal{}RecordSelector{AlignImage:Center;}Inactive{ForeColor:InactiveCaptionText;BackColor:InactiveCaption;}OddRow{BackColor:224, 224, 224;}Style14{}Footer{}Heading{Wrap:True;Border:Raised,,1, 1, 1, 1;AlignVert:Center;BackColor:Control;ForeColor:ControlText;}Style5{}Editor{}Style10{AlignHorz:Near;}Style3{}Selected{ForeColor:HighlightText;BackColor:Highlight;}Style15{}Style13{}Style12{}Style11{}Style4{}Style9{}Group{Border:None,,0, 0, 0, 0;AlignVert:Center;BackColor:ControlDark;}Style1{}Caption{AlignHorz:Center;}Style6{}FilterBar{BackColor:255, 255, 192;}</Data></Styles><Splits><C1.Win.C1TrueDBGrid.MergeView Name="" AlternatingRowStyle="True" CaptionHeight="17" ColumnCaptionHeight="17" ColumnFooterHeight="17" MarqueeStyle="DottedCellBorder" RecordSelectorWidth="17" DefRecSelWidth="17" VerticalScrollGroup="1" HorizontalScrollGroup="1"><Height>257</Height><CaptionStyle parent="Style2" me="Style10" /><EditorStyle parent="Editor" me="Style5" /><EvenRowStyle parent="EvenRow" me="Style8" /><FilterBarStyle parent="FilterBar" me="Style13" /><FooterStyle parent="Footer" me="Style3" /><GroupStyle parent="Group" me="Style12" /><HeadingStyle parent="Heading" me="Style2" /><HighLightRowStyle parent="HighlightRow" me="Style7" /><InactiveStyle parent="Inactive" me="Style4" /><OddRowStyle parent="OddRow" me="Style9" /><RecordSelectorStyle parent="RecordSelector" me="Style11" /><SelectedStyle parent="Selected" me="Style6" /><Style parent="Normal" me="Style1" /><ClientRect>0, 0, 422, 257</ClientRect><BorderSide>0</BorderSide></C1.Win.C1TrueDBGrid.MergeView></Splits><NamedStyles><Style parent="" me="Normal" /><Style parent="Normal" me="Heading" /><Style parent="Heading" me="Footer" /><Style parent="Heading" me="Caption" /><Style parent="Heading" me="Inactive" /><Style parent="Normal" me="Selected" /><Style parent="Normal" me="Editor" /><Style parent="Normal" me="HighlightRow" /><Style parent="Normal" me="EvenRow" /><Style parent="Normal" me="OddRow" /><Style parent="Heading" me="RecordSelector" /><Style parent="Normal" me="FilterBar" /><Style parent="Caption" me="Group" /></NamedStyles><vertSplits>1</vertSplits><horzSplits>1</horzSplits><Layout>None</Layout><DefaultRecSelWidth>17</DefaultRecSelWidth><ClientArea>0, 0, 424, 259</ClientArea><PrintPageHeaderStyle parent="" me="Style14" /><PrintPageFooterStyle parent="" me="Style15" /></Blob> diff --git a/EDOKA/Office/WordLib.vb b/EDOKA/Office/WordLib.vb index 719c9c8..2af49c0 100644 --- a/EDOKA/Office/WordLib.vb +++ b/EDOKA/Office/WordLib.vb @@ -5466,15 +5466,15 @@ eh: keys.cpMainConnectionProvider = conn key = keys.get_dbkey("barcodeetikette") defkey = LTrim(key) - While Len(defkey) < 7 + While Len(defkey) < 5 defkey = "0" + defkey End While yy = LTrim(Str(Year(Now))) - yy = Right(yy, 2) + 'yy = Right(yy, 2) defkey = yy + defkey defkey = defkey + LTrim(Pruefziffer(defkey)) - bc.iBarcodenr = New SqlInt32(CType(defkey, Int32)) + bc.iBarcodenr = New SqlInt32(CType(defkey, Long)) bc.sDokumentid = New SqlString(CType("", String)) bc.bAktiv = New SqlBoolean(CType(True, Boolean)) bc.daErstellt_am = New SqlDateTime(CType(Now, DateTime)) diff --git a/EDOKA/Utils/DivFnkt.vb b/EDOKA/Utils/DivFnkt.vb index 74a769b..1228e77 100644 --- a/EDOKA/Utils/DivFnkt.vb +++ b/EDOKA/Utils/DivFnkt.vb @@ -109,6 +109,27 @@ Namespace EDOKA #Region " Div" + Public Function delDokInUse(ByVal Mitarbeiternr As Integer) + Dim scmCmdToExecute As SqlCommand = New SqlCommand() + Dim dtToReturn As DataTable = New DataTable() + Dim sdaAdapter As SqlDataAdapter = New SqlDataAdapter(scmCmdToExecute) + scmCmdToExecute.CommandText = "dbo.sp_deldokinuse" + scmCmdToExecute.CommandType = CommandType.StoredProcedure + scmCmdToExecute.Connection = conn.scoDBConnection + Try + scmCmdToExecute.Parameters.Add(New SqlParameter("@mitarbeiternr", SqlDbType.Int, 4, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Mitarbeiternr)) + sdaAdapter.Fill(dtToReturn) + Catch ex As Exception + ' // some error occured. Bubble it to caller and encapsulate Exception object + Throw New Exception("DivFnkt:DelDokInUse::" & scmCmdToExecute.CommandText & "::Error occured." & ex.Message, ex) + Finally + scmCmdToExecute.Dispose() + sdaAdapter.Dispose() + End Try + End Function + + + Public Function GetHostValutaDAtum(ByVal sDokId As String, ByVal sPartnerNr As String) As String Dim scmCmdToExecute As SqlCommand = New SqlCommand() Dim dtToReturn As DataTable = New DataTable() diff --git a/EDOKA/Utils/Globals.vb b/EDOKA/Utils/Globals.vb index 948a54e..e1119f4 100644 --- a/EDOKA/Utils/Globals.vb +++ b/EDOKA/Utils/Globals.vb @@ -17,7 +17,7 @@ Module Globals Public WithEvents Generic_Event_Handler As New Generic_Event_Handler 'EDOKA-Version Public Version As String = "5.6" - Public Versionsdatum As String = "03.08.2021" + Public Versionsdatum As String = "26.09.2021" Public Force_Exit As Boolean = False 'Datenbankvariablen Public sConnectionString As String diff --git a/EDOKA/bin/20210912_edoka.zip b/EDOKA/bin/20210912_edoka.zip new file mode 100644 index 0000000..f664581 Binary files /dev/null and b/EDOKA/bin/20210912_edoka.zip differ diff --git a/EDOKA/bin/20210926_EDOKA.zip b/EDOKA/bin/20210926_EDOKA.zip new file mode 100644 index 0000000..5e02f2d Binary files /dev/null and b/EDOKA/bin/20210926_EDOKA.zip differ diff --git a/EDOKA/bin/20220103_EDOKA-zip.zip b/EDOKA/bin/20220103_EDOKA-zip.zip new file mode 100644 index 0000000..c30060e Binary files /dev/null and b/EDOKA/bin/20220103_EDOKA-zip.zip differ diff --git a/EDOKA/bin/EDOKA.exe b/EDOKA/bin/EDOKA.exe index 6731227..1ebc827 100644 Binary files a/EDOKA/bin/EDOKA.exe and b/EDOKA/bin/EDOKA.exe differ diff --git a/EDOKA/bin/EDOKA.pdb b/EDOKA/bin/EDOKA.pdb index e21107f..7bd0715 100644 Binary files a/EDOKA/bin/EDOKA.pdb and b/EDOKA/bin/EDOKA.pdb differ diff --git a/EDOKA/bin/EDOKALib.Common.dll b/EDOKA/bin/EDOKALib.Common.dll index e990118..789b226 100644 Binary files a/EDOKA/bin/EDOKALib.Common.dll and b/EDOKA/bin/EDOKALib.Common.dll differ diff --git a/EDOKA/bin/EDOKALib.Common.pdb b/EDOKA/bin/EDOKALib.Common.pdb index e0cbf48..adeaed5 100644 Binary files a/EDOKA/bin/EDOKALib.Common.pdb and b/EDOKA/bin/EDOKALib.Common.pdb differ diff --git a/EDOKA/bin/EDOKALib.DataAccess.dll b/EDOKA/bin/EDOKALib.DataAccess.dll index 7d43cab..912df00 100644 Binary files a/EDOKA/bin/EDOKALib.DataAccess.dll and b/EDOKA/bin/EDOKALib.DataAccess.dll differ diff --git a/EDOKA/bin/EDOKALib.DataAccess.pdb b/EDOKA/bin/EDOKALib.DataAccess.pdb index ad9044f..6f3b0e4 100644 Binary files a/EDOKA/bin/EDOKALib.DataAccess.pdb and b/EDOKA/bin/EDOKALib.DataAccess.pdb differ diff --git a/EDOKA/frmEdokaMain.resx b/EDOKA/frmEdokaMain.resx index e5e7f43..39f30d6 100644 --- a/EDOKA/frmEdokaMain.resx +++ b/EDOKA/frmEdokaMain.resx @@ -123,7 +123,7 @@ - 0, 295 + 0, 275 890, 17 @@ -538,7 +538,7 @@ 5, 13 - 1020, 317 + 1020, 297 Fill @@ -1720,7 +1720,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK - DAAAAk1TRnQBSQFMAgEBBwEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBwEAAWABAQFgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/EDOKA/frmEdokaMain.vb b/EDOKA/frmEdokaMain.vb index f5120e2..40ec773 100644 --- a/EDOKA/frmEdokaMain.vb +++ b/EDOKA/frmEdokaMain.vb @@ -1561,6 +1561,7 @@ Public Class EDOKAMain End If End If If bExit = True Then + DivFnkt.deldokinuse(Globals.MitarbeiterNr) Office_Freigeben() Application.Exit() Else diff --git a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 2156302..505dd6a 100644 Binary files a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/EDOKA/obj/Debug/EDOKA.exe b/EDOKA/obj/Debug/EDOKA.exe index 6731227..1ebc827 100644 Binary files a/EDOKA/obj/Debug/EDOKA.exe and b/EDOKA/obj/Debug/EDOKA.exe differ diff --git a/EDOKA/obj/Debug/EDOKA.pdb b/EDOKA/obj/Debug/EDOKA.pdb index e21107f..7bd0715 100644 Binary files a/EDOKA/obj/Debug/EDOKA.pdb and b/EDOKA/obj/Debug/EDOKA.pdb differ diff --git a/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources b/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources index dc6658c..2785ddd 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources and b/EDOKA/obj/Debug/EDOKAApp.EDOKAMain.resources differ diff --git a/EDOKA/obj/Debug/EDOKAApp.frmBLDruck.resources b/EDOKA/obj/Debug/EDOKAApp.frmBLDruck.resources index 79d8c71..c36f29e 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.frmBLDruck.resources and b/EDOKA/obj/Debug/EDOKAApp.frmBLDruck.resources differ diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache index 4aea97e..aeb166d 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache and b/EDOKA/obj/Debug/EDOKAApp.vbproj.AssemblyReference.cache differ diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache index fb25008..d02ac04 100644 --- a/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache +++ b/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -d3adf2a1a4591bccec27d61069fbfb144d335bbf +29c8571abf91ec6ecdd735e42df52b191b4b68ce diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache index 69d5d61..a6d5b5c 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache and b/EDOKA/obj/Debug/EDOKAApp.vbproj.GenerateResource.cache differ diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache index d28cff5..c0c74c9 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache and b/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache differ