MS27062016

2016-06-27 13:43:47 +02:00
parent 59371f3fba
commit c5f276c37d
27 changed files with 1192 additions and 626 deletions
--- a/app/DD-Record-Organiser/DD_DMSDataSet1.Designer.vb
+++ b/app/DD-Record-Organiser/DD_DMSDataSet1.Designer.vb
@@ -7246,6 +7246,8 @@ Partial Public Class DD_DMSDataSet
        
        Private columnSQL_RESULT As Global.System.Data.DataColumn
        
+        Private columnENTITY_ID As Global.System.Data.DataColumn
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
        Public Sub New()
@@ -7385,6 +7387,14 @@ Partial Public Class DD_DMSDataSet
            End Get
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public ReadOnly Property ENTITY_IDColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnENTITY_ID
+            End Get
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
         Global.System.ComponentModel.Browsable(false)>  _
@@ -7422,9 +7432,9 @@ Partial Public Class DD_DMSDataSet
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
-        Public Overloads Function AddTBDD_INDEX_AUTOMRow(ByVal parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID As TBDD_DOKUMENTARTRow, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal SQL_ACTIVE As Boolean, ByVal SQL_RESULT As String) As TBDD_INDEX_AUTOMRow
+        Public Overloads Function AddTBDD_INDEX_AUTOMRow(ByVal parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID As TBDD_DOKUMENTARTRow, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal SQL_ACTIVE As Boolean, ByVal SQL_RESULT As String, ByVal ENTITY_ID As Integer) As TBDD_INDEX_AUTOMRow
            Dim rowTBDD_INDEX_AUTOMRow As TBDD_INDEX_AUTOMRow = CType(Me.NewRow,TBDD_INDEX_AUTOMRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_ACTIVE, SQL_RESULT}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_ACTIVE, SQL_RESULT, ENTITY_ID}
            If (Not (parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID) Is Nothing) Then
                columnValuesArray(1) = parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID(0)
            End If
@@ -7469,6 +7479,7 @@ Partial Public Class DD_DMSDataSet
            Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN")
            Me.columnSQL_ACTIVE = MyBase.Columns("SQL_ACTIVE")
            Me.columnSQL_RESULT = MyBase.Columns("SQL_RESULT")
+            Me.columnENTITY_ID = MyBase.Columns("ENTITY_ID")
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -7500,8 +7511,11 @@ Partial Public Class DD_DMSDataSet
            MyBase.Columns.Add(Me.columnSQL_ACTIVE)
            Me.columnSQL_RESULT = New Global.System.Data.DataColumn("SQL_RESULT", GetType(String), Nothing, Global.System.Data.MappingType.Element)
            MyBase.Columns.Add(Me.columnSQL_RESULT)
+            Me.columnENTITY_ID = New Global.System.Data.DataColumn("ENTITY_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnENTITY_ID)
            Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
            Me.columnGUID.AutoIncrement = true
+            Me.columnGUID.AutoIncrementSeed = 1
            Me.columnGUID.AllowDBNull = false
            Me.columnGUID.ReadOnly = true
            Me.columnGUID.Unique = true
@@ -7514,6 +7528,7 @@ Partial Public Class DD_DMSDataSet
            Me.columnCOMMENT.MaxLength = 400
            Me.columnACTIVE.AllowDBNull = false
            Me.columnACTIVE.DefaultValue = CType(true,Boolean)
+            Me.columnADDED_WHO.AllowDBNull = false
            Me.columnADDED_WHO.MaxLength = 50
            Me.columnCHANGED_WHO.MaxLength = 50
            Me.columnSQL_ACTIVE.AllowDBNull = false
@@ -7521,6 +7536,8 @@ Partial Public Class DD_DMSDataSet
            Me.columnSQL_RESULT.AllowDBNull = false
            Me.columnSQL_RESULT.DefaultValue = CType("",String)
            Me.columnSQL_RESULT.MaxLength = 2000
+            Me.columnENTITY_ID.AllowDBNull = false
+            Me.columnENTITY_ID.DefaultValue = CType(0,Integer)
        End Sub
        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -23386,11 +23403,7 @@ Partial Public Class DD_DMSDataSet
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
        Public Property ADDED_WHO() As String
            Get
-                Try 
-                    Return CType(Me(Me.tableTBDD_INDEX_AUTOM.ADDED_WHOColumn),String)
-                Catch e As Global.System.InvalidCastException
-                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBDD_INDEX_AUTOM ist DBNull.", e)
-                End Try
+                Return CType(Me(Me.tableTBDD_INDEX_AUTOM.ADDED_WHOColumn),String)
            End Get
            Set
                Me(Me.tableTBDD_INDEX_AUTOM.ADDED_WHOColumn) = value
@@ -23464,6 +23477,17 @@ Partial Public Class DD_DMSDataSet
            End Set
        End Property
        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
+        Public Property ENTITY_ID() As Integer
+            Get
+                Return CType(Me(Me.tableTBDD_INDEX_AUTOM.ENTITY_IDColumn),Integer)
+            End Get
+            Set
+                Me(Me.tableTBDD_INDEX_AUTOM.ENTITY_IDColumn) = value
+            End Set
+        End Property
+        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
        Public Property TBDD_DOKUMENTARTRow() As TBDD_DOKUMENTARTRow
@@ -23510,18 +23534,6 @@ Partial Public Class DD_DMSDataSet
            Me(Me.tableTBDD_INDEX_AUTOM.COMMENTColumn) = Global.System.Convert.DBNull
        End Sub
        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
-        Public Function IsADDED_WHONull() As Boolean
-            Return Me.IsNull(Me.tableTBDD_INDEX_AUTOM.ADDED_WHOColumn)
-        End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
-        Public Sub SetADDED_WHONull()
-            Me(Me.tableTBDD_INDEX_AUTOM.ADDED_WHOColumn) = Global.System.Convert.DBNull
-        End Sub
-        
        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")>  _
        Public Function IsADDED_WHENNull() As Boolean
@@ -37078,6 +37090,7 @@ Namespace DD_DMSDataSetTableAdapters
            tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN")
            tableMapping.ColumnMappings.Add("SQL_ACTIVE", "SQL_ACTIVE")
            tableMapping.ColumnMappings.Add("SQL_RESULT", "SQL_RESULT")
+            tableMapping.ColumnMappings.Add("ENTITY_ID", "ENTITY_ID")
            Me._adapter.TableMappings.Add(tableMapping)
            Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -37087,11 +37100,12 @@ Namespace DD_DMSDataSetTableAdapters
            Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.InsertCommand.Connection = Me.Connection
            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (DOCTYPE_ID, INDEXNAME, VA"& _ 
-                "LUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, SQL_ACTIVE, SQL_RESULT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ 
-                "       (@DOCTYPE_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE,@ADDED_WHO"& _ 
-                ",@SQL_ACTIVE,@SQL_RESULT); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTI"& _ 
-                "ON_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_AC"& _ 
-                "TIVE, SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDENTITY())"
+                "LUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, SQL_ACTIVE, SQL_RESULT, ENTITY_I"& _ 
+                "D)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@DOCTYPE_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE"& _ 
+                ",@ADDED_WHO,@SQL_ACTIVE,@SQL_RESULT,@ENTITY_ID);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, IND"& _ 
+                "EXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WH"& _ 
+                "O, CHANGED_WHEN, SQL_ACTIVE, SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOP"& _ 
+                "E_IDENTITY())"
            Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -37102,15 +37116,16 @@ Namespace DD_DMSDataSetTableAdapters
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
            Me._adapter.UpdateCommand.Connection = Me.Connection
            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                DOCTYPE_ID = @DOCTYPE_ID, INDEX"& _ 
                "NAME = @INDEXNAME, VALUE = @VALUE, CONNECTION_ID = @CONNECTION_ID, COMMENT = @CO"& _ 
                "MMENT, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         "& _ 
-                "SQL_ACTIVE = @SQL_ACTIVE, SQL_RESULT = @SQL_RESULT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Origin"& _ 
-                "al_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, A"& _ 
-                "CTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_ACTIVE, SQL_RESULT "& _ 
-                "FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID)"
+                "SQL_ACTIVE = @SQL_ACTIVE, SQL_RESULT = @SQL_RESULT, ENTITY_ID = @ENTITY_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHER"& _ 
+                "E        (GUID = @Original_GUID);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, "& _ 
+                "CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"& _ 
+                ", SQL_ACTIVE, SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID)"
            Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -37121,6 +37136,7 @@ Namespace DD_DMSDataSetTableAdapters
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
        End Sub
@@ -37139,8 +37155,8 @@ Namespace DD_DMSDataSetTableAdapters
            Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(0).Connection = Me.Connection
            Me._commandCollection(0).CommandText = "SELECT        GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE,"& _ 
-                " ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_ACTIVE, SQL_RESULT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ 
-                "           TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (DOCTYPE_ID = @DocTypeID)"
+                " ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_ACTIVE, SQL_RESULT, ENTIT"& _ 
+                "Y_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (DOCTYPE_ID = @DocTypeID)"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DocTypeID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
        End Sub
@@ -37224,7 +37240,7 @@ Namespace DD_DMSDataSetTableAdapters
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
-        Public Overloads Overridable Function Insert(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal SQL_ACTIVE As Boolean, ByVal SQL_RESULT As String) As Integer
+        Public Overloads Overridable Function Insert(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal SQL_ACTIVE As Boolean, ByVal SQL_RESULT As String, ByVal ENTITY_ID As Integer) As Integer
            Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer)
            If (INDEXNAME Is Nothing) Then
                Throw New Global.System.ArgumentNullException("INDEXNAME")
@@ -37244,7 +37260,7 @@ Namespace DD_DMSDataSetTableAdapters
            End If
            Me.Adapter.InsertCommand.Parameters(5).Value = CType(ACTIVE,Boolean)
            If (ADDED_WHO Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value
+                Throw New Global.System.ArgumentNullException("ADDED_WHO")
            Else
                Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String)
            End If
@@ -37254,6 +37270,7 @@ Namespace DD_DMSDataSetTableAdapters
            Else
                Me.Adapter.InsertCommand.Parameters(8).Value = CType(SQL_RESULT,String)
            End If
+            Me.Adapter.InsertCommand.Parameters(9).Value = CType(ENTITY_ID,Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@@ -37273,7 +37290,7 @@ Namespace DD_DMSDataSetTableAdapters
         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal SQL_ACTIVE As Boolean, ByVal SQL_RESULT As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function Update(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal SQL_ACTIVE As Boolean, ByVal SQL_RESULT As String, ByVal ENTITY_ID As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer)
            If (INDEXNAME Is Nothing) Then
                Throw New Global.System.ArgumentNullException("INDEXNAME")
@@ -37303,8 +37320,9 @@ Namespace DD_DMSDataSetTableAdapters
            Else
                Me.Adapter.UpdateCommand.Parameters(8).Value = CType(SQL_RESULT,String)
            End If
-            Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(10).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(9).Value = CType(ENTITY_ID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(11).Value = CType(GUID,Integer)
            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                        <> Global.System.Data.ConnectionState.Open) Then
@@ -48388,34 +48406,34 @@ Namespace DD_DMSDataSetTableAdapters
            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
            Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
            Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT        GUID, ID, PATTERN, FORMAT_RULE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," & _
-                " CHANGED_WHEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM            TBPMO_WD_NAMECONVENTION_FORMAT" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE        (ID " & _
+            Me._commandCollection(0).CommandText = "SELECT        GUID, ID, PATTERN, FORMAT_RULE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO,"& _ 
+                " CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPMO_WD_NAMECONVENTION_FORMAT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (ID "& _ 
                "= @ID)"
            Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", ""))
+            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
        End Sub
-
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, True)> _
-        Public Overridable Overloads Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMATDataTable, ByVal ID As Integer) As Integer
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, true)>  _
+        Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMATDataTable, ByVal ID As Integer) As Integer
            Me.Adapter.SelectCommand = Me.CommandCollection(0)
-            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ID, Integer)
-            If (Me.ClearBeforeFill = True) Then
-                dataTable.Clear()
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ID,Integer)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
            End If
            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
            Return returnValue
        End Function
-
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], True)> _
-        Public Overridable Overloads Function GetData(ByVal ID As Integer) As DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMATDataTable
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)>  _
+        Public Overloads Overridable Function GetData(ByVal ID As Integer) As DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMATDataTable
            Me.Adapter.SelectCommand = Me.CommandCollection(0)
-            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ID, Integer)
+            Me.Adapter.SelectCommand.Parameters(0).Value = CType(ID,Integer)
            Dim dataTable As DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMATDataTable = New DD_DMSDataSet.TBPMO_WD_NAMECONVENTION_FORMATDataTable()
            Me.Adapter.Fill(dataTable)
            Return dataTable