diff --git a/WcfService1/WmsWcfService.csproj.user b/WcfService1/WmsWcfService.csproj.user index 5e44a85..e879aa3 100644 --- a/WcfService1/WmsWcfService.csproj.user +++ b/WcfService1/WmsWcfService.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/WcfServiceErp/WcfServiceErp.csproj.user b/WcfServiceErp/WcfServiceErp.csproj.user index 1914c59..e91f2bc 100644 --- a/WcfServiceErp/WcfServiceErp.csproj.user +++ b/WcfServiceErp/WcfServiceErp.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU IISProfile diff --git a/WcfServicePortal/WcfServicePortal.csproj.user b/WcfServicePortal/WcfServicePortal.csproj.user index ab6aaed..5d1220f 100644 --- a/WcfServicePortal/WcfServicePortal.csproj.user +++ b/WcfServicePortal/WcfServicePortal.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/epickService/epickService.csproj.user b/epickService/epickService.csproj.user index 7199c13..c41d0f2 100644 --- a/epickService/epickService.csproj.user +++ b/epickService/epickService.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU false diff --git a/winform/出库/零货复核/GoodsOutSeedsPackForm.Designer.cs b/winform/出库/零货复核/GoodsOutSeedsPackForm.Designer.cs index a66b324..8d63973 100644 --- a/winform/出库/零货复核/GoodsOutSeedsPackForm.Designer.cs +++ b/winform/出库/零货复核/GoodsOutSeedsPackForm.Designer.cs @@ -90,6 +90,10 @@ this.label6 = new System.Windows.Forms.Label(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); + this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); ((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); @@ -140,6 +144,10 @@ ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); this.SuspendLayout(); // // ribbon @@ -870,6 +878,50 @@ // this.openFileDialog1.FileName = "openFileDialog1"; // + // emptySpaceItem3 + // + this.emptySpaceItem3.AllowHotTrack = false; + this.emptySpaceItem3.Location = new System.Drawing.Point(1347, 0); + this.emptySpaceItem3.Name = "emptySpaceItem3"; + this.emptySpaceItem3.Size = new System.Drawing.Size(264, 160); + this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0); + // + // layoutControlGroup6 + // + this.layoutControlGroup6.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem7, + this.layoutControlItem17, + this.emptySpaceItem1, + this.emptySpaceItem2, + this.layoutControlItem35, + this.layoutControlItem36, + this.layoutControlItem2, + this.layoutControlItem14}); + this.layoutControlGroup6.Location = new System.Drawing.Point(0, 0); + this.layoutControlGroup6.Name = "layoutControlGroup6"; + this.layoutControlGroup6.OptionsItemText.TextToControlDistance = 5; + this.layoutControlGroup6.Size = new System.Drawing.Size(1347, 160); + this.layoutControlGroup6.TextVisible = false; + // + // emptySpaceItem1 + // + this.emptySpaceItem1.AllowHotTrack = false; + this.emptySpaceItem1.Location = new System.Drawing.Point(476, 0); + this.emptySpaceItem1.MaxSize = new System.Drawing.Size(281, 58); + this.emptySpaceItem1.MinSize = new System.Drawing.Size(281, 58); + this.emptySpaceItem1.Name = "emptySpaceItem1"; + this.emptySpaceItem1.Size = new System.Drawing.Size(281, 58); + this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); + // + // emptySpaceItem2 + // + this.emptySpaceItem2.AllowHotTrack = false; + this.emptySpaceItem2.Location = new System.Drawing.Point(1299, 0); + this.emptySpaceItem2.Name = "emptySpaceItem2"; + this.emptySpaceItem2.Size = new System.Drawing.Size(10, 122); + this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); + // // GoodsOutSeedsPackForm // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); @@ -932,6 +984,10 @@ ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/winform/出库/零货复核/GoodsOutValidationForm.Designer.cs b/winform/出库/零货复核/GoodsOutValidationForm.Designer.cs index 1f204f9..512d9bc 100644 --- a/winform/出库/零货复核/GoodsOutValidationForm.Designer.cs +++ b/winform/出库/零货复核/GoodsOutValidationForm.Designer.cs @@ -88,6 +88,8 @@ this.layoutControlGroup11 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup(); + this.layoutControlGroup13 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlGroup9 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -114,8 +116,6 @@ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.lgOutPickDetail = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlGroup13 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -195,6 +195,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); @@ -221,8 +223,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lgOutPickDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit(); @@ -1011,6 +1011,26 @@ this.lgOutPickDetail, this.layoutControlGroup13}); // + // layoutControlGroup13 + // + this.layoutControlGroup13.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem33}); + this.layoutControlGroup13.Location = new System.Drawing.Point(0, 0); + this.layoutControlGroup13.Name = "layoutControlGroup13"; + this.layoutControlGroup13.Size = new System.Drawing.Size(1529, 424); + this.layoutControlGroup13.Text = "拣货明细"; + // + // layoutControlItem33 + // + this.layoutControlItem33.Control = this.gridPickDetails; + this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem33.Name = "layoutControlItem33"; + this.layoutControlItem33.Size = new System.Drawing.Size(1529, 424); + this.layoutControlItem33.Text = "拣货明细"; + this.layoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top; + this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem33.TextVisible = false; + // // layoutControlGroup9 // this.layoutControlGroup9.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 12F); @@ -1337,26 +1357,6 @@ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // - // layoutControlGroup13 - // - this.layoutControlGroup13.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem33}); - this.layoutControlGroup13.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroup13.Name = "layoutControlGroup13"; - this.layoutControlGroup13.Size = new System.Drawing.Size(1529, 424); - this.layoutControlGroup13.Text = "拣货明细"; - // - // layoutControlItem33 - // - this.layoutControlItem33.Control = this.gridPickDetails; - this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.Size = new System.Drawing.Size(1529, 424); - this.layoutControlItem33.Text = "拣货明细"; - this.layoutControlItem33.TextLocation = DevExpress.Utils.Locations.Top; - this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem33.TextVisible = false; - // // layoutControlItem7 // this.layoutControlItem7.Control = this.textEditBarcode; @@ -1834,6 +1834,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); @@ -1860,8 +1862,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lgOutPickDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();