Update Service-Bezeichnung für Paralell-Betrieb

edkb08/clsCheckandImport.vb

@@ -780,7 +780,7 @@ Public Class clsCheckandImport
             scmCmdToExecute.ExecuteNonQuery()
             Return scmCmdToExecute.Parameters("@dokid").Value
         Catch ex As Exception
-            PrintOut("clsCheckandImport.get_bcdokumentid()" + ex.Message, EventLogEntryType.Error)
+            Printout("clsCheckandImport.get_bcdokumentid()" + ex.Message, EventLogEntryType.Error)
             Return ""
         Finally
             conn_edoka.CloseConnection(True)
@@ -826,7 +826,7 @@ Public Class clsCheckandImport
             scmCmdToExecute.ExecuteNonQuery()
             Return scmCmdToExecute.Parameters("@nrpar00").Value
         Catch ex As Exception
-            PrintOut("clsCheckandImport.Get_VVParnter()" + ex.Message, EventLogEntryType.Error)
+            Printout("clsCheckandImport.Get_VVParnter()" + ex.Message, EventLogEntryType.Error)
         Finally
             conn_edoka.CloseConnection(True)
             scmCmdToExecute.Dispose()
@@ -854,10 +854,10 @@ Public Class clsCheckandImport
         Dim key As Long
 
         Try
-            If Me.IndexData.Rows(datarow).Item(5) = "" And _
-               Me.IndexData.Rows(datarow).Item(6) = "" And _
-               Me.IndexData.Rows(datarow).Item(8) = "" And _
-               Me.IndexData.Rows(datarow).Item(9) = "" And _
+            If Me.IndexData.Rows(datarow).Item(5) = "" And
+               Me.IndexData.Rows(datarow).Item(6) = "" And
+               Me.IndexData.Rows(datarow).Item(8) = "" And
+               Me.IndexData.Rows(datarow).Item(9) = "" And
                Me.IndexData.Rows(datarow).Item(10) = "" Then
                 Return False
             End If
@@ -931,11 +931,11 @@ Public Class clsCheckandImport
     '''<seealso cref="Checkdata">Checkdata</seealso>
     Private Function Check_Dokumentdaten(ByVal datarow As Integer) As Boolean
         'Prüfung Dateityp
-        If UCase(Me.IndexData.Rows(datarow).Item(13)) <> "DOC" And _
-           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "XLS" And _
-           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "PDF" And _
-           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "TIF" And _
-           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "JPG" And _
+        If UCase(Me.IndexData.Rows(datarow).Item(13)) <> "DOC" And
+           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "XLS" And
+           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "PDF" And
+           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "TIF" And
+           UCase(Me.IndexData.Rows(datarow).Item(13)) <> "JPG" And
            UCase(Me.IndexData.Rows(datarow).Item(13)) <> "" Then
             If Not Me.BarcodeImport Then
                 Fehler = 9
@@ -978,7 +978,7 @@ Public Class clsCheckandImport
                     Return True
                 End If
             Catch ex As Exception
-                PrintOut("clsCheckandImport.Check_Dokumentdaten()" + ex.Message, EventLogEntryType.Error)
+                Printout("clsCheckandImport.Check_Dokumentdaten()" + ex.Message, EventLogEntryType.Error)
             Finally
                 conn_edoka.CloseConnection(True)
                 scmCmdToExecute.Dispose()
@@ -1098,7 +1098,7 @@ Public Class clsCheckandImport
                 Return True
             End If
         Catch ex As Exception
-            PrintOut("clsCheckandImport.Get_herkunfstapplikation()" + ex.Message, EventLogEntryType.Error)
+            Printout("clsCheckandImport.Get_herkunfstapplikation()" + ex.Message, EventLogEntryType.Error)
         Finally
             scmCmdToExecute.Dispose()
             sdaAdapter.Dispose()
@@ -1291,21 +1291,21 @@ Public Class clsCheckandImport
                 End If
 
                 If dd.bBl_scan.Value = True Then
-                        dd.bBldossier = New SqlBoolean(CType(True, Boolean))
-                        Try
-                            conn_edoka.OpenConnection()
-                        Catch
-                        End Try
-                        dd.Update()
-                        Try
-                            conn_edoka.CloseConnection(True)
-                        Catch
-                        End Try
+                    dd.bBldossier = New SqlBoolean(CType(True, Boolean))
+                    Try
+                        conn_edoka.OpenConnection()
+                    Catch
+                    End Try
+                    dd.Update()
+                    Try
+                        conn_edoka.CloseConnection(True)
+                    Catch
+                    End Try
 
-                    End If
                 End If
+            End If
 
-                Return True
+            Return True
         Else
             'Dokumentid auslesen
             '            If Globals.Herkunftsapplikation.Rows(0).Item(1) = "EDKB09" Or Globals.Herkunftsapplikation.Rows(0).Item(1) = "EDKB14" Or Globals.Herkunftsapplikation.Rows(0).Item(1) = "FinFox" Then
@@ -1613,11 +1613,12 @@ Public Class clsCheckandImport
         conn_edoka.CloseConnection(True)
 
         'EDKB09
-        If Globals.Herkunftsapplikation.Rows(0).Item(1) = "EDKB09" Then
-            If IndexData.Rows(datarow).Item("DokumentidBdr") <> "" Then
-                Insert_Bedingte_Retournierung(datarow)
-            End If
-        End If
+        'Erneuerung DMS - keine Bedingte Retournieren mehr
+        'If Globals.Herkunftsapplikation.Rows(0).Item(1) = "EDKB09" Then
+        '    If IndexData.Rows(datarow).Item("DokumentidBdr") <> "" Then
+        '        Insert_Bedingte_Retournierung(datarow)
+        '    End If
+        'End If
     End Function
 
 #Region "Bedingte Retournierung"
@@ -1988,7 +1989,7 @@ Public Class clsCheckandImport
                 Return scmCmdToExecute.Parameters("@edokadokumenttyp").Value
             End If
         Catch ex As Exception
-            PrintOut("clsCheckandImport.Get_EDOKA_Dokumenttypnr()" + ex.Message, EventLogEntryType.Error)
+            Printout("clsCheckandImport.Get_EDOKA_Dokumenttypnr()" + ex.Message, EventLogEntryType.Error)
             Return 0
         Finally
             scmCmdToExecute.Dispose()
@@ -2458,7 +2459,7 @@ Public Class clsCheckandImport
             dbkey.Dispose()
             sh.Dispose()
         Catch ex As Exception
-            PrintOut("clsCheckandImport.insert_history_status()" + ex.Message, EventLogEntryType.Error)
+            Printout("clsCheckandImport.insert_history_status()" + ex.Message, EventLogEntryType.Error)
         End Try
 
     End Sub
@@ -2575,7 +2576,7 @@ Public Class clsCheckandImport
             conn_edoka.CloseConnection(True)
             Return scmCmdToExecute.Parameters("@aufheben").Value
         Catch ex As Exception
-            PrintOut("clsCheckandImport.get_status()" + ex.Message, EventLogEntryType.Error)
+            Printout("clsCheckandImport.get_status()" + ex.Message, EventLogEntryType.Error)
             Return 0
         Finally
             scmCmdToExecute.Dispose()
@@ -2978,7 +2979,7 @@ Public Class clsCheckandImport
         sFieldArray(12) = "BERES03"
 
         For i = 0 To dtOrg.Rows.Count - 1
-            If (i1 = 1 And dtOrg.Rows(i).Item("indextyp") = 1) Or _
+            If (i1 = 1 And dtOrg.Rows(i).Item("indextyp") = 1) Or
                (i2 = 1 And dtOrg.Rows(i).Item("indextyp") = 2) Then
                 dw.iIndextyp = New SqlInt32(CType(dtOrg.Rows(i).Item(1), Int32))
                 dw.iMandantnr = New SqlInt32(CType(dtOrg.Rows(i).Item("mandantnr"), Int32))
@@ -3222,7 +3223,7 @@ Public Class clsCheckandImport
                 End If
             End If
         Catch ex As Exception
-            PrintOut("clsCheckandImport.get_edoka_dokument()" + ex.Message, EventLogEntryType.Error)
+            Printout("clsCheckandImport.get_edoka_dokument()" + ex.Message, EventLogEntryType.Error)
             Return False
         Finally
             scmCmdToExecute.Dispose()
@@ -3293,7 +3294,7 @@ Public Class clsCheckandImport
                     DA.Update(dsDATEN, "docs")
                 End If
             Catch ex As Exception
-                PrintOut("clsCheckandImport.Save_ImportDaten()" + ex.Message, EventLogEntryType.Error)
+                Printout("clsCheckandImport.Save_ImportDaten()" + ex.Message, EventLogEntryType.Error)
             End Try
             fs = Nothing
             cb = Nothing