diff --git a/EDIDocumentImport/DocumentInfo.vb b/EDIDocumentImport/DocumentInfo.vb index 34e0421..4993a5e 100644 --- a/EDIDocumentImport/DocumentInfo.vb +++ b/EDIDocumentImport/DocumentInfo.vb @@ -8,8 +8,10 @@ Public Class DocumentInfo Public Type As DocumentType Public Mandator As Mandator - Public DataOriginal As Object Public Data As Object + Public DataOriginal As Object + Public DataOutput As Object + Public DataString As String Public Selected As Boolean = False diff --git a/EDIDocumentImport/DocumentLoader.vb b/EDIDocumentImport/DocumentLoader.vb index 95ecdb3..e6a6437 100644 --- a/EDIDocumentImport/DocumentLoader.vb +++ b/EDIDocumentImport/DocumentLoader.vb @@ -12,14 +12,16 @@ Imports EDIDocumentImport.WinLineInfo Public Class DocumentLoader Inherits Base - Public Config As Config - Private Database As MSSQLServer - Private Winline As WinLineInfo + Private ReadOnly Config As Config + Private ReadOnly Database As MSSQLServer + Private ReadOnly Winline As WinLineInfo + Private ReadOnly Serializer As Serializer Public Files As New List(Of Document) Public Sub New(pLogConfig As LogConfig, pConfig As Config, pDatabase As MSSQLServer, pWinline As WinLineInfo) MyBase.New(pLogConfig, pLogConfig.GetLogger()) + Serializer = New Serializer(pLogConfig) Config = pConfig Database = pDatabase Winline = pWinline @@ -138,6 +140,10 @@ Public Class DocumentLoader Dim oMandator = FindMatchingMandatorFromOrder(pDocument.Data) Dim oData As Orders.Input.MESOWebService = MatchOrderData(pDocument.Data, oMandator) + If oMandator Is Nothing Then + Logger.Warn("Mandator not found for File [{0}]", pDocument.File.Name) + End If + pDocument.Mandator = oMandator pDocument.Data = oData End If @@ -183,32 +189,8 @@ Public Class DocumentLoader Concat(oPositions). ToArray() - - 'Dim oAccountNumber = Winline.TryGetAccountNumber(oHead.Fakt_Kontonummer, oMandator) - 'If oAccountNumber IsNot Nothing Then - ' oHead.Fakt_Kontonummer = oAccountNumber - 'End If - - 'Dim oAccountNumber2 = Winline.TryGetAccountNumber(oHead.Lief_Kontonummer, oMandator) - 'If oAccountNumber2 IsNot Nothing Then - ' oHead.Lief_Kontonummer = oAccountNumber2 - 'End If - - 'For Each oPos In oPositions - ' Dim oArticleNumber = Winline.TryGetArticleNumber(oPos.Artikelnummer, oMandator) - ' If oArticleNumber Then - ' oPos.Artikelnummer = oArticleNumber - ' End If - - - 'Next - Return pData End Function - - - - Private Function WrapFileInfo(pFileInfo As FileInfo) As Document Return New Document With {.File = pFileInfo} End Function @@ -223,14 +205,14 @@ Public Class DocumentLoader ' Read data the first time, working copy Using oReader = oNavigator.ReadSubtree() - Dim oSerializer = GetSerializer(oSchemaType) + Dim oSerializer = Serializer.GetSerializer(oSchemaType) pDocument.Data = oSerializer.Deserialize(oReader) End Using ' Read data the second time, archive copy Using oReader = oNavigator.ReadSubtree() - Dim oSerializer = GetSerializer(oSchemaType) + Dim oSerializer = Serializer.GetSerializer(oSchemaType) pDocument.DataOriginal = oSerializer.Deserialize(oReader) End Using @@ -250,30 +232,6 @@ Public Class DocumentLoader End Using End Function - - Private Function GetSerializer(pSchemaType As Type) As XmlSerializer - Dim oSerializer As New XmlSerializer(pSchemaType) - - - AddHandler oSerializer.UnknownAttribute, Sub(sender As Object, e As XmlAttributeEventArgs) - Logger.Debug("Unknown Attribute: {0}", e.Attr) - End Sub - - AddHandler oSerializer.UnknownElement, Sub(sender As Object, e As XmlElementEventArgs) - Logger.Debug("Unknown Element: {0}", e.Element) - End Sub - - AddHandler oSerializer.UnknownNode, Sub(sender As Object, e As XmlNodeEventArgs) - Logger.Debug("Unknown Node: {0}", e.Name) - End Sub - - AddHandler oSerializer.UnreferencedObject, Sub(sender As Object, e As UnreferencedObjectEventArgs) - Logger.Debug("Unreferenced Object: {0}", e.UnreferencedId) - End Sub - - Return oSerializer - End Function - Private Function GetTemplateName(pDocument As XPathNavigator) As String Dim oTemplateName = pDocument. SelectSingleNode("//MESOWebService"). diff --git a/EDIDocumentImport/DocumentPositions.vb b/EDIDocumentImport/DocumentPositions.vb index 0cc5d11..a61704e 100644 --- a/EDIDocumentImport/DocumentPositions.vb +++ b/EDIDocumentImport/DocumentPositions.vb @@ -1,6 +1,9 @@ Imports DevExpress.XtraGrid.Columns Public Class DocumentPositions + ''' + ''' Class to determine the displayed columns in the positions grid + ''' Public Class OrderPosition Public Property RowNumber As Integer Public Property EuropeanArticleNumber As String @@ -60,6 +63,9 @@ Public Class DocumentPositions .VisibleIndex = 8 } + ''' + ''' Columns that can be changed in the positions grid + ''' Public Shared Property WritableColumns As New List(Of GridColumn) From { ColumnPrice } diff --git a/EDIDocumentImport/EDIDocumentImporter.vbproj b/EDIDocumentImport/EDIDocumentImporter.vbproj index 2dd0ee0..99beecc 100644 --- a/EDIDocumentImport/EDIDocumentImporter.vbproj +++ b/EDIDocumentImport/EDIDocumentImporter.vbproj @@ -48,6 +48,9 @@ On + + ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll + @@ -100,6 +103,10 @@ ..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll + + False + ..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll + False ..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll @@ -169,16 +176,18 @@ Settings.settings True - - - - - + OrderReport.vb - + Component + + + + + + @@ -191,7 +200,7 @@ My.Resources Designer - + OrderReport.vb @@ -210,6 +219,7 @@ + @@ -226,6 +236,8 @@ - + + + \ No newline at end of file diff --git a/EDIDocumentImport/My Project/AssemblyInfo.vb b/EDIDocumentImport/My Project/AssemblyInfo.vb index 7c3875d..d03ca97 100644 --- a/EDIDocumentImport/My Project/AssemblyInfo.vb +++ b/EDIDocumentImport/My Project/AssemblyInfo.vb @@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - + - + diff --git a/EDIDocumentImport/My Project/Resources.Designer.vb b/EDIDocumentImport/My Project/Resources.Designer.vb index 6d64699..4b30301 100644 --- a/EDIDocumentImport/My Project/Resources.Designer.vb +++ b/EDIDocumentImport/My Project/Resources.Designer.vb @@ -130,6 +130,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property paymentrefund() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("paymentrefund", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/EDIDocumentImport/My Project/Resources.resx b/EDIDocumentImport/My Project/Resources.resx index 081b898..5c37681 100644 --- a/EDIDocumentImport/My Project/Resources.resx +++ b/EDIDocumentImport/My Project/Resources.resx @@ -118,43 +118,46 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\showallfieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\import.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\import.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\showallfieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/EDIDocumentImport/My Project/licenses.licx b/EDIDocumentImport/My Project/licenses.licx index a25f102..4a9de77 100644 --- a/EDIDocumentImport/My Project/licenses.licx +++ b/EDIDocumentImport/My Project/licenses.licx @@ -1,13 +1,15 @@ -DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraReports.UserDesigner.XRDesignDockManager, DevExpress.XtraReports.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraReports.UserDesigner.XRDesignBarManager, DevExpress.XtraReports.v19.2.Extensions, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EDIDocumentImport/OrderReport.Designer.vb b/EDIDocumentImport/Reports/OrderReport.Designer.vb similarity index 52% rename from EDIDocumentImport/OrderReport.Designer.vb rename to EDIDocumentImport/Reports/OrderReport.Designer.vb index 3b71363..f23eff8 100644 --- a/EDIDocumentImport/OrderReport.Designer.vb +++ b/EDIDocumentImport/Reports/OrderReport.Designer.vb @@ -20,8 +20,9 @@ Partial Public Class OrderReport _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components) Me.Title = New DevExpress.XtraReports.UI.XRControlStyle() + Me.GroupCaption1 = New DevExpress.XtraReports.UI.XRControlStyle() + Me.GroupData1 = New DevExpress.XtraReports.UI.XRControlStyle() Me.DetailCaption1 = New DevExpress.XtraReports.UI.XRControlStyle() Me.DetailData1 = New DevExpress.XtraReports.UI.XRControlStyle() Me.DetailCaption2 = New DevExpress.XtraReports.UI.XRControlStyle() @@ -32,15 +33,15 @@ Partial Public Class OrderReport Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand() Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand() Me.Detail = New DevExpress.XtraReports.UI.DetailBand() - Me.DetailReport = New DevExpress.XtraReports.UI.DetailReportBand() Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo() Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo() - Me.label1 = New DevExpress.XtraReports.UI.XRLabel() Me.table1 = New DevExpress.XtraReports.UI.XRTable() Me.tableRow1 = New DevExpress.XtraReports.UI.XRTableRow() - Me.tableRow2 = New DevExpress.XtraReports.UI.XRTableRow() Me.tableCell1 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell2 = New DevExpress.XtraReports.UI.XRTableCell() + Me.table2 = New DevExpress.XtraReports.UI.XRTable() + Me.tableRow2 = New DevExpress.XtraReports.UI.XRTableRow() + Me.tableRow3 = New DevExpress.XtraReports.UI.XRTableRow() Me.tableCell3 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell4 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell5 = New DevExpress.XtraReports.UI.XRTableCell() @@ -55,11 +56,8 @@ Partial Public Class OrderReport Me.tableCell14 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell15 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell16 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell17 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell18 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell19 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell20 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell21 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell22 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell23 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell24 = New DevExpress.XtraReports.UI.XRTableCell() @@ -75,61 +73,40 @@ Partial Public Class OrderReport Me.tableCell34 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell35 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell36 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell37 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell38 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell39 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell40 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell41 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell42 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell43 = New DevExpress.XtraReports.UI.XRTableCell() + Me.table3 = New DevExpress.XtraReports.UI.XRTable() + Me.tableRow4 = New DevExpress.XtraReports.UI.XRTableRow() Me.tableCell44 = New DevExpress.XtraReports.UI.XRTableCell() - Me.checkBox1 = New DevExpress.XtraReports.UI.XRCheckBox() - Me.checkBox2 = New DevExpress.XtraReports.UI.XRCheckBox() - Me.GroupHeader1 = New DevExpress.XtraReports.UI.GroupHeaderBand() - Me.Detail1 = New DevExpress.XtraReports.UI.DetailBand() - Me.table2 = New DevExpress.XtraReports.UI.XRTable() - Me.tableRow3 = New DevExpress.XtraReports.UI.XRTableRow() - Me.tableCell45 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell46 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell47 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell48 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell49 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell50 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell51 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell52 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell53 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell54 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell55 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell56 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell57 = New DevExpress.XtraReports.UI.XRTableCell() - Me.table3 = New DevExpress.XtraReports.UI.XRTable() - Me.tableRow4 = New DevExpress.XtraReports.UI.XRTableRow() - Me.tableCell58 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell59 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell60 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell61 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell62 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell63 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell64 = New DevExpress.XtraReports.UI.XRTableCell() + Me.table4 = New DevExpress.XtraReports.UI.XRTable() + Me.tableRow5 = New DevExpress.XtraReports.UI.XRTableRow() Me.tableCell65 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell66 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell67 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell68 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell69 = New DevExpress.XtraReports.UI.XRTableCell() Me.tableCell70 = New DevExpress.XtraReports.UI.XRTableCell() - Me.checkBox3 = New DevExpress.XtraReports.UI.XRCheckBox() - Me.checkBox4 = New DevExpress.XtraReports.UI.XRCheckBox() - CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tableCell71 = New DevExpress.XtraReports.UI.XRTableCell() + Me.tableCell73 = New DevExpress.XtraReports.UI.XRTableCell() + Me.tableCell74 = New DevExpress.XtraReports.UI.XRTableCell() + Me.tableCell75 = New DevExpress.XtraReports.UI.XRTableCell() + Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel() + Me.Detail1 = New DevExpress.XtraReports.UI.DetailBand() + Me.DetailReport = New DevExpress.XtraReports.UI.DetailReportBand() + Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components) CType(Me.table1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.table2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.table4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' - 'ObjectDataSource1 - ' - Me.ObjectDataSource1.DataSource = GetType(EDIDocumentImport.Orders.OrdersReport) - Me.ObjectDataSource1.Name = "ObjectDataSource1" - ' 'Title ' Me.Title.BackColor = System.Drawing.Color.Transparent @@ -137,19 +114,43 @@ Partial Public Class OrderReport Me.Title.Borders = DevExpress.XtraPrinting.BorderSide.None Me.Title.BorderWidth = 1.0! Me.Title.Font = New System.Drawing.Font("Arial", 14.25!) - Me.Title.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer)) + Me.Title.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(70, Byte), Integer), CType(CType(80, Byte), Integer)) Me.Title.Name = "Title" ' + 'GroupCaption1 + ' + Me.GroupCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer)) + Me.GroupCaption1.BorderColor = System.Drawing.Color.White + Me.GroupCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom + Me.GroupCaption1.BorderWidth = 2.0! + Me.GroupCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold) + Me.GroupCaption1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer), CType(CType(228, Byte), Integer)) + Me.GroupCaption1.Name = "GroupCaption1" + Me.GroupCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!) + Me.GroupCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft + ' + 'GroupData1 + ' + Me.GroupData1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer)) + Me.GroupData1.BorderColor = System.Drawing.Color.White + Me.GroupData1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom + Me.GroupData1.BorderWidth = 2.0! + Me.GroupData1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold) + Me.GroupData1.ForeColor = System.Drawing.Color.White + Me.GroupData1.Name = "GroupData1" + Me.GroupData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 2, 0, 0, 100.0!) + Me.GroupData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft + ' 'DetailCaption1 ' - Me.DetailCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer)) + Me.DetailCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(23, Byte), Integer), CType(CType(104, Byte), Integer), CType(CType(196, Byte), Integer)) Me.DetailCaption1.BorderColor = System.Drawing.Color.White Me.DetailCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Left Me.DetailCaption1.BorderWidth = 2.0! Me.DetailCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold) Me.DetailCaption1.ForeColor = System.Drawing.Color.White Me.DetailCaption1.Name = "DetailCaption1" - Me.DetailCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 96.0!) + Me.DetailCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) Me.DetailCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft ' 'DetailData1 @@ -160,19 +161,19 @@ Partial Public Class OrderReport Me.DetailData1.Font = New System.Drawing.Font("Arial", 8.25!) Me.DetailData1.ForeColor = System.Drawing.Color.Black Me.DetailData1.Name = "DetailData1" - Me.DetailData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 96.0!) + Me.DetailData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) Me.DetailData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft ' 'DetailCaption2 ' - Me.DetailCaption2.BackColor = System.Drawing.Color.FromArgb(CType(CType(111, Byte), Integer), CType(CType(111, Byte), Integer), CType(CType(111, Byte), Integer)) + Me.DetailCaption2.BackColor = System.Drawing.Color.FromArgb(CType(CType(37, Byte), Integer), CType(CType(129, Byte), Integer), CType(CType(216, Byte), Integer)) Me.DetailCaption2.BorderColor = System.Drawing.Color.White Me.DetailCaption2.Borders = DevExpress.XtraPrinting.BorderSide.Left Me.DetailCaption2.BorderWidth = 2.0! Me.DetailCaption2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold) Me.DetailCaption2.ForeColor = System.Drawing.Color.White Me.DetailCaption2.Name = "DetailCaption2" - Me.DetailCaption2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 96.0!) + Me.DetailCaption2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) Me.DetailCaption2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft ' 'DetailData2 @@ -183,830 +184,551 @@ Partial Public Class OrderReport Me.DetailData2.Font = New System.Drawing.Font("Arial", 8.25!) Me.DetailData2.ForeColor = System.Drawing.Color.Black Me.DetailData2.Name = "DetailData2" - Me.DetailData2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 96.0!) + Me.DetailData2.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) Me.DetailData2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft ' 'DetailData3_Odd ' - Me.DetailData3_Odd.BackColor = System.Drawing.Color.FromArgb(CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer)) + Me.DetailData3_Odd.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(248, Byte), Integer)) Me.DetailData3_Odd.BorderColor = System.Drawing.Color.Transparent Me.DetailData3_Odd.Borders = DevExpress.XtraPrinting.BorderSide.None Me.DetailData3_Odd.BorderWidth = 1.0! Me.DetailData3_Odd.Font = New System.Drawing.Font("Arial", 8.25!) Me.DetailData3_Odd.ForeColor = System.Drawing.Color.Black Me.DetailData3_Odd.Name = "DetailData3_Odd" - Me.DetailData3_Odd.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 96.0!) + Me.DetailData3_Odd.Padding = New DevExpress.XtraPrinting.PaddingInfo(6, 6, 0, 0, 100.0!) Me.DetailData3_Odd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft ' 'PageInfo ' Me.PageInfo.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold) - Me.PageInfo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer)) + Me.PageInfo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(70, Byte), Integer), CType(CType(80, Byte), Integer)) Me.PageInfo.Name = "PageInfo" - Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96.0!) + Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) ' 'TopMargin ' - Me.TopMargin.Dpi = 96.0! - Me.TopMargin.HeightF = 48.0! + Me.TopMargin.HeightF = 25.0! Me.TopMargin.Name = "TopMargin" ' 'BottomMargin ' Me.BottomMargin.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.pageInfo1, Me.pageInfo2}) - Me.BottomMargin.Dpi = 96.0! - Me.BottomMargin.HeightF = 390.68! + Me.BottomMargin.HeightF = 29.0! Me.BottomMargin.Name = "BottomMargin" ' 'ReportHeader ' - Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label1}) - Me.ReportHeader.Dpi = 96.0! - Me.ReportHeader.HeightF = 57.6! + Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table2, Me.table1}) + Me.ReportHeader.HeightF = 98.87498! Me.ReportHeader.Name = "ReportHeader" ' 'Detail ' - Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table1}) - Me.Detail.Dpi = 96.0! - Me.Detail.HeightF = 53.76! - Me.Detail.HierarchyPrintOptions.Indent = 19.2! + Me.Detail.HeightF = 0! Me.Detail.KeepTogether = True Me.Detail.Name = "Detail" ' - 'DetailReport - ' - Me.DetailReport.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.GroupHeader1, Me.Detail1}) - Me.DetailReport.DataMember = "Positions" - Me.DetailReport.DataSource = Me.ObjectDataSource1 - Me.DetailReport.Dpi = 96.0! - Me.DetailReport.Level = 0 - Me.DetailReport.Name = "DetailReport" - ' 'pageInfo1 ' - Me.pageInfo1.Dpi = 96.0! Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(6.0!, 6.0!) Me.pageInfo1.Name = "pageInfo1" Me.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime - Me.pageInfo1.SizeF = New System.Drawing.SizeF(348.0!, 22.0!) + Me.pageInfo1.SizeF = New System.Drawing.SizeF(513.0!, 23.0!) Me.pageInfo1.StyleName = "PageInfo" ' 'pageInfo2 ' - Me.pageInfo2.Dpi = 96.0! - Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(366.0!, 6.0!) + Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(531.0!, 6.0!) Me.pageInfo2.Name = "pageInfo2" - Me.pageInfo2.SizeF = New System.Drawing.SizeF(348.0!, 22.0!) + Me.pageInfo2.SizeF = New System.Drawing.SizeF(513.0!, 23.0!) Me.pageInfo2.StyleName = "PageInfo" Me.pageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight Me.pageInfo2.TextFormatString = "Seite {0} von {1}" ' - 'label1 - ' - Me.label1.Dpi = 96.0! - Me.label1.LocationFloat = New DevExpress.Utils.PointFloat(6.0!, 6.0!) - Me.label1.Name = "label1" - Me.label1.SizeF = New System.Drawing.SizeF(708.0!, 23.22656!) - Me.label1.StyleName = "Title" - Me.label1.Text = "OrderReport" - ' 'table1 ' - Me.table1.Dpi = 96.0! - Me.table1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) + Me.table1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 1.999998!) Me.table1.Name = "table1" - Me.table1.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow1, Me.tableRow2}) - Me.table1.SizeF = New System.Drawing.SizeF(720.0!, 53.76!) + Me.table1.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow1}) + Me.table1.SizeF = New System.Drawing.SizeF(1050.0!, 25.0!) ' 'tableRow1 ' - Me.tableRow1.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell1, Me.tableCell2, Me.tableCell3, Me.tableCell4, Me.tableCell5, Me.tableCell6, Me.tableCell7, Me.tableCell8, Me.tableCell9, Me.tableCell10, Me.tableCell11, Me.tableCell12, Me.tableCell13, Me.tableCell14, Me.tableCell15, Me.tableCell16, Me.tableCell17, Me.tableCell18, Me.tableCell19, Me.tableCell20, Me.tableCell21, Me.tableCell22}) - Me.tableRow1.Dpi = 96.0! + Me.tableRow1.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell1, Me.tableCell2}) Me.tableRow1.Name = "tableRow1" - Me.tableRow1.Weight = 0.5R - ' - 'tableRow2 - ' - Me.tableRow2.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell23, Me.tableCell24, Me.tableCell25, Me.tableCell26, Me.tableCell27, Me.tableCell28, Me.tableCell29, Me.tableCell30, Me.tableCell31, Me.tableCell32, Me.tableCell33, Me.tableCell34, Me.tableCell35, Me.tableCell36, Me.tableCell37, Me.tableCell38, Me.tableCell39, Me.tableCell40, Me.tableCell41, Me.tableCell42, Me.tableCell43, Me.tableCell44}) - Me.tableRow2.Dpi = 96.0! - Me.tableRow2.Name = "tableRow2" - Me.tableRow2.Weight = 0.5R + Me.tableRow1.Weight = 1.0R ' 'tableCell1 ' - Me.tableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None - Me.tableCell1.Dpi = 96.0! Me.tableCell1.Name = "tableCell1" - Me.tableCell1.StyleName = "DetailCaption1" - Me.tableCell1.StylePriority.UseBorders = False - Me.tableCell1.Text = "Head BELEGKEY" - Me.tableCell1.Weight = 0.03813254568311903R + Me.tableCell1.StyleName = "GroupCaption1" + Me.tableCell1.Text = "HEAD BELEGKEY" + Me.tableCell1.Weight = 0.1016025143577939R ' 'tableCell2 ' - Me.tableCell2.Dpi = 96.0! + Me.tableCell2.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.BELEGKEY]")}) Me.tableCell2.Name = "tableCell2" - Me.tableCell2.StyleName = "DetailCaption1" - Me.tableCell2.Text = "Head Fakt Kontonummer" - Me.tableCell2.Weight = 0.052852646509806318R + Me.tableCell2.StyleName = "GroupData1" + Me.tableCell2.Weight = 0.8983975074404762R + ' + 'table2 + ' + Me.table2.LocationFloat = New DevExpress.Utils.PointFloat(0.00003973643!, 27.0!) + Me.table2.Name = "table2" + Me.table2.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow2, Me.tableRow3}) + Me.table2.SizeF = New System.Drawing.SizeF(1050.0!, 56.0!) + ' + 'tableRow2 + ' + Me.tableRow2.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell3, Me.tableCell4, Me.tableCell5, Me.tableCell6, Me.tableCell7, Me.tableCell8, Me.tableCell9, Me.tableCell10, Me.tableCell11, Me.tableCell12, Me.tableCell13, Me.tableCell14, Me.tableCell15, Me.tableCell16, Me.tableCell18, Me.tableCell19, Me.tableCell22}) + Me.tableRow2.Name = "tableRow2" + Me.tableRow2.Weight = 0.5R + ' + 'tableRow3 + ' + Me.tableRow3.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell23, Me.tableCell24, Me.tableCell25, Me.tableCell26, Me.tableCell27, Me.tableCell28, Me.tableCell29, Me.tableCell30, Me.tableCell31, Me.tableCell32, Me.tableCell33, Me.tableCell34, Me.tableCell35, Me.tableCell36, Me.tableCell38, Me.tableCell39, Me.tableCell42}) + Me.tableRow3.Name = "tableRow3" + Me.tableRow3.Weight = 0.5R ' 'tableCell3 ' - Me.tableCell3.Dpi = 96.0! + Me.tableCell3.Borders = DevExpress.XtraPrinting.BorderSide.None Me.tableCell3.Name = "tableCell3" Me.tableCell3.StyleName = "DetailCaption1" - Me.tableCell3.Text = "Head Laufnummer" - Me.tableCell3.Weight = 0.040361735555860728R + Me.tableCell3.StylePriority.UseBorders = False + Me.tableCell3.Text = "Head Fakt Kontonummer" + Me.tableCell3.Weight = 0.057705637613932291R ' 'tableCell4 ' - Me.tableCell4.Dpi = 96.0! Me.tableCell4.Name = "tableCell4" Me.tableCell4.StyleName = "DetailCaption1" - Me.tableCell4.Text = "Head Fakt Name" - Me.tableCell4.Weight = 0.036352337731255423R + Me.tableCell4.Text = "Head Laufnummer" + Me.tableCell4.Weight = 0.044022438412620907R ' 'tableCell5 ' - Me.tableCell5.Dpi = 96.0! Me.tableCell5.Name = "tableCell5" Me.tableCell5.StyleName = "DetailCaption1" - Me.tableCell5.Text = "Head Fakt Strasse" - Me.tableCell5.Weight = 0.039926483896043564R + Me.tableCell5.Text = "Head Fakt Name" + Me.tableCell5.Weight = 0.03963033040364583R ' 'tableCell6 ' - Me.tableCell6.Dpi = 96.0! Me.tableCell6.Name = "tableCell6" Me.tableCell6.StyleName = "DetailCaption1" - Me.tableCell6.Text = "Head Fakt PLZ" - Me.tableCell6.Weight = 0.032999730110168456R + Me.tableCell6.Text = "Head Fakt Strasse" + Me.tableCell6.Weight = 0.043545641217912948R ' 'tableCell7 ' - Me.tableCell7.Dpi = 96.0! Me.tableCell7.Name = "tableCell7" Me.tableCell7.StyleName = "DetailCaption1" - Me.tableCell7.Text = "Head Fakt Ort" - Me.tableCell7.Weight = 0.031439103020562069R + Me.tableCell7.Text = "Head Fakt PLZ" + Me.tableCell7.Weight = 0.035957706996372768R ' 'tableCell8 ' - Me.tableCell8.Dpi = 96.0! Me.tableCell8.Name = "tableCell8" Me.tableCell8.StyleName = "DetailCaption1" - Me.tableCell8.Text = "Head Fakt Ansprechpartner" - Me.tableCell8.Weight = 0.057769801881578237R + Me.tableCell8.Text = "Head Fakt Ort" + Me.tableCell8.Weight = 0.034248112269810269R ' 'tableCell9 ' - Me.tableCell9.Dpi = 96.0! Me.tableCell9.Name = "tableCell9" Me.tableCell9.StyleName = "DetailCaption1" - Me.tableCell9.Text = "Head Lief Kontonummer" - Me.tableCell9.Weight = 0.051735109753078885R + Me.tableCell9.Text = "Head Fakt Ansprechpartner" + Me.tableCell9.Weight = 0.063092150006975448R ' 'tableCell10 ' - Me.tableCell10.Dpi = 96.0! Me.tableCell10.Name = "tableCell10" Me.tableCell10.StyleName = "DetailCaption1" - Me.tableCell10.Text = "Head Lief Name" - Me.tableCell10.Weight = 0.035234800974528R + Me.tableCell10.Text = "Head Lief Kontonummer" + Me.tableCell10.Weight = 0.056481428600492933R ' 'tableCell11 ' - Me.tableCell11.Dpi = 96.0! Me.tableCell11.Name = "tableCell11" Me.tableCell11.StyleName = "DetailCaption1" - Me.tableCell11.Text = "Head Lief Strasse" - Me.tableCell11.Weight = 0.038808949788411456R + Me.tableCell11.Text = "Head Lief Name" + Me.tableCell11.Weight = 0.038406121390206473R ' 'tableCell12 ' - Me.tableCell12.Dpi = 96.0! Me.tableCell12.Name = "tableCell12" Me.tableCell12.StyleName = "DetailCaption1" - Me.tableCell12.Text = "Head Lief PLZ" - Me.tableCell12.Weight = 0.031882196002536348R + Me.tableCell12.Text = "Head Lief Strasse" + Me.tableCell12.Weight = 0.0423214358375186R ' 'tableCell13 ' - Me.tableCell13.Dpi = 96.0! Me.tableCell13.Name = "tableCell13" Me.tableCell13.StyleName = "DetailCaption1" - Me.tableCell13.Text = "Head Lief Ort" - Me.tableCell13.Weight = 0.030321566263834636R + Me.tableCell13.Text = "Head Lief PLZ" + Me.tableCell13.Weight = 0.034733501615978421R ' 'tableCell14 ' - Me.tableCell14.Dpi = 96.0! Me.tableCell14.Name = "tableCell14" Me.tableCell14.StyleName = "DetailCaption1" - Me.tableCell14.Text = "Head Belegart" - Me.tableCell14.Weight = 0.032111583815680612R + Me.tableCell14.Text = "Head Lief Ort" + Me.tableCell14.Weight = 0.033023906889415922R ' 'tableCell15 ' - Me.tableCell15.Dpi = 96.0! Me.tableCell15.Name = "tableCell15" Me.tableCell15.StyleName = "DetailCaption1" - Me.tableCell15.Text = "Head Datum Auftrag Bestellung" - Me.tableCell15.Weight = 0.0655690246158176R + Me.tableCell15.Text = "Head Belegart" + Me.tableCell15.Weight = 0.03498478480747768R ' 'tableCell16 ' - Me.tableCell16.Dpi = 96.0! Me.tableCell16.Name = "tableCell16" Me.tableCell16.StyleName = "DetailCaption1" - Me.tableCell16.StylePriority.UseTextAlignment = False - Me.tableCell16.Text = "Head Datum Auftrag Bestellung Specified" - Me.tableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell16.Weight = 0.084535747104220918R - ' - 'tableCell17 - ' - Me.tableCell17.Dpi = 96.0! - Me.tableCell17.Name = "tableCell17" - Me.tableCell17.StyleName = "DetailCaption1" - Me.tableCell17.Text = "Head Auftrags Bestellnummer" - Me.tableCell17.Weight = 0.062677155600653761R + Me.tableCell16.Text = "Head Datum Auftrag Bestellung" + Me.tableCell16.Weight = 0.1640488034202939R ' 'tableCell18 ' - Me.tableCell18.Dpi = 96.0! Me.tableCell18.Name = "tableCell18" Me.tableCell18.StyleName = "DetailCaption1" - Me.tableCell18.Text = "Head Projektnummer" - Me.tableCell18.Weight = 0.045498477088080511R + Me.tableCell18.Text = "Head Auftrags Bestellnummer" + Me.tableCell18.Weight = 0.068467915852864589R ' 'tableCell19 ' - Me.tableCell19.Dpi = 96.0! Me.tableCell19.Name = "tableCell19" Me.tableCell19.StyleName = "DetailCaption1" Me.tableCell19.Text = "Head Leistungsdatum" - Me.tableCell19.Weight = 0.047053220536973743R - ' - 'tableCell20 - ' - Me.tableCell20.Dpi = 96.0! - Me.tableCell20.Name = "tableCell20" - Me.tableCell20.StyleName = "DetailCaption1" - Me.tableCell20.StylePriority.UseTextAlignment = False - Me.tableCell20.Text = "Head Leistungsdatum Specified" - Me.tableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell20.Weight = 0.066019958919949R - ' - 'tableCell21 - ' - Me.tableCell21.Dpi = 96.0! - Me.tableCell21.Name = "tableCell21" - Me.tableCell21.StyleName = "DetailCaption1" - Me.tableCell21.Text = "Head Auftragsreferenz" - Me.tableCell21.Weight = 0.048174683252970377R + Me.tableCell19.Weight = 0.17606359209333147R ' 'tableCell22 ' - Me.tableCell22.Dpi = 96.0! Me.tableCell22.Name = "tableCell22" Me.tableCell22.StyleName = "DetailCaption1" Me.tableCell22.Text = "Head Infotext" - Me.tableCell22.Weight = 0.030543197525872125R + Me.tableCell22.Weight = 0.0332666015625R ' 'tableCell23 ' Me.tableCell23.Borders = DevExpress.XtraPrinting.BorderSide.None - Me.tableCell23.Dpi = 96.0! - Me.tableCell23.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.BELEGKEY]")}) + Me.tableCell23.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Kontonummer]")}) Me.tableCell23.Name = "tableCell23" Me.tableCell23.StyleName = "DetailData1" Me.tableCell23.StylePriority.UseBorders = False - Me.tableCell23.Weight = 0.03813254568311903R + Me.tableCell23.Weight = 0.057705637613932291R ' 'tableCell24 ' - Me.tableCell24.Dpi = 96.0! - Me.tableCell24.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Kontonummer]")}) + Me.tableCell24.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Laufnummer]")}) Me.tableCell24.Name = "tableCell24" Me.tableCell24.StyleName = "DetailData1" - Me.tableCell24.Weight = 0.052852646509806318R + Me.tableCell24.Weight = 0.044022438412620907R ' 'tableCell25 ' - Me.tableCell25.Dpi = 96.0! - Me.tableCell25.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Laufnummer]")}) + Me.tableCell25.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Name]")}) Me.tableCell25.Name = "tableCell25" Me.tableCell25.StyleName = "DetailData1" - Me.tableCell25.Weight = 0.040361735555860728R + Me.tableCell25.Weight = 0.03963033040364583R ' 'tableCell26 ' - Me.tableCell26.Dpi = 96.0! - Me.tableCell26.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Name]")}) + Me.tableCell26.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Strasse]")}) Me.tableCell26.Name = "tableCell26" Me.tableCell26.StyleName = "DetailData1" - Me.tableCell26.Weight = 0.036352337731255423R + Me.tableCell26.Weight = 0.043545641217912948R ' 'tableCell27 ' - Me.tableCell27.Dpi = 96.0! - Me.tableCell27.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Strasse]")}) + Me.tableCell27.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_PLZ]")}) Me.tableCell27.Name = "tableCell27" Me.tableCell27.StyleName = "DetailData1" - Me.tableCell27.Weight = 0.039926483896043564R + Me.tableCell27.Weight = 0.035957706996372768R ' 'tableCell28 ' - Me.tableCell28.Dpi = 96.0! - Me.tableCell28.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_PLZ]")}) + Me.tableCell28.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Ort]")}) Me.tableCell28.Name = "tableCell28" Me.tableCell28.StyleName = "DetailData1" - Me.tableCell28.Weight = 0.032999730110168456R + Me.tableCell28.Weight = 0.034248112269810269R ' 'tableCell29 ' - Me.tableCell29.Dpi = 96.0! - Me.tableCell29.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Ort]")}) + Me.tableCell29.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Ansprechpartner]")}) Me.tableCell29.Name = "tableCell29" Me.tableCell29.StyleName = "DetailData1" - Me.tableCell29.Weight = 0.031439103020562069R + Me.tableCell29.Weight = 0.063092150006975448R ' 'tableCell30 ' - Me.tableCell30.Dpi = 96.0! - Me.tableCell30.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Fakt_Ansprechpartner]")}) + Me.tableCell30.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Kontonummer]")}) Me.tableCell30.Name = "tableCell30" Me.tableCell30.StyleName = "DetailData1" - Me.tableCell30.Weight = 0.057769801881578237R + Me.tableCell30.Weight = 0.056481428600492933R ' 'tableCell31 ' - Me.tableCell31.Dpi = 96.0! - Me.tableCell31.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Kontonummer]")}) + Me.tableCell31.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Name]")}) Me.tableCell31.Name = "tableCell31" Me.tableCell31.StyleName = "DetailData1" - Me.tableCell31.Weight = 0.051735109753078885R + Me.tableCell31.Weight = 0.038406121390206473R ' 'tableCell32 ' - Me.tableCell32.Dpi = 96.0! - Me.tableCell32.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Name]")}) + Me.tableCell32.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Strasse]")}) Me.tableCell32.Name = "tableCell32" Me.tableCell32.StyleName = "DetailData1" - Me.tableCell32.Weight = 0.035234800974528R + Me.tableCell32.Weight = 0.0423214358375186R ' 'tableCell33 ' - Me.tableCell33.Dpi = 96.0! - Me.tableCell33.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Strasse]")}) + Me.tableCell33.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_PLZ]")}) Me.tableCell33.Name = "tableCell33" Me.tableCell33.StyleName = "DetailData1" - Me.tableCell33.Weight = 0.038808949788411456R + Me.tableCell33.Weight = 0.034733501615978421R ' 'tableCell34 ' - Me.tableCell34.Dpi = 96.0! - Me.tableCell34.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_PLZ]")}) + Me.tableCell34.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Ort]")}) Me.tableCell34.Name = "tableCell34" Me.tableCell34.StyleName = "DetailData1" - Me.tableCell34.Weight = 0.031882196002536348R + Me.tableCell34.Weight = 0.033023906889415922R ' 'tableCell35 ' - Me.tableCell35.Dpi = 96.0! - Me.tableCell35.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Lief_Ort]")}) + Me.tableCell35.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Belegart]")}) Me.tableCell35.Name = "tableCell35" Me.tableCell35.StyleName = "DetailData1" - Me.tableCell35.Weight = 0.030321566263834636R + Me.tableCell35.Weight = 0.03498478480747768R ' 'tableCell36 ' - Me.tableCell36.Dpi = 96.0! - Me.tableCell36.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Belegart]")}) + Me.tableCell36.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Datum_AuftragBestellung]")}) Me.tableCell36.Name = "tableCell36" Me.tableCell36.StyleName = "DetailData1" - Me.tableCell36.Weight = 0.032111583815680612R - ' - 'tableCell37 - ' - Me.tableCell37.Dpi = 96.0! - Me.tableCell37.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Datum_AuftragBestellung]")}) - Me.tableCell37.Name = "tableCell37" - Me.tableCell37.StyleName = "DetailData1" - Me.tableCell37.Weight = 0.0655690246158176R + Me.tableCell36.Weight = 0.1640488034202939R ' 'tableCell38 ' - Me.tableCell38.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.checkBox1}) - Me.tableCell38.Dpi = 96.0! + Me.tableCell38.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.AuftragsBestellnummer]")}) Me.tableCell38.Name = "tableCell38" Me.tableCell38.StyleName = "DetailData1" - Me.tableCell38.StylePriority.UseTextAlignment = False - Me.tableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell38.Weight = 0.084535747104220918R + Me.tableCell38.Weight = 0.068467915852864589R ' 'tableCell39 ' - Me.tableCell39.Dpi = 96.0! - Me.tableCell39.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.AuftragsBestellnummer]")}) + Me.tableCell39.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Leistungsdatum]")}) Me.tableCell39.Name = "tableCell39" Me.tableCell39.StyleName = "DetailData1" - Me.tableCell39.Weight = 0.062677155600653761R - ' - 'tableCell40 - ' - Me.tableCell40.Dpi = 96.0! - Me.tableCell40.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Projektnummer]")}) - Me.tableCell40.Name = "tableCell40" - Me.tableCell40.StyleName = "DetailData1" - Me.tableCell40.Weight = 0.045498477088080511R - ' - 'tableCell41 - ' - Me.tableCell41.Dpi = 96.0! - Me.tableCell41.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Leistungsdatum]")}) - Me.tableCell41.Name = "tableCell41" - Me.tableCell41.StyleName = "DetailData1" - Me.tableCell41.Weight = 0.047053220536973743R + Me.tableCell39.Weight = 0.1760636574881489R ' 'tableCell42 ' - Me.tableCell42.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.checkBox2}) - Me.tableCell42.Dpi = 96.0! + Me.tableCell42.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Infotext]")}) Me.tableCell42.Name = "tableCell42" Me.tableCell42.StyleName = "DetailData1" - Me.tableCell42.StylePriority.UseTextAlignment = False - Me.tableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell42.Weight = 0.066019958919949R - ' - 'tableCell43 - ' - Me.tableCell43.Dpi = 96.0! - Me.tableCell43.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Auftragsreferenz]")}) - Me.tableCell43.Name = "tableCell43" - Me.tableCell43.StyleName = "DetailData1" - Me.tableCell43.Weight = 0.048174683252970377R - ' - 'tableCell44 - ' - Me.tableCell44.Dpi = 96.0! - Me.tableCell44.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head.Infotext]")}) - Me.tableCell44.Name = "tableCell44" - Me.tableCell44.StyleName = "DetailData1" - Me.tableCell44.Weight = 0.030543197525872125R - ' - 'checkBox1 - ' - Me.checkBox1.AnchorHorizontal = CType((DevExpress.XtraReports.UI.HorizontalAnchorStyles.Left Or DevExpress.XtraReports.UI.HorizontalAnchorStyles.Right), DevExpress.XtraReports.UI.HorizontalAnchorStyles) - Me.checkBox1.AnchorVertical = CType((DevExpress.XtraReports.UI.VerticalAnchorStyles.Top Or DevExpress.XtraReports.UI.VerticalAnchorStyles.Bottom), DevExpress.XtraReports.UI.VerticalAnchorStyles) - Me.checkBox1.Dpi = 96.0! - Me.checkBox1.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "CheckState", "[Head.Datum_AuftragBestellungSpecified]")}) - Me.checkBox1.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Center - Me.checkBox1.LocationFloat = New DevExpress.Utils.PointFloat(2.0!, 0!) - Me.checkBox1.Name = "checkBox1" - Me.checkBox1.SizeF = New System.Drawing.SizeF(58.86573!, 26.88!) - ' - 'checkBox2 - ' - Me.checkBox2.AnchorHorizontal = CType((DevExpress.XtraReports.UI.HorizontalAnchorStyles.Left Or DevExpress.XtraReports.UI.HorizontalAnchorStyles.Right), DevExpress.XtraReports.UI.HorizontalAnchorStyles) - Me.checkBox2.AnchorVertical = CType((DevExpress.XtraReports.UI.VerticalAnchorStyles.Top Or DevExpress.XtraReports.UI.VerticalAnchorStyles.Bottom), DevExpress.XtraReports.UI.VerticalAnchorStyles) - Me.checkBox2.Dpi = 96.0! - Me.checkBox2.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "CheckState", "[Head.LeistungsdatumSpecified]")}) - Me.checkBox2.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Center - Me.checkBox2.LocationFloat = New DevExpress.Utils.PointFloat(2.0!, 0!) - Me.checkBox2.Name = "checkBox2" - Me.checkBox2.SizeF = New System.Drawing.SizeF(45.53437!, 26.88!) - ' - 'GroupHeader1 - ' - Me.GroupHeader1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table2}) - Me.GroupHeader1.Dpi = 96.0! - Me.GroupHeader1.GroupUnion = DevExpress.XtraReports.UI.GroupUnion.WithFirstDetail - Me.GroupHeader1.HeightF = 26.88! - Me.GroupHeader1.Name = "GroupHeader1" - ' - 'Detail1 - ' - Me.Detail1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table3}) - Me.Detail1.Dpi = 96.0! - Me.Detail1.HeightF = 24.08! - Me.Detail1.HierarchyPrintOptions.Indent = 19.2! - Me.Detail1.Name = "Detail1" - ' - 'table2 - ' - Me.table2.Dpi = 96.0! - Me.table2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) - Me.table2.Name = "table2" - Me.table2.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow3}) - Me.table2.SizeF = New System.Drawing.SizeF(720.0!, 26.88!) - ' - 'tableRow3 - ' - Me.tableRow3.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell45, Me.tableCell46, Me.tableCell47, Me.tableCell48, Me.tableCell49, Me.tableCell50, Me.tableCell51, Me.tableCell52, Me.tableCell53, Me.tableCell54, Me.tableCell55, Me.tableCell56, Me.tableCell57}) - Me.tableRow3.Dpi = 96.0! - Me.tableRow3.Name = "tableRow3" - Me.tableRow3.Weight = 1.0R - ' - 'tableCell45 - ' - Me.tableCell45.Borders = DevExpress.XtraPrinting.BorderSide.None - Me.tableCell45.Dpi = 96.0! - Me.tableCell45.Name = "tableCell45" - Me.tableCell45.StyleName = "DetailCaption2" - Me.tableCell45.StylePriority.UseBorders = False - Me.tableCell45.Text = "BELEGKEY" - Me.tableCell45.Weight = 0.063200924131605357R - ' - 'tableCell46 - ' - Me.tableCell46.Dpi = 96.0! - Me.tableCell46.Name = "tableCell46" - Me.tableCell46.StyleName = "DetailCaption2" - Me.tableCell46.Text = "Zeilennummer" - Me.tableCell46.Weight = 0.075647444195217559R - ' - 'tableCell47 - ' - Me.tableCell47.Dpi = 96.0! - Me.tableCell47.Name = "tableCell47" - Me.tableCell47.StyleName = "DetailCaption2" - Me.tableCell47.Text = "Datentyp" - Me.tableCell47.Weight = 0.051793130238850911R - ' - 'tableCell48 - ' - Me.tableCell48.Dpi = 96.0! - Me.tableCell48.Name = "tableCell48" - Me.tableCell48.StyleName = "DetailCaption2" - Me.tableCell48.Text = "Artikelnummer" - Me.tableCell48.Weight = 0.077724901835123691R - ' - 'tableCell49 - ' - Me.tableCell49.Dpi = 96.0! - Me.tableCell49.Name = "tableCell49" - Me.tableCell49.StyleName = "DetailCaption2" - Me.tableCell49.Text = "Bezeichnung" - Me.tableCell49.Weight = 0.069934437010023331R - ' - 'tableCell50 - ' - Me.tableCell50.Dpi = 96.0! - Me.tableCell50.Name = "tableCell50" - Me.tableCell50.StyleName = "DetailCaption2" - Me.tableCell50.Text = "Notizblock" - Me.tableCell50.Weight = 0.059046008851793078R - ' - 'tableCell51 - ' - Me.tableCell51.Dpi = 96.0! - Me.tableCell51.Name = "tableCell51" - Me.tableCell51.StyleName = "DetailCaption2" - Me.tableCell51.Text = "Lieferantenartikelnummer" - Me.tableCell51.Weight = 0.12646770477294922R - ' - 'tableCell52 - ' - Me.tableCell52.Dpi = 96.0! - Me.tableCell52.Name = "tableCell52" - Me.tableCell52.StyleName = "DetailCaption2" - Me.tableCell52.StylePriority.UseTextAlignment = False - Me.tableCell52.Text = "Menge bestellt" - Me.tableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight - Me.tableCell52.Weight = 0.076681619220309791R - ' - 'tableCell53 - ' - Me.tableCell53.Dpi = 96.0! - Me.tableCell53.Name = "tableCell53" - Me.tableCell53.StyleName = "DetailCaption2" - Me.tableCell53.StylePriority.UseTextAlignment = False - Me.tableCell53.Text = "Menge bestellt Specified" - Me.tableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell53.Weight = 0.12075469758775499R - ' - 'tableCell54 - ' - Me.tableCell54.Dpi = 96.0! - Me.tableCell54.Name = "tableCell54" - Me.tableCell54.StyleName = "DetailCaption2" - Me.tableCell54.StylePriority.UseTextAlignment = False - Me.tableCell54.Text = "Menge geliefert" - Me.tableCell54.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight - Me.tableCell54.Weight = 0.0803126123216417R - ' - 'tableCell55 - ' - Me.tableCell55.Dpi = 96.0! - Me.tableCell55.Name = "tableCell55" - Me.tableCell55.StyleName = "DetailCaption2" - Me.tableCell55.Text = "Colli" - Me.tableCell55.Weight = 0.032089177767435709R - ' - 'tableCell56 - ' - Me.tableCell56.Dpi = 96.0! - Me.tableCell56.Name = "tableCell56" - Me.tableCell56.StyleName = "DetailCaption2" - Me.tableCell56.StylePriority.UseTextAlignment = False - Me.tableCell56.Text = "Einzelpreis" - Me.tableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight - Me.tableCell56.Weight = 0.061137135823567709R - ' - 'tableCell57 - ' - Me.tableCell57.Dpi = 96.0! - Me.tableCell57.Name = "tableCell57" - Me.tableCell57.StyleName = "DetailCaption2" - Me.tableCell57.StylePriority.UseTextAlignment = False - Me.tableCell57.Text = "Einzelpreis Specified" - Me.tableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell57.Weight = 0.10521028306749132R + Me.tableCell42.Weight = 0.0332665361676826R ' 'table3 ' - Me.table3.Dpi = 96.0! - Me.table3.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) + Me.table3.LocationFloat = New DevExpress.Utils.PointFloat(0.00003973643!, 0!) Me.table3.Name = "table3" - Me.table3.OddStyleName = "DetailData3_Odd" Me.table3.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow4}) - Me.table3.SizeF = New System.Drawing.SizeF(720.0!, 24.08!) + Me.table3.SizeF = New System.Drawing.SizeF(1050.0!, 28.0!) ' 'tableRow4 ' - Me.tableRow4.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell58, Me.tableCell59, Me.tableCell60, Me.tableCell61, Me.tableCell62, Me.tableCell63, Me.tableCell64, Me.tableCell65, Me.tableCell66, Me.tableCell67, Me.tableCell68, Me.tableCell69, Me.tableCell70}) - Me.tableRow4.Dpi = 96.0! + Me.tableRow4.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell44, Me.tableCell46, Me.tableCell47, Me.tableCell49, Me.tableCell50, Me.tableCell52, Me.tableCell53, Me.tableCell54}) Me.tableRow4.Name = "tableRow4" - Me.tableRow4.Weight = 11.039999961853027R + Me.tableRow4.Weight = 1.0R ' - 'tableCell58 + 'tableCell44 ' - Me.tableCell58.Borders = DevExpress.XtraPrinting.BorderSide.None - Me.tableCell58.Dpi = 96.0! - Me.tableCell58.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[BELEGKEY]")}) - Me.tableCell58.Name = "tableCell58" - Me.tableCell58.StyleName = "DetailData2" - Me.tableCell58.StylePriority.UseBorders = False - Me.tableCell58.Weight = 0.063200918833414707R + Me.tableCell44.Name = "tableCell44" + Me.tableCell44.StyleName = "DetailCaption2" + Me.tableCell44.Text = "Zeilennummer" + Me.tableCell44.Weight = 0.04382187252952939R ' - 'tableCell59 + 'tableCell46 ' - Me.tableCell59.Dpi = 96.0! - Me.tableCell59.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Zeilennummer]")}) - Me.tableCell59.Name = "tableCell59" - Me.tableCell59.StyleName = "DetailData2" - Me.tableCell59.Weight = 0.075647438897026908R + Me.tableCell46.Name = "tableCell46" + Me.tableCell46.StyleName = "DetailCaption2" + Me.tableCell46.Text = "Artikelnummer" + Me.tableCell46.Weight = 0.0450318363734654R ' - 'tableCell60 + 'tableCell47 ' - Me.tableCell60.Dpi = 96.0! - Me.tableCell60.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Datentyp]")}) - Me.tableCell60.Name = "tableCell60" - Me.tableCell60.StyleName = "DetailData2" - Me.tableCell60.Weight = 0.051793124940660268R + Me.tableCell47.Name = "tableCell47" + Me.tableCell47.StyleName = "DetailCaption2" + Me.tableCell47.Text = "Bezeichnung" + Me.tableCell47.Weight = 0.10979868348239258R ' - 'tableCell61 + 'tableCell49 ' - Me.tableCell61.Dpi = 96.0! - Me.tableCell61.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Artikelnummer]")}) - Me.tableCell61.Name = "tableCell61" - Me.tableCell61.StyleName = "DetailData2" - Me.tableCell61.Weight = 0.077724896536933055R + Me.tableCell49.Name = "tableCell49" + Me.tableCell49.StyleName = "DetailCaption2" + Me.tableCell49.Text = "Lieferantenartikelnummer" + Me.tableCell49.Weight = 0.044113117808847475R ' - 'tableCell62 + 'tableCell50 ' - Me.tableCell62.Dpi = 96.0! - Me.tableCell62.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Bezeichnung]")}) - Me.tableCell62.Name = "tableCell62" - Me.tableCell62.StyleName = "DetailData2" - Me.tableCell62.Weight = 0.069934431711832681R + Me.tableCell50.Name = "tableCell50" + Me.tableCell50.StyleName = "DetailCaption2" + Me.tableCell50.Text = "Bestellt" + Me.tableCell50.Weight = 0.026839454366174756R ' - 'tableCell63 + 'tableCell52 ' - Me.tableCell63.Dpi = 96.0! - Me.tableCell63.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Notizblock]")}) - Me.tableCell63.Name = "tableCell63" - Me.tableCell63.StyleName = "DetailData2" - Me.tableCell63.Weight = 0.059046003553602427R + Me.tableCell52.Name = "tableCell52" + Me.tableCell52.StyleName = "DetailCaption2" + Me.tableCell52.Text = "Geliefert" + Me.tableCell52.Weight = 0.024127269849467645R ' - 'tableCell64 + 'tableCell53 ' - Me.tableCell64.Dpi = 96.0! - Me.tableCell64.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Lieferantenartikelnummer]")}) - Me.tableCell64.Name = "tableCell64" - Me.tableCell64.StyleName = "DetailData2" - Me.tableCell64.Weight = 0.12646769417656792R + Me.tableCell53.Name = "tableCell53" + Me.tableCell53.StyleName = "DetailCaption2" + Me.tableCell53.Text = "Colli" + Me.tableCell53.Weight = 0.030175568915830075R + ' + 'tableCell54 + ' + Me.tableCell54.Name = "tableCell54" + Me.tableCell54.StyleName = "DetailCaption2" + Me.tableCell54.Text = "Preis" + Me.tableCell54.Weight = 0.023647549748139415R + ' + 'table4 + ' + Me.table4.LocationFloat = New DevExpress.Utils.PointFloat(0!, 28.00001!) + Me.table4.Name = "table4" + Me.table4.OddStyleName = "DetailData3_Odd" + Me.table4.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow5}) + Me.table4.SizeF = New System.Drawing.SizeF(1050.0!, 25.0!) + ' + 'tableRow5 + ' + Me.tableRow5.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell65, Me.tableCell67, Me.tableCell68, Me.tableCell70, Me.tableCell71, Me.tableCell73, Me.tableCell74, Me.tableCell75}) + Me.tableRow5.Name = "tableRow5" + Me.tableRow5.Weight = 11.5R ' 'tableCell65 ' - Me.tableCell65.Dpi = 96.0! - Me.tableCell65.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Menge_bestellt]")}) + Me.tableCell65.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Zeilennummer]")}) Me.tableCell65.Name = "tableCell65" Me.tableCell65.StyleName = "DetailData2" - Me.tableCell65.StylePriority.UseTextAlignment = False - Me.tableCell65.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight - Me.tableCell65.TextFormatString = "{0:C2}" - Me.tableCell65.Weight = 0.076681613922119141R - ' - 'tableCell66 - ' - Me.tableCell66.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.checkBox3}) - Me.tableCell66.Dpi = 96.0! - Me.tableCell66.Name = "tableCell66" - Me.tableCell66.StyleName = "DetailData2" - Me.tableCell66.StylePriority.UseTextAlignment = False - Me.tableCell66.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell66.Weight = 0.12075468699137369R + Me.tableCell65.Weight = 0.04382187252952939R ' 'tableCell67 ' - Me.tableCell67.Dpi = 96.0! - Me.tableCell67.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Menge_geliefert]")}) + Me.tableCell67.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Artikelnummer]")}) Me.tableCell67.Name = "tableCell67" Me.tableCell67.StyleName = "DetailData2" - Me.tableCell67.StylePriority.UseTextAlignment = False - Me.tableCell67.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight - Me.tableCell67.TextFormatString = "{0:C2}" - Me.tableCell67.Weight = 0.080312607023451069R + Me.tableCell67.Weight = 0.0450318363734654R ' 'tableCell68 ' - Me.tableCell68.Dpi = 96.0! - Me.tableCell68.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Colli]")}) + Me.tableCell68.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Bezeichnung]")}) Me.tableCell68.Name = "tableCell68" Me.tableCell68.StyleName = "DetailData2" - Me.tableCell68.Weight = 0.032089175118340384R - ' - 'tableCell69 - ' - Me.tableCell69.Dpi = 96.0! - Me.tableCell69.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Einzelpreis]")}) - Me.tableCell69.Name = "tableCell69" - Me.tableCell69.StyleName = "DetailData2" - Me.tableCell69.StylePriority.UseTextAlignment = False - Me.tableCell69.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight - Me.tableCell69.TextFormatString = "{0:C2}" - Me.tableCell69.Weight = 0.061137130525377059R + Me.tableCell68.Weight = 0.10979876020551542R ' 'tableCell70 ' - Me.tableCell70.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.checkBox4}) - Me.tableCell70.Dpi = 96.0! + Me.tableCell70.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Lieferantenartikelnummer]")}) Me.tableCell70.Name = "tableCell70" Me.tableCell70.StyleName = "DetailData2" - Me.tableCell70.StylePriority.UseTextAlignment = False - Me.tableCell70.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter - Me.tableCell70.Weight = 0.10521028306749132R + Me.tableCell70.Weight = 0.044113126146570605R ' - 'checkBox3 + 'tableCell71 ' - Me.checkBox3.AnchorHorizontal = CType((DevExpress.XtraReports.UI.HorizontalAnchorStyles.Left Or DevExpress.XtraReports.UI.HorizontalAnchorStyles.Right), DevExpress.XtraReports.UI.HorizontalAnchorStyles) - Me.checkBox3.AnchorVertical = CType((DevExpress.XtraReports.UI.VerticalAnchorStyles.Top Or DevExpress.XtraReports.UI.VerticalAnchorStyles.Bottom), DevExpress.XtraReports.UI.VerticalAnchorStyles) - Me.checkBox3.Dpi = 96.0! - Me.checkBox3.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "CheckState", "[Menge_bestelltSpecified]")}) - Me.checkBox3.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Center - Me.checkBox3.LocationFloat = New DevExpress.Utils.PointFloat(2.0!, 0!) - Me.checkBox3.Name = "checkBox3" - Me.checkBox3.SizeF = New System.Drawing.SizeF(84.94337!, 24.08!) + Me.tableCell71.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Menge_bestellt]")}) + Me.tableCell71.Name = "tableCell71" + Me.tableCell71.StyleName = "DetailData2" + Me.tableCell71.Weight = 0.026839462904304431R ' - 'checkBox4 + 'tableCell73 ' - Me.checkBox4.AnchorHorizontal = CType((DevExpress.XtraReports.UI.HorizontalAnchorStyles.Left Or DevExpress.XtraReports.UI.HorizontalAnchorStyles.Right), DevExpress.XtraReports.UI.HorizontalAnchorStyles) - Me.checkBox4.AnchorVertical = CType((DevExpress.XtraReports.UI.VerticalAnchorStyles.Top Or DevExpress.XtraReports.UI.VerticalAnchorStyles.Bottom), DevExpress.XtraReports.UI.VerticalAnchorStyles) - Me.checkBox4.Dpi = 96.0! - Me.checkBox4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "CheckState", "[EinzelpreisSpecified]")}) - Me.checkBox4.GlyphOptions.Alignment = DevExpress.Utils.HorzAlignment.Center - Me.checkBox4.LocationFloat = New DevExpress.Utils.PointFloat(2.0!, 0!) - Me.checkBox4.Name = "checkBox4" - Me.checkBox4.SizeF = New System.Drawing.SizeF(73.7514!, 24.08!) + Me.tableCell73.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Menge_geliefert]")}) + Me.tableCell73.Name = "tableCell73" + Me.tableCell73.StyleName = "DetailData2" + Me.tableCell73.Weight = 0.024127176250492R ' - 'XtraReport1 + 'tableCell74 + ' + Me.tableCell74.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Colli]")}) + Me.tableCell74.Name = "tableCell74" + Me.tableCell74.StyleName = "DetailData2" + Me.tableCell74.Weight = 0.030175672656399144R + ' + 'tableCell75 + ' + Me.tableCell75.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Einzelpreis]")}) + Me.tableCell75.Name = "tableCell75" + Me.tableCell75.StyleName = "DetailData2" + Me.tableCell75.Weight = 0.02364744600757035R + ' + 'XrLabel1 + ' + Me.XrLabel1.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Notizblock]")}) + Me.XrLabel1.Font = New System.Drawing.Font("Arial", 8.25!) + Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 53.0!) + Me.XrLabel1.Multiline = True + Me.XrLabel1.Name = "XrLabel1" + Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel1.SizeF = New System.Drawing.SizeF(1050.0!, 23.0!) + Me.XrLabel1.StylePriority.UseFont = False + Me.XrLabel1.Text = "XrLabel1" + ' + 'Detail1 + ' + Me.Detail1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel1, Me.table4, Me.table3}) + Me.Detail1.HeightF = 135.2917! + Me.Detail1.Name = "Detail1" + ' + 'DetailReport + ' + Me.DetailReport.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.Detail1}) + Me.DetailReport.DataMember = "Positions" + Me.DetailReport.DataSource = Me.ObjectDataSource1 + Me.DetailReport.Level = 0 + Me.DetailReport.Name = "DetailReport" + ' + 'ObjectDataSource1 + ' + Me.ObjectDataSource1.DataSource = GetType(EDIDocumentImport.Orders.ReportSource) + Me.ObjectDataSource1.Name = "ObjectDataSource1" + ' + 'OrderReport2 ' Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.Detail, Me.DetailReport}) Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.ObjectDataSource1}) Me.DataSource = Me.ObjectDataSource1 - Me.Dpi = 96.0! Me.Font = New System.Drawing.Font("Arial", 9.75!) - Me.Margins = New System.Drawing.Printing.Margins(48, 48, 48, 391) - Me.PageHeight = 1056 - Me.PageWidth = 816 - Me.ReportUnit = DevExpress.XtraReports.UI.ReportUnit.Pixels - Me.SnapGridSize = 12.5! - Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.DetailCaption1, Me.DetailData1, Me.DetailCaption2, Me.DetailData2, Me.DetailData3_Odd, Me.PageInfo}) + Me.Landscape = True + Me.Margins = New System.Drawing.Printing.Margins(25, 25, 25, 29) + Me.PageHeight = 850 + Me.PageWidth = 1100 + Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.GroupCaption1, Me.GroupData1, Me.DetailCaption1, Me.DetailData1, Me.DetailCaption2, Me.DetailData2, Me.DetailData3_Odd, Me.PageInfo}) Me.Version = "19.2" - CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.table1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.table2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.table3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.table4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me, System.ComponentModel.ISupportInitialize).EndInit() End Sub Friend WithEvents ObjectDataSource1 As DevExpress.DataAccess.ObjectBinding.ObjectDataSource Friend WithEvents Title As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents GroupCaption1 As DevExpress.XtraReports.UI.XRControlStyle + Friend WithEvents GroupData1 As DevExpress.XtraReports.UI.XRControlStyle Friend WithEvents DetailCaption1 As DevExpress.XtraReports.UI.XRControlStyle Friend WithEvents DetailData1 As DevExpress.XtraReports.UI.XRControlStyle Friend WithEvents DetailCaption2 As DevExpress.XtraReports.UI.XRControlStyle @@ -1018,12 +740,13 @@ Partial Public Class OrderReport Friend WithEvents pageInfo1 As DevExpress.XtraReports.UI.XRPageInfo Friend WithEvents pageInfo2 As DevExpress.XtraReports.UI.XRPageInfo Friend WithEvents ReportHeader As DevExpress.XtraReports.UI.ReportHeaderBand - Friend WithEvents label1 As DevExpress.XtraReports.UI.XRLabel - Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand Friend WithEvents table1 As DevExpress.XtraReports.UI.XRTable Friend WithEvents tableRow1 As DevExpress.XtraReports.UI.XRTableRow Friend WithEvents tableCell1 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell2 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand + Friend WithEvents table2 As DevExpress.XtraReports.UI.XRTable + Friend WithEvents tableRow2 As DevExpress.XtraReports.UI.XRTableRow Friend WithEvents tableCell3 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell4 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell5 As DevExpress.XtraReports.UI.XRTableCell @@ -1038,13 +761,10 @@ Partial Public Class OrderReport Friend WithEvents tableCell14 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell15 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell16 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell17 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell18 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell19 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell20 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell21 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell22 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableRow2 As DevExpress.XtraReports.UI.XRTableRow + Friend WithEvents tableRow3 As DevExpress.XtraReports.UI.XRTableRow Friend WithEvents tableCell23 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell24 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell25 As DevExpress.XtraReports.UI.XRTableCell @@ -1059,49 +779,30 @@ Partial Public Class OrderReport Friend WithEvents tableCell34 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell35 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell36 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell37 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell38 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents checkBox1 As DevExpress.XtraReports.UI.XRCheckBox Friend WithEvents tableCell39 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell40 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell41 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell42 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents checkBox2 As DevExpress.XtraReports.UI.XRCheckBox - Friend WithEvents tableCell43 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents table3 As DevExpress.XtraReports.UI.XRTable + Friend WithEvents tableRow4 As DevExpress.XtraReports.UI.XRTableRow Friend WithEvents tableCell44 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents DetailReport As DevExpress.XtraReports.UI.DetailReportBand - Friend WithEvents GroupHeader1 As DevExpress.XtraReports.UI.GroupHeaderBand - Friend WithEvents table2 As DevExpress.XtraReports.UI.XRTable - Friend WithEvents tableRow3 As DevExpress.XtraReports.UI.XRTableRow - Friend WithEvents tableCell45 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell46 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell47 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell48 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell49 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell50 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell51 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell52 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell53 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell54 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell55 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell56 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell57 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents Detail1 As DevExpress.XtraReports.UI.DetailBand - Friend WithEvents table3 As DevExpress.XtraReports.UI.XRTable - Friend WithEvents tableRow4 As DevExpress.XtraReports.UI.XRTableRow - Friend WithEvents tableCell58 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell59 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell60 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell61 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell62 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell63 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell64 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents table4 As DevExpress.XtraReports.UI.XRTable + Friend WithEvents tableRow5 As DevExpress.XtraReports.UI.XRTableRow Friend WithEvents tableCell65 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell66 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents checkBox3 As DevExpress.XtraReports.UI.XRCheckBox Friend WithEvents tableCell67 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell68 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell69 As DevExpress.XtraReports.UI.XRTableCell Friend WithEvents tableCell70 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents checkBox4 As DevExpress.XtraReports.UI.XRCheckBox + Friend WithEvents tableCell71 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents tableCell73 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents tableCell74 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents tableCell75 As DevExpress.XtraReports.UI.XRTableCell + Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents Detail1 As DevExpress.XtraReports.UI.DetailBand + Friend WithEvents DetailReport As DevExpress.XtraReports.UI.DetailReportBand End Class diff --git a/EDIDocumentImport/OrderReport.resx b/EDIDocumentImport/Reports/OrderReport.resx similarity index 100% rename from EDIDocumentImport/OrderReport.resx rename to EDIDocumentImport/Reports/OrderReport.resx diff --git a/EDIDocumentImport/OrderReport.vb b/EDIDocumentImport/Reports/OrderReport.vb similarity index 100% rename from EDIDocumentImport/OrderReport.vb rename to EDIDocumentImport/Reports/OrderReport.vb diff --git a/EDIDocumentImport/Resources/paymentrefund.svg b/EDIDocumentImport/Resources/paymentrefund.svg new file mode 100644 index 0000000..81f90f1 --- /dev/null +++ b/EDIDocumentImport/Resources/paymentrefund.svg @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/EDIDocumentImport/Schemas/Orders/Input.vb b/EDIDocumentImport/Schemas/Orders/Input.vb index 632b413..e371579 100644 --- a/EDIDocumentImport/Schemas/Orders/Input.vb +++ b/EDIDocumentImport/Schemas/Orders/Input.vb @@ -58,7 +58,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property TemplateType() As String Get Return Me.templateTypeField @@ -80,7 +80,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property [option]() As String Get Return Me.optionField @@ -91,7 +91,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property amount() As String Get Return Me.amountField @@ -102,7 +102,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property extEntry() As String Get Return Me.extEntryField @@ -113,7 +113,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property printVoucher() As String Get Return Me.printVoucherField @@ -124,7 +124,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property extInsert() As String Get Return Me.extInsertField @@ -135,7 +135,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property ChangeLotSize() As String Get Return Me.changeLotSizeField @@ -197,7 +197,7 @@ Namespace Orders.Input Private infotextField As String ''' - _ + _ Public Property BELEGKEY() As String Get Return Me.bELEGKEYField @@ -351,7 +351,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property Datum_AuftragBestellung() As String Get Return Me.datum_AuftragBestellungField @@ -384,7 +384,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property Leistungsdatum() As String Get Return Me.leistungsdatumField @@ -479,7 +479,7 @@ Namespace Orders.Input Private zeilenrabatt4FieldSpecified As Boolean ''' - _ + _ Public Property BELEGKEY() As String Get Return Me.bELEGKEYField @@ -490,7 +490,7 @@ Namespace Orders.Input End Property ''' - _ + _ Public Property Zeilennummer() As String Get Return Me.zeilennummerField diff --git a/EDIDocumentImport/Schemas/Orders/Output.vb b/EDIDocumentImport/Schemas/Orders/Output.vb index c58819f..b5abe18 100644 --- a/EDIDocumentImport/Schemas/Orders/Output.vb +++ b/EDIDocumentImport/Schemas/Orders/Output.vb @@ -17,695 +17,695 @@ Imports System.Xml.Serialization 'This source code was auto-generated by xsd, Version=4.8.3928.0. ' Namespace Orders.Output - + ''' - + _ Partial Public Class MESOWebService - + Private itemsField() As Object - + Private templateTypeField As String - + Private templateField As String - + Private optionField As String - + Private amountField As String - + Private extEntryField As String - + Private printVoucherField As String - + Private extInsertField As String - + Private changeLotSizeField As String - + ''' - + _ Public Property Items() As Object() Get Return Me.itemsField End Get Set - Me.itemsField = Value + Me.itemsField = value End Set End Property - + ''' - + _ Public Property TemplateType() As String Get Return Me.templateTypeField End Get Set - Me.templateTypeField = Value + Me.templateTypeField = value End Set End Property - + ''' - + _ Public Property Template() As String Get Return Me.templateField End Get Set - Me.templateField = Value + Me.templateField = value End Set End Property - + ''' - + _ Public Property [option]() As String Get Return Me.optionField End Get Set - Me.optionField = Value + Me.optionField = value End Set End Property - + ''' - + _ Public Property amount() As String Get Return Me.amountField End Get Set - Me.amountField = Value + Me.amountField = value End Set End Property - + ''' - + _ Public Property extEntry() As String Get Return Me.extEntryField End Get Set - Me.extEntryField = Value + Me.extEntryField = value End Set End Property - + ''' - + _ Public Property printVoucher() As String Get Return Me.printVoucherField End Get Set - Me.printVoucherField = Value + Me.printVoucherField = value End Set End Property - + ''' - + _ Public Property extInsert() As String Get Return Me.extInsertField End Get Set - Me.extInsertField = Value + Me.extInsertField = value End Set End Property - + ''' - + _ Public Property ChangeLotSize() As String Get Return Me.changeLotSizeField End Get Set - Me.changeLotSizeField = Value + Me.changeLotSizeField = value End Set End Property End Class - + ''' - + _ Partial Public Class MESOWebServiceEXIMVRG_ordersT025 - + Private bELEGKEYField As String - + Private fakt_KontonummerField As String - + Private laufnummerField As String - + Private fakt_NameField As String - + Private fakt_StrasseField As String - + Private fakt_PLZField As String - + Private fakt_OrtField As String - + Private fakt_AnsprechpartnerField As String - + Private lief_KontonummerField As String - + Private lief_NameField As String - + Private lief_StrasseField As String - + Private lief_PLZField As String - + Private lief_OrtField As String - + Private belegartField As String - + Private datum_AuftragBestellungField As Date - + Private datum_AuftragBestellungFieldSpecified As Boolean - + Private auftragsBestellnummerField As String - + Private leistungsdatumField As Date - + Private leistungsdatumFieldSpecified As Boolean - + Private auftragsreferenzField As String - + Private infotextField As String - + ''' - + _ Public Property BELEGKEY() As String Get Return Me.bELEGKEYField End Get Set - Me.bELEGKEYField = Value + Me.bELEGKEYField = value End Set End Property - + ''' - + _ Public Property Fakt_Kontonummer() As String Get Return Me.fakt_KontonummerField End Get Set - Me.fakt_KontonummerField = Value + Me.fakt_KontonummerField = value End Set End Property - + ''' - + _ Public Property Laufnummer() As String Get Return Me.laufnummerField End Get Set - Me.laufnummerField = Value + Me.laufnummerField = value End Set End Property - + ''' - + _ Public Property Fakt_Name() As String Get Return Me.fakt_NameField End Get Set - Me.fakt_NameField = Value + Me.fakt_NameField = value End Set End Property - + ''' - + _ Public Property Fakt_Strasse() As String Get Return Me.fakt_StrasseField End Get Set - Me.fakt_StrasseField = Value + Me.fakt_StrasseField = value End Set End Property - + ''' - + _ Public Property Fakt_PLZ() As String Get Return Me.fakt_PLZField End Get Set - Me.fakt_PLZField = Value + Me.fakt_PLZField = value End Set End Property - + ''' - + _ Public Property Fakt_Ort() As String Get Return Me.fakt_OrtField End Get Set - Me.fakt_OrtField = Value + Me.fakt_OrtField = value End Set End Property - + ''' - + _ Public Property Fakt_Ansprechpartner() As String Get Return Me.fakt_AnsprechpartnerField End Get Set - Me.fakt_AnsprechpartnerField = Value + Me.fakt_AnsprechpartnerField = value End Set End Property - + ''' - + _ Public Property Lief_Kontonummer() As String Get Return Me.lief_KontonummerField End Get Set - Me.lief_KontonummerField = Value + Me.lief_KontonummerField = value End Set End Property - + ''' - + _ Public Property Lief_Name() As String Get Return Me.lief_NameField End Get Set - Me.lief_NameField = Value + Me.lief_NameField = value End Set End Property - + ''' - + _ Public Property Lief_Strasse() As String Get Return Me.lief_StrasseField End Get Set - Me.lief_StrasseField = Value + Me.lief_StrasseField = value End Set End Property - + ''' - + _ Public Property Lief_PLZ() As String Get Return Me.lief_PLZField End Get Set - Me.lief_PLZField = Value + Me.lief_PLZField = value End Set End Property - + ''' - + _ Public Property Lief_Ort() As String Get Return Me.lief_OrtField End Get Set - Me.lief_OrtField = Value + Me.lief_OrtField = value End Set End Property - + ''' - + _ Public Property Belegart() As String Get Return Me.belegartField End Get Set - Me.belegartField = Value + Me.belegartField = value End Set End Property - + ''' - + _ Public Property Datum_AuftragBestellung() As Date Get Return Me.datum_AuftragBestellungField End Get Set - Me.datum_AuftragBestellungField = Value + Me.datum_AuftragBestellungField = value End Set End Property - + ''' - + _ Public Property Datum_AuftragBestellungSpecified() As Boolean Get Return Me.datum_AuftragBestellungFieldSpecified End Get Set - Me.datum_AuftragBestellungFieldSpecified = Value + Me.datum_AuftragBestellungFieldSpecified = value End Set End Property - + ''' - + _ Public Property AuftragsBestellnummer() As String Get Return Me.auftragsBestellnummerField End Get Set - Me.auftragsBestellnummerField = Value + Me.auftragsBestellnummerField = value End Set End Property - + ''' - + _ Public Property Leistungsdatum() As Date Get Return Me.leistungsdatumField End Get Set - Me.leistungsdatumField = Value + Me.leistungsdatumField = value End Set End Property - + ''' - + _ Public Property LeistungsdatumSpecified() As Boolean Get Return Me.leistungsdatumFieldSpecified End Get Set - Me.leistungsdatumFieldSpecified = Value + Me.leistungsdatumFieldSpecified = value End Set End Property - + ''' - + _ Public Property Auftragsreferenz() As String Get Return Me.auftragsreferenzField End Get Set - Me.auftragsreferenzField = Value + Me.auftragsreferenzField = value End Set End Property - + ''' - + _ Public Property Infotext() As String Get Return Me.infotextField End Get Set - Me.infotextField = Value + Me.infotextField = value End Set End Property End Class - + ''' - + _ Partial Public Class MESOWebServiceEXIMVRG_ordersT026 - + Private bELEGKEYField As String - + Private zeilennummerField As String - + Private datentypField As String - + Private artikelnummerField As String - + Private bezeichnungField As String - + Private notizblockField As String - + Private lieferantenartikelnummerField As String - + Private menge_bestelltField As Decimal - + Private menge_bestelltFieldSpecified As Boolean - + Private menge_geliefertField As Decimal - + Private colliField As String - + Private einzelpreisField As Decimal - + Private einzelpreisFieldSpecified As Boolean - + Private zeilenrabatt1Field As Decimal - + Private zeilenrabatt1FieldSpecified As Boolean - + Private zeilenrabatt2Field As Decimal - + Private zeilenrabatt2FieldSpecified As Boolean - + Private zeilenrabatt3Field As Decimal - + Private zeilenrabatt3FieldSpecified As Boolean - + Private zeilenrabatt4Field As Decimal - + Private zeilenrabatt4FieldSpecified As Boolean - + ''' - + _ Public Property BELEGKEY() As String Get Return Me.bELEGKEYField End Get Set - Me.bELEGKEYField = Value + Me.bELEGKEYField = value End Set End Property - + ''' - + _ Public Property Zeilennummer() As String Get Return Me.zeilennummerField End Get Set - Me.zeilennummerField = Value + Me.zeilennummerField = value End Set End Property - + ''' - + _ Public Property Datentyp() As String Get Return Me.datentypField End Get Set - Me.datentypField = Value + Me.datentypField = value End Set End Property - + ''' - + _ Public Property Artikelnummer() As String Get Return Me.artikelnummerField End Get Set - Me.artikelnummerField = Value + Me.artikelnummerField = value End Set End Property - + ''' - + _ Public Property Bezeichnung() As String Get Return Me.bezeichnungField End Get Set - Me.bezeichnungField = Value + Me.bezeichnungField = value End Set End Property - + ''' - + _ Public Property Notizblock() As String Get Return Me.notizblockField End Get Set - Me.notizblockField = Value + Me.notizblockField = value End Set End Property - + ''' - + _ Public Property Lieferantenartikelnummer() As String Get Return Me.lieferantenartikelnummerField End Get Set - Me.lieferantenartikelnummerField = Value + Me.lieferantenartikelnummerField = value End Set End Property - + ''' - + _ Public Property Menge_bestellt() As Decimal Get Return Me.menge_bestelltField End Get Set - Me.menge_bestelltField = Value + Me.menge_bestelltField = value End Set End Property - + ''' - + _ Public Property Menge_bestelltSpecified() As Boolean Get Return Me.menge_bestelltFieldSpecified End Get Set - Me.menge_bestelltFieldSpecified = Value + Me.menge_bestelltFieldSpecified = value End Set End Property - + ''' - + _ Public Property Menge_geliefert() As Decimal Get Return Me.menge_geliefertField End Get Set - Me.menge_geliefertField = Value + Me.menge_geliefertField = value End Set End Property - + ''' - + _ Public Property Colli() As String Get Return Me.colliField End Get Set - Me.colliField = Value + Me.colliField = value End Set End Property - + ''' - + _ Public Property Einzelpreis() As Decimal Get Return Me.einzelpreisField End Get Set - Me.einzelpreisField = Value + Me.einzelpreisField = value End Set End Property - + ''' - + _ Public Property EinzelpreisSpecified() As Boolean Get Return Me.einzelpreisFieldSpecified End Get Set - Me.einzelpreisFieldSpecified = Value + Me.einzelpreisFieldSpecified = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt1() As Decimal Get Return Me.zeilenrabatt1Field End Get Set - Me.zeilenrabatt1Field = Value + Me.zeilenrabatt1Field = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt1Specified() As Boolean Get Return Me.zeilenrabatt1FieldSpecified End Get Set - Me.zeilenrabatt1FieldSpecified = Value + Me.zeilenrabatt1FieldSpecified = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt2() As Decimal Get Return Me.zeilenrabatt2Field End Get Set - Me.zeilenrabatt2Field = Value + Me.zeilenrabatt2Field = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt2Specified() As Boolean Get Return Me.zeilenrabatt2FieldSpecified End Get Set - Me.zeilenrabatt2FieldSpecified = Value + Me.zeilenrabatt2FieldSpecified = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt3() As Decimal Get Return Me.zeilenrabatt3Field End Get Set - Me.zeilenrabatt3Field = Value + Me.zeilenrabatt3Field = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt3Specified() As Boolean Get Return Me.zeilenrabatt3FieldSpecified End Get Set - Me.zeilenrabatt3FieldSpecified = Value + Me.zeilenrabatt3FieldSpecified = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt4() As Decimal Get Return Me.zeilenrabatt4Field End Get Set - Me.zeilenrabatt4Field = Value + Me.zeilenrabatt4Field = value End Set End Property - + ''' - + _ Public Property Zeilenrabatt4Specified() As Boolean Get Return Me.zeilenrabatt4FieldSpecified End Get Set - Me.zeilenrabatt4FieldSpecified = Value + Me.zeilenrabatt4FieldSpecified = value End Set End Property End Class diff --git a/EDIDocumentImport/Schemas/Orders/ReportSource.vb b/EDIDocumentImport/Schemas/Orders/ReportSource.vb new file mode 100644 index 0000000..86d482b --- /dev/null +++ b/EDIDocumentImport/Schemas/Orders/ReportSource.vb @@ -0,0 +1,21 @@ +Imports DevExpress.DataAccess.ObjectBinding +Imports System.Collections.Generic +Imports System.ComponentModel + +Namespace Orders + + Public Class ReportSource + + Public Property Head As Orders.Input.MESOWebServiceEXIMVRG_ordersT025 + + + Public Property Positions As IEnumerable(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026) + + + Public Iterator Function GetPositionList() As IEnumerable(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026) + For Each oPosition In Positions + Yield oPosition + Next + End Function + End Class +End Namespace diff --git a/EDIDocumentImport/Schemas/OrdersReport.vb b/EDIDocumentImport/Schemas/OrdersReport.vb deleted file mode 100644 index 5e69595..0000000 --- a/EDIDocumentImport/Schemas/OrdersReport.vb +++ /dev/null @@ -1,11 +0,0 @@ -Imports DevExpress.DataAccess.ObjectBinding -Imports System.Collections.Generic -Imports System.ComponentModel - -Namespace Orders - - Public Class OrdersReport - Public Property Head As Orders.Input.MESOWebServiceEXIMVRG_ordersT025 - Public Property Positions As List(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026) - End Class -End Namespace diff --git a/EDIDocumentImport/Serializer.vb b/EDIDocumentImport/Serializer.vb new file mode 100644 index 0000000..55b576d --- /dev/null +++ b/EDIDocumentImport/Serializer.vb @@ -0,0 +1,32 @@ +Imports System.Xml.Serialization +Imports DigitalData.Modules.Logging + +Public Class Serializer + Inherits Base + Public Sub New(pLogConfig As LogConfig) + MyBase.New(pLogConfig, pLogConfig.GetLogger()) + End Sub + + Public Function GetSerializer(pSchemaType As Type) As XmlSerializer + Dim oSerializer As New XmlSerializer(pSchemaType) + + + AddHandler oSerializer.UnknownAttribute, Sub(sender As Object, e As XmlAttributeEventArgs) + Logger.Debug("[{1}] Unknown Attribute: {0}", e.Attr, pSchemaType.Name) + End Sub + + AddHandler oSerializer.UnknownElement, Sub(sender As Object, e As XmlElementEventArgs) + Logger.Debug("[{1}] Unknown Element: {0}", e.Element, pSchemaType.Name) + End Sub + + AddHandler oSerializer.UnknownNode, Sub(sender As Object, e As XmlNodeEventArgs) + Logger.Debug("[{1}] Unknown Node: {0}", e.Name, pSchemaType.Name) + End Sub + + AddHandler oSerializer.UnreferencedObject, Sub(sender As Object, e As UnreferencedObjectEventArgs) + Logger.Debug("[{1}] Unreferenced Object: {0}", e.UnreferencedId, pSchemaType.Name) + End Sub + + Return oSerializer + End Function +End Class diff --git a/EDIDocumentImport/WinLineWebService.vb b/EDIDocumentImport/WinLineWebService.vb new file mode 100644 index 0000000..e97eade --- /dev/null +++ b/EDIDocumentImport/WinLineWebService.vb @@ -0,0 +1,139 @@ +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Filesystem +Imports AutoMapper +Imports AutoMapper.Configuration +Imports System.Globalization +Imports System.Xml.Serialization +Imports System.IO +Imports System.Xml +Imports System.Net + +Public Class WinLineWebService + Inherits Base + + Private ReadOnly Database As MSSQLServer + Private ReadOnly Config As Config + Private ReadOnly Serializer As Serializer + Private ReadOnly Mapper As AutoMapper.Mapper + Private ReadOnly MapperConfig As MapperConfiguration + Private ReadOnly FileEx As DigitalData.Modules.Filesystem.File + + Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pConfig As Config) + MyBase.New(pLogConfig, pLogConfig.GetLogger()) + FileEx = New DigitalData.Modules.Filesystem.File(pLogConfig) + Serializer = New Serializer(pLogConfig) + Database = pDatabase + Config = pConfig + MapperConfig = New MapperConfiguration(CreateMapperConfig()) + MapperConfig.AssertConfigurationIsValid() + Mapper = MapperConfig.CreateMapper() + End Sub + + Private Function CreateMapperConfig() As MapperConfigurationExpression + Dim oConfig As New MapperConfigurationExpression() + + oConfig.CreateMap(Of String, Integer)().ConvertUsing(New IntegerTypeConverter()) + oConfig.CreateMap(Of String, Decimal)().ConvertUsing(New DecimalTypeConverter()) + oConfig.CreateMap(Of String, DateTime)().ConvertUsing(New DateTimeTypeConverter()) + oConfig.CreateMap(Of Orders.Input.MESOWebService, Orders.Output.MESOWebService)() + oConfig.CreateMap(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT025, Orders.Output.MESOWebServiceEXIMVRG_ordersT025)() + oConfig.CreateMap(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026, Orders.Output.MESOWebServiceEXIMVRG_ordersT026)() + + Return oConfig + End Function + + Public Function TransferDocumentToWinLine(pDocument As DocumentInfo.Document) As Boolean + If TypeOf pDocument.Data Is Orders.Input.MESOWebService Then + TransferOrderToWinline(pDocument) + End If + + Return True + End Function + + Private Function TransferOrderToWinline(pDocument As DocumentInfo.Document) + Dim oOrderOutput = TransformOrderToOutput(pDocument.Data) + Dim oWS As Config.WebServiceConfig = Config.Webservice + Dim oFilePath = SerializeOrder(oOrderOutput) + Dim oXmlString = IO.File.ReadAllText(oFilePath) + pDocument.DataOutput = oOrderOutput + + Dim oURL As String = $"{oWS.BaseUrl}/ewlservice/import?User={oWS.Username}&Password={oWS.Password}&Company={pDocument.Mandator.Id}&Type=30&Vorlage=EXIM-VRG_orders&ActionCode=1&Byref=0Data={oXmlString}" + Dim oRequest = WebRequest.Create(oURL) + oRequest.Method = "POST" + + Logger.Info("Creating HTTP Request to [{0}]", oWS.BaseUrl) + + ' TODO: Make better lol + + Using oResponse = oRequest.GetResponse() + Using oStream = oResponse.GetResponseStream() + Using oReader As New StreamReader(oStream) + Dim oData = oReader.ReadToEnd() + + End Using + End Using + End Using + + Return True + End Function + + Private Function TransformOrderToOutput(pData As Orders.Input.MESOWebService) As Orders.Output.MESOWebService + Dim oData As Orders.Input.MESOWebService = pData + Dim oResult As Orders.Output.MESOWebService = Mapper.Map(Of Orders.Output.MESOWebService)(oData) + + Dim oItems = oData.Items. + Select(Function(i) + If TypeOf i Is Orders.Input.MESOWebServiceEXIMVRG_ordersT025 Then + Return Mapper.Map(Of Orders.Output.MESOWebServiceEXIMVRG_ordersT025)(i) + Else + Return Mapper.Map(Of Orders.Output.MESOWebServiceEXIMVRG_ordersT026)(i) + End If + End Function). + ToList() + + oResult.Items = oItems.ToArray() + Return oResult + End Function + + Private Function SerializeOrder(pData As Orders.Output.MESOWebService) As String + Dim oSerializer = Serializer.GetSerializer(GetType(Orders.Output.MESOWebService)) + Dim oSettings As New XmlWriterSettings With { + .Indent = True + } + + Dim oPath As String = Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService") + Dim oFileName As String = $"{Now:yyyy-MM-dd-f}.xml" + Dim oFilePath As String = Path.Combine(oPath, oFileName) + + If Directory.Exists(oPath) = False Then + Directory.CreateDirectory(oPath) + End If + + Using oWriter = XmlWriter.Create(oFilePath, oSettings) + oSerializer.Serialize(oWriter, pData) + End Using + + Return oFilePath + End Function + + Private Class DateTimeTypeConverter + Implements ITypeConverter(Of String, DateTime) + + Public Function Convert(source As String, destination As Date, context As ResolutionContext) As Date Implements ITypeConverter(Of String, Date).Convert + Return System.Convert.ToDateTime(source) + End Function + End Class + Private Class IntegerTypeConverter + Implements ITypeConverter(Of String, Integer) + Public Function Convert(source As String, destination As Integer, context As ResolutionContext) As Integer Implements ITypeConverter(Of String, Integer).Convert + Return System.Convert.ToInt32(source) + End Function + End Class + Private Class DecimalTypeConverter + Implements ITypeConverter(Of String, Decimal) + Public Function Convert(source As String, destination As Decimal, context As ResolutionContext) As Decimal Implements ITypeConverter(Of String, Decimal).Convert + Return System.Convert.ToDecimal(source, CultureInfo.InvariantCulture) + End Function + End Class +End Class diff --git a/EDIDocumentImport/frmMain.Designer.vb b/EDIDocumentImport/frmMain.Designer.vb index c1ae1b7..c7729e1 100644 --- a/EDIDocumentImport/frmMain.Designer.vb +++ b/EDIDocumentImport/frmMain.Designer.vb @@ -33,14 +33,16 @@ Partial Class frmMain Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() + Me.btnPreviewReport = New DevExpress.XtraBars.BarButtonItem() + Me.btnReportPreview = New DevExpress.XtraBars.BarButtonItem() + Me.btnReloadDocument = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonGroupData = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonGroupDocument = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonGroupPositions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.GridControlFiles = New DevExpress.XtraGrid.GridControl() Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView() @@ -70,6 +72,7 @@ Partial Class frmMain Me.txtCustomerGLN = New DevExpress.XtraEditors.TextEdit() Me.txtDeliveryAddressGLN = New DevExpress.XtraEditors.TextEdit() Me.txtDocumentKind = New DevExpress.XtraEditors.TextEdit() + Me.txtDocumentReference = New DevExpress.XtraEditors.MemoEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.TabbedControlGroup2 = New DevExpress.XtraLayout.TabbedControlGroup() Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() @@ -85,18 +88,17 @@ Partial Class frmMain Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItemRunningNumber = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.GridControlPositions = New DevExpress.XtraGrid.GridControl() Me.GridViewPositions = New DevExpress.XtraGrid.Views.Grid.GridView() Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl() Me.RichEditXml = New DevExpress.XtraRichEdit.RichEditControl() - Me.txtDocumentReference = New DevExpress.XtraEditors.MemoEdit() - Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit() @@ -127,6 +129,7 @@ Partial Class frmMain CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtDocumentReference.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -142,26 +145,25 @@ Partial Class frmMain CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlPositions, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewPositions, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl3.SuspendLayout() - CType(Me.txtDocumentReference.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnLoadDocuments, Me.txtFilesLoaded, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.checkShowXml, Me.BarButtonItem4, Me.BarButtonItem5, Me.txtVersion, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnLoadDocuments, Me.txtFilesLoaded, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.checkShowXml, Me.BarButtonItem4, Me.BarButtonItem5, Me.txtVersion, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.btnPreviewReport, Me.btnReportPreview, Me.btnReloadDocument}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 17 + Me.RibbonControl.MaxItemId = 19 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -254,22 +256,36 @@ Partial Class frmMain Me.BarButtonItem8.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.singlepageview Me.BarButtonItem8.Name = "BarButtonItem8" ' - 'BarButtonItem9 + 'btnPreviewReport ' - Me.BarButtonItem9.Caption = "Belegvorschau für aktuelle Zeile öffnen" - Me.BarButtonItem9.Id = 16 - Me.BarButtonItem9.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.preview - Me.BarButtonItem9.Name = "BarButtonItem9" + Me.btnPreviewReport.Caption = "Belegvorschau für aktuelle Zeile öffnen" + Me.btnPreviewReport.Id = 16 + Me.btnPreviewReport.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.preview + Me.btnPreviewReport.Name = "btnPreviewReport" + ' + 'btnReportPreview + ' + Me.btnReportPreview.Caption = "BarButtonItem10" + Me.btnReportPreview.Id = 17 + Me.btnReportPreview.Name = "btnReportPreview" + ' + 'btnReloadDocument + ' + Me.btnReloadDocument.Caption = "Aktuelles Dokument erneut laden" + Me.btnReloadDocument.Id = 18 + Me.btnReloadDocument.ImageOptions.SvgImage = Global.EDIDocumentImport.My.Resources.Resources.paymentrefund + Me.btnReloadDocument.Name = "btnReloadDocument" ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup6, Me.RibbonPageGroup5}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonGroupData, Me.RibbonGroupDocument, Me.RibbonGroupPositions}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.btnLoadDocuments) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnReloadDocument) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten laden" ' @@ -278,37 +294,40 @@ Partial Class frmMain Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Konfiguration" ' 'RibbonPageGroup3 ' Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup3.ItemLinks.Add(Me.checkShowXml) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem8) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Text = "Debugging" ' - 'RibbonPageGroup4 + 'RibbonGroupData ' - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem5) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - Me.RibbonPageGroup4.Text = "Daten übermitteln" + Me.RibbonGroupData.Enabled = False + Me.RibbonGroupData.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonGroupData.ItemLinks.Add(Me.BarButtonItem5) + Me.RibbonGroupData.Name = "RibbonGroupData" + Me.RibbonGroupData.Text = "Daten übermitteln" ' - 'RibbonPageGroup6 + 'RibbonGroupDocument ' - Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem9) - Me.RibbonPageGroup6.Name = "RibbonPageGroup6" - Me.RibbonPageGroup6.Text = "Beleg" + Me.RibbonGroupDocument.Enabled = False + Me.RibbonGroupDocument.ItemLinks.Add(Me.btnPreviewReport) + Me.RibbonGroupDocument.ItemLinks.Add(Me.checkShowXml) + Me.RibbonGroupDocument.Name = "RibbonGroupDocument" + Me.RibbonGroupDocument.Text = "Beleg" ' - 'RibbonPageGroup5 + 'RibbonGroupPositions ' - Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem6) - Me.RibbonPageGroup5.ItemLinks.Add(Me.BarButtonItem7) - Me.RibbonPageGroup5.Name = "RibbonPageGroup5" - Me.RibbonPageGroup5.Text = "Belegpositionen" + Me.RibbonGroupPositions.Enabled = False + Me.RibbonGroupPositions.ItemLinks.Add(Me.BarButtonItem6) + Me.RibbonGroupPositions.ItemLinks.Add(Me.BarButtonItem7) + Me.RibbonGroupPositions.Name = "RibbonGroupPositions" + Me.RibbonGroupPositions.Text = "Belegpositionen" ' 'RibbonStatusBar ' @@ -613,6 +632,15 @@ Partial Class frmMain Me.txtDocumentKind.StyleController = Me.LayoutControl1 Me.txtDocumentKind.TabIndex = 18 ' + 'txtDocumentReference + ' + Me.txtDocumentReference.Location = New System.Drawing.Point(123, 214) + Me.txtDocumentReference.MenuManager = Me.RibbonControl + Me.txtDocumentReference.Name = "txtDocumentReference" + Me.txtDocumentReference.Size = New System.Drawing.Size(912, 34) + Me.txtDocumentReference.StyleController = Me.LayoutControl1 + Me.txtDocumentReference.TabIndex = 19 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -758,6 +786,16 @@ Partial Class frmMain Me.LayoutControlItemRunningNumber.Text = "Laufnummer" Me.LayoutControlItemRunningNumber.TextSize = New System.Drawing.Size(93, 13) ' + 'LayoutControlItem14 + ' + Me.LayoutControlItem14.Control = Me.txtDocumentReference + Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 164) + Me.LayoutControlItem14.Name = "LayoutControlItem14" + Me.LayoutControlItem14.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem14.Size = New System.Drawing.Size(1018, 44) + Me.LayoutControlItem14.Text = "Auftragsreferenz" + Me.LayoutControlItem14.TextSize = New System.Drawing.Size(93, 13) + ' 'LayoutControlGroup1 ' Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem9}) @@ -776,6 +814,26 @@ Partial Class frmMain Me.LayoutControlItem10.Text = "Kontakt" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(93, 13) ' + 'LayoutControlItem6 + ' + Me.LayoutControlItem6.Control = Me.TextEdit5 + Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem6.Size = New System.Drawing.Size(705, 30) + Me.LayoutControlItem6.Text = "Straße" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(93, 13) + ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.TextEdit6 + Me.LayoutControlItem7.Location = New System.Drawing.Point(705, 0) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem7.Size = New System.Drawing.Size(313, 30) + Me.LayoutControlItem7.Text = "Hausnummer" + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(93, 13) + ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.TextEdit7 @@ -796,26 +854,6 @@ Partial Class frmMain Me.LayoutControlItem9.Text = "PLZ" Me.LayoutControlItem9.TextSize = New System.Drawing.Size(93, 13) ' - 'LayoutControlItem7 - ' - Me.LayoutControlItem7.Control = Me.TextEdit6 - Me.LayoutControlItem7.Location = New System.Drawing.Point(705, 0) - Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem7.Size = New System.Drawing.Size(313, 30) - Me.LayoutControlItem7.Text = "Hausnummer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem6 - ' - Me.LayoutControlItem6.Control = Me.TextEdit5 - Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem6.Size = New System.Drawing.Size(705, 30) - Me.LayoutControlItem6.Text = "Straße" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(93, 13) - ' 'GridControlPositions ' Me.GridControlPositions.Dock = System.Windows.Forms.DockStyle.Fill @@ -861,24 +899,6 @@ Partial Class frmMain Me.RichEditXml.Size = New System.Drawing.Size(0, 0) Me.RichEditXml.TabIndex = 0 ' - 'txtDocumentReference - ' - Me.txtDocumentReference.Location = New System.Drawing.Point(120, 211) - Me.txtDocumentReference.MenuManager = Me.RibbonControl - Me.txtDocumentReference.Name = "txtDocumentReference" - Me.txtDocumentReference.Size = New System.Drawing.Size(918, 40) - Me.txtDocumentReference.StyleController = Me.LayoutControl1 - Me.txtDocumentReference.TabIndex = 19 - ' - 'LayoutControlItem14 - ' - Me.LayoutControlItem14.Control = Me.txtDocumentReference - Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 164) - Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(1018, 44) - Me.LayoutControlItem14.Text = "Auftragsreferenz" - Me.LayoutControlItem14.TextSize = New System.Drawing.Size(93, 13) - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -922,6 +942,7 @@ Partial Class frmMain CType(Me.txtCustomerGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtDeliveryAddressGLN.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtDocumentReference.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TabbedControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() @@ -937,18 +958,17 @@ Partial Class frmMain CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControlPositions, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridViewPositions, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl3.ResumeLayout(False) - CType(Me.txtDocumentReference.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -996,10 +1016,10 @@ Partial Class frmMain Friend WithEvents cmbDeliveryAddress As DevExpress.XtraEditors.SearchLookUpEdit Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonGroupData As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents txtVersion As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonGroupPositions As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem Friend WithEvents colSelected As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents cmbYears As DevExpress.XtraEditors.ComboBoxEdit @@ -1025,10 +1045,12 @@ Partial Class frmMain Friend WithEvents txtDeliveryAddressGLN As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem13 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents btnPreviewReport As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonGroupDocument As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents txtDocumentKind As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents txtDocumentReference As DevExpress.XtraEditors.MemoEdit Friend WithEvents LayoutControlItem14 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents btnReportPreview As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnReloadDocument As DevExpress.XtraBars.BarButtonItem End Class diff --git a/EDIDocumentImport/frmMain.vb b/EDIDocumentImport/frmMain.vb index 1aadb0f..dd3955b 100644 --- a/EDIDocumentImport/frmMain.vb +++ b/EDIDocumentImport/frmMain.vb @@ -11,6 +11,8 @@ Imports DigitalData.GUIs.Common Imports EDIDocumentImport.DocumentInfo Imports EDIDocumentImport.DocumentPositions Imports DevExpress.XtraEditors +Imports DevExpress.XtraReports.UI +Imports EDIDocumentImport.WinLineInfo Public Class frmMain Public LogConfig As LogConfig @@ -19,7 +21,9 @@ Public Class frmMain Public Database As MSSQLServer Public DocumentLoader As DocumentLoader Public GridBuilder As GridBuilder + Public Winline As WinLineInfo + Public WebService As WinLineWebService Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try @@ -46,6 +50,7 @@ Public Class frmMain Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) Database = New MSSQLServer(LogConfig, oConnectionString) Winline = New WinLineInfo(LogConfig, Database, ConfigManager.Config) + WebService = New WinLineWebService(LogConfig, Database, ConfigManager.Config) ' Load WinLine Data Winline.Mandators.Clear() @@ -77,6 +82,11 @@ Public Class frmMain Private Sub btnLoadDocuments_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnLoadDocuments.ItemClick Try If DocumentLoader.LoadFiles() = True Then + + RibbonGroupData.Enabled = True + RibbonGroupDocument.Enabled = True + RibbonGroupPositions.Enabled = True + GridControlFiles.DataSource = DocumentLoader.Files txtFilesLoaded.Caption = $"{DocumentLoader.Files.Count} Dokumente geladen" End If @@ -113,30 +123,19 @@ Public Class frmMain Logger.Error(ex) Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, Text) + Dim oMessage As String = $"Unerwarteter Fehler beim Laden des Dokuments {oDocument.Name}:{vbNewLine}{ex.Message}" + MsgBox(oMessage, MsgBoxStyle.Critical, Text) Logger.Error(ex) End Try End Sub Private Sub ShowDocument(pDocument As Document, pData As Orders.Input.MESOWebService, pDataOriginal As Orders.Input.MESOWebService) - Dim oHead As Orders.Input.MESOWebServiceEXIMVRG_ordersT025 = pData.Items. - Where(Function(i) TypeOf i Is Orders.Input.MESOWebServiceEXIMVRG_ordersT025). - FirstOrDefault() + Dim oHead = GetOrderHead(pData) + Dim oHeadOriginal = GetOrderHead(pDataOriginal) - Dim oHeadOriginal As Orders.Input.MESOWebServiceEXIMVRG_ordersT025 = pDataOriginal.Items. - Where(Function(i) TypeOf i Is Orders.Input.MESOWebServiceEXIMVRG_ordersT025). - FirstOrDefault() - - Dim oPositions As List(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026) = pData.Items. - Where(Function(i) TypeOf i Is Orders.Input.MESOWebServiceEXIMVRG_ordersT026). - Select(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026)(Function(i) i). - ToList() - - Dim oPositionsOriginal As List(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026) = pDataOriginal.Items. - Where(Function(i) TypeOf i Is Orders.Input.MESOWebServiceEXIMVRG_ordersT026). - Select(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026)(Function(i) i). - ToList() + Dim oPositions = GetOrderPositions(pData) + Dim oPositionsOriginal = GetOrderPositions(pDataOriginal) ' ====== Head Data ====== @@ -152,6 +151,9 @@ Public Class frmMain txtDocumentReference.Text = oHead.Auftragsreferenz dateOrderDate.EditValue = oHead.Datum_AuftragBestellung + + + Dim oMandator = Winline.Mandators. Where(Function(m) m.Id = pDocument.Mandator.Id). SingleOrDefault() @@ -168,7 +170,10 @@ Public Class frmMain cmbCustomer.EditValue = Nothing Else cmbCustomer.EditValue = Winline.Accounts. - Where(Function(oAccount) oAccount.Id = oHead.Fakt_Kontonummer And oAccount.Mandator = cmbMandator.EditValue). + Where(Function(oAccount) + Dim oSelectedMandator As Mandator = cmbMandator.EditValue + Return oAccount.Id = oHead.Fakt_Kontonummer And oAccount.Mandator = oSelectedMandator.Id + End Function). SingleOrDefault() End If @@ -278,7 +283,12 @@ Public Class frmMain End Sub Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick - MsgBox("Mach et!") + Dim oDocument As Document = GetFocusedDocument() + If oDocument Is Nothing Then + Exit Sub + End If + + WebService.TransferDocumentToWinLine(oDocument) End Sub Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick @@ -300,4 +310,49 @@ Public Class frmMain MsgBox($"{pDisplayName} nicht konfiguriert oder nicht gefunden!", MsgBoxStyle.Exclamation, Text) End If End Sub + + Private Function GetOrderHead(pData As Orders.Input.MESOWebService) As Orders.Input.MESOWebServiceEXIMVRG_ordersT025 + Dim oHead As Orders.Input.MESOWebServiceEXIMVRG_ordersT025 = pData.Items. + Where(Function(i) TypeOf i Is Orders.Input.MESOWebServiceEXIMVRG_ordersT025). + FirstOrDefault() + Return oHead + End Function + + Private Function GetOrderPositions(pData As Orders.Input.MESOWebService) As List(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026) + Dim oPositions As List(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026) = pData.Items. + Where(Function(i) TypeOf i Is Orders.Input.MESOWebServiceEXIMVRG_ordersT026). + Select(Of Orders.Input.MESOWebServiceEXIMVRG_ordersT026)(Function(i) i). + ToList() + Return oPositions + End Function + + Private Function GetFocusedDocument() As DocumentInfo.Document + Dim oRowHandles = GridViewFiles.GetSelectedRows().ToList() + Dim oDocument As Document = GridViewFiles.GetRow(oRowHandles.First()) + Return oDocument + End Function + + Private Sub btnPreviewReport_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnPreviewReport.ItemClick + Dim oDocument As Document = GetFocusedDocument() + If oDocument Is Nothing Then + Exit Sub + End If + + Dim oReport As New OrderReport() + Dim oDataSource = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource With { + .DataSource = New Orders.ReportSource With { + .Head = GetOrderHead(oDocument.Data), + .Positions = GetOrderPositions(oDocument.Data) + } + } + oDataSource.Fill() + oReport.DataSource = oDataSource + + Dim oReportPrintTool As New ReportPrintTool(oReport) + oReportPrintTool.ShowPreview() + End Sub + + Private Sub btnReloadDocument_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadDocument.ItemClick + + End Sub End Class \ No newline at end of file diff --git a/EDIDocumentImport/packages.config b/EDIDocumentImport/packages.config index 63f3075..30c87d1 100644 --- a/EDIDocumentImport/packages.config +++ b/EDIDocumentImport/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file