Update Test GitWechsel
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -8,7 +8,7 @@ DeleteOriginalfiles =1
|
||||
Mailadresse_OK =stefan.hutter@tkb.ch
|
||||
Mailadresse_NOK =stefan.hutter@tkb.ch
|
||||
GSF_ConfigFiles =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\gsf\
|
||||
GSF_Timer in Minuten =1
|
||||
GSF_Timer in Minuten =30
|
||||
GSF_Conf_Dateiendung =xml
|
||||
Directorytimer =10
|
||||
Directorys =E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\bin\DirectoriesToScan.txt
|
||||
|
||||
@@ -31,6 +31,10 @@ Module Globals
|
||||
Return True
|
||||
Exit Function
|
||||
End If
|
||||
If Input = "IRIS_FORMS_LSV" Then
|
||||
Return True
|
||||
Exit Function
|
||||
End If
|
||||
Return False
|
||||
End Function
|
||||
|
||||
|
||||
@@ -1068,8 +1068,12 @@ Public Class clsCheckandImport
|
||||
scmCmdToExecute.CommandText = "dbo.SP_Edoka_Import_Get_Herkunftsapplikation"
|
||||
scmCmdToExecute.CommandType = CommandType.StoredProcedure
|
||||
scmCmdToExecute.Connection = conn_edoka.scoDBConnection
|
||||
scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(11)))
|
||||
scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(17)))
|
||||
|
||||
'scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(11)))
|
||||
'scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item(17)))
|
||||
|
||||
scmCmdToExecute.Parameters.Add(New SqlParameter("@Dokumenttyp", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Dokumenttypnr")))
|
||||
scmCmdToExecute.Parameters.Add(New SqlParameter("@InputAppl", SqlDbType.VarChar, 255, ParameterDirection.Input, True, 10, 0, "", DataRowVersion.Proposed, Me.IndexData.Rows(i).Item("Herkunftsapplikation")))
|
||||
|
||||
Try
|
||||
sdaAdapter.Fill(dtToReturn)
|
||||
@@ -1431,6 +1435,25 @@ Public Class clsCheckandImport
|
||||
bez = dok.sBezeichnung.Value + " V" + IndexData.Rows(datarow).Item("KATASTER").ToString + " " + IndexData.Rows(datarow).Item("Ort").ToString
|
||||
dok.sBezeichnung = New SqlString(CType(bez, String))
|
||||
End If
|
||||
|
||||
'***************************************************************************************************************3
|
||||
'LSV
|
||||
'***************************************************************************************************************3
|
||||
If Globals.Herkunftsapplikation.Rows(0).Item(1) = "IRIS_FORMS_LSV" Then
|
||||
Dim lsvid As String = ""
|
||||
For i As Integer = 10 To IndexData.Columns.Count - 1
|
||||
If Left(IndexData.Rows(datarow).Item(IndexData.Columns(i).ColumnName), 6) = "LSV-ID" Then
|
||||
lsvid = IndexData.Rows(datarow).Item(IndexData.Columns(i).ColumnName)
|
||||
If Len(lsvid) > 7 Then lsvid = Right(lsvid, Len(lsvid) - 7)
|
||||
End If
|
||||
Next
|
||||
Dim bez As String
|
||||
bez = dok.sBezeichnung.Value + " " + lsvid
|
||||
dok.sBezeichnung = New SqlString(CType(bez, String))
|
||||
|
||||
'Status_Bereit_Zur_Eingangsarchivierung = dok.sBezeichnung.Value + IndexData.Rows(datarow).Item("Dokumentwert")
|
||||
End If
|
||||
|
||||
'***************************************************************************************************************3
|
||||
'EDKB09
|
||||
'***************************************************************************************************************3
|
||||
@@ -2082,7 +2105,7 @@ Public Class clsCheckandImport
|
||||
'Dokumentwert_Sichern("Formular-ID;" + Me.IndexData.Rows(datarow).Item(25), -90004)
|
||||
Else
|
||||
If Me.IndexData.Rows(datarow).Item(25) <> "" Then
|
||||
If UCase(Globals.Herkunftsapplikation.Rows(0).Item(1)) = "INTRANET" Then
|
||||
If UCase(Globals.Herkunftsapplikation.Rows(0).Item(1)) = "INTRANET" Or UCase(Globals.Herkunftsapplikation.Rows(0).Item(1)) = "IRIS_FORMS_LSV" Then
|
||||
Startindex_Dokumentwerte = 25
|
||||
Else
|
||||
Dokumentwert_Sichern("Empfänger NL;" + Me.IndexData.Rows(datarow).Item(25), -90004)
|
||||
@@ -3226,7 +3249,9 @@ Public Class clsCheckandImport
|
||||
Dim cb As SqlCommandBuilder = New SqlCommandBuilder(DA)
|
||||
|
||||
Dim dsDATEN As New DataSet()
|
||||
Dim fs As New FileStream(Params.Inputverzeichnis + Me.IndexData.Rows(datarow).Item(12), FileMode.Open, FileAccess.Read)
|
||||
Dim fs As New FileStream(Params.Inputverzeichnis + Me.IndexData.Rows(datarow).Item("Dateiname"), FileMode.Open, FileAccess.Read)
|
||||
'20210709 - LSV
|
||||
'Dim fs As New FileStream(Params.Inputverzeichnis + Me.IndexData.Rows(datarow).Item(12), FileMode.Open, FileAccess.Read)
|
||||
Dim mydata(fs.Length) As Byte
|
||||
Try
|
||||
fs.Read(mydata, 0, fs.Length)
|
||||
|
||||
@@ -157,6 +157,51 @@ Public Class clsIndexData
|
||||
tmpds.Tables(0).Rows.Add(dr)
|
||||
idxds.Tables.Clear()
|
||||
|
||||
idxds.Tables.Add(tmpds.Tables(0).Copy)
|
||||
tmpds.Dispose()
|
||||
End Sub
|
||||
|
||||
Private Sub map_iris_LSV(ByRef idxds As DataSet)
|
||||
Dim tmpds As New DataSet
|
||||
tmpds.ReadXml(System.AppDomain.CurrentDomain.BaseDirectory + "\edkb08struktur.xml")
|
||||
tmpds.Tables(0).Columns.Add("DOKUMENTWERT21")
|
||||
tmpds.Tables(0).Columns.Add("DOKUMENTWERT22")
|
||||
tmpds.Tables(0).Columns.Add("DOKUMENTWERT23")
|
||||
tmpds.Tables(0).Columns.Add("DOKUMENTWERT24")
|
||||
tmpds.Tables(0).Columns.Add("DOKUMENTWERT25")
|
||||
tmpds.Tables(0).Columns.Add("Stapelkennung")
|
||||
|
||||
Dim dr As DataRow = tmpds.Tables(0).NewRow
|
||||
For Each col As DataColumn In tmpds.Tables(0).Columns
|
||||
dr.Item(col.ColumnName) = ""
|
||||
Next
|
||||
|
||||
For Each col As DataColumn In idxds.Tables(0).Columns
|
||||
Try
|
||||
dr.Item(col.ColumnName) = idxds.Tables(0).Rows(0).Item(col.ColumnName)
|
||||
Catch
|
||||
End Try
|
||||
Next
|
||||
|
||||
dr.Item("ersteller") = idxds.Tables(0).Rows(0).Item("Benutzer")
|
||||
'dr.Item("DOKUMENTTYPNR") = idxds.Tables(0).Rows(0).Item("Dokumenttyp")
|
||||
'//dr.Item("DOKUMENTWERT1") = "Scandatum;" + idxds.Tables(0).Rows(0).Item("Scandatum")
|
||||
'dr.Item("DOKUMENTWERT2") = "Paginatornummer;" + idxds.Tables(0).Rows(0).Item("Paginatornummer")
|
||||
'dr.Item("DOKUMENTWERT3") = "Status;" + idxds.Tables(0).Rows(0).Item("Status")
|
||||
'dr.Item("DOKUMENTWERT4") = "IBAN;" + idxds.Tables(0).Rows(0).Item("IBAN")
|
||||
|
||||
|
||||
For i As Integer = 11 To 33
|
||||
dr.Item("DOKUMENTWERT" + (i - 10).ToString) = idxds.Tables(0).Columns(i).ColumnName + ";" + idxds.Tables(0).Rows(0).Item(i).ToString
|
||||
Next
|
||||
|
||||
|
||||
|
||||
tmpds.Tables(0).Rows.Clear()
|
||||
tmpds.Tables(0).Rows.Add(dr)
|
||||
idxds.Tables.Clear()
|
||||
|
||||
|
||||
idxds.Tables.Add(tmpds.Tables(0).Copy)
|
||||
tmpds.Dispose()
|
||||
End Sub
|
||||
@@ -169,8 +214,14 @@ Public Class clsIndexData
|
||||
|
||||
Try
|
||||
If Globals.Canon_Herkunft(idxds.Tables(0).Rows(0).Item("Herkunftsapplikation")) Then
|
||||
'20210816 - LSV
|
||||
If idxds.Tables(0).Rows(0).Item("Herkunftsapplikation") = "IRIS_FORMS_LSV" Then
|
||||
map_iris_lsv(idxds)
|
||||
Else
|
||||
|
||||
map_iris_struktur(idxds)
|
||||
End If
|
||||
|
||||
map_iris_struktur(idxds)
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -27,3 +27,4 @@ E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.xml
|
||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.pdb
|
||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CopyComplete
|
||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.CoreCompileInputs.cache
|
||||
E:\Software-Projekte\EDOKA\batch\EDKB08\EDKB08\obj\Debug\EDKB08.vbproj.AssemblyReference.cache
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user