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_FqcDetect01.Designer.cs | 895 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 561 insertions(+), 334 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs index f69ab32..260763c 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs @@ -42,11 +42,12 @@ 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(); DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -86,8 +87,6 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); - this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit(); - this.txt_lineId = new Gs.DevApp.UserControl.UcLookWorkline(); this.txt_msg = new Gs.DevApp.UserControl.UcDictionary(); this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer(); this.lbGuid = new System.Windows.Forms.Label(); @@ -108,9 +107,8 @@ this.txt_guid = new DevExpress.XtraEditors.TextEdit(); this.txt_lifnr = new DevExpress.XtraEditors.TextEdit(); this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit(); - this.txt_lotNo = new DevExpress.XtraEditors.TextEdit(); this.txt_workNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_states = 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(); @@ -118,17 +116,19 @@ this.txt_fzrIdTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_freceQty = new DevExpress.XtraEditors.TextEdit(); + this.txt_zrType = new DevExpress.XtraEditors.TextEdit(); + this.txt_kbList = new DevExpress.XtraEditors.ButtonEdit(); + this.txt_lotNo = new DevExpress.XtraEditors.ButtonEdit(); + this.txt_lineName = new DevExpress.XtraEditors.TextEdit(); + this.txt_itemId = new DevExpress.XtraEditors.TextEdit(); + this.txt_lineId = new DevExpress.XtraEditors.TextEdit(); + this.txt_kbSl = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); - this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -138,19 +138,28 @@ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -173,6 +182,10 @@ this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptDefectLevel = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptDefectDetails = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl(); this.groupControl1 = new DevExpress.XtraEditors.GroupControl(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); @@ -203,6 +216,8 @@ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); 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(); @@ -230,7 +245,6 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit(); @@ -248,9 +262,8 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit(); ((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.txt_states.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(); @@ -258,17 +271,19 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fzrIdTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.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.Root)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); @@ -278,19 +293,28 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -302,6 +326,8 @@ this.splitMx2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptDefectLevel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptDefectDetails)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).BeginInit(); this.splitYangLi.Panel1.SuspendLayout(); @@ -326,6 +352,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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(); @@ -381,6 +408,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"; @@ -394,8 +422,9 @@ // 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 = 0; this.split1.TabIndex = 4; // // gcMain1 @@ -404,7 +433,7 @@ 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, 638); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -482,7 +511,7 @@ // gridColumn5 // this.gridColumn5.Caption = "妫�楠岀姸鎬�"; - this.gridColumn5.FieldName = "states"; + this.gridColumn5.FieldName = "checkStates"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; @@ -783,7 +812,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, 638); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; @@ -814,14 +843,13 @@ // 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.TabIndex = 0; // // layoutMx1 // - this.layoutMx1.Controls.Add(this.txt_itemId); - this.layoutMx1.Controls.Add(this.txt_lineId); this.layoutMx1.Controls.Add(this.txt_msg); this.layoutMx1.Controls.Add(this.txt_suppId); this.layoutMx1.Controls.Add(this.lbGuid); @@ -842,9 +870,8 @@ this.layoutMx1.Controls.Add(this.txt_guid); this.layoutMx1.Controls.Add(this.txt_lifnr); 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.txt_states); + 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); @@ -852,10 +879,19 @@ this.layoutMx1.Controls.Add(this.txt_fzrIdTxt); this.layoutMx1.Controls.Add(this.txt_mrmodeTxt); this.layoutMx1.Controls.Add(this.txt_freceQty); + this.layoutMx1.Controls.Add(this.txt_zrType); + this.layoutMx1.Controls.Add(this.txt_kbList); + this.layoutMx1.Controls.Add(this.txt_lotNo); + this.layoutMx1.Controls.Add(this.txt_lineName); + this.layoutMx1.Controls.Add(this.txt_itemId); + this.layoutMx1.Controls.Add(this.txt_lineId); + 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_itemId1111, + this.layoutControlItem4}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(789, 440, 812, 500); @@ -864,31 +900,12 @@ this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // - // txt_itemId - // - this.txt_itemId.Location = new System.Drawing.Point(84, 109); - this.txt_itemId.Name = "txt_itemId"; - this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton()}); - this.txt_itemId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_itemId.Size = new System.Drawing.Size(254, 24); - this.txt_itemId.StyleController = this.layoutMx1; - this.txt_itemId.TabIndex = 824; - // - // txt_lineId - // - this.txt_lineId.IsReadly = false; - this.txt_lineId.Location = new System.Drawing.Point(84, 76); - this.txt_lineId.Name = "txt_lineId"; - this.txt_lineId.Size = new System.Drawing.Size(254, 24); - this.txt_lineId.TabIndex = 821; - // // 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, 186); 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, 54); this.txt_msg.TabIndex = 814; this.txt_msg.TextTxt = ""; this.txt_msg.WhereTxt = null; @@ -896,7 +913,7 @@ // txt_suppId // this.txt_suppId.IsReadly = false; - this.txt_suppId.Location = new System.Drawing.Point(414, 109); + this.txt_suppId.Location = new System.Drawing.Point(414, 99); this.txt_suppId.Name = "txt_suppId"; this.txt_suppId.Size = new System.Drawing.Size(254, 24); this.txt_suppId.TabIndex = 811; @@ -912,7 +929,7 @@ // // txt_fngHandle // - this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142); + this.txt_fngHandle.Location = new System.Drawing.Point(1074, 128); this.txt_fngHandle.Name = "txt_fngHandle"; this.txt_fngHandle.Size = new System.Drawing.Size(256, 24); this.txt_fngHandle.StyleController = this.layoutMx1; @@ -921,7 +938,7 @@ // // txt_remarks // - this.txt_remarks.Location = new System.Drawing.Point(84, 241); + this.txt_remarks.Location = new System.Drawing.Point(84, 244); this.txt_remarks.Name = "txt_remarks"; this.txt_remarks.Properties.Appearance.Options.UseFont = true; this.txt_remarks.Size = new System.Drawing.Size(584, 24); @@ -930,8 +947,10 @@ // // txt_fcheckResu // - this.txt_fcheckResu.Location = new System.Drawing.Point(744, 142); + this.txt_fcheckResu.Location = new System.Drawing.Point(744, 128); 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; @@ -939,7 +958,7 @@ // // txt_releaseNo // - this.txt_releaseNo.Location = new System.Drawing.Point(84, 43); + this.txt_releaseNo.Location = new System.Drawing.Point(414, 12); this.txt_releaseNo.Name = "txt_releaseNo"; this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; this.txt_releaseNo.Size = new System.Drawing.Size(254, 24); @@ -949,7 +968,7 @@ // // txt_fcheckDate // - this.txt_fcheckDate.Location = new System.Drawing.Point(744, 175); + this.txt_fcheckDate.Location = new System.Drawing.Point(744, 157); this.txt_fcheckDate.Name = "txt_fcheckDate"; this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true; this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24); @@ -959,7 +978,7 @@ // // txt_lotNo1 // - this.txt_lotNo1.Location = new System.Drawing.Point(414, 142); + this.txt_lotNo1.Location = new System.Drawing.Point(414, 128); this.txt_lotNo1.Name = "txt_lotNo1"; this.txt_lotNo1.Properties.Appearance.Options.UseFont = true; this.txt_lotNo1.Size = new System.Drawing.Size(254, 24); @@ -969,7 +988,7 @@ // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(84, 142); + this.txt_itemNo.Location = new System.Drawing.Point(84, 157); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; this.txt_itemNo.Size = new System.Drawing.Size(254, 24); @@ -979,16 +998,16 @@ // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(84, 208); + this.txt_itemModel.Location = new System.Drawing.Point(84, 215); this.txt_itemModel.Name = "txt_itemModel"; - this.txt_itemModel.Size = new System.Drawing.Size(254, 24); + this.txt_itemModel.Size = new System.Drawing.Size(584, 24); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 801; this.txt_itemModel.Tag = "readonly"; // // txt_fcheckBy // - this.txt_fcheckBy.Location = new System.Drawing.Point(744, 76); + this.txt_fcheckBy.Location = new System.Drawing.Point(744, 70); this.txt_fcheckBy.Name = "txt_fcheckBy"; this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true; this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24); @@ -998,7 +1017,7 @@ // // txt_fbatchQty // - this.txt_fbatchQty.Location = new System.Drawing.Point(414, 43); + this.txt_fbatchQty.Location = new System.Drawing.Point(414, 41); this.txt_fbatchQty.Name = "txt_fbatchQty"; this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24); @@ -1008,7 +1027,7 @@ // // txt_fsubmitBy // - this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43); + this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 41); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitBy.StyleController = this.layoutMx1; @@ -1026,7 +1045,7 @@ // // txt_fsubmit // - this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76); + this.txt_fsubmit.Location = new System.Drawing.Point(1002, 70); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑"; this.txt_fsubmit.Size = new System.Drawing.Size(328, 24); @@ -1036,7 +1055,7 @@ // // txt_fmanageNo // - this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208); + this.txt_fmanageNo.Location = new System.Drawing.Point(414, 186); this.txt_fmanageNo.Name = "txt_fmanageNo"; this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24); this.txt_fmanageNo.StyleController = this.layoutMx1; @@ -1054,7 +1073,7 @@ // // txt_lifnr // - this.txt_lifnr.Location = new System.Drawing.Point(414, 76); + this.txt_lifnr.Location = new System.Drawing.Point(414, 70); this.txt_lifnr.Name = "txt_lifnr"; this.txt_lifnr.Size = new System.Drawing.Size(254, 24); this.txt_lifnr.StyleController = this.layoutMx1; @@ -1075,36 +1094,29 @@ this.txt_djType.StyleController = this.layoutMx1; this.txt_djType.TabIndex = 810; // - // txt_lotNo - // - this.txt_lotNo.Location = new System.Drawing.Point(414, 12); - this.txt_lotNo.Name = "txt_lotNo"; - this.txt_lotNo.Size = new System.Drawing.Size(254, 24); - this.txt_lotNo.StyleController = this.layoutMx1; - this.txt_lotNo.TabIndex = 815; - this.txt_lotNo.Tag = "readonly"; - // // txt_workNo // - this.txt_workNo.Location = new System.Drawing.Point(1074, 208); + this.txt_workNo.Location = new System.Drawing.Point(1074, 186); this.txt_workNo.Name = "txt_workNo"; this.txt_workNo.Size = new System.Drawing.Size(256, 24); this.txt_workNo.StyleController = this.layoutMx1; this.txt_workNo.TabIndex = 816; this.txt_workNo.Tag = "readonly"; // - // txt_states + // txt_checkStates // - this.txt_states.Location = new System.Drawing.Point(744, 109); - this.txt_states.Name = "txt_states"; - this.txt_states.Size = new System.Drawing.Size(254, 24); - this.txt_states.StyleController = this.layoutMx1; - this.txt_states.TabIndex = 819; - this.txt_states.Tag = "readonly"; + this.txt_checkStates.Location = new System.Drawing.Point(744, 99); + 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(414, 175); + this.txt_epTag.Location = new System.Drawing.Point(414, 157); 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)}); @@ -1123,7 +1135,7 @@ // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(744, 43); + this.txt_createDate.Location = new System.Drawing.Point(744, 41); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Size = new System.Drawing.Size(254, 24); this.txt_createDate.StyleController = this.layoutMx1; @@ -1132,7 +1144,7 @@ // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(84, 175); + this.txt_itemName.Location = new System.Drawing.Point(84, 186); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Size = new System.Drawing.Size(254, 24); this.txt_itemName.StyleController = this.layoutMx1; @@ -1141,7 +1153,7 @@ // // txt_fzrIdTxt // - this.txt_fzrIdTxt.Location = new System.Drawing.Point(1074, 175); + this.txt_fzrIdTxt.Location = new System.Drawing.Point(1074, 157); this.txt_fzrIdTxt.Name = "txt_fzrIdTxt"; this.txt_fzrIdTxt.Size = new System.Drawing.Size(256, 24); this.txt_fzrIdTxt.StyleController = this.layoutMx1; @@ -1150,7 +1162,7 @@ // // txt_mrmodeTxt // - this.txt_mrmodeTxt.Location = new System.Drawing.Point(1074, 241); + this.txt_mrmodeTxt.Location = new System.Drawing.Point(1074, 215); this.txt_mrmodeTxt.Name = "txt_mrmodeTxt"; this.txt_mrmodeTxt.Size = new System.Drawing.Size(256, 24); this.txt_mrmodeTxt.StyleController = this.layoutMx1; @@ -1159,12 +1171,80 @@ // // txt_freceQty // - this.txt_freceQty.Location = new System.Drawing.Point(1074, 109); + this.txt_freceQty.Location = new System.Drawing.Point(1074, 99); 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.Size = new System.Drawing.Size(256, 24); this.txt_freceQty.StyleController = this.layoutMx1; this.txt_freceQty.TabIndex = 828; this.txt_freceQty.Tag = "readonly"; + // + // txt_zrType + // + this.txt_zrType.Location = new System.Drawing.Point(1074, 244); + this.txt_zrType.Name = "txt_zrType"; + this.txt_zrType.Size = new System.Drawing.Size(256, 24); + this.txt_zrType.StyleController = this.layoutMx1; + this.txt_zrType.TabIndex = 829; + this.txt_zrType.Tag = "readonly"; + // + // txt_kbList + // + this.txt_kbList.Location = new System.Drawing.Point(84, 70); + this.txt_kbList.Name = "txt_kbList"; + this.txt_kbList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txt_kbList.Size = new System.Drawing.Size(254, 24); + this.txt_kbList.StyleController = this.layoutMx1; + this.txt_kbList.TabIndex = 830; + // + // txt_lotNo + // + this.txt_lotNo.EditValue = ""; + this.txt_lotNo.Location = new System.Drawing.Point(84, 41); + this.txt_lotNo.Name = "txt_lotNo"; + this.txt_lotNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.txt_lotNo.Size = new System.Drawing.Size(254, 24); + this.txt_lotNo.StyleController = this.layoutMx1; + this.txt_lotNo.TabIndex = 831; + // + // txt_lineName + // + this.txt_lineName.Location = new System.Drawing.Point(84, 128); + this.txt_lineName.Name = "txt_lineName"; + this.txt_lineName.Size = new System.Drawing.Size(254, 24); + this.txt_lineName.StyleController = this.layoutMx1; + this.txt_lineName.TabIndex = 832; + this.txt_lineName.Tag = "readonly"; + // + // txt_itemId + // + this.txt_itemId.Location = new System.Drawing.Point(744, 244); + this.txt_itemId.Name = "txt_itemId"; + this.txt_itemId.Size = new System.Drawing.Size(254, 24); + this.txt_itemId.StyleController = this.layoutMx1; + this.txt_itemId.TabIndex = 833; + this.txt_itemId.Tag = "readonly"; + // + // txt_lineId + // + this.txt_lineId.Location = new System.Drawing.Point(414, 215); + this.txt_lineId.Name = "txt_lineId"; + this.txt_lineId.Size = new System.Drawing.Size(254, 24); + this.txt_lineId.StyleController = this.layoutMx1; + this.txt_lineId.TabIndex = 834; + this.txt_lineId.Tag = "readonly"; + // + // txt_kbSl + // + this.txt_kbSl.Location = new System.Drawing.Point(84, 99); + 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 = 835; + this.txt_kbSl.Tag = "readonly"; // // layoutControlItem17 // @@ -1189,19 +1269,34 @@ this.layoutControlItem21.Text = "涓婚敭GUID"; this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20); // + // txt_itemId1111 + // + this.txt_itemId1111.Control = this.txt_itemId; + this.txt_itemId1111.Location = new System.Drawing.Point(660, 232); + this.txt_itemId1111.Name = "txt_itemId1111"; + this.txt_itemId1111.OptionsTableLayoutItem.ColumnIndex = 2; + this.txt_itemId1111.OptionsTableLayoutItem.RowIndex = 8; + this.txt_itemId1111.Size = new System.Drawing.Size(330, 30); + this.txt_itemId1111.Text = "浜у搧ID"; + this.txt_itemId1111.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_lineId; + this.layoutControlItem4.Location = new System.Drawing.Point(330, 203); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 7; + this.layoutControlItem4.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem4.Text = "绾垮埆ID"; + this.layoutControlItem4.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.layoutControlItem5, - this.layoutControlItem30, - this.layoutControlItem4, - this.layoutControlItem6, - this.layoutControlItem34, - this.layoutControlItem18, this.layoutControlItem16, this.layoutControlItem15, this.layoutControlItem14, @@ -1211,19 +1306,28 @@ this.layoutControlItem25, this.layoutControlItem29, this.layoutControlItem27, - this.layoutControlItem28, - this.layoutControlItem9, - this.layoutControlItem22, - this.layoutControlItem24, - this.layoutControlItem3, - this.txt_epTagtxt, this.layoutControlItem31, this.layoutControlItem10, this.layoutControlItem32, this.layoutControlItem8, this.layoutControlItem33, this.layoutControlItem2, - this.layoutControlItem12}); + this.layoutControlItem35, + this.layoutControlItem12, + this.layoutControlItem6, + this.layoutControlItem34, + this.layoutControlItem5, + this.layoutControlItem1, + this.layoutControlItem28, + this.txt_boxQty11, + this.layoutControlItem9, + this.layoutControlItem22, + this.layoutControlItem24, + this.layoutControlItem3, + this.txt_epTagtxt, + this.layoutControlItem18, + this.txt_lineName111, + this.layoutControlItem30}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1255,6 +1359,8 @@ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition9.Height = 100D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, @@ -1263,91 +1369,19 @@ rowDefinition5, rowDefinition6, rowDefinition7, - rowDefinition8}); + rowDefinition8, + rowDefinition9}); this.Root.Size = new System.Drawing.Size(1342, 282); this.Root.TextVisible = false; - // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.txt_releaseNo; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 31); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem1.Size = new System.Drawing.Size(330, 33); - 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, 31); + this.layoutControlItem23.Size = new System.Drawing.Size(330, 29); this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem23.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); - // - // layoutControlItem30 - // - this.layoutControlItem30.Control = this.txt_lineId; - this.layoutControlItem30.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem30.Name = "layoutControlItem30"; - this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem30.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem30.Text = "閫夋嫨浜х嚎"; - this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_itemId; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 97); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem4.Text = "閫夋嫨浜у搧"; - this.layoutControlItem4.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); - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txt_fmanageNo; - this.layoutControlItem18.Location = new System.Drawing.Point(330, 196); - 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.Text = "娴佺▼缂栧彿"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // @@ -1355,29 +1389,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, 31); + this.layoutControlItem16.Size = new System.Drawing.Size(332, 29); 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, 31); + this.layoutControlItem15.Location = new System.Drawing.Point(990, 29); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem15.Size = new System.Drawing.Size(332, 29); 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, 58); 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, 29); this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; @@ -1385,33 +1419,33 @@ // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_freceQty; - this.layoutControlItem26.Location = new System.Drawing.Point(990, 97); + this.layoutControlItem26.Location = new System.Drawing.Point(990, 87); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem26.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem26.Size = new System.Drawing.Size(332, 29); this.layoutControlItem26.Text = "鍒ゅ畾缁撴灉"; this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_fngHandle; - this.layoutControlItem13.Location = new System.Drawing.Point(990, 130); + this.layoutControlItem13.Location = new System.Drawing.Point(990, 116); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem13.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem13.Size = new System.Drawing.Size(332, 29); this.layoutControlItem13.Text = "澶勭疆缁撴灉"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_fzrIdTxt; - this.layoutControlItem7.Location = new System.Drawing.Point(990, 163); + this.layoutControlItem7.Location = new System.Drawing.Point(990, 145); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem7.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem7.Size = new System.Drawing.Size(332, 29); this.layoutControlItem7.Text = "璐d换浜哄憳"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // @@ -1419,102 +1453,37 @@ // this.layoutControlItem25.Control = this.txt_mrmodeTxt; this.layoutControlItem25.CustomizationFormText = "杩斿伐宸ュ簭"; - this.layoutControlItem25.Location = new System.Drawing.Point(990, 229); + this.layoutControlItem25.Location = new System.Drawing.Point(990, 203); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem25.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem25.Size = new System.Drawing.Size(332, 29); this.layoutControlItem25.Text = "鍙嶅伐宸ュ簭"; this.layoutControlItem25.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.Location = new System.Drawing.Point(990, 174); 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.Size = new System.Drawing.Size(332, 29); this.layoutControlItem29.Text = "杩斿伐鍗曞彿"; this.layoutControlItem29.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, 174); 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, 58); this.layoutControlItem27.Text = "杩濊绫诲埆"; this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem27.TextVisible = false; - // - // layoutControlItem28 - // - this.layoutControlItem28.Control = this.txt_lotNo; - this.layoutControlItem28.Location = new System.Drawing.Point(330, 0); - this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem28.Size = new System.Drawing.Size(330, 31); - this.layoutControlItem28.Text = "鐢熶骇宸ュ崟"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_fbatchQty; - this.layoutControlItem9.Location = new System.Drawing.Point(330, 31); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem9.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem9.Text = "鎶芥鏁伴噺"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem22 - // - this.layoutControlItem22.Control = this.txt_lifnr; - this.layoutControlItem22.Location = new System.Drawing.Point(330, 64); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem22.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem24 - // - this.layoutControlItem24.Control = this.txt_suppId; - this.layoutControlItem24.Location = new System.Drawing.Point(330, 97); - this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem24.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem24.Text = "瀹㈡埛缂栫爜"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.txt_lotNo1; - this.layoutControlItem3.Location = new System.Drawing.Point(330, 130); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem3.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem3.Text = "閫佹鎵瑰彿"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); - // - // txt_epTagtxt - // - this.txt_epTagtxt.Control = this.txt_epTag; - this.txt_epTagtxt.Location = new System.Drawing.Point(330, 163); - this.txt_epTagtxt.Name = "txt_epTagtxt"; - this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1; - this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5; - this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33); - this.txt_epTagtxt.Text = "鐜繚鏍囪瘑"; - this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem31 // @@ -1522,75 +1491,235 @@ this.layoutControlItem31.Location = new System.Drawing.Point(660, 0); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem31.Size = new System.Drawing.Size(330, 31); + this.layoutControlItem31.Size = new System.Drawing.Size(330, 29); this.layoutControlItem31.Text = "鍒涘缓浜哄憳"; this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fcheckResu; - this.layoutControlItem10.Location = new System.Drawing.Point(660, 130); + this.layoutControlItem10.Location = new System.Drawing.Point(660, 116); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem10.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem10.Size = new System.Drawing.Size(330, 29); this.layoutControlItem10.Text = "妫�楠岀粨鏋�"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem32 // - this.layoutControlItem32.Control = this.txt_states; - this.layoutControlItem32.Location = new System.Drawing.Point(660, 97); + this.layoutControlItem32.Control = this.txt_checkStates; + this.layoutControlItem32.Location = new System.Drawing.Point(660, 87); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem32.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem32.Size = new System.Drawing.Size(330, 29); 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(660, 64); + this.layoutControlItem8.Location = new System.Drawing.Point(660, 58); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem8.Size = new System.Drawing.Size(330, 29); this.layoutControlItem8.Text = "妫�楠屼汉鍛�"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem33 // this.layoutControlItem33.Control = this.txt_createDate; - this.layoutControlItem33.Location = new System.Drawing.Point(660, 31); + this.layoutControlItem33.Location = new System.Drawing.Point(660, 29); this.layoutControlItem33.Name = "layoutControlItem33"; this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem33.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem33.Size = new System.Drawing.Size(330, 29); this.layoutControlItem33.Text = "鍒涘缓鏃堕棿"; this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fcheckDate; - this.layoutControlItem2.Location = new System.Drawing.Point(660, 163); + this.layoutControlItem2.Location = new System.Drawing.Point(660, 145); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem2.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem2.Size = new System.Drawing.Size(330, 29); this.layoutControlItem2.Text = "妫�楠屾棩鏈�"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem35 + // + this.layoutControlItem35.Control = this.txt_zrType; + this.layoutControlItem35.Location = new System.Drawing.Point(990, 232); + this.layoutControlItem35.Name = "layoutControlItem35"; + this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8; + this.layoutControlItem35.Size = new System.Drawing.Size(332, 30); + this.layoutControlItem35.Text = "璐d换鍒ゅ畾"; + this.layoutControlItem35.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, 232); 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.OptionsTableLayoutItem.RowIndex = 8; + this.layoutControlItem12.Size = new System.Drawing.Size(660, 30); this.layoutControlItem12.Text = "澶囨敞璇存槑"; this.layoutControlItem12.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, 203); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 7; + this.layoutControlItem6.Size = new System.Drawing.Size(660, 29); + 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, 174); + this.layoutControlItem34.Name = "layoutControlItem34"; + this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem34.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem34.Text = "浜у搧鍚嶇О"; + this.layoutControlItem34.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, 145); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem5.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem5.Text = "浜у搧缂栫爜"; + this.layoutControlItem5.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, 29); + this.layoutControlItem1.Text = "妫�楠屽崟鍙�"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_lotNo; + this.layoutControlItem28.Location = new System.Drawing.Point(0, 29); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem28.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem28.Text = "閫夋嫨宸ュ崟"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); + // + // txt_boxQty11 + // + this.txt_boxQty11.Control = this.txt_kbList; + this.txt_boxQty11.Location = new System.Drawing.Point(0, 58); + this.txt_boxQty11.Name = "txt_boxQty11"; + this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 2; + this.txt_boxQty11.Size = new System.Drawing.Size(330, 29); + this.txt_boxQty11.Text = "閫佹绠辩爜"; + this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_fbatchQty; + this.layoutControlItem9.Location = new System.Drawing.Point(330, 29); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem9.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem9.Text = "鎶芥鏁伴噺"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.txt_lifnr; + this.layoutControlItem22.Location = new System.Drawing.Point(330, 58); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem22.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem24 + // + this.layoutControlItem24.Control = this.txt_suppId; + this.layoutControlItem24.Location = new System.Drawing.Point(330, 87); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem24.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem24.Text = "瀹㈡埛缂栫爜"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.txt_lotNo1; + this.layoutControlItem3.Location = new System.Drawing.Point(330, 116); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem3.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem3.Text = "閫佹鎵瑰彿"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + // + // txt_epTagtxt + // + this.txt_epTagtxt.Control = this.txt_epTag; + this.txt_epTagtxt.Location = new System.Drawing.Point(330, 145); + this.txt_epTagtxt.Name = "txt_epTagtxt"; + this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1; + this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5; + this.txt_epTagtxt.Size = new System.Drawing.Size(330, 29); + this.txt_epTagtxt.Text = "鐜繚鏍囪瘑"; + this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txt_fmanageNo; + this.layoutControlItem18.Location = new System.Drawing.Point(330, 174); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem18.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem18.Text = "娴佺▼缂栧彿"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); + // + // txt_lineName111 + // + this.txt_lineName111.Control = this.txt_lineName; + this.txt_lineName111.Location = new System.Drawing.Point(0, 116); + this.txt_lineName111.Name = "txt_lineName111"; + this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 4; + this.txt_lineName111.Size = new System.Drawing.Size(330, 29); + this.txt_lineName111.Text = "鐢熶骇绾垮埆"; + this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem30 + // + this.layoutControlItem30.Control = this.txt_kbSl; + this.layoutControlItem30.Location = new System.Drawing.Point(0, 87); + this.layoutControlItem30.Name = "layoutControlItem30"; + this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem30.Size = new System.Drawing.Size(330, 29); + this.layoutControlItem30.Text = "閫佹鏁伴噺"; + this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18); // // xtraTabControl2 // @@ -1602,7 +1731,8 @@ this.xtraTabControl2.TabIndex = 3; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, - this.tabMxPage2}); + this.tabMxPage2, + this.tabMxPage3}); // // tabMxPage1 // @@ -1638,6 +1768,9 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; + this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.rptDefectLevel, + this.rptDefectDetails}); this.gcMx1.Size = new System.Drawing.Size(1340, 287); this.gcMx1.TabIndex = 1; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1665,7 +1798,9 @@ this.gvMx1fngQty, this.gvMx1sampleSizeNo, this.gvMx1fcheckLevel, - this.gvMx1facLevel}); + this.gvMx1facLevel, + this.gridColumn9, + this.gridColumn10}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1877,6 +2012,55 @@ this.gvMx1facLevel.Visible = true; this.gvMx1facLevel.VisibleIndex = 15; this.gvMx1facLevel.Width = 200; + // + // gridColumn9 + // + this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn9.AppearanceCell.Options.UseForeColor = true; + this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn9.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn9.Caption = "缂洪櫡绛夌骇"; + this.gridColumn9.ColumnEdit = this.rptDefectLevel; + this.gridColumn9.FieldName = "defectLevel"; + this.gridColumn9.MinWidth = 25; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Tag = "edit"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 16; + this.gridColumn9.Width = 94; + // + // rptDefectLevel + // + this.rptDefectLevel.AutoHeight = false; + this.rptDefectLevel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.rptDefectLevel.Name = "rptDefectLevel"; + this.rptDefectLevel.NullText = "--"; + this.rptDefectLevel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + // + // gridColumn10 + // + this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn10.AppearanceCell.Options.UseForeColor = true; + this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn10.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn10.Caption = "缂洪櫡鎻忚堪"; + this.gridColumn10.ColumnEdit = this.rptDefectDetails; + this.gridColumn10.FieldName = "defectDetails"; + this.gridColumn10.MinWidth = 25; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.Tag = "edit"; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 17; + this.gridColumn10.Width = 94; + // + // rptDefectDetails + // + this.rptDefectDetails.AutoHeight = false; + this.rptDefectDetails.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.rptDefectDetails.Name = "rptDefectDetails"; + this.rptDefectDetails.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDefectDetails_ButtonClick); // // splitYangLi // @@ -2174,10 +2358,10 @@ columnDefinition6, columnDefinition7, columnDefinition8}); - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition10.Height = 100D; + rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition9}); + rowDefinition10}); this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43); this.layoutControlGroup1.TextVisible = false; @@ -2225,16 +2409,33 @@ // // 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.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, 362); + this.ucChouJianList1.TabIndex = 0; + // + // tabMxPage3 + // + this.tabMxPage3.Controls.Add(this.ucUpFileList1); + this.tabMxPage3.Name = "tabMxPage3"; + this.tabMxPage3.Size = new System.Drawing.Size(1340, 362); + 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.TabIndex = 0; @@ -2302,7 +2503,6 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit(); @@ -2320,9 +2520,8 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit(); ((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.txt_states.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(); @@ -2330,17 +2529,19 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_fzrIdTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.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.Root)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); @@ -2350,19 +2551,28 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2374,6 +2584,8 @@ this.splitMx2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptDefectLevel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptDefectDetails)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).EndInit(); this.splitYangLi.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).EndInit(); @@ -2398,6 +2610,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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(); @@ -2485,7 +2698,7 @@ private DevExpress.XtraEditors.PanelControl panMsg; private DevExpress.XtraEditors.SimpleButton btnLoad; private DevExpress.XtraEditors.TextEdit txtJianYan; - 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; @@ -2521,28 +2734,18 @@ private DevExpress.XtraEditors.ComboBoxEdit txt_djType; private UserControl.UcLookCustomer txt_suppId; 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.XtraEditors.TextEdit txt_states; + private DevExpress.XtraEditors.TextEdit txt_checkStates; private DevExpress.XtraEditors.ComboBoxEdit txt_epTag; - private UserControl.UcLookWorkline txt_lineId; private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraEditors.TextEdit txt_createDate; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; - private DevExpress.XtraEditors.ButtonEdit txt_itemId; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; 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.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraEditors.TextEdit txt_fzrIdTxt; private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; @@ -2555,20 +2758,44 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; - private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptDefectLevel; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails; + private DevExpress.XtraEditors.TextEdit txt_zrType; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; + private DevExpress.XtraEditors.ButtonEdit txt_kbList; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraEditors.ButtonEdit txt_lotNo; + private DevExpress.XtraEditors.TextEdit txt_lineName; + private DevExpress.XtraEditors.TextEdit txt_itemId; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; + private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraEditors.TextEdit txt_lineId; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraTab.XtraTabPage tabMxPage2; + private UcChouJianList ucChouJianList1; + private DevExpress.XtraEditors.TextEdit txt_kbSl; + private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111; + private DevExpress.XtraLayout.LayoutControlItem txt_lineName111; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; } } \ No newline at end of file -- Gitblit v1.9.3