Verbesserungen

app/DD-Record-Organizer/Classes/ClassDocGrid.vb

@@ -136,14 +136,19 @@ Public Class ClassDocGrid
 
         For Each oRowHandle In oSelectedRows
             Dim oDocId = pGridView.GetRowCellValue(oRowHandle, "DocID")
-            Dim oSQL = $"Select dwParentID FROM TBPMO_DOCRESULT_LIST where DocID = {oDocId}"
-            Dim odwParentID = MYDB_ECM.GetScalarValue(oSQL)
-            Dim oDisplayName = pGridView.GetRowCellValue(oRowHandle, "Displayname")
+            Dim oSQL = $"Select * FROM TBPMO_DOCRESULT_LIST where DocID = {oDocId}"
+            Dim oDTRow As DataTable = MYDB_ECM.GetDatatable(oSQL)
+
+            Dim odwParentID = oDTRow.Rows(0).Item("dwParentID")
+            Dim oDisplayName = oDTRow.Rows(0).Item("Display_name")
             Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH")
-            Dim oObjecttype = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE")
-            Dim oFilename = pGridView.GetRowCellValue(oRowHandle, "Dateiname")
-            Dim oInWork = pGridView.GetRowCellValue(oRowHandle, "in work?")
-            Dim oInWorkUser = pGridView.GetRowCellValue(oRowHandle, "in work User")
+            If IsNothing(oDocPath) Then
+                oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULL_FILENAME")
+            End If
+            Dim oObjecttype = oDTRow.Rows(0).Item("Objecttype")
+            Dim oFilename = oDTRow.Rows(0).Item("Filename")
+            Dim oInWork = pGridView.GetRowCellValue(oRowHandle, "IN_WORK")
+            Dim oInWorkUser = pGridView.GetRowCellValue(oRowHandle, "IN_WORK_USER")
             oDocuments.Add(New clsWMDoc With {
                 .DocId = oDocId,
                 .ParentID = odwParentID,

app/DD-Record-Organizer/Classes/ClassHelper.vb

@@ -303,19 +303,12 @@ Public Class ClassHelper
                 oExtension = Path.GetExtension(BW_DocPath).ToLower()
                 LOGGER.Debug($"Checking if file extension [{oExtension}] may change during edit...")
 
-                If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
-                    oSql = $"SELECT * FROM VWOF_DOCID_HANDLE WHERE dwParentID = {BW_ParentID} AND [Filename] = '{BW_Filename}'"
-                    Dim oDTNEWDoc As DataTable = MYDB_ECM.GetDatatable(oSql)
+                If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) And oOverrideRunPath = "" Then
+                    LOGGER.Debug("Create possible Document change in TBPMO_DOC_ID_CHANGED.")
+                    Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID,DOC_PATH) VALUES (" &
+                                  $"{USER_GUID},'{ProcID}',9999,{BW_DocID},0,'{BW_DocPath}')"
+                    MYDB_ECM.ExecuteNonQuery(oInsert)
 
-                    If oDTNEWDoc IsNot Nothing AndAlso oDTNEWDoc.Rows.Count = 1 Then
-                        Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID,DOC_PATH) VALUES (" &
-                                  $"{USER_GUID},'{ProcID}',{oDTNEWDoc.Rows(0).Item("dwVersionID")},{BW_DocID},{oDTNEWDoc.Rows(0).Item("NewDocID")},'{BW_DocPath}')"
-
-                        MYDB_ECM.ExecuteNonQuery(oInsert)
-                        LOGGER.Debug("Document change recorded in TBPMO_DOC_ID_CHANGED.")
-                    Else
-                        LOGGER.Debug("No matching document change detected.")
-                    End If
                 End If
 
             Catch ex As Exception

app/DD-Record-Organizer/Classes/ClassImport_Windream.vb

@@ -20,7 +20,7 @@ Public Class ClassImport_Windream
                 End If
 
                 'Die Datei nach windream importieren
-                Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE, True)
+                Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE)
                 If streamresult = True Then
                     Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE()) AND FULL_FILENAME = '{0}'", CURRENT_FILEIN_WD)
                     CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(sql)

app/DD-Record-Organizer/Classes/ClassInit.vb

@@ -221,6 +221,11 @@ Public Class ClassInit
                     ElseIf oRow.Item("CAT_TITLE") = "WM_RWA2" Then
                         WM_RWA2 = oRow.Item("CAT_STRING")
                         LOGGER.Debug("WM_RWA2 = " + WM_RWA1)
+                    ElseIf oRow.Item("CAT_TITLE") = "OF_FILESTORE_ENTITY" Then
+                        OF_FILESTORE_ENTITY = oRow.Item("CAT_STRING")
+                        Dim oSQL1 = String.Format("select A.GUID from TBPMO_FORM_CONSTRUCTOR A INNER JOIN TBPMO_FORM_CONSTRUCTOR_DETAIL B ON A.GUID = B.CONSTRUCT_ID WHERE B.FORM_ID = {0}", OF_FILESTORE_ENTITY)
+                        OF_FILESTORE_CONSTRUCTOR = MYDB_ECM.GetScalarValue(oSQL1)
+                        LOGGER.Debug(String.Format("OF_FILESTORE_ENTITY = {0}", OF_FILESTORE_ENTITY.ToString))
                     End If
                 Next
             Catch ex As Exception

app/DD-Record-Organizer/Classes/ClassJumpRecord.vb

@@ -57,7 +57,7 @@ Public Class ClassJumpRecord
                 Exit Sub
             End If
             JUMP_STATE = STATE_ID
-            JUMP_RECORD_ID = recordId
+            JUMP_ID = recordId
             'OpenFormConstructor(constructorId, recordId)
             OpenRecordView()
         Catch ex As Exception