From b3cec8b6e881eb5c014aa2984b6a4a0759d1cd14 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Jun 2018 11:05:12 +0200 Subject: [PATCH 1/4] jj: ignore build files --- SchaumKommiCollo/.gitignore | 157 ++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 SchaumKommiCollo/.gitignore diff --git a/SchaumKommiCollo/.gitignore b/SchaumKommiCollo/.gitignore new file mode 100644 index 0000000..11bf4d7 --- /dev/null +++ b/SchaumKommiCollo/.gitignore @@ -0,0 +1,157 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets +!packages/*/build/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.log +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml + +# NuGet Packages Directory +## TODO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + + +#LightSwitch generated files +GeneratedArtifacts/ +_Pvt_Extensions/ +ModelManifest.xml + +# ========================= +# Windows detritus +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac desktop service store files +.DS_Store +/SchaumKommiCollo/.vs/KommiCollo/v15/Server/sqlite3 From 0f7fa5ffc9f0f0d4aed91a464563d9472679868f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Jun 2018 11:05:37 +0200 Subject: [PATCH 2/4] jj: add grouping back, we need it :/ --- .../KommiCollo/reportUebergabe.designer.vb | 328 ++++++++++-------- 1 file changed, 179 insertions(+), 149 deletions(-) diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb index cc70852..be9d28e 100644 --- a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb +++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb @@ -40,6 +40,16 @@ Partial Public Class reportUebergabe Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand() Me.SqlDataSource1 = New DevExpress.DataAccess.Sql.SqlDataSource(Me.components) Me.PageHeaderBand1 = New DevExpress.XtraReports.UI.PageHeaderBand() + Me.XrPageInfo3 = New DevExpress.XtraReports.UI.XRPageInfo() + Me.XrLabel25 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel29 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel31 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel32 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel33 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLine4 = New DevExpress.XtraReports.UI.XRLine() + Me.XrLabel37 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel38 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel39 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel41 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel48 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel11 = New DevExpress.XtraReports.UI.XRLabel() @@ -94,16 +104,9 @@ Partial Public Class reportUebergabe Me.XrLabel34 = New DevExpress.XtraReports.UI.XRLabel() Me.labelGewicht = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel55 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrPageInfo3 = New DevExpress.XtraReports.UI.XRPageInfo() - Me.XrLabel25 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel29 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel31 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel32 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel33 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLine4 = New DevExpress.XtraReports.UI.XRLine() - Me.XrLabel37 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel38 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel39 = New DevExpress.XtraReports.UI.XRLabel() + Me.GroupHeader1 = New DevExpress.XtraReports.UI.GroupHeaderBand() + Me.GroupHeader2 = New DevExpress.XtraReports.UI.GroupHeaderBand() + Me.GroupHeader4 = New DevExpress.XtraReports.UI.GroupHeaderBand() Me.XrSubreport1 = New DevExpress.XtraReports.UI.XRSubreport() CType(Me, System.ComponentModel.ISupportInitialize).BeginInit() ' @@ -238,6 +241,137 @@ Partial Public Class reportUebergabe Me.PageHeaderBand1.HeightF = 81.64739! Me.PageHeaderBand1.Name = "PageHeaderBand1" ' + 'XrPageInfo3 + ' + Me.XrPageInfo3.Dpi = 100.0! + Me.XrPageInfo3.Font = New System.Drawing.Font("Arial", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrPageInfo3.Format = "{0} von {1}" + Me.XrPageInfo3.LocationFloat = New DevExpress.Utils.PointFloat(547.9167!, 0!) + Me.XrPageInfo3.Name = "XrPageInfo3" + Me.XrPageInfo3.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrPageInfo3.SizeF = New System.Drawing.SizeF(102.0833!, 25.0!) + Me.XrPageInfo3.StyleName = "PageInfo" + Me.XrPageInfo3.StylePriority.UseFont = False + Me.XrPageInfo3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight + ' + 'XrLabel25 + ' + Me.XrLabel25.Dpi = 100.0! + Me.XrLabel25.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel25.LocationFloat = New DevExpress.Utils.PointFloat(487.468!, 43.64738!) + Me.XrLabel25.Multiline = True + Me.XrLabel25.Name = "XrLabel25" + Me.XrLabel25.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel25.SizeF = New System.Drawing.SizeF(81.16373!, 28.00001!) + Me.XrLabel25.StyleName = "Title" + Me.XrLabel25.StylePriority.UseFont = False + Me.XrLabel25.StylePriority.UseTextAlignment = False + Me.XrLabel25.Text = "Warenwert" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Nachnahme" + Me.XrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight + ' + 'XrLabel29 + ' + Me.XrLabel29.Dpi = 100.0! + Me.XrLabel29.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel29.LocationFloat = New DevExpress.Utils.PointFloat(278.3874!, 43.64751!) + Me.XrLabel29.Multiline = True + Me.XrLabel29.Name = "XrLabel29" + Me.XrLabel29.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel29.SizeF = New System.Drawing.SizeF(119.576!, 28.00001!) + Me.XrLabel29.StyleName = "Title" + Me.XrLabel29.StylePriority.UseFont = False + Me.XrLabel29.Text = "Warenbeschreibung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "L x B x H" + ' + 'XrLabel31 + ' + Me.XrLabel31.Dpi = 100.0! + Me.XrLabel31.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel31.LocationFloat = New DevExpress.Utils.PointFloat(568.6316!, 43.64738!) + Me.XrLabel31.Multiline = True + Me.XrLabel31.Name = "XrLabel31" + Me.XrLabel31.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel31.SizeF = New System.Drawing.SizeF(81.36865!, 28.00001!) + Me.XrLabel31.StyleName = "Title" + Me.XrLabel31.StylePriority.UseFont = False + Me.XrLabel31.StylePriority.UseTextAlignment = False + Me.XrLabel31.Text = "Frankatur:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Transp. Vers." + Me.XrLabel31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight + ' + 'XrLabel32 + ' + Me.XrLabel32.Dpi = 100.0! + Me.XrLabel32.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel32.LocationFloat = New DevExpress.Utils.PointFloat(397.9634!, 43.64738!) + Me.XrLabel32.Multiline = True + Me.XrLabel32.Name = "XrLabel32" + Me.XrLabel32.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel32.SizeF = New System.Drawing.SizeF(89.50453!, 28.0!) + Me.XrLabel32.StyleName = "Title" + Me.XrLabel32.StylePriority.UseFont = False + Me.XrLabel32.StylePriority.UseTextAlignment = False + Me.XrLabel32.Text = "Gewicht" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "CBM/LDM" + Me.XrLabel32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight + ' + 'XrLabel33 + ' + Me.XrLabel33.Dpi = 100.0! + Me.XrLabel33.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel33.LocationFloat = New DevExpress.Utils.PointFloat(156.9494!, 43.64738!) + Me.XrLabel33.Multiline = True + Me.XrLabel33.Name = "XrLabel33" + Me.XrLabel33.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel33.SizeF = New System.Drawing.SizeF(58.88715!, 28.00001!) + Me.XrLabel33.StyleName = "Title" + Me.XrLabel33.StylePriority.UseFont = False + Me.XrLabel33.Text = "Auftrag:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zeichen/Nr." + ' + 'XrLine4 + ' + Me.XrLine4.Dpi = 100.0! + Me.XrLine4.LocationFloat = New DevExpress.Utils.PointFloat(0.0002441406!, 74.64739!) + Me.XrLine4.Name = "XrLine4" + Me.XrLine4.SizeF = New System.Drawing.SizeF(650.0!, 7.0!) + ' + 'XrLabel37 + ' + Me.XrLabel37.Dpi = 100.0! + Me.XrLabel37.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel37.LocationFloat = New DevExpress.Utils.PointFloat(2.000237!, 43.64738!) + Me.XrLabel37.Name = "XrLabel37" + Me.XrLabel37.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel37.SizeF = New System.Drawing.SizeF(154.9492!, 28.00001!) + Me.XrLabel37.StyleName = "Title" + Me.XrLabel37.StylePriority.UseFont = False + Me.XrLabel37.Text = "Empfänger:" + ' + 'XrLabel38 + ' + Me.XrLabel38.Dpi = 100.0! + Me.XrLabel38.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel38.LocationFloat = New DevExpress.Utils.PointFloat(215.8366!, 43.64738!) + Me.XrLabel38.Multiline = True + Me.XrLabel38.Name = "XrLabel38" + Me.XrLabel38.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel38.SizeF = New System.Drawing.SizeF(62.55078!, 28.00001!) + Me.XrLabel38.StyleName = "Title" + Me.XrLabel38.StylePriority.UseFont = False + Me.XrLabel38.StylePriority.UseTextAlignment = False + Me.XrLabel38.Text = "Kolli Art" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verp. auf" + Me.XrLabel38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight + ' + 'XrLabel39 + ' + Me.XrLabel39.Dpi = 100.0! + Me.XrLabel39.Font = New System.Drawing.Font("Arial", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.XrLabel39.LocationFloat = New DevExpress.Utils.PointFloat(460.4928!, 0!) + Me.XrLabel39.Multiline = True + Me.XrLabel39.Name = "XrLabel39" + Me.XrLabel39.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel39.SizeF = New System.Drawing.SizeF(69.79169!, 25.0!) + Me.XrLabel39.StyleName = "Title" + Me.XrLabel39.StylePriority.UseFont = False + Me.XrLabel39.Text = "Seite:" + ' 'XrLabel41 ' Me.XrLabel41.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.BORDERONR")}) @@ -704,7 +838,7 @@ Partial Public Class reportUebergabe Me.GroupFooter2.GroupUnion = DevExpress.XtraReports.UI.GroupFooterUnion.WithLastDetail Me.GroupFooter2.HeightF = 55.95843! Me.GroupFooter2.KeepTogether = True - Me.GroupFooter2.Level = 1 + Me.GroupFooter2.Level = 2 Me.GroupFooter2.Name = "GroupFooter2" ' 'XrLabel46 @@ -739,12 +873,13 @@ Partial Public Class reportUebergabe ' 'GroupHeader3 ' - Me.GroupHeader3.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel44, Me.XrLabel45, Me.XrLabel54, Me.labelSendungNr, Me.labelPalettenanzahl, Me.XrLabel42, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.XrLabel55}) + Me.GroupHeader3.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.labelSendungNr, Me.labelPalettenanzahl, Me.XrLabel42, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.XrLabel44, Me.XrLabel54, Me.XrLabel45, Me.XrLabel55}) Me.GroupHeader3.Dpi = 100.0! Me.GroupHeader3.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("CODE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) Me.GroupHeader3.GroupUnion = DevExpress.XtraReports.UI.GroupUnion.WholePage - Me.GroupHeader3.HeightF = 45.12498! + Me.GroupHeader3.HeightF = 45.12499! Me.GroupHeader3.KeepTogether = True + Me.GroupHeader3.Level = 1 Me.GroupHeader3.Name = "GroupHeader3" ' 'XrLabel44 @@ -752,7 +887,7 @@ Partial Public Class reportUebergabe Me.XrLabel44.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP")}) Me.XrLabel44.Dpi = 100.0! Me.XrLabel44.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel44.LocationFloat = New DevExpress.Utils.PointFloat(0.9998474!, 0!) + Me.XrLabel44.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) Me.XrLabel44.Name = "XrLabel44" Me.XrLabel44.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel44.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink @@ -765,7 +900,7 @@ Partial Public Class reportUebergabe Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR")}) Me.XrLabel45.Dpi = 100.0! Me.XrLabel45.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(0.9998493!, 33.58331!) + Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(0!, 33.58332!) Me.XrLabel45.Name = "XrLabel45" Me.XrLabel45.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel45.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink @@ -778,7 +913,7 @@ Partial Public Class reportUebergabe Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE")}) Me.XrLabel54.Dpi = 100.0! Me.XrLabel54.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0.9998493!, 22.99998!) + Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 22.99995!) Me.XrLabel54.Name = "XrLabel54" Me.XrLabel54.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel54.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink @@ -791,7 +926,7 @@ Partial Public Class reportUebergabe Me.labelSendungNr.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.SENDUNGNR")}) Me.labelSendungNr.Dpi = 100.0! Me.labelSendungNr.Font = New System.Drawing.Font("Arial", 8.25!) - Me.labelSendungNr.LocationFloat = New DevExpress.Utils.PointFloat(157.9532!, 0!) + Me.labelSendungNr.LocationFloat = New DevExpress.Utils.PointFloat(156.9539!, 0!) Me.labelSendungNr.Name = "labelSendungNr" Me.labelSendungNr.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.labelSendungNr.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.Suppress @@ -804,7 +939,7 @@ Partial Public Class reportUebergabe Me.labelPalettenanzahl.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.PALETTENANZAHL")}) Me.labelPalettenanzahl.Dpi = 100.0! Me.labelPalettenanzahl.Font = New System.Drawing.Font("Arial", 8.25!) - Me.labelPalettenanzahl.LocationFloat = New DevExpress.Utils.PointFloat(216.836!, 0!) + Me.labelPalettenanzahl.LocationFloat = New DevExpress.Utils.PointFloat(215.8367!, 0!) Me.labelPalettenanzahl.Name = "labelPalettenanzahl" Me.labelPalettenanzahl.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.labelPalettenanzahl.SizeF = New System.Drawing.SizeF(25.25044!, 14.66667!) @@ -820,7 +955,7 @@ Partial Public Class reportUebergabe Me.XrLabel42.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.CODE")}) Me.XrLabel42.Dpi = 100.0! Me.XrLabel42.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel42.LocationFloat = New DevExpress.Utils.PointFloat(242.0865!, 0!) + Me.XrLabel42.LocationFloat = New DevExpress.Utils.PointFloat(241.0872!, 0!) Me.XrLabel42.Name = "XrLabel42" Me.XrLabel42.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel42.SizeF = New System.Drawing.SizeF(37.30055!, 14.66667!) @@ -833,7 +968,7 @@ Partial Public Class reportUebergabe Me.XrLabel35.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.SDG_FRANKATUR"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.EMP")}) Me.XrLabel35.Dpi = 100.0! Me.XrLabel35.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel35.LocationFloat = New DevExpress.Utils.PointFloat(590.1087!, 0!) + Me.XrLabel35.LocationFloat = New DevExpress.Utils.PointFloat(589.1094!, 0!) Me.XrLabel35.Name = "XrLabel35" Me.XrLabel35.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel35.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.Suppress @@ -846,7 +981,7 @@ Partial Public Class reportUebergabe Me.XrLabel34.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.EMP")}) Me.XrLabel34.Dpi = 100.0! Me.XrLabel34.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel34.LocationFloat = New DevExpress.Utils.PointFloat(510.7397!, 0!) + Me.XrLabel34.LocationFloat = New DevExpress.Utils.PointFloat(509.7403!, 0!) Me.XrLabel34.Name = "XrLabel34" Me.XrLabel34.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel34.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.Suppress @@ -860,7 +995,7 @@ Partial Public Class reportUebergabe Me.labelGewicht.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.SDG_GEWICHT", "{0} kg")}) Me.labelGewicht.Dpi = 100.0! Me.labelGewicht.Font = New System.Drawing.Font("Arial", 8.25!) - Me.labelGewicht.LocationFloat = New DevExpress.Utils.PointFloat(429.5758!, 0!) + Me.labelGewicht.LocationFloat = New DevExpress.Utils.PointFloat(428.5765!, 0!) Me.labelGewicht.Name = "labelGewicht" Me.labelGewicht.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.labelGewicht.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.Suppress @@ -872,7 +1007,7 @@ Partial Public Class reportUebergabe Me.XrLabel55.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_ZUSATZ")}) Me.XrLabel55.Dpi = 100.0! Me.XrLabel55.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel55.LocationFloat = New DevExpress.Utils.PointFloat(0.9998493!, 12.5!) + Me.XrLabel55.LocationFloat = New DevExpress.Utils.PointFloat(0!, 12.5!) Me.XrLabel55.Name = "XrLabel55" Me.XrLabel55.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel55.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink @@ -880,136 +1015,28 @@ Partial Public Class reportUebergabe Me.XrLabel55.StylePriority.UseFont = False Me.XrLabel55.Text = "XrLabel35" ' - 'XrPageInfo3 - ' - Me.XrPageInfo3.Dpi = 100.0! - Me.XrPageInfo3.Font = New System.Drawing.Font("Arial", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrPageInfo3.Format = "{0} von {1}" - Me.XrPageInfo3.LocationFloat = New DevExpress.Utils.PointFloat(547.9167!, 0!) - Me.XrPageInfo3.Name = "XrPageInfo3" - Me.XrPageInfo3.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrPageInfo3.SizeF = New System.Drawing.SizeF(102.0833!, 25.0!) - Me.XrPageInfo3.StyleName = "PageInfo" - Me.XrPageInfo3.StylePriority.UseFont = False - Me.XrPageInfo3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight - ' - 'XrLabel25 - ' - Me.XrLabel25.Dpi = 100.0! - Me.XrLabel25.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel25.LocationFloat = New DevExpress.Utils.PointFloat(487.468!, 43.64738!) - Me.XrLabel25.Multiline = True - Me.XrLabel25.Name = "XrLabel25" - Me.XrLabel25.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel25.SizeF = New System.Drawing.SizeF(81.16373!, 28.00001!) - Me.XrLabel25.StyleName = "Title" - Me.XrLabel25.StylePriority.UseFont = False - Me.XrLabel25.StylePriority.UseTextAlignment = False - Me.XrLabel25.Text = "Warenwert" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Nachnahme" - Me.XrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight - ' - 'XrLabel29 - ' - Me.XrLabel29.Dpi = 100.0! - Me.XrLabel29.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel29.LocationFloat = New DevExpress.Utils.PointFloat(278.3874!, 43.64751!) - Me.XrLabel29.Multiline = True - Me.XrLabel29.Name = "XrLabel29" - Me.XrLabel29.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel29.SizeF = New System.Drawing.SizeF(119.576!, 28.00001!) - Me.XrLabel29.StyleName = "Title" - Me.XrLabel29.StylePriority.UseFont = False - Me.XrLabel29.Text = "Warenbeschreibung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "L x B x H" - ' - 'XrLabel31 - ' - Me.XrLabel31.Dpi = 100.0! - Me.XrLabel31.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel31.LocationFloat = New DevExpress.Utils.PointFloat(568.6316!, 43.64738!) - Me.XrLabel31.Multiline = True - Me.XrLabel31.Name = "XrLabel31" - Me.XrLabel31.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel31.SizeF = New System.Drawing.SizeF(81.36865!, 28.00001!) - Me.XrLabel31.StyleName = "Title" - Me.XrLabel31.StylePriority.UseFont = False - Me.XrLabel31.StylePriority.UseTextAlignment = False - Me.XrLabel31.Text = "Frankatur:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Transp. Vers." - Me.XrLabel31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight - ' - 'XrLabel32 + 'GroupHeader1 ' - Me.XrLabel32.Dpi = 100.0! - Me.XrLabel32.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel32.LocationFloat = New DevExpress.Utils.PointFloat(397.9634!, 43.64738!) - Me.XrLabel32.Multiline = True - Me.XrLabel32.Name = "XrLabel32" - Me.XrLabel32.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel32.SizeF = New System.Drawing.SizeF(89.50453!, 28.0!) - Me.XrLabel32.StyleName = "Title" - Me.XrLabel32.StylePriority.UseFont = False - Me.XrLabel32.StylePriority.UseTextAlignment = False - Me.XrLabel32.Text = "Gewicht" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "CBM/LDM" - Me.XrLabel32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight + Me.GroupHeader1.Dpi = 100.0! + Me.GroupHeader1.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("SENDUNGNR", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) + Me.GroupHeader1.HeightF = 0! + Me.GroupHeader1.Level = 2 + Me.GroupHeader1.Name = "GroupHeader1" ' - 'XrLabel33 + 'GroupHeader2 ' - Me.XrLabel33.Dpi = 100.0! - Me.XrLabel33.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel33.LocationFloat = New DevExpress.Utils.PointFloat(156.9494!, 43.64738!) - Me.XrLabel33.Multiline = True - Me.XrLabel33.Name = "XrLabel33" - Me.XrLabel33.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel33.SizeF = New System.Drawing.SizeF(58.88715!, 28.00001!) - Me.XrLabel33.StyleName = "Title" - Me.XrLabel33.StylePriority.UseFont = False - Me.XrLabel33.Text = "Auftrag:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zeichen/Nr." + Me.GroupHeader2.Dpi = 100.0! + Me.GroupHeader2.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("EMP", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) + Me.GroupHeader2.HeightF = 45.12499! + Me.GroupHeader2.Level = 3 + Me.GroupHeader2.Name = "GroupHeader2" ' - 'XrLine4 + 'GroupHeader4 ' - Me.XrLine4.Dpi = 100.0! - Me.XrLine4.LocationFloat = New DevExpress.Utils.PointFloat(0.0002441406!, 74.64739!) - Me.XrLine4.Name = "XrLine4" - Me.XrLine4.SizeF = New System.Drawing.SizeF(650.0!, 7.0!) - ' - 'XrLabel37 - ' - Me.XrLabel37.Dpi = 100.0! - Me.XrLabel37.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel37.LocationFloat = New DevExpress.Utils.PointFloat(2.000237!, 43.64738!) - Me.XrLabel37.Name = "XrLabel37" - Me.XrLabel37.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel37.SizeF = New System.Drawing.SizeF(154.9492!, 28.00001!) - Me.XrLabel37.StyleName = "Title" - Me.XrLabel37.StylePriority.UseFont = False - Me.XrLabel37.Text = "Empfänger:" - ' - 'XrLabel38 - ' - Me.XrLabel38.Dpi = 100.0! - Me.XrLabel38.Font = New System.Drawing.Font("Arial Narrow", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel38.LocationFloat = New DevExpress.Utils.PointFloat(215.8366!, 43.64738!) - Me.XrLabel38.Multiline = True - Me.XrLabel38.Name = "XrLabel38" - Me.XrLabel38.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel38.SizeF = New System.Drawing.SizeF(62.55078!, 28.00001!) - Me.XrLabel38.StyleName = "Title" - Me.XrLabel38.StylePriority.UseFont = False - Me.XrLabel38.StylePriority.UseTextAlignment = False - Me.XrLabel38.Text = "Kolli Art" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Verp. auf" - Me.XrLabel38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight - ' - 'XrLabel39 - ' - Me.XrLabel39.Dpi = 100.0! - Me.XrLabel39.Font = New System.Drawing.Font("Arial", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.XrLabel39.LocationFloat = New DevExpress.Utils.PointFloat(460.4928!, 0!) - Me.XrLabel39.Multiline = True - Me.XrLabel39.Name = "XrLabel39" - Me.XrLabel39.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel39.SizeF = New System.Drawing.SizeF(69.79169!, 25.0!) - Me.XrLabel39.StyleName = "Title" - Me.XrLabel39.StylePriority.UseFont = False - Me.XrLabel39.Text = "Seite:" + Me.GroupHeader4.Dpi = 100.0! + Me.GroupHeader4.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("NVE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) + Me.GroupHeader4.HeightF = 0! + Me.GroupHeader4.Name = "GroupHeader4" ' 'XrSubreport1 ' @@ -1022,7 +1049,7 @@ Partial Public Class reportUebergabe ' 'reportUebergabe ' - Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.Detail, Me.TopMargin, Me.BottomMargin, Me.PageHeaderBand1, Me.ReportHeaderBand1, Me.ReportFooter, Me.GroupFooter2, Me.GroupHeader3}) + Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.Detail, Me.TopMargin, Me.BottomMargin, Me.PageHeaderBand1, Me.ReportHeaderBand1, Me.ReportFooter, Me.GroupFooter2, Me.GroupHeader3, Me.GroupHeader1, Me.GroupHeader2, Me.GroupHeader4}) Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.SqlDataSource1}) Me.DataMember = "Query" Me.DataSource = Me.SqlDataSource1 @@ -1109,4 +1136,7 @@ Partial Public Class reportUebergabe Friend WithEvents XrLabel37 As DevExpress.XtraReports.UI.XRLabel Friend WithEvents XrLabel38 As DevExpress.XtraReports.UI.XRLabel Friend WithEvents XrLabel39 As DevExpress.XtraReports.UI.XRLabel + Friend WithEvents GroupHeader1 As DevExpress.XtraReports.UI.GroupHeaderBand + Friend WithEvents GroupHeader2 As DevExpress.XtraReports.UI.GroupHeaderBand + Friend WithEvents GroupHeader4 As DevExpress.XtraReports.UI.GroupHeaderBand End Class From 9af16f4bfd55dc0bd67333051fd917f3135a386c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 18 Jun 2018 16:38:01 +0200 Subject: [PATCH 3/4] jj: fix calc of anzahl sendungen, gewicht --- .../KommiCollo/reportUebergabe.designer.vb | 94 +++++++++---------- .../KommiCollo/reportUebergabe.vb | 17 +++- 2 files changed, 61 insertions(+), 50 deletions(-) diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb index be9d28e..83d2c68 100644 --- a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb +++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb @@ -94,15 +94,15 @@ Partial Public Class reportUebergabe Me.XrLabel46 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel58 = New DevExpress.XtraReports.UI.XRLabel() Me.GroupHeader3 = New DevExpress.XtraReports.UI.GroupHeaderBand() - Me.XrLabel44 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel45 = New DevExpress.XtraReports.UI.XRLabel() - Me.XrLabel54 = New DevExpress.XtraReports.UI.XRLabel() Me.labelSendungNr = New DevExpress.XtraReports.UI.XRLabel() Me.labelPalettenanzahl = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel42 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel35 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel34 = New DevExpress.XtraReports.UI.XRLabel() Me.labelGewicht = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel44 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel54 = New DevExpress.XtraReports.UI.XRLabel() + Me.XrLabel45 = New DevExpress.XtraReports.UI.XRLabel() Me.XrLabel55 = New DevExpress.XtraReports.UI.XRLabel() Me.GroupHeader1 = New DevExpress.XtraReports.UI.GroupHeaderBand() Me.GroupHeader2 = New DevExpress.XtraReports.UI.GroupHeaderBand() @@ -873,54 +873,14 @@ Partial Public Class reportUebergabe ' 'GroupHeader3 ' - Me.GroupHeader3.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.labelSendungNr, Me.labelPalettenanzahl, Me.XrLabel42, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.XrLabel44, Me.XrLabel54, Me.XrLabel45, Me.XrLabel55}) Me.GroupHeader3.Dpi = 100.0! Me.GroupHeader3.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("CODE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) Me.GroupHeader3.GroupUnion = DevExpress.XtraReports.UI.GroupUnion.WholePage - Me.GroupHeader3.HeightF = 45.12499! + Me.GroupHeader3.HeightF = 0! Me.GroupHeader3.KeepTogether = True Me.GroupHeader3.Level = 1 Me.GroupHeader3.Name = "GroupHeader3" ' - 'XrLabel44 - ' - Me.XrLabel44.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP")}) - Me.XrLabel44.Dpi = 100.0! - Me.XrLabel44.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel44.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) - Me.XrLabel44.Name = "XrLabel44" - Me.XrLabel44.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel44.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink - Me.XrLabel44.SizeF = New System.Drawing.SizeF(156.9534!, 12.5!) - Me.XrLabel44.StylePriority.UseFont = False - Me.XrLabel44.Text = "XrLabel29" - ' - 'XrLabel45 - ' - Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR")}) - Me.XrLabel45.Dpi = 100.0! - Me.XrLabel45.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(0!, 33.58332!) - Me.XrLabel45.Name = "XrLabel45" - Me.XrLabel45.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel45.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink - Me.XrLabel45.SizeF = New System.Drawing.SizeF(156.9534!, 11.54167!) - Me.XrLabel45.StylePriority.UseFont = False - Me.XrLabel45.Text = "XrLabel33" - ' - 'XrLabel54 - ' - Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE")}) - Me.XrLabel54.Dpi = 100.0! - Me.XrLabel54.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 22.99995!) - Me.XrLabel54.Name = "XrLabel54" - Me.XrLabel54.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) - Me.XrLabel54.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink - Me.XrLabel54.SizeF = New System.Drawing.SizeF(156.9534!, 10.58332!) - Me.XrLabel54.StylePriority.UseFont = False - Me.XrLabel54.Text = "XrLabel34" - ' 'labelSendungNr ' Me.labelSendungNr.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.SENDUNGNR")}) @@ -1002,12 +962,51 @@ Partial Public Class reportUebergabe Me.labelGewicht.SizeF = New System.Drawing.SizeF(58.89133!, 14.66667!) Me.labelGewicht.StylePriority.UseFont = False ' + 'XrLabel44 + ' + Me.XrLabel44.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP")}) + Me.XrLabel44.Dpi = 100.0! + Me.XrLabel44.Font = New System.Drawing.Font("Arial", 8.25!) + Me.XrLabel44.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!) + Me.XrLabel44.Name = "XrLabel44" + Me.XrLabel44.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel44.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink + Me.XrLabel44.SizeF = New System.Drawing.SizeF(156.9534!, 12.5!) + Me.XrLabel44.StylePriority.UseFont = False + Me.XrLabel44.Text = "XrLabel29" + ' + 'XrLabel54 + ' + Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE")}) + Me.XrLabel54.Dpi = 100.0! + Me.XrLabel54.Font = New System.Drawing.Font("Arial", 8.25!) + Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 23.0!) + Me.XrLabel54.Name = "XrLabel54" + Me.XrLabel54.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel54.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink + Me.XrLabel54.SizeF = New System.Drawing.SizeF(156.9534!, 10.58332!) + Me.XrLabel54.StylePriority.UseFont = False + Me.XrLabel54.Text = "XrLabel34" + ' + 'XrLabel45 + ' + Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR")}) + Me.XrLabel45.Dpi = 100.0! + Me.XrLabel45.Font = New System.Drawing.Font("Arial", 8.25!) + Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(0!, 33.58332!) + Me.XrLabel45.Name = "XrLabel45" + Me.XrLabel45.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) + Me.XrLabel45.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink + Me.XrLabel45.SizeF = New System.Drawing.SizeF(156.9534!, 11.54167!) + Me.XrLabel45.StylePriority.UseFont = False + Me.XrLabel45.Text = "XrLabel33" + ' 'XrLabel55 ' Me.XrLabel55.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_ZUSATZ")}) Me.XrLabel55.Dpi = 100.0! Me.XrLabel55.Font = New System.Drawing.Font("Arial", 8.25!) - Me.XrLabel55.LocationFloat = New DevExpress.Utils.PointFloat(0!, 12.5!) + Me.XrLabel55.LocationFloat = New DevExpress.Utils.PointFloat(0!, 12.50001!) Me.XrLabel55.Name = "XrLabel55" Me.XrLabel55.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!) Me.XrLabel55.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink @@ -1027,15 +1026,16 @@ Partial Public Class reportUebergabe ' Me.GroupHeader2.Dpi = 100.0! Me.GroupHeader2.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("EMP", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) - Me.GroupHeader2.HeightF = 45.12499! + Me.GroupHeader2.HeightF = 0! Me.GroupHeader2.Level = 3 Me.GroupHeader2.Name = "GroupHeader2" ' 'GroupHeader4 ' + Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel55, Me.labelPalettenanzahl, Me.XrLabel42, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.XrLabel44, Me.XrLabel54, Me.XrLabel45, Me.labelSendungNr}) Me.GroupHeader4.Dpi = 100.0! Me.GroupHeader4.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("NVE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}) - Me.GroupHeader4.HeightF = 0! + Me.GroupHeader4.HeightF = 45.12499! Me.GroupHeader4.Name = "GroupHeader4" ' 'XrSubreport1 diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.vb b/SchaumKommiCollo/KommiCollo/reportUebergabe.vb index 131250e..3037105 100644 --- a/SchaumKommiCollo/KommiCollo/reportUebergabe.vb +++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.vb @@ -13,16 +13,22 @@ Public Class reportUebergabe Private sendungen As Integer = 0 Private kolli As Integer = 0 Private gewicht As Double = 0.00 - + Private letzteSendung As Integer = 0 Private Sub labelAnzahlSendungen_SummaryReset(sender As Object, e As EventArgs) Handles labelAnzahlSendungen.SummaryReset sendungen = 0 kolli = 0 gewicht = 0.00 + + letzteSendung = 0 End Sub Private Sub labelSendungNr_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelSendungNr.BeforePrint - sendungen = sendungen + 1 + Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR") + + If sendungsNr <> letzteSendung Then + sendungen = sendungen + 1 + End If End Sub Private Sub labelPalettenanzahl_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelPalettenanzahl.BeforePrint @@ -30,7 +36,12 @@ Public Class reportUebergabe End Sub Private Sub labelGewicht_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelGewicht.BeforePrint - gewicht = gewicht + CDbl(GetCurrentColumnValue("SDG_GEWICHT")) + Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR") + + If sendungsNr <> letzteSendung Then + gewicht = gewicht + CDbl(GetCurrentColumnValue("SDG_GEWICHT")) + letzteSendung = sendungsNr + End If End Sub Private Sub labelSummeKolli_SummaryGetResult(sender As Object, e As DevExpress.XtraReports.UI.SummaryGetResultEventArgs) Handles labelSummeKolli.SummaryGetResult From 5de68174225540a196af1633a1a15d3c6b706083 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 22 Jun 2018 11:30:57 +0200 Subject: [PATCH 4/4] jj: fix report --- .../KommiCollo/reportUebergabe.vb | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/SchaumKommiCollo/KommiCollo/reportUebergabe.vb b/SchaumKommiCollo/KommiCollo/reportUebergabe.vb index 3037105..b099c1d 100644 --- a/SchaumKommiCollo/KommiCollo/reportUebergabe.vb +++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.vb @@ -14,6 +14,8 @@ Public Class reportUebergabe Private kolli As Integer = 0 Private gewicht As Double = 0.00 Private letzteSendung As Integer = 0 + Private letzteNve As String = String.Empty + Private letzerCode As String = String.Empty Private Sub labelAnzahlSendungen_SummaryReset(sender As Object, e As EventArgs) Handles labelAnzahlSendungen.SummaryReset sendungen = 0 @@ -21,20 +23,19 @@ Public Class reportUebergabe gewicht = 0.00 letzteSendung = 0 + End Sub Private Sub labelSendungNr_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelSendungNr.BeforePrint Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR") + Dim sdgStellplaetze As Integer = GetCurrentColumnValue("SDG_STELLPLAETZE") If sendungsNr <> letzteSendung Then sendungen = sendungen + 1 + kolli = kolli + sdgStellplaetze End If End Sub - Private Sub labelPalettenanzahl_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelPalettenanzahl.BeforePrint - kolli = kolli + GetCurrentColumnValue("PALETTENANZAHL") - End Sub - Private Sub labelGewicht_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelGewicht.BeforePrint Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR") @@ -58,4 +59,39 @@ Public Class reportUebergabe e.Result = sendungen e.Handled = True End Sub + + Private Sub labelPalettenanzahl_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles labelPalettenanzahl.BeforePrint + Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR") + Dim nve As String = GetCurrentColumnValue("NVE") + Dim code As String = GetCurrentColumnValue("CODE") + + If sendungsNr = letzteSendung Then + + If Not (nve <> letzteNve And code <> letzerCode) Then + e.Cancel = True + End If + + letzteNve = nve + letzerCode = code + + + 'gewicht = gewicht + CDbl(GetCurrentColumnValue("SDG_GEWICHT")) + 'letzteSendung = sendungsNr + + End If + End Sub + + Private Sub XrLabel42_BeforePrint(sender As Object, e As Printing.PrintEventArgs) Handles XrLabel42.BeforePrint + Dim sendungsNr As Integer = GetCurrentColumnValue("SENDUNGNR") + Dim nve As String = GetCurrentColumnValue("NVE") + Dim code As String = GetCurrentColumnValue("CODE") + + If sendungsNr = letzteSendung Then + + If Not (nve <> letzteNve And code <> letzerCode) Then + e.Cancel = True + End If + + End If + End Sub End Class \ No newline at end of file