From 4c09363b9dc423003848ae4861414e5357129bfb Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 19 六月 2025 16:44:49 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 659 +-------------------------- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 371 +-------------- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 29 - DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 120 ----- DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs | 77 +- DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs | 88 -- 6 files changed, 139 insertions(+), 1,205 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs index 2ca888c..cf5b2ad 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs @@ -40,16 +40,6 @@ 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 columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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(); @@ -60,11 +50,6 @@ 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(); @@ -115,6 +100,7 @@ this.txt_qt034 = new DevExpress.XtraEditors.TextEdit(); this.txt_qt033 = new DevExpress.XtraEditors.TextEdit(); this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit(); + this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -137,38 +123,9 @@ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); - this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); - this.layout99 = new DevExpress.XtraLayout.LayoutControl(); - this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); - this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); - this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); - this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); - this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); - this.radOut = new DevExpress.XtraEditors.RadioGroup(); - this.txtWlid = new DevExpress.XtraEditors.TextEdit(); - this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); - this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); - this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); - this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); - this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); - this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -213,12 +170,8 @@ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); - this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit(); - this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -252,6 +205,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); @@ -274,44 +228,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit(); - this.split99.Panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit(); - this.split99.Panel2.SuspendLayout(); - this.split99.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit(); - this.layout99.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); - this.layoutControl1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); @@ -322,10 +242,7 @@ this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -924,6 +841,16 @@ this.txt_qt032.TabIndex = 339; this.txt_qt032.Tag = "readonly"; // + // txt_qt035 + // + this.txt_qt035.Location = new System.Drawing.Point(114, 155); + this.txt_qt035.Name = "txt_qt035"; + this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txt_qt035.Size = new System.Drawing.Size(222, 24); + this.txt_qt035.StyleController = this.layoutMx1; + this.txt_qt035.TabIndex = 340; + // // layoutControlItem12 // this.layoutControlItem12.Control = this.lbGuid; @@ -1217,6 +1144,16 @@ this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem21.TextVisible = false; // + // layoutControlItem35 + // + this.layoutControlItem35.Control = this.txt_qt035; + this.layoutControlItem35.Location = new System.Drawing.Point(0, 143); + this.layoutControlItem35.Name = "layoutControlItem35"; + this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem35.Size = new System.Drawing.Size(328, 29); + this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿"; + this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18); + // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1231,404 +1168,10 @@ // // tabMxPage1 // - this.tabMxPage1.Controls.Add(this.split99); + this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1330, 334); this.tabMxPage1.Text = "鐗╂枡鏄庣粏"; - // - // split99 - // - this.split99.Dock = System.Windows.Forms.DockStyle.Fill; - this.split99.Horizontal = false; - this.split99.Location = new System.Drawing.Point(0, 0); - this.split99.Name = "split99"; - // - // split99.Panel1 - // - this.split99.Panel1.Controls.Add(this.layout99); - this.split99.Panel1.Text = "Panel1"; - // - // split99.Panel2 - // - this.split99.Panel2.Controls.Add(this.gcMx1); - this.split99.Panel2.Text = "Panel2"; - this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split99.Size = new System.Drawing.Size(1330, 334); - this.split99.SplitterPosition = 125; - this.split99.TabIndex = 3; - // - // layout99 - // - this.layout99.Controls.Add(this.layoutControl1); - this.layout99.Controls.Add(this.lbMxGuid); - this.layout99.Controls.Add(this.ucBtnPrint1); - this.layout99.Controls.Add(this.radOut); - this.layout99.Controls.Add(this.txtWlid); - this.layout99.Controls.Add(this.txt_psnQty_1); - this.layout99.Controls.Add(this.txtWlmc); - this.layout99.Controls.Add(this.txtWlgg); - this.layout99.Controls.Add(this.txt_kQty); - this.layout99.Controls.Add(this.txtQuantity); - this.layout99.Controls.Add(this.txt_yQty); - this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; - this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem31}); - this.layout99.Location = new System.Drawing.Point(0, 0); - this.layout99.Name = "layout99"; - this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(104, 578, 812, 452); - this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1330, 125); - this.layout99.TabIndex = 0; - this.layout99.Text = "layoutControl1"; - // - // layoutControl1 - // - this.layoutControl1.Controls.Add(this.txt_iCount_1); - this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(682, 68); - this.layoutControl1.Margin = new System.Windows.Forms.Padding(0); - this.layoutControl1.Name = "layoutControl1"; - this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 222, 812, 500); - this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 29); - this.layoutControl1.TabIndex = 476; - this.layoutControl1.Text = "layoutControl1"; - // - // txt_iCount_1 - // - this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); - this.txt_iCount_1.Name = "txt_iCount_1"; - this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; - this.txt_iCount_1.Properties.ReadOnly = true; - this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); - this.txt_iCount_1.StyleController = this.layoutControl1; - this.txt_iCount_1.TabIndex = 228; - // - // txt_yuliang_1 - // - this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); - this.txt_yuliang_1.Name = "txt_yuliang_1"; - this.txt_yuliang_1.Properties.ReadOnly = true; - this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); - this.txt_yuliang_1.StyleController = this.layoutControl1; - this.txt_yuliang_1.TabIndex = 229; - // - // layoutControlGroup2 - // - this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup2.GroupBordersVisible = false; - this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem33, - this.layoutControlItem34}); - this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup2.Name = "Root"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6}); - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7}); - this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 29); - this.layoutControlGroup2.TextVisible = false; - // - // layoutControlItem33 - // - this.layoutControlItem33.Control = this.txt_iCount_1; - this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.Size = new System.Drawing.Size(168, 29); - this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��"; - this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem34 - // - this.layoutControlItem34.Control = this.txt_yuliang_1; - this.layoutControlItem34.Location = new System.Drawing.Point(168, 0); - this.layoutControlItem34.Name = "layoutControlItem34"; - this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem34.Size = new System.Drawing.Size(168, 29); - this.layoutControlItem34.Text = "鎵撳嵃浣欐暟"; - this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18); - // - // lbMxGuid - // - this.lbMxGuid.Location = new System.Drawing.Point(826, 41); - this.lbMxGuid.Name = "lbMxGuid"; - this.lbMxGuid.Size = new System.Drawing.Size(58, 18); - this.lbMxGuid.StyleController = this.layout99; - this.lbMxGuid.TabIndex = 229; - this.lbMxGuid.Text = "lbMxGuid"; - this.lbMxGuid.Visible = false; - // - // ucBtnPrint1 - // - this.ucBtnPrint1.allClickKey = null; - this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1019, 39); - this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); - this.ucBtnPrint1.Name = "ucBtnPrint1"; - this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(334, 29); - this.ucBtnPrint1.TabIndex = 230; - // - // radOut - // - this.radOut.Location = new System.Drawing.Point(1021, 10); - this.radOut.Margin = new System.Windows.Forms.Padding(0); - this.radOut.Name = "radOut"; - this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; - this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); - this.radOut.Size = new System.Drawing.Size(227, 28); - this.radOut.StyleController = this.layout99; - this.radOut.TabIndex = 475; - // - // txtWlid - // - this.txtWlid.Location = new System.Drawing.Point(114, 12); - this.txtWlid.Name = "txtWlid"; - this.txtWlid.Properties.Appearance.Options.UseFont = true; - this.txtWlid.Properties.ReadOnly = true; - this.txtWlid.Size = new System.Drawing.Size(230, 24); - this.txtWlid.StyleController = this.layout99; - this.txtWlid.TabIndex = 214; - // - // txt_psnQty_1 - // - this.txt_psnQty_1.Location = new System.Drawing.Point(786, 41); - this.txt_psnQty_1.Name = "txt_psnQty_1"; - this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24); - this.txt_psnQty_1.StyleController = this.layout99; - this.txt_psnQty_1.TabIndex = 226; - // - // txtWlmc - // - this.txtWlmc.Location = new System.Drawing.Point(114, 41); - this.txtWlmc.Name = "txtWlmc"; - this.txtWlmc.Properties.Appearance.Options.UseFont = true; - this.txtWlmc.Properties.ReadOnly = true; - this.txtWlmc.Size = new System.Drawing.Size(230, 24); - this.txtWlmc.StyleController = this.layout99; - this.txtWlmc.TabIndex = 216; - // - // txtWlgg - // - this.txtWlgg.Location = new System.Drawing.Point(114, 70); - this.txtWlgg.Name = "txtWlgg"; - this.txtWlgg.Properties.Appearance.Options.UseFont = true; - this.txtWlgg.Properties.ReadOnly = true; - this.txtWlgg.Size = new System.Drawing.Size(566, 24); - this.txtWlgg.StyleController = this.layout99; - this.txtWlgg.TabIndex = 218; - // - // txt_kQty - // - this.txt_kQty.Location = new System.Drawing.Point(786, 12); - this.txt_kQty.Name = "txt_kQty"; - this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; - this.txt_kQty.Properties.Appearance.Options.UseFont = true; - this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; - this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(230, 24); - this.txt_kQty.StyleController = this.layout99; - this.txt_kQty.TabIndex = 224; - // - // txtQuantity - // - this.txtQuantity.Location = new System.Drawing.Point(450, 12); - this.txtQuantity.Name = "txtQuantity"; - this.txtQuantity.Properties.Appearance.Options.UseFont = true; - this.txtQuantity.Properties.ReadOnly = true; - this.txtQuantity.Size = new System.Drawing.Size(230, 24); - this.txtQuantity.StyleController = this.layout99; - this.txtQuantity.TabIndex = 220; - // - // txt_yQty - // - this.txt_yQty.Location = new System.Drawing.Point(450, 41); - this.txt_yQty.Name = "txt_yQty"; - this.txt_yQty.Properties.Appearance.Options.UseFont = true; - this.txt_yQty.Properties.ReadOnly = true; - this.txt_yQty.Size = new System.Drawing.Size(230, 24); - this.txt_yQty.StyleController = this.layout99; - this.txt_yQty.TabIndex = 222; - // - // layoutControlItem31 - // - this.layoutControlItem31.Control = this.lbMxGuid; - this.layoutControlItem31.Location = new System.Drawing.Point(930, 70); - this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem31.Size = new System.Drawing.Size(310, 35); - this.layoutControlItem31.Text = "lbMxGuid"; - this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem31.TextVisible = false; - // - // layoutControlGroup1 - // - this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup1.GroupBordersVisible = false; - this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem22, - this.layoutControlItem23, - this.layoutControlItem24, - this.layoutControlItem25, - this.layoutControlItem26, - this.layoutControlItem27, - this.layoutControlItem28, - this.layoutControlItem29, - this.layoutControlItem30, - this.layoutControlItem32}); - this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup1.Name = "Root"; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; - columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition9.Width = 100D; - columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition10.Width = 100D; - this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition7, - columnDefinition8, - columnDefinition9, - columnDefinition10}); - rowDefinition8.Height = 100D; - rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition10.Height = 100D; - rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition8, - rowDefinition9, - rowDefinition10}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1364, 107); - this.layoutControlGroup1.TextVisible = false; - // - // layoutControlItem22 - // - this.layoutControlItem22.Control = this.txtWlid; - this.layoutControlItem22.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem22.Text = "鐗╂枡缂栫爜"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem23 - // - this.layoutControlItem23.Control = this.txtWlmc; - this.layoutControlItem23.Location = new System.Drawing.Point(0, 29); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem23.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem24 - // - this.layoutControlItem24.Control = this.txtWlgg; - this.layoutControlItem24.Location = new System.Drawing.Point(0, 58); - this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(672, 29); - this.layoutControlItem24.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem25 - // - this.layoutControlItem25.Control = this.txtQuantity; - this.layoutControlItem25.Location = new System.Drawing.Point(336, 0); - this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem25.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.txt_yQty; - this.layoutControlItem26.Location = new System.Drawing.Point(336, 29); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem26.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem27 - // - this.layoutControlItem27.Control = this.txt_kQty; - this.layoutControlItem27.Location = new System.Drawing.Point(672, 0); - this.layoutControlItem27.Name = "layoutControlItem27"; - this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem27.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem27.Text = "鍙墦鍗版�绘暟"; - this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem28 - // - this.layoutControlItem28.Control = this.txt_psnQty_1; - this.layoutControlItem28.Location = new System.Drawing.Point(672, 29); - this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem28.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem29 - // - this.layoutControlItem29.Control = this.radOut; - this.layoutControlItem29.Location = new System.Drawing.Point(1008, 0); - this.layoutControlItem29.MaxSize = new System.Drawing.Size(230, 28); - this.layoutControlItem29.MinSize = new System.Drawing.Size(100, 28); - this.layoutControlItem29.Name = "layoutControlItem29"; - this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem29.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); - this.layoutControlItem29.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem29.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem29.Text = "鑷姩璁$畻"; - this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem29.TextVisible = false; - // - // layoutControlItem30 - // - this.layoutControlItem30.Control = this.ucBtnPrint1; - this.layoutControlItem30.Location = new System.Drawing.Point(1008, 29); - this.layoutControlItem30.Name = "layoutControlItem30"; - this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem30.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem30.Text = "鎵撳嵃鎸夐挳"; - this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem30.TextVisible = false; - // - // layoutControlItem32 - // - this.layoutControlItem32.Control = this.layoutControl1; - this.layoutControlItem32.Location = new System.Drawing.Point(672, 58); - this.layoutControlItem32.Name = "layoutControlItem32"; - this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem32.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlItem32.Size = new System.Drawing.Size(336, 29); - this.layoutControlItem32.Text = "鎵撳嵃寮犳暟"; - this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem32.TextVisible = false; // // gcMx1 // @@ -1641,7 +1184,7 @@ this.repositoryItemSearchLookUpEdit1, this.rptBl, this.repositoryItemMemoEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1330, 197); + this.gcMx1.Size = new System.Drawing.Size(1330, 334); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1682,7 +1225,7 @@ this.gvMx1guid.OptionsColumn.AllowEdit = false; this.gvMx1guid.OptionsColumn.ReadOnly = true; this.gvMx1guid.Tag = "query_a.guid"; - this.gvMx1guid.Width = 94; + this.gvMx1guid.Width = 50; // // gvMx1qtrkGuid // @@ -1694,7 +1237,7 @@ this.gvMx1qtrkGuid.OptionsColumn.AllowEdit = false; this.gvMx1qtrkGuid.OptionsColumn.ReadOnly = true; this.gvMx1qtrkGuid.Tag = "query_a.qtrkGuid"; - this.gvMx1qtrkGuid.Width = 94; + this.gvMx1qtrkGuid.Width = 50; // // gridColumn1 // @@ -1709,7 +1252,7 @@ this.gridColumn1.Tag = "edit"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 0; - this.gridColumn1.Width = 100; + this.gridColumn1.Width = 79; // // repositoryItemSearchLookUpEdit1 // @@ -1798,7 +1341,7 @@ this.gvMx1qd002.Tag = "query_a.qd002"; this.gvMx1qd002.Visible = true; this.gvMx1qd002.VisibleIndex = 1; - this.gvMx1qd002.Width = 150; + this.gvMx1qd002.Width = 79; // // gvMx1qd003 // @@ -1812,7 +1355,7 @@ this.gvMx1qd003.Tag = "query_a.qd003"; this.gvMx1qd003.Visible = true; this.gvMx1qd003.VisibleIndex = 2; - this.gvMx1qd003.Width = 150; + this.gvMx1qd003.Width = 79; // // gvMx1qd004 // @@ -1826,7 +1369,7 @@ this.gvMx1qd004.Tag = "query_a.qd004"; this.gvMx1qd004.Visible = true; this.gvMx1qd004.VisibleIndex = 3; - this.gvMx1qd004.Width = 250; + this.gvMx1qd004.Width = 79; // // gvMx1qd007 // @@ -1842,7 +1385,7 @@ this.gvMx1qd007.Tag = "edit"; this.gvMx1qd007.Visible = true; this.gvMx1qd007.VisibleIndex = 4; - this.gvMx1qd007.Width = 94; + this.gvMx1qd007.Width = 79; // // gvMx1qd010 // @@ -1858,7 +1401,7 @@ this.gvMx1qd010.Tag = "edit"; this.gvMx1qd010.Visible = true; this.gvMx1qd010.VisibleIndex = 5; - this.gvMx1qd010.Width = 250; + this.gvMx1qd010.Width = 79; // // gridColumn15 // @@ -1868,7 +1411,7 @@ this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 8; - this.gridColumn15.Width = 94; + this.gridColumn15.Width = 140; // // gridColumn16 // @@ -1878,7 +1421,7 @@ this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 9; - this.gridColumn16.Width = 94; + this.gridColumn16.Width = 140; // // gvMx1qd008 // @@ -1892,7 +1435,7 @@ this.gvMx1qd008.Tag = "query_a.qd008"; this.gvMx1qd008.Visible = true; this.gvMx1qd008.VisibleIndex = 10; - this.gvMx1qd008.Width = 94; + this.gvMx1qd008.Width = 140; // // gvMx1qd009 // @@ -1906,7 +1449,7 @@ this.gvMx1qd009.Tag = "query_a.qd009"; this.gvMx1qd009.Visible = true; this.gvMx1qd009.VisibleIndex = 11; - this.gvMx1qd009.Width = 94; + this.gvMx1qd009.Width = 140; // // gvMxDel // @@ -1916,7 +1459,7 @@ this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 12; - this.gvMxDel.Width = 94; + this.gvMxDel.Width = 166; // // repositoryItemButtonEdit1 // @@ -1937,7 +1480,7 @@ this.gridColumn29.Name = "gridColumn29"; this.gridColumn29.Visible = true; this.gridColumn29.VisibleIndex = 6; - this.gridColumn29.Width = 94; + this.gridColumn29.Width = 50; // // rptBl // @@ -1963,7 +1506,7 @@ this.gridColumn28.Tag = "edit"; this.gridColumn28.Visible = true; this.gridColumn28.VisibleIndex = 7; - this.gridColumn28.Width = 94; + this.gridColumn28.Width = 50; // // repositoryItemMemoEdit1 // @@ -1975,7 +1518,7 @@ this.gridColumn12.FieldName = "itemId"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; - this.gridColumn12.Width = 94; + this.gridColumn12.Width = 50; // // xtraTabPage3 // @@ -1990,8 +1533,6 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; - this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.rptChongDa}); this.gcMx2.Size = new System.Drawing.Size(1330, 334); this.gcMx2.TabIndex = 2; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -2013,8 +1554,7 @@ this.gridColumn17, this.gridColumn18, this.gridColumn19, - this.gridColumn20, - this.gvBtnAlawys}); + this.gridColumn20}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -2159,27 +1699,6 @@ this.gridColumn20.VisibleIndex = 11; this.gridColumn20.Width = 94; // - // gvBtnAlawys - // - 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; - // - // rptChongDa - // - this.rptChongDa.AutoHeight = false; - editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; - editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.rptChongDa.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.rptChongDa.Name = "rptChongDa"; - this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; - this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); - // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; @@ -2190,26 +1709,6 @@ this.picCheckBox.TabIndex = 5; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; - // - // txt_qt035 - // - this.txt_qt035.Location = new System.Drawing.Point(114, 155); - this.txt_qt035.Name = "txt_qt035"; - this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txt_qt035.Size = new System.Drawing.Size(222, 24); - this.txt_qt035.StyleController = this.layoutMx1; - this.txt_qt035.TabIndex = 340; - // - // layoutControlItem35 - // - this.layoutControlItem35.Control = this.txt_qt035; - this.layoutControlItem35.Location = new System.Drawing.Point(0, 143); - this.layoutControlItem35.Name = "layoutControlItem35"; - this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem35.Size = new System.Drawing.Size(328, 29); - this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿"; - this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18); // // Frm_MesItemQtrk // @@ -2254,6 +1753,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); @@ -2276,44 +1776,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit(); - this.split99.Panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit(); - this.split99.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit(); - this.split99.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit(); - this.layout99.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); - this.layoutControl1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); @@ -2324,10 +1790,7 @@ this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); this.ResumeLayout(false); } @@ -2400,16 +1863,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; - private UserControl.UcBtnPrint ucBtnPrint1; - private DevExpress.XtraEditors.LabelControl lbMxGuid; - private DevExpress.XtraEditors.TextEdit txt_iCount_1; - private DevExpress.XtraEditors.TextEdit txt_psnQty_1; - private DevExpress.XtraEditors.TextEdit txt_kQty; - private DevExpress.XtraEditors.TextEdit txt_yQty; - private DevExpress.XtraEditors.TextEdit txtQuantity; - private DevExpress.XtraEditors.TextEdit txtWlgg; - private DevExpress.XtraEditors.TextEdit txtWlmc; - private DevExpress.XtraEditors.TextEdit txtWlid; private DevExpress.XtraTab.XtraTabPage xtraTabPage3; private DevExpress.XtraGrid.GridControl gcMx2; private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; @@ -2422,8 +1875,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy; private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate; - private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; - private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraEditors.TextEdit txt_qt005; private DevExpress.XtraEditors.TextEdit txt_qt001; @@ -2439,7 +1890,6 @@ private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraEditors.RadioGroup radOut; private UserControl.UcDictionaryComBox txt_qt003; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; @@ -2455,25 +1905,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; - private DevExpress.XtraEditors.SplitContainerControl split99; - private DevExpress.XtraLayout.LayoutControl layout99; - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; - private DevExpress.XtraLayout.LayoutControl layoutControl1; - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; - private DevExpress.XtraEditors.TextEdit txt_yuliang_1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index 0aa0e40..e3b570f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -54,7 +54,6 @@ }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛� this.txt_qt022.EditChanged += (s, e) => { @@ -84,50 +83,7 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } }; - gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; - this.ucBtnPrint1.btnPrintClick += (s, e) => - { - ucBtnPrint1.guidKey = ""; - string rowGuid = lbMxGuid.Text.Trim(); - ucBtnPrint1.guidKey = rowGuid; - if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); - txt_iCount_1.Focus(); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); - txt_psnQty_1.Focus(); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - if (lbMxGuid.Text.Trim().Length < 10) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - this.ucBtnPrint1.rptParameter = "rpt_Qtrk{" + lbMxGuid.Text.Trim() - + "," + "" - + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim()) - + "," + txt_iCount_1.Text.Trim() - + "," + txt_psnQty_1.Text.Trim() - + "}"; - }; - - //鑷姩璁$畻鎵撳嵃閲� - txt_psnQty_1.TextChanged += (s, e) => - { - Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); - }; - - radOut.SelectedIndexChanged += (s, e) => - { - Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); - }; + } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) @@ -304,6 +260,8 @@ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); ucLookHuoZhu1.Enabled = true; + //澧炲姞鏃讹紝榛樿缁勭粐 + string deftOrg = UtilityHelper.GetFirstOrg(txt_qt022); } /// <summary> /// 淇濆瓨浜嬩欢 @@ -749,77 +707,6 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) - { - - if (e.FocusedRowHandle >= 0) - { - DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); - lbMxGuid.Text = row["guid"].ToString(); - ucBtnPrint1.guidKey = row["guid"].ToString(); - txtWlid.Text = row["qd002"].ToString(); - txtWlgg.Text = row["qd004"].ToString(); - txtWlmc.Text = row["qd003"].ToString(); - txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺 - txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 - txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 - } - else - { - lbMxGuid.Text = ""; - ucBtnPrint1.guidKey = ""; - txtWlid.Text = ""; - txtWlgg.Text = ""; - txtWlmc.Text = ""; - txtQuantity.Text = ""; - txt_yQty.Text = ""; - txt_kQty.Text = ""; - txt_psnQty_1.Text = ""; - txt_iCount_1.Text = ""; - } - } - /// <summary> - /// 閲嶆墦鏉$爜 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) - { - MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�"); - return; - var rowhandle = gvMx2.FocusedRowHandle; - if (rowhandle < 0) - return; - if (e.Button.Index == 0) - { - var dr = gvMx2.GetDataRow(rowhandle); - var mxGuid = dr["guid"].ToString(); - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) - return; - var _obj = new - { - mxGuid = mxGuid, - inType = "dhtm" - }; - try - { - var strJson = UtilityHelper.HttpPost("", - "VArrivalBarcodeManager/DeleteBarcode", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - } - private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gvMx1.FocusedRowHandle; @@ -841,5 +728,6 @@ }; frm.ShowDialog(); } + } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs index 35f0759..943659e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs @@ -39,12 +39,6 @@ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition7 = 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(); @@ -120,25 +114,9 @@ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); - this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); - this.layout99 = new DevExpress.XtraLayout.LayoutControl(); - this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); - this.txtWlid = new DevExpress.XtraEditors.TextEdit(); - this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); - this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); - this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); - this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); - this.txtYdy = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1tlid = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -179,7 +157,6 @@ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -233,31 +210,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit(); - this.split99.Panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit(); - this.split99.Panel2.SuspendLayout(); - this.split99.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit(); - this.layout99.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); @@ -267,7 +223,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -659,7 +614,7 @@ // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; - this.btnSelect.Location = new System.Drawing.Point(12, 131); + this.btnSelect.Location = new System.Drawing.Point(12, 136); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(96, 27); this.btnSelect.StyleController = this.layoutMx1; @@ -669,7 +624,7 @@ // txt_tbl023 // this.txt_tbl023.IsReadly = false; - this.txt_tbl023.Location = new System.Drawing.Point(84, 38); + this.txt_tbl023.Location = new System.Drawing.Point(84, 43); this.txt_tbl023.Name = "txt_tbl023"; this.txt_tbl023.Size = new System.Drawing.Size(195, 24); this.txt_tbl023.TabIndex = 462; @@ -677,7 +632,7 @@ // txt_tbl005 // this.txt_tbl005.EditValue = "-璇烽�夋嫨-"; - this.txt_tbl005.Location = new System.Drawing.Point(84, 100); + this.txt_tbl005.Location = new System.Drawing.Point(84, 105); this.txt_tbl005.Name = "txt_tbl005"; this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -693,7 +648,7 @@ // // txt_tbl006 // - this.txt_tbl006.Location = new System.Drawing.Point(355, 100); + this.txt_tbl006.Location = new System.Drawing.Point(355, 105); this.txt_tbl006.Name = "txt_tbl006"; this.txt_tbl006.Properties.Appearance.Options.UseFont = true; this.txt_tbl006.Size = new System.Drawing.Size(195, 24); @@ -704,14 +659,14 @@ // this.txt_tbl002.category = null; this.txt_tbl002.IsReadly = false; - this.txt_tbl002.Location = new System.Drawing.Point(84, 69); + this.txt_tbl002.Location = new System.Drawing.Point(84, 74); this.txt_tbl002.Name = "txt_tbl002"; this.txt_tbl002.Size = new System.Drawing.Size(195, 24); this.txt_tbl002.TabIndex = 458; // // txt_workName // - this.txt_workName.Location = new System.Drawing.Point(355, 38); + this.txt_workName.Location = new System.Drawing.Point(355, 43); this.txt_workName.Name = "txt_workName"; this.txt_workName.Properties.Appearance.Options.UseFont = true; this.txt_workName.Size = new System.Drawing.Size(195, 24); @@ -721,7 +676,7 @@ // // txt_tbl012 // - this.txt_tbl012.Location = new System.Drawing.Point(897, 38); + this.txt_tbl012.Location = new System.Drawing.Point(897, 43); this.txt_tbl012.Name = "txt_tbl012"; this.txt_tbl012.Properties.Appearance.Options.UseFont = true; this.txt_tbl012.Size = new System.Drawing.Size(196, 24); @@ -731,7 +686,7 @@ // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(84, 7); + this.txt_billNo.Location = new System.Drawing.Point(84, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Size = new System.Drawing.Size(195, 24); @@ -741,7 +696,7 @@ // // txt_rwd // - this.txt_rwd.Location = new System.Drawing.Point(355, 7); + this.txt_rwd.Location = new System.Drawing.Point(355, 12); this.txt_rwd.Name = "txt_rwd"; this.txt_rwd.Properties.Appearance.Options.UseFont = true; this.txt_rwd.Size = new System.Drawing.Size(195, 24); @@ -751,7 +706,7 @@ // // txt_tbl011 // - this.txt_tbl011.Location = new System.Drawing.Point(897, 7); + this.txt_tbl011.Location = new System.Drawing.Point(897, 12); this.txt_tbl011.Name = "txt_tbl011"; this.txt_tbl011.Properties.Appearance.Options.UseFont = true; this.txt_tbl011.Size = new System.Drawing.Size(196, 24); @@ -761,7 +716,7 @@ // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(355, 69); + this.txt_itemName.Location = new System.Drawing.Point(355, 74); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; this.txt_itemName.Size = new System.Drawing.Size(195, 24); @@ -771,7 +726,7 @@ // // txt_tbl013 // - this.txt_tbl013.Location = new System.Drawing.Point(825, 69); + this.txt_tbl013.Location = new System.Drawing.Point(825, 74); this.txt_tbl013.Name = "txt_tbl013"; this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No; @@ -782,7 +737,7 @@ // // txt_tbl009 // - this.txt_tbl009.Location = new System.Drawing.Point(626, 7); + this.txt_tbl009.Location = new System.Drawing.Point(626, 12); this.txt_tbl009.Name = "txt_tbl009"; this.txt_tbl009.Size = new System.Drawing.Size(195, 24); this.txt_tbl009.StyleController = this.layoutMx1; @@ -791,7 +746,7 @@ // // txt_tbl010 // - this.txt_tbl010.Location = new System.Drawing.Point(626, 38); + this.txt_tbl010.Location = new System.Drawing.Point(626, 43); this.txt_tbl010.Name = "txt_tbl010"; this.txt_tbl010.Size = new System.Drawing.Size(195, 24); this.txt_tbl010.StyleController = this.layoutMx1; @@ -800,7 +755,7 @@ // // txt_tbl020 // - this.txt_tbl020.Location = new System.Drawing.Point(825, 100); + this.txt_tbl020.Location = new System.Drawing.Point(825, 105); this.txt_tbl020.Name = "txt_tbl020"; this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑"; this.txt_tbl020.Size = new System.Drawing.Size(268, 24); @@ -810,7 +765,7 @@ // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(626, 69); + this.txt_itemNo.Location = new System.Drawing.Point(626, 74); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Size = new System.Drawing.Size(195, 24); this.txt_itemNo.StyleController = this.layoutMx1; @@ -828,7 +783,7 @@ // // txt_daa014 // - this.txt_daa014.Location = new System.Drawing.Point(626, 100); + this.txt_daa014.Location = new System.Drawing.Point(626, 105); this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Size = new System.Drawing.Size(195, 24); this.txt_daa014.StyleController = this.layoutMx1; @@ -1087,6 +1042,17 @@ this.layoutControlItem2.Text = "浠诲姟鍗曞彿"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // + // lab_daa014 + // + this.lab_daa014.Control = this.txt_daa014; + this.lab_daa014.Location = new System.Drawing.Point(542, 93); + this.lab_daa014.Name = "lab_daa014"; + this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2; + this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3; + this.lab_daa014.Size = new System.Drawing.Size(271, 31); + this.lab_daa014.Text = "鎶曟枡鍗曞彿"; + this.lab_daa014.TextSize = new System.Drawing.Size(60, 18); + // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1101,231 +1067,10 @@ // // tabMxPage1 // - this.tabMxPage1.Controls.Add(this.split99); + this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1124, 378); this.tabMxPage1.Text = "閫�鏂欐槑缁�"; - // - // split99 - // - this.split99.Dock = System.Windows.Forms.DockStyle.Fill; - this.split99.Horizontal = false; - this.split99.Location = new System.Drawing.Point(0, 0); - this.split99.Name = "split99"; - // - // split99.Panel1 - // - this.split99.Panel1.Controls.Add(this.layout99); - this.split99.Panel1.Text = "Panel1"; - // - // split99.Panel2 - // - this.split99.Panel2.Controls.Add(this.gcMx1); - this.split99.Panel2.Text = "Panel2"; - this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split99.Size = new System.Drawing.Size(1124, 378); - this.split99.SplitterPosition = 73; - this.split99.TabIndex = 2; - // - // layout99 - // - this.layout99.Controls.Add(this.lbMxGuid); - this.layout99.Controls.Add(this.txtWlid); - this.layout99.Controls.Add(this.txtWlmc); - this.layout99.Controls.Add(this.txtWlgg); - this.layout99.Controls.Add(this.txt_kQty); - this.layout99.Controls.Add(this.txtQuantity); - this.layout99.Controls.Add(this.txtYdy); - this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; - this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem26}); - this.layout99.Location = new System.Drawing.Point(0, 0); - this.layout99.Name = "layout99"; - this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(237, 453, 812, 500); - this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1124, 73); - this.layout99.TabIndex = 0; - this.layout99.Text = "layoutControl1"; - // - // lbMxGuid - // - this.lbMxGuid.Location = new System.Drawing.Point(1032, 50); - this.lbMxGuid.Name = "lbMxGuid"; - this.lbMxGuid.Size = new System.Drawing.Size(58, 18); - this.lbMxGuid.StyleController = this.layout99; - this.lbMxGuid.TabIndex = 229; - this.lbMxGuid.Text = "lbMxGuid"; - this.lbMxGuid.Visible = false; - // - // txtWlid - // - this.txtWlid.Location = new System.Drawing.Point(99, 12); - this.txtWlid.Name = "txtWlid"; - this.txtWlid.Properties.Appearance.Options.UseFont = true; - this.txtWlid.Properties.ReadOnly = true; - this.txtWlid.Size = new System.Drawing.Size(179, 24); - this.txtWlid.StyleController = this.layout99; - this.txtWlid.TabIndex = 214; - // - // txtWlmc - // - this.txtWlmc.Location = new System.Drawing.Point(99, 40); - this.txtWlmc.Name = "txtWlmc"; - this.txtWlmc.Properties.Appearance.Options.UseFont = true; - this.txtWlmc.Properties.ReadOnly = true; - this.txtWlmc.Size = new System.Drawing.Size(179, 24); - this.txtWlmc.StyleController = this.layout99; - this.txtWlmc.TabIndex = 216; - // - // txtWlgg - // - this.txtWlgg.Location = new System.Drawing.Point(369, 40); - this.txtWlgg.Name = "txtWlgg"; - this.txtWlgg.Properties.Appearance.Options.UseFont = true; - this.txtWlgg.Properties.ReadOnly = true; - this.txtWlgg.Size = new System.Drawing.Size(180, 24); - this.txtWlgg.StyleController = this.layout99; - this.txtWlgg.TabIndex = 218; - // - // txt_kQty - // - this.txt_kQty.Location = new System.Drawing.Point(640, 12); - this.txt_kQty.Name = "txt_kQty"; - this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; - this.txt_kQty.Properties.Appearance.Options.UseFont = true; - this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; - this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(180, 24); - this.txt_kQty.StyleController = this.layout99; - this.txt_kQty.TabIndex = 224; - // - // txtQuantity - // - this.txtQuantity.Location = new System.Drawing.Point(369, 12); - this.txtQuantity.Name = "txtQuantity"; - this.txtQuantity.Properties.Appearance.Options.UseFont = true; - this.txtQuantity.Properties.ReadOnly = true; - this.txtQuantity.Size = new System.Drawing.Size(180, 24); - this.txtQuantity.StyleController = this.layout99; - this.txtQuantity.TabIndex = 220; - // - // txtYdy - // - this.txtYdy.Location = new System.Drawing.Point(911, 12); - this.txtYdy.Name = "txtYdy"; - this.txtYdy.Properties.Appearance.Options.UseFont = true; - this.txtYdy.Properties.ReadOnly = true; - this.txtYdy.Size = new System.Drawing.Size(180, 24); - this.txtYdy.StyleController = this.layout99; - this.txtYdy.TabIndex = 222; - // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.lbMxGuid; - this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem26.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem26.Text = "lbMxGuid"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem26.TextVisible = false; - // - // layoutControlGroup1 - // - this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup1.GroupBordersVisible = false; - this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem19, - this.layoutControlItem20, - this.layoutControlItem22, - this.layoutControlItem24, - this.layoutControlItem23, - this.layoutControlItem21}); - this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup1.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; - this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition6, - rowDefinition7}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1103, 76); - this.layoutControlGroup1.TextVisible = false; - // - // layoutControlItem19 - // - this.layoutControlItem19.Control = this.txtWlid; - this.layoutControlItem19.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.Size = new System.Drawing.Size(270, 28); - this.layoutControlItem19.Text = "鐗╂枡缂栧彿"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem20 - // - this.layoutControlItem20.Control = this.txtWlmc; - this.layoutControlItem20.Location = new System.Drawing.Point(0, 28); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem20.Size = new System.Drawing.Size(270, 28); - this.layoutControlItem20.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem22 - // - this.layoutControlItem22.Control = this.txtQuantity; - this.layoutControlItem22.Location = new System.Drawing.Point(270, 0); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem22.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem22.Text = "鐢宠鎬婚噺"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem24 - // - this.layoutControlItem24.Control = this.txt_kQty; - this.layoutControlItem24.Location = new System.Drawing.Point(541, 0); - this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem24.Text = "鍙墦鍗版�绘暟"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem23 - // - this.layoutControlItem23.Control = this.txtYdy; - this.layoutControlItem23.Location = new System.Drawing.Point(812, 0); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem23.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem23.Text = "宸叉墦鍗版�婚噺"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem21 - // - this.layoutControlItem21.Control = this.txtWlgg; - this.layoutControlItem21.Location = new System.Drawing.Point(270, 28); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem21.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); // // gcMx1 // @@ -1337,7 +1082,7 @@ this.repositoryItemButtonEdit1, this.rptBl, this.repositoryItemMemoEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 293); + this.gcMx1.Size = new System.Drawing.Size(1124, 378); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1781,17 +1526,6 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // - // lab_daa014 - // - this.lab_daa014.Control = this.txt_daa014; - this.lab_daa014.Location = new System.Drawing.Point(542, 93); - this.lab_daa014.Name = "lab_daa014"; - this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2; - this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3; - this.lab_daa014.Size = new System.Drawing.Size(271, 31); - this.lab_daa014.Text = "鎶曟枡鍗曞彿"; - this.lab_daa014.TextSize = new System.Drawing.Size(60, 18); - // // Frm_MesItemTbl // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1855,31 +1589,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit(); - this.split99.Panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit(); - this.split99.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit(); - this.split99.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit(); - this.layout99.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); @@ -1889,7 +1602,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit(); this.ResumeLayout(false); } @@ -1963,13 +1675,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; - private DevExpress.XtraEditors.LabelControl lbMxGuid; - private DevExpress.XtraEditors.TextEdit txt_kQty; - private DevExpress.XtraEditors.TextEdit txtYdy; - private DevExpress.XtraEditors.TextEdit txtQuantity; - private DevExpress.XtraEditors.TextEdit txtWlgg; - private DevExpress.XtraEditors.TextEdit txtWlmc; - private DevExpress.XtraEditors.TextEdit txtWlid; private DevExpress.XtraTab.XtraTabPage xtraTabPage3; private DevExpress.XtraGrid.GridControl gcMx2; private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; @@ -1993,14 +1698,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.Utils.ToolTipController tips; - private DevExpress.XtraEditors.SplitContainerControl split99; - private DevExpress.XtraLayout.LayoutControl layout99; - private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; @@ -2012,8 +1709,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl; private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1; diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs index 0a19330..a77deb4 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs @@ -107,7 +107,6 @@ }; frm.ShowDialog(); }; - gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; } @@ -675,34 +674,6 @@ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } - - private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) - { - if (e.FocusedRowHandle >= 0 && gvMx1.GetDataRow(e.FocusedRowHandle)["tlid"].ToString().Length > 0) - { - DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); - lbMxGuid.Text = row["tlid"].ToString(); - toolBarMenu1.guidKey = row["tlid"].ToString(); - txtWlid.Text = row["tld002"].ToString(); - txtWlgg.Text = row["tld004"].ToString(); - txtWlmc.Text = row["tld003"].ToString(); - txtQuantity.Text = row["tld005"].ToString();//鐢宠鎬婚噺 - txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 - txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 - } - else - { - lbMxGuid.Text = ""; - toolBarMenu1.guidKey = ""; - txtWlid.Text = ""; - txtWlgg.Text = ""; - txtWlmc.Text = ""; - txtQuantity.Text = ""; - txtYdy.Text = ""; - txt_kQty.Text = ""; - } - } - /// <summary> /// 閫夋嫨涓嶈壇 diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs index e13b21b..ab7b92b 100644 --- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs @@ -202,12 +202,10 @@ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.radOut = new DevExpress.XtraEditors.RadioGroup(); this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); - this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); this.txtYdy = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -231,7 +229,6 @@ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -357,7 +354,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); @@ -2052,17 +2048,14 @@ this.layout99.Controls.Add(this.layoutControl1); this.layout99.Controls.Add(this.radOut); this.layout99.Controls.Add(this.ucBtnPrint1); - this.layout99.Controls.Add(this.lbMxGuid); this.layout99.Controls.Add(this.txt_psnQty_1); this.layout99.Controls.Add(this.txt_kQty); this.layout99.Controls.Add(this.txtQuantity); this.layout99.Controls.Add(this.txtYdy); this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; - this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem26}); this.layout99.Location = new System.Drawing.Point(0, 0); this.layout99.Name = "layout99"; - this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 645, 812, 500); + this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(383, 617, 812, 500); this.layout99.Root = this.layoutControlGroup3; this.layout99.Size = new System.Drawing.Size(1340, 103); this.layout99.TabIndex = 0; @@ -2072,10 +2065,10 @@ // this.layoutControl1.Controls.Add(this.txt_iCount_1); this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(352, 53); + this.layoutControl1.Location = new System.Drawing.Point(352, 45); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 38); + this.layoutControl1.Size = new System.Drawing.Size(336, 29); this.layoutControl1.TabIndex = 475; this.layoutControl1.Text = "layoutControl1"; // @@ -2119,7 +2112,7 @@ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition8}); this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 38); + this.layoutControlGroup2.Size = new System.Drawing.Size(336, 29); this.layoutControlGroup2.TextVisible = false; // // layoutControlItem30 @@ -2127,7 +2120,7 @@ this.layoutControlItem30.Control = this.txt_iCount_1; this.layoutControlItem30.Location = new System.Drawing.Point(0, 0); this.layoutControlItem30.Name = "layoutControlItem30"; - this.layoutControlItem30.Size = new System.Drawing.Size(168, 38); + this.layoutControlItem30.Size = new System.Drawing.Size(168, 29); this.layoutControlItem30.Text = "鎵撳嵃鏁村紶鏁板��"; this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18); // @@ -2137,7 +2130,7 @@ this.layoutControlItem31.Location = new System.Drawing.Point(168, 0); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem31.Size = new System.Drawing.Size(168, 38); + this.layoutControlItem31.Size = new System.Drawing.Size(168, 29); this.layoutControlItem31.Text = "鎵撳嵃浣欐暟"; this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); // @@ -2152,7 +2145,7 @@ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0); - this.radOut.Size = new System.Drawing.Size(340, 41); + this.radOut.Size = new System.Drawing.Size(340, 33); this.radOut.StyleController = this.layout99; this.radOut.TabIndex = 474; // @@ -2160,26 +2153,16 @@ // this.ucBtnPrint1.allClickKey = null; this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 53); + this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 45); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(336, 38); + this.ucBtnPrint1.Size = new System.Drawing.Size(336, 29); this.ucBtnPrint1.TabIndex = 231; - // - // lbMxGuid - // - this.lbMxGuid.Location = new System.Drawing.Point(1032, 50); - this.lbMxGuid.Name = "lbMxGuid"; - this.lbMxGuid.Size = new System.Drawing.Size(58, 18); - this.lbMxGuid.StyleController = this.layout99; - this.lbMxGuid.TabIndex = 229; - this.lbMxGuid.Text = "lbMxGuid"; - this.lbMxGuid.Visible = false; // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(794, 53); + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 45); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); @@ -2218,18 +2201,6 @@ this.txtYdy.StyleController = this.layout99; this.txtYdy.TabIndex = 222; // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.lbMxGuid; - this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem26.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem26.Text = "lbMxGuid"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem26.TextVisible = false; - // // layoutControlGroup3 // this.layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; @@ -2264,7 +2235,7 @@ this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition9, rowDefinition10}); - this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 103); + this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 86); this.layoutControlGroup3.TextVisible = false; // // layoutControlItem29 @@ -2273,29 +2244,29 @@ this.layoutControlItem29.Location = new System.Drawing.Point(680, 0); this.layoutControlItem29.Name = "layoutControlItem24"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem29.Size = new System.Drawing.Size(340, 41); + this.layoutControlItem29.Size = new System.Drawing.Size(340, 33); this.layoutControlItem29.Text = "鍙墦鍗版�绘暟"; this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem32 // this.layoutControlItem32.Control = this.txt_psnQty_1; - this.layoutControlItem32.Location = new System.Drawing.Point(680, 41); + this.layoutControlItem32.Location = new System.Drawing.Point(680, 33); this.layoutControlItem32.Name = "layoutControlItem25"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem32.Size = new System.Drawing.Size(340, 42); + this.layoutControlItem32.Size = new System.Drawing.Size(340, 33); this.layoutControlItem32.Text = "姣忓紶鏉$爜鏁伴噺"; this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem33 // this.layoutControlItem33.Control = this.ucBtnPrint1; - this.layoutControlItem33.Location = new System.Drawing.Point(1020, 41); + this.layoutControlItem33.Location = new System.Drawing.Point(1020, 33); this.layoutControlItem33.Name = "layoutControlItem27"; this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem33.Size = new System.Drawing.Size(340, 42); + this.layoutControlItem33.Size = new System.Drawing.Size(340, 33); this.layoutControlItem33.Text = "鎵撳嵃鎸夐挳"; this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem33.TextVisible = false; @@ -2308,7 +2279,7 @@ this.layoutControlItem34.Name = "layoutControlItem28"; this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlItem34.Size = new System.Drawing.Size(340, 41); + this.layoutControlItem34.Size = new System.Drawing.Size(340, 33); this.layoutControlItem34.Text = "鑷姩璁$畻"; this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem34.TextVisible = false; @@ -2318,7 +2289,7 @@ this.layoutControlItem13.Control = this.txtQuantity; this.layoutControlItem13.Location = new System.Drawing.Point(0, 0); this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.Size = new System.Drawing.Size(340, 41); + this.layoutControlItem13.Size = new System.Drawing.Size(340, 33); this.layoutControlItem13.Text = "鐢宠鎬婚噺"; this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // @@ -2328,18 +2299,18 @@ this.layoutControlItem18.Location = new System.Drawing.Point(340, 0); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem18.Size = new System.Drawing.Size(340, 41); + this.layoutControlItem18.Size = new System.Drawing.Size(340, 33); this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺"; this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.layoutControl1; - this.layoutControlItem24.Location = new System.Drawing.Point(340, 41); + this.layoutControlItem24.Location = new System.Drawing.Point(340, 33); this.layoutControlItem24.Name = "item0"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem24.Size = new System.Drawing.Size(340, 42); + this.layoutControlItem24.Size = new System.Drawing.Size(340, 33); this.layoutControlItem24.Text = "鑷姩璁$畻"; this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem24.TextVisible = false; @@ -2371,8 +2342,7 @@ this.gvMx1lotDate, this.gridColumn13, this.gridColumn16, - this.gridColumn23, - this.gvBtnAlawys}); + this.gridColumn23}); this.gvMx8.GridControl = this.gcMx8; this.gvMx8.Name = "gvMx8"; this.gvMx8.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -2516,16 +2486,6 @@ this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 11; this.gridColumn23.Width = 94; - // - // gvBtnAlawys - // - this.gvBtnAlawys.Caption = "绉诲嚭"; - this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2; - this.gvBtnAlawys.MinWidth = 25; - this.gvBtnAlawys.Name = "gvBtnAlawys"; - this.gvBtnAlawys.Visible = true; - this.gvBtnAlawys.VisibleIndex = 12; - this.gvBtnAlawys.Width = 94; // // repositoryItemComboBox2 // @@ -2689,7 +2649,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); @@ -2852,12 +2811,10 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; private DevExpress.XtraEditors.RadioGroup radOut; private UserControl.UcBtnPrint ucBtnPrint1; - private DevExpress.XtraEditors.LabelControl lbMxGuid; private DevExpress.XtraEditors.TextEdit txt_psnQty_1; private DevExpress.XtraEditors.TextEdit txt_kQty; private DevExpress.XtraEditors.TextEdit txtQuantity; private DevExpress.XtraEditors.TextEdit txtYdy; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; @@ -2883,7 +2840,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; - private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; private UserControl.UcLookCk txt_rkCkId; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs index da41d3c..b41ec7c 100644 --- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs @@ -1,4 +1,5 @@ 锘縰sing Gs.DevApp.DevFrm.QC; +using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -81,6 +82,39 @@ + "," + txt_iCount_1.Text.Trim() + "," + txt_psnQty_1.Text.Trim() + "}"; + }; + this.ucBtnPrint1.btnAllClick += (s, e) => + { + string rowGuid = txt_aboutGuid.Text.Trim(); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "閲囪喘鍏ュ簱"); + string strCodeList = ""; + frm.UpdateParent += (ss, ee) => + { + strCodeList = ee.StringSingle; + }; + frm.ShowDialog(); + if (string.IsNullOrEmpty(strCodeList)) + return; + try + { + string rptParameter = "rpt_SCTL{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); + } + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } }; //鑷姩璁$畻鎵撳嵃閲� txt_psnQty_1.TextChanged += (s, e) => @@ -648,47 +682,6 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - - - - /// <summary> - /// 绉诲嚭鏉$爜 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repDelCard_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) - { - var rowhandle = gvMx2.FocusedRowHandle; - if (rowhandle < 0) - return; - if (e.Button.Index == 0) - { - var dr = gvMx2.GetDataRow(rowhandle); - var mxGuid = dr["guid"].ToString(); - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) - return; - var _obj = new - { - mxGuid = mxGuid, - inType = "dhtm" - }; - try - { - var strJson = UtilityHelper.HttpPost("", - "VArrivalBarcodeManager/DeleteBarcode", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - //if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - } + } } \ No newline at end of file -- Gitblit v1.9.3