From 7e412b035c84cf6c8b486c8a8249383d715cbc15 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期一, 19 五月 2025 15:58:04 +0800 Subject: [PATCH] 调整oa返回来的结果 --- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 119 ++++++++++++++++++++++------------------------------------- 1 files changed, 45 insertions(+), 74 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs index a7f3e02..82fb154 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs @@ -92,7 +92,6 @@ this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.txt_fType = new DevExpress.XtraEditors.CheckEdit(); this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit(); - this.txt_insDate = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -104,10 +103,9 @@ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -176,7 +174,7 @@ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -209,7 +207,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); @@ -221,10 +218,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -268,7 +264,7 @@ this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -619,7 +615,6 @@ this.layoutMx1.Controls.Add(this.txt_createDate); this.layoutMx1.Controls.Add(this.txt_fType); this.layoutMx1.Controls.Add(this.txt_urgentFlag); - this.layoutMx1.Controls.Add(this.txt_insDate); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem14}); @@ -668,7 +663,7 @@ // // txt_barcodeProgress // - this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 102); + this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 72); this.txt_barcodeProgress.Name = "txt_barcodeProgress"; this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true; this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24); @@ -747,14 +742,6 @@ this.txt_urgentFlag.StyleController = this.layoutMx1; this.txt_urgentFlag.TabIndex = 470; // - // txt_insDate - // - this.txt_insDate.Location = new System.Drawing.Point(776, 72); - this.txt_insDate.Name = "txt_insDate"; - this.txt_insDate.Size = new System.Drawing.Size(225, 24); - this.txt_insDate.StyleController = this.layoutMx1; - this.txt_insDate.TabIndex = 472; - // // layoutControlItem14 // this.layoutControlItem14.Control = this.lbGuid; @@ -781,10 +768,9 @@ this.layoutControlItem7, this.layoutControlItem8, this.layoutControlItem12, - this.layoutControlItem13, - this.layoutControlItem9, this.layoutControlItem10, - this.layoutControlItem11}); + this.layoutControlItem11, + this.layoutControlItem13}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -910,28 +896,6 @@ this.layoutControlItem12.Text = "澶囨敞"; this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_barcodeProgress; - this.layoutControlItem13.Location = new System.Drawing.Point(662, 90); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(331, 30); - this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_insDate; - this.layoutControlItem9.Location = new System.Drawing.Point(662, 60); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(331, 30); - this.layoutControlItem9.Text = "鍒拌揣鏃ユ湡"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); - // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fType; @@ -954,6 +918,17 @@ this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_barcodeProgress; + this.layoutControlItem13.Location = new System.Drawing.Point(662, 60); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem13.Size = new System.Drawing.Size(331, 30); + this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -1023,7 +998,7 @@ // this.layoutControl1.Controls.Add(this.txt_iCount_1); this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(692, 76); + this.layoutControl1.Location = new System.Drawing.Point(692, 55); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup2; this.layoutControl1.Size = new System.Drawing.Size(336, 28); @@ -1108,7 +1083,7 @@ // ucBtnPrint1 // this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42); + this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 21); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = "rpt_daa"; @@ -1117,7 +1092,7 @@ // // radOut // - this.radOut.Location = new System.Drawing.Point(1033, 10); + this.radOut.Location = new System.Drawing.Point(1033, -11); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; @@ -1131,7 +1106,7 @@ // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44); + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 23); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true; @@ -1143,7 +1118,7 @@ // // txtWlid // - this.txtWlid.Location = new System.Drawing.Point(114, 12); + this.txtWlid.Location = new System.Drawing.Point(114, -9); this.txtWlid.Name = "txtWlid"; this.txtWlid.Properties.Appearance.Options.UseFont = true; this.txtWlid.Properties.ReadOnly = true; @@ -1153,7 +1128,7 @@ // // txtWlmc // - this.txtWlmc.Location = new System.Drawing.Point(114, 44); + this.txtWlmc.Location = new System.Drawing.Point(114, 23); this.txtWlmc.Name = "txtWlmc"; this.txtWlmc.Properties.Appearance.Options.UseFont = true; this.txtWlmc.Properties.ReadOnly = true; @@ -1163,7 +1138,7 @@ // // txtWlgg // - this.txtWlgg.Location = new System.Drawing.Point(114, 76); + this.txtWlgg.Location = new System.Drawing.Point(114, 55); this.txtWlgg.Name = "txtWlgg"; this.txtWlgg.Properties.Appearance.Options.UseFont = true; this.txtWlgg.Properties.ReadOnly = true; @@ -1173,7 +1148,7 @@ // // txt_kQty // - this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Location = new System.Drawing.Point(794, -9); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_kQty.Properties.Appearance.Options.UseFont = true; @@ -1185,7 +1160,7 @@ // // txtQuantity // - this.txtQuantity.Location = new System.Drawing.Point(454, 12); + this.txtQuantity.Location = new System.Drawing.Point(454, -9); this.txtQuantity.Name = "txtQuantity"; this.txtQuantity.Properties.Appearance.Options.UseFont = true; this.txtQuantity.Properties.ReadOnly = true; @@ -1195,7 +1170,7 @@ // // txt_yQty // - this.txt_yQty.Location = new System.Drawing.Point(454, 44); + this.txt_yQty.Location = new System.Drawing.Point(454, 23); this.txt_yQty.Name = "txt_yQty"; this.txt_yQty.Properties.Appearance.Options.UseFont = true; this.txt_yQty.Properties.ReadOnly = true; @@ -1594,8 +1569,8 @@ // // gridColumn12 // - this.gridColumn12.Caption = "鍒ゅ畾缁撴灉"; - this.gridColumn12.FieldName = "pdjg"; + this.gridColumn12.Caption = "澶勭悊鎰忚"; + this.gridColumn12.FieldName = "clyj"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; @@ -1616,7 +1591,7 @@ this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemButtonEdit1}); + this.rptChongDa}); this.gcMx2.Size = new System.Drawing.Size(1342, 386); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1788,24 +1763,24 @@ // // gvBtnAlawys // - this.gvBtnAlawys.Caption = "绉诲嚭"; - this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1; + this.gvBtnAlawys.Caption = "閲嶆墦"; + this.gvBtnAlawys.ColumnEdit = this.rptChongDa; this.gvBtnAlawys.MinWidth = 25; this.gvBtnAlawys.Name = "gvBtnAlawys"; this.gvBtnAlawys.Visible = true; this.gvBtnAlawys.VisibleIndex = 12; this.gvBtnAlawys.Width = 94; // - // repositoryItemButtonEdit1 + // rptChongDa // - this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + this.rptChongDa.AutoHeight = false; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); - this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; - this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; - this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); + this.rptChongDa.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.rptChongDa.Name = "rptChongDa"; + this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // Frm_ArrivalBarcode // @@ -1847,7 +1822,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); @@ -1859,10 +1833,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1906,7 +1879,7 @@ this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit(); this.ResumeLayout(false); } @@ -1956,7 +1929,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; private DevExpress.XtraGrid.GridControl gcMx1; @@ -2004,11 +1976,9 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; - private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraEditors.TextEdit txt_insDate; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; @@ -2036,5 +2006,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; } } \ No newline at end of file -- Gitblit v1.9.3