From 48ff014392dbb512ed141383a4a3ed8b43a57ff0 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期三, 09 四月 2025 08:46:53 +0800 Subject: [PATCH] 异常处置单 --- DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs | 603 +++++++++++++++++++++++++----------------------------- 1 files changed, 280 insertions(+), 323 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs index 239d57c..51c34ac 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs @@ -72,14 +72,13 @@ 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(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_msg = new Gs.DevApp.UserControl.UcDictionary(); - this.txt_workNo = new Gs.DevApp.UserControl.UcLookGx(); + this.txt_fmrmode = new Gs.DevApp.UserControl.UcLookGx(); this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_remarks = new DevExpress.XtraEditors.TextEdit(); @@ -99,8 +98,8 @@ this.txt_lifnr = new DevExpress.XtraEditors.TextEdit(); this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_lotNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_lotNo2 = new DevExpress.XtraEditors.TextEdit(); - this.textEdit5 = new DevExpress.XtraEditors.TextEdit(); + this.txt_workNo = new DevExpress.XtraEditors.TextEdit(); + this.txt_states = 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(); @@ -108,7 +107,7 @@ this.txt_lineId = new DevExpress.XtraEditors.TextEdit(); this.txt_itemId = new DevExpress.XtraEditors.TextEdit(); this.txt_suppId = new DevExpress.XtraEditors.TextEdit(); - this.txt_fsecondResu = new DevExpress.XtraEditors.ComboBoxEdit(); + this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -123,23 +122,26 @@ this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = 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.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = 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.layoutControlItem11 = 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(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -190,9 +192,7 @@ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -230,8 +230,8 @@ ((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_lotNo2.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_states.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(); @@ -239,7 +239,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); @@ -254,23 +254,26 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).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.layoutControlItem31)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem11)).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(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -302,9 +305,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); this.SuspendLayout(); // // repositoryItemComboBox1 @@ -375,7 +375,6 @@ // 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"; @@ -388,13 +387,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 +404,6 @@ this.gridColumn14, this.gv_fcovertQty, this.gv_fbatchQty, - this.gv_fcheckResu, this.gv_remarks, this.gv_fcheckBy, this.gv_fcheckDate, @@ -417,7 +416,6 @@ this.gridColumn30, this.gridColumn13, this.gridColumn17, - this.gridColumn6, this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; @@ -428,7 +426,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 +440,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"; @@ -457,7 +453,6 @@ // // 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 +461,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 +471,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 +484,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 +497,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 +510,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 +523,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 +534,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 +548,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,12 +561,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"; @@ -586,12 +574,11 @@ 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.VisibleIndex = 2; 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 +587,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 +600,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 +613,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 +626,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 +636,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 +649,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 +662,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 +672,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 +682,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 +700,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 +710,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 // @@ -791,7 +763,7 @@ // layoutMx1 // this.layoutMx1.Controls.Add(this.txt_msg); - this.layoutMx1.Controls.Add(this.txt_workNo); + this.layoutMx1.Controls.Add(this.txt_fmrmode); this.layoutMx1.Controls.Add(this.txt_fzrId); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_remarks); @@ -811,8 +783,8 @@ 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_lotNo2); - this.layoutMx1.Controls.Add(this.textEdit5); + this.layoutMx1.Controls.Add(this.txt_workNo); + this.layoutMx1.Controls.Add(this.txt_states); this.layoutMx1.Controls.Add(this.txt_epTag); this.layoutMx1.Controls.Add(this.txt_createBy); this.layoutMx1.Controls.Add(this.txt_createDate); @@ -820,7 +792,7 @@ this.layoutMx1.Controls.Add(this.txt_lineId); this.layoutMx1.Controls.Add(this.txt_itemId); this.layoutMx1.Controls.Add(this.txt_suppId); - this.layoutMx1.Controls.Add(this.txt_fsecondResu); + this.layoutMx1.Controls.Add(this.txt_fngHandle); this.layoutMx1.Controls.Add(this.txt_freceQty); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { @@ -828,7 +800,7 @@ this.layoutControlItem21}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(225, 479, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(116, 591, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1342, 282); this.layoutMx1.TabIndex = 0; @@ -844,22 +816,22 @@ this.txt_msg.TextTxt = ""; this.txt_msg.WhereTxt = null; // - // txt_workNo + // txt_fmrmode // - this.txt_workNo.IsReadly = false; - this.txt_workNo.Location = new System.Drawing.Point(1074, 241); - this.txt_workNo.Margin = new System.Windows.Forms.Padding(0); - this.txt_workNo.Name = "txt_workNo"; - this.txt_workNo.Size = new System.Drawing.Size(256, 24); - this.txt_workNo.TabIndex = 813; - this.txt_workNo.Tag = "readonly"; + this.txt_fmrmode.IsReadly = false; + this.txt_fmrmode.Location = new System.Drawing.Point(1074, 241); + 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); + this.txt_fmrmode.TabIndex = 813; + this.txt_fmrmode.Tag = "readonly"; // // txt_fzrId // this.txt_fzrId.IsReadly = false; - this.txt_fzrId.Location = new System.Drawing.Point(744, 175); + this.txt_fzrId.Location = new System.Drawing.Point(1074, 175); this.txt_fzrId.Name = "txt_fzrId"; - this.txt_fzrId.Size = new System.Drawing.Size(254, 24); + this.txt_fzrId.Size = new System.Drawing.Size(256, 24); this.txt_fzrId.TabIndex = 812; // // lbGuid @@ -875,9 +847,8 @@ // this.txt_remarks.Location = new System.Drawing.Point(84, 241); 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"; @@ -893,22 +864,20 @@ // // txt_releaseNo // - this.txt_releaseNo.Location = new System.Drawing.Point(84, 44); + this.txt_releaseNo.Location = new System.Drawing.Point(84, 43); 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, 43); 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"; @@ -917,9 +886,8 @@ // this.txt_lotNo1.Location = new System.Drawing.Point(744, 76); 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"; @@ -928,9 +896,8 @@ // this.txt_itemNo.Location = new System.Drawing.Point(84, 142); 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"; @@ -948,9 +915,8 @@ // this.txt_fcheckBy.Location = new System.Drawing.Point(414, 76); 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"; @@ -959,16 +925,15 @@ // this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12); 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, 109); + this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitBy.StyleController = this.layoutMx1; @@ -977,7 +942,7 @@ // // txt_fsubmitDate // - this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 76); + this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 12); this.txt_fsubmitDate.Name = "txt_fsubmitDate"; this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitDate.StyleController = this.layoutMx1; @@ -986,7 +951,7 @@ // // txt_fsubmit // - this.txt_fsubmit.Location = new System.Drawing.Point(1002, 142); + this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑"; this.txt_fsubmit.Size = new System.Drawing.Size(328, 24); @@ -1046,22 +1011,22 @@ this.txt_lotNo.TabIndex = 815; this.txt_lotNo.Tag = "readonly"; // - // txt_lotNo2 + // txt_workNo // - this.txt_lotNo2.Location = new System.Drawing.Point(1074, 208); - this.txt_lotNo2.Name = "txt_lotNo2"; - this.txt_lotNo2.Size = new System.Drawing.Size(256, 24); - this.txt_lotNo2.StyleController = this.layoutMx1; - this.txt_lotNo2.TabIndex = 816; + this.txt_workNo.Location = new System.Drawing.Point(1074, 208); + 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; // - // textEdit5 + // txt_states // - 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_states.Location = new System.Drawing.Point(414, 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"; // // txt_epTag // @@ -1076,18 +1041,18 @@ // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(1074, 12); + this.txt_createBy.Location = new System.Drawing.Point(744, 175); this.txt_createBy.Name = "txt_createBy"; - this.txt_createBy.Size = new System.Drawing.Size(256, 24); + this.txt_createBy.Size = new System.Drawing.Size(254, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 822; this.txt_createBy.Tag = "readonly"; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(1074, 44); + this.txt_createDate.Location = new System.Drawing.Point(744, 142); this.txt_createDate.Name = "txt_createDate"; - this.txt_createDate.Size = new System.Drawing.Size(256, 24); + this.txt_createDate.Size = new System.Drawing.Size(254, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 823; this.txt_createDate.Tag = "readonly"; @@ -1121,43 +1086,43 @@ // // txt_suppId // - this.txt_suppId.Location = new System.Drawing.Point(744, 44); + this.txt_suppId.Location = new System.Drawing.Point(744, 43); this.txt_suppId.Name = "txt_suppId"; this.txt_suppId.Size = new System.Drawing.Size(254, 24); this.txt_suppId.StyleController = this.layoutMx1; this.txt_suppId.TabIndex = 828; this.txt_suppId.Tag = "readonly"; // - // txt_fsecondResu + // txt_fngHandle // - this.txt_fsecondResu.EditValue = "-璇烽�夋嫨-"; - this.txt_fsecondResu.Location = new System.Drawing.Point(1074, 175); - this.txt_fsecondResu.Name = "txt_fsecondResu"; - this.txt_fsecondResu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + this.txt_fngHandle.EditValue = "-璇烽�夋嫨-"; + this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142); + 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_fsecondResu.Properties.Items.AddRange(new object[] { + this.txt_fngHandle.Properties.Items.AddRange(new object[] { "-璇烽�夋嫨-", - "杩斿伐", - "鐗归噰", - "鎸戦�変娇鐢�"}); - this.txt_fsecondResu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_fsecondResu.Size = new System.Drawing.Size(256, 24); - this.txt_fsecondResu.StyleController = this.layoutMx1; - this.txt_fsecondResu.TabIndex = 829; + "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; + this.txt_fngHandle.TabIndex = 829; // // txt_freceQty // this.txt_freceQty.EditValue = "-璇烽�夋嫨-"; - this.txt_freceQty.Location = new System.Drawing.Point(744, 142); + this.txt_freceQty.Location = new System.Drawing.Point(1074, 109); this.txt_freceQty.Name = "txt_freceQty"; 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(254, 24); + this.txt_freceQty.Size = new System.Drawing.Size(256, 24); this.txt_freceQty.StyleController = this.layoutMx1; this.txt_freceQty.TabIndex = 830; // @@ -1199,26 +1164,26 @@ this.txt_epTagtxt, this.layoutControlItem10, this.layoutControlItem32, - this.layoutControlItem12, this.layoutControlItem29, this.layoutControlItem5, this.layoutControlItem6, this.layoutControlItem34, - this.layoutControlItem31, - this.layoutControlItem33, - this.layoutControlItem16, - this.layoutControlItem15, - this.layoutControlItem14, this.layoutControlItem7, this.txt_itemId11111, this.layoutControlItem18, this.layoutControlItem28, this.layoutControlItem4, - this.layoutControlItem11, this.layoutControlItem27, - this.layoutControlItem25, + this.layoutControlItem26, + this.layoutControlItem33, + this.layoutControlItem31, + this.layoutControlItem16, + this.layoutControlItem15, + this.layoutControlItem14, this.layoutControlItem13, - this.layoutControlItem26}); + this.layoutControlItem11, + this.layoutControlItem25, + this.layoutControlItem12}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1265,10 +1230,10 @@ // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_releaseNo; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 32); + 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, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(330, 33); this.layoutControlItem1.Text = "妫�楠屽崟鍙�"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // @@ -1277,7 +1242,7 @@ 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.Size = new System.Drawing.Size(330, 31); this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // @@ -1295,11 +1260,11 @@ // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fcheckDate; - this.layoutControlItem2.Location = new System.Drawing.Point(330, 32); + this.layoutControlItem2.Location = new System.Drawing.Point(330, 31); 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.Size = new System.Drawing.Size(330, 33); this.layoutControlItem2.Text = "妫�楠屾棩鏈�"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // @@ -1309,7 +1274,7 @@ 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.Size = new System.Drawing.Size(330, 31); this.layoutControlItem9.Text = "鎶芥鏁伴噺"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // @@ -1330,7 +1295,7 @@ 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, 31); this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); // @@ -1358,7 +1323,7 @@ // // layoutControlItem32 // - this.layoutControlItem32.Control = this.textEdit5; + this.layoutControlItem32.Control = this.txt_states; this.layoutControlItem32.Location = new System.Drawing.Point(330, 97); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1; @@ -1367,20 +1332,9 @@ this.layoutControlItem32.Text = "妫�楠岀姸鎬�"; this.layoutControlItem32.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.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem12.Size = new System.Drawing.Size(660, 33); - this.layoutControlItem12.Text = "澶囨敞璇存槑"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem29 // - this.layoutControlItem29.Control = this.txt_lotNo2; + this.layoutControlItem29.Control = this.txt_workNo; this.layoutControlItem29.Location = new System.Drawing.Point(990, 196); this.layoutControlItem29.Name = "layoutControlItem29"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; @@ -1420,63 +1374,6 @@ this.layoutControlItem34.Size = new System.Drawing.Size(330, 33); this.layoutControlItem34.Text = "浜у搧鍚嶇О"; this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem31 - // - this.layoutControlItem31.Control = this.txt_createBy; - this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳"; - this.layoutControlItem31.Location = new System.Drawing.Point(990, 0); - this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem31.Size = new System.Drawing.Size(332, 32); - this.layoutControlItem31.Text = "鍒涘缓浜哄憳"; - this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem33 - // - this.layoutControlItem33.Control = this.txt_createDate; - this.layoutControlItem33.Location = new System.Drawing.Point(990, 32); - this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem33.Size = new System.Drawing.Size(332, 32); - this.layoutControlItem33.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txt_fsubmitDate; - this.layoutControlItem16.CustomizationFormText = "瀹℃牳浜哄憳"; - this.layoutControlItem16.Location = new System.Drawing.Point(990, 64); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem16.Size = new System.Drawing.Size(332, 33); - 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, 97); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(332, 33); - 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, 130); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem14.Size = new System.Drawing.Size(332, 33); - this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem14.TextVisible = false; // // layoutControlItem7 // @@ -1523,24 +1420,13 @@ // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_suppId; - this.layoutControlItem4.Location = new System.Drawing.Point(660, 32); + this.layoutControlItem4.Location = new System.Drawing.Point(660, 31); 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, 33); this.layoutControlItem4.Text = "瀹㈡埛鍚嶇О"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_fsecondResu; - this.layoutControlItem11.Location = new System.Drawing.Point(990, 163); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem11.Size = new System.Drawing.Size(332, 33); - this.layoutControlItem11.Text = "澶勭疆缁撴灉"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem27 // @@ -1554,6 +1440,119 @@ 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.Name = "layoutControlItem33"; + this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem33.Size = new System.Drawing.Size(330, 33); + this.layoutControlItem33.Text = "鍒涘缓鏃堕棿"; + this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem31 + // + this.layoutControlItem31.Control = this.txt_createBy; + this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳"; + this.layoutControlItem31.Location = new System.Drawing.Point(660, 163); + 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.Text = "鍒涘缓浜哄憳"; + this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_fsubmitDate; + this.layoutControlItem16.CustomizationFormText = "瀹℃牳浜哄憳"; + 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.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.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem15.Size = new System.Drawing.Size(332, 33); + 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.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem14.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem14.TextVisible = false; + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_freceQty; + this.layoutControlItem13.Location = new System.Drawing.Point(990, 97); + 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.Text = "鍒ゅ畾缁撴灉"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_fngHandle; + this.layoutControlItem11.CustomizationFormText = "澶勭疆缁撴灉"; + this.layoutControlItem11.Location = new System.Drawing.Point(990, 130); + 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.Text = "澶勭疆缁撴灉"; + this.layoutControlItem11.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.Name = "layoutControlItem25"; + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem25.Size = new System.Drawing.Size(332, 33); + this.layoutControlItem25.Text = "璐d换浜�"; + this.layoutControlItem25.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.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7; + this.layoutControlItem12.Size = new System.Drawing.Size(660, 33); + this.layoutControlItem12.Text = "澶囨敞璇存槑"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // xtraTabControl2 // @@ -1636,7 +1635,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"; @@ -1647,7 +1645,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"; @@ -1660,7 +1657,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"; @@ -1673,7 +1669,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"; @@ -1686,7 +1681,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"; @@ -1699,7 +1693,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"; @@ -1712,7 +1705,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"; @@ -1725,7 +1717,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"; @@ -1738,7 +1729,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"; @@ -1751,7 +1741,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"; @@ -1764,7 +1753,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"; @@ -1777,7 +1765,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; @@ -1794,7 +1781,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"; @@ -1807,7 +1793,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"; @@ -1820,7 +1805,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"; @@ -1833,7 +1817,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"; @@ -1846,7 +1829,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"; @@ -1899,7 +1881,6 @@ // // 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, @@ -1995,7 +1976,6 @@ // // 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, @@ -2128,38 +2108,15 @@ // this.gridView4.Name = "gridView4"; // - // layoutControlItem25 + // gridColumn5 // - this.layoutControlItem25.Control = this.txt_fzrId; - this.layoutControlItem25.Location = new System.Drawing.Point(660, 163); - this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem25.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem25.Text = "璐d换浜�"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem13 - // - this.layoutControlItem13.Control = this.txt_freceQty; - this.layoutControlItem13.Location = new System.Drawing.Point(660, 130); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem13.Size = new System.Drawing.Size(330, 33); - this.layoutControlItem13.Text = "鍒ゅ畾缁撴灉"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.txt_workNo; - 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); + 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; // // Frm_FqcDetect01Check // @@ -2208,8 +2165,8 @@ ((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_lotNo2.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_states.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(); @@ -2217,7 +2174,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); @@ -2232,23 +2189,26 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).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.layoutControlItem31)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem11)).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(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2280,9 +2240,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); this.ResumeLayout(false); } @@ -2390,10 +2347,10 @@ private DevExpress.XtraEditors.TextEdit txt_lifnr; private DevExpress.XtraEditors.ComboBoxEdit txt_djType; private UserControl.UcLookStaff txt_fzrId; - private UserControl.UcLookGx txt_workNo; + private UserControl.UcLookGx txt_fmrmode; private UserControl.UcDictionary txt_msg; private DevExpress.XtraEditors.TextEdit txt_lotNo; - private DevExpress.XtraEditors.TextEdit txt_lotNo2; + private DevExpress.XtraEditors.TextEdit txt_workNo; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; @@ -2401,27 +2358,20 @@ 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_states; 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 layoutControlItem12; 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.XtraLayout.LayoutControlItem layoutControlItem31; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; 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; @@ -2432,12 +2382,19 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; private DevExpress.XtraEditors.TextEdit txt_suppId; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraEditors.ComboBoxEdit txt_fsecondResu; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle; private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; } } \ No newline at end of file -- Gitblit v1.9.3