From b084bd77d01a94c8f0a2d20c86a1f45ba7c8a23c Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期六, 19 四月 2025 14:08:05 +0800 Subject: [PATCH] 页面跳转 --- DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs | 948 ++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 521 insertions(+), 427 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs index 808c3be..5107af8 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs @@ -41,6 +41,7 @@ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -50,6 +51,8 @@ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -59,7 +62,6 @@ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -72,7 +74,6 @@ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); @@ -100,7 +101,7 @@ this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_lotNo = new DevExpress.XtraEditors.TextEdit(); this.txt_workNo = new DevExpress.XtraEditors.TextEdit(); - this.textEdit5 = new DevExpress.XtraEditors.TextEdit(); + this.txt_checkStates = new DevExpress.XtraEditors.TextEdit(); this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); @@ -110,30 +111,18 @@ this.txt_suppId = new DevExpress.XtraEditors.TextEdit(); this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit(); + this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit(); + this.txt_kbSl = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_itemId11111 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_itemId11111 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -141,7 +130,23 @@ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -165,6 +170,8 @@ this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl(); this.groupControl1 = new DevExpress.XtraEditors.GroupControl(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); @@ -186,6 +193,8 @@ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.ucChouJianList1 = new Gs.DevApp.DevFrm.FQC.UcChouJianList(); + this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage(); this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList(); this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.picCheckBox = new System.Windows.Forms.PictureBox(); @@ -231,7 +240,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); @@ -241,30 +250,18 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); @@ -272,7 +269,23 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); @@ -300,6 +313,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit(); this.tabMxPage2.SuspendLayout(); + this.tabMxPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); @@ -355,6 +369,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -368,18 +383,18 @@ // split1.Panel2 // this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1342, 688); - this.split1.SplitterPosition = 651; + this.split1.SplitterPosition = 106; this.split1.TabIndex = 4; // // gcMain1 // this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F); this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1342, 613); + this.gcMain1.Size = new System.Drawing.Size(1342, 532); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -388,13 +403,14 @@ // this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true; this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_fsubmit, this.gv_releaseNo, + this.gv_fcheckResu, + this.gridColumn5, this.gv_lotNo, this.gridColumn23, this.gv_lifnr, @@ -404,7 +420,6 @@ this.gridColumn14, this.gv_fcovertQty, this.gv_fbatchQty, - this.gv_fcheckResu, this.gv_remarks, this.gv_fcheckBy, this.gv_fcheckDate, @@ -417,7 +432,6 @@ this.gridColumn30, this.gridColumn13, this.gridColumn17, - this.gridColumn6, this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; @@ -428,7 +442,6 @@ // // gv_fsubmit // - this.gv_fsubmit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fsubmit.AppearanceCell.Options.UseFont = true; this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑"; this.gv_fsubmit.FieldName = "modifyFlagTxt"; @@ -443,7 +456,6 @@ // // gv_releaseNo // - this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_releaseNo.AppearanceCell.Options.UseFont = true; this.gv_releaseNo.Caption = "妫�楠屽崟鍙�"; this.gv_releaseNo.FieldName = "releaseNo"; @@ -455,9 +467,31 @@ this.gv_releaseNo.VisibleIndex = 1; this.gv_releaseNo.Width = 100; // + // gv_fcheckResu + // + this.gv_fcheckResu.AppearanceCell.Options.UseFont = true; + this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�"; + this.gv_fcheckResu.FieldName = "fcheckResu"; + this.gv_fcheckResu.MinWidth = 30; + this.gv_fcheckResu.Name = "gv_fcheckResu"; + this.gv_fcheckResu.OptionsColumn.AllowEdit = false; + this.gv_fcheckResu.Tag = "query_a.fcheck_resu"; + this.gv_fcheckResu.Visible = true; + this.gv_fcheckResu.VisibleIndex = 2; + this.gv_fcheckResu.Width = 50; + // + // gridColumn5 + // + this.gridColumn5.Caption = "鍒ゅ畾缁撴灉"; + this.gridColumn5.FieldName = "freceQty"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.Width = 94; + // // gv_lotNo // - this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lotNo.AppearanceCell.Options.UseFont = true; this.gv_lotNo.Caption = "宸ュ崟鍗曞彿"; this.gv_lotNo.FieldName = "lotNo"; @@ -466,7 +500,7 @@ this.gv_lotNo.OptionsColumn.AllowEdit = false; this.gv_lotNo.Tag = "query_a.lot_no"; this.gv_lotNo.Visible = true; - this.gv_lotNo.VisibleIndex = 2; + this.gv_lotNo.VisibleIndex = 4; this.gv_lotNo.Width = 120; // // gridColumn23 @@ -476,12 +510,11 @@ this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 3; + this.gridColumn23.VisibleIndex = 5; this.gridColumn23.Width = 94; // // gv_lifnr // - this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lifnr.AppearanceCell.Options.UseFont = true; this.gv_lifnr.Caption = "瀹㈡埛鍚嶇О"; this.gv_lifnr.FieldName = "cusName"; @@ -490,12 +523,11 @@ this.gv_lifnr.OptionsColumn.AllowEdit = false; this.gv_lifnr.Tag = "query_a.lifnr"; this.gv_lifnr.Visible = true; - this.gv_lifnr.VisibleIndex = 4; + this.gv_lifnr.VisibleIndex = 6; this.gv_lifnr.Width = 200; // // gv_itemId // - this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_itemId.AppearanceCell.Options.UseFont = true; this.gv_itemId.Caption = "鐗╂枡ID"; this.gv_itemId.FieldName = "itemId"; @@ -504,12 +536,11 @@ this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.item_id"; this.gv_itemId.Visible = true; - this.gv_itemId.VisibleIndex = 5; + this.gv_itemId.VisibleIndex = 7; this.gv_itemId.Width = 30; // // gv_itemNo // - this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_itemNo.AppearanceCell.Options.UseFont = true; this.gv_itemNo.Caption = "鐗╂枡缂栫爜"; this.gv_itemNo.FieldName = "itemNo2"; @@ -518,12 +549,11 @@ this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_a.item_no"; this.gv_itemNo.Visible = true; - this.gv_itemNo.VisibleIndex = 6; + this.gv_itemNo.VisibleIndex = 8; this.gv_itemNo.Width = 136; // // gv_boardStyle // - this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_boardStyle.AppearanceCell.Options.UseFont = true; this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О"; this.gv_boardStyle.FieldName = "itemName"; @@ -532,7 +562,7 @@ this.gv_boardStyle.OptionsColumn.AllowEdit = false; this.gv_boardStyle.Tag = "query_a.board_style"; this.gv_boardStyle.Visible = true; - this.gv_boardStyle.VisibleIndex = 7; + this.gv_boardStyle.VisibleIndex = 9; this.gv_boardStyle.Width = 164; // // gridColumn14 @@ -543,12 +573,11 @@ this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.OptionsColumn.ReadOnly = true; this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 8; + this.gridColumn14.VisibleIndex = 10; this.gridColumn14.Width = 200; // // gv_fcovertQty // - this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fcovertQty.AppearanceCell.Options.UseFont = true; this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺"; this.gv_fcovertQty.FieldName = "daaQty"; @@ -558,12 +587,11 @@ this.gv_fcovertQty.OptionsColumn.ReadOnly = true; this.gv_fcovertQty.Tag = "query_a.fcovert_qty"; this.gv_fcovertQty.Visible = true; - this.gv_fcovertQty.VisibleIndex = 9; + this.gv_fcovertQty.VisibleIndex = 11; this.gv_fcovertQty.Width = 60; // // gv_fbatchQty // - this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fbatchQty.AppearanceCell.Options.UseFont = true; this.gv_fbatchQty.Caption = "鎶芥鏁伴噺"; this.gv_fbatchQty.FieldName = "fbatchQty"; @@ -572,26 +600,11 @@ this.gv_fbatchQty.OptionsColumn.AllowEdit = false; this.gv_fbatchQty.Tag = "query_a.fbatch_qty"; this.gv_fbatchQty.Visible = true; - this.gv_fbatchQty.VisibleIndex = 10; + this.gv_fbatchQty.VisibleIndex = 12; this.gv_fbatchQty.Width = 80; - // - // gv_fcheckResu - // - this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_fcheckResu.AppearanceCell.Options.UseFont = true; - this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�"; - this.gv_fcheckResu.FieldName = "fcheckResu"; - this.gv_fcheckResu.MinWidth = 30; - this.gv_fcheckResu.Name = "gv_fcheckResu"; - this.gv_fcheckResu.OptionsColumn.AllowEdit = false; - this.gv_fcheckResu.Tag = "query_a.fcheck_resu"; - this.gv_fcheckResu.Visible = true; - this.gv_fcheckResu.VisibleIndex = 11; - this.gv_fcheckResu.Width = 50; // // gv_remarks // - this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_remarks.AppearanceCell.Options.UseFont = true; this.gv_remarks.Caption = "澶囨敞璇存槑"; this.gv_remarks.FieldName = "remarks"; @@ -600,12 +613,11 @@ this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.Tag = "query_a.remarks"; this.gv_remarks.Visible = true; - this.gv_remarks.VisibleIndex = 12; + this.gv_remarks.VisibleIndex = 13; this.gv_remarks.Width = 100; // // gv_fcheckBy // - this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fcheckBy.AppearanceCell.Options.UseFont = true; this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�"; this.gv_fcheckBy.FieldName = "fcheckBy"; @@ -614,12 +626,11 @@ this.gv_fcheckBy.OptionsColumn.AllowEdit = false; this.gv_fcheckBy.Tag = "query_a.fcheck_by"; this.gv_fcheckBy.Visible = true; - this.gv_fcheckBy.VisibleIndex = 13; + this.gv_fcheckBy.VisibleIndex = 14; this.gv_fcheckBy.Width = 118; // // gv_fcheckDate // - this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fcheckDate.AppearanceCell.Options.UseFont = true; this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�"; this.gv_fcheckDate.FieldName = "fcheckDate"; @@ -628,12 +639,11 @@ this.gv_fcheckDate.OptionsColumn.AllowEdit = false; this.gv_fcheckDate.Tag = "query_a.fcheck_date"; this.gv_fcheckDate.Visible = true; - this.gv_fcheckDate.VisibleIndex = 14; + this.gv_fcheckDate.VisibleIndex = 15; this.gv_fcheckDate.Width = 182; // // gv_createBy // - this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_createBy.AppearanceCell.Options.UseFont = true; this.gv_createBy.Caption = "鍒涘缓浜�"; this.gv_createBy.FieldName = "createBy"; @@ -642,7 +652,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; - this.gv_createBy.VisibleIndex = 15; + this.gv_createBy.VisibleIndex = 16; this.gv_createBy.Width = 67; // // gridColumn15 @@ -652,12 +662,11 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 16; + this.gridColumn15.VisibleIndex = 17; this.gridColumn15.Width = 94; // // gv_lastupdateBy // - this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉"; this.gv_lastupdateBy.FieldName = "lastupdateBy"; @@ -666,12 +675,11 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; this.gv_lastupdateBy.Visible = true; - this.gv_lastupdateBy.VisibleIndex = 17; + this.gv_lastupdateBy.VisibleIndex = 18; this.gv_lastupdateBy.Width = 60; // // gv_lastupdateDate // - this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�"; this.gv_lastupdateDate.FieldName = "lastupdateDate"; @@ -680,7 +688,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; this.gv_lastupdateDate.Visible = true; - this.gv_lastupdateDate.VisibleIndex = 18; + this.gv_lastupdateDate.VisibleIndex = 19; this.gv_lastupdateDate.Width = 120; // // gridColumn18 @@ -690,7 +698,7 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 19; + this.gridColumn18.VisibleIndex = 20; this.gridColumn18.Width = 94; // // gridColumn19 @@ -700,7 +708,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 20; + this.gridColumn19.VisibleIndex = 21; this.gridColumn19.Width = 94; // // gridColumn30 @@ -718,7 +726,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 21; + this.gridColumn13.VisibleIndex = 22; this.gridColumn13.Width = 94; // // gridColumn17 @@ -728,16 +736,6 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Width = 94; - // - // gridColumn6 - // - this.gridColumn6.Caption = "鍒ゅ畾缁撴灉"; - this.gridColumn6.FieldName = "fsecondResu"; - this.gridColumn6.MinWidth = 25; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 22; - this.gridColumn6.Width = 94; // // gridColumn7 // @@ -753,7 +751,7 @@ // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 613); + this.pageBar1.Location = new System.Drawing.Point(0, 532); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; @@ -784,8 +782,9 @@ // this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2); this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1342, 688); - this.splitMx1.SplitterPosition = 282; + this.splitMx1.SplitterPosition = 268; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -812,7 +811,7 @@ this.layoutMx1.Controls.Add(this.txt_djType); this.layoutMx1.Controls.Add(this.txt_lotNo); this.layoutMx1.Controls.Add(this.txt_workNo); - this.layoutMx1.Controls.Add(this.textEdit5); + this.layoutMx1.Controls.Add(this.txt_checkStates); this.layoutMx1.Controls.Add(this.txt_epTag); this.layoutMx1.Controls.Add(this.txt_createBy); this.layoutMx1.Controls.Add(this.txt_createDate); @@ -822,24 +821,27 @@ this.layoutMx1.Controls.Add(this.txt_suppId); this.layoutMx1.Controls.Add(this.txt_fngHandle); this.layoutMx1.Controls.Add(this.txt_freceQty); + this.layoutMx1.Controls.Add(this.txt_zrType); + this.layoutMx1.Controls.Add(this.txt_kbSl); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem17, - this.layoutControlItem21}); + this.layoutControlItem21, + this.txt_itemId11111}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(116, 591, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(116, 530, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1342, 282); + this.layoutMx1.Size = new System.Drawing.Size(1342, 268); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_msg // this.txt_msg.BtnTxt = "杩濊绫诲埆"; - this.txt_msg.Location = new System.Drawing.Point(672, 208); + this.txt_msg.Location = new System.Drawing.Point(672, 180); this.txt_msg.Name = "txt_msg"; - this.txt_msg.Size = new System.Drawing.Size(326, 62); + this.txt_msg.Size = new System.Drawing.Size(326, 52); this.txt_msg.TabIndex = 814; this.txt_msg.TextTxt = ""; this.txt_msg.WhereTxt = null; @@ -847,7 +849,7 @@ // txt_fmrmode // this.txt_fmrmode.IsReadly = false; - this.txt_fmrmode.Location = new System.Drawing.Point(1074, 241); + this.txt_fmrmode.Location = new System.Drawing.Point(1074, 236); this.txt_fmrmode.Margin = new System.Windows.Forms.Padding(0); this.txt_fmrmode.Name = "txt_fmrmode"; this.txt_fmrmode.Size = new System.Drawing.Size(256, 24); @@ -857,7 +859,7 @@ // txt_fzrId // this.txt_fzrId.IsReadly = false; - this.txt_fzrId.Location = new System.Drawing.Point(1074, 175); + this.txt_fzrId.Location = new System.Drawing.Point(1074, 180); this.txt_fzrId.Name = "txt_fzrId"; this.txt_fzrId.Size = new System.Drawing.Size(256, 24); this.txt_fzrId.TabIndex = 812; @@ -873,19 +875,20 @@ // // txt_remarks // - this.txt_remarks.Location = new System.Drawing.Point(84, 241); + this.txt_remarks.Location = new System.Drawing.Point(84, 208); this.txt_remarks.Name = "txt_remarks"; - this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remarks.Properties.Appearance.Options.UseFont = true; - this.txt_remarks.Size = new System.Drawing.Size(584, 28); + this.txt_remarks.Size = new System.Drawing.Size(584, 24); this.txt_remarks.StyleController = this.layoutMx1; this.txt_remarks.TabIndex = 797; this.txt_remarks.Tag = "readonly"; // // txt_fcheckResu // - this.txt_fcheckResu.Location = new System.Drawing.Point(414, 142); + this.txt_fcheckResu.Location = new System.Drawing.Point(414, 152); this.txt_fcheckResu.Name = "txt_fcheckResu"; + this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true; this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24); this.txt_fcheckResu.StyleController = this.layoutMx1; this.txt_fcheckResu.TabIndex = 798; @@ -893,51 +896,47 @@ // // txt_releaseNo // - this.txt_releaseNo.Location = new System.Drawing.Point(84, 44); + this.txt_releaseNo.Location = new System.Drawing.Point(414, 12); this.txt_releaseNo.Name = "txt_releaseNo"; - this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; - this.txt_releaseNo.Size = new System.Drawing.Size(254, 28); + this.txt_releaseNo.Size = new System.Drawing.Size(254, 24); this.txt_releaseNo.StyleController = this.layoutMx1; this.txt_releaseNo.TabIndex = 213; this.txt_releaseNo.Tag = "readonly"; // // txt_fcheckDate // - this.txt_fcheckDate.Location = new System.Drawing.Point(414, 44); + this.txt_fcheckDate.Location = new System.Drawing.Point(414, 68); this.txt_fcheckDate.Name = "txt_fcheckDate"; - this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true; - this.txt_fcheckDate.Size = new System.Drawing.Size(254, 28); + this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24); this.txt_fcheckDate.StyleController = this.layoutMx1; this.txt_fcheckDate.TabIndex = 216; this.txt_fcheckDate.Tag = "readonly"; // // txt_lotNo1 // - this.txt_lotNo1.Location = new System.Drawing.Point(744, 76); + this.txt_lotNo1.Location = new System.Drawing.Point(744, 68); this.txt_lotNo1.Name = "txt_lotNo1"; - this.txt_lotNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lotNo1.Properties.Appearance.Options.UseFont = true; - this.txt_lotNo1.Size = new System.Drawing.Size(254, 28); + this.txt_lotNo1.Size = new System.Drawing.Size(254, 24); this.txt_lotNo1.StyleController = this.layoutMx1; this.txt_lotNo1.TabIndex = 262; this.txt_lotNo1.Tag = "readonly"; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(84, 142); + this.txt_itemNo.Location = new System.Drawing.Point(84, 124); this.txt_itemNo.Name = "txt_itemNo"; - this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemNo.Size = new System.Drawing.Size(254, 28); + this.txt_itemNo.Size = new System.Drawing.Size(254, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 789; this.txt_itemNo.Tag = "readonly"; // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(84, 208); + this.txt_itemModel.Location = new System.Drawing.Point(84, 180); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Size = new System.Drawing.Size(254, 24); this.txt_itemModel.StyleController = this.layoutMx1; @@ -946,29 +945,27 @@ // // txt_fcheckBy // - this.txt_fcheckBy.Location = new System.Drawing.Point(414, 76); + this.txt_fcheckBy.Location = new System.Drawing.Point(414, 96); this.txt_fcheckBy.Name = "txt_fcheckBy"; - this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true; - this.txt_fcheckBy.Size = new System.Drawing.Size(254, 28); + this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24); this.txt_fcheckBy.StyleController = this.layoutMx1; this.txt_fcheckBy.TabIndex = 217; this.txt_fcheckBy.Tag = "readonly"; // // txt_fbatchQty // - this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12); + this.txt_fbatchQty.Location = new System.Drawing.Point(414, 40); this.txt_fbatchQty.Name = "txt_fbatchQty"; - this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; - this.txt_fbatchQty.Size = new System.Drawing.Size(254, 28); + this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24); this.txt_fbatchQty.StyleController = this.layoutMx1; this.txt_fbatchQty.TabIndex = 222; this.txt_fbatchQty.Tag = "readonly"; // // txt_fsubmitBy // - this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 44); + this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 40); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitBy.StyleController = this.layoutMx1; @@ -986,7 +983,7 @@ // // txt_fsubmit // - this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76); + this.txt_fsubmit.Location = new System.Drawing.Point(1002, 68); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑"; this.txt_fsubmit.Size = new System.Drawing.Size(328, 24); @@ -996,7 +993,7 @@ // // txt_fmanageNo // - this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208); + this.txt_fmanageNo.Location = new System.Drawing.Point(414, 180); this.txt_fmanageNo.Name = "txt_fmanageNo"; this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24); this.txt_fmanageNo.StyleController = this.layoutMx1; @@ -1039,7 +1036,7 @@ // // txt_lotNo // - this.txt_lotNo.Location = new System.Drawing.Point(414, 175); + this.txt_lotNo.Location = new System.Drawing.Point(84, 40); this.txt_lotNo.Name = "txt_lotNo"; this.txt_lotNo.Size = new System.Drawing.Size(254, 24); this.txt_lotNo.StyleController = this.layoutMx1; @@ -1054,18 +1051,20 @@ this.txt_workNo.StyleController = this.layoutMx1; this.txt_workNo.TabIndex = 816; // - // textEdit5 + // txt_checkStates // - this.textEdit5.Location = new System.Drawing.Point(414, 109); - this.textEdit5.Name = "textEdit5"; - this.textEdit5.Size = new System.Drawing.Size(254, 24); - this.textEdit5.StyleController = this.layoutMx1; - this.textEdit5.TabIndex = 819; - this.textEdit5.Tag = "readonly"; + this.txt_checkStates.Location = new System.Drawing.Point(414, 124); + this.txt_checkStates.Name = "txt_checkStates"; + this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true; + this.txt_checkStates.Size = new System.Drawing.Size(254, 24); + this.txt_checkStates.StyleController = this.layoutMx1; + this.txt_checkStates.TabIndex = 819; + this.txt_checkStates.Tag = "readonly"; // // txt_epTag // - this.txt_epTag.Location = new System.Drawing.Point(744, 109); + this.txt_epTag.Location = new System.Drawing.Point(744, 96); this.txt_epTag.Name = "txt_epTag"; this.txt_epTag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -1076,7 +1075,7 @@ // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(744, 175); + this.txt_createBy.Location = new System.Drawing.Point(744, 152); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Size = new System.Drawing.Size(254, 24); this.txt_createBy.StyleController = this.layoutMx1; @@ -1085,7 +1084,7 @@ // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(744, 142); + this.txt_createDate.Location = new System.Drawing.Point(744, 124); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Size = new System.Drawing.Size(254, 24); this.txt_createDate.StyleController = this.layoutMx1; @@ -1094,7 +1093,7 @@ // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(84, 175); + this.txt_itemName.Location = new System.Drawing.Point(84, 152); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Size = new System.Drawing.Size(254, 24); this.txt_itemName.StyleController = this.layoutMx1; @@ -1103,7 +1102,7 @@ // // txt_lineId // - this.txt_lineId.Location = new System.Drawing.Point(84, 76); + this.txt_lineId.Location = new System.Drawing.Point(84, 96); this.txt_lineId.Name = "txt_lineId"; this.txt_lineId.Size = new System.Drawing.Size(254, 24); this.txt_lineId.StyleController = this.layoutMx1; @@ -1112,7 +1111,7 @@ // // txt_itemId // - this.txt_itemId.Location = new System.Drawing.Point(84, 109); + this.txt_itemId.Location = new System.Drawing.Point(84, 128); this.txt_itemId.Name = "txt_itemId"; this.txt_itemId.Size = new System.Drawing.Size(254, 24); this.txt_itemId.StyleController = this.layoutMx1; @@ -1121,7 +1120,7 @@ // // txt_suppId // - this.txt_suppId.Location = new System.Drawing.Point(744, 44); + this.txt_suppId.Location = new System.Drawing.Point(744, 40); this.txt_suppId.Name = "txt_suppId"; this.txt_suppId.Size = new System.Drawing.Size(254, 24); this.txt_suppId.StyleController = this.layoutMx1; @@ -1131,15 +1130,15 @@ // txt_fngHandle // this.txt_fngHandle.EditValue = "-璇烽�夋嫨-"; - this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142); + this.txt_fngHandle.Location = new System.Drawing.Point(1074, 124); this.txt_fngHandle.Name = "txt_fngHandle"; this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_fngHandle.Properties.Items.AddRange(new object[] { "-璇烽�夋嫨-", - "杩斿伐", - "鐗归噰", - "鎸戦�変娇鐢�"}); + "1:杩斿伐", + "2:鐗归噰", + "3:鎸戦�変娇鐢�"}); this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_fngHandle.Size = new System.Drawing.Size(256, 24); this.txt_fngHandle.StyleController = this.layoutMx1; @@ -1148,18 +1147,44 @@ // txt_freceQty // this.txt_freceQty.EditValue = "-璇烽�夋嫨-"; - this.txt_freceQty.Location = new System.Drawing.Point(1074, 109); + this.txt_freceQty.Location = new System.Drawing.Point(1074, 96); this.txt_freceQty.Name = "txt_freceQty"; + this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true; this.txt_freceQty.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_freceQty.Properties.Items.AddRange(new object[] { "-璇烽�夋嫨-", - "1:鍚堟牸", - "2:涓嶅悎鏍�"}); + "Y:鍚堟牸", + "N:涓嶅悎鏍�"}); this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_freceQty.Size = new System.Drawing.Size(256, 24); this.txt_freceQty.StyleController = this.layoutMx1; this.txt_freceQty.TabIndex = 830; + // + // txt_zrType + // + this.txt_zrType.EditValue = "-璇烽�夋嫨-"; + this.txt_zrType.Location = new System.Drawing.Point(1074, 152); + this.txt_zrType.Name = "txt_zrType"; + this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.txt_zrType.Properties.Items.AddRange(new object[] { + "-璇烽�夋嫨-", + "1:鐢熶骇璐d换", + "2:闈炵敓浜ц矗浠�"}); + this.txt_zrType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + this.txt_zrType.Size = new System.Drawing.Size(256, 24); + this.txt_zrType.StyleController = this.layoutMx1; + this.txt_zrType.TabIndex = 829; + // + // txt_kbSl + // + this.txt_kbSl.Location = new System.Drawing.Point(84, 68); + this.txt_kbSl.Name = "txt_kbSl"; + this.txt_kbSl.Size = new System.Drawing.Size(254, 24); + this.txt_kbSl.StyleController = this.layoutMx1; + this.txt_kbSl.TabIndex = 831; // // layoutControlItem17 // @@ -1184,32 +1209,27 @@ this.layoutControlItem21.Text = "涓婚敭GUID"; this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20); // + // txt_itemId11111 + // + this.txt_itemId11111.Control = this.txt_itemId; + this.txt_itemId11111.Location = new System.Drawing.Point(0, 116); + this.txt_itemId11111.Name = "txt_itemId11111"; + this.txt_itemId11111.OptionsTableLayoutItem.RowIndex = 4; + this.txt_itemId11111.Size = new System.Drawing.Size(330, 29); + this.txt_itemId11111.Text = "鐗╂枡ID"; + this.txt_itemId11111.TextSize = new System.Drawing.Size(60, 18); + // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem1, - this.layoutControlItem23, - this.layoutControlItem8, - this.layoutControlItem2, - this.layoutControlItem9, this.layoutControlItem3, this.layoutControlItem22, this.txt_epTagtxt, - this.layoutControlItem10, - this.layoutControlItem32, - this.layoutControlItem29, - this.layoutControlItem5, - this.layoutControlItem6, - this.layoutControlItem34, - this.layoutControlItem7, - this.txt_itemId11111, this.layoutControlItem18, - this.layoutControlItem28, this.layoutControlItem4, this.layoutControlItem27, - this.layoutControlItem26, this.layoutControlItem33, this.layoutControlItem31, this.layoutControlItem16, @@ -1217,7 +1237,23 @@ this.layoutControlItem14, this.layoutControlItem13, this.layoutControlItem11, + this.layoutControlItem23, + this.layoutControlItem26, + this.layoutControlItem29, this.layoutControlItem25, + this.layoutControlItem35, + this.layoutControlItem7, + this.layoutControlItem28, + this.layoutControlItem10, + this.layoutControlItem32, + this.layoutControlItem8, + this.layoutControlItem2, + this.layoutControlItem9, + this.layoutControlItem1, + this.layoutControlItem19, + this.layoutControlItem5, + this.layoutControlItem34, + this.layoutControlItem6, this.layoutControlItem12}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; @@ -1250,6 +1286,8 @@ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition9.Height = 28D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, @@ -1258,69 +1296,19 @@ rowDefinition5, rowDefinition6, rowDefinition7, - rowDefinition8}); - this.Root.Size = new System.Drawing.Size(1342, 282); + rowDefinition8, + rowDefinition9}); + this.Root.Size = new System.Drawing.Size(1342, 272); this.Root.TextVisible = false; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.txt_releaseNo; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 32); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem1.Size = new System.Drawing.Size(330, 32); - this.layoutControlItem1.Text = "妫�楠屽崟鍙�"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem23 - // - this.layoutControlItem23.Control = this.txt_djType; - this.layoutControlItem23.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.Size = new System.Drawing.Size(330, 32); - this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txt_fcheckBy; - this.layoutControlItem8.Location = new System.Drawing.Point(330, 64); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem8.Text = "妫�楠屼汉鍛�"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_fcheckDate; - this.layoutControlItem2.Location = new System.Drawing.Point(330, 32); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(330, 32); - this.layoutControlItem2.Text = "妫�楠屾棩鏈�"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_fbatchQty; - this.layoutControlItem9.Location = new System.Drawing.Point(330, 0); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem9.Size = new System.Drawing.Size(330, 32); - this.layoutControlItem9.Text = "鎶芥鏁伴噺"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_lotNo1; - this.layoutControlItem3.Location = new System.Drawing.Point(660, 64); + this.layoutControlItem3.Location = new System.Drawing.Point(660, 56); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem3.Size = new System.Drawing.Size(330, 28); this.layoutControlItem3.Text = "閫佹鎵瑰彿"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // @@ -1330,171 +1318,64 @@ this.layoutControlItem22.Location = new System.Drawing.Point(660, 0); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem22.Size = new System.Drawing.Size(330, 32); + this.layoutControlItem22.Size = new System.Drawing.Size(330, 28); this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); // // txt_epTagtxt // this.txt_epTagtxt.Control = this.txt_epTag; - this.txt_epTagtxt.Location = new System.Drawing.Point(660, 97); + this.txt_epTagtxt.Location = new System.Drawing.Point(660, 84); this.txt_epTagtxt.Name = "txt_epTagtxt"; this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 2; this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 3; - this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33); + this.txt_epTagtxt.Size = new System.Drawing.Size(330, 28); this.txt_epTagtxt.Text = "鐜繚鏍囪瘑"; this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_fcheckResu; - this.layoutControlItem10.Location = new System.Drawing.Point(330, 130); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem10.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem10.Text = "妫�楠岀粨鏋�"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem32 - // - this.layoutControlItem32.Control = this.textEdit5; - this.layoutControlItem32.Location = new System.Drawing.Point(330, 97); - this.layoutControlItem32.Name = "layoutControlItem32"; - this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem32.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem32.Text = "妫�楠岀姸鎬�"; - this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem29 - // - this.layoutControlItem29.Control = this.txt_workNo; - this.layoutControlItem29.Location = new System.Drawing.Point(990, 196); - this.layoutControlItem29.Name = "layoutControlItem29"; - this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem29.Size = new System.Drawing.Size(332, 33); - this.layoutControlItem29.Text = "杩斿伐鍗曞彿"; - this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.txt_itemNo; - this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜"; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 130); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem5.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem5.Text = "鐗╂枡缂栫爜"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_itemModel; - this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸"; - this.layoutControlItem6.Location = new System.Drawing.Point(0, 196); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem6.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem6.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem34 - // - this.layoutControlItem34.Control = this.txt_itemName; - this.layoutControlItem34.Location = new System.Drawing.Point(0, 163); - this.layoutControlItem34.Name = "layoutControlItem34"; - this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem34.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem34.Text = "浜у搧鍚嶇О"; - this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_lineId; - this.layoutControlItem7.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem7.Text = "鐢熶骇绾垮埆"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); - // - // txt_itemId11111 - // - this.txt_itemId11111.Control = this.txt_itemId; - this.txt_itemId11111.Location = new System.Drawing.Point(0, 97); - this.txt_itemId11111.Name = "txt_itemId11111"; - this.txt_itemId11111.OptionsTableLayoutItem.RowIndex = 3; - this.txt_itemId11111.Size = new System.Drawing.Size(330, 33); - this.txt_itemId11111.Text = "鐗╂枡ID"; - this.txt_itemId11111.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_fmanageNo; - this.layoutControlItem18.Location = new System.Drawing.Point(330, 196); + this.layoutControlItem18.Location = new System.Drawing.Point(330, 168); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem18.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem18.Size = new System.Drawing.Size(330, 28); this.layoutControlItem18.Text = "娴佺▼缂栧彿"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem28 - // - this.layoutControlItem28.Control = this.txt_lotNo; - this.layoutControlItem28.Location = new System.Drawing.Point(330, 163); - this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem28.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem28.Text = "鐢熶骇宸ュ崟"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_suppId; - this.layoutControlItem4.Location = new System.Drawing.Point(660, 32); + this.layoutControlItem4.Location = new System.Drawing.Point(660, 28); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(330, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(330, 28); this.layoutControlItem4.Text = "瀹㈡埛鍚嶇О"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem27 // this.layoutControlItem27.Control = this.txt_msg; - this.layoutControlItem27.Location = new System.Drawing.Point(660, 196); + this.layoutControlItem27.Location = new System.Drawing.Point(660, 168); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2; - this.layoutControlItem27.Size = new System.Drawing.Size(330, 66); + this.layoutControlItem27.Size = new System.Drawing.Size(330, 56); this.layoutControlItem27.Text = "杩濊绫诲埆"; this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem27.TextVisible = false; // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.txt_fmrmode; - this.layoutControlItem26.Location = new System.Drawing.Point(990, 229); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem26.Size = new System.Drawing.Size(332, 33); - this.layoutControlItem26.Text = "杩斿伐宸ュ簭"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem33 // this.layoutControlItem33.Control = this.txt_createDate; - this.layoutControlItem33.Location = new System.Drawing.Point(660, 130); + this.layoutControlItem33.Location = new System.Drawing.Point(660, 112); this.layoutControlItem33.Name = "layoutControlItem33"; this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem33.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem33.Size = new System.Drawing.Size(330, 28); this.layoutControlItem33.Text = "鍒涘缓鏃堕棿"; this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18); // @@ -1502,11 +1383,11 @@ // this.layoutControlItem31.Control = this.txt_createBy; this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳"; - this.layoutControlItem31.Location = new System.Drawing.Point(660, 163); + this.layoutControlItem31.Location = new System.Drawing.Point(660, 140); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem31.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem31.Size = new System.Drawing.Size(330, 28); this.layoutControlItem31.Text = "鍒涘缓浜哄憳"; this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18); // @@ -1517,29 +1398,29 @@ this.layoutControlItem16.Location = new System.Drawing.Point(990, 0); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(332, 32); + this.layoutControlItem16.Size = new System.Drawing.Size(332, 28); this.layoutControlItem16.Text = "瀹℃牳浜哄憳"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_fsubmitBy; - this.layoutControlItem15.Location = new System.Drawing.Point(990, 32); + this.layoutControlItem15.Location = new System.Drawing.Point(990, 28); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(332, 32); + this.layoutControlItem15.Size = new System.Drawing.Size(332, 28); this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_fsubmit; - this.layoutControlItem14.Location = new System.Drawing.Point(990, 64); + this.layoutControlItem14.Location = new System.Drawing.Point(990, 56); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem14.Size = new System.Drawing.Size(332, 28); this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; @@ -1547,11 +1428,11 @@ // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_freceQty; - this.layoutControlItem13.Location = new System.Drawing.Point(990, 97); + this.layoutControlItem13.Location = new System.Drawing.Point(990, 84); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem13.Size = new System.Drawing.Size(332, 28); this.layoutControlItem13.Text = "鍒ゅ畾缁撴灉"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // @@ -1559,33 +1440,204 @@ // this.layoutControlItem11.Control = this.txt_fngHandle; this.layoutControlItem11.CustomizationFormText = "澶勭疆缁撴灉"; - this.layoutControlItem11.Location = new System.Drawing.Point(990, 130); + this.layoutControlItem11.Location = new System.Drawing.Point(990, 112); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem11.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem11.Size = new System.Drawing.Size(332, 28); this.layoutControlItem11.Text = "澶勭疆缁撴灉"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.txt_djType; + this.layoutControlItem23.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem26 + // + this.layoutControlItem26.Control = this.txt_fmrmode; + this.layoutControlItem26.Location = new System.Drawing.Point(990, 224); + this.layoutControlItem26.Name = "layoutControlItem26"; + this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 8; + this.layoutControlItem26.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem26.Text = "杩斿伐宸ュ簭"; + this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem29 + // + this.layoutControlItem29.Control = this.txt_workNo; + this.layoutControlItem29.Location = new System.Drawing.Point(990, 196); + this.layoutControlItem29.Name = "layoutControlItem29"; + this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7; + this.layoutControlItem29.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem29.Text = "杩斿伐鍗曞彿"; + this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_fzrId; - this.layoutControlItem25.Location = new System.Drawing.Point(990, 163); + this.layoutControlItem25.Location = new System.Drawing.Point(990, 168); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem25.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem25.Size = new System.Drawing.Size(332, 28); this.layoutControlItem25.Text = "璐d换浜�"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem35 + // + this.layoutControlItem35.Control = this.txt_zrType; + this.layoutControlItem35.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem35.CustomizationFormText = "璐d换鍒ゅ畾"; + this.layoutControlItem35.Location = new System.Drawing.Point(990, 140); + this.layoutControlItem35.Name = "layoutControlItem35"; + this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem35.Size = new System.Drawing.Size(332, 28); + this.layoutControlItem35.Text = "鍒ゅ畾璐d换"; + this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_lineId; + this.layoutControlItem7.Location = new System.Drawing.Point(0, 84); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem7.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem7.Text = "鐢熶骇绾垮埆"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_lotNo; + this.layoutControlItem28.Location = new System.Drawing.Point(0, 28); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem28.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem28.Text = "鐢熶骇宸ュ崟"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem10 + // + this.layoutControlItem10.Control = this.txt_fcheckResu; + this.layoutControlItem10.Location = new System.Drawing.Point(330, 140); + this.layoutControlItem10.Name = "layoutControlItem10"; + this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem10.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem10.Text = "妫�楠岀粨鏋�"; + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem32 + // + this.layoutControlItem32.Control = this.txt_checkStates; + this.layoutControlItem32.Location = new System.Drawing.Point(330, 112); + this.layoutControlItem32.Name = "layoutControlItem32"; + this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem32.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem32.Text = "妫�楠岀姸鎬�"; + this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txt_fcheckBy; + this.layoutControlItem8.Location = new System.Drawing.Point(330, 84); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem8.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem8.Text = "妫�楠屼汉鍛�"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_fcheckDate; + this.layoutControlItem2.Location = new System.Drawing.Point(330, 56); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem2.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem2.Text = "妫�楠屾棩鏈�"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_fbatchQty; + this.layoutControlItem9.Location = new System.Drawing.Point(330, 28); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem9.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem9.Text = "鎶芥鏁伴噺"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.txt_releaseNo; + this.layoutControlItem1.Location = new System.Drawing.Point(330, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem1.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem1.Text = "妫�楠屽崟鍙�"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.txt_kbSl; + this.layoutControlItem19.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem19.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem19.Text = "閫佹鏁伴噺"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_itemNo; + this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜"; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 112); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem5.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem5.Text = "鐗╂枡缂栫爜"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem34 + // + this.layoutControlItem34.Control = this.txt_itemName; + this.layoutControlItem34.Location = new System.Drawing.Point(0, 140); + this.layoutControlItem34.Name = "layoutControlItem34"; + this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem34.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem34.Text = "浜у搧鍚嶇О"; + this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_itemModel; + this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸"; + this.layoutControlItem6.Location = new System.Drawing.Point(0, 168); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem6.Size = new System.Drawing.Size(330, 28); + this.layoutControlItem6.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remarks; - this.layoutControlItem12.Location = new System.Drawing.Point(0, 229); + this.layoutControlItem12.Location = new System.Drawing.Point(0, 196); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem12.Size = new System.Drawing.Size(660, 33); + this.layoutControlItem12.Size = new System.Drawing.Size(660, 28); this.layoutControlItem12.Text = "澶囨敞璇存槑"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // @@ -1595,17 +1647,18 @@ this.xtraTabControl2.Location = new System.Drawing.Point(0, 0); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.tabMxPage1; - this.xtraTabControl2.Size = new System.Drawing.Size(1342, 394); + this.xtraTabControl2.Size = new System.Drawing.Size(1342, 408); this.xtraTabControl2.TabIndex = 3; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, - this.tabMxPage2}); + this.tabMxPage2, + this.tabMxPage3}); // // tabMxPage1 // this.tabMxPage1.Controls.Add(this.splitMx2); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1340, 362); + this.tabMxPage1.Size = new System.Drawing.Size(1340, 376); this.tabMxPage1.Text = "鎶芥牱淇℃伅"; // // splitMx2 @@ -1624,7 +1677,7 @@ // this.splitMx2.Panel2.Controls.Add(this.splitYangLi); this.splitMx2.Panel2.Text = "Panel2"; - this.splitMx2.Size = new System.Drawing.Size(1340, 362); + this.splitMx2.Size = new System.Drawing.Size(1340, 376); this.splitMx2.SplitterPosition = 287; this.splitMx2.TabIndex = 3; // @@ -1661,7 +1714,9 @@ this.gvMx1fngQty, this.gvMx1sampleSizeNo, this.gvMx1fcheckLevel, - this.gvMx1facLevel}); + this.gvMx1facLevel, + this.gridColumn6, + this.gridColumn8}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1670,7 +1725,6 @@ // // gvMx1guid // - this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1guid.AppearanceCell.Options.UseFont = true; this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎"; this.gvMx1guid.FieldName = "guid"; @@ -1681,7 +1735,6 @@ // // gvMx1fcheckItem // - this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�"; this.gvMx1fcheckItem.FieldName = "fcheckItem"; @@ -1694,7 +1747,6 @@ // // gvMx1fcheckTool // - this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�"; this.gvMx1fcheckTool.FieldName = "fcheckTool"; @@ -1707,7 +1759,6 @@ // // gvMx1fcheckItemDesc // - this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�"; this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc"; @@ -1720,7 +1771,6 @@ // // gvMx1fspecRequ // - this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true; this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰"; this.gvMx1fspecRequ.FieldName = "fspecRequ"; @@ -1733,7 +1783,6 @@ // // gvMx1fupAllow // - this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fupAllow.Caption = "涓婇檺"; this.gvMx1fupAllow.FieldName = "fupAllow"; @@ -1746,7 +1795,6 @@ // // gvMx1fstand // - this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fstand.AppearanceCell.Options.UseFont = true; this.gvMx1fstand.Caption = "鏍囧噯鍊�"; this.gvMx1fstand.FieldName = "fstand"; @@ -1759,7 +1807,6 @@ // // gvMx1fdownAllow // - this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true; this.gvMx1fdownAllow.Caption = "涓嬮檺"; this.gvMx1fdownAllow.FieldName = "fdownAllow"; @@ -1772,7 +1819,6 @@ // // gvMx1freQty // - this.gvMx1freQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1freQty.AppearanceCell.Options.UseFont = true; this.gvMx1freQty.Caption = "RE鏁伴噺"; this.gvMx1freQty.FieldName = "freQty"; @@ -1785,7 +1831,6 @@ // // gvMx1checkQyt // - this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true; this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺"; this.gvMx1checkQyt.FieldName = "checkQyt"; @@ -1798,7 +1843,6 @@ // // gvMx1fenterQty // - this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true; this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�"; this.gvMx1fenterQty.FieldName = "fenterQty"; @@ -1811,7 +1855,6 @@ // // gvMx1fcheckResu // - this.gvMx1fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true; @@ -1828,7 +1871,6 @@ // // gvMx1fngRate // - this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fngRate.AppearanceCell.Options.UseFont = true; this.gvMx1fngRate.Caption = "涓嶈壇鐜�"; this.gvMx1fngRate.FieldName = "fngRateName"; @@ -1841,7 +1883,6 @@ // // gvMx1fngQty // - this.gvMx1fngQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fngQty.AppearanceCell.Options.UseFont = true; this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟"; this.gvMx1fngQty.FieldName = "fngQty"; @@ -1854,7 +1895,6 @@ // // gvMx1sampleSizeNo // - this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true; this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�"; this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo"; @@ -1867,7 +1907,6 @@ // // gvMx1fcheckLevel // - this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true; this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�"; this.gvMx1fcheckLevel.FieldName = "fcheckLevel"; @@ -1880,7 +1919,6 @@ // // gvMx1facLevel // - this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx1facLevel.AppearanceCell.Options.UseFont = true; this.gvMx1facLevel.Caption = "鎷掓敹姘村钩"; this.gvMx1facLevel.FieldName = "facLevel"; @@ -1890,6 +1928,34 @@ this.gvMx1facLevel.Visible = true; this.gvMx1facLevel.VisibleIndex = 15; this.gvMx1facLevel.Width = 200; + // + // gridColumn6 + // + this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn6.AppearanceCell.Options.UseForeColor = true; + this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn6.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn6.Caption = "缂洪櫡绛夌骇"; + this.gridColumn6.FieldName = "defectLevel"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 16; + this.gridColumn6.Width = 94; + // + // gridColumn8 + // + this.gridColumn8.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn8.AppearanceCell.Options.UseForeColor = true; + this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn8.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn8.Caption = "缂洪櫡鎻忚堪"; + this.gridColumn8.FieldName = "defectDetails"; + this.gridColumn8.MinWidth = 25; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 17; + this.gridColumn8.Width = 94; // // splitYangLi // @@ -1906,7 +1972,7 @@ // this.splitYangLi.Panel2.Controls.Add(this.groupControl2); this.splitYangLi.Panel2.Text = "Panel2"; - this.splitYangLi.Size = new System.Drawing.Size(1340, 63); + this.splitYangLi.Size = new System.Drawing.Size(1340, 77); this.splitYangLi.SplitterPosition = 676; this.splitYangLi.TabIndex = 4; // @@ -1916,7 +1982,7 @@ this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl1.Location = new System.Drawing.Point(0, 0); this.groupControl1.Name = "groupControl1"; - this.groupControl1.Size = new System.Drawing.Size(676, 63); + this.groupControl1.Size = new System.Drawing.Size(676, 77); this.groupControl1.TabIndex = 3; this.groupControl1.Text = "妫�娴嬬粨鏋�"; // @@ -1926,14 +1992,13 @@ this.gcMx2.Location = new System.Drawing.Point(2, 28); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; - this.gcMx2.Size = new System.Drawing.Size(672, 33); + this.gcMx2.Size = new System.Drawing.Size(672, 47); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); // // gvMx2 // - this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx2.Appearance.Row.Options.UseFont = true; this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn4, @@ -2012,7 +2077,7 @@ this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl2.Location = new System.Drawing.Point(0, 0); this.groupControl2.Name = "groupControl2"; - this.groupControl2.Size = new System.Drawing.Size(652, 63); + this.groupControl2.Size = new System.Drawing.Size(652, 77); this.groupControl2.TabIndex = 4; this.groupControl2.Text = "鏍锋湰缁撴灉"; // @@ -2022,14 +2087,13 @@ this.gcMx3.Location = new System.Drawing.Point(2, 28); this.gcMx3.MainView = this.gvMx3; this.gcMx3.Name = "gcMx3"; - this.gcMx3.Size = new System.Drawing.Size(648, 33); + this.gcMx3.Size = new System.Drawing.Size(648, 47); this.gcMx3.TabIndex = 0; this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx3}); // // gvMx3 // - this.gvMx3.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gvMx3.Appearance.Row.Options.UseFont = true; this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn1, @@ -2115,18 +2179,35 @@ // // tabMxPage2 // - this.tabMxPage2.Controls.Add(this.ucUpFileList1); + this.tabMxPage2.Controls.Add(this.ucChouJianList1); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1340, 362); - this.tabMxPage2.Text = "闄勪欢淇℃伅"; + this.tabMxPage2.Size = new System.Drawing.Size(1340, 376); + this.tabMxPage2.Text = "浜у搧鏉$爜鏄庣粏"; + // + // ucChouJianList1 + // + this.ucChouJianList1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucChouJianList1.Location = new System.Drawing.Point(0, 0); + this.ucChouJianList1.Name = "ucChouJianList1"; + this.ucChouJianList1.pGuid = null; + this.ucChouJianList1.Size = new System.Drawing.Size(1340, 376); + this.ucChouJianList1.TabIndex = 0; + // + // tabMxPage3 + // + this.tabMxPage3.Controls.Add(this.ucUpFileList1); + this.tabMxPage3.Name = "tabMxPage3"; + this.tabMxPage3.Size = new System.Drawing.Size(1340, 376); + this.tabMxPage3.Text = "闄勪欢淇℃伅"; // // ucUpFileList1 // this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill; this.ucUpFileList1.Location = new System.Drawing.Point(0, 0); this.ucUpFileList1.Name = "ucUpFileList1"; + this.ucUpFileList1.parentGroup = null; this.ucUpFileList1.pGuid = null; - this.ucUpFileList1.Size = new System.Drawing.Size(1340, 362); + this.ucUpFileList1.Size = new System.Drawing.Size(1340, 376); this.ucUpFileList1.TabIndex = 0; // // repositoryItemComboBox2 @@ -2210,7 +2291,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); @@ -2220,30 +2301,18 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); @@ -2251,7 +2320,23 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); @@ -2279,6 +2364,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit(); this.tabMxPage2.ResumeLayout(false); + this.tabMxPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); @@ -2362,7 +2448,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraTab.XtraTabPage tabMxPage2; + private DevExpress.XtraTab.XtraTabPage tabMxPage3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraEditors.TextEdit txt_fmanageNo; @@ -2395,42 +2481,26 @@ private UserControl.UcDictionary txt_msg; private DevExpress.XtraEditors.TextEdit txt_lotNo; private DevExpress.XtraEditors.TextEdit txt_workNo; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; - private DevExpress.XtraEditors.TextEdit textEdit5; + private DevExpress.XtraEditors.TextEdit txt_checkStates; private DevExpress.XtraEditors.ComboBoxEdit txt_epTag; private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraEditors.TextEdit txt_createDate; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraEditors.TextEdit txt_itemName; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; private UserControl.UCUpFileList ucUpFileList1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraEditors.TextEdit txt_lineId; private DevExpress.XtraEditors.TextEdit txt_itemId; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem txt_itemId11111; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; private DevExpress.XtraEditors.TextEdit txt_suppId; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle; private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; @@ -2438,7 +2508,31 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraEditors.ComboBoxEdit txt_zrType; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraEditors.TextEdit txt_kbSl; + private DevExpress.XtraLayout.LayoutControlItem txt_itemId11111; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraTab.XtraTabPage tabMxPage2; + private UcChouJianList ucChouJianList1; } } \ No newline at end of file -- Gitblit v1.9.3