From 3ba209dab53170b3450ceeaea07f9499790a56a5 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期二, 15 七月 2025 16:01:53 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 647 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 331 insertions(+), 316 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs index 9829dfe..d320711 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs @@ -30,25 +30,29 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -64,11 +68,10 @@ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); @@ -76,12 +79,10 @@ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.lbGuid = new System.Windows.Forms.Label(); this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); - this.txtDepotsCode = new DevExpress.XtraEditors.TextEdit(); this.txt_remark = new DevExpress.XtraEditors.TextEdit(); this.txt_receiveOrgId = new Gs.DevApp.UserControl.UcLookOrg(); this.txtSupplierCode = new DevExpress.XtraEditors.TextEdit(); this.txt_billNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk(); this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier(); this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit(); this.txt_fType = new DevExpress.XtraEditors.CheckEdit(); @@ -89,16 +90,15 @@ this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.txt_checkUser = new DevExpress.XtraEditors.TextEdit(); this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); - this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit(); this.txt_guid = new DevExpress.XtraEditors.TextEdit(); + this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_isSrm = new DevExpress.XtraEditors.CheckEdit(); 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.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -106,9 +106,10 @@ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -133,7 +134,6 @@ this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -145,8 +145,14 @@ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -166,7 +172,6 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit(); @@ -176,16 +181,15 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit(); ((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.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.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); @@ -193,9 +197,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -203,6 +208,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -217,7 +223,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = "rpt_InvItem{}"; - this.toolBarMenu1.Size = new System.Drawing.Size(1233, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1575, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}"; @@ -228,7 +234,7 @@ 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(1233, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1575, 602); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -238,7 +244,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1231, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1573, 570); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -259,7 +265,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1231, 570); + this.split1.Size = new System.Drawing.Size(1573, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // @@ -269,7 +275,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(1231, 519); + this.gcMain1.Size = new System.Drawing.Size(1573, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -290,11 +296,10 @@ this.gv_createDate, this.gv_checkUser, this.gv_checkDate, - this.gv_depotsCode, - this.gridColumn4, this.gv_suppNo, this.gridColumn5, this.gv_remark, + this.gridColumn4, this.gridColumn11}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; @@ -418,28 +423,6 @@ this.gv_checkDate.VisibleIndex = 8; this.gv_checkDate.Width = 64; // - // gv_depotsCode - // - this.gv_depotsCode.AppearanceCell.Options.UseFont = true; - this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栧彿"; - this.gv_depotsCode.FieldName = "depotsCode"; - this.gv_depotsCode.Name = "gv_depotsCode"; - this.gv_depotsCode.OptionsColumn.AllowEdit = false; - this.gv_depotsCode.Tag = "query_a.depots_code"; - this.gv_depotsCode.Visible = true; - this.gv_depotsCode.VisibleIndex = 9; - this.gv_depotsCode.Width = 87; - // - // gridColumn4 - // - this.gridColumn4.Caption = "鏀惰揣浠撳簱鍚嶇О"; - this.gridColumn4.FieldName = "depotName"; - this.gridColumn4.Name = "gridColumn4"; - this.gridColumn4.OptionsColumn.AllowEdit = false; - this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 10; - this.gridColumn4.Width = 128; - // // gv_suppNo // this.gv_suppNo.AppearanceCell.Options.UseFont = true; @@ -449,7 +432,7 @@ this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.supp_no"; this.gv_suppNo.Visible = true; - this.gv_suppNo.VisibleIndex = 11; + this.gv_suppNo.VisibleIndex = 9; this.gv_suppNo.Width = 69; // // gridColumn5 @@ -459,7 +442,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.AllowEdit = false; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 12; + this.gridColumn5.VisibleIndex = 10; this.gridColumn5.Width = 70; // // gv_remark @@ -471,8 +454,18 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; - this.gv_remark.VisibleIndex = 13; + this.gv_remark.VisibleIndex = 11; this.gv_remark.Width = 90; + // + // gridColumn4 + // + this.gridColumn4.Caption = "SRM鏍囪瘑"; + this.gridColumn4.FieldName = "isSrmChk"; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 12; + this.gridColumn4.Width = 94; // // gridColumn11 // @@ -490,7 +483,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(1231, 39); + this.pageBar1.Size = new System.Drawing.Size(1573, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -498,7 +491,7 @@ // this.xtraTabPage2.Controls.Add(this.splitMx1); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1231, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(1573, 570); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -518,20 +511,18 @@ 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(1231, 570); - this.splitMx1.SplitterPosition = 175; + this.splitMx1.Size = new System.Drawing.Size(1573, 570); + this.splitMx1.SplitterPosition = 149; this.splitMx1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.btnSelect); - this.layoutMx1.Controls.Add(this.txtDepotsCode); this.layoutMx1.Controls.Add(this.txt_remark); this.layoutMx1.Controls.Add(this.txt_receiveOrgId); this.layoutMx1.Controls.Add(this.txtSupplierCode); this.layoutMx1.Controls.Add(this.txt_billNo); - this.layoutMx1.Controls.Add(this.txt_depotsId); this.layoutMx1.Controls.Add(this.txt_suppId); this.layoutMx1.Controls.Add(this.txt_fstatus); this.layoutMx1.Controls.Add(this.txt_fType); @@ -539,17 +530,18 @@ this.layoutMx1.Controls.Add(this.txt_createDate); this.layoutMx1.Controls.Add(this.txt_checkUser); this.layoutMx1.Controls.Add(this.txt_checkDate); - this.layoutMx1.Controls.Add(this.txt_paperBillNo); this.layoutMx1.Controls.Add(this.txt_guid); + this.layoutMx1.Controls.Add(this.txt_paperBillNo); + this.layoutMx1.Controls.Add(this.txt_isSrm); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem18, this.layoutControlItem9}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1007, 106, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(758, 132, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1231, 175); + this.layoutMx1.Size = new System.Drawing.Size(1573, 149); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -565,48 +557,37 @@ // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; - this.btnSelect.Location = new System.Drawing.Point(12, 136); + this.btnSelect.Location = new System.Drawing.Point(12, 108); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(116, 27); this.btnSelect.StyleController = this.layoutMx1; this.btnSelect.TabIndex = 443; this.btnSelect.Text = "閫夋嫨鐗╂枡 "; // - // txtDepotsCode - // - this.txtDepotsCode.Location = new System.Drawing.Point(401, 74); - this.txtDepotsCode.Name = "txtDepotsCode"; - this.txtDepotsCode.Properties.Appearance.Options.UseFont = true; - this.txtDepotsCode.Properties.Tag = ""; - this.txtDepotsCode.Size = new System.Drawing.Size(212, 24); - this.txtDepotsCode.StyleController = this.layoutMx1; - this.txtDepotsCode.TabIndex = 454; - this.txtDepotsCode.Tag = "readOnly"; - // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(401, 105); + this.txt_remark.Location = new System.Drawing.Point(487, 76); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(515, 24); + this.txt_remark.Size = new System.Drawing.Size(297, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 240; // // txt_receiveOrgId // this.txt_receiveOrgId.IsReadly = false; - this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 43); + this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 44); this.txt_receiveOrgId.Name = "txt_receiveOrgId"; - this.txt_receiveOrgId.Size = new System.Drawing.Size(211, 24); + this.txt_receiveOrgId.Size = new System.Drawing.Size(297, 24); this.txt_receiveOrgId.TabIndex = 457; // // txtSupplierCode // - this.txtSupplierCode.Location = new System.Drawing.Point(401, 43); + this.txtSupplierCode.Location = new System.Drawing.Point(487, 44); this.txtSupplierCode.Name = "txtSupplierCode"; this.txtSupplierCode.Properties.Appearance.Options.UseFont = true; this.txtSupplierCode.Properties.Tag = ""; - this.txtSupplierCode.Size = new System.Drawing.Size(212, 24); + this.txtSupplierCode.Size = new System.Drawing.Size(297, 24); this.txtSupplierCode.StyleController = this.layoutMx1; this.txtSupplierCode.TabIndex = 451; this.txtSupplierCode.Tag = "readOnly"; @@ -617,97 +598,79 @@ 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(211, 24); + this.txt_billNo.Size = new System.Drawing.Size(297, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; this.txt_billNo.Tag = "readOnly"; // - // txt_depotsId - // - this.txt_depotsId.IsReadly = false; - this.txt_depotsId.Location = new System.Drawing.Point(99, 105); - this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0); - this.txt_depotsId.Name = "txt_depotsId"; - this.txt_depotsId.Size = new System.Drawing.Size(211, 24); - this.txt_depotsId.TabIndex = 445; - // // txt_suppId // this.txt_suppId.IsReadly = false; - this.txt_suppId.Location = new System.Drawing.Point(99, 74); + 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(211, 24); + this.txt_suppId.Size = new System.Drawing.Size(297, 24); this.txt_suppId.TabIndex = 440; // // txt_fstatus // - this.txt_fstatus.Location = new System.Drawing.Point(920, 74); + this.txt_fstatus.Location = new System.Drawing.Point(1176, 76); this.txt_fstatus.Name = "txt_fstatus"; this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_fstatus.Size = new System.Drawing.Size(299, 24); + this.txt_fstatus.Size = new System.Drawing.Size(385, 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(314, 12); + this.txt_fType.Location = new System.Drawing.Point(400, 12); this.txt_fType.Name = "txt_fType"; this.txt_fType.Properties.Caption = "濮斿鏍囪瘑"; - this.txt_fType.Size = new System.Drawing.Size(299, 24); + this.txt_fType.Size = new System.Drawing.Size(384, 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(704, 12); + this.txt_createBy.Location = new System.Drawing.Point(875, 12); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(212, 24); + this.txt_createBy.Size = new System.Drawing.Size(297, 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(704, 43); + this.txt_createDate.Location = new System.Drawing.Point(875, 44); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(212, 24); + this.txt_createDate.Size = new System.Drawing.Size(297, 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(1007, 12); + this.txt_checkUser.Location = new System.Drawing.Point(1263, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(212, 24); + this.txt_checkUser.Size = new System.Drawing.Size(298, 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(1007, 43); + this.txt_checkDate.Location = new System.Drawing.Point(1263, 44); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(212, 24); + this.txt_checkDate.Size = new System.Drawing.Size(298, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 464; this.txt_checkDate.Tag = "readOnly"; - // - // txt_paperBillNo - // - this.txt_paperBillNo.Location = new System.Drawing.Point(704, 74); - this.txt_paperBillNo.Name = "txt_paperBillNo"; - this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true; - this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24); - this.txt_paperBillNo.StyleController = this.layoutMx1; - this.txt_paperBillNo.TabIndex = 465; // // txt_guid // @@ -717,6 +680,24 @@ this.txt_guid.StyleController = this.layoutMx1; this.txt_guid.TabIndex = 466; this.txt_guid.Tag = "readOnly"; + // + // txt_paperBillNo + // + this.txt_paperBillNo.Location = new System.Drawing.Point(875, 76); + this.txt_paperBillNo.Name = "txt_paperBillNo"; + this.txt_paperBillNo.Size = new System.Drawing.Size(297, 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.Name = "txt_isSrm"; + this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑"; + this.txt_isSrm.Size = new System.Drawing.Size(385, 24); + this.txt_isSrm.StyleController = this.layoutMx1; + this.txt_isSrm.TabIndex = 468; + this.txt_isSrm.Tag = "readOnly"; // // layoutControlItem18 // @@ -749,8 +730,6 @@ this.layoutControlItem1, this.layoutControlItem2, this.layoutControlItem3, - this.layoutControlItem4, - this.layoutControlItem16, this.layoutControlItem11, this.layoutControlItem12, this.layoutControlItem13, @@ -758,50 +737,48 @@ this.layoutControlItem7, this.layoutControlItem8, this.layoutControlItem5, - this.layoutControlItem6, this.layoutControlItem17, - this.lab_paperBillNo}); + this.layoutControlItem16, + this.layoutControlItem4, + this.layoutControlItem6}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - 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; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - 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; + columnDefinition5, + columnDefinition6, + columnDefinition7, + columnDefinition8}); rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1231, 175); + rowDefinition5, + rowDefinition6, + rowDefinition7, + rowDefinition8}); + this.Root.Size = new System.Drawing.Size(1573, 149); this.Root.TextVisible = false; // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_receiveOrgId; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 31); + 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(302, 31); + this.layoutControlItem1.Size = new System.Drawing.Size(388, 32); this.layoutControlItem1.Text = "鏀舵枡缁勭粐"; this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // @@ -810,94 +787,70 @@ 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(302, 31); + this.layoutControlItem2.Size = new System.Drawing.Size(388, 32); this.layoutControlItem2.Text = "鍒拌揣鍗曞彿"; this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_suppId; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 62); + 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(302, 31); + this.layoutControlItem3.Size = new System.Drawing.Size(388, 32); this.layoutControlItem3.Text = "閫変緵搴斿晢"; this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_depotsId; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 93); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(302, 31); - this.layoutControlItem4.Text = "閫夋嫨浠撳簱"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.btnSelect; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 124); - this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31); - this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem16.Size = new System.Drawing.Size(302, 31); - this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem16.Text = "閫夋嫨鐗╂枡"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem16.TextVisible = false; // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_createBy; - this.layoutControlItem11.Location = new System.Drawing.Point(605, 0); + this.layoutControlItem11.Location = new System.Drawing.Point(776, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem11.Size = new System.Drawing.Size(388, 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(605, 31); + this.layoutControlItem12.Location = new System.Drawing.Point(776, 32); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem12.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem12.Size = new System.Drawing.Size(388, 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(908, 0); + this.layoutControlItem13.Location = new System.Drawing.Point(1164, 0); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem13.Size = new System.Drawing.Size(389, 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(908, 31); + this.layoutControlItem14.Location = new System.Drawing.Point(1164, 32); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem14.Size = new System.Drawing.Size(389, 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(908, 62); + this.layoutControlItem7.Location = new System.Drawing.Point(1164, 64); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem7.Size = new System.Drawing.Size(389, 32); this.layoutControlItem7.Text = "鎻愪氦妫�楠�"; this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem7.TextVisible = false; @@ -905,10 +858,10 @@ // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fType; - this.layoutControlItem8.Location = new System.Drawing.Point(302, 0); + this.layoutControlItem8.Location = new System.Drawing.Point(388, 0); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem8.Size = new System.Drawing.Size(388, 32); this.layoutControlItem8.Text = "濮斿鏍囪瘑"; this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; @@ -916,47 +869,60 @@ // layoutControlItem5 // this.layoutControlItem5.Control = this.txtSupplierCode; - this.layoutControlItem5.Location = new System.Drawing.Point(302, 31); + this.layoutControlItem5.Location = new System.Drawing.Point(388, 32); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(303, 31); + this.layoutControlItem5.Size = new System.Drawing.Size(388, 32); this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�"; this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txtDepotsCode; - this.layoutControlItem6.Location = new System.Drawing.Point(302, 62); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(303, 31); - this.layoutControlItem6.Text = "浠撳簱缂栫爜"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_remark; - this.layoutControlItem17.Location = new System.Drawing.Point(302, 93); + this.layoutControlItem17.Location = new System.Drawing.Point(388, 64); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem17.Size = new System.Drawing.Size(606, 31); - this.layoutControlItem17.Text = "澶囨敞淇℃伅"; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem17.Size = new System.Drawing.Size(388, 32); + this.layoutControlItem17.Text = "鏀舵枡澶囨敞"; this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); // - // lab_paperBillNo + // layoutControlItem16 // - this.lab_paperBillNo.Control = this.txt_paperBillNo; - this.lab_paperBillNo.Location = new System.Drawing.Point(605, 62); - this.lab_paperBillNo.Name = "lab_paperBillNo"; - this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2; - this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2; - this.lab_paperBillNo.Size = new System.Drawing.Size(303, 31); - this.lab_paperBillNo.Text = "閫佽揣鍗曞彿"; - this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem16.Control = this.btnSelect; + this.layoutControlItem16.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31); + 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.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem16.Text = "閫夋嫨鐗╂枡"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem16.TextVisible = false; + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_paperBillNo; + this.layoutControlItem4.Location = new System.Drawing.Point(776, 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.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.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem6.Size = new System.Drawing.Size(389, 33); + this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem6.TextVisible = false; // // tabMx // @@ -964,7 +930,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(1231, 383); + this.tabMx.Size = new System.Drawing.Size(1573, 409); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -973,8 +939,8 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1229, 351); - this.tabMxPage1.Text = "鍏ヤ粨鐗╂枡鏄庣粏"; + this.tabMxPage1.Size = new System.Drawing.Size(1571, 377); + this.tabMxPage1.Text = "鏀舵枡鏄庣粏"; // // gcMx1 // @@ -984,8 +950,9 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, - this.repositoryItemButtonEdit2}); - this.gcMx1.Size = new System.Drawing.Size(1229, 351); + this.repositoryItemButtonEdit2, + this.rptHistory}); + this.gcMx1.Size = new System.Drawing.Size(1571, 377); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1013,7 +980,6 @@ this.gvMx1checkDate, this.gridColumn3, this.gridColumn9, - this.gridColumn7, this.gridColumn6, this.gridColumn10, this.gridColumn12, @@ -1022,7 +988,12 @@ this.gvMxDel, this.gridColumn14, this.gridColumn15, - this.gridColumn16}); + this.gridColumn16, + this.gridColumn2, + this.gridColumn17, + this.gridColumn18, + this.gridColumn19, + this.gridColumn20}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1042,7 +1013,7 @@ // gvMx1guid // this.gvMx1guid.AppearanceCell.Options.UseFont = true; - this.gvMx1guid.Caption = "涓婚敭GUID"; + this.gvMx1guid.Caption = "鍒拌揣鏄庣粏GUID"; this.gvMx1guid.FieldName = "guid"; this.gvMx1guid.MinWidth = 70; this.gvMx1guid.Name = "gvMx1guid"; @@ -1053,8 +1024,8 @@ // gvMx1ebelnLine // this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true; - this.gvMx1ebelnLine.Caption = "ERP琛孖D"; - this.gvMx1ebelnLine.FieldName = "ebelnK3id"; + this.gvMx1ebelnLine.Caption = "Erp琛孖d"; + this.gvMx1ebelnLine.FieldName = "lineK3id"; this.gvMx1ebelnLine.MinWidth = 90; this.gvMx1ebelnLine.Name = "gvMx1ebelnLine"; this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true; @@ -1073,7 +1044,7 @@ // gvMx1returnFlag // this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true; - this.gvMx1returnFlag.Caption = "閫�璐ф爣璇�"; + this.gvMx1returnFlag.Caption = "閫�璐�"; this.gvMx1returnFlag.FieldName = "returnFlag"; this.gvMx1returnFlag.MinWidth = 25; this.gvMx1returnFlag.Name = "gvMx1returnFlag"; @@ -1082,7 +1053,7 @@ this.gvMx1returnFlag.UnboundDataType = typeof(bool); this.gvMx1returnFlag.Visible = true; this.gvMx1returnFlag.VisibleIndex = 0; - this.gvMx1returnFlag.Width = 50; + this.gvMx1returnFlag.Width = 63; // // gvMx1urgentFlag // @@ -1091,7 +1062,7 @@ this.gvMx1urgentFlag.AppearanceCell.Options.UseForeColor = true; this.gvMx1urgentFlag.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑"; + this.gvMx1urgentFlag.Caption = "鎬ユ枡"; this.gvMx1urgentFlag.FieldName = "urgentFlag"; this.gvMx1urgentFlag.MinWidth = 25; this.gvMx1urgentFlag.Name = "gvMx1urgentFlag"; @@ -1099,7 +1070,7 @@ this.gvMx1urgentFlag.UnboundDataType = typeof(bool); this.gvMx1urgentFlag.Visible = true; this.gvMx1urgentFlag.VisibleIndex = 1; - this.gvMx1urgentFlag.Width = 50; + this.gvMx1urgentFlag.Width = 34; // // gvMx1isdepsIn // @@ -1124,7 +1095,7 @@ this.gvMx1checkStates.Tag = "query_a.check_states"; this.gvMx1checkStates.Visible = true; this.gvMx1checkStates.VisibleIndex = 2; - this.gvMx1checkStates.Width = 90; + this.gvMx1checkStates.Width = 66; // // gvMx1checkRes // @@ -1137,7 +1108,7 @@ this.gvMx1checkRes.Tag = "query_a.check_res"; this.gvMx1checkRes.Visible = true; this.gvMx1checkRes.VisibleIndex = 3; - this.gvMx1checkRes.Width = 90; + this.gvMx1checkRes.Width = 66; // // gvMx1ebeln // @@ -1149,8 +1120,8 @@ this.gvMx1ebeln.OptionsColumn.ReadOnly = true; this.gvMx1ebeln.Tag = "query_a.ebeln"; this.gvMx1ebeln.Visible = true; - this.gvMx1ebeln.VisibleIndex = 5; - this.gvMx1ebeln.Width = 120; + this.gvMx1ebeln.VisibleIndex = 4; + this.gvMx1ebeln.Width = 129; // // gridColumn8 // @@ -1159,8 +1130,8 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 6; - this.gridColumn8.Width = 70; + this.gridColumn8.VisibleIndex = 5; + this.gridColumn8.Width = 53; // // gvMx1boardStyle // @@ -1172,8 +1143,8 @@ this.gvMx1boardStyle.OptionsColumn.ReadOnly = true; this.gvMx1boardStyle.Tag = "query_a.board_style"; this.gvMx1boardStyle.Visible = true; - this.gvMx1boardStyle.VisibleIndex = 7; - this.gvMx1boardStyle.Width = 180; + this.gvMx1boardStyle.VisibleIndex = 6; + this.gvMx1boardStyle.Width = 73; // // gvMx1ebelnQty // @@ -1185,21 +1156,21 @@ this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true; this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty"; this.gvMx1ebelnQty.Visible = true; - this.gvMx1ebelnQty.VisibleIndex = 8; - this.gvMx1ebelnQty.Width = 80; + this.gvMx1ebelnQty.VisibleIndex = 7; + this.gvMx1ebelnQty.Width = 64; // // gvMx1subQty // this.gvMx1subQty.AppearanceCell.Options.UseFont = true; - this.gvMx1subQty.Caption = "鏈敹鏁伴噺"; + this.gvMx1subQty.Caption = "绱鏈敹閲�"; this.gvMx1subQty.FieldName = "wssl"; this.gvMx1subQty.MinWidth = 25; this.gvMx1subQty.Name = "gvMx1subQty"; this.gvMx1subQty.OptionsColumn.ReadOnly = true; this.gvMx1subQty.Tag = "query_a.sub_qty"; this.gvMx1subQty.Visible = true; - this.gvMx1subQty.VisibleIndex = 10; - this.gvMx1subQty.Width = 80; + this.gvMx1subQty.VisibleIndex = 11; + this.gvMx1subQty.Width = 64; // // gvMx1quantity // @@ -1208,14 +1179,14 @@ this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true; this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺"; + this.gvMx1quantity.Caption = "鏈鏀堕噺"; this.gvMx1quantity.FieldName = "quantity"; this.gvMx1quantity.MinWidth = 25; this.gvMx1quantity.Name = "gvMx1quantity"; this.gvMx1quantity.Tag = "yz_quantity_0_edit"; this.gvMx1quantity.Visible = true; - this.gvMx1quantity.VisibleIndex = 11; - this.gvMx1quantity.Width = 80; + this.gvMx1quantity.VisibleIndex = 12; + this.gvMx1quantity.Width = 64; // // gvMx1memo // @@ -1231,21 +1202,21 @@ this.gvMx1memo.OptionsColumn.ReadOnly = true; this.gvMx1memo.Tag = "edit"; this.gvMx1memo.Visible = true; - this.gvMx1memo.VisibleIndex = 12; - this.gvMx1memo.Width = 180; + this.gvMx1memo.VisibleIndex = 13; + this.gvMx1memo.Width = 110; // // gvMx1okRkqty // this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true; - this.gvMx1okRkqty.Caption = "宸叉敹鏁伴噺"; + this.gvMx1okRkqty.Caption = "绱瀹炴敹"; this.gvMx1okRkqty.FieldName = "yssl"; this.gvMx1okRkqty.MinWidth = 25; this.gvMx1okRkqty.Name = "gvMx1okRkqty"; this.gvMx1okRkqty.OptionsColumn.ReadOnly = true; this.gvMx1okRkqty.Tag = "query_a.ok_rkqty"; this.gvMx1okRkqty.Visible = true; - this.gvMx1okRkqty.VisibleIndex = 9; - this.gvMx1okRkqty.Width = 80; + this.gvMx1okRkqty.VisibleIndex = 8; + this.gvMx1okRkqty.Width = 64; // // gvMx1checkDate // @@ -1275,19 +1246,8 @@ this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 13; - this.gridColumn9.Width = 50; - // - // gridColumn7 - // - this.gridColumn7.Caption = "搴撳瓨鍗曚綅"; - this.gridColumn7.FieldName = "kcUnit"; - this.gridColumn7.MinWidth = 25; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.OptionsColumn.ReadOnly = true; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 14; - this.gridColumn7.Width = 50; + this.gridColumn9.VisibleIndex = 14; + this.gridColumn9.Width = 40; // // gridColumn6 // @@ -1298,7 +1258,7 @@ this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 15; - this.gridColumn6.Width = 180; + this.gridColumn6.Width = 119; // // gridColumn10 // @@ -1307,8 +1267,8 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 16; - this.gridColumn10.Width = 94; + this.gridColumn10.VisibleIndex = 19; + this.gridColumn10.Width = 43; // // gridColumn12 // @@ -1316,9 +1276,7 @@ this.gridColumn12.FieldName = "returnDate"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; - this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 19; - this.gridColumn12.Width = 94; + this.gridColumn12.Width = 25; // // gridColumn13 // @@ -1326,9 +1284,7 @@ this.gridColumn13.FieldName = "returnBy"; this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; - this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 20; - this.gridColumn13.Width = 94; + this.gridColumn13.Width = 25; // // gvBtnAlawys // @@ -1343,10 +1299,10 @@ // repositoryItemButtonEdit2 // this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.edit_16x16; + editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); @@ -1359,15 +1315,15 @@ this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 22; - this.gvMxDel.Width = 80; + this.gvMxDel.Width = 103; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -1378,29 +1334,66 @@ this.gridColumn14.FieldName = "freceQty"; this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; - this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 4; this.gridColumn14.Width = 94; // // gridColumn15 // - this.gridColumn15.Caption = "澶勭悊缁撴灉"; - this.gridColumn15.FieldName = "czjg"; + this.gridColumn15.Caption = "OA澶勭悊鎰忚"; + this.gridColumn15.FieldName = "clyj"; this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 17; - this.gridColumn15.Width = 94; + this.gridColumn15.VisibleIndex = 16; + this.gridColumn15.Width = 89; // // gridColumn16 // - this.gridColumn16.Caption = "閫�鐞嗘柟寮�"; - this.gridColumn16.FieldName = "tlfs"; + this.gridColumn16.Caption = "OA鎸戦�夋暟閲�"; + this.gridColumn16.FieldName = "txsl"; this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 18; - this.gridColumn16.Width = 94; + this.gridColumn16.VisibleIndex = 17; + this.gridColumn16.Width = 89; + // + // gridColumn2 + // + this.gridColumn2.Caption = "OA閫夊埆绫诲埆"; + this.gridColumn2.FieldName = "xblb"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 18; + this.gridColumn2.Width = 44; + // + // gridColumn17 + // + this.gridColumn17.Caption = "鍒拌揣璁板綍"; + this.gridColumn17.ColumnEdit = this.rptHistory; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 20; + this.gridColumn17.Width = 124; + // + // rptHistory + // + this.rptHistory.AutoHeight = false; + editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16; + editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptHistory.Name = "rptHistory"; + this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick); + // + // gridColumn18 + // + this.gridColumn18.Caption = "ErpId"; + this.gridColumn18.FieldName = "ebelnK3id"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Width = 94; // // picCheckBox // @@ -1413,11 +1406,31 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // gridColumn19 + // + this.gridColumn19.Caption = "绱Н楠岄��"; + this.gridColumn19.FieldName = "ljyt"; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 9; + this.gridColumn19.Width = 94; + // + // gridColumn20 + // + this.gridColumn20.Caption = "绱Н浠撻��"; + this.gridColumn20.FieldName = "ljct"; + this.gridColumn20.MinWidth = 25; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 10; + this.gridColumn20.Width = 94; + // // Frm_MesInvItemArn // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1233, 682); + this.ClientSize = new System.Drawing.Size(1575, 682); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); @@ -1442,7 +1455,6 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit(); @@ -1452,16 +1464,15 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit(); ((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.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.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); @@ -1469,9 +1480,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1479,6 +1491,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -1500,8 +1513,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser; private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; - private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gv_remark; @@ -1511,9 +1522,7 @@ private DevExpress.XtraLayout.LayoutControl layoutMx1; private DevExpress.XtraLayout.LayoutControlGroup Root; private UserControl.UcLookOrg txt_receiveOrgId; - private DevExpress.XtraEditors.TextEdit txtDepotsCode; private DevExpress.XtraEditors.TextEdit txtSupplierCode; - private UserControl.UcLookCk txt_depotsId; private DevExpress.XtraEditors.SimpleButton btnSelect; private UserControl.UcLookSupplier txt_suppId; private System.Windows.Forms.Label lbGuid; @@ -1522,14 +1531,12 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraEditors.CheckEdit txt_fstatus; private DevExpress.XtraEditors.CheckEdit txt_fType; private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraEditors.TextEdit txt_createDate; private DevExpress.XtraEditors.TextEdit txt_checkUser; private DevExpress.XtraEditors.TextEdit txt_checkDate; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; private DevExpress.XtraGrid.GridControl gcMx1; @@ -1554,7 +1561,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo; private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; @@ -1568,10 +1574,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraEditors.TextEdit txt_paperBillNo; - private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraEditors.TextEdit txt_guid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; @@ -1582,5 +1584,18 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraEditors.TextEdit txt_paperBillNo; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraEditors.CheckEdit txt_isSrm; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; } } \ No newline at end of file -- Gitblit v1.9.3