From 337d942a0b32356ad06e5a66f82b8498959b89d7 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 28 三月 2025 10:08:27 +0800 Subject: [PATCH] 销售 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 180 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 113 insertions(+), 67 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs index f1439f0..8513e6b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs @@ -30,15 +30,15 @@ /// </summary> private void InitializeComponent() { - DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -61,6 +61,7 @@ this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -82,6 +83,8 @@ this.txt_remark = new DevExpress.XtraEditors.TextEdit(); this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit(); this.txt_status = new DevExpress.XtraEditors.CheckEdit(); + this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -99,7 +102,7 @@ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -163,6 +166,8 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); @@ -180,7 +185,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -196,6 +201,7 @@ // this.toolBarMenu1.chkParameter = null; this.toolBarMenu1.currentAction = null; + this.toolBarMenu1.defaultActions = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -243,7 +249,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.Size = new System.Drawing.Size(1126, 570); - this.split1.SplitterPosition = 263; + this.split1.SplitterPosition = 558; this.split1.TabIndex = 0; // // gcMain1 @@ -253,7 +259,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1126, 224); + this.gcMain1.Size = new System.Drawing.Size(1126, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -281,7 +287,8 @@ this.gv_remark, this.gv_reason, this.gridColumn1, - this.gridColumn6}); + this.gridColumn6, + this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -405,7 +412,7 @@ // this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_receiver.AppearanceCell.Options.UseFont = true; - this.gv_receiver.Caption = "鍑哄簱缂栧彿"; + this.gv_receiver.Caption = "浠撳簱缂栧彿"; this.gv_receiver.FieldName = "ckNo"; this.gv_receiver.MinWidth = 25; this.gv_receiver.Name = "gv_receiver"; @@ -419,7 +426,7 @@ // this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_outPart.AppearanceCell.Options.UseFont = true; - this.gv_outPart.Caption = "鍑哄簱鍚嶇О"; + this.gv_outPart.Caption = "浠撳簱鍚嶇О"; this.gv_outPart.FieldName = "ckName"; this.gv_outPart.MinWidth = 25; this.gv_outPart.Name = "gv_outPart"; @@ -462,7 +469,7 @@ this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_remark.AppearanceCell.Options.UseFont = true; this.gv_remark.Caption = "澶囨敞淇℃伅 "; - this.gv_remark.FieldName = "remark"; + this.gv_remark.FieldName = "sqRemark"; this.gv_remark.MinWidth = 25; this.gv_remark.Name = "gv_remark"; this.gv_remark.OptionsColumn.AllowEdit = false; @@ -505,11 +512,19 @@ this.gridColumn6.VisibleIndex = 15; this.gridColumn6.Width = 94; // + // gridColumn7 + // + this.gridColumn7.Caption = "涓婚敭Guid"; + this.gridColumn7.FieldName = "guid"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Width = 94; + // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 224); + this.pageBar1.Location = new System.Drawing.Point(0, 519); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; @@ -541,7 +556,7 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 161; + this.splitMx1.SplitterPosition = 171; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -563,20 +578,23 @@ this.layoutMx1.Controls.Add(this.txt_remark); this.layoutMx1.Controls.Add(this.txt_kcOrg); this.layoutMx1.Controls.Add(this.txt_status); + this.layoutMx1.Controls.Add(this.txt_sqRemark); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem17}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(764, 426, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 161); + this.layoutMx1.Size = new System.Drawing.Size(1126, 171); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // lbGuid // - this.lbGuid.Location = new System.Drawing.Point(840, 140); + this.lbGuid.Location = new System.Drawing.Point(840, 154); this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(274, 28); + this.lbGuid.Size = new System.Drawing.Size(274, 32); this.lbGuid.TabIndex = 591; this.lbGuid.Text = "lbGuid"; // @@ -739,6 +757,26 @@ this.txt_status.StyleController = this.layoutMx1; this.txt_status.TabIndex = 590; // + // txt_sqRemark + // + this.txt_sqRemark.Location = new System.Drawing.Point(84, 140); + this.txt_sqRemark.Name = "txt_sqRemark"; + this.txt_sqRemark.Size = new System.Drawing.Size(476, 24); + this.txt_sqRemark.StyleController = this.layoutMx1; + this.txt_sqRemark.TabIndex = 592; + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.lbGuid; + this.layoutControlItem17.Location = new System.Drawing.Point(828, 142); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem17.Size = new System.Drawing.Size(278, 36); + this.layoutControlItem17.Text = "lbGuid"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem17.TextVisible = false; + // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; @@ -760,38 +798,38 @@ this.layoutControlItem14, this.layoutControlItem15, this.layoutControlItem16, - this.layoutControlItem17}); + this.layoutControlItem18}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition21.Width = 100D; - columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition22.Width = 100D; - columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition23.Width = 100D; - columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition24.Width = 100D; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition21, - columnDefinition22, - columnDefinition23, - columnDefinition24}); - rowDefinition26.Height = 100D; - rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition27.Height = 100D; - rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition28.Height = 100D; - rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition29.Height = 100D; - rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition30.Height = 100D; - rowDefinition30.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition4.Height = 100D; + rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition26, - rowDefinition27, - rowDefinition28, - rowDefinition29, - rowDefinition30}); + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5}); this.Root.Size = new System.Drawing.Size(1126, 180); this.Root.TextVisible = false; // @@ -964,17 +1002,16 @@ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem16.TextVisible = false; // - // layoutControlItem17 + // layoutControlItem18 // - this.layoutControlItem17.Control = this.lbGuid; - this.layoutControlItem17.Location = new System.Drawing.Point(828, 128); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(278, 32); - this.layoutControlItem17.Text = "lbGuid"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem17.TextVisible = false; + this.layoutControlItem18.Control = this.txt_sqRemark; + this.layoutControlItem18.Location = new System.Drawing.Point(0, 128); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem18.Size = new System.Drawing.Size(552, 32); + this.layoutControlItem18.Text = "澶囨敞鍘熷洜"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -982,7 +1019,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1126, 397); + this.tabMx.Size = new System.Drawing.Size(1126, 387); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -992,7 +1029,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 365); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 355); this.tabMxPage1.Text = "鍑哄簱鏄庣粏"; // // gcMx1 @@ -1001,13 +1038,15 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1124, 365); + this.gcMx1.Size = new System.Drawing.Size(1124, 355); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); // // gvMx1 // + this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1.Appearance.Row.Options.UseFont = true; this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx1guid, this.gvMx1workNo, @@ -1133,7 +1172,7 @@ this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1remark.AppearanceCell.Options.UseFont = true; this.gvMx1remark.Caption = "澶囨敞淇℃伅 "; - this.gvMx1remark.FieldName = "remark"; + this.gvMx1remark.FieldName = "sqRemark"; this.gvMx1remark.MinWidth = 50; this.gvMx1remark.Name = "gvMx1remark"; this.gvMx1remark.Tag = "query_a.remark"; @@ -1165,7 +1204,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1124, 365); + this.tabMxPage2.Size = new System.Drawing.Size(1124, 355); this.tabMxPage2.Text = "鍑哄簱鏉$爜"; // // gcMx2 @@ -1174,13 +1213,15 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; - this.gcMx2.Size = new System.Drawing.Size(1124, 365); + this.gcMx2.Size = new System.Drawing.Size(1124, 355); this.gcMx2.TabIndex = 1; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); // // gvMx2 // + this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2.Appearance.Row.Options.UseFont = true; this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gvMx2itemBarcode, this.gvMx2itemNo, @@ -1364,6 +1405,8 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); @@ -1381,7 +1424,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1484,5 +1527,8 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraEditors.TextEdit txt_sqRemark; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; } } \ No newline at end of file -- Gitblit v1.9.3