update devexpress deps

2019-03-15 16:37:14 +01:00
parent d76c99b92c
commit e970ce1758
20 changed files with 443 additions and 83 deletions
--- a/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb
+++ b/SchaumKommiCollo/KommiCollo/reportUebergabe.designer.vb
@@ -23,6 +23,7 @@ Partial Public Class reportUebergabe
        Dim CustomSqlQuery1 As DevExpress.DataAccess.Sql.CustomSqlQuery = New DevExpress.DataAccess.Sql.CustomSqlQuery()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(reportUebergabe))
        Dim CustomSqlQuery2 As DevExpress.DataAccess.Sql.CustomSqlQuery = New DevExpress.DataAccess.Sql.CustomSqlQuery()
+        Dim CustomSqlQuery3 As DevExpress.DataAccess.Sql.CustomSqlQuery = New DevExpress.DataAccess.Sql.CustomSqlQuery()
        Dim MasterDetailInfo1 As DevExpress.DataAccess.Sql.MasterDetailInfo = New DevExpress.DataAccess.Sql.MasterDetailInfo()
        Dim RelationColumnInfo1 As DevExpress.DataAccess.Sql.RelationColumnInfo = New DevExpress.DataAccess.Sql.RelationColumnInfo()
        Dim XrSummary1 As DevExpress.XtraReports.UI.XRSummary = New DevExpress.XtraReports.UI.XRSummary()
@@ -91,7 +92,6 @@ Partial Public Class reportUebergabe
        Me.XrLine5 = New DevExpress.XtraReports.UI.XRLine()
        Me.XrLine1 = New DevExpress.XtraReports.UI.XRLine()
        Me.GroupFooter2 = New DevExpress.XtraReports.UI.GroupFooterBand()
-        Me.XrSubreport1 = New DevExpress.XtraReports.UI.XRSubreport()
        Me.XrLabel46 = New DevExpress.XtraReports.UI.XRLabel()
        Me.XrLabel58 = New DevExpress.XtraReports.UI.XRLabel()
        Me.GroupHeader3 = New DevExpress.XtraReports.UI.GroupHeaderBand()
@@ -109,12 +109,15 @@ Partial Public Class reportUebergabe
        Me.GroupHeader2 = New DevExpress.XtraReports.UI.GroupHeaderBand()
        Me.GroupHeader4 = New DevExpress.XtraReports.UI.GroupHeaderBand()
        Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
+        Me.XrLabel2 = New DevExpress.XtraReports.UI.XRLabel()
+        Me.XrSubreport1 = New DevExpress.XtraReports.UI.XRSubreport()
+        Me.FormattingRule1 = New DevExpress.XtraReports.UI.FormattingRule()
        CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
        '
        'Detail
        '
        Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel49, Me.XrLabel51})
-        Me.Detail.HeightF = 24.12504!
+        Me.Detail.HeightF = 24.12505!
        Me.Detail.KeepTogether = True
        Me.Detail.KeepTogetherWithDetailReports = True
        Me.Detail.MultiColumn.Mode = DevExpress.XtraReports.UI.MultiColumnMode.UseColumnCount
@@ -134,6 +137,7 @@ Partial Public Class reportUebergabe
        Me.XrLabel49.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
        Me.XrLabel49.SizeF = New System.Drawing.SizeF(148.9583!, 12.58333!)
        Me.XrLabel49.StylePriority.UseFont = False
+        Me.XrLabel49.Visible = False
        '
        'XrLabel51
        '
@@ -146,6 +150,7 @@ Partial Public Class reportUebergabe
        Me.XrLabel51.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
        Me.XrLabel51.SizeF = New System.Drawing.SizeF(148.9583!, 11.54167!)
        Me.XrLabel51.StylePriority.UseFont = False
+        Me.XrLabel51.Visible = False
        '
        'TopMargin
        '
@@ -217,7 +222,9 @@ Partial Public Class reportUebergabe
        CustomSqlQuery1.Sql = resources.GetString("CustomSqlQuery1.Sql")
        CustomSqlQuery2.Name = "Query_Hinweistext"
        CustomSqlQuery2.Sql = resources.GetString("CustomSqlQuery2.Sql")
-        Me.SqlDataSource1.Queries.AddRange(New DevExpress.DataAccess.Sql.SqlQuery() {CustomSqlQuery1, CustomSqlQuery2})
+        CustomSqlQuery3.Name = "Query_Positionen"
+        CustomSqlQuery3.Sql = "SELECT NVE, POSINHALT, SENDUNGNR FROM VWHUP_REPORT1"
+        Me.SqlDataSource1.Queries.AddRange(New DevExpress.DataAccess.Sql.SqlQuery() {CustomSqlQuery1, CustomSqlQuery2, CustomSqlQuery3})
        MasterDetailInfo1.DetailQueryName = "Query_Hinweistext"
        RelationColumnInfo1.NestedKeyColumn = "SENDUNGNR"
        RelationColumnInfo1.ParentKeyColumn = "GUID"
@@ -785,14 +792,6 @@ Partial Public Class reportUebergabe
        Me.GroupFooter2.Level = 2
        Me.GroupFooter2.Name = "GroupFooter2"
        '
-        'XrSubreport1
-        '
-        Me.XrSubreport1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
-        Me.XrSubreport1.Name = "XrSubreport1"
-        Me.XrSubreport1.ParameterBindings.Add(New DevExpress.XtraReports.UI.ParameterBinding("SendungNr", Nothing, "Query.GUID"))
-        Me.XrSubreport1.ReportSource = New KommiCollo.reportHinweis()
-        Me.XrSubreport1.SizeF = New System.Drawing.SizeF(650.0!, 32.99999!)
-        '
        'XrLabel46
        '
        Me.XrLabel46.Font = New System.Drawing.Font("Arial", 8.25!)
@@ -923,24 +922,24 @@ Partial Public Class reportUebergabe
        '
        Me.XrLabel54.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_STRASSE"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.GUID")})
        Me.XrLabel54.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 36.54162!)
+        Me.XrLabel54.LocationFloat = New DevExpress.Utils.PointFloat(0!, 36.54161!)
        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.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
-        Me.XrLabel54.SizeF = New System.Drawing.SizeF(156.9534!, 10.58332!)
+        Me.XrLabel54.SizeF = New System.Drawing.SizeF(169.2364!, 10.58332!)
        Me.XrLabel54.StylePriority.UseFont = False
        '
        'XrLabel45
        '
        Me.XrLabel45.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_PLZ_STR"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.GUID")})
        Me.XrLabel45.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(0!, 47.12494!)
+        Me.XrLabel45.LocationFloat = New DevExpress.Utils.PointFloat(21.33848!, 48.12492!)
        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.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
-        Me.XrLabel45.SizeF = New System.Drawing.SizeF(156.9534!, 11.54167!)
+        Me.XrLabel45.SizeF = New System.Drawing.SizeF(147.8979!, 11.54168!)
        Me.XrLabel45.StylePriority.UseFont = False
        '
        'XrLabel55
@@ -952,7 +951,7 @@ Partial Public Class reportUebergabe
        Me.XrLabel55.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
        Me.XrLabel55.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
        Me.XrLabel55.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
-        Me.XrLabel55.SizeF = New System.Drawing.SizeF(154.9481!, 10.49999!)
+        Me.XrLabel55.SizeF = New System.Drawing.SizeF(169.2364!, 10.49999!)
        Me.XrLabel55.StylePriority.UseFont = False
        '
        'GroupHeader1
@@ -971,9 +970,9 @@ Partial Public Class reportUebergabe
        '
        'GroupHeader4
        '
-        Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel1, Me.XrLabel55, Me.labelPalettenanzahl, Me.labelColliCode, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.labelEmpfaenger, Me.XrLabel54, Me.XrLabel45, Me.labelSendungNr})
+        Me.GroupHeader4.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel2, Me.XrLabel1, Me.XrLabel55, Me.labelPalettenanzahl, Me.labelColliCode, Me.XrLabel35, Me.XrLabel34, Me.labelGewicht, Me.labelEmpfaenger, Me.XrLabel54, Me.XrLabel45, Me.labelSendungNr})
        Me.GroupHeader4.GroupFields.AddRange(New DevExpress.XtraReports.UI.GroupField() {New DevExpress.XtraReports.UI.GroupField("NVE", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)})
-        Me.GroupHeader4.HeightF = 58.66661!
+        Me.GroupHeader4.HeightF = 59.6666!
        Me.GroupHeader4.Name = "GroupHeader4"
        '
        'XrLabel1
@@ -985,15 +984,41 @@ Partial Public Class reportUebergabe
        Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
        Me.XrLabel1.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
        Me.XrLabel1.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
-        Me.XrLabel1.SizeF = New System.Drawing.SizeF(154.9481!, 10.49999!)
+        Me.XrLabel1.SizeF = New System.Drawing.SizeF(156.9478!, 10.49999!)
        Me.XrLabel1.StylePriority.UseFont = False
        '
+        'XrLabel2
+        '
+        Me.XrLabel2.DataBindings.AddRange(New DevExpress.XtraReports.UI.XRBinding() {New DevExpress.XtraReports.UI.XRBinding("Text", Nothing, "Query.EMP_LKZ"), New DevExpress.XtraReports.UI.XRBinding("Tag", Nothing, "Query.GUID")})
+        Me.XrLabel2.Font = New System.Drawing.Font("Arial", 8.25!)
+        Me.XrLabel2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 48.11999!)
+        Me.XrLabel2.Name = "XrLabel2"
+        Me.XrLabel2.Padding = New DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100.0!)
+        Me.XrLabel2.ProcessDuplicatesMode = DevExpress.XtraReports.UI.ProcessDuplicatesMode.SuppressAndShrink
+        Me.XrLabel2.ProcessDuplicatesTarget = DevExpress.XtraReports.UI.ProcessDuplicatesTarget.Tag
+        Me.XrLabel2.SizeF = New System.Drawing.SizeF(21.33847!, 11.54167!)
+        Me.XrLabel2.StylePriority.UseFont = False
+        '
+        'XrSubreport1
+        '
+        Me.XrSubreport1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
+        Me.XrSubreport1.Name = "XrSubreport1"
+        Me.XrSubreport1.ParameterBindings.Add(New DevExpress.XtraReports.UI.ParameterBinding("SendungNr", Nothing, "Query.GUID"))
+        Me.XrSubreport1.ReportSource = New KommiCollo.reportHinweis()
+        Me.XrSubreport1.SizeF = New System.Drawing.SizeF(650.0!, 32.99999!)
+        '
+        'FormattingRule1
+        '
+        Me.FormattingRule1.DataMember = "Query"
+        Me.FormattingRule1.Name = "FormattingRule1"
+        '
        '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.GroupHeader1, Me.GroupHeader2, Me.GroupHeader4})
        Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.SqlDataSource1})
        Me.DataMember = "Query"
        Me.DataSource = Me.SqlDataSource1
+        Me.FormattingRuleSheet.AddRange(New DevExpress.XtraReports.UI.FormattingRule() {Me.FormattingRule1})
        Me.Margins = New System.Drawing.Printing.Margins(100, 100, 41, 54)
        Me.ScriptLanguage = DevExpress.XtraReports.ScriptLanguage.VisualBasic
        Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.FieldCaption, Me.PageInfo, Me.DataField})
@@ -1081,4 +1106,6 @@ Partial Public Class reportUebergabe
    Friend WithEvents GroupHeader2 As DevExpress.XtraReports.UI.GroupHeaderBand
    Friend WithEvents GroupHeader4 As DevExpress.XtraReports.UI.GroupHeaderBand
    Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel
+    Friend WithEvents XrLabel2 As DevExpress.XtraReports.UI.XRLabel
+    Friend WithEvents FormattingRule1 As DevExpress.XtraReports.UI.FormattingRule
 End Class