From 9702c6a4dc358c7bff2eb18c8426229a0140e34a Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期一, 15 九月 2025 08:29:16 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 335 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 240 insertions(+), 95 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs index c887aa3..d7709cb 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs @@ -73,6 +73,12 @@ this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -93,11 +99,11 @@ this.txt_guid = new DevExpress.XtraEditors.TextEdit(); this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit(); this.txt_isSrm = new DevExpress.XtraEditors.CheckEdit(); + this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -110,6 +116,8 @@ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -151,6 +159,9 @@ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage(); + this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -184,11 +195,11 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); @@ -201,6 +212,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -209,6 +222,7 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit(); + this.xtraTabPageReport.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -221,9 +235,10 @@ this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = "rpt_InvItem{}"; - this.toolBarMenu1.Size = new System.Drawing.Size(1575, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1552, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}"; @@ -234,17 +249,18 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1575, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1552, 602); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, - this.xtraTabPage2}); + this.xtraTabPage2, + this.xtraTabPageReport}); // // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1573, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1550, 570); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -265,7 +281,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1573, 570); + this.split1.Size = new System.Drawing.Size(1550, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // @@ -275,7 +291,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(1573, 519); + this.gcMain1.Size = new System.Drawing.Size(1550, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -300,7 +316,13 @@ this.gridColumn5, this.gv_remark, this.gridColumn4, - this.gridColumn11}); + this.gridColumn11, + this.gridColumn7, + this.gridColumn22, + this.gridColumn23, + this.gridColumn24, + this.gridColumn25, + this.gridColumn26}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -384,7 +406,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; - this.gv_createBy.VisibleIndex = 5; + this.gv_createBy.VisibleIndex = 10; this.gv_createBy.Width = 89; // // gv_createDate @@ -396,7 +418,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.create_date"; this.gv_createDate.Visible = true; - this.gv_createDate.VisibleIndex = 6; + this.gv_createDate.VisibleIndex = 11; this.gv_createDate.Width = 193; // // gv_checkUser @@ -408,7 +430,7 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.check_user"; this.gv_checkUser.Visible = true; - this.gv_checkUser.VisibleIndex = 7; + this.gv_checkUser.VisibleIndex = 8; this.gv_checkUser.Width = 100; // // gv_checkDate @@ -420,7 +442,7 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.check_date"; this.gv_checkDate.Visible = true; - this.gv_checkDate.VisibleIndex = 8; + this.gv_checkDate.VisibleIndex = 9; this.gv_checkDate.Width = 64; // // gv_suppNo @@ -432,7 +454,7 @@ this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.supp_no"; this.gv_suppNo.Visible = true; - this.gv_suppNo.VisibleIndex = 9; + this.gv_suppNo.VisibleIndex = 6; this.gv_suppNo.Width = 69; // // gridColumn5 @@ -442,7 +464,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.AllowEdit = false; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 10; + this.gridColumn5.VisibleIndex = 7; this.gridColumn5.Width = 70; // // gv_remark @@ -454,7 +476,7 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; - this.gv_remark.VisibleIndex = 11; + this.gv_remark.VisibleIndex = 12; this.gv_remark.Width = 90; // // gridColumn4 @@ -464,7 +486,7 @@ this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 12; + this.gridColumn4.VisibleIndex = 13; this.gridColumn4.Width = 94; // // gridColumn11 @@ -475,6 +497,58 @@ this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Width = 94; // + // gridColumn7 + // + this.gridColumn7.Caption = "SRM鍒拌揣鍗曞彿"; + this.gridColumn7.FieldName = "paperBillNo"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 14; + this.gridColumn7.Width = 94; + // + // gridColumn22 + // + this.gridColumn22.Caption = "鍏ュ簱鐘舵��"; + this.gridColumn22.FieldName = "mxStatueColor"; + this.gridColumn22.MinWidth = 24; + this.gridColumn22.Name = "gridColumn22"; + this.gridColumn22.Visible = true; + this.gridColumn22.VisibleIndex = 5; + this.gridColumn22.Width = 90; + // + // gridColumn23 + // + this.gridColumn23.Caption = "鍒拌揣鏁伴噺"; + this.gridColumn23.FieldName = "鍒拌揣鎬婚噺"; + this.gridColumn23.MinWidth = 24; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Width = 90; + // + // gridColumn24 + // + this.gridColumn24.Caption = "妫�楠屾暟閲�"; + this.gridColumn24.FieldName = "妫�楠屾�婚噺"; + this.gridColumn24.MinWidth = 24; + this.gridColumn24.Name = "gridColumn24"; + this.gridColumn24.Width = 90; + // + // gridColumn25 + // + this.gridColumn25.Caption = "鍏ュ簱鏁伴噺"; + this.gridColumn25.FieldName = "鍏ュ簱鎬婚噺"; + this.gridColumn25.MinWidth = 24; + this.gridColumn25.Name = "gridColumn25"; + this.gridColumn25.Width = 90; + // + // gridColumn26 + // + this.gridColumn26.Caption = "鎵撳嵃鏁伴噺"; + this.gridColumn26.FieldName = "鎵撳嵃鎬婚噺"; + this.gridColumn26.MinWidth = 24; + this.gridColumn26.Name = "gridColumn26"; + this.gridColumn26.Width = 90; + // // pageBar1 // this.pageBar1.CurrentPage = 1; @@ -483,7 +557,7 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1573, 39); + this.pageBar1.Size = new System.Drawing.Size(1550, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -491,7 +565,7 @@ // this.xtraTabPage2.Controls.Add(this.splitMx1); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1573, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(1550, 570); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -511,7 +585,7 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.splitMx1.Size = new System.Drawing.Size(1573, 570); + this.splitMx1.Size = new System.Drawing.Size(1550, 570); this.splitMx1.SplitterPosition = 149; this.splitMx1.TabIndex = 0; // @@ -533,6 +607,7 @@ this.layoutMx1.Controls.Add(this.txt_guid); this.layoutMx1.Controls.Add(this.txt_paperBillNo); this.layoutMx1.Controls.Add(this.txt_isSrm); + this.layoutMx1.Controls.Add(this.txt_mxStatue); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem18, @@ -541,7 +616,7 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(758, 132, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1573, 149); + this.layoutMx1.Size = new System.Drawing.Size(1550, 149); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -566,10 +641,10 @@ // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(487, 76); + this.txt_remark.Location = new System.Drawing.Point(481, 76); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(297, 24); + this.txt_remark.Size = new System.Drawing.Size(291, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 240; // @@ -577,17 +652,18 @@ // this.txt_receiveOrgId.IsReadly = false; this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 44); + this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(4); this.txt_receiveOrgId.Name = "txt_receiveOrgId"; - this.txt_receiveOrgId.Size = new System.Drawing.Size(297, 24); + this.txt_receiveOrgId.Size = new System.Drawing.Size(291, 24); this.txt_receiveOrgId.TabIndex = 457; // // txtSupplierCode // - this.txtSupplierCode.Location = new System.Drawing.Point(487, 44); + this.txtSupplierCode.Location = new System.Drawing.Point(481, 44); this.txtSupplierCode.Name = "txtSupplierCode"; this.txtSupplierCode.Properties.Appearance.Options.UseFont = true; this.txtSupplierCode.Properties.Tag = ""; - this.txtSupplierCode.Size = new System.Drawing.Size(297, 24); + this.txtSupplierCode.Size = new System.Drawing.Size(291, 24); this.txtSupplierCode.StyleController = this.layoutMx1; this.txtSupplierCode.TabIndex = 451; this.txtSupplierCode.Tag = "readOnly"; @@ -598,7 +674,7 @@ this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Properties.Tag = ""; - this.txt_billNo.Size = new System.Drawing.Size(297, 24); + this.txt_billNo.Size = new System.Drawing.Size(291, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; this.txt_billNo.Tag = "readOnly"; @@ -609,65 +685,65 @@ this.txt_suppId.Location = new System.Drawing.Point(99, 76); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; - this.txt_suppId.Size = new System.Drawing.Size(297, 24); + this.txt_suppId.Size = new System.Drawing.Size(291, 24); this.txt_suppId.TabIndex = 440; // // txt_fstatus // - this.txt_fstatus.Location = new System.Drawing.Point(1176, 76); + this.txt_fstatus.Location = new System.Drawing.Point(1158, 76); this.txt_fstatus.Name = "txt_fstatus"; this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_fstatus.Size = new System.Drawing.Size(385, 24); + this.txt_fstatus.Size = new System.Drawing.Size(380, 24); this.txt_fstatus.StyleController = this.layoutMx1; this.txt_fstatus.TabIndex = 458; this.txt_fstatus.Tag = "readOnly"; // // txt_fType // - this.txt_fType.Location = new System.Drawing.Point(400, 12); + this.txt_fType.Location = new System.Drawing.Point(394, 12); this.txt_fType.Name = "txt_fType"; this.txt_fType.Properties.Caption = "濮斿鏍囪瘑"; - this.txt_fType.Size = new System.Drawing.Size(384, 24); + this.txt_fType.Size = new System.Drawing.Size(378, 24); this.txt_fType.StyleController = this.layoutMx1; this.txt_fType.TabIndex = 459; this.txt_fType.Tag = "readOnly"; // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(875, 12); + this.txt_createBy.Location = new System.Drawing.Point(863, 12); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(297, 24); + this.txt_createBy.Size = new System.Drawing.Size(291, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 461; this.txt_createBy.Tag = "readOnly"; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(875, 44); + this.txt_createDate.Location = new System.Drawing.Point(863, 44); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(297, 24); + this.txt_createDate.Size = new System.Drawing.Size(291, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 462; this.txt_createDate.Tag = "readOnly"; // // txt_checkUser // - this.txt_checkUser.Location = new System.Drawing.Point(1263, 12); + this.txt_checkUser.Location = new System.Drawing.Point(1245, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(298, 24); + this.txt_checkUser.Size = new System.Drawing.Size(293, 24); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 463; this.txt_checkUser.Tag = "readOnly"; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(1263, 44); + this.txt_checkDate.Location = new System.Drawing.Point(1245, 44); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(298, 24); + this.txt_checkDate.Size = new System.Drawing.Size(293, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 464; this.txt_checkDate.Tag = "readOnly"; @@ -683,21 +759,31 @@ // // txt_paperBillNo // - this.txt_paperBillNo.Location = new System.Drawing.Point(875, 76); + this.txt_paperBillNo.Location = new System.Drawing.Point(863, 76); this.txt_paperBillNo.Name = "txt_paperBillNo"; - this.txt_paperBillNo.Size = new System.Drawing.Size(297, 24); + this.txt_paperBillNo.Size = new System.Drawing.Size(291, 24); this.txt_paperBillNo.StyleController = this.layoutMx1; this.txt_paperBillNo.TabIndex = 467; // // txt_isSrm // - this.txt_isSrm.Location = new System.Drawing.Point(1176, 108); + this.txt_isSrm.Location = new System.Drawing.Point(1158, 108); this.txt_isSrm.Name = "txt_isSrm"; this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑"; - this.txt_isSrm.Size = new System.Drawing.Size(385, 24); + this.txt_isSrm.Size = new System.Drawing.Size(380, 24); this.txt_isSrm.StyleController = this.layoutMx1; this.txt_isSrm.TabIndex = 468; this.txt_isSrm.Tag = "readOnly"; + // + // txt_mxStatue + // + this.txt_mxStatue.Location = new System.Drawing.Point(481, 108); + this.txt_mxStatue.Name = "txt_mxStatue"; + this.txt_mxStatue.Properties.Appearance.Options.UseFont = true; + this.txt_mxStatue.Size = new System.Drawing.Size(291, 24); + this.txt_mxStatue.StyleController = this.layoutMx1; + this.txt_mxStatue.TabIndex = 240; + this.txt_mxStatue.Tag = "readOnly"; // // layoutControlItem18 // @@ -728,7 +814,6 @@ this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, - this.layoutControlItem2, this.layoutControlItem3, this.layoutControlItem11, this.layoutControlItem12, @@ -740,7 +825,9 @@ this.layoutControlItem17, this.layoutControlItem16, this.layoutControlItem4, - this.layoutControlItem6}); + this.layoutControlItem6, + this.layoutControlItem10, + this.layoutControlItem2}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -769,7 +856,7 @@ rowDefinition2, rowDefinition3, rowDefinition4}); - this.Root.Size = new System.Drawing.Size(1573, 149); + this.Root.Size = new System.Drawing.Size(1550, 149); this.Root.TextVisible = false; // // layoutControlItem1 @@ -778,18 +865,9 @@ this.layoutControlItem1.Location = new System.Drawing.Point(0, 32); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem1.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(382, 32); this.layoutControlItem1.Text = "鏀舵枡缁勭粐"; this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_billNo; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(388, 32); - this.layoutControlItem2.Text = "鍒拌揣鍗曞彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem3 // @@ -797,60 +875,60 @@ this.layoutControlItem3.Location = new System.Drawing.Point(0, 64); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(382, 32); this.layoutControlItem3.Text = "閫変緵搴斿晢"; this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_createBy; - this.layoutControlItem11.Location = new System.Drawing.Point(776, 0); + this.layoutControlItem11.Location = new System.Drawing.Point(764, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem11.Size = new System.Drawing.Size(382, 32); this.layoutControlItem11.Text = "寤虹珛浜哄憳"; this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_createDate; - this.layoutControlItem12.Location = new System.Drawing.Point(776, 32); + this.layoutControlItem12.Location = new System.Drawing.Point(764, 32); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem12.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem12.Size = new System.Drawing.Size(382, 32); this.layoutControlItem12.Text = "寤虹珛鏃ユ湡"; this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_checkUser; - this.layoutControlItem13.Location = new System.Drawing.Point(1164, 0); + this.layoutControlItem13.Location = new System.Drawing.Point(1146, 0); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(389, 32); + this.layoutControlItem13.Size = new System.Drawing.Size(384, 32); this.layoutControlItem13.Text = "瀹℃牳浜哄憳"; this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_checkDate; - this.layoutControlItem14.Location = new System.Drawing.Point(1164, 32); + this.layoutControlItem14.Location = new System.Drawing.Point(1146, 32); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(389, 32); + this.layoutControlItem14.Size = new System.Drawing.Size(384, 32); this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡"; this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_fstatus; - this.layoutControlItem7.Location = new System.Drawing.Point(1164, 64); + this.layoutControlItem7.Location = new System.Drawing.Point(1146, 64); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(389, 32); + this.layoutControlItem7.Size = new System.Drawing.Size(384, 32); this.layoutControlItem7.Text = "鎻愪氦妫�楠�"; this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem7.TextVisible = false; @@ -858,10 +936,10 @@ // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fType; - this.layoutControlItem8.Location = new System.Drawing.Point(388, 0); + this.layoutControlItem8.Location = new System.Drawing.Point(382, 0); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem8.Size = new System.Drawing.Size(382, 32); this.layoutControlItem8.Text = "濮斿鏍囪瘑"; this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; @@ -869,22 +947,22 @@ // layoutControlItem5 // this.layoutControlItem5.Control = this.txtSupplierCode; - this.layoutControlItem5.Location = new System.Drawing.Point(388, 32); + this.layoutControlItem5.Location = new System.Drawing.Point(382, 32); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem5.Size = new System.Drawing.Size(382, 32); this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�"; this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_remark; - this.layoutControlItem17.Location = new System.Drawing.Point(388, 64); + this.layoutControlItem17.Location = new System.Drawing.Point(382, 64); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem17.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem17.Size = new System.Drawing.Size(382, 32); this.layoutControlItem17.Text = "鏀舵枡澶囨敞"; this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); // @@ -896,7 +974,7 @@ this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(388, 33); + this.layoutControlItem16.Size = new System.Drawing.Size(382, 33); this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem16.Text = "閫夋嫨鐗╂枡"; this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); @@ -905,24 +983,46 @@ // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_paperBillNo; - this.layoutControlItem4.Location = new System.Drawing.Point(776, 64); + this.layoutControlItem4.Location = new System.Drawing.Point(764, 64); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem4.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(382, 32); this.layoutControlItem4.Text = "閫佽揣鍗曞彿"; this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_isSrm; - this.layoutControlItem6.Location = new System.Drawing.Point(1164, 96); + this.layoutControlItem6.Location = new System.Drawing.Point(1146, 96); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem6.Size = new System.Drawing.Size(389, 33); + this.layoutControlItem6.Size = new System.Drawing.Size(384, 33); this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem6.TextVisible = false; + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_mxStatue; + this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem10.CustomizationFormText = "鍏ュ簱鐘舵��"; + this.layoutControlItem10.Location = new System.Drawing.Point(382, 96); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem10.Size = new System.Drawing.Size(382, 33); + this.layoutControlItem10.Text = "鍏ュ簱鐘舵��"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_billNo; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(382, 32); + this.layoutControlItem2.Text = "鍒拌揣鍗曞彿"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // tabMx // @@ -930,7 +1030,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(1573, 409); + this.tabMx.Size = new System.Drawing.Size(1550, 409); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -939,7 +1039,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1571, 377); + this.tabMxPage1.Size = new System.Drawing.Size(1548, 377); this.tabMxPage1.Text = "鏀舵枡鏄庣粏"; // // gcMx1 @@ -952,7 +1052,7 @@ this.repositoryItemButtonEdit1, this.repositoryItemButtonEdit2, this.rptHistory}); - this.gcMx1.Size = new System.Drawing.Size(1571, 377); + this.gcMx1.Size = new System.Drawing.Size(1548, 377); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -993,7 +1093,8 @@ this.gridColumn17, this.gridColumn18, this.gridColumn19, - this.gridColumn20}); + this.gridColumn20, + this.gridColumn21}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1169,7 +1270,7 @@ this.gvMx1subQty.OptionsColumn.ReadOnly = true; this.gvMx1subQty.Tag = "query_a.sub_qty"; this.gvMx1subQty.Visible = true; - this.gvMx1subQty.VisibleIndex = 11; + this.gvMx1subQty.VisibleIndex = 8; this.gvMx1subQty.Width = 64; // // gvMx1quantity @@ -1185,7 +1286,7 @@ this.gvMx1quantity.Name = "gvMx1quantity"; this.gvMx1quantity.Tag = "yz_quantity_0_edit"; this.gvMx1quantity.Visible = true; - this.gvMx1quantity.VisibleIndex = 12; + this.gvMx1quantity.VisibleIndex = 9; this.gvMx1quantity.Width = 64; // // gvMx1memo @@ -1202,7 +1303,7 @@ this.gvMx1memo.OptionsColumn.ReadOnly = true; this.gvMx1memo.Tag = "edit"; this.gvMx1memo.Visible = true; - this.gvMx1memo.VisibleIndex = 13; + this.gvMx1memo.VisibleIndex = 10; this.gvMx1memo.Width = 110; // // gvMx1okRkqty @@ -1215,7 +1316,7 @@ this.gvMx1okRkqty.OptionsColumn.ReadOnly = true; this.gvMx1okRkqty.Tag = "query_a.ok_rkqty"; this.gvMx1okRkqty.Visible = true; - this.gvMx1okRkqty.VisibleIndex = 8; + this.gvMx1okRkqty.VisibleIndex = 11; this.gvMx1okRkqty.Width = 64; // // gvMx1checkDate @@ -1293,7 +1394,7 @@ this.gvBtnAlawys.MinWidth = 80; this.gvBtnAlawys.Name = "gvBtnAlawys"; this.gvBtnAlawys.Visible = true; - this.gvBtnAlawys.VisibleIndex = 21; + this.gvBtnAlawys.VisibleIndex = 22; this.gvBtnAlawys.Width = 80; // // repositoryItemButtonEdit2 @@ -1314,7 +1415,7 @@ this.gvMxDel.MinWidth = 80; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 22; + this.gvMxDel.VisibleIndex = 23; this.gvMxDel.Width = 103; // // repositoryItemButtonEdit1 @@ -1373,7 +1474,7 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 20; + this.gridColumn17.VisibleIndex = 21; this.gridColumn17.Width = 124; // // rptHistory @@ -1402,7 +1503,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 9; + this.gridColumn19.VisibleIndex = 12; this.gridColumn19.Width = 94; // // gridColumn20 @@ -1412,8 +1513,34 @@ this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 10; + this.gridColumn20.VisibleIndex = 13; this.gridColumn20.Width = 94; + // + // gridColumn21 + // + this.gridColumn21.Caption = "娓呯偣鐘舵��"; + this.gridColumn21.FieldName = "mxStatue"; + this.gridColumn21.MinWidth = 24; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Visible = true; + this.gridColumn21.VisibleIndex = 20; + // + // xtraTabPageReport + // + this.xtraTabPageReport.Controls.Add(this.ucRptCgdhd1); + this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16; + this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(2); + this.xtraTabPageReport.Name = "xtraTabPageReport"; + this.xtraTabPageReport.Size = new System.Drawing.Size(1550, 570); + this.xtraTabPageReport.Text = "鎶ヨ〃"; + // + // ucRptCgdhd1 + // + this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0); + this.ucRptCgdhd1.Name = "ucRptCgdhd1"; + this.ucRptCgdhd1.Size = new System.Drawing.Size(1550, 570); + this.ucRptCgdhd1.TabIndex = 0; // // picCheckBox // @@ -1430,7 +1557,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1575, 682); + this.ClientSize = new System.Drawing.Size(1552, 682); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); @@ -1467,11 +1594,11 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); @@ -1484,6 +1611,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1492,6 +1621,7 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit(); + this.xtraTabPageReport.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -1529,7 +1659,6 @@ private DevExpress.XtraEditors.TextEdit txt_remark; private DevExpress.XtraEditors.TextEdit txt_billNo; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraEditors.CheckEdit txt_fstatus; private DevExpress.XtraEditors.CheckEdit txt_fType; @@ -1597,5 +1726,21 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + + private DevExpress.XtraTab.XtraTabPage xtraTabPageReport; + + + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; + private DevExpress.XtraEditors.TextEdit txt_mxStatue; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; + private Rpt.UcRptCgdhd ucRptCgdhd1; } } \ No newline at end of file -- Gitblit v1.9.3