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/SelectFqcItem.Designer.cs | 162 +++---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs | 51 ++
DevApp/Gs.DevApp/UserControl/UcLookGx.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 90 ++--
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs | 194 +++-----
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 649 +++++++++++++++---------------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 1
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 88 ++--
8 files changed, 605 insertions(+), 632 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index cd5f857..f69ab32 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -56,6 +56,9 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -78,7 +81,6 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -108,35 +110,25 @@
this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
- this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_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();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.txt_fzrId = new DevExpress.XtraEditors.TextEdit();
- this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fzrIdTxt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_freceQty = 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.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = 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.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -145,9 +137,19 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = 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.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -248,35 +250,25 @@
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_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();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fzrId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+ ((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.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.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).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.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -285,9 +277,19 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).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.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
@@ -399,7 +401,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";
@@ -412,13 +413,15 @@
//
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.gridColumn5,
+ this.gridColumn8,
+ this.gridColumn6,
this.gv_lotNo,
this.gridColumn23,
this.gv_lifnr,
@@ -441,7 +444,6 @@
this.gridColumn30,
this.gridColumn13,
this.gridColumn17,
- this.gridColumn6,
this.gridColumn7});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
@@ -452,7 +454,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 = "fsubmitTxt";
@@ -467,7 +468,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";
@@ -479,9 +479,38 @@
this.gv_releaseNo.VisibleIndex = 1;
this.gv_releaseNo.Width = 100;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn5.FieldName = "states";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "妫�楠岀粨鏋�";
+ this.gridColumn8.FieldName = "fcheckResu";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 3;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
+ this.gridColumn6.FieldName = "freceQty";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 4;
+ this.gridColumn6.Width = 94;
+ //
// gv_lotNo
//
- this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "宸ュ崟鍗曞彿";
this.gv_lotNo.FieldName = "lotNo";
@@ -490,7 +519,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 = 5;
this.gv_lotNo.Width = 120;
//
// gridColumn23
@@ -500,12 +529,11 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 3;
+ this.gridColumn23.VisibleIndex = 6;
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";
@@ -514,12 +542,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 = 7;
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";
@@ -528,12 +555,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 = 8;
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";
@@ -542,12 +568,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 = 9;
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";
@@ -556,7 +581,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 = 10;
this.gv_boardStyle.Width = 164;
//
// gridColumn14
@@ -567,12 +592,11 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.VisibleIndex = 11;
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";
@@ -582,12 +606,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 = 12;
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";
@@ -596,12 +619,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 = 13;
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";
@@ -610,12 +632,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 = 14;
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";
@@ -624,12 +645,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 = 15;
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";
@@ -638,12 +658,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 = 16;
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";
@@ -652,12 +671,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 = 17;
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";
@@ -666,7 +684,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 = 18;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -676,12 +694,11 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 16;
+ this.gridColumn15.VisibleIndex = 19;
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";
@@ -690,12 +707,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 = 20;
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";
@@ -704,7 +720,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 = 21;
this.gv_lastupdateDate.Width = 120;
//
// gridColumn18
@@ -714,7 +730,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 19;
+ this.gridColumn18.VisibleIndex = 22;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -724,7 +740,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 20;
+ this.gridColumn19.VisibleIndex = 23;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -742,7 +758,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 21;
+ this.gridColumn13.VisibleIndex = 24;
this.gridColumn13.Width = 94;
//
// gridColumn17
@@ -753,16 +769,6 @@
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
//
this.gridColumn7.Caption = "妫�楠岀被鍨�";
@@ -770,7 +776,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 23;
+ this.gridColumn7.VisibleIndex = 25;
this.gridColumn7.Width = 94;
//
// pageBar1
@@ -838,13 +844,13 @@
this.layoutMx1.Controls.Add(this.txt_djType);
this.layoutMx1.Controls.Add(this.txt_lotNo);
this.layoutMx1.Controls.Add(this.txt_workNo);
- this.layoutMx1.Controls.Add(this.textEdit5);
+ this.layoutMx1.Controls.Add(this.txt_states);
this.layoutMx1.Controls.Add(this.txt_epTag);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_itemName);
- this.layoutMx1.Controls.Add(this.txt_fzrId);
- this.layoutMx1.Controls.Add(this.txt_fmrmode);
+ this.layoutMx1.Controls.Add(this.txt_fzrIdTxt);
+ this.layoutMx1.Controls.Add(this.txt_mrmodeTxt);
this.layoutMx1.Controls.Add(this.txt_freceQty);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -852,7 +858,7 @@
this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(613, 530, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(789, 440, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
this.layoutMx1.TabIndex = 0;
@@ -890,7 +896,7 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(744, 44);
+ this.txt_suppId.Location = new System.Drawing.Point(414, 109);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Size = new System.Drawing.Size(254, 24);
this.txt_suppId.TabIndex = 811;
@@ -917,15 +923,14 @@
//
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;
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(414, 175);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(744, 142);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
@@ -934,33 +939,30 @@
//
// 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, 76);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(744, 175);
this.txt_fcheckDate.Name = "txt_fcheckDate";
- this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(254, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(744, 76);
+ this.txt_lotNo1.Location = new System.Drawing.Point(414, 142);
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 = "";
@@ -969,9 +971,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";
@@ -987,29 +988,27 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(414, 109);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(744, 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";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(414, 43);
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 = "";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 44);
+ 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;
@@ -1055,7 +1054,7 @@
//
// txt_lifnr
//
- this.txt_lifnr.Location = new System.Drawing.Point(744, 12);
+ this.txt_lifnr.Location = new System.Drawing.Point(414, 76);
this.txt_lifnr.Name = "txt_lifnr";
this.txt_lifnr.Size = new System.Drawing.Size(254, 24);
this.txt_lifnr.StyleController = this.layoutMx1;
@@ -1078,7 +1077,7 @@
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(414, 44);
+ 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;
@@ -1094,18 +1093,18 @@
this.txt_workNo.TabIndex = 816;
this.txt_workNo.Tag = "readonly";
//
- // textEdit5
+ // txt_states
//
- this.textEdit5.Location = new System.Drawing.Point(414, 142);
- 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(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";
//
// txt_epTag
//
- this.txt_epTag.Location = new System.Drawing.Point(744, 109);
+ this.txt_epTag.Location = new System.Drawing.Point(414, 175);
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)});
@@ -1115,7 +1114,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(744, 142);
+ this.txt_createBy.Location = new System.Drawing.Point(744, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Size = new System.Drawing.Size(254, 24);
this.txt_createBy.StyleController = this.layoutMx1;
@@ -1124,7 +1123,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(744, 175);
+ this.txt_createDate.Location = new System.Drawing.Point(744, 43);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Size = new System.Drawing.Size(254, 24);
this.txt_createDate.StyleController = this.layoutMx1;
@@ -1140,23 +1139,23 @@
this.txt_itemName.TabIndex = 825;
this.txt_itemName.Tag = "readonly";
//
- // txt_fzrId
+ // txt_fzrIdTxt
//
- this.txt_fzrId.Location = new System.Drawing.Point(1074, 175);
- this.txt_fzrId.Name = "txt_fzrId";
- this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
- this.txt_fzrId.StyleController = this.layoutMx1;
- this.txt_fzrId.TabIndex = 826;
- this.txt_fzrId.Tag = "readonly";
+ this.txt_fzrIdTxt.Location = new System.Drawing.Point(1074, 175);
+ this.txt_fzrIdTxt.Name = "txt_fzrIdTxt";
+ this.txt_fzrIdTxt.Size = new System.Drawing.Size(256, 24);
+ this.txt_fzrIdTxt.StyleController = this.layoutMx1;
+ this.txt_fzrIdTxt.TabIndex = 826;
+ this.txt_fzrIdTxt.Tag = "readonly";
//
- // txt_fmrmode
+ // txt_mrmodeTxt
//
- this.txt_fmrmode.Location = new System.Drawing.Point(1074, 241);
- this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
- this.txt_fmrmode.StyleController = this.layoutMx1;
- this.txt_fmrmode.TabIndex = 827;
- this.txt_fmrmode.Tag = "readonly";
+ this.txt_mrmodeTxt.Location = new System.Drawing.Point(1074, 241);
+ this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
+ this.txt_mrmodeTxt.Size = new System.Drawing.Size(256, 24);
+ this.txt_mrmodeTxt.StyleController = this.layoutMx1;
+ this.txt_mrmodeTxt.TabIndex = 827;
+ this.txt_mrmodeTxt.Tag = "readonly";
//
// txt_freceQty
//
@@ -1197,22 +1196,12 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem23,
- this.layoutControlItem9,
- this.layoutControlItem3,
- this.layoutControlItem24,
- this.layoutControlItem22,
- this.txt_epTagtxt,
this.layoutControlItem5,
this.layoutControlItem30,
this.layoutControlItem4,
this.layoutControlItem6,
this.layoutControlItem34,
this.layoutControlItem18,
- this.layoutControlItem10,
- this.layoutControlItem32,
- this.layoutControlItem8,
- this.layoutControlItem2,
- this.layoutControlItem28,
this.layoutControlItem16,
this.layoutControlItem15,
this.layoutControlItem14,
@@ -1221,9 +1210,19 @@
this.layoutControlItem7,
this.layoutControlItem25,
this.layoutControlItem29,
- this.layoutControlItem31,
- this.layoutControlItem33,
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.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -1271,10 +1270,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);
//
@@ -1283,62 +1282,9 @@
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);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 32);
- this.layoutControlItem9.Text = "鎶芥鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(660, 64);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.Control = this.txt_suppId;
- this.layoutControlItem24.Location = new System.Drawing.Point(660, 32);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(330, 32);
- this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_lifnr;
- 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.Text = "瀹㈡埛璁㈠崟";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_epTagtxt
- //
- this.txt_epTagtxt.Control = this.txt_epTag;
- this.txt_epTagtxt.Location = new System.Drawing.Point(660, 97);
- this.txt_epTagtxt.Name = "txt_epTagtxt";
- this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 2;
- this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 3;
- this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33);
- this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
- this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
@@ -1348,7 +1294,7 @@
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem30
@@ -1403,79 +1349,24 @@
this.layoutControlItem18.Text = "娴佺▼缂栧彿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 163);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem32
- //
- this.layoutControlItem32.Control = this.textEdit5;
- this.layoutControlItem32.Location = new System.Drawing.Point(330, 130);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(330, 97);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(330, 64);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_lotNo;
- this.layoutControlItem28.Location = new System.Drawing.Point(330, 32);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(330, 32);
- this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
this.layoutControlItem16.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(332, 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, 32);
+ 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, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1515,7 +1406,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_fzrId;
+ this.layoutControlItem7.Control = this.txt_fzrIdTxt;
this.layoutControlItem7.Location = new System.Drawing.Point(990, 163);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1526,7 +1417,8 @@
//
// layoutControlItem25
//
- this.layoutControlItem25.Control = this.txt_fmrmode;
+ this.layoutControlItem25.Control = this.txt_mrmodeTxt;
+ this.layoutControlItem25.CustomizationFormText = "杩斿伐宸ュ簭";
this.layoutControlItem25.Location = new System.Drawing.Point(990, 229);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1546,28 +1438,6 @@
this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(660, 130);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem31.Size = new System.Drawing.Size(330, 33);
- 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(660, 163);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem33.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_msg;
@@ -1580,6 +1450,136 @@
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
+ //
+ this.layoutControlItem31.Control = this.txt_createBy;
+ 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.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.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txt_states;
+ this.layoutControlItem32.Location = new System.Drawing.Point(660, 97);
+ 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.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.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txt_createDate;
+ this.layoutControlItem33.Location = new System.Drawing.Point(660, 31);
+ 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.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.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
@@ -1674,7 +1674,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";
@@ -1685,7 +1684,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";
@@ -1698,7 +1696,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";
@@ -1711,7 +1708,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";
@@ -1724,7 +1720,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";
@@ -1737,7 +1732,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";
@@ -1750,7 +1744,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";
@@ -1763,7 +1756,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";
@@ -1776,7 +1768,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";
@@ -1789,7 +1780,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";
@@ -1802,7 +1792,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";
@@ -1815,7 +1804,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;
@@ -1832,7 +1820,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";
@@ -1845,7 +1832,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";
@@ -1858,7 +1844,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";
@@ -1871,7 +1856,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";
@@ -1884,7 +1868,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";
@@ -1937,7 +1920,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,
@@ -2033,7 +2015,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,
@@ -2341,35 +2322,25 @@
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_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();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fzrId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+ ((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.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.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).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.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -2378,9 +2349,19 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).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.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
@@ -2544,13 +2525,8 @@
private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- 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 UserControl.UcLookWorkline txt_lineId;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_createDate;
@@ -2567,13 +2543,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraEditors.TextEdit txt_fzrId;
- private DevExpress.XtraEditors.TextEdit txt_fmrmode;
+ private DevExpress.XtraEditors.TextEdit txt_fzrIdTxt;
+ private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
@@ -2583,9 +2554,21 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
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;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index cb7bc02..012eac3 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -93,7 +93,6 @@
Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input frm = new Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
frm.ShowDialog();
}
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
index 808c3be..51c34ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -72,7 +72,6 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -100,7 +99,7 @@
this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
- this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_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();
@@ -193,6 +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.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -231,7 +231,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_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();
@@ -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
//
@@ -812,7 +784,7 @@
this.layoutMx1.Controls.Add(this.txt_djType);
this.layoutMx1.Controls.Add(this.txt_lotNo);
this.layoutMx1.Controls.Add(this.txt_workNo);
- this.layoutMx1.Controls.Add(this.textEdit5);
+ this.layoutMx1.Controls.Add(this.txt_states);
this.layoutMx1.Controls.Add(this.txt_epTag);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
@@ -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, 44);
+ 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;
@@ -1054,14 +1019,14 @@
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
//
@@ -1121,7 +1086,7 @@
//
// 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;
@@ -1137,9 +1102,9 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fngHandle.Properties.Items.AddRange(new object[] {
"-璇烽�夋嫨-",
- "杩斿伐",
- "鐗归噰",
- "鎸戦�変娇鐢�"});
+ "1:杩斿伐",
+ "2:鐗归噰",
+ "3:鎸戦�変娇鐢�"});
this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
@@ -1154,8 +1119,8 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_freceQty.Properties.Items.AddRange(new object[] {
"-璇烽�夋嫨-",
- "1:鍚堟牸",
- "2:涓嶅悎鏍�"});
+ "Y:鍚堟牸",
+ "N:涓嶅悎鏍�"});
this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
@@ -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;
@@ -1455,11 +1420,11 @@
// 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);
//
@@ -1517,18 +1482,18 @@
this.layoutControlItem16.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(332, 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, 32);
+ 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, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1670,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";
@@ -1681,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";
@@ -1694,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";
@@ -1707,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";
@@ -1720,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";
@@ -1733,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";
@@ -1746,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";
@@ -1759,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";
@@ -1772,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";
@@ -1785,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";
@@ -1798,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";
@@ -1811,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;
@@ -1828,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";
@@ -1841,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";
@@ -1854,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";
@@ -1867,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";
@@ -1880,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";
@@ -1933,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,
@@ -2029,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,
@@ -2162,6 +2108,16 @@
//
this.gridView4.Name = "gridView4";
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鍒ゅ畾缁撴灉";
+ this.gridColumn5.FieldName = "freceQty";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 94;
+ //
// Frm_FqcDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2210,7 +2166,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_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();
@@ -2402,7 +2358,7 @@
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;
@@ -2416,7 +2372,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private UserControl.UCUpFileList ucUpFileList1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraEditors.TextEdit txt_lineId;
@@ -2440,5 +2395,6 @@
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
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
index 6570002..b1c51d0 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -166,7 +166,6 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -228,18 +227,54 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _txt_fngHandle = txt_fngHandle.Text.Trim();
string _freceQty = txt_freceQty.Text.Trim();
+ string _txt_fngHandle = txt_fngHandle.Text.Trim();
string _txt_fmrmode = txt_fmrmode.GetCode();
string _txt_fzrId = txt_fzrId.GetId();
string _txt_workNo = txt_workNo.Text.Trim();
string _txt_msg = txt_msg.TextTxt;
- //if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�");
- // txt_fbatchQty.Focus();
- // return;
- //}
+ if (txt_freceQty.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
+ txt_freceQty.Focus();
+ return;
+ }
+ //褰撲负涓嶅悎鏍兼椂锛岃閫夋嫨澶勭疆缁撴灉
+ if (txt_freceQty.SelectedIndex != 1)
+ {
+ if (txt_fngHandle.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭疆缁撴灉锛�");
+ txt_fngHandle.Focus();
+ return;
+ }
+ //褰撳缃粨鏋滀负鍙嶅伐鏃讹紝瑕侀�夋嫨宸ュ簭鍜屽弽宸ョ紪鍙�
+ if (txt_fngHandle.SelectedIndex == 1)
+ {
+ if (string.IsNullOrEmpty(_txt_workNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～鍐欏弽宸ュ崟鍙凤紒");
+ txt_workNo.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_fmrmode))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～閫夋嫨鍙嶅伐宸ュ簭锛�");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ }
+ //褰撲负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜�
+ else {
+ if ((_txt_fngHandle.Length + _txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒锛�");
+ txt_freceQty.Focus();
+ return;
+ }
+ }
+
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs
index a3698c7..c629c6d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs
@@ -28,22 +28,22 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -80,6 +80,76 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "涓婚敭Guid";
+ this.gridColumn7.FieldName = "guid";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浜х嚎";
+ this.gridColumn1.FieldName = "lineName";
+ this.gridColumn1.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "宸ュ崟缂栧彿";
+ this.gridColumn2.FieldName = "gdbh";
+ this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 0;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "浜у搧ID";
+ this.gridColumn3.FieldName = "itemId";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浜у搧缂栫爜";
+ this.gridColumn4.FieldName = "itemNo";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "浜у搧鍚嶇О";
+ this.gridColumn5.FieldName = "itemName";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn6.FieldName = "itemModel";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
+ //
// gv_Btn
//
this.gv_Btn.Caption = "閫夋嫨";
@@ -93,81 +163,13 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "浜х嚎";
- this.gridColumn1.FieldName = "lineName";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "宸ュ崟缂栧彿";
- this.gridColumn2.FieldName = "gdbh";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "浜у搧ID";
- this.gridColumn3.FieldName = "itemId";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "浜у搧缂栫爜";
- this.gridColumn4.FieldName = "itemNo";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 4;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "浜у搧鍚嶇О";
- this.gridColumn5.FieldName = "itemName";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 94;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "涓婚敭Guid";
- this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 25;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 94;
//
// SelectFqcItem
//
@@ -180,7 +182,7 @@
this.MinimizeBox = false;
this.Name = "SelectFqcItem";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨缁勭粐";
+ this.Text = "閫夋嫨宸ュ崟";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
index 1c5a35a..676a045 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -389,7 +389,7 @@
// 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";
@@ -402,7 +402,7 @@
//
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;
@@ -442,7 +442,7 @@
//
// 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 = "fsubmitTxt";
@@ -457,7 +457,7 @@
//
// 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";
@@ -471,7 +471,7 @@
//
// 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";
@@ -495,7 +495,7 @@
//
// 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";
@@ -509,7 +509,7 @@
//
// 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";
@@ -523,7 +523,7 @@
//
// 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";
@@ -537,7 +537,7 @@
//
// 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";
@@ -562,7 +562,7 @@
//
// 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";
@@ -577,7 +577,7 @@
//
// 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";
@@ -591,7 +591,7 @@
//
// 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";
@@ -605,7 +605,7 @@
//
// 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";
@@ -619,7 +619,7 @@
//
// 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";
@@ -633,7 +633,7 @@
//
// 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";
@@ -647,7 +647,7 @@
//
// 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";
@@ -671,7 +671,7 @@
//
// 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";
@@ -685,7 +685,7 @@
//
// 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";
@@ -923,7 +923,7 @@
//
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.StyleController = this.layoutMx1;
@@ -942,7 +942,7 @@
//
this.txt_releaseNo.Location = new System.Drawing.Point(84, 44);
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.StyleController = this.layoutMx1;
@@ -953,7 +953,7 @@
//
this.txt_fcheckDate.Location = new System.Drawing.Point(414, 44);
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.StyleController = this.layoutMx1;
@@ -964,7 +964,7 @@
//
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.StyleController = this.layoutMx1;
@@ -975,7 +975,7 @@
//
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.StyleController = this.layoutMx1;
@@ -995,7 +995,7 @@
//
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.StyleController = this.layoutMx1;
@@ -1006,7 +1006,7 @@
//
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.StyleController = this.layoutMx1;
@@ -1640,7 +1640,7 @@
//
// 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";
@@ -1651,7 +1651,7 @@
//
// gvMx1fcheckItem
//
- this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
@@ -1664,7 +1664,7 @@
//
// gvMx1fcheckTool
//
- this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
@@ -1677,7 +1677,7 @@
//
// gvMx1fcheckItemDesc
//
- this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
@@ -1690,7 +1690,7 @@
//
// gvMx1fspecRequ
//
- this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
@@ -1703,7 +1703,7 @@
//
// gvMx1fupAllow
//
- this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
@@ -1716,7 +1716,7 @@
//
// gvMx1fstand
//
- this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
@@ -1729,7 +1729,7 @@
//
// gvMx1fdownAllow
//
- this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
@@ -1742,7 +1742,7 @@
//
// 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";
@@ -1755,7 +1755,7 @@
//
// gvMx1checkQyt
//
- this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
@@ -1768,7 +1768,7 @@
//
// gvMx1fenterQty
//
- this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
@@ -1781,7 +1781,7 @@
//
// 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;
@@ -1798,7 +1798,7 @@
//
// gvMx1fngRate
//
- this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
@@ -1811,7 +1811,7 @@
//
// gvMx1fngQty
//
- this.gvMx1fngQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
@@ -1824,7 +1824,7 @@
//
// gvMx1sampleSizeNo
//
- this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
@@ -1837,7 +1837,7 @@
//
// gvMx1fcheckLevel
//
- this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
@@ -1850,7 +1850,7 @@
//
// gvMx1facLevel
//
- this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
@@ -1903,7 +1903,7 @@
//
// 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,
@@ -1999,7 +1999,7 @@
//
// 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,
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 846cb03..290713f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -342,7 +342,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";
@@ -355,7 +354,6 @@
//
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;
@@ -408,7 +406,7 @@
//
// 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 = "fsubmitTxt";
@@ -423,7 +421,7 @@
//
// 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";
@@ -437,7 +435,7 @@
//
// 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 = "suppName";
@@ -451,7 +449,7 @@
//
// 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";
@@ -465,7 +463,7 @@
//
// 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";
@@ -479,7 +477,7 @@
//
// 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 = "itemNo";
@@ -493,7 +491,7 @@
//
// 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";
@@ -518,7 +516,7 @@
//
// 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";
@@ -532,7 +530,7 @@
//
// 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";
@@ -546,7 +544,7 @@
//
// 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 = "fcovertQty";
@@ -561,7 +559,7 @@
//
// 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";
@@ -575,7 +573,7 @@
//
// 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";
@@ -589,7 +587,7 @@
//
// 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";
@@ -603,7 +601,7 @@
//
// 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";
@@ -627,7 +625,7 @@
//
// 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";
@@ -641,7 +639,7 @@
//
// 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";
@@ -655,7 +653,7 @@
//
// gv_fngHandle
//
- this.gv_fngHandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
this.gv_fngHandle.FieldName = "fngHandle";
@@ -819,7 +817,7 @@
//
this.txt_remarks.Location = new System.Drawing.Point(409, 108);
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(574, 28);
this.txt_remarks.StyleController = this.layoutMx1;
@@ -838,7 +836,7 @@
//
this.txt_itemName.Location = new System.Drawing.Point(84, 44);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(249, 28);
this.txt_itemName.StyleController = this.layoutMx1;
@@ -849,7 +847,7 @@
//
this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
- this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
this.txt_releaseNo.Size = new System.Drawing.Size(249, 28);
this.txt_releaseNo.StyleController = this.layoutMx1;
@@ -860,7 +858,7 @@
//
this.txt_fcheckDate.Location = new System.Drawing.Point(409, 12);
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(249, 28);
this.txt_fcheckDate.StyleController = this.layoutMx1;
@@ -871,7 +869,7 @@
//
this.txt_lotNo.Location = new System.Drawing.Point(734, 12);
this.txt_lotNo.Name = "txt_lotNo";
- this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo.Size = new System.Drawing.Size(249, 28);
this.txt_lotNo.StyleController = this.layoutMx1;
@@ -882,7 +880,7 @@
//
this.txt_itemNo.Location = new System.Drawing.Point(84, 76);
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(249, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
@@ -911,7 +909,7 @@
//
this.txt_fcheckBy.Location = new System.Drawing.Point(409, 44);
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(249, 28);
this.txt_fcheckBy.StyleController = this.layoutMx1;
@@ -922,7 +920,7 @@
//
this.txt_fbatchQty.Location = new System.Drawing.Point(734, 44);
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(249, 28);
this.txt_fbatchQty.StyleController = this.layoutMx1;
@@ -1300,7 +1298,7 @@
//
// 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";
@@ -1311,7 +1309,7 @@
//
// gvMx1fcheckItem
//
- this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
@@ -1324,7 +1322,7 @@
//
// gvMx1fcheckTool
//
- this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
@@ -1337,7 +1335,7 @@
//
// gvMx1fcheckItemDesc
//
- this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
@@ -1350,7 +1348,7 @@
//
// gvMx1fspecRequ
//
- this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
@@ -1363,7 +1361,7 @@
//
// gvMx1fupAllow
//
- this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
@@ -1376,7 +1374,7 @@
//
// gvMx1fstand
//
- this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
@@ -1389,7 +1387,7 @@
//
// gvMx1fdownAllow
//
- this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
@@ -1402,7 +1400,7 @@
//
// 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";
@@ -1415,7 +1413,7 @@
//
// gvMx1checkQyt
//
- this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
@@ -1428,7 +1426,7 @@
//
// gvMx1fenterQty
//
- this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
@@ -1441,7 +1439,7 @@
//
// 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;
@@ -1458,7 +1456,7 @@
//
// gvMx1fngRate
//
- this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
@@ -1471,7 +1469,7 @@
//
// gvMx1fngQty
//
- this.gvMx1fngQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
@@ -1484,7 +1482,7 @@
//
// gvMx1sampleSizeNo
//
- this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
@@ -1497,7 +1495,7 @@
//
// gvMx1fcheckLevel
//
- this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
@@ -1510,7 +1508,7 @@
//
// gvMx1facLevel
//
- this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
@@ -1563,7 +1561,7 @@
//
// 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,
@@ -1659,7 +1657,7 @@
//
// 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,
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
index 1dddcd1..122f959 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
@@ -58,7 +58,7 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
lookSearchSupplier.Properties.DataSource = dt;
- lookSearchSupplier.Properties.DisplayMember = "processName";
+ lookSearchSupplier.Properties.DisplayMember = "processNoAndName";
lookSearchSupplier.Properties.ValueMember = "processNo";
lookSearchSupplier.ForceInitialize();
lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
--
Gitblit v1.9.3