From 5bf6668fc8a570f64498888b8d923911485180b3 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期一, 11 八月 2025 17:43:56 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 397 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 232 insertions(+), 165 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs index a3a55a6..bda50d5 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs @@ -30,13 +30,18 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -135,11 +140,13 @@ this.gvMx1terminator = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1terminateTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1totalReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1totalStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1remainingStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1totalReturnedQty = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1remainingStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1sourceDocumentType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1planTrackingId = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -148,6 +155,8 @@ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -160,8 +169,8 @@ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -214,6 +223,7 @@ this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); @@ -336,14 +346,12 @@ // // gv_factory // - this.gv_factory.Caption = "ERPID鍙�"; + this.gv_factory.Caption = "ErpId"; this.gv_factory.FieldName = "ebelnK3id"; this.gv_factory.MinWidth = 25; this.gv_factory.Name = "gv_factory"; this.gv_factory.OptionsColumn.AllowEdit = false; this.gv_factory.Tag = "query_a.ebelnK3id"; - this.gv_factory.Visible = true; - this.gv_factory.VisibleIndex = 0; this.gv_factory.Width = 80; // // gv_billNo @@ -356,7 +364,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 1; + this.gv_billNo.VisibleIndex = 0; this.gv_billNo.Width = 120; // // gv_documentStatus @@ -369,7 +377,7 @@ this.gv_documentStatus.OptionsColumn.AllowEdit = false; this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS"; this.gv_documentStatus.Visible = true; - this.gv_documentStatus.VisibleIndex = 2; + this.gv_documentStatus.VisibleIndex = 1; this.gv_documentStatus.Width = 70; // // gv_documentType @@ -382,7 +390,7 @@ this.gv_documentType.OptionsColumn.AllowEdit = false; this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE"; this.gv_documentType.Visible = true; - this.gv_documentType.VisibleIndex = 3; + this.gv_documentType.VisibleIndex = 2; this.gv_documentType.Width = 80; // // gv_businessType @@ -394,8 +402,6 @@ this.gv_businessType.Name = "gv_businessType"; this.gv_businessType.OptionsColumn.AllowEdit = false; this.gv_businessType.Tag = "query_a.BUSINESS_TYPE"; - this.gv_businessType.Visible = true; - this.gv_businessType.VisibleIndex = 4; this.gv_businessType.Width = 80; // // gv_purchaseDate @@ -408,7 +414,7 @@ this.gv_purchaseDate.OptionsColumn.AllowEdit = false; this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE"; this.gv_purchaseDate.Visible = true; - this.gv_purchaseDate.VisibleIndex = 5; + this.gv_purchaseDate.VisibleIndex = 3; this.gv_purchaseDate.Width = 170; // // bandedGridColumn1 @@ -420,7 +426,7 @@ this.bandedGridColumn1.OptionsColumn.AllowEdit = false; this.bandedGridColumn1.Tag = "query_a.suppName"; this.bandedGridColumn1.Visible = true; - this.bandedGridColumn1.VisibleIndex = 6; + this.bandedGridColumn1.VisibleIndex = 4; this.bandedGridColumn1.Width = 134; // // gv_supplier @@ -433,7 +439,7 @@ this.gv_supplier.OptionsColumn.AllowEdit = false; this.gv_supplier.Tag = "query_a.SUPPLIER"; this.gv_supplier.Visible = true; - this.gv_supplier.VisibleIndex = 7; + this.gv_supplier.VisibleIndex = 5; this.gv_supplier.Width = 66; // // gv_closeStatus @@ -446,7 +452,7 @@ this.gv_closeStatus.OptionsColumn.AllowEdit = false; this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS"; this.gv_closeStatus.Visible = true; - this.gv_closeStatus.VisibleIndex = 8; + this.gv_closeStatus.VisibleIndex = 6; this.gv_closeStatus.Width = 80; // // bandedGridColumn2 @@ -458,7 +464,7 @@ this.bandedGridColumn2.OptionsColumn.AllowEdit = false; this.bandedGridColumn2.Tag = "query_a.departmentname"; this.bandedGridColumn2.Visible = true; - this.bandedGridColumn2.VisibleIndex = 9; + this.bandedGridColumn2.VisibleIndex = 7; this.bandedGridColumn2.Width = 80; // // gv_purchaseDept @@ -470,8 +476,6 @@ this.gv_purchaseDept.Name = "gv_purchaseDept"; this.gv_purchaseDept.OptionsColumn.AllowEdit = false; this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT"; - this.gv_purchaseDept.Visible = true; - this.gv_purchaseDept.VisibleIndex = 10; this.gv_purchaseDept.Width = 50; // // gv_purchaser @@ -484,7 +488,7 @@ this.gv_purchaser.OptionsColumn.AllowEdit = false; this.gv_purchaser.Tag = "query_a.PURCHASER"; this.gv_purchaser.Visible = true; - this.gv_purchaser.VisibleIndex = 11; + this.gv_purchaser.VisibleIndex = 8; this.gv_purchaser.Width = 60; // // gv_qualityReq @@ -497,7 +501,7 @@ this.gv_qualityReq.OptionsColumn.AllowEdit = false; this.gv_qualityReq.Tag = "query_a.QUALITY_REQ"; this.gv_qualityReq.Visible = true; - this.gv_qualityReq.VisibleIndex = 12; + this.gv_qualityReq.VisibleIndex = 9; this.gv_qualityReq.Width = 80; // // gv_settlementParty @@ -532,7 +536,7 @@ this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.Tag = "query_a.REMARKS"; this.gv_remarks.Visible = true; - this.gv_remarks.VisibleIndex = 13; + this.gv_remarks.VisibleIndex = 10; this.gv_remarks.Width = 100; // // gv_cancellationStatus @@ -545,7 +549,7 @@ this.gv_cancellationStatus.OptionsColumn.AllowEdit = false; this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS"; this.gv_cancellationStatus.Visible = true; - this.gv_cancellationStatus.VisibleIndex = 14; + this.gv_cancellationStatus.VisibleIndex = 11; this.gv_cancellationStatus.Width = 60; // // gv_cancellationPerson @@ -558,7 +562,7 @@ this.gv_cancellationPerson.OptionsColumn.AllowEdit = false; this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON"; this.gv_cancellationPerson.Visible = true; - this.gv_cancellationPerson.VisibleIndex = 15; + this.gv_cancellationPerson.VisibleIndex = 12; this.gv_cancellationPerson.Width = 60; // // gv_cancellationDate @@ -571,7 +575,7 @@ this.gv_cancellationDate.OptionsColumn.AllowEdit = false; this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE"; this.gv_cancellationDate.Visible = true; - this.gv_cancellationDate.VisibleIndex = 16; + this.gv_cancellationDate.VisibleIndex = 13; this.gv_cancellationDate.Width = 180; // // gv_createBy @@ -584,7 +588,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.CREATE_BY"; this.gv_createBy.Visible = true; - this.gv_createBy.VisibleIndex = 17; + this.gv_createBy.VisibleIndex = 14; this.gv_createBy.Width = 80; // // gv_createDate @@ -597,7 +601,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.CREATE_DATE"; this.gv_createDate.Visible = true; - this.gv_createDate.VisibleIndex = 18; + this.gv_createDate.VisibleIndex = 15; this.gv_createDate.Width = 180; // // gv_lastupdateDate @@ -610,7 +614,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE"; this.gv_lastupdateDate.Visible = true; - this.gv_lastupdateDate.VisibleIndex = 19; + this.gv_lastupdateDate.VisibleIndex = 16; this.gv_lastupdateDate.Width = 200; // // gv_lastupdateBy @@ -623,7 +627,7 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY"; this.gv_lastupdateBy.Visible = true; - this.gv_lastupdateBy.VisibleIndex = 20; + this.gv_lastupdateBy.VisibleIndex = 17; this.gv_lastupdateBy.Width = 100; // // gv_erpCheckBy @@ -636,7 +640,7 @@ this.gv_erpCheckBy.OptionsColumn.AllowEdit = false; this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY"; this.gv_erpCheckBy.Visible = true; - this.gv_erpCheckBy.VisibleIndex = 21; + this.gv_erpCheckBy.VisibleIndex = 18; this.gv_erpCheckBy.Width = 80; // // gv_erpCheckDate @@ -649,7 +653,7 @@ this.gv_erpCheckDate.OptionsColumn.AllowEdit = false; this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE"; this.gv_erpCheckDate.Visible = true; - this.gv_erpCheckDate.VisibleIndex = 22; + this.gv_erpCheckDate.VisibleIndex = 19; this.gv_erpCheckDate.Width = 180; // // gv_changereason @@ -662,7 +666,7 @@ this.gv_changereason.OptionsColumn.AllowEdit = false; this.gv_changereason.Tag = "query_a.CHANGEREASON"; this.gv_changereason.Visible = true; - this.gv_changereason.VisibleIndex = 23; + this.gv_changereason.VisibleIndex = 20; this.gv_changereason.Width = 100; // // gridColumn4 @@ -672,7 +676,7 @@ this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 24; + this.gridColumn4.VisibleIndex = 21; this.gridColumn4.Width = 94; // // gridColumn5 @@ -706,7 +710,7 @@ this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 25; + this.gridColumn11.VisibleIndex = 22; this.gridColumn11.Width = 94; // // pageBar1 @@ -789,7 +793,7 @@ this.txt_billNo.Location = new System.Drawing.Point(109, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(229, 24); + this.txt_billNo.Size = new System.Drawing.Size(234, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; // @@ -803,41 +807,41 @@ // // txt_suppName // - this.txt_suppName.Location = new System.Drawing.Point(769, 12); + this.txt_suppName.Location = new System.Drawing.Point(780, 12); this.txt_suppName.Name = "txt_suppName"; - this.txt_suppName.Size = new System.Drawing.Size(229, 24); + this.txt_suppName.Size = new System.Drawing.Size(235, 24); this.txt_suppName.StyleController = this.layoutMx1; this.txt_suppName.TabIndex = 231; // // txt_documentTypeTxt // - this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12); + this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12); this.txt_documentTypeTxt.Name = "txt_documentTypeTxt"; - this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24); + this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24); this.txt_documentTypeTxt.StyleController = this.layoutMx1; this.txt_documentTypeTxt.TabIndex = 232; // // txt_suppNo // - this.txt_suppNo.Location = new System.Drawing.Point(769, 40); + this.txt_suppNo.Location = new System.Drawing.Point(780, 40); this.txt_suppNo.Name = "txt_suppNo"; - this.txt_suppNo.Size = new System.Drawing.Size(229, 24); + this.txt_suppNo.Size = new System.Drawing.Size(235, 24); this.txt_suppNo.StyleController = this.layoutMx1; this.txt_suppNo.TabIndex = 233; // // txt_closeStatusTxt // - this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40); + this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40); this.txt_closeStatusTxt.Name = "txt_closeStatusTxt"; - this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24); + this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24); this.txt_closeStatusTxt.StyleController = this.layoutMx1; this.txt_closeStatusTxt.TabIndex = 234; // // txt_cancellationStatusTxt // - this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68); + this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68); this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt"; - this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24); + this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24); this.txt_cancellationStatusTxt.StyleController = this.layoutMx1; this.txt_cancellationStatusTxt.TabIndex = 235; // @@ -845,39 +849,39 @@ // this.txt_dptName.Location = new System.Drawing.Point(109, 40); this.txt_dptName.Name = "txt_dptName"; - this.txt_dptName.Size = new System.Drawing.Size(229, 24); + this.txt_dptName.Size = new System.Drawing.Size(234, 24); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 236; // // txt_purchaseDate // - this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40); + this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40); this.txt_purchaseDate.Name = "txt_purchaseDate"; - this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24); + this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24); this.txt_purchaseDate.StyleController = this.layoutMx1; this.txt_purchaseDate.TabIndex = 237; // // txt_docStusTxt // - this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12); + this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12); this.txt_docStusTxt.Name = "txt_docStusTxt"; - this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24); + this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24); this.txt_docStusTxt.StyleController = this.layoutMx1; this.txt_docStusTxt.TabIndex = 238; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(769, 68); + this.txt_createDate.Location = new System.Drawing.Point(780, 68); this.txt_createDate.Name = "txt_createDate"; - this.txt_createDate.Size = new System.Drawing.Size(229, 24); + this.txt_createDate.Size = new System.Drawing.Size(235, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 239; // // txt_erpCheckDate // - this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68); + this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68); this.txt_erpCheckDate.Name = "txt_erpCheckDate"; - this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24); + this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24); this.txt_erpCheckDate.StyleController = this.layoutMx1; this.txt_erpCheckDate.TabIndex = 240; // @@ -885,7 +889,7 @@ // this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68); this.txt_erpCheckBy.Name = "txt_erpCheckBy"; - this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24); + this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24); this.txt_erpCheckBy.StyleController = this.layoutMx1; this.txt_erpCheckBy.TabIndex = 241; // @@ -929,30 +933,30 @@ this.layoutControlItem14}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - 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; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - rowDefinition4.Height = 100D; - rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition5.Height = 100D; - rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition4, - rowDefinition5, - rowDefinition6}); - this.Root.Size = new System.Drawing.Size(1342, 104); + rowDefinition1, + rowDefinition2, + rowDefinition3}); + this.Root.Size = new System.Drawing.Size(1363, 104); this.Root.TextVisible = false; // // layoutControlItem1 @@ -960,38 +964,38 @@ this.layoutControlItem1.Control = this.txt_billNo; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem1.Size = new System.Drawing.Size(335, 28); this.layoutControlItem1.Text = "閲囪喘鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_documentTypeTxt; - this.layoutControlItem5.Location = new System.Drawing.Point(330, 0); + this.layoutControlItem5.Location = new System.Drawing.Point(335, 0); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem5.Size = new System.Drawing.Size(336, 28); this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_suppName; - this.layoutControlItem2.Location = new System.Drawing.Point(660, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(671, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem2.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem2.Size = new System.Drawing.Size(336, 28); this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�"; this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_suppNo; - this.layoutControlItem6.Location = new System.Drawing.Point(660, 28); + this.layoutControlItem6.Location = new System.Drawing.Point(671, 28); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem6.Size = new System.Drawing.Size(336, 28); this.layoutControlItem6.Text = "渚涘簲鍟嗙紪鍙�"; this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18); // @@ -1001,72 +1005,72 @@ this.layoutControlItem9.Location = new System.Drawing.Point(0, 28); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem9.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem9.Size = new System.Drawing.Size(335, 28); this.layoutControlItem9.Text = "閲囪喘閮ㄩ棬"; this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_purchaseDate; - this.layoutControlItem10.Location = new System.Drawing.Point(330, 28); + this.layoutControlItem10.Location = new System.Drawing.Point(335, 28); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem10.Size = new System.Drawing.Size(336, 28); this.layoutControlItem10.Text = "閲囪喘鏃ユ湡"; this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_cancellationStatusTxt; - this.layoutControlItem8.Location = new System.Drawing.Point(990, 56); + this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem8.Size = new System.Drawing.Size(336, 28); this.layoutControlItem8.Text = "浣滃簾鐘舵��"; this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_closeStatusTxt; - this.layoutControlItem7.Location = new System.Drawing.Point(990, 28); + this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem7.Size = new System.Drawing.Size(336, 28); this.layoutControlItem7.Text = "鍏抽棴鐘舵��"; this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_docStusTxt; - this.layoutControlItem11.Location = new System.Drawing.Point(990, 0); + this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem11.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem11.Size = new System.Drawing.Size(336, 28); this.layoutControlItem11.Text = "鍗曟嵁鐘舵��"; this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_createDate; - this.layoutControlItem12.Location = new System.Drawing.Point(660, 56); + this.layoutControlItem12.Location = new System.Drawing.Point(671, 56); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem12.Size = new System.Drawing.Size(336, 28); this.layoutControlItem12.Text = "鍚屾鏃堕棿"; this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_erpCheckDate; - this.layoutControlItem13.Location = new System.Drawing.Point(330, 56); + this.layoutControlItem13.Location = new System.Drawing.Point(335, 56); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem13.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem13.Size = new System.Drawing.Size(336, 28); this.layoutControlItem13.Text = "ERP瀹℃牳鏃堕棿"; this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18); // @@ -1076,7 +1080,7 @@ this.layoutControlItem14.Location = new System.Drawing.Point(0, 56); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem14.Size = new System.Drawing.Size(335, 28); this.layoutControlItem14.Text = "ERP瀹℃牳浜�"; this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18); // @@ -1105,6 +1109,8 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; + this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.rptHistory}); this.gcMx1.Size = new System.Drawing.Size(1361, 426); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1140,11 +1146,13 @@ this.gvMx1terminator, this.gvMx1terminateTime, this.gvMx1totalReceivedQty, - this.gridColumn10, this.gvMx1totalStoredQty, - this.gvMx1remainingStoredQty, this.gvMx1totalReturnedQty, + this.gridColumn10, + this.gvMx1remainingStoredQty, this.gvMx1returnableReceivedQty, + this.gridColumn21, + this.gridColumn20, this.gvMx1returnableStoredQty, this.gvMx1sourceDocumentType, this.gvMx1planTrackingId, @@ -1152,7 +1160,8 @@ this.gvMx1demandDocumentLineId, this.gridColumn6, this.gridColumn8, - this.gridColumn9}); + this.gridColumn9, + this.gridColumn19}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1171,12 +1180,10 @@ // // gv_erpid // - this.gv_erpid.Caption = "ERP涓ID"; + this.gv_erpid.Caption = "Erp琛孖d"; this.gv_erpid.FieldName = "ebelnK3id"; this.gv_erpid.MinWidth = 25; this.gv_erpid.Name = "gv_erpid"; - this.gv_erpid.Visible = true; - this.gv_erpid.VisibleIndex = 1; this.gv_erpid.Width = 46; // // gvMx1itemId @@ -1196,7 +1203,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 2; + this.gridColumn2.VisibleIndex = 1; this.gridColumn2.Width = 46; // // gridColumn1 @@ -1206,7 +1213,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 3; + this.gridColumn1.VisibleIndex = 2; this.gridColumn1.Width = 55; // // gvMx1pricingQty @@ -1238,7 +1245,7 @@ this.gvMx1deliveryDate.Name = "gvMx1deliveryDate"; this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE"; this.gvMx1deliveryDate.Visible = true; - this.gvMx1deliveryDate.VisibleIndex = 18; + this.gvMx1deliveryDate.VisibleIndex = 12; this.gvMx1deliveryDate.Width = 92; // // gvMx1earliestDeliveryDate @@ -1250,7 +1257,7 @@ this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate"; this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE"; this.gvMx1earliestDeliveryDate.Visible = true; - this.gvMx1earliestDeliveryDate.VisibleIndex = 19; + this.gvMx1earliestDeliveryDate.VisibleIndex = 13; this.gvMx1earliestDeliveryDate.Width = 92; // // gvMx1latestDeliveryDate @@ -1262,7 +1269,7 @@ this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate"; this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE"; this.gvMx1latestDeliveryDate.Visible = true; - this.gvMx1latestDeliveryDate.VisibleIndex = 20; + this.gvMx1latestDeliveryDate.VisibleIndex = 14; this.gvMx1latestDeliveryDate.Width = 92; // // gvMx1purchaseQty @@ -1274,7 +1281,7 @@ this.gvMx1purchaseQty.Name = "gvMx1purchaseQty"; this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY"; this.gvMx1purchaseQty.Visible = true; - this.gvMx1purchaseQty.VisibleIndex = 4; + this.gvMx1purchaseQty.VisibleIndex = 3; this.gvMx1purchaseQty.Width = 25; // // gvMx1purchaseUnit @@ -1286,7 +1293,7 @@ this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit"; this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; this.gvMx1purchaseUnit.Visible = true; - this.gvMx1purchaseUnit.VisibleIndex = 12; + this.gvMx1purchaseUnit.VisibleIndex = 6; this.gvMx1purchaseUnit.Width = 25; // // gvMx1inventoryUnit @@ -1318,7 +1325,7 @@ this.gvMx1isGift.Name = "gvMx1isGift"; this.gvMx1isGift.Tag = "query_a.IS_GIFT"; this.gvMx1isGift.Visible = true; - this.gvMx1isGift.VisibleIndex = 13; + this.gvMx1isGift.VisibleIndex = 7; this.gvMx1isGift.Width = 25; // // gvMx1remarks @@ -1330,7 +1337,7 @@ this.gvMx1remarks.Name = "gvMx1remarks"; this.gvMx1remarks.Tag = "query_a.REMARKS"; this.gvMx1remarks.Visible = true; - this.gvMx1remarks.VisibleIndex = 14; + this.gvMx1remarks.VisibleIndex = 8; this.gvMx1remarks.Width = 46; // // gvMx1businessTerminate @@ -1342,7 +1349,7 @@ this.gvMx1businessTerminate.Name = "gvMx1businessTerminate"; this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE"; this.gvMx1businessTerminate.Visible = true; - this.gvMx1businessTerminate.VisibleIndex = 15; + this.gvMx1businessTerminate.VisibleIndex = 9; this.gvMx1businessTerminate.Width = 25; // // gvMx1businessClose @@ -1354,7 +1361,7 @@ this.gvMx1businessClose.Name = "gvMx1businessClose"; this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE"; this.gvMx1businessClose.Visible = true; - this.gvMx1businessClose.VisibleIndex = 16; + this.gvMx1businessClose.VisibleIndex = 10; this.gvMx1businessClose.Width = 25; // // gvMx1businessFreeze @@ -1366,7 +1373,7 @@ this.gvMx1businessFreeze.Name = "gvMx1businessFreeze"; this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE"; this.gvMx1businessFreeze.Visible = true; - this.gvMx1businessFreeze.VisibleIndex = 17; + this.gvMx1businessFreeze.VisibleIndex = 11; this.gvMx1businessFreeze.Width = 25; // // gvMx1freezer @@ -1411,15 +1418,45 @@ // // gvMx1totalReceivedQty // + this.gvMx1totalReceivedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gvMx1totalReceivedQty.AppearanceCell.Options.UseFont = true; - this.gvMx1totalReceivedQty.Caption = "绱鏀舵枡鏁伴噺"; + this.gvMx1totalReceivedQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1totalReceivedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalReceivedQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1totalReceivedQty.Caption = "绱鏀堕噺"; this.gvMx1totalReceivedQty.FieldName = "qty1"; this.gvMx1totalReceivedQty.MinWidth = 25; this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty"; this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY"; - this.gvMx1totalReceivedQty.Visible = true; - this.gvMx1totalReceivedQty.VisibleIndex = 5; this.gvMx1totalReceivedQty.Width = 32; + // + // gvMx1totalStoredQty + // + this.gvMx1totalStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalStoredQty.AppearanceCell.Options.UseFont = true; + this.gvMx1totalStoredQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1totalStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalStoredQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1totalStoredQty.Caption = "绱鍏ュ簱閲�"; + this.gvMx1totalStoredQty.FieldName = "qty2"; + this.gvMx1totalStoredQty.MinWidth = 25; + this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty"; + this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY"; + this.gvMx1totalStoredQty.Width = 28; + // + // gvMx1totalReturnedQty + // + this.gvMx1totalReturnedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true; + this.gvMx1totalReturnedQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1totalReturnedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalReturnedQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1totalReturnedQty.Caption = "绱閫�閲�"; + this.gvMx1totalReturnedQty.FieldName = "qty3"; + this.gvMx1totalReturnedQty.MinWidth = 25; + this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty"; + this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY"; + this.gvMx1totalReturnedQty.Width = 32; // // gridColumn10 // @@ -1427,25 +1464,11 @@ this.gridColumn10.AppearanceCell.Options.UseForeColor = true; this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gridColumn10.AppearanceHeader.Options.UseForeColor = true; - this.gridColumn10.Caption = "鍓╀綑鏀舵枡鏁伴噺"; - this.gridColumn10.FieldName = "qty2"; + this.gridColumn10.Caption = "绱楠岄��"; + this.gridColumn10.FieldName = "qty4"; this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; - this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 6; this.gridColumn10.Width = 37; - // - // gvMx1totalStoredQty - // - this.gvMx1totalStoredQty.AppearanceCell.Options.UseFont = true; - this.gvMx1totalStoredQty.Caption = "绱鍏ュ簱鏁伴噺"; - this.gvMx1totalStoredQty.FieldName = "qty3"; - this.gvMx1totalStoredQty.MinWidth = 25; - this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty"; - this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY"; - this.gvMx1totalStoredQty.Visible = true; - this.gvMx1totalStoredQty.VisibleIndex = 7; - this.gvMx1totalStoredQty.Width = 28; // // gvMx1remainingStoredQty // @@ -1454,49 +1477,67 @@ this.gvMx1remainingStoredQty.AppearanceCell.Options.UseForeColor = true; this.gvMx1remainingStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gvMx1remainingStoredQty.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1remainingStoredQty.Caption = "鍓╀綑鍏ュ簱鏁伴噺"; - this.gvMx1remainingStoredQty.FieldName = "qty4"; + this.gvMx1remainingStoredQty.Caption = "鍓╀綑鏀舵枡"; + this.gvMx1remainingStoredQty.FieldName = "qty5"; this.gvMx1remainingStoredQty.MinWidth = 25; this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty"; this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY"; this.gvMx1remainingStoredQty.Visible = true; - this.gvMx1remainingStoredQty.VisibleIndex = 8; + this.gvMx1remainingStoredQty.VisibleIndex = 4; this.gvMx1remainingStoredQty.Width = 32; - // - // gvMx1totalReturnedQty - // - this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true; - this.gvMx1totalReturnedQty.Caption = "绱閫�鏂欐暟閲�"; - this.gvMx1totalReturnedQty.FieldName = "qty5"; - this.gvMx1totalReturnedQty.MinWidth = 25; - this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty"; - this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY"; - this.gvMx1totalReturnedQty.Visible = true; - this.gvMx1totalReturnedQty.VisibleIndex = 9; - this.gvMx1totalReturnedQty.Width = 32; // // gvMx1returnableReceivedQty // + this.gvMx1returnableReceivedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseFont = true; - this.gvMx1returnableReceivedQty.Caption = "鏀舵枡鍙��鏁伴噺"; + this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1returnableReceivedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1returnableReceivedQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1returnableReceivedQty.Caption = "鍓╀綑鍏ュ簱閲�"; this.gvMx1returnableReceivedQty.FieldName = "qty6"; this.gvMx1returnableReceivedQty.MinWidth = 25; this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty"; this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY"; - this.gvMx1returnableReceivedQty.Visible = true; - this.gvMx1returnableReceivedQty.VisibleIndex = 10; this.gvMx1returnableReceivedQty.Width = 32; + // + // gridColumn21 + // + this.gridColumn21.AppearanceCell.ForeColor = System.Drawing.Color.Red; + this.gridColumn21.AppearanceCell.Options.UseForeColor = true; + this.gridColumn21.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gridColumn21.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn21.Caption = "搴撳瓨鍙��閲�"; + this.gridColumn21.FieldName = "qty8"; + this.gridColumn21.MinWidth = 25; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Width = 94; + // + // gridColumn20 + // + this.gridColumn20.AppearanceCell.ForeColor = System.Drawing.Color.Red; + this.gridColumn20.AppearanceCell.Options.UseForeColor = true; + this.gridColumn20.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gridColumn20.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn20.Caption = "绱瀹炴敹閲�"; + this.gridColumn20.FieldName = "qty9"; + this.gridColumn20.MinWidth = 25; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 5; + this.gridColumn20.Width = 94; // // gvMx1returnableStoredQty // + this.gvMx1returnableStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gvMx1returnableStoredQty.AppearanceCell.Options.UseFont = true; - this.gvMx1returnableStoredQty.Caption = "搴撳瓨鍙��鏁伴噺"; + this.gvMx1returnableStoredQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1returnableStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1returnableStoredQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1returnableStoredQty.Caption = "鏀舵枡鍙��閲�"; this.gvMx1returnableStoredQty.FieldName = "qty7"; this.gvMx1returnableStoredQty.MinWidth = 25; this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty"; this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY"; - this.gvMx1returnableStoredQty.Visible = true; - this.gvMx1returnableStoredQty.VisibleIndex = 11; this.gvMx1returnableStoredQty.Width = 32; // // gvMx1sourceDocumentType @@ -1541,7 +1582,7 @@ // // gridColumn6 // - this.gridColumn6.Caption = "涓婚敭Guid"; + this.gridColumn6.Caption = "鏄庣粏琛ㄤ富閿瓽uid"; this.gridColumn6.FieldName = "guid"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; @@ -1554,7 +1595,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 21; + this.gridColumn8.VisibleIndex = 15; this.gridColumn8.Width = 43; // // gridColumn9 @@ -1564,8 +1605,29 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 22; + this.gridColumn9.VisibleIndex = 16; this.gridColumn9.Width = 94; + // + // gridColumn19 + // + this.gridColumn19.Caption = "鍒拌揣璁板綍"; + this.gridColumn19.ColumnEdit = this.rptHistory; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 17; + this.gridColumn19.Width = 94; + // + // rptHistory + // + this.rptHistory.AutoHeight = false; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16; + editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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); // // tabMxPage2 // @@ -1776,6 +1838,7 @@ this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit(); this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); @@ -1908,5 +1971,9 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; } } \ No newline at end of file -- Gitblit v1.9.3