From cdca5a70b3fac5f804a6eabb7a3976f8c00e35e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 08 四月 2025 16:40:30 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 1388 +++++++++++++++++++++++++--------------------------------
 1 files changed, 614 insertions(+), 774 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 125ee32..cd5f857 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -29,6 +29,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -46,21 +47,6 @@
             DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.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();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -68,18 +54,18 @@
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_releaseNo = 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();
             this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -87,13 +73,13 @@
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.bandedGridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -101,16 +87,14 @@
             this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
             this.txt_lineId = new Gs.DevApp.UserControl.UcLookWorkline();
             this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
-            this.txt_workNo = new Gs.DevApp.UserControl.UcLookGx();
-            this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff();
             this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_fsecondResu = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
             this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
             this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
             this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_fcheckDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_logNo1 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
             this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
@@ -123,43 +107,48 @@
             this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
             this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_lotNo2 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
             this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
-            this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit2 = 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_freceQty = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_epTag = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = 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();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            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.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -212,26 +201,13 @@
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx4 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
+            this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList();
             this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -253,12 +229,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_logNo1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
@@ -271,43 +247,48 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.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_freceQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_epTag)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).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();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((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.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -343,11 +324,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
@@ -441,18 +417,18 @@
             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.gridColumn13,
             this.gv_fsubmit,
-            this.gv_lotNo,
-            this.gv_lifnr,
             this.gv_releaseNo,
+            this.gv_lotNo,
+            this.gridColumn23,
+            this.gv_lifnr,
             this.gv_itemId,
             this.gv_itemNo,
             this.gv_boardStyle,
             this.gridColumn14,
+            this.gv_fcovertQty,
             this.gv_fbatchQty,
             this.gv_fcheckResu,
-            this.gv_fcovertQty,
             this.gv_remarks,
             this.gv_fcheckBy,
             this.gv_fcheckDate,
@@ -460,32 +436,19 @@
             this.gridColumn15,
             this.gv_lastupdateBy,
             this.gv_lastupdateDate,
-            this.gv_fngHandle,
-            this.bandedGridColumn1,
             this.gridColumn18,
             this.gridColumn19,
+            this.gridColumn30,
+            this.gridColumn13,
             this.gridColumn17,
-            this.gridColumn23,
-            this.gridColumn30});
+            this.gridColumn6,
+            this.gridColumn7});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
-            this.gridColumn13.FieldName = "urgentLagTxt";
-            this.gridColumn13.MinWidth = 30;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.OptionsColumn.ReadOnly = true;
-            this.gridColumn13.Tag = "query_a.fsubmit";
-            this.gridColumn13.UnboundDataType = typeof(bool);
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 50;
             // 
             // gv_fsubmit
             // 
@@ -499,36 +462,8 @@
             this.gv_fsubmit.Tag = "query_a.fsubmit";
             this.gv_fsubmit.UnboundDataType = typeof(bool);
             this.gv_fsubmit.Visible = true;
-            this.gv_fsubmit.VisibleIndex = 1;
+            this.gv_fsubmit.VisibleIndex = 0;
             this.gv_fsubmit.Width = 50;
-            // 
-            // 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";
-            this.gv_lotNo.MinWidth = 30;
-            this.gv_lotNo.Name = "gv_lotNo";
-            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.Width = 120;
-            // 
-            // 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";
-            this.gv_lifnr.MinWidth = 30;
-            this.gv_lifnr.Name = "gv_lifnr";
-            this.gv_lifnr.OptionsColumn.AllowEdit = false;
-            this.gv_lifnr.Tag = "query_a.lifnr";
-            this.gv_lifnr.Visible = true;
-            this.gv_lifnr.VisibleIndex = 3;
-            this.gv_lifnr.Width = 200;
             // 
             // gv_releaseNo
             // 
@@ -541,8 +476,46 @@
             this.gv_releaseNo.OptionsColumn.AllowEdit = false;
             this.gv_releaseNo.Tag = "query_a.release_no";
             this.gv_releaseNo.Visible = true;
-            this.gv_releaseNo.VisibleIndex = 4;
+            this.gv_releaseNo.VisibleIndex = 1;
             this.gv_releaseNo.Width = 100;
+            // 
+            // 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";
+            this.gv_lotNo.MinWidth = 30;
+            this.gv_lotNo.Name = "gv_lotNo";
+            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.Width = 120;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "浜х嚎鍚嶇О";
+            this.gridColumn23.FieldName = "lineName";
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 3;
+            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";
+            this.gv_lifnr.MinWidth = 30;
+            this.gv_lifnr.Name = "gv_lifnr";
+            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.Width = 200;
             // 
             // gv_itemId
             // 
@@ -563,7 +536,7 @@
             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";
+            this.gv_itemNo.FieldName = "itemNo2";
             this.gv_itemNo.MinWidth = 30;
             this.gv_itemNo.Name = "gv_itemNo";
             this.gv_itemNo.OptionsColumn.AllowEdit = false;
@@ -597,18 +570,33 @@
             this.gridColumn14.VisibleIndex = 8;
             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";
+            this.gv_fcovertQty.MinWidth = 30;
+            this.gv_fcovertQty.Name = "gv_fcovertQty";
+            this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
+            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.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.Caption = "鎶芥鏁伴噺";
             this.gv_fbatchQty.FieldName = "fbatchQty";
             this.gv_fbatchQty.MinWidth = 30;
             this.gv_fbatchQty.Name = "gv_fbatchQty";
             this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
             this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
             this.gv_fbatchQty.Visible = true;
-            this.gv_fbatchQty.VisibleIndex = 9;
+            this.gv_fbatchQty.VisibleIndex = 10;
             this.gv_fbatchQty.Width = 80;
             // 
             // gv_fcheckResu
@@ -622,23 +610,8 @@
             this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
             this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
             this.gv_fcheckResu.Visible = true;
-            this.gv_fcheckResu.VisibleIndex = 10;
+            this.gv_fcheckResu.VisibleIndex = 11;
             this.gv_fcheckResu.Width = 50;
-            // 
-            // 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";
-            this.gv_fcovertQty.MinWidth = 30;
-            this.gv_fcovertQty.Name = "gv_fcovertQty";
-            this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
-            this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
-            this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
-            this.gv_fcovertQty.Visible = true;
-            this.gv_fcovertQty.VisibleIndex = 11;
-            this.gv_fcovertQty.Width = 60;
             // 
             // gv_remarks
             // 
@@ -679,7 +652,7 @@
             this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
             this.gv_fcheckDate.Tag = "query_a.fcheck_date";
             this.gv_fcheckDate.Visible = true;
-            this.gv_fcheckDate.VisibleIndex = 15;
+            this.gv_fcheckDate.VisibleIndex = 14;
             this.gv_fcheckDate.Width = 182;
             // 
             // gv_createBy
@@ -693,7 +666,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 14;
+            this.gv_createBy.VisibleIndex = 15;
             this.gv_createBy.Width = 67;
             // 
             // gridColumn15
@@ -734,31 +707,6 @@
             this.gv_lastupdateDate.VisibleIndex = 18;
             this.gv_lastupdateDate.Width = 120;
             // 
-            // 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";
-            this.gv_fngHandle.MinWidth = 30;
-            this.gv_fngHandle.Name = "gv_fngHandle";
-            this.gv_fngHandle.OptionsColumn.AllowEdit = false;
-            this.gv_fngHandle.Tag = "query_a.fng_handle";
-            this.gv_fngHandle.Visible = true;
-            this.gv_fngHandle.VisibleIndex = 19;
-            this.gv_fngHandle.Width = 100;
-            // 
-            // bandedGridColumn1
-            // 
-            this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
-            this.bandedGridColumn1.FieldName = "receivingOrg";
-            this.bandedGridColumn1.MinWidth = 50;
-            this.bandedGridColumn1.Name = "bandedGridColumn1";
-            this.bandedGridColumn1.Tag = "org.fnamber";
-            this.bandedGridColumn1.Visible = true;
-            this.bandedGridColumn1.VisibleIndex = 20;
-            this.bandedGridColumn1.Width = 250;
-            // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "瀹℃牳浜�";
@@ -766,7 +714,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 21;
+            this.gridColumn18.VisibleIndex = 19;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn19
@@ -776,8 +724,26 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 22;
+            this.gridColumn19.VisibleIndex = 20;
             this.gridColumn19.Width = 94;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "绫诲瀷";
+            this.gridColumn30.FieldName = "orderType";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "浜х嚎ID";
+            this.gridColumn13.FieldName = "lineId";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 21;
+            this.gridColumn13.Width = 94;
             // 
             // gridColumn17
             // 
@@ -787,23 +753,25 @@
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Width = 94;
             // 
-            // gridColumn23
+            // gridColumn6
             // 
-            this.gridColumn23.Caption = "閲囪喘鍗曞彿";
-            this.gridColumn23.FieldName = "cgdNo";
-            this.gridColumn23.MinWidth = 25;
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 23;
-            this.gridColumn23.Width = 94;
+            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;
             // 
-            // gridColumn30
+            // gridColumn7
             // 
-            this.gridColumn30.Caption = "绫诲瀷";
-            this.gridColumn30.FieldName = "orderType";
-            this.gridColumn30.MinWidth = 25;
-            this.gridColumn30.Name = "gridColumn30";
-            this.gridColumn30.Width = 94;
+            this.gridColumn7.Caption = "妫�楠岀被鍨�";
+            this.gridColumn7.FieldName = "djType";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 23;
+            this.gridColumn7.Width = 94;
             // 
             // pageBar1
             // 
@@ -849,16 +817,14 @@
             this.layoutMx1.Controls.Add(this.txt_itemId);
             this.layoutMx1.Controls.Add(this.txt_lineId);
             this.layoutMx1.Controls.Add(this.txt_msg);
-            this.layoutMx1.Controls.Add(this.txt_workNo);
-            this.layoutMx1.Controls.Add(this.txt_fzrId);
             this.layoutMx1.Controls.Add(this.txt_suppId);
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_fsecondResu);
+            this.layoutMx1.Controls.Add(this.txt_fngHandle);
             this.layoutMx1.Controls.Add(this.txt_remarks);
             this.layoutMx1.Controls.Add(this.txt_fcheckResu);
             this.layoutMx1.Controls.Add(this.txt_releaseNo);
             this.layoutMx1.Controls.Add(this.txt_fcheckDate);
-            this.layoutMx1.Controls.Add(this.txt_logNo1);
+            this.layoutMx1.Controls.Add(this.txt_lotNo1);
             this.layoutMx1.Controls.Add(this.txt_itemNo);
             this.layoutMx1.Controls.Add(this.txt_itemModel);
             this.layoutMx1.Controls.Add(this.txt_fcheckBy);
@@ -871,19 +837,22 @@
             this.layoutMx1.Controls.Add(this.txt_lifnr);
             this.layoutMx1.Controls.Add(this.txt_djType);
             this.layoutMx1.Controls.Add(this.txt_lotNo);
-            this.layoutMx1.Controls.Add(this.txt_lotNo2);
+            this.layoutMx1.Controls.Add(this.txt_workNo);
             this.layoutMx1.Controls.Add(this.textEdit5);
-            this.layoutMx1.Controls.Add(this.comboBoxEdit1);
-            this.layoutMx1.Controls.Add(this.textEdit1);
-            this.layoutMx1.Controls.Add(this.textEdit2);
+            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_freceQty);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem17,
-            this.layoutControlItem7,
             this.layoutControlItem21});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(817, 530, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(613, 530, 812, 500);
             this.layoutMx1.Root = this.Root;
             this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
             this.layoutMx1.TabIndex = 0;
@@ -895,6 +864,7 @@
             this.txt_itemId.Name = "txt_itemId";
             this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txt_itemId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.txt_itemId.Size = new System.Drawing.Size(254, 24);
             this.txt_itemId.StyleController = this.layoutMx1;
             this.txt_itemId.TabIndex = 824;
@@ -910,29 +880,12 @@
             // txt_msg
             // 
             this.txt_msg.BtnTxt = "杩濊绫诲埆";
-            this.txt_msg.Location = new System.Drawing.Point(672, 175);
+            this.txt_msg.Location = new System.Drawing.Point(672, 208);
             this.txt_msg.Name = "txt_msg";
-            this.txt_msg.Size = new System.Drawing.Size(326, 95);
+            this.txt_msg.Size = new System.Drawing.Size(326, 62);
             this.txt_msg.TabIndex = 814;
             this.txt_msg.TextTxt = "";
             this.txt_msg.WhereTxt = null;
-            // 
-            // txt_workNo
-            // 
-            this.txt_workNo.IsReadly = false;
-            this.txt_workNo.Location = new System.Drawing.Point(414, 208);
-            this.txt_workNo.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_workNo.Name = "txt_workNo";
-            this.txt_workNo.Size = new System.Drawing.Size(254, 24);
-            this.txt_workNo.TabIndex = 813;
-            // 
-            // txt_fzrId
-            // 
-            this.txt_fzrId.IsReadly = false;
-            this.txt_fzrId.Location = new System.Drawing.Point(744, 142);
-            this.txt_fzrId.Name = "txt_fzrId";
-            this.txt_fzrId.Size = new System.Drawing.Size(254, 24);
-            this.txt_fzrId.TabIndex = 812;
             // 
             // txt_suppId
             // 
@@ -951,14 +904,14 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_fsecondResu
+            // txt_fngHandle
             // 
-            this.txt_fsecondResu.Location = new System.Drawing.Point(414, 175);
-            this.txt_fsecondResu.Name = "txt_fsecondResu";
-            this.txt_fsecondResu.Size = new System.Drawing.Size(254, 24);
-            this.txt_fsecondResu.StyleController = this.layoutMx1;
-            this.txt_fsecondResu.TabIndex = 801;
-            this.txt_fsecondResu.Tag = "readonly";
+            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142);
+            this.txt_fngHandle.Name = "txt_fngHandle";
+            this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
+            this.txt_fngHandle.StyleController = this.layoutMx1;
+            this.txt_fngHandle.TabIndex = 801;
+            this.txt_fngHandle.Tag = "readonly";
             // 
             // txt_remarks
             // 
@@ -972,7 +925,7 @@
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 142);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 175);
             this.txt_fcheckResu.Name = "txt_fcheckResu";
             this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckResu.StyleController = this.layoutMx1;
@@ -992,7 +945,7 @@
             // 
             // txt_fcheckDate
             // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 44);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 76);
             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;
@@ -1001,16 +954,16 @@
             this.txt_fcheckDate.TabIndex = 216;
             this.txt_fcheckDate.Tag = "readonly";
             // 
-            // txt_logNo1
+            // txt_lotNo1
             // 
-            this.txt_logNo1.Location = new System.Drawing.Point(744, 76);
-            this.txt_logNo1.Name = "txt_logNo1";
-            this.txt_logNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_logNo1.Properties.Appearance.Options.UseFont = true;
-            this.txt_logNo1.Size = new System.Drawing.Size(254, 28);
-            this.txt_logNo1.StyleController = this.layoutMx1;
-            this.txt_logNo1.TabIndex = 262;
-            this.txt_logNo1.Tag = "readonly";
+            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;
+            this.txt_lotNo1.TabIndex = 262;
+            this.txt_lotNo1.Tag = "";
             // 
             // txt_itemNo
             // 
@@ -1025,7 +978,7 @@
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(84, 175);
+            this.txt_itemModel.Location = new System.Drawing.Point(84, 208);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
@@ -1034,7 +987,7 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 76);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 109);
             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;
@@ -1052,7 +1005,7 @@
             this.txt_fbatchQty.Size = new System.Drawing.Size(254, 28);
             this.txt_fbatchQty.StyleController = this.layoutMx1;
             this.txt_fbatchQty.TabIndex = 222;
-            this.txt_fbatchQty.Tag = "readonly";
+            this.txt_fbatchQty.Tag = "";
             // 
             // txt_fsubmitBy
             // 
@@ -1065,7 +1018,7 @@
             // 
             // txt_fsubmitDate
             // 
-            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 76);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 12);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
             this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
             this.txt_fsubmitDate.StyleController = this.layoutMx1;
@@ -1074,7 +1027,7 @@
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
+            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
             this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
@@ -1084,12 +1037,12 @@
             // 
             // txt_fmanageNo
             // 
-            this.txt_fmanageNo.Location = new System.Drawing.Point(1074, 175);
+            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208);
             this.txt_fmanageNo.Name = "txt_fmanageNo";
-            this.txt_fmanageNo.Size = new System.Drawing.Size(256, 24);
+            this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
             this.txt_fmanageNo.StyleController = this.layoutMx1;
             this.txt_fmanageNo.TabIndex = 807;
-            this.txt_fmanageNo.Tag = "readonly";
+            this.txt_fmanageNo.Tag = "";
             // 
             // txt_guid
             // 
@@ -1125,57 +1078,94 @@
             // 
             // txt_lotNo
             // 
-            this.txt_lotNo.Location = new System.Drawing.Point(84, 208);
+            this.txt_lotNo.Location = new System.Drawing.Point(414, 44);
             this.txt_lotNo.Name = "txt_lotNo";
             this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
             this.txt_lotNo.StyleController = this.layoutMx1;
             this.txt_lotNo.TabIndex = 815;
             this.txt_lotNo.Tag = "readonly";
             // 
-            // txt_lotNo2
+            // txt_workNo
             // 
-            this.txt_lotNo2.Location = new System.Drawing.Point(1074, 208);
-            this.txt_lotNo2.Name = "txt_lotNo2";
-            this.txt_lotNo2.Size = new System.Drawing.Size(256, 24);
-            this.txt_lotNo2.StyleController = this.layoutMx1;
-            this.txt_lotNo2.TabIndex = 816;
+            this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
+            this.txt_workNo.Name = "txt_workNo";
+            this.txt_workNo.Size = new System.Drawing.Size(256, 24);
+            this.txt_workNo.StyleController = this.layoutMx1;
+            this.txt_workNo.TabIndex = 816;
+            this.txt_workNo.Tag = "readonly";
             // 
             // textEdit5
             // 
-            this.textEdit5.Location = new System.Drawing.Point(414, 109);
+            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";
             // 
-            // comboBoxEdit1
+            // txt_epTag
             // 
-            this.comboBoxEdit1.Location = new System.Drawing.Point(744, 109);
-            this.comboBoxEdit1.Name = "comboBoxEdit1";
-            this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_epTag.Location = new System.Drawing.Point(744, 109);
+            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)});
-            this.comboBoxEdit1.Size = new System.Drawing.Size(254, 24);
-            this.comboBoxEdit1.StyleController = this.layoutMx1;
-            this.comboBoxEdit1.TabIndex = 820;
+            this.txt_epTag.Size = new System.Drawing.Size(254, 24);
+            this.txt_epTag.StyleController = this.layoutMx1;
+            this.txt_epTag.TabIndex = 820;
             // 
-            // textEdit1
+            // txt_createBy
             // 
-            this.textEdit1.Location = new System.Drawing.Point(1074, 109);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Size = new System.Drawing.Size(256, 24);
-            this.textEdit1.StyleController = this.layoutMx1;
-            this.textEdit1.TabIndex = 822;
-            this.textEdit1.Tag = "readonly";
+            this.txt_createBy.Location = new System.Drawing.Point(744, 142);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Size = new System.Drawing.Size(254, 24);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 822;
+            this.txt_createBy.Tag = "readonly";
             // 
-            // textEdit2
+            // txt_createDate
             // 
-            this.textEdit2.Location = new System.Drawing.Point(1074, 142);
-            this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Size = new System.Drawing.Size(256, 24);
-            this.textEdit2.StyleController = this.layoutMx1;
-            this.textEdit2.TabIndex = 823;
-            this.textEdit2.Tag = "readonly";
+            this.txt_createDate.Location = new System.Drawing.Point(744, 175);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Size = new System.Drawing.Size(254, 24);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 823;
+            this.txt_createDate.Tag = "readonly";
+            // 
+            // txt_itemName
+            // 
+            this.txt_itemName.Location = new System.Drawing.Point(84, 175);
+            this.txt_itemName.Name = "txt_itemName";
+            this.txt_itemName.Size = new System.Drawing.Size(254, 24);
+            this.txt_itemName.StyleController = this.layoutMx1;
+            this.txt_itemName.TabIndex = 825;
+            this.txt_itemName.Tag = "readonly";
+            // 
+            // txt_fzrId
+            // 
+            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";
+            // 
+            // txt_fmrmode
+            // 
+            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";
+            // 
+            // txt_freceQty
+            // 
+            this.txt_freceQty.Location = new System.Drawing.Point(1074, 109);
+            this.txt_freceQty.Name = "txt_freceQty";
+            this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
+            this.txt_freceQty.StyleController = this.layoutMx1;
+            this.txt_freceQty.TabIndex = 828;
+            this.txt_freceQty.Tag = "readonly";
             // 
             // layoutControlItem17
             // 
@@ -1188,13 +1178,6 @@
             this.layoutControlItem17.Text = "lbGuid";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem17.TextVisible = false;
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(0, 0);
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(50, 20);
             // 
             // layoutControlItem21
             // 
@@ -1212,34 +1195,36 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem15,
-            this.layoutControlItem16,
-            this.layoutControlItem14,
             this.layoutControlItem1,
             this.layoutControlItem23,
-            this.layoutControlItem8,
-            this.layoutControlItem2,
             this.layoutControlItem9,
-            this.layoutControlItem25,
             this.layoutControlItem3,
             this.layoutControlItem24,
-            this.layoutControlItem27,
             this.layoutControlItem22,
-            this.txt_epTag,
-            this.layoutControlItem13,
-            this.layoutControlItem10,
-            this.layoutControlItem32,
-            this.layoutControlItem12,
-            this.layoutControlItem28,
-            this.layoutControlItem26,
-            this.layoutControlItem31,
-            this.layoutControlItem33,
-            this.layoutControlItem18,
-            this.layoutControlItem29,
-            this.layoutControlItem6,
+            this.txt_epTagtxt,
             this.layoutControlItem5,
             this.layoutControlItem30,
-            this.layoutControlItem4});
+            this.layoutControlItem4,
+            this.layoutControlItem6,
+            this.layoutControlItem34,
+            this.layoutControlItem18,
+            this.layoutControlItem10,
+            this.layoutControlItem32,
+            this.layoutControlItem8,
+            this.layoutControlItem2,
+            this.layoutControlItem28,
+            this.layoutControlItem16,
+            this.layoutControlItem15,
+            this.layoutControlItem14,
+            this.layoutControlItem26,
+            this.layoutControlItem13,
+            this.layoutControlItem7,
+            this.layoutControlItem25,
+            this.layoutControlItem29,
+            this.layoutControlItem31,
+            this.layoutControlItem33,
+            this.layoutControlItem27,
+            this.layoutControlItem12});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1283,39 +1268,6 @@
             this.Root.Size = new System.Drawing.Size(1342, 282);
             this.Root.TextVisible = false;
             // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_fsubmitBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(990, 32);
-            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.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_fsubmitDate;
-            this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem16.Text = "瀹℃牳浜�";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_fsubmit;
-            this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(332, 32);
-            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem14.TextVisible = false;
-            // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txt_releaseNo;
@@ -1335,28 +1287,6 @@
             this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_fcheckBy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(330, 64);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_fcheckDate;
-            this.layoutControlItem2.Location = new System.Drawing.Point(330, 32);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 32);
-            this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_fbatchQty;
@@ -1367,20 +1297,9 @@
             this.layoutControlItem9.Text = "鎶芥鏁伴噺";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_fzrId;
-            this.layoutControlItem25.Location = new System.Drawing.Point(660, 130);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem25.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem25.Text = "璐d换浜�";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txt_logNo1;
+            this.layoutControlItem3.Control = this.txt_lotNo1;
             this.layoutControlItem3.Location = new System.Drawing.Point(660, 64);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1400,19 +1319,6 @@
             this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_msg;
-            this.layoutControlItem27.Location = new System.Drawing.Point(660, 163);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
-            this.layoutControlItem27.Size = new System.Drawing.Size(330, 99);
-            this.layoutControlItem27.Text = "杩濊绫诲埆";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem27.TextVisible = false;
-            // 
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.txt_lifnr;
@@ -1423,139 +1329,21 @@
             this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // txt_epTag
+            // txt_epTagtxt
             // 
-            this.txt_epTag.Control = this.comboBoxEdit1;
-            this.txt_epTag.Location = new System.Drawing.Point(660, 97);
-            this.txt_epTag.Name = "txt_epTag";
-            this.txt_epTag.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.txt_epTag.OptionsTableLayoutItem.RowIndex = 3;
-            this.txt_epTag.Size = new System.Drawing.Size(330, 33);
-            this.txt_epTag.Text = "鐜繚鏍囪瘑";
-            this.txt_epTag.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_fsecondResu;
-            this.layoutControlItem13.Location = new System.Drawing.Point(330, 163);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem13.Text = "澶勭疆缁撴灉";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(330, 130);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem32
-            // 
-            this.layoutControlItem32.Control = this.textEdit5;
-            this.layoutControlItem32.Location = new System.Drawing.Point(330, 97);
-            this.layoutControlItem32.Name = "layoutControlItem32";
-            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 229);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
-            this.layoutControlItem12.Text = "澶囨敞璇存槑";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_lotNo;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 196);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem28.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.txt_workNo;
-            this.layoutControlItem26.Location = new System.Drawing.Point(330, 196);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem26.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem31
-            // 
-            this.layoutControlItem31.Control = this.textEdit1;
-            this.layoutControlItem31.Location = new System.Drawing.Point(990, 97);
-            this.layoutControlItem31.Name = "layoutControlItem31";
-            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem31.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem31.Text = "鍒涘缓浜�";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem33
-            // 
-            this.layoutControlItem33.Control = this.textEdit2;
-            this.layoutControlItem33.Location = new System.Drawing.Point(990, 130);
-            this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem33.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_fmanageNo;
-            this.layoutControlItem18.Location = new System.Drawing.Point(990, 163);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem18.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem18.Text = "娴佺▼缂栧彿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_lotNo2;
-            this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 163);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
-            this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            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
             // 
             this.layoutControlItem5.Control = this.txt_itemNo;
+            this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 130);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
@@ -1582,6 +1370,227 @@
             this.layoutControlItem4.Size = new System.Drawing.Size(330, 33);
             this.layoutControlItem4.Text = "閫夋嫨浜у搧";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_itemModel;
+            this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.txt_itemName;
+            this.layoutControlItem34.Location = new System.Drawing.Point(0, 163);
+            this.layoutControlItem34.Name = "layoutControlItem34";
+            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem34.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_fmanageNo;
+            this.layoutControlItem18.Location = new System.Drawing.Point(330, 196);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem18.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem18.Text = "娴佺▼缂栧彿";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // 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.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.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem15.Size = new System.Drawing.Size(332, 32);
+            this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_fsubmit;
+            this.layoutControlItem14.Location = new System.Drawing.Point(990, 64);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem14.TextVisible = false;
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.txt_freceQty;
+            this.layoutControlItem26.Location = new System.Drawing.Point(990, 97);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem26.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem26.Text = "鍒ゅ畾缁撴灉";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_fngHandle;
+            this.layoutControlItem13.Location = new System.Drawing.Point(990, 130);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem13.Text = "澶勭疆缁撴灉";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_fzrId;
+            this.layoutControlItem7.Location = new System.Drawing.Point(990, 163);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem7.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem7.Text = "璐d换浜哄憳";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_fmrmode;
+            this.layoutControlItem25.Location = new System.Drawing.Point(990, 229);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem25.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem25.Text = "鍙嶅伐宸ュ簭";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_workNo;
+            this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // 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;
+            this.layoutControlItem27.Location = new System.Drawing.Point(660, 196);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2;
+            this.layoutControlItem27.Size = new System.Drawing.Size(330, 66);
+            this.layoutControlItem27.Text = "杩濊绫诲埆";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem27.TextVisible = false;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_remarks;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 229);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
+            this.layoutControlItem12.Text = "澶囨敞璇存槑";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
             // 
             // xtraTabControl2
             // 
@@ -2235,177 +2244,19 @@
             // 
             // tabMxPage2
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx4);
-            this.tabMxPage2.Controls.Add(this.ucUpFile1);
+            this.tabMxPage2.Controls.Add(this.ucUpFileList1);
             this.tabMxPage2.Name = "tabMxPage2";
             this.tabMxPage2.Size = new System.Drawing.Size(1340, 362);
             this.tabMxPage2.Text = "闄勪欢淇℃伅";
             // 
-            // gcMx4
+            // ucUpFileList1
             // 
-            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx4.Location = new System.Drawing.Point(0, 57);
-            this.gcMx4.MainView = this.gvMx4;
-            this.gcMx4.Name = "gcMx4";
-            this.gcMx4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemButtonEdit2,
-            this.repositoryItemButtonEdit3});
-            this.gcMx4.Size = new System.Drawing.Size(1340, 305);
-            this.gcMx4.TabIndex = 2;
-            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx4});
-            // 
-            // gvMx4
-            // 
-            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn5,
-            this.gridColumn6,
-            this.gridColumn11,
-            this.gridColumn7,
-            this.gridColumn8,
-            this.gridColumn9,
-            this.gridColumn10,
-            this.gridColumn16,
-            this.gridColumn12});
-            this.gvMx4.GridControl = this.gcMx4;
-            this.gvMx4.Name = "gvMx4";
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn5.FieldName = "guid";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.OptionsColumn.ReadOnly = true;
-            this.gridColumn5.Width = 94;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "闄勪欢鍚嶇О";
-            this.gridColumn6.FieldName = "fileTitle";
-            this.gridColumn6.MinWidth = 100;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.OptionsColumn.ReadOnly = true;
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 0;
-            this.gridColumn6.Width = 100;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "闄勪欢绫诲瀷";
-            this.gridColumn11.FieldName = "fileType";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.OptionsColumn.ReadOnly = true;
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 1;
-            this.gridColumn11.Width = 94;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "娴忚鍦板潃";
-            this.gridColumn7.FieldName = "urlPath";
-            this.gridColumn7.MinWidth = 200;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 2;
-            this.gridColumn7.Width = 200;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "涓婁紶鑰�";
-            this.gridColumn8.FieldName = "createBy";
-            this.gridColumn8.MinWidth = 25;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.OptionsColumn.ReadOnly = true;
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 3;
-            this.gridColumn8.Width = 94;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "涓婁紶鏃堕棿";
-            this.gridColumn9.FieldName = "createDate";
-            this.gridColumn9.MinWidth = 25;
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.OptionsColumn.ReadOnly = true;
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 4;
-            this.gridColumn9.Width = 94;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "娴忚";
-            this.gridColumn10.ColumnEdit = this.repositoryItemButtonEdit2;
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 5;
-            this.gridColumn10.Width = 94;
-            // 
-            // repositoryItemButtonEdit2
-            // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.show_16x162;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "涓嬭浇";
-            this.gridColumn16.ColumnEdit = this.repositoryItemButtonEdit3;
-            this.gridColumn16.MinWidth = 25;
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 6;
-            this.gridColumn16.Width = 94;
-            // 
-            // repositoryItemButtonEdit3
-            // 
-            this.repositoryItemButtonEdit3.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
-            this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "绉诲嚭";
-            this.gridColumn12.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gridColumn12.MinWidth = 25;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 7;
-            this.gridColumn12.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.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)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // ucUpFile1
-            // 
-            this.ucUpFile1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.ucUpFile1.Location = new System.Drawing.Point(0, 0);
-            this.ucUpFile1.Name = "ucUpFile1";
-            this.ucUpFile1.parentGuid = null;
-            this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
-            this.ucUpFile1.TabIndex = 1;
+            this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
+            this.ucUpFileList1.Name = "ucUpFileList1";
+            this.ucUpFileList1.pGuid = null;
+            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 362);
+            this.ucUpFileList1.TabIndex = 0;
             // 
             // repositoryItemComboBox2
             // 
@@ -2449,7 +2300,7 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_FqcDetect01";
-            this.Text = "鏉ユ枡妫�楠岀敵璇�";
+            this.Text = "fqc鐢宠";
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
@@ -2471,12 +2322,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_logNo1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
@@ -2489,43 +2340,48 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.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_freceQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_epTag)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).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();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((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.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2561,11 +2417,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
@@ -2583,7 +2434,6 @@
         private DevExpress.XtraGrid.GridControl gcMain1;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
@@ -2601,19 +2451,17 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
-        private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
-        private DevExpress.XtraEditors.TextEdit txt_fsecondResu;
+        private DevExpress.XtraEditors.TextEdit txt_fngHandle;
         private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
         private DevExpress.XtraEditors.TextEdit txt_remarks;
         private DevExpress.XtraEditors.TextEdit txt_itemNo;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_logNo1;
+        private DevExpress.XtraEditors.TextEdit txt_lotNo1;
         private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
         private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
         private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
@@ -2621,14 +2469,9 @@
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private DevExpress.XtraEditors.TextEdit txt_itemModel;
-     
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
         private DevExpress.XtraEditors.TextEdit txt_fsubmitDate;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2662,21 +2505,6 @@
         private DevExpress.XtraEditors.SimpleButton btnLoad;
         private DevExpress.XtraEditors.TextEdit txtJianYan;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraGrid.GridControl gcMx4;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private UserControl.UCUpFile ucUpFile1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private DevExpress.XtraEditors.TextEdit txt_fmanageNo;
@@ -2710,42 +2538,54 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
         private DevExpress.XtraEditors.TextEdit txt_lifnr;
         private DevExpress.XtraEditors.ComboBoxEdit txt_djType;
-        private UserControl.UcLookStaff txt_fzrId;
         private UserControl.UcLookCustomer txt_suppId;
-        private UserControl.UcLookGx txt_workNo;
         private UserControl.UcDictionary txt_msg;
         private DevExpress.XtraEditors.TextEdit txt_lotNo;
-        private DevExpress.XtraEditors.TextEdit txt_lotNo2;
+        private DevExpress.XtraEditors.TextEdit txt_workNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraEditors.TextEdit textEdit5;
-        private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem txt_epTag;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
+        private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt;
         private UserControl.UcLookWorkline txt_lineId;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
-        private DevExpress.XtraEditors.TextEdit textEdit2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
         private DevExpress.XtraEditors.ButtonEdit txt_itemId;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.TextEdit txt_itemName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private UserControl.UCUpFileList ucUpFileList1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.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.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraEditors.TextEdit txt_freceQty;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        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 layoutControlItem12;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3