diff --git a/EDIDocumentImport/Positions/PositionGrid.vb b/EDIDocumentImport/Positions/PositionGrid.vb index 4a44d28..acda595 100644 --- a/EDIDocumentImport/Positions/PositionGrid.vb +++ b/EDIDocumentImport/Positions/PositionGrid.vb @@ -21,8 +21,7 @@ Namespace Positions pView.GridControl.DataSource = Nothing pView.GridControl.ForceInitialize() - ' Clear, add and adjust columns - pView.Columns.Clear() + ' Add and adjust columns pView.Columns.AddRange(oColumns.ToArray()) pView.BestFitColumns() diff --git a/EDIDocumentImport/Reports/OrderReport.Designer.vb b/EDIDocumentImport/Reports/OrderReport.Designer.vb index 60f63bb..4180fba 100644 --- a/EDIDocumentImport/Reports/OrderReport.Designer.vb +++ b/EDIDocumentImport/Reports/OrderReport.Designer.vb @@ -31,51 +31,10 @@ Partial Public Class OrderReport Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle() Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand() Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand() - Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand() - Me.Detail = New DevExpress.XtraReports.UI.DetailBand() Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo() Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo() - Me.table1 = New DevExpress.XtraReports.UI.XRTable() - Me.tableRow1 = 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() - Me.tableCell6 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell7 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell8 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell9 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell10 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell11 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell12 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell13 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell14 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell15 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell16 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell18 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell19 = 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() - Me.tableCell25 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell26 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell27 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell28 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell29 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell30 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell31 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell32 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell33 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell34 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell35 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell36 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell38 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell39 = New DevExpress.XtraReports.UI.XRTableCell() - Me.tableCell42 = New DevExpress.XtraReports.UI.XRTableCell() + Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand() + Me.Detail = New DevExpress.XtraReports.UI.DetailBand() Me.table3 = New DevExpress.XtraReports.UI.XRTable() Me.tableRow4 = New DevExpress.XtraReports.UI.XRTableRow() Me.tableCell44 = New DevExpress.XtraReports.UI.XRTableCell() @@ -99,9 +58,18 @@ Partial Public Class OrderReport Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel() Me.Detail1 = New DevExpress.XtraReports.UI.DetailBand() Me.DetailReport = New DevExpress.XtraReports.UI.DetailReportBand() + Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel3 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel4 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel5 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel6 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel7 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel8 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel9 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel10 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel11 = New DevExpress.XtraReports.UI.XRLabel() Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components) - CType(Me.table1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.table2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XrLabel12 = New DevExpress.XtraReports.UI.XRLabel() CType(Me.table3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.table4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -217,18 +185,6 @@ Partial Public Class OrderReport Me.BottomMargin.HeightF = 29.0! Me.BottomMargin.Name = "BottomMargin" ' - 'ReportHeader - ' - 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.HeightF = 0! - Me.Detail.KeepTogether = True - Me.Detail.Name = "Detail" - ' 'pageInfo1 ' Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(6.0!, 6.0!) @@ -246,293 +202,17 @@ Partial Public Class OrderReport Me.pageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight Me.pageInfo2.TextFormatString = "Seite {0} von {1}" ' - 'table1 + 'ReportHeader ' - 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.table1.SizeF = New System.Drawing.SizeF(1050.0!, 25.0!) + Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel12, Me.XrLabel11, Me.XrLabel9, Me.XrLabel10, Me.XrLabel8, Me.XrLabel6, Me.XrLabel7, Me.XrLabel5, Me.XrLabel4, Me.XrLabel3, Me.XrLabel2}) + Me.ReportHeader.HeightF = 234.2917! + Me.ReportHeader.Name = "ReportHeader" ' - 'tableRow1 + 'Detail ' - Me.tableRow1.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell1, Me.tableCell2}) - Me.tableRow1.Name = "tableRow1" - Me.tableRow1.Weight = 1.0R - ' - 'tableCell1 - ' - Me.tableCell1.Name = "tableCell1" - Me.tableCell1.StyleName = "GroupCaption1" - Me.tableCell1.Text = "HEAD BELEGKEY" - Me.tableCell1.Weight = 0.1016025143577939R - ' - 'tableCell2 - ' - 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 = "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.Borders = DevExpress.XtraPrinting.BorderSide.None - Me.tableCell3.Name = "tableCell3" - Me.tableCell3.StyleName = "DetailCaption1" - Me.tableCell3.StylePriority.UseBorders = False - Me.tableCell3.Text = "Head Fakt Kontonummer" - Me.tableCell3.Weight = 0.057705637613932291R - ' - 'tableCell4 - ' - Me.tableCell4.Name = "tableCell4" - Me.tableCell4.StyleName = "DetailCaption1" - Me.tableCell4.Text = "Head Laufnummer" - Me.tableCell4.Weight = 0.044022438412620907R - ' - 'tableCell5 - ' - Me.tableCell5.Name = "tableCell5" - Me.tableCell5.StyleName = "DetailCaption1" - Me.tableCell5.Text = "Head Fakt Name" - Me.tableCell5.Weight = 0.03963033040364583R - ' - 'tableCell6 - ' - Me.tableCell6.Name = "tableCell6" - Me.tableCell6.StyleName = "DetailCaption1" - Me.tableCell6.Text = "Head Fakt Strasse" - Me.tableCell6.Weight = 0.043545641217912948R - ' - 'tableCell7 - ' - Me.tableCell7.Name = "tableCell7" - Me.tableCell7.StyleName = "DetailCaption1" - Me.tableCell7.Text = "Head Fakt PLZ" - Me.tableCell7.Weight = 0.035957706996372768R - ' - 'tableCell8 - ' - Me.tableCell8.Name = "tableCell8" - Me.tableCell8.StyleName = "DetailCaption1" - Me.tableCell8.Text = "Head Fakt Ort" - Me.tableCell8.Weight = 0.034248112269810269R - ' - 'tableCell9 - ' - Me.tableCell9.Name = "tableCell9" - Me.tableCell9.StyleName = "DetailCaption1" - Me.tableCell9.Text = "Head Fakt Ansprechpartner" - Me.tableCell9.Weight = 0.063092150006975448R - ' - 'tableCell10 - ' - Me.tableCell10.Name = "tableCell10" - Me.tableCell10.StyleName = "DetailCaption1" - Me.tableCell10.Text = "Head Lief Kontonummer" - Me.tableCell10.Weight = 0.056481428600492933R - ' - 'tableCell11 - ' - Me.tableCell11.Name = "tableCell11" - Me.tableCell11.StyleName = "DetailCaption1" - Me.tableCell11.Text = "Head Lief Name" - Me.tableCell11.Weight = 0.038406121390206473R - ' - 'tableCell12 - ' - Me.tableCell12.Name = "tableCell12" - Me.tableCell12.StyleName = "DetailCaption1" - Me.tableCell12.Text = "Head Lief Strasse" - Me.tableCell12.Weight = 0.0423214358375186R - ' - 'tableCell13 - ' - Me.tableCell13.Name = "tableCell13" - Me.tableCell13.StyleName = "DetailCaption1" - Me.tableCell13.Text = "Head Lief PLZ" - Me.tableCell13.Weight = 0.034733501615978421R - ' - 'tableCell14 - ' - Me.tableCell14.Name = "tableCell14" - Me.tableCell14.StyleName = "DetailCaption1" - Me.tableCell14.Text = "Head Lief Ort" - Me.tableCell14.Weight = 0.033023906889415922R - ' - 'tableCell15 - ' - Me.tableCell15.Name = "tableCell15" - Me.tableCell15.StyleName = "DetailCaption1" - Me.tableCell15.Text = "Head Belegart" - Me.tableCell15.Weight = 0.03498478480747768R - ' - 'tableCell16 - ' - Me.tableCell16.Name = "tableCell16" - Me.tableCell16.StyleName = "DetailCaption1" - Me.tableCell16.Text = "Head Datum Auftrag Bestellung" - Me.tableCell16.Weight = 0.1640488034202939R - ' - 'tableCell18 - ' - Me.tableCell18.Name = "tableCell18" - Me.tableCell18.StyleName = "DetailCaption1" - Me.tableCell18.Text = "Head Auftrags Bestellnummer" - Me.tableCell18.Weight = 0.068467915852864589R - ' - 'tableCell19 - ' - Me.tableCell19.Name = "tableCell19" - Me.tableCell19.StyleName = "DetailCaption1" - Me.tableCell19.Text = "Head Leistungsdatum" - Me.tableCell19.Weight = 0.17606359209333147R - ' - 'tableCell22 - ' - Me.tableCell22.Name = "tableCell22" - Me.tableCell22.StyleName = "DetailCaption1" - Me.tableCell22.Text = "Head Infotext" - Me.tableCell22.Weight = 0.0332666015625R - ' - 'tableCell23 - ' - Me.tableCell23.Borders = DevExpress.XtraPrinting.BorderSide.None - 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.057705637613932291R - ' - 'tableCell24 - ' - 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.044022438412620907R - ' - 'tableCell25 - ' - 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.03963033040364583R - ' - 'tableCell26 - ' - 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.043545641217912948R - ' - 'tableCell27 - ' - 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.035957706996372768R - ' - 'tableCell28 - ' - 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.034248112269810269R - ' - 'tableCell29 - ' - 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.063092150006975448R - ' - 'tableCell30 - ' - 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.056481428600492933R - ' - 'tableCell31 - ' - 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.038406121390206473R - ' - 'tableCell32 - ' - 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.0423214358375186R - ' - 'tableCell33 - ' - 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.034733501615978421R - ' - 'tableCell34 - ' - 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.033023906889415922R - ' - 'tableCell35 - ' - 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.03498478480747768R - ' - 'tableCell36 - ' - 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.1640488034202939R - ' - 'tableCell38 - ' - 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.Weight = 0.068467915852864589R - ' - 'tableCell39 - ' - 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.1760636574881489R - ' - 'tableCell42 - ' - 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.Weight = 0.0332665361676826R + Me.Detail.HeightF = 0! + Me.Detail.KeepTogether = True + Me.Detail.Name = "Detail" ' 'table3 ' @@ -699,12 +379,143 @@ Partial Public Class OrderReport Me.DetailReport.Level = 0 Me.DetailReport.Name = "DetailReport" ' + 'XrLabel2 + ' + Me.XrLabel2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 10.00001!) + Me.XrLabel2.Multiline = True + Me.XrLabel2.Name = "XrLabel2" + Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel2.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!) + Me.XrLabel2.StylePriority.UseFont = False + Me.XrLabel2.Text = "Kunde" + ' + 'XrLabel3 + ' + Me.XrLabel3.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Fakt_Kontonummer]")}) + Me.XrLabel3.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel3.LocationFloat = New DevExpress.Utils.PointFloat(118.3903!, 10.00001!) + Me.XrLabel3.Multiline = True + Me.XrLabel3.Name = "XrLabel3" + Me.XrLabel3.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel3.SizeF = New System.Drawing.SizeF(265.092!, 23.0!) + Me.XrLabel3.StylePriority.UseFont = False + Me.XrLabel3.Text = "XrLabel2" + ' + 'XrLabel4 + ' + Me.XrLabel4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Fakt_Name]")}) + Me.XrLabel4.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel4.LocationFloat = New DevExpress.Utils.PointFloat(118.3904!, 33.00001!) + Me.XrLabel4.Multiline = True + Me.XrLabel4.Name = "XrLabel4" + Me.XrLabel4.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel4.SizeF = New System.Drawing.SizeF(265.092!, 23.0!) + Me.XrLabel4.StylePriority.UseFont = False + Me.XrLabel4.Text = "XrLabel2" + ' + 'XrLabel5 + ' + Me.XrLabel5.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel5.LocationFloat = New DevExpress.Utils.PointFloat(383.4824!, 10.00001!) + Me.XrLabel5.Multiline = True + Me.XrLabel5.Name = "XrLabel5" + Me.XrLabel5.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel5.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!) + Me.XrLabel5.StylePriority.UseFont = False + Me.XrLabel5.Text = "Datum" + ' + 'XrLabel6 + ' + Me.XrLabel6.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Datum_AuftragBestellung]")}) + Me.XrLabel6.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel6.LocationFloat = New DevExpress.Utils.PointFloat(491.8157!, 10.00001!) + Me.XrLabel6.Multiline = True + Me.XrLabel6.Name = "XrLabel6" + Me.XrLabel6.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel6.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!) + Me.XrLabel6.StylePriority.UseFont = False + Me.XrLabel6.Text = "XrLabel2" + Me.XrLabel6.TextFormatString = "{0:dd.MM.yyyy}" + ' + 'XrLabel7 + ' + Me.XrLabel7.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Leistungsdatum]")}) + Me.XrLabel7.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel7.LocationFloat = New DevExpress.Utils.PointFloat(491.8157!, 33.00001!) + Me.XrLabel7.Multiline = True + Me.XrLabel7.Name = "XrLabel7" + Me.XrLabel7.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel7.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!) + Me.XrLabel7.StylePriority.UseFont = False + Me.XrLabel7.Text = "XrLabel2" + Me.XrLabel7.TextFormatString = "{0:dd.MM.yyyy}" + ' + 'XrLabel8 + ' + Me.XrLabel8.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel8.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 64.16667!) + Me.XrLabel8.Multiline = True + Me.XrLabel8.Name = "XrLabel8" + Me.XrLabel8.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel8.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!) + Me.XrLabel8.StylePriority.UseFont = False + Me.XrLabel8.Text = "Bestellnummer" + ' + 'XrLabel9 + ' + Me.XrLabel9.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[AuftragsBestellnummer]")}) + Me.XrLabel9.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel9.LocationFloat = New DevExpress.Utils.PointFloat(118.3333!, 64.16667!) + Me.XrLabel9.Multiline = True + Me.XrLabel9.Name = "XrLabel9" + Me.XrLabel9.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel9.SizeF = New System.Drawing.SizeF(265.149!, 23.0!) + Me.XrLabel9.StylePriority.UseFont = False + Me.XrLabel9.Text = "XrLabel2" + ' + 'XrLabel10 + ' + Me.XrLabel10.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Head].[Auftragsreferenz]")}) + Me.XrLabel10.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel10.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 110.1667!) + Me.XrLabel10.Multiline = True + Me.XrLabel10.Name = "XrLabel10" + Me.XrLabel10.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel10.SizeF = New System.Drawing.SizeF(373.4824!, 120.9167!) + Me.XrLabel10.StylePriority.UseFont = False + Me.XrLabel10.Text = "XrLabel2" + ' + 'XrLabel11 + ' + Me.XrLabel11.Font = New System.Drawing.Font("Arial", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel11.LocationFloat = New DevExpress.Utils.PointFloat(814.504!, 10.00001!) + Me.XrLabel11.Multiline = True + Me.XrLabel11.Name = "XrLabel11" + Me.XrLabel11.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel11.SizeF = New System.Drawing.SizeF(225.496!, 77.16665!) + Me.XrLabel11.StylePriority.UseFont = False + Me.XrLabel11.StylePriority.UseTextAlignment = False + Me.XrLabel11.Text = "ORDERS" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Offene EDI Sätze" + Me.XrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight + ' 'ObjectDataSource1 ' Me.ObjectDataSource1.DataSource = GetType(ImporterShared.Schemas.Orders.ReportSource) Me.ObjectDataSource1.Name = "ObjectDataSource1" ' - 'OrderReport2 + 'XrLabel12 + ' + Me.XrLabel12.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel12.LocationFloat = New DevExpress.Utils.PointFloat(9.999998!, 87.16666!) + Me.XrLabel12.Multiline = True + Me.XrLabel12.Name = "XrLabel12" + Me.XrLabel12.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel12.SizeF = New System.Drawing.SizeF(108.3333!, 23.0!) + Me.XrLabel12.StylePriority.UseFont = False + Me.XrLabel12.Text = "Auftragsreferenz" + ' + 'OrderReport ' 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}) @@ -716,8 +527,6 @@ Partial Public Class OrderReport 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.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() @@ -740,48 +549,7 @@ 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 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 - Friend WithEvents tableCell6 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell7 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell8 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell9 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell10 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell11 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell12 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell13 As DevExpress.XtraReports.UI.XRTableCell - 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 tableCell18 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell19 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell22 As DevExpress.XtraReports.UI.XRTableCell - 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 - Friend WithEvents tableCell26 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell27 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell28 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell29 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell30 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell31 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell32 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell33 As DevExpress.XtraReports.UI.XRTableCell - 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 tableCell38 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell39 As DevExpress.XtraReports.UI.XRTableCell - Friend WithEvents tableCell42 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 @@ -805,4 +573,15 @@ Partial Public Class OrderReport Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel Friend WithEvents Detail1 As DevExpress.XtraReports.UI.DetailBand Friend WithEvents DetailReport As DevExpress.XtraReports.UI.DetailReportBand + Friend WithEvents XrLabel6 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel7 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel5 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel4 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel3 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel9 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel10 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel8 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel11 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents XrLabel12 As DevExpress.XtraReports.UI.XRLabel End Class diff --git a/EDIDocumentImport/frmMain.Designer.vb b/EDIDocumentImport/frmMain.Designer.vb index c0dd579..dc2cc9e 100644 --- a/EDIDocumentImport/frmMain.Designer.vb +++ b/EDIDocumentImport/frmMain.Designer.vb @@ -39,7 +39,6 @@ Partial Class frmMain 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.RibbonGroupData = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroupDocument = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroupPositions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -73,10 +72,17 @@ Partial Class frmMain Me.cmbYears = New DevExpress.XtraEditors.ComboBoxEdit() 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.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.TabbedControlGroup2 = New DevExpress.XtraLayout.TabbedControlGroup() + 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.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -91,16 +97,12 @@ Partial Class frmMain Me.LayoutControlItemRunningNumber = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = 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.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.cmdDocumentKind = New DevExpress.XtraEditors.SearchLookUpEdit() + Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit() @@ -130,10 +132,17 @@ Partial Class frmMain CType(Me.cmbYears.Properties, System.ComponentModel.ISupportInitialize).BeginInit() 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.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TabbedControlGroup2, 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.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -148,16 +157,12 @@ Partial Class frmMain CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, 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.GridControlPositions, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewPositions, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl3.SuspendLayout() + CType(Me.cmdDocumentKind.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl @@ -281,7 +286,7 @@ Partial Class frmMain ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonGroupData, Me.RibbonGroupDocument, Me.RibbonGroupPositions}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonGroupData, Me.RibbonGroupDocument, Me.RibbonGroupPositions}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -300,14 +305,6 @@ Partial Class frmMain Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Konfiguration" ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem8) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "Debugging" - ' 'RibbonGroupData ' Me.RibbonGroupData.Enabled = False @@ -436,8 +433,9 @@ Partial Class frmMain Me.LayoutControlHead.Controls.Add(Me.cmbYears) Me.LayoutControlHead.Controls.Add(Me.txtCustomerGLN) Me.LayoutControlHead.Controls.Add(Me.txtDeliveryAddressGLN) - Me.LayoutControlHead.Controls.Add(Me.txtDocumentKind) Me.LayoutControlHead.Controls.Add(Me.txtDocumentReference) + Me.LayoutControlHead.Controls.Add(Me.TextEdit1) + Me.LayoutControlHead.Controls.Add(Me.cmdDocumentKind) Me.LayoutControlHead.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControlHead.Enabled = False Me.LayoutControlHead.Location = New System.Drawing.Point(0, 0) @@ -477,7 +475,7 @@ Partial Class frmMain ' 'TextEdit5 ' - Me.TextEdit5.Location = New System.Drawing.Point(123, 50) + Me.TextEdit5.Location = New System.Drawing.Point(123, 80) Me.TextEdit5.MenuManager = Me.RibbonControl Me.TextEdit5.Name = "TextEdit5" Me.TextEdit5.Size = New System.Drawing.Size(599, 20) @@ -486,7 +484,7 @@ Partial Class frmMain ' 'TextEdit6 ' - Me.TextEdit6.Location = New System.Drawing.Point(828, 50) + Me.TextEdit6.Location = New System.Drawing.Point(828, 80) Me.TextEdit6.MenuManager = Me.RibbonControl Me.TextEdit6.Name = "TextEdit6" Me.TextEdit6.Size = New System.Drawing.Size(207, 20) @@ -495,7 +493,7 @@ Partial Class frmMain ' 'TextEdit7 ' - Me.TextEdit7.Location = New System.Drawing.Point(346, 80) + Me.TextEdit7.Location = New System.Drawing.Point(346, 110) Me.TextEdit7.MenuManager = Me.RibbonControl Me.TextEdit7.Name = "TextEdit7" Me.TextEdit7.Size = New System.Drawing.Size(689, 20) @@ -504,7 +502,7 @@ Partial Class frmMain ' 'TextEdit8 ' - Me.TextEdit8.Location = New System.Drawing.Point(123, 80) + Me.TextEdit8.Location = New System.Drawing.Point(123, 110) Me.TextEdit8.MenuManager = Me.RibbonControl Me.TextEdit8.Name = "TextEdit8" Me.TextEdit8.Size = New System.Drawing.Size(117, 20) @@ -513,7 +511,7 @@ Partial Class frmMain ' 'TextEdit9 ' - Me.TextEdit9.Location = New System.Drawing.Point(123, 110) + Me.TextEdit9.Location = New System.Drawing.Point(123, 140) Me.TextEdit9.MenuManager = Me.RibbonControl Me.TextEdit9.Name = "TextEdit9" Me.TextEdit9.Size = New System.Drawing.Size(912, 20) @@ -644,15 +642,6 @@ Partial Class frmMain Me.txtDeliveryAddressGLN.StyleController = Me.LayoutControlHead Me.txtDeliveryAddressGLN.TabIndex = 17 ' - 'txtDocumentKind - ' - Me.txtDocumentKind.Location = New System.Drawing.Point(932, 50) - Me.txtDocumentKind.MenuManager = Me.RibbonControl - Me.txtDocumentKind.Name = "txtDocumentKind" - Me.txtDocumentKind.Size = New System.Drawing.Size(103, 20) - Me.txtDocumentKind.StyleController = Me.LayoutControlHead - Me.txtDocumentKind.TabIndex = 18 - ' 'txtDocumentReference ' Me.txtDocumentReference.Location = New System.Drawing.Point(123, 170) @@ -662,6 +651,15 @@ Partial Class frmMain Me.txtDocumentReference.StyleController = Me.LayoutControlHead Me.txtDocumentReference.TabIndex = 19 ' + 'TextEdit1 + ' + Me.TextEdit1.Location = New System.Drawing.Point(123, 50) + Me.TextEdit1.MenuManager = Me.RibbonControl + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Size = New System.Drawing.Size(912, 20) + Me.TextEdit1.StyleController = Me.LayoutControlHead + Me.TextEdit1.TabIndex = 20 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -679,6 +677,74 @@ Partial Class frmMain Me.TabbedControlGroup2.Size = New System.Drawing.Size(1042, 255) Me.TabbedControlGroup2.TabPages.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup2, Me.LayoutControlGroup1}) ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.LayoutControlItem9, Me.LayoutControlItem15}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(1018, 208) + Me.LayoutControlGroup1.Text = "Diverse Adresse" + ' + 'LayoutControlItem10 + ' + Me.LayoutControlItem10.Control = Me.TextEdit9 + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem10.Name = "LayoutControlItem10" + Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem10.Size = New System.Drawing.Size(1018, 118) + 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, 30) + 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, 30) + 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 + Me.LayoutControlItem8.Location = New System.Drawing.Point(223, 60) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem8.Size = New System.Drawing.Size(795, 30) + Me.LayoutControlItem8.Text = "Ort" + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(93, 13) + ' + 'LayoutControlItem9 + ' + Me.LayoutControlItem9.Control = Me.TextEdit8 + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem9.Name = "LayoutControlItem9" + Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem9.Size = New System.Drawing.Size(223, 30) + Me.LayoutControlItem9.Text = "PLZ" + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(93, 13) + ' + 'LayoutControlItem15 + ' + Me.LayoutControlItem15.Control = Me.TextEdit1 + Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem15.Name = "LayoutControlItem15" + Me.LayoutControlItem15.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem15.Size = New System.Drawing.Size(1018, 30) + Me.LayoutControlItem15.Text = "Name" + Me.LayoutControlItem15.TextSize = New System.Drawing.Size(93, 13) + ' 'LayoutControlGroup2 ' Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5, Me.LayoutControlItem2, Me.LayoutItemOrderIssuer, Me.LayoutItemOrderNumber, Me.LayoutItemOrderDate, Me.LayoutControlItem12, Me.LayoutControlItem13, Me.LayoutControlItem1, Me.LayoutControlItem4, Me.LayoutControlItem11, Me.LayoutControlItemRunningNumber, Me.LayoutControlItem14, Me.LayoutControlItem3}) @@ -779,7 +845,7 @@ Partial Class frmMain ' 'LayoutControlItem11 ' - Me.LayoutControlItem11.Control = Me.txtDocumentKind + Me.LayoutControlItem11.Control = Me.cmdDocumentKind Me.LayoutControlItem11.Location = New System.Drawing.Point(809, 0) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) @@ -817,64 +883,6 @@ Partial Class frmMain Me.LayoutControlItem3.Text = "Freitext" Me.LayoutControlItem3.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}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(1018, 208) - Me.LayoutControlGroup1.Text = "Diverse Adresse" - ' - 'LayoutControlItem10 - ' - Me.LayoutControlItem10.Control = Me.TextEdit9 - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 60) - Me.LayoutControlItem10.Name = "LayoutControlItem10" - Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem10.Size = New System.Drawing.Size(1018, 148) - 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 - Me.LayoutControlItem8.Location = New System.Drawing.Point(223, 30) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(795, 30) - Me.LayoutControlItem8.Text = "Ort" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(93, 13) - ' - 'LayoutControlItem9 - ' - Me.LayoutControlItem9.Control = Me.TextEdit8 - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 30) - Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem9.Size = New System.Drawing.Size(223, 30) - Me.LayoutControlItem9.Text = "PLZ" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(93, 13) - ' 'GridControlPositions ' Me.GridControlPositions.Dock = System.Windows.Forms.DockStyle.Fill @@ -920,6 +928,25 @@ Partial Class frmMain Me.RichEditXml.Size = New System.Drawing.Size(0, 0) Me.RichEditXml.TabIndex = 0 ' + 'cmdDocumentKind + ' + Me.cmdDocumentKind.Location = New System.Drawing.Point(932, 50) + Me.cmdDocumentKind.MenuManager = Me.RibbonControl + Me.cmdDocumentKind.Name = "cmdDocumentKind" + Me.cmdDocumentKind.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmdDocumentKind.Properties.NullText = "" + Me.cmdDocumentKind.Properties.PopupView = Me.GridView3 + Me.cmdDocumentKind.Size = New System.Drawing.Size(103, 20) + Me.cmdDocumentKind.StyleController = Me.LayoutControlHead + Me.cmdDocumentKind.TabIndex = 18 + ' + 'GridView3 + ' + Me.GridView3.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.GridView3.Name = "GridView3" + Me.GridView3.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridView3.OptionsView.ShowGroupPanel = False + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -962,10 +989,17 @@ Partial Class frmMain CType(Me.cmbYears.Properties, System.ComponentModel.ISupportInitialize).EndInit() 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.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TabbedControlGroup2, 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.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() @@ -980,16 +1014,12 @@ Partial Class frmMain CType(Me.LayoutControlItemRunningNumber, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, 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.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.cmdDocumentKind.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1028,7 +1058,6 @@ Partial Class frmMain Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents RichEditXml As DevExpress.XtraRichEdit.RichEditControl Friend WithEvents checkShowXml As DevExpress.XtraBars.BarCheckItem - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents cmbMandator As DevExpress.XtraEditors.SearchLookUpEdit Friend WithEvents SearchLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents cmbCustomer As DevExpress.XtraEditors.SearchLookUpEdit @@ -1068,7 +1097,6 @@ Partial Class frmMain Friend WithEvents LayoutControlItem13 As DevExpress.XtraLayout.LayoutControlItem 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 @@ -1076,4 +1104,8 @@ Partial Class frmMain Friend WithEvents btnReloadDocument As DevExpress.XtraBars.BarButtonItem Friend WithEvents colId As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colName As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents cmdDocumentKind As DevExpress.XtraEditors.SearchLookUpEdit + Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.Grid.GridView End Class diff --git a/EDIDocumentImport/frmMain.vb b/EDIDocumentImport/frmMain.vb index e556f9a..e27dd92 100644 --- a/EDIDocumentImport/frmMain.vb +++ b/EDIDocumentImport/frmMain.vb @@ -31,11 +31,13 @@ Public Class frmMain txtVersion.Caption = String.Format(txtVersion.Caption, Application.ProductVersion) LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "EDI Document Importer") + Logger = LogConfig.GetLogger() + Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion) + ConfigManager = New ConfigManager(Of ImporterShared.Config)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath) - Logger = LogConfig.GetLogger() ' If ConnectionString does not exist, show SQL Config Form If ConfigManager.Config.ConnectionString = String.Empty Then @@ -76,12 +78,16 @@ Public Class frmMain ' Initialize Grids GridBuilder = New GridBuilder(New List(Of GridView) From {GridViewFiles, GridViewPositions}) GridBuilder.WithDefaults() + PositionGrid.LoadPositionViewAndColumns(GridViewPositions, DocumentType.Order) ' Construct classes related to the xml data DocumentLoader = New DocumentLoader(LogConfig, Winline) + + Catch ex As Exception Logger.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, Text) + Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden der Anwendung") + MsgBox(oMessage, MsgBoxStyle.Critical, Text) End Try End Sub @@ -90,6 +96,10 @@ Public Class frmMain Return $"Das Feld '{FieldName}' muss ausgefüllt werden!" End Function + Private Function GetErrorMessage(pException As Exception, pErrorText As String) + Return $"{pErrorText}:{vbNewLine}{vbNewLine}{pException.Message}" + End Function + Private Function GetFocusedDocument() As Document Dim oRowHandles = GridViewFiles.GetSelectedRows().ToList() Dim oDocument As Document = GridViewFiles.GetRow(oRowHandles.First()) @@ -174,17 +184,17 @@ Public Class frmMain End Select Catch ex As Xml.XmlException - Dim oMessage As String = $"Fehler beim Laden des Dokuments {pDocument.Name}:{vbNewLine}{ex.Message}" + Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden des Dokuments") MsgBox(oMessage, MsgBoxStyle.Critical, Text) Logger.Error(ex) Catch ex As Exceptions.NoMandatorException - Dim oMessage As String = $"Fehler beim Laden des Dokuments {pDocument.Name}:{vbNewLine}{ex.Message}" + Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden des Dokuments") MsgBox(oMessage, MsgBoxStyle.Critical, Text) Logger.Error(ex) Catch ex As Exception - Dim oMessage As String = $"Unerwarteter Fehler beim Laden des Dokuments {pDocument.Name}:{vbNewLine}{ex.Message}" + Dim oMessage = GetErrorMessage(ex, "Fehler beim Laden des Dokuments") MsgBox(oMessage, MsgBoxStyle.Critical, Text) Logger.Error(ex) @@ -211,7 +221,10 @@ Public Class frmMain txtRunningNumber.Text = oHead.Laufnummer txtOrderIssuer.Text = oHead.Fakt_Ansprechpartner txtOrderNumber.Text = oHead.AuftragsBestellnummer - txtDocumentKind.Text = oHead.Belegart + + ' TODO: Get Doc Kind from Winline Class + cmdDocumentKind.Text = oHead.Belegart + txtDocumentReference.Text = oHead.Auftragsreferenz dateOrderDate.EditValue = oHead.Datum_AuftragBestellung @@ -267,9 +280,6 @@ Public Class frmMain End If - - PositionGrid.LoadPositionViewAndColumns(GridViewPositions, DocumentType.Order) - Dim oPositionList = PositionData.Load(oData, oDataOriginal) GridControlPositions.DataSource = oPositionList GridViewPositions.BestFitColumns() diff --git a/ImporterShared/Documents/DocumentLoader.vb b/ImporterShared/Documents/DocumentLoader.vb index dcc8712..60e75fe 100644 --- a/ImporterShared/Documents/DocumentLoader.vb +++ b/ImporterShared/Documents/DocumentLoader.vb @@ -5,6 +5,7 @@ Imports System.Xml.XPath Imports DigitalData.Modules.Language Imports DigitalData.Modules.Logging Imports ImporterShared.Documents +Imports ImporterShared.Schemas.Orders Namespace Documents Public Class DocumentLoader @@ -54,9 +55,9 @@ Namespace Documents Private Function MatchDataFromWinLine(pDocument As Document, pMandators As List(Of Winline.Mandator)) As Document Dim oMandators As List(Of Winline.Mandator) = pMandators. - Where(Function(m) m.IsWhitelisted = True). - OrderBy(Function(m) m.Order). - ToList() + Where(Function(m) m.IsWhitelisted = True). + OrderBy(Function(m) m.Order). + ToList() If TypeOf pDocument.Data Is Schemas.Orders.Input.MESOWebService Then Dim oMandator = Winline.FindMatchingMandatorFromOrder(pDocument.Data) @@ -73,43 +74,45 @@ Namespace Documents Return pDocument End Function - Private Function MatchOrderData(pData As Schemas.Orders.Input.MESOWebService, pMandator As Winline.Mandator) As Schemas.Orders.Input.MESOWebService + Private Function MatchOrderData(pData As Input.MESOWebService, pMandator As Winline.Mandator) As Input.MESOWebService Dim oYear = Winline.GetWinLineYear() If pMandator Is Nothing Then Return pData End If - Dim oHead As Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT025 = pData.Items. - Where(Function(h) TypeOf h Is Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT025). - SetValue(Sub(h) - Dim oAccountNumber = Winline.TryGetAccountNumber(h.Fakt_Kontonummer, pMandator) - If oAccountNumber IsNot Nothing Then - h.Fakt_Kontonummer = oAccountNumber - End If - - Dim oAccountNumber2 = Winline.TryGetAccountNumber(h.Lief_Kontonummer, pMandator) - If oAccountNumber2 IsNot Nothing Then - h.Lief_Kontonummer = oAccountNumber2 - End If - End Sub). - FirstOrDefault() - - Dim oPositions As List(Of Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT026) = pData.Items. - Where(Function(p) TypeOf p Is Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT026). - SetValue(Sub(p) - Dim oArticleNumber = Winline.TryGetArticleNumber(p.Artikelnummer, pMandator) - If oArticleNumber IsNot Nothing Then - p.Artikelnummer = oArticleNumber - End If - End Sub). - Select(Of Schemas.Orders.Input.MESOWebServiceEXIMVRG_ordersT026)(Function(i) i). - ToList() + Dim oHead As Input.MESOWebServiceEXIMVRG_ordersT025 = pData.Items. + Where(Function(h) TypeOf h Is Input.MESOWebServiceEXIMVRG_ordersT025). + SetValue(Sub(h As Input.MESOWebServiceEXIMVRG_ordersT025) + Dim oAccount = Winline.TryGetAccount(h.Fakt_Kontonummer, pMandator) + If oAccount IsNot Nothing Then + h.Fakt_Kontonummer = oAccount.Id + h.Fakt_Name = oAccount.Name + End If + End Sub). + SetValue(Sub(h As Input.MESOWebServiceEXIMVRG_ordersT025) + Dim oAccount = Winline.TryGetAccount(h.Lief_Kontonummer, pMandator) + If oAccount IsNot Nothing Then + h.Lief_Kontonummer = oAccount.Id + h.Lief_Name = oAccount.Name + End If + End Sub). + FirstOrDefault() + Dim oPositions As List(Of Input.MESOWebServiceEXIMVRG_ordersT026) = pData.Items. + Where(Function(p) TypeOf p Is Input.MESOWebServiceEXIMVRG_ordersT026). + SetValue(Sub(p) + Dim oArticleNumber = Winline.TryGetArticleNumber(p.Artikelnummer, pMandator) + If oArticleNumber IsNot Nothing Then + p.Artikelnummer = oArticleNumber + End If + End Sub). + Select(Of Input.MESOWebServiceEXIMVRG_ordersT026)(Function(i) i). + ToList() pData.Items = New List(Of Object) From {oHead}. - Concat(oPositions). - ToArray() + Concat(oPositions). + ToArray() Return pData End Function diff --git a/ImporterShared/ImporterShared.vbproj b/ImporterShared/ImporterShared.vbproj index 5ed7b6d..46acf96 100644 --- a/ImporterShared/ImporterShared.vbproj +++ b/ImporterShared/ImporterShared.vbproj @@ -117,9 +117,10 @@ - + - + + diff --git a/ImporterShared/Winline/Data.vb b/ImporterShared/Winline/Data.vb index 4376a96..0795d2c 100644 --- a/ImporterShared/Winline/Data.vb +++ b/ImporterShared/Winline/Data.vb @@ -17,9 +17,16 @@ Namespace Winline Public Years As List(Of Integer) Public Const V21_ARTICLENUMBER = "c011" + Public Const V50_ACCOUNTNUMBER = "c002" + Public Const V50_ACCOUNTNAME = "c003" + Public Const V05_ACCOUNTID = "c002" Public Const V05_ACCOUNTNAME = "c003" + + Public Const T357_KINDID = "c030" + Public Const T357_KINDNAME = "c001" + Public Const T01_DATABASEINFO = "c004" Public Const T01_MANDATORID = "c000" Public Const T01_MANDATORNAME = "c003" @@ -39,44 +46,63 @@ Namespace Winline End Function Public Sub LoadAccounts(pMandator As Mandator) - Dim oSQL = $"SELECT [c002], [c003] FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v005] WHERE c139 IS NULL" - Dim oTable = Database.GetDatatable(oSQL) + Logger.Info("Loading Accounts for Mandator [{0}]", pMandator) - For Each oRow As DataRow In oTable.Rows - Accounts.Add(New Account With { - .Id = oRow.Item(V05_ACCOUNTID), - .Name = oRow.Item(V05_ACCOUNTNAME), - .Mandator = pMandator.Id - }) - Next + Try + Dim oSQL = $"SELECT DISTINCT [c002], [c003] FROM [{pMandator.Server}].[{pMandator.Database}].[dbo].[v005] WHERE c139 IS NULL" + Dim oTable = Database.GetDatatable(oSQL) + Dim oAccounts As New List(Of Account) + + For Each oRow As DataRow In oTable.Rows + oAccounts.Add(New Account With { + .Id = oRow.Item(V05_ACCOUNTID), + .Name = oRow.Item(V05_ACCOUNTNAME), + .Mandator = pMandator.Id + }) + Next + Accounts.AddRange(oAccounts) + + Logger.Info("[{0}] Accounts loaded for Mandator [{1}]", oAccounts.Count, pMandator) + Catch ex As Exception + Logger.Warn("Could not load Accounts for Mandator [{0}]", pMandator) + Logger.Error(ex) + End Try End Sub Public Sub LoadMandators() - Dim oSQL = "SELECT [c000], [c003], [c004] FROM [cwlsystem].[dbo].[T001SRV] (NOLOCK)" - Dim oTable = Database.GetDatatable(oSQL) + Try + Dim oSQL = "SELECT [c000], [c003], [c004] FROM [cwlsystem].[dbo].[T001SRV] (NOLOCK)" + Dim oTable = Database.GetDatatable(oSQL) - Mandators.Clear() - For Each oRow As DataRow In oTable.Rows - Dim oDbInfo = SplitConnectionInfo(oRow) - Dim oMandator = New Mandator With { - .Id = oRow.Item(T01_MANDATORID), - .Name = oRow.Item(T01_MANDATORNAME), - .Database = oDbInfo.Item1, - .Server = oDbInfo.Item2 - } + Mandators.Clear() + For Each oRow As DataRow In oTable.Rows + Dim oDbInfo = SplitConnectionInfo(oRow) + Dim oMandator = New Mandator With { + .Id = oRow.Item(T01_MANDATORID), + .Name = oRow.Item(T01_MANDATORNAME), + .Database = oDbInfo.Item1, + .Server = oDbInfo.Item2 + } - Dim oMandatorConfig As Config.MandatorConfig = Config.Mandators. - Where(Function(m) oMandator.Id = m.Name). - SingleOrDefault() + Dim oMandatorConfig As Config.MandatorConfig = Config.Mandators. + Where(Function(m) oMandator.Id = m.Name). + SingleOrDefault() - If oMandatorConfig IsNot Nothing Then - oMandator.IsWhitelisted = True - oMandator.Regex = oMandatorConfig.ArticleRegex - oMandator.Order = oMandatorConfig.Order - End If + If oMandatorConfig IsNot Nothing Then + oMandator.IsWhitelisted = True + oMandator.Regex = oMandatorConfig.ArticleRegex + oMandator.Order = oMandatorConfig.Order + End If - Mandators.Add(oMandator) - Next + + Mandators.Add(oMandator) + Next + + Logger.Info("[{0}] Mandators loaded", Mandators.Count) + Catch ex As Exception + Logger.Warn("Could not load Mandators") + Logger.Error(ex) + End Try End Sub Public Sub LoadEconomicYears() @@ -85,17 +111,58 @@ Namespace Winline Years = oRange End Sub - Public Function TryGetAccountNumber(pGLN As String, pMandator As Mandator) As String + Public Function GetDocumentKinds(pMandator As Mandator, pYear As Integer) As List(Of DocumentKind) + Dim oDocumentKinds As New List(Of DocumentKind) + Try + Dim oSQL = $" + SELECT + [c030], + [c001] + FROM [t357] (NOLOCK) + WHERE ( + [c001] LIKE 'Werk%(VK)' OR + [c001] LIKE 'Werk%(WK)' + ) + AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {pYear}" + Dim oTable As DataTable = Database.GetDatatable(oSQL) + + If oTable.Rows.Count = 0 Then + Logger.Warn("No DocumentKinds found") + Return oDocumentKinds + + End If + + For Each oRow As DataRow In oTable.Rows + oDocumentKinds.Add(New DocumentKind With { + .Id = oRow.Item(T357_KINDID), + .Name = oRow.Item(T357_KINDNAME) + }) + Next + + Return oDocumentKinds + Catch ex As Exception + Logger.Warn("Could not load DocumentKinds") + Logger.Error(ex) + Return oDocumentKinds + End Try + End Function + + Public Function TryGetAccount(pGLN As String, pMandator As Mandator) As Account + Try + If pGLN Is Nothing OrElse pGLN = String.Empty Then + Return Nothing + End If + Dim oYear As Integer = GetWinLineYear() Dim oSQL = $" - SELECT - [c002], -- Kundennummer - [c003] -- Kundenname - FROM [{pMandator.Database}].[dbo].[v050] - WHERE [c004] = 2 -- Was für ein Konto?? - AND [c260] = {pGLN} - AND [mesocomp] = '{pMandator.Id}' and [mesoyear] = {oYear}" + SELECT + [c002], -- Kundennummer + [c003] -- Kundenname + FROM [{pMandator.Database}].[dbo].[v050] + WHERE [c004] = 2 -- KontoTyp + AND [c260] = '{pGLN}' + AND [mesocomp] = '{pMandator.Id}' and [mesoyear] = {oYear}" Dim oTable As DataTable = Database.GetDatatable(oSQL) ' GLN not found in this Mandator, continue to next one @@ -113,9 +180,16 @@ Namespace Winline End If Dim oRow As DataRow = oTable.Rows.Item(0) - Dim oArticleNumber As String = Utils.NotNull(oRow.Item(V50_ACCOUNTNUMBER), String.Empty) - Return oArticleNumber + Dim oAccountNumber As String = Utils.NotNull(oRow.Item(V50_ACCOUNTNUMBER), String.Empty) + Dim oAccountName As String = Utils.NotNull(oRow.Item(V50_ACCOUNTNAME), String.Empty) + + Return New Account With { + .Id = oAccountNumber, + .Name = oAccountName, + .Mandator = pMandator.Id + } Catch ex As Exception + Logger.Warn("Error while trying to get account for GLN [{0}]", pGLN) Logger.Error(ex) Return Nothing End Try diff --git a/ImporterShared/Winline/Account.vb b/ImporterShared/Winline/Entities/Account.vb similarity index 100% rename from ImporterShared/Winline/Account.vb rename to ImporterShared/Winline/Entities/Account.vb diff --git a/ImporterShared/Winline/Entities/DocumentKind.vb b/ImporterShared/Winline/Entities/DocumentKind.vb new file mode 100644 index 0000000..b030979 --- /dev/null +++ b/ImporterShared/Winline/Entities/DocumentKind.vb @@ -0,0 +1,7 @@ +Namespace Winline + Public Class DocumentKind + Public Id As Integer + Public Name As String + End Class + +End Namespace \ No newline at end of file diff --git a/ImporterShared/Winline/Mandator.vb b/ImporterShared/Winline/Entities/Mandator.vb similarity index 100% rename from ImporterShared/Winline/Mandator.vb rename to ImporterShared/Winline/Entities/Mandator.vb