From ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 09 六月 2025 09:53:37 +0800 Subject: [PATCH] 采购明细报表 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 501 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 293 insertions(+), 208 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs index 7d0197a..60d7f61 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs @@ -29,6 +29,7 @@ /// </summary> 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(); @@ -48,6 +49,11 @@ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -58,7 +64,6 @@ this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -125,22 +130,32 @@ this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1boardStyle = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1subQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn(); 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.gvMx1memo = 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(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + 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); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -197,6 +212,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(); // @@ -204,6 +220,7 @@ // this.toolBarMenu1.chkParameter = "0,0,0,0,000prc_cgdhd_submit"; this.toolBarMenu1.currentAction = null; + this.toolBarMenu1.defaultActions = null; this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; this.toolBarMenu1.guidKey = null; this.toolBarMenu1.isSetBtn = false; @@ -237,6 +254,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -250,14 +268,14 @@ // split1.Panel2 // this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1231, 570); - this.split1.SplitterPosition = 558; + this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; @@ -268,7 +286,6 @@ // // gridView1 // - this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true; this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; @@ -278,7 +295,6 @@ this.gv_fType, this.gv_urgentFlag, this.gv_fstatus, - this.gridColumn2, this.gv_billNo, this.gv_createBy, this.gv_createDate, @@ -313,7 +329,6 @@ // // gv_fType // - this.gv_fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fType.AppearanceCell.Options.UseFont = true; this.gv_fType.AppearanceHeader.Options.UseTextOptions = true; this.gv_fType.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; @@ -329,7 +344,6 @@ // // gv_urgentFlag // - this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_urgentFlag.AppearanceCell.Options.UseFont = true; this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑"; this.gv_urgentFlag.FieldName = "urgentFlag"; @@ -343,7 +357,6 @@ // // gv_fstatus // - this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fstatus.AppearanceCell.Options.UseFont = true; this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑"; this.gv_fstatus.FieldName = "fstatus"; @@ -355,21 +368,8 @@ this.gv_fstatus.VisibleIndex = 3; this.gv_fstatus.Width = 68; // - // gridColumn2 - // - this.gridColumn2.Caption = "鍏ュ簱"; - this.gridColumn2.FieldName = "ckStatus"; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.OptionsColumn.AllowEdit = false; - this.gridColumn2.Tag = "query_a.ckStatus"; - this.gridColumn2.UnboundDataType = typeof(bool); - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 4; - this.gridColumn2.Width = 68; - // // gv_billNo // - this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_billNo.AppearanceCell.Options.UseFont = true; this.gv_billNo.Caption = "鍒拌揣鍗曞彿"; this.gv_billNo.FieldName = "billNo"; @@ -377,12 +377,11 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.bill_no"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 5; + this.gv_billNo.VisibleIndex = 4; this.gv_billNo.Width = 68; // // gv_createBy // - this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "鍒涘缓浜�"; this.gv_createBy.FieldName = "createBy"; @@ -390,12 +389,11 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; - this.gv_createBy.VisibleIndex = 6; + this.gv_createBy.VisibleIndex = 5; this.gv_createBy.Width = 89; // // gv_createDate // - this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_createDate.AppearanceCell.Options.UseFont = true; this.gv_createDate.Caption = "鍒涘缓鏃堕棿"; this.gv_createDate.FieldName = "createDate"; @@ -403,12 +401,11 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.create_date"; this.gv_createDate.Visible = true; - this.gv_createDate.VisibleIndex = 7; + this.gv_createDate.VisibleIndex = 6; this.gv_createDate.Width = 193; // // gv_checkUser // - this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_checkUser.AppearanceCell.Options.UseFont = true; this.gv_checkUser.Caption = "鎻愪氦妫�楠屼汉"; this.gv_checkUser.FieldName = "checkUser"; @@ -416,12 +413,11 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.check_user"; this.gv_checkUser.Visible = true; - this.gv_checkUser.VisibleIndex = 8; + this.gv_checkUser.VisibleIndex = 7; this.gv_checkUser.Width = 100; // // gv_checkDate // - this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_checkDate.AppearanceCell.Options.UseFont = true; this.gv_checkDate.Caption = "鎻愪氦妫�楠屾棩鏈�"; this.gv_checkDate.FieldName = "checkDate"; @@ -429,12 +425,11 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.check_date"; this.gv_checkDate.Visible = true; - this.gv_checkDate.VisibleIndex = 9; + this.gv_checkDate.VisibleIndex = 8; this.gv_checkDate.Width = 64; // // gv_depotsCode // - this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depotsCode.AppearanceCell.Options.UseFont = true; this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栧彿"; this.gv_depotsCode.FieldName = "depotsCode"; @@ -442,7 +437,7 @@ this.gv_depotsCode.OptionsColumn.AllowEdit = false; this.gv_depotsCode.Tag = "query_a.depots_code"; this.gv_depotsCode.Visible = true; - this.gv_depotsCode.VisibleIndex = 10; + this.gv_depotsCode.VisibleIndex = 9; this.gv_depotsCode.Width = 87; // // gridColumn4 @@ -452,12 +447,11 @@ this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 11; + this.gridColumn4.VisibleIndex = 10; this.gridColumn4.Width = 128; // // gv_suppNo // - this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_suppNo.AppearanceCell.Options.UseFont = true; this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙�"; this.gv_suppNo.FieldName = "suppNo"; @@ -465,7 +459,7 @@ this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.supp_no"; this.gv_suppNo.Visible = true; - this.gv_suppNo.VisibleIndex = 12; + this.gv_suppNo.VisibleIndex = 11; this.gv_suppNo.Width = 69; // // gridColumn5 @@ -475,12 +469,11 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.AllowEdit = false; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 13; + this.gridColumn5.VisibleIndex = 12; this.gridColumn5.Width = 70; // // gv_remark // - this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_remark.AppearanceCell.Options.UseFont = true; this.gv_remark.Caption = "澶囨敞"; this.gv_remark.FieldName = "remark"; @@ -488,7 +481,7 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; - this.gv_remark.VisibleIndex = 14; + this.gv_remark.VisibleIndex = 13; this.gv_remark.Width = 90; // // gridColumn11 @@ -534,6 +527,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(1231, 570); this.splitMx1.SplitterPosition = 175; this.splitMx1.TabIndex = 0; @@ -581,63 +575,59 @@ // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; - this.btnSelect.Location = new System.Drawing.Point(12, 140); + this.btnSelect.Location = new System.Drawing.Point(12, 136); 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 = "閫夊緟鍏ヤ粨鐗╂枡 "; + this.btnSelect.Text = "閫夋嫨鐗╂枡 "; // // txtDepotsCode // - this.txtDepotsCode.Location = new System.Drawing.Point(416, 76); + this.txtDepotsCode.Location = new System.Drawing.Point(401, 74); this.txtDepotsCode.Name = "txtDepotsCode"; - this.txtDepotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txtDepotsCode.Properties.Appearance.Options.UseFont = true; this.txtDepotsCode.Properties.Tag = ""; - this.txtDepotsCode.Size = new System.Drawing.Size(197, 28); + 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(416, 108); + this.txt_remark.Location = new System.Drawing.Point(401, 105); this.txt_remark.Name = "txt_remark"; - this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(500, 28); + this.txt_remark.Size = new System.Drawing.Size(515, 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(114, 44); + this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 43); this.txt_receiveOrgId.Name = "txt_receiveOrgId"; - this.txt_receiveOrgId.Size = new System.Drawing.Size(196, 28); + this.txt_receiveOrgId.Size = new System.Drawing.Size(211, 24); this.txt_receiveOrgId.TabIndex = 457; // // txtSupplierCode // - this.txtSupplierCode.Location = new System.Drawing.Point(416, 44); + this.txtSupplierCode.Location = new System.Drawing.Point(401, 43); this.txtSupplierCode.Name = "txtSupplierCode"; - this.txtSupplierCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txtSupplierCode.Properties.Appearance.Options.UseFont = true; this.txtSupplierCode.Properties.Tag = ""; - this.txtSupplierCode.Size = new System.Drawing.Size(197, 28); + this.txtSupplierCode.Size = new System.Drawing.Size(212, 24); this.txtSupplierCode.StyleController = this.layoutMx1; this.txtSupplierCode.TabIndex = 451; this.txtSupplierCode.Tag = "readOnly"; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(114, 12); + this.txt_billNo.Location = new System.Drawing.Point(99, 12); this.txt_billNo.Name = "txt_billNo"; - this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Properties.Tag = ""; - this.txt_billNo.Size = new System.Drawing.Size(196, 28); + this.txt_billNo.Size = new System.Drawing.Size(211, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; this.txt_billNo.Tag = "readOnly"; @@ -645,24 +635,24 @@ // txt_depotsId // this.txt_depotsId.IsReadly = false; - this.txt_depotsId.Location = new System.Drawing.Point(114, 108); + 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(196, 28); + 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(114, 76); + this.txt_suppId.Location = new System.Drawing.Point(99, 74); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; - this.txt_suppId.Size = new System.Drawing.Size(196, 28); + this.txt_suppId.Size = new System.Drawing.Size(211, 24); this.txt_suppId.TabIndex = 440; // // txt_fstatus // - this.txt_fstatus.Location = new System.Drawing.Point(920, 76); + this.txt_fstatus.Location = new System.Drawing.Point(920, 74); this.txt_fstatus.Name = "txt_fstatus"; this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑"; this.txt_fstatus.Size = new System.Drawing.Size(299, 24); @@ -678,48 +668,54 @@ this.txt_fType.Size = new System.Drawing.Size(299, 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(719, 12); + this.txt_createBy.Location = new System.Drawing.Point(704, 12); this.txt_createBy.Name = "txt_createBy"; - this.txt_createBy.Size = new System.Drawing.Size(197, 24); + this.txt_createBy.Properties.Appearance.Options.UseFont = true; + this.txt_createBy.Size = new System.Drawing.Size(212, 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(719, 44); + this.txt_createDate.Location = new System.Drawing.Point(704, 43); this.txt_createDate.Name = "txt_createDate"; - this.txt_createDate.Size = new System.Drawing.Size(197, 24); + this.txt_createDate.Properties.Appearance.Options.UseFont = true; + this.txt_createDate.Size = new System.Drawing.Size(212, 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(1022, 12); + this.txt_checkUser.Location = new System.Drawing.Point(1007, 12); this.txt_checkUser.Name = "txt_checkUser"; - this.txt_checkUser.Size = new System.Drawing.Size(197, 24); + this.txt_checkUser.Properties.Appearance.Options.UseFont = true; + this.txt_checkUser.Size = new System.Drawing.Size(212, 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(1022, 44); + this.txt_checkDate.Location = new System.Drawing.Point(1007, 43); this.txt_checkDate.Name = "txt_checkDate"; - this.txt_checkDate.Size = new System.Drawing.Size(197, 24); + this.txt_checkDate.Properties.Appearance.Options.UseFont = true; + this.txt_checkDate.Size = new System.Drawing.Size(212, 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(719, 76); + this.txt_paperBillNo.Location = new System.Drawing.Point(704, 74); this.txt_paperBillNo.Name = "txt_paperBillNo"; - this.txt_paperBillNo.Size = new System.Drawing.Size(197, 24); + 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; // @@ -806,57 +802,57 @@ rowDefinition3, rowDefinition4, rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1231, 180); + this.Root.Size = new System.Drawing.Size(1231, 175); this.Root.TextVisible = false; // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_receiveOrgId; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem1.Location = new System.Drawing.Point(0, 31); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem1.Size = new System.Drawing.Size(302, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(302, 31); this.layoutControlItem1.Text = "鏀舵枡缁勭粐"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); + 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(302, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(302, 31); this.layoutControlItem2.Text = "鍒拌揣鍗曞彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_suppId; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem3.Location = new System.Drawing.Point(0, 62); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(302, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(302, 31); this.layoutControlItem3.Text = "閫変緵搴斿晢"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_depotsId; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 96); + 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, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(302, 31); this.layoutControlItem4.Text = "閫夋嫨浠撳簱"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.btnSelect; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 128); + 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, 32); + 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); @@ -868,20 +864,20 @@ this.layoutControlItem11.Location = new System.Drawing.Point(605, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(303, 32); - this.layoutControlItem11.Text = "寤虹珛浜�"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem11.Size = new System.Drawing.Size(303, 31); + 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, 32); + this.layoutControlItem12.Location = new System.Drawing.Point(605, 31); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem12.Size = new System.Drawing.Size(303, 32); + this.layoutControlItem12.Size = new System.Drawing.Size(303, 31); this.layoutControlItem12.Text = "寤虹珛鏃ユ湡"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem13 // @@ -889,29 +885,29 @@ this.layoutControlItem13.Location = new System.Drawing.Point(908, 0); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(303, 32); - this.layoutControlItem13.Text = "鎻愪氦妫�楠屼汉"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem13.Size = new System.Drawing.Size(303, 31); + 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, 32); + this.layoutControlItem14.Location = new System.Drawing.Point(908, 31); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(303, 32); - this.layoutControlItem14.Text = "鎻愪氦妫�楠屾棩鏈�"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem14.Size = new System.Drawing.Size(303, 31); + 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, 64); + this.layoutControlItem7.Location = new System.Drawing.Point(908, 62); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(303, 32); + this.layoutControlItem7.Size = new System.Drawing.Size(303, 31); this.layoutControlItem7.Text = "鎻愪氦妫�楠�"; this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem7.TextVisible = false; @@ -922,7 +918,7 @@ this.layoutControlItem8.Location = new System.Drawing.Point(302, 0); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(303, 32); + this.layoutControlItem8.Size = new System.Drawing.Size(303, 31); this.layoutControlItem8.Text = "濮斿鏍囪瘑"; this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem8.TextVisible = false; @@ -930,47 +926,47 @@ // layoutControlItem5 // this.layoutControlItem5.Control = this.txtSupplierCode; - this.layoutControlItem5.Location = new System.Drawing.Point(302, 32); + this.layoutControlItem5.Location = new System.Drawing.Point(302, 31); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(303, 32); + this.layoutControlItem5.Size = new System.Drawing.Size(303, 31); this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txtDepotsCode; - this.layoutControlItem6.Location = new System.Drawing.Point(302, 64); + 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, 32); + this.layoutControlItem6.Size = new System.Drawing.Size(303, 31); this.layoutControlItem6.Text = "浠撳簱缂栫爜"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_remark; - this.layoutControlItem17.Location = new System.Drawing.Point(302, 96); + this.layoutControlItem17.Location = new System.Drawing.Point(302, 93); 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, 32); - this.layoutControlItem17.Text = "澶囨敞淇℃伅"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem17.Size = new System.Drawing.Size(606, 31); + this.layoutControlItem17.Text = "鏀舵枡澶囨敞"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); // // lab_paperBillNo // this.lab_paperBillNo.Control = this.txt_paperBillNo; - this.lab_paperBillNo.Location = new System.Drawing.Point(605, 64); + 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, 32); + this.lab_paperBillNo.Size = new System.Drawing.Size(303, 31); this.lab_paperBillNo.Text = "閫佽揣鍗曞彿"; - this.lab_paperBillNo.TextSize = new System.Drawing.Size(90, 18); + this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18); // // tabMx // @@ -988,7 +984,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1229, 351); - this.tabMxPage1.Text = "鍏ヤ粨鐗╂枡鏄庣粏"; + this.tabMxPage1.Text = "鏀舵枡鏄庣粏"; // // gcMx1 // @@ -998,7 +994,8 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, - this.repositoryItemButtonEdit2}); + this.repositoryItemButtonEdit2, + this.rptHistory}); this.gcMx1.Size = new System.Drawing.Size(1229, 351); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1019,19 +1016,27 @@ this.gvMx1ebeln, this.gridColumn8, this.gvMx1boardStyle, - this.gridColumn6, + this.gvMx1ebelnQty, this.gvMx1subQty, this.gvMx1quantity, - this.gvMx1ebelnQty, + this.gvMx1memo, this.gvMx1okRkqty, this.gvMx1checkDate, this.gridColumn3, this.gridColumn9, this.gridColumn7, - this.gvMx1memo, + this.gridColumn6, this.gridColumn10, + this.gridColumn12, + this.gridColumn13, this.gvBtnAlawys, - this.gvMxDel}); + this.gvMxDel, + this.gridColumn14, + this.gridColumn15, + this.gridColumn16, + this.gridColumn2, + this.gridColumn17, + this.gridColumn18}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1050,9 +1055,8 @@ // // gvMx1guid // - this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); 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"; @@ -1062,10 +1066,9 @@ // // gvMx1ebelnLine // - this.gvMx1ebelnLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); 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; @@ -1083,9 +1086,8 @@ // // gvMx1returnFlag // - this.gvMx1returnFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true; - this.gvMx1returnFlag.Caption = "閫�璐ф爣璇�"; + this.gvMx1returnFlag.Caption = "閫�璐�"; this.gvMx1returnFlag.FieldName = "returnFlag"; this.gvMx1returnFlag.MinWidth = 25; this.gvMx1returnFlag.Name = "gvMx1returnFlag"; @@ -1094,17 +1096,16 @@ this.gvMx1returnFlag.UnboundDataType = typeof(bool); this.gvMx1returnFlag.Visible = true; this.gvMx1returnFlag.VisibleIndex = 0; - this.gvMx1returnFlag.Width = 50; + this.gvMx1returnFlag.Width = 26; // // gvMx1urgentFlag // - this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1urgentFlag.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true; 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"; @@ -1112,11 +1113,10 @@ this.gvMx1urgentFlag.UnboundDataType = typeof(bool); this.gvMx1urgentFlag.Visible = true; this.gvMx1urgentFlag.VisibleIndex = 1; - this.gvMx1urgentFlag.Width = 50; + this.gvMx1urgentFlag.Width = 25; // // gvMx1isdepsIn // - this.gvMx1isdepsIn.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true; this.gvMx1isdepsIn.Caption = "瀹岀粨鏍囪瘑"; this.gvMx1isdepsIn.FieldName = "isdepsIn"; @@ -1125,13 +1125,10 @@ this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true; this.gvMx1isdepsIn.Tag = "query_a.isdeps_in"; this.gvMx1isdepsIn.UnboundDataType = typeof(bool); - this.gvMx1isdepsIn.Visible = true; - this.gvMx1isdepsIn.VisibleIndex = 2; this.gvMx1isdepsIn.Width = 50; // // gvMx1checkStates // - this.gvMx1checkStates.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1checkStates.AppearanceCell.Options.UseFont = true; this.gvMx1checkStates.Caption = "妫�楠岀姸鎬�"; this.gvMx1checkStates.FieldName = "checkStates"; @@ -1140,12 +1137,11 @@ this.gvMx1checkStates.OptionsColumn.ReadOnly = true; this.gvMx1checkStates.Tag = "query_a.check_states"; this.gvMx1checkStates.Visible = true; - this.gvMx1checkStates.VisibleIndex = 3; - this.gvMx1checkStates.Width = 90; + this.gvMx1checkStates.VisibleIndex = 2; + this.gvMx1checkStates.Width = 48; // // gvMx1checkRes // - this.gvMx1checkRes.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1checkRes.AppearanceCell.Options.UseFont = true; this.gvMx1checkRes.Caption = "妫�楠岀粨鏋�"; this.gvMx1checkRes.FieldName = "checkRes"; @@ -1154,21 +1150,20 @@ this.gvMx1checkRes.OptionsColumn.ReadOnly = true; this.gvMx1checkRes.Tag = "query_a.check_res"; this.gvMx1checkRes.Visible = true; - this.gvMx1checkRes.VisibleIndex = 4; - this.gvMx1checkRes.Width = 90; + this.gvMx1checkRes.VisibleIndex = 3; + this.gvMx1checkRes.Width = 48; // // gvMx1ebeln // - this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1ebeln.AppearanceCell.Options.UseFont = true; - this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿"; + this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿"; this.gvMx1ebeln.FieldName = "ebeln"; this.gvMx1ebeln.MinWidth = 120; this.gvMx1ebeln.Name = "gvMx1ebeln"; this.gvMx1ebeln.OptionsColumn.ReadOnly = true; this.gvMx1ebeln.Tag = "query_a.ebeln"; this.gvMx1ebeln.Visible = true; - this.gvMx1ebeln.VisibleIndex = 5; + this.gvMx1ebeln.VisibleIndex = 4; this.gvMx1ebeln.Width = 120; // // gridColumn8 @@ -1178,12 +1173,11 @@ 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 = 37; // // gvMx1boardStyle // - this.gvMx1boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true; this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О"; this.gvMx1boardStyle.FieldName = "itemName"; @@ -1192,82 +1186,83 @@ 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 = 96; // - // gridColumn6 + // gvMx1ebelnQty // - this.gridColumn6.Caption = "鐗╂枡瑙勬牸"; - this.gridColumn6.FieldName = "itemModel"; - this.gridColumn6.MinWidth = 25; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.OptionsColumn.ReadOnly = true; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 8; - this.gridColumn6.Width = 180; + this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true; + this.gvMx1ebelnQty.Caption = "閲囪喘鏁伴噺"; + this.gvMx1ebelnQty.FieldName = "cgsl"; + this.gvMx1ebelnQty.MinWidth = 25; + this.gvMx1ebelnQty.Name = "gvMx1ebelnQty"; + this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true; + this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty"; + this.gvMx1ebelnQty.Visible = true; + this.gvMx1ebelnQty.VisibleIndex = 7; + this.gvMx1ebelnQty.Width = 42; // // gvMx1subQty // - this.gvMx1subQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1subQty.AppearanceCell.Options.UseFont = true; - this.gvMx1subQty.Caption = "鏈搴旀敹鏁伴噺"; - this.gvMx1subQty.FieldName = "subQty"; + 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 = 9; - this.gvMx1subQty.Width = 80; + this.gvMx1subQty.Width = 42; // // gvMx1quantity // - this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue; this.gvMx1quantity.AppearanceCell.Options.UseFont = true; 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 = 10; - this.gvMx1quantity.Width = 80; + this.gvMx1quantity.Width = 42; // - // gvMx1ebelnQty + // gvMx1memo // - this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true; - this.gvMx1ebelnQty.Caption = "閲囪喘璁㈠崟鏁伴噺"; - this.gvMx1ebelnQty.FieldName = "ebelnQty"; - this.gvMx1ebelnQty.MinWidth = 25; - this.gvMx1ebelnQty.Name = "gvMx1ebelnQty"; - this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true; - this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty"; - this.gvMx1ebelnQty.Visible = true; - this.gvMx1ebelnQty.VisibleIndex = 11; - this.gvMx1ebelnQty.Width = 80; + this.gvMx1memo.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gvMx1memo.AppearanceCell.Options.UseFont = true; + this.gvMx1memo.AppearanceCell.Options.UseForeColor = true; + this.gvMx1memo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1memo.Caption = "澶囨敞"; + this.gvMx1memo.FieldName = "memo"; + this.gvMx1memo.MinWidth = 50; + this.gvMx1memo.Name = "gvMx1memo"; + this.gvMx1memo.OptionsColumn.ReadOnly = true; + this.gvMx1memo.Tag = "edit"; + this.gvMx1memo.Visible = true; + this.gvMx1memo.VisibleIndex = 11; + this.gvMx1memo.Width = 96; // // gvMx1okRkqty // - this.gvMx1okRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true; - this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�"; - this.gvMx1okRkqty.FieldName = "okRkqty"; + 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 = 12; - this.gvMx1okRkqty.Width = 80; + this.gvMx1okRkqty.VisibleIndex = 8; + this.gvMx1okRkqty.Width = 42; // // gvMx1checkDate // - this.gvMx1checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1checkDate.AppearanceCell.Options.UseFont = true; this.gvMx1checkDate.Caption = "妫�楠屾棩鏈�"; this.gvMx1checkDate.FieldName = "checkDate"; @@ -1294,8 +1289,8 @@ this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 13; - this.gridColumn9.Width = 50; + this.gridColumn9.VisibleIndex = 12; + this.gridColumn9.Width = 26; // // gridColumn7 // @@ -1305,26 +1300,19 @@ this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.ReadOnly = true; this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 14; - this.gridColumn7.Width = 50; + this.gridColumn7.VisibleIndex = 13; + this.gridColumn7.Width = 26; // - // gvMx1memo + // gridColumn6 // - this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gvMx1memo.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gvMx1memo.AppearanceCell.Options.UseFont = true; - this.gvMx1memo.AppearanceCell.Options.UseForeColor = true; - this.gvMx1memo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1memo.Caption = "澶囨敞"; - this.gvMx1memo.FieldName = "memo"; - this.gvMx1memo.MinWidth = 50; - this.gvMx1memo.Name = "gvMx1memo"; - this.gvMx1memo.OptionsColumn.ReadOnly = true; - this.gvMx1memo.Tag = "edit"; - this.gvMx1memo.Visible = true; - this.gvMx1memo.VisibleIndex = 15; - this.gvMx1memo.Width = 180; + this.gridColumn6.Caption = "鐗╂枡瑙勬牸"; + this.gridColumn6.FieldName = "itemModel"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.OptionsColumn.ReadOnly = true; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 14; + this.gridColumn6.Width = 96; // // gridColumn10 // @@ -1333,8 +1321,28 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 16; - this.gridColumn10.Width = 94; + this.gridColumn10.VisibleIndex = 18; + this.gridColumn10.Width = 25; + // + // gridColumn12 + // + this.gridColumn12.Caption = "閫�鏂欐椂闂�"; + this.gridColumn12.FieldName = "returnDate"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 19; + this.gridColumn12.Width = 25; + // + // gridColumn13 + // + this.gridColumn13.Caption = "閫�鏂欎汉"; + this.gridColumn13.FieldName = "returnBy"; + this.gridColumn13.MinWidth = 25; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 20; + this.gridColumn13.Width = 25; // // gvBtnAlawys // @@ -1343,7 +1351,7 @@ this.gvBtnAlawys.MinWidth = 80; this.gvBtnAlawys.Name = "gvBtnAlawys"; this.gvBtnAlawys.Visible = true; - this.gvBtnAlawys.VisibleIndex = 17; + this.gvBtnAlawys.VisibleIndex = 21; this.gvBtnAlawys.Width = 80; // // repositoryItemButtonEdit2 @@ -1364,7 +1372,7 @@ this.gvMxDel.MinWidth = 80; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 18; + this.gvMxDel.VisibleIndex = 22; this.gvMxDel.Width = 80; // // repositoryItemButtonEdit1 @@ -1377,6 +1385,73 @@ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); + // + // gridColumn14 + // + this.gridColumn14.Caption = "鍒ゅ畾缁撴灉"; + this.gridColumn14.FieldName = "freceQty"; + this.gridColumn14.MinWidth = 25; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Width = 94; + // + // gridColumn15 + // + this.gridColumn15.Caption = "澶勭悊鎰忚"; + this.gridColumn15.FieldName = "clyj"; + this.gridColumn15.MinWidth = 25; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 15; + this.gridColumn15.Width = 50; + // + // gridColumn16 + // + this.gridColumn16.Caption = "鎸戦�夋暟閲�"; + this.gridColumn16.FieldName = "txsl"; + this.gridColumn16.MinWidth = 25; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 16; + this.gridColumn16.Width = 50; + // + // gridColumn2 + // + this.gridColumn2.Caption = "閫夊埆绫诲埆"; + this.gridColumn2.FieldName = "xblb"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 17; + this.gridColumn2.Width = 26; + // + // gridColumn17 + // + this.gridColumn17.Caption = "鍒拌揣璁板綍"; + this.gridColumn17.ColumnEdit = this.rptHistory; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 23; + this.gridColumn17.Width = 26; + // + // rptHistory + // + this.rptHistory.AutoHeight = false; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16; + editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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 // @@ -1455,6 +1530,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); @@ -1471,7 +1547,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_fType; private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag; private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; @@ -1553,5 +1628,15 @@ private DevExpress.XtraEditors.TextEdit txt_guid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.Utils.ToolTipController tips; + 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; } } \ No newline at end of file -- Gitblit v1.9.3