diff --git a/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/07f86ce2-cada-4395-a56e-af03044e4c9e.vsidx b/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/07f86ce2-cada-4395-a56e-af03044e4c9e.vsidx deleted file mode 100644 index 117b03b..0000000 Binary files a/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/07f86ce2-cada-4395-a56e-af03044e4c9e.vsidx and /dev/null differ diff --git a/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/e3ea2765-cc71-43d4-b0f7-e09b78cd9f2a.vsidx b/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/e3ea2765-cc71-43d4-b0f7-e09b78cd9f2a.vsidx deleted file mode 100644 index d46889f..0000000 Binary files a/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/e3ea2765-cc71-43d4-b0f7-e09b78cd9f2a.vsidx and /dev/null differ diff --git a/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/e5ede10e-d521-4692-b43c-baef33947fb6.vsidx b/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/e5ede10e-d521-4692-b43c-baef33947fb6.vsidx deleted file mode 100644 index a204007..0000000 Binary files a/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/e5ede10e-d521-4692-b43c-baef33947fb6.vsidx and /dev/null differ diff --git a/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/ff2e3704-50fd-494c-867e-9a1113376339.vsidx b/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/ff2e3704-50fd-494c-867e-9a1113376339.vsidx new file mode 100644 index 0000000..91672f5 Binary files /dev/null and b/.vs/EDKB08_Dimensions_Transfer/FileContentIndex/ff2e3704-50fd-494c-867e-9a1113376339.vsidx differ diff --git a/.vs/EDKB08_Dimensions_Transfer/v16/.suo b/.vs/EDKB08_Dimensions_Transfer/v16/.suo index 0c474ce..4861d2e 100644 Binary files a/.vs/EDKB08_Dimensions_Transfer/v16/.suo and b/.vs/EDKB08_Dimensions_Transfer/v16/.suo differ diff --git a/.vs/EDKB08_Dimensions_Transfer/v17/.suo b/.vs/EDKB08_Dimensions_Transfer/v17/.suo index 877797e..6aee9a9 100644 Binary files a/.vs/EDKB08_Dimensions_Transfer/v17/.suo and b/.vs/EDKB08_Dimensions_Transfer/v17/.suo differ diff --git a/Module1.vb b/Module1.vb index 223a667..7cc2d2d 100644 --- a/Module1.vb +++ b/Module1.vb @@ -1,11 +1,7 @@ Imports System.IO Imports System.Net -Imports System.Text -Imports System.Threading -Imports System.Web.Script.Serialization -Imports System.Xml -Imports Newtonsoft.Json Imports System.Reflection +Imports Newtonsoft.Json ' Changelog ' 20221105 - Anpassung neuer Dokumentart 'FINAL_VALUATION_REPORT'" @@ -349,24 +345,15 @@ Module Module1 Process_Step = 23 Dim ds As New DataSet - ds.ReadXml(ApplicationPath() + "EDKB08struktur.xml") + 'ds.ReadXml(ApplicationPath() + "EDKB08struktur.xml") + ds.ReadXml(ApplicationPath() + "DIPStruktur.xml") Dim dr As DataRow = ds.Tables(0).Rows(0) - dr("Funktion") = "ADD" + dr("PARTNERNR") = Order.externalId - dr("Dokumenttypnr") = 1638 + dr("dateiname") = System.IO.Path.GetFileName(filename) dr("Dateiformat") = "PDF" dr("Herkunftsapplikation") = "Dimensions" - - ds.Tables(0).Columns("Dokumentwert1").ColumnName = "AUFTRAGSNR" - ds.Tables(0).Columns("Dokumentwert2").ColumnName = "ANLAGECODE" - ds.Tables(0).Columns("Dokumentwert3").ColumnName = "ANLAGE" - ds.Tables(0).Columns("Dokumentwert4").ColumnName = "OSTRASSE" - ds.Tables(0).Columns("Dokumentwert5").ColumnName = "KATASTER" - ds.Tables(0).Columns("Dokumentwert6").ColumnName = "EIGENTUEMER" - ds.Tables(0).Columns("Dokumentwert7").ColumnName = "BEWERTET_VON" - ds.Tables(0).Columns("Dokumentwert8").ColumnName = "PLAUSIBILISIERT_VON" - ds.Tables(0).Columns("Dokumentwert9").ColumnName = "PLAUSIBILISIERT_AM" dr("AUFTRAGSNR") = Order.id.ToString If Not IsNothing(Order.valuationObject.parcelNumber) Then dr("Kataster") = Order.valuationObject.parcelNumber @@ -378,6 +365,37 @@ Module Module1 dr("bewertet_von") = get_user_data("valuator") dr("plausibilisiert_von") = get_user_data("reviewer") dr("plausibilisiert_am") = Order.modificationdate + dr("Status_Vertraege") = "Aktiv" + Dim bezeichnung As String + Dim tmpbez As String + + bezeichnung = "WD " + Order.id.ToString + If Not IsNothing(Order.valuationObject.address.addressline1) Then + tmpbez = Order.valuationObject.address.addressline1 + Else + tmpbez = "" + End If + If tmpbez <> "" Then bezeichnung = bezeichnung + ", " + tmpbez + + If Not IsNothing(Order.valuationObject.address.addressline2) Then + tmpbez = Order.valuationObject.address.addressline2 + Else + tmpbez = "" + End If + If tmpbez <> "" Then bezeichnung = bezeichnung + ", " + tmpbez + If Not IsNothing(Order.valuationObject.address.place) Then + tmpbez = Order.valuationObject.address.place + Else + tmpbez = "" + End If + If tmpbez <> "" Then bezeichnung = bezeichnung + ", " + tmpbez + + tmpbez = dr("Kataster").ToString + tmpbez = tmpbez.Replace("NULL", "") + If tmpbez <> "" Then bezeichnung = bezeichnung + ", " + tmpbez + + + dr("Bezeichnung") = Bezeichnung ds.Tables(0).AcceptChanges() If System.IO.File.Exists(My.Settings.DestPath + System.IO.Path.GetFileName(filename)) Then System.IO.File.Delete(My.Settings.DestPath + System.IO.Path.GetFileName(filename)) diff --git a/bin/Debug/20231106_WD1.zip b/bin/Debug/20231106_WD1.zip new file mode 100644 index 0000000..52b8a8b Binary files /dev/null and b/bin/Debug/20231106_WD1.zip differ diff --git a/bin/Debug/20231115_WD.zip b/bin/Debug/20231115_WD.zip new file mode 100644 index 0000000..abff07a Binary files /dev/null and b/bin/Debug/20231115_WD.zip differ diff --git a/bin/Debug/DIPStruktur.xml b/bin/Debug/DIPStruktur.xml new file mode 100644 index 0000000..b2626a3 --- /dev/null +++ b/bin/Debug/DIPStruktur.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/bin/Debug/EDKB08_Dimensions_Transfer.exe b/bin/Debug/EDKB08_Dimensions_Transfer.exe index 6094333..766832a 100644 Binary files a/bin/Debug/EDKB08_Dimensions_Transfer.exe and b/bin/Debug/EDKB08_Dimensions_Transfer.exe differ diff --git a/bin/Debug/EDKB08_Dimensions_Transfer.pdb b/bin/Debug/EDKB08_Dimensions_Transfer.pdb index 9835a2f..2d819a8 100644 Binary files a/bin/Debug/EDKB08_Dimensions_Transfer.pdb and b/bin/Debug/EDKB08_Dimensions_Transfer.pdb differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index d6e8b09..7a693e2 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9e9f59d..ab85ef6 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/EDKB08_Dimensions_Transfer.exe b/obj/Debug/EDKB08_Dimensions_Transfer.exe index 6094333..766832a 100644 Binary files a/obj/Debug/EDKB08_Dimensions_Transfer.exe and b/obj/Debug/EDKB08_Dimensions_Transfer.exe differ diff --git a/obj/Debug/EDKB08_Dimensions_Transfer.pdb b/obj/Debug/EDKB08_Dimensions_Transfer.pdb index 9835a2f..2d819a8 100644 Binary files a/obj/Debug/EDKB08_Dimensions_Transfer.pdb and b/obj/Debug/EDKB08_Dimensions_Transfer.pdb differ diff --git a/obj/Debug/EDKB08_Dimensions_Transfer.vbproj.AssemblyReference.cache b/obj/Debug/EDKB08_Dimensions_Transfer.vbproj.AssemblyReference.cache index 28c399f..ef64108 100644 Binary files a/obj/Debug/EDKB08_Dimensions_Transfer.vbproj.AssemblyReference.cache and b/obj/Debug/EDKB08_Dimensions_Transfer.vbproj.AssemblyReference.cache differ