From 1f99c554ffc67f599fbce5981a3da584945b3b16 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 18 八月 2025 14:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 1750 +++++++++++++++++++++++----------------------------------
 1 files changed, 719 insertions(+), 1,031 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 9743459..921a4dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -30,33 +30,23 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
-            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.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -68,7 +58,6 @@
             this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -78,7 +67,6 @@
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -96,10 +84,12 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff();
+            this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
             this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer();
             this.lbGuid = new System.Windows.Forms.Label();
-            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();
@@ -122,51 +112,49 @@
             this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fzrIdTxt = new DevExpress.XtraEditors.TextEdit();
-            this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit();
-            this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_zrType = new DevExpress.XtraEditors.TextEdit();
             this.txt_kbList = new DevExpress.XtraEditors.ButtonEdit();
             this.txt_lotNo = new DevExpress.XtraEditors.ButtonEdit();
             this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
             this.txt_lineId = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kbSl = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            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.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -223,25 +211,7 @@
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx14 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx14 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.layoutMxMsg2 = new DevExpress.XtraLayout.LayoutControl();
-            this.txtChouJian = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.ucChouJianList1 = new Gs.DevApp.DevFrm.FQC.UcChouJianList();
             this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList();
             this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -270,6 +240,7 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.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();
@@ -293,51 +264,49 @@
             ((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_fzrIdTxt.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((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.layoutControlItem27)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -375,15 +344,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).BeginInit();
-            this.layoutMxMsg2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
             this.tabMxPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -440,6 +400,7 @@
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -453,8 +414,9 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1342, 688);
-            this.split1.SplitterPosition = 651;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 4;
             // 
             // gcMain1
@@ -463,7 +425,7 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1342, 613);
+            this.gcMain1.Size = new System.Drawing.Size(1342, 638);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -480,7 +442,6 @@
             this.gv_releaseNo,
             this.gridColumn5,
             this.gridColumn8,
-            this.gridColumn6,
             this.gv_lotNo,
             this.gridColumn23,
             this.gv_lifnr,
@@ -490,7 +451,6 @@
             this.gridColumn14,
             this.gv_fcovertQty,
             this.gv_fbatchQty,
-            this.gv_fcheckResu,
             this.gv_remarks,
             this.gv_fcheckBy,
             this.gv_fcheckDate,
@@ -558,16 +518,6 @@
             this.gridColumn8.VisibleIndex = 3;
             this.gridColumn8.Width = 94;
             // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
-            this.gridColumn6.FieldName = "freceQty";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 94;
-            // 
             // gv_lotNo
             // 
             this.gv_lotNo.AppearanceCell.Options.UseFont = true;
@@ -578,7 +528,7 @@
             this.gv_lotNo.OptionsColumn.AllowEdit = false;
             this.gv_lotNo.Tag = "query_a.lot_no";
             this.gv_lotNo.Visible = true;
-            this.gv_lotNo.VisibleIndex = 5;
+            this.gv_lotNo.VisibleIndex = 4;
             this.gv_lotNo.Width = 120;
             // 
             // gridColumn23
@@ -588,7 +538,7 @@
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 6;
+            this.gridColumn23.VisibleIndex = 5;
             this.gridColumn23.Width = 94;
             // 
             // gv_lifnr
@@ -601,7 +551,7 @@
             this.gv_lifnr.OptionsColumn.AllowEdit = false;
             this.gv_lifnr.Tag = "query_a.lifnr";
             this.gv_lifnr.Visible = true;
-            this.gv_lifnr.VisibleIndex = 7;
+            this.gv_lifnr.VisibleIndex = 6;
             this.gv_lifnr.Width = 200;
             // 
             // gv_itemId
@@ -613,8 +563,6 @@
             this.gv_itemId.Name = "gv_itemId";
             this.gv_itemId.OptionsColumn.AllowEdit = false;
             this.gv_itemId.Tag = "query_a.item_id";
-            this.gv_itemId.Visible = true;
-            this.gv_itemId.VisibleIndex = 8;
             this.gv_itemId.Width = 30;
             // 
             // gv_itemNo
@@ -627,7 +575,7 @@
             this.gv_itemNo.OptionsColumn.AllowEdit = false;
             this.gv_itemNo.Tag = "query_a.item_no";
             this.gv_itemNo.Visible = true;
-            this.gv_itemNo.VisibleIndex = 9;
+            this.gv_itemNo.VisibleIndex = 7;
             this.gv_itemNo.Width = 136;
             // 
             // gv_boardStyle
@@ -640,7 +588,7 @@
             this.gv_boardStyle.OptionsColumn.AllowEdit = false;
             this.gv_boardStyle.Tag = "query_a.board_style";
             this.gv_boardStyle.Visible = true;
-            this.gv_boardStyle.VisibleIndex = 10;
+            this.gv_boardStyle.VisibleIndex = 8;
             this.gv_boardStyle.Width = 164;
             // 
             // gridColumn14
@@ -651,7 +599,7 @@
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.OptionsColumn.ReadOnly = true;
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 11;
+            this.gridColumn14.VisibleIndex = 9;
             this.gridColumn14.Width = 200;
             // 
             // gv_fcovertQty
@@ -665,7 +613,7 @@
             this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
             this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
             this.gv_fcovertQty.Visible = true;
-            this.gv_fcovertQty.VisibleIndex = 12;
+            this.gv_fcovertQty.VisibleIndex = 10;
             this.gv_fcovertQty.Width = 60;
             // 
             // gv_fbatchQty
@@ -678,21 +626,8 @@
             this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
             this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
             this.gv_fbatchQty.Visible = true;
-            this.gv_fbatchQty.VisibleIndex = 13;
+            this.gv_fbatchQty.VisibleIndex = 11;
             this.gv_fbatchQty.Width = 80;
-            // 
-            // gv_fcheckResu
-            // 
-            this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
-            this.gv_fcheckResu.FieldName = "fcheckResu";
-            this.gv_fcheckResu.MinWidth = 30;
-            this.gv_fcheckResu.Name = "gv_fcheckResu";
-            this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
-            this.gv_fcheckResu.Visible = true;
-            this.gv_fcheckResu.VisibleIndex = 14;
-            this.gv_fcheckResu.Width = 50;
             // 
             // gv_remarks
             // 
@@ -704,7 +639,7 @@
             this.gv_remarks.OptionsColumn.AllowEdit = false;
             this.gv_remarks.Tag = "query_a.remarks";
             this.gv_remarks.Visible = true;
-            this.gv_remarks.VisibleIndex = 15;
+            this.gv_remarks.VisibleIndex = 12;
             this.gv_remarks.Width = 100;
             // 
             // gv_fcheckBy
@@ -717,7 +652,7 @@
             this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
             this.gv_fcheckBy.Tag = "query_a.fcheck_by";
             this.gv_fcheckBy.Visible = true;
-            this.gv_fcheckBy.VisibleIndex = 16;
+            this.gv_fcheckBy.VisibleIndex = 13;
             this.gv_fcheckBy.Width = 118;
             // 
             // gv_fcheckDate
@@ -730,7 +665,7 @@
             this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
             this.gv_fcheckDate.Tag = "query_a.fcheck_date";
             this.gv_fcheckDate.Visible = true;
-            this.gv_fcheckDate.VisibleIndex = 17;
+            this.gv_fcheckDate.VisibleIndex = 14;
             this.gv_fcheckDate.Width = 182;
             // 
             // gv_createBy
@@ -743,7 +678,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 18;
+            this.gv_createBy.VisibleIndex = 15;
             this.gv_createBy.Width = 67;
             // 
             // gridColumn15
@@ -753,7 +688,7 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 19;
+            this.gridColumn15.VisibleIndex = 16;
             this.gridColumn15.Width = 94;
             // 
             // gv_lastupdateBy
@@ -766,7 +701,7 @@
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
             this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 20;
+            this.gv_lastupdateBy.VisibleIndex = 17;
             this.gv_lastupdateBy.Width = 60;
             // 
             // gv_lastupdateDate
@@ -779,7 +714,7 @@
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 21;
+            this.gv_lastupdateDate.VisibleIndex = 18;
             this.gv_lastupdateDate.Width = 120;
             // 
             // gridColumn18
@@ -789,7 +724,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 22;
+            this.gridColumn18.VisibleIndex = 19;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn19
@@ -799,7 +734,7 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 23;
+            this.gridColumn19.VisibleIndex = 20;
             this.gridColumn19.Width = 94;
             // 
             // gridColumn30
@@ -816,8 +751,6 @@
             this.gridColumn13.FieldName = "lineId";
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 24;
             this.gridColumn13.Width = 94;
             // 
             // gridColumn17
@@ -834,15 +767,13 @@
             this.gridColumn7.FieldName = "djType";
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 25;
             this.gridColumn7.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 613);
+            this.pageBar1.Location = new System.Drawing.Point(0, 638);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
@@ -873,16 +804,19 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
             this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1342, 688);
-            this.splitMx1.SplitterPosition = 282;
+            this.splitMx1.SplitterPosition = 242;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.txt_fzrId);
+            this.layoutMx1.Controls.Add(this.txt_zrType);
+            this.layoutMx1.Controls.Add(this.txt_fngHandle);
             this.layoutMx1.Controls.Add(this.txt_msg);
             this.layoutMx1.Controls.Add(this.txt_suppId);
             this.layoutMx1.Controls.Add(this.lbGuid);
-            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);
@@ -905,41 +839,87 @@
             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_fzrIdTxt);
-            this.layoutMx1.Controls.Add(this.txt_mrmodeTxt);
-            this.layoutMx1.Controls.Add(this.txt_freceQty);
-            this.layoutMx1.Controls.Add(this.txt_zrType);
             this.layoutMx1.Controls.Add(this.txt_kbList);
             this.layoutMx1.Controls.Add(this.txt_lotNo);
             this.layoutMx1.Controls.Add(this.txt_lineName);
             this.layoutMx1.Controls.Add(this.txt_itemId);
             this.layoutMx1.Controls.Add(this.txt_lineId);
+            this.layoutMx1.Controls.Add(this.txt_kbSl);
+            this.layoutMx1.Controls.Add(this.txt_fmrmode);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem17,
-            this.layoutControlItem21});
+            this.layoutControlItem21,
+            this.txt_itemId1111,
+            this.layoutControlItem4,
+            this.layoutControlItem29,
+            this.layoutControlItem23,
+            this.layoutControlItem31,
+            this.layoutControlItem33});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(789, 440, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
+            this.layoutMx1.Size = new System.Drawing.Size(1342, 242);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // txt_fzrId
+            // 
+            this.txt_fzrId.Appearance.ForeColor = System.Drawing.Color.Blue;
+            this.txt_fzrId.Appearance.Options.UseForeColor = true;
+            this.txt_fzrId.IsReadly = false;
+            this.txt_fzrId.Location = new System.Drawing.Point(1074, 152);
+            this.txt_fzrId.Name = "txt_fzrId";
+            this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
+            this.txt_fzrId.TabIndex = 839;
+            // 
+            // txt_zrType
+            // 
+            this.txt_zrType.EditValue = "-璇烽�夋嫨-";
+            this.txt_zrType.Location = new System.Drawing.Point(1074, 124);
+            this.txt_zrType.Name = "txt_zrType";
+            this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_zrType.Properties.Items.AddRange(new object[] {
+            "-璇烽�夋嫨-",
+            "1:鐢熶骇璐d换",
+            "2:闈炵敓浜ц矗浠�"});
+            this.txt_zrType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_zrType.Size = new System.Drawing.Size(256, 24);
+            this.txt_zrType.StyleController = this.layoutMx1;
+            this.txt_zrType.TabIndex = 838;
+            // 
+            // txt_fngHandle
+            // 
+            this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
+            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 96);
+            this.txt_fngHandle.Name = "txt_fngHandle";
+            this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_fngHandle.Properties.Items.AddRange(new object[] {
+            "-璇烽�夋嫨-",
+            "1:杩斿伐"});
+            this.txt_fngHandle.Properties.NullText = "-璇烽�夋嫨-";
+            this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
+            this.txt_fngHandle.StyleController = this.layoutMx1;
+            this.txt_fngHandle.TabIndex = 837;
             // 
             // txt_msg
             // 
             this.txt_msg.BtnTxt = "杩濊绫诲埆";
-            this.txt_msg.Location = new System.Drawing.Point(672, 186);
+            this.txt_msg.Location = new System.Drawing.Point(1002, 12);
             this.txt_msg.Name = "txt_msg";
-            this.txt_msg.Size = new System.Drawing.Size(326, 54);
+            this.txt_msg.Size = new System.Drawing.Size(328, 80);
             this.txt_msg.TabIndex = 814;
             this.txt_msg.TextTxt = "";
-            this.txt_msg.WhereTxt = null;
+            this.txt_msg.WhereTxt = " a.s_type=\'杩濊绫诲埆\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
             // 
             // txt_suppId
             // 
             this.txt_suppId.IsReadly = false;
-            this.txt_suppId.Location = new System.Drawing.Point(414, 99);
+            this.txt_suppId.Location = new System.Drawing.Point(414, 96);
             this.txt_suppId.Name = "txt_suppId";
             this.txt_suppId.Size = new System.Drawing.Size(254, 24);
             this.txt_suppId.TabIndex = 811;
@@ -953,27 +933,18 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_fngHandle
-            // 
-            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 128);
-            this.txt_fngHandle.Name = "txt_fngHandle";
-            this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
-            this.txt_fngHandle.StyleController = this.layoutMx1;
-            this.txt_fngHandle.TabIndex = 801;
-            this.txt_fngHandle.Tag = "readonly";
-            // 
             // txt_remarks
             // 
-            this.txt_remarks.Location = new System.Drawing.Point(84, 244);
+            this.txt_remarks.Location = new System.Drawing.Point(84, 208);
             this.txt_remarks.Name = "txt_remarks";
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(584, 24);
+            this.txt_remarks.Size = new System.Drawing.Size(254, 24);
             this.txt_remarks.StyleController = this.layoutMx1;
             this.txt_remarks.TabIndex = 797;
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(744, 128);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(744, 68);
             this.txt_fcheckResu.Name = "txt_fcheckResu";
             this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
@@ -994,7 +965,7 @@
             // 
             // txt_fcheckDate
             // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(744, 157);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(744, 96);
             this.txt_fcheckDate.Name = "txt_fcheckDate";
             this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
             this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
@@ -1004,7 +975,7 @@
             // 
             // txt_lotNo1
             // 
-            this.txt_lotNo1.Location = new System.Drawing.Point(414, 128);
+            this.txt_lotNo1.Location = new System.Drawing.Point(414, 124);
             this.txt_lotNo1.Name = "txt_lotNo1";
             this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
             this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
@@ -1014,7 +985,7 @@
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(84, 157);
+            this.txt_itemNo.Location = new System.Drawing.Point(84, 124);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
             this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
@@ -1024,7 +995,7 @@
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(84, 215);
+            this.txt_itemModel.Location = new System.Drawing.Point(84, 180);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
@@ -1033,7 +1004,7 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(744, 70);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(744, 12);
             this.txt_fcheckBy.Name = "txt_fcheckBy";
             this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
             this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
@@ -1043,7 +1014,7 @@
             // 
             // txt_fbatchQty
             // 
-            this.txt_fbatchQty.Location = new System.Drawing.Point(414, 41);
+            this.txt_fbatchQty.Location = new System.Drawing.Point(414, 40);
             this.txt_fbatchQty.Name = "txt_fbatchQty";
             this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
             this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
@@ -1053,35 +1024,35 @@
             // 
             // txt_fsubmitBy
             // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 41);
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(744, 152);
             this.txt_fsubmitBy.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+            this.txt_fsubmitBy.Size = new System.Drawing.Size(254, 24);
             this.txt_fsubmitBy.StyleController = this.layoutMx1;
             this.txt_fsubmitBy.TabIndex = 804;
             this.txt_fsubmitBy.Tag = "readonly";
             // 
             // txt_fsubmitDate
             // 
-            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 12);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(744, 124);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+            this.txt_fsubmitDate.Size = new System.Drawing.Size(254, 24);
             this.txt_fsubmitDate.StyleController = this.layoutMx1;
             this.txt_fsubmitDate.TabIndex = 805;
             this.txt_fsubmitDate.Tag = "readonly";
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 70);
+            this.txt_fsubmit.Location = new System.Drawing.Point(672, 180);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+            this.txt_fsubmit.Size = new System.Drawing.Size(326, 24);
             this.txt_fsubmit.StyleController = this.layoutMx1;
             this.txt_fsubmit.TabIndex = 806;
             this.txt_fsubmit.Tag = "readonly";
             // 
             // txt_fmanageNo
             // 
-            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 186);
+            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 180);
             this.txt_fmanageNo.Name = "txt_fmanageNo";
             this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
             this.txt_fmanageNo.StyleController = this.layoutMx1;
@@ -1099,7 +1070,7 @@
             // 
             // txt_lifnr
             // 
-            this.txt_lifnr.Location = new System.Drawing.Point(414, 70);
+            this.txt_lifnr.Location = new System.Drawing.Point(414, 68);
             this.txt_lifnr.Name = "txt_lifnr";
             this.txt_lifnr.Size = new System.Drawing.Size(254, 24);
             this.txt_lifnr.StyleController = this.layoutMx1;
@@ -1107,16 +1078,15 @@
             // 
             // txt_djType
             // 
-            this.txt_djType.EditValue = "-璇烽�夋嫨-";
-            this.txt_djType.Location = new System.Drawing.Point(84, 12);
+            this.txt_djType.EditValue = "1:甯歌娴佺▼";
+            this.txt_djType.Location = new System.Drawing.Point(84, 10);
             this.txt_djType.Name = "txt_djType";
             this.txt_djType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_djType.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
             "1:甯歌娴佺▼"});
             this.txt_djType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_djType.Size = new System.Drawing.Size(254, 24);
+            this.txt_djType.Size = new System.Drawing.Size(249, 24);
             this.txt_djType.StyleController = this.layoutMx1;
             this.txt_djType.TabIndex = 810;
             // 
@@ -1127,11 +1097,11 @@
             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";
+            this.txt_workNo.Tag = "";
             // 
             // txt_checkStates
             // 
-            this.txt_checkStates.Location = new System.Drawing.Point(744, 99);
+            this.txt_checkStates.Location = new System.Drawing.Point(744, 40);
             this.txt_checkStates.Name = "txt_checkStates";
             this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
@@ -1142,7 +1112,7 @@
             // 
             // txt_epTag
             // 
-            this.txt_epTag.Location = new System.Drawing.Point(414, 157);
+            this.txt_epTag.Location = new System.Drawing.Point(414, 152);
             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)});
@@ -1152,72 +1122,34 @@
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(744, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(734, 10);
             this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Size = new System.Drawing.Size(254, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(249, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 822;
             this.txt_createBy.Tag = "readonly";
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(744, 41);
+            this.txt_createDate.Location = new System.Drawing.Point(734, 38);
             this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Size = new System.Drawing.Size(254, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(249, 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, 186);
+            this.txt_itemName.Location = new System.Drawing.Point(84, 152);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Size = new System.Drawing.Size(254, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 825;
             this.txt_itemName.Tag = "readonly";
             // 
-            // txt_fzrIdTxt
-            // 
-            this.txt_fzrIdTxt.Location = new System.Drawing.Point(1074, 157);
-            this.txt_fzrIdTxt.Name = "txt_fzrIdTxt";
-            this.txt_fzrIdTxt.Size = new System.Drawing.Size(256, 24);
-            this.txt_fzrIdTxt.StyleController = this.layoutMx1;
-            this.txt_fzrIdTxt.TabIndex = 826;
-            this.txt_fzrIdTxt.Tag = "readonly";
-            // 
-            // txt_mrmodeTxt
-            // 
-            this.txt_mrmodeTxt.Location = new System.Drawing.Point(1074, 215);
-            this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
-            this.txt_mrmodeTxt.Size = new System.Drawing.Size(256, 24);
-            this.txt_mrmodeTxt.StyleController = this.layoutMx1;
-            this.txt_mrmodeTxt.TabIndex = 827;
-            this.txt_mrmodeTxt.Tag = "readonly";
-            // 
-            // txt_freceQty
-            // 
-            this.txt_freceQty.Location = new System.Drawing.Point(1074, 99);
-            this.txt_freceQty.Name = "txt_freceQty";
-            this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
-            this.txt_freceQty.StyleController = this.layoutMx1;
-            this.txt_freceQty.TabIndex = 828;
-            this.txt_freceQty.Tag = "readonly";
-            // 
-            // txt_zrType
-            // 
-            this.txt_zrType.Location = new System.Drawing.Point(1074, 244);
-            this.txt_zrType.Name = "txt_zrType";
-            this.txt_zrType.Size = new System.Drawing.Size(256, 24);
-            this.txt_zrType.StyleController = this.layoutMx1;
-            this.txt_zrType.TabIndex = 829;
-            this.txt_zrType.Tag = "readonly";
-            // 
             // txt_kbList
             // 
-            this.txt_kbList.Location = new System.Drawing.Point(84, 70);
+            this.txt_kbList.Location = new System.Drawing.Point(84, 40);
             this.txt_kbList.Name = "txt_kbList";
             this.txt_kbList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
@@ -1228,7 +1160,7 @@
             // txt_lotNo
             // 
             this.txt_lotNo.EditValue = "";
-            this.txt_lotNo.Location = new System.Drawing.Point(84, 41);
+            this.txt_lotNo.Location = new System.Drawing.Point(84, 12);
             this.txt_lotNo.Name = "txt_lotNo";
             this.txt_lotNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
@@ -1238,7 +1170,7 @@
             // 
             // txt_lineName
             // 
-            this.txt_lineName.Location = new System.Drawing.Point(84, 99);
+            this.txt_lineName.Location = new System.Drawing.Point(84, 96);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Size = new System.Drawing.Size(254, 24);
             this.txt_lineName.StyleController = this.layoutMx1;
@@ -1247,7 +1179,7 @@
             // 
             // txt_itemId
             // 
-            this.txt_itemId.Location = new System.Drawing.Point(84, 128);
+            this.txt_itemId.Location = new System.Drawing.Point(744, 244);
             this.txt_itemId.Name = "txt_itemId";
             this.txt_itemId.Size = new System.Drawing.Size(254, 24);
             this.txt_itemId.StyleController = this.layoutMx1;
@@ -1262,6 +1194,27 @@
             this.txt_lineId.StyleController = this.layoutMx1;
             this.txt_lineId.TabIndex = 834;
             this.txt_lineId.Tag = "readonly";
+            // 
+            // txt_kbSl
+            // 
+            this.txt_kbSl.Location = new System.Drawing.Point(84, 68);
+            this.txt_kbSl.Name = "txt_kbSl";
+            this.txt_kbSl.Size = new System.Drawing.Size(254, 24);
+            this.txt_kbSl.StyleController = this.layoutMx1;
+            this.txt_kbSl.TabIndex = 835;
+            this.txt_kbSl.Tag = "readonly";
+            // 
+            // txt_fmrmode
+            // 
+            this.txt_fmrmode.Location = new System.Drawing.Point(1074, 180);
+            this.txt_fmrmode.Name = "txt_fmrmode";
+            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_fmrmode.Properties.NullText = "-璇烽�夋嫨-";
+            this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
+            this.txt_fmrmode.StyleController = this.layoutMx1;
+            this.txt_fmrmode.TabIndex = 840;
             // 
             // layoutControlItem17
             // 
@@ -1286,435 +1239,16 @@
             this.layoutControlItem21.Text = "涓婚敭GUID";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
             // 
-            // Root
-            // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem23,
-            this.layoutControlItem16,
-            this.layoutControlItem15,
-            this.layoutControlItem14,
-            this.layoutControlItem26,
-            this.layoutControlItem13,
-            this.layoutControlItem7,
-            this.layoutControlItem25,
-            this.layoutControlItem29,
-            this.layoutControlItem27,
-            this.layoutControlItem31,
-            this.layoutControlItem10,
-            this.layoutControlItem32,
-            this.layoutControlItem8,
-            this.layoutControlItem33,
-            this.layoutControlItem2,
-            this.layoutControlItem35,
-            this.layoutControlItem12,
-            this.layoutControlItem6,
-            this.layoutControlItem34,
-            this.layoutControlItem5,
-            this.layoutControlItem1,
-            this.layoutControlItem28,
-            this.txt_itemId1111,
-            this.txt_lineName111,
-            this.txt_boxQty11,
-            this.layoutControlItem9,
-            this.layoutControlItem22,
-            this.layoutControlItem24,
-            this.layoutControlItem3,
-            this.txt_epTagtxt,
-            this.layoutControlItem18,
-            this.layoutControlItem4});
-            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.Root.Name = "Root";
-            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition12.Width = 100D;
-            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition13.Width = 100D;
-            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition14.Width = 100D;
-            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition15.Width = 100D;
-            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition12,
-            columnDefinition13,
-            columnDefinition14,
-            columnDefinition15});
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition19.Height = 100D;
-            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition20.Height = 100D;
-            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14,
-            rowDefinition15,
-            rowDefinition16,
-            rowDefinition17,
-            rowDefinition18,
-            rowDefinition19,
-            rowDefinition20});
-            this.Root.Size = new System.Drawing.Size(1342, 282);
-            this.Root.TextVisible = false;
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_djType;
-            this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem23.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, 29);
-            this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_fsubmitBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(990, 29);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_fsubmit;
-            this.layoutControlItem14.Location = new System.Drawing.Point(990, 58);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem14.TextVisible = false;
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.txt_freceQty;
-            this.layoutControlItem26.Location = new System.Drawing.Point(990, 87);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem26.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem26.Text = "鍒ゅ畾缁撴灉";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_fngHandle;
-            this.layoutControlItem13.Location = new System.Drawing.Point(990, 116);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem13.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem13.Text = "澶勭疆缁撴灉";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_fzrIdTxt;
-            this.layoutControlItem7.Location = new System.Drawing.Point(990, 145);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem7.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem7.Text = "璐d换浜哄憳";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_mrmodeTxt;
-            this.layoutControlItem25.CustomizationFormText = "杩斿伐宸ュ簭";
-            this.layoutControlItem25.Location = new System.Drawing.Point(990, 203);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem25.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem25.Text = "鍙嶅伐宸ュ簭";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_workNo;
-            this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_msg;
-            this.layoutControlItem27.Location = new System.Drawing.Point(660, 174);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2;
-            this.layoutControlItem27.Size = new System.Drawing.Size(330, 58);
-            this.layoutControlItem27.Text = "杩濊绫诲埆";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem27.TextVisible = false;
-            // 
-            // layoutControlItem31
-            // 
-            this.layoutControlItem31.Control = this.txt_createBy;
-            this.layoutControlItem31.Location = new System.Drawing.Point(660, 0);
-            this.layoutControlItem31.Name = "layoutControlItem31";
-            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem31.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(660, 116);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem32
-            // 
-            this.layoutControlItem32.Control = this.txt_checkStates;
-            this.layoutControlItem32.Location = new System.Drawing.Point(660, 87);
-            this.layoutControlItem32.Name = "layoutControlItem32";
-            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem32.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_fcheckBy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(660, 58);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem33
-            // 
-            this.layoutControlItem33.Control = this.txt_createDate;
-            this.layoutControlItem33.Location = new System.Drawing.Point(660, 29);
-            this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem33.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_fcheckDate;
-            this.layoutControlItem2.Location = new System.Drawing.Point(660, 145);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem35
-            // 
-            this.layoutControlItem35.Control = this.txt_zrType;
-            this.layoutControlItem35.Location = new System.Drawing.Point(990, 232);
-            this.layoutControlItem35.Name = "layoutControlItem35";
-            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem35.Size = new System.Drawing.Size(332, 30);
-            this.layoutControlItem35.Text = "璐d换鍒ゅ畾";
-            this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 232);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem12.Size = new System.Drawing.Size(660, 30);
-            this.layoutControlItem12.Text = "澶囨敞璇存槑";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 203);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem34
-            // 
-            this.layoutControlItem34.Control = this.txt_itemName;
-            this.layoutControlItem34.Location = new System.Drawing.Point(0, 174);
-            this.layoutControlItem34.Name = "layoutControlItem34";
-            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem34.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem34.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_itemNo;
-            this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 145);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem5.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem5.Text = "浜у搧缂栫爜";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_releaseNo;
-            this.layoutControlItem1.Location = new System.Drawing.Point(330, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_lotNo;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 29);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem28.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem28.Text = "閫夋嫨宸ュ崟";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // txt_itemId1111
             // 
             this.txt_itemId1111.Control = this.txt_itemId;
-            this.txt_itemId1111.Location = new System.Drawing.Point(0, 116);
+            this.txt_itemId1111.Location = new System.Drawing.Point(660, 232);
             this.txt_itemId1111.Name = "txt_itemId1111";
-            this.txt_itemId1111.OptionsTableLayoutItem.RowIndex = 4;
-            this.txt_itemId1111.Size = new System.Drawing.Size(330, 29);
+            this.txt_itemId1111.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.txt_itemId1111.OptionsTableLayoutItem.RowIndex = 8;
+            this.txt_itemId1111.Size = new System.Drawing.Size(330, 30);
             this.txt_itemId1111.Text = "浜у搧ID";
             this.txt_itemId1111.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // txt_lineName111
-            // 
-            this.txt_lineName111.Control = this.txt_lineName;
-            this.txt_lineName111.Location = new System.Drawing.Point(0, 87);
-            this.txt_lineName111.Name = "txt_lineName111";
-            this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 3;
-            this.txt_lineName111.Size = new System.Drawing.Size(330, 29);
-            this.txt_lineName111.Text = "鐢熶骇绾垮埆";
-            this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // txt_boxQty11
-            // 
-            this.txt_boxQty11.Control = this.txt_kbList;
-            this.txt_boxQty11.Location = new System.Drawing.Point(0, 58);
-            this.txt_boxQty11.Name = "txt_boxQty11";
-            this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 2;
-            this.txt_boxQty11.Size = new System.Drawing.Size(330, 29);
-            this.txt_boxQty11.Text = "閫夋嫨绠辩爜";
-            this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_fbatchQty;
-            this.layoutControlItem9.Location = new System.Drawing.Point(330, 29);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem9.Text = "鎶芥鏁伴噺";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_lifnr;
-            this.layoutControlItem22.Location = new System.Drawing.Point(330, 58);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem22.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem24
-            // 
-            this.layoutControlItem24.Control = this.txt_suppId;
-            this.layoutControlItem24.Location = new System.Drawing.Point(330, 87);
-            this.layoutControlItem24.Name = "layoutControlItem24";
-            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem24.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_lotNo1;
-            this.layoutControlItem3.Location = new System.Drawing.Point(330, 116);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem3.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem3.Text = "閫佹鎵瑰彿";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // txt_epTagtxt
-            // 
-            this.txt_epTagtxt.Control = this.txt_epTag;
-            this.txt_epTagtxt.Location = new System.Drawing.Point(330, 145);
-            this.txt_epTagtxt.Name = "txt_epTagtxt";
-            this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5;
-            this.txt_epTagtxt.Size = new System.Drawing.Size(330, 29);
-            this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
-            this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_fmanageNo;
-            this.layoutControlItem18.Location = new System.Drawing.Point(330, 174);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem18.Size = new System.Drawing.Size(330, 29);
-            this.layoutControlItem18.Text = "娴佺▼缂栧彿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem4
             // 
@@ -1727,13 +1261,419 @@
             this.layoutControlItem4.Text = "绾垮埆ID";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_workNo;
+            this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
+            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem23
+            // 
+            this.layoutControlItem23.Control = this.txt_djType;
+            this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem23.Name = "layoutControlItem23";
+            this.layoutControlItem23.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem31
+            // 
+            this.layoutControlItem31.Control = this.txt_createBy;
+            this.layoutControlItem31.Location = new System.Drawing.Point(650, 0);
+            this.layoutControlItem31.Name = "layoutControlItem31";
+            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem31.Size = new System.Drawing.Size(325, 28);
+            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(650, 28);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem33.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem9,
+            this.layoutControlItem22,
+            this.layoutControlItem24,
+            this.layoutControlItem3,
+            this.txt_epTagtxt,
+            this.layoutControlItem18,
+            this.layoutControlItem13,
+            this.layoutControlItem7,
+            this.layoutControlItem35,
+            this.layoutControlItem27,
+            this.layoutControlItem25,
+            this.layoutControlItem28,
+            this.txt_boxQty11,
+            this.layoutControlItem30,
+            this.txt_lineName111,
+            this.layoutControlItem5,
+            this.layoutControlItem34,
+            this.layoutControlItem6,
+            this.layoutControlItem12,
+            this.layoutControlItem8,
+            this.layoutControlItem32,
+            this.layoutControlItem10,
+            this.layoutControlItem2,
+            this.layoutControlItem16,
+            this.layoutControlItem15,
+            this.layoutControlItem14});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8});
+            this.Root.Size = new System.Drawing.Size(1342, 244);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_releaseNo;
+            this.layoutControlItem1.Location = new System.Drawing.Point(330, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_fbatchQty;
+            this.layoutControlItem9.Location = new System.Drawing.Point(330, 28);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem9.Text = "鎶芥鏁伴噺";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_lifnr;
+            this.layoutControlItem22.Location = new System.Drawing.Point(330, 56);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem22.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem24
+            // 
+            this.layoutControlItem24.Control = this.txt_suppId;
+            this.layoutControlItem24.Location = new System.Drawing.Point(330, 84);
+            this.layoutControlItem24.Name = "layoutControlItem24";
+            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem24.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_lotNo1;
+            this.layoutControlItem3.Location = new System.Drawing.Point(330, 112);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem3.Text = "閫佹鎵瑰彿";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_epTagtxt
+            // 
+            this.txt_epTagtxt.Control = this.txt_epTag;
+            this.txt_epTagtxt.Location = new System.Drawing.Point(330, 140);
+            this.txt_epTagtxt.Name = "txt_epTagtxt";
+            this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5;
+            this.txt_epTagtxt.Size = new System.Drawing.Size(330, 28);
+            this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
+            this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_fmanageNo;
+            this.layoutControlItem18.Location = new System.Drawing.Point(330, 168);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem18.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem18.Text = "娴佺▼缂栧彿";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_fngHandle;
+            this.layoutControlItem13.Location = new System.Drawing.Point(990, 84);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem13.Text = "澶勭疆缁撴灉";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_zrType;
+            this.layoutControlItem7.Location = new System.Drawing.Point(990, 112);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem7.Text = "鍒ゅ畾璐d换";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.txt_fzrId;
+            this.layoutControlItem35.Location = new System.Drawing.Point(990, 140);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem35.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem35.Text = "璐d换浜�";
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.txt_msg;
+            this.layoutControlItem27.Location = new System.Drawing.Point(990, 0);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
+            this.layoutControlItem27.Size = new System.Drawing.Size(332, 84);
+            this.layoutControlItem27.Text = "杩濊绫诲埆";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem27.TextVisible = false;
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_fmrmode;
+            this.layoutControlItem25.Location = new System.Drawing.Point(990, 168);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem25.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem25.Text = "杩斿伐宸ュ簭";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_lotNo;
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem28.Text = "閫夋嫨宸ュ崟";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_boxQty11
+            // 
+            this.txt_boxQty11.Control = this.txt_kbList;
+            this.txt_boxQty11.Location = new System.Drawing.Point(0, 28);
+            this.txt_boxQty11.Name = "txt_boxQty11";
+            this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 1;
+            this.txt_boxQty11.Size = new System.Drawing.Size(330, 28);
+            this.txt_boxQty11.Text = "閫佹绠辩爜";
+            this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_kbSl;
+            this.layoutControlItem30.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem30.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem30.Text = "閫佹鏁伴噺";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_lineName111
+            // 
+            this.txt_lineName111.Control = this.txt_lineName;
+            this.txt_lineName111.Location = new System.Drawing.Point(0, 84);
+            this.txt_lineName111.Name = "txt_lineName111";
+            this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 3;
+            this.txt_lineName111.Size = new System.Drawing.Size(330, 28);
+            this.txt_lineName111.Text = "鐢熶骇绾垮埆";
+            this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_itemNo;
+            this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem5.Text = "浜у搧缂栫爜";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.txt_itemName;
+            this.layoutControlItem34.Location = new System.Drawing.Point(0, 140);
+            this.layoutControlItem34.Name = "layoutControlItem34";
+            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem34.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_itemModel;
+            this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 168);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_remarks;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem12.Text = "澶囨敞璇存槑";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_fcheckBy;
+            this.layoutControlItem8.Location = new System.Drawing.Point(660, 0);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem32
+            // 
+            this.layoutControlItem32.Control = this.txt_checkStates;
+            this.layoutControlItem32.Location = new System.Drawing.Point(660, 28);
+            this.layoutControlItem32.Name = "layoutControlItem32";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem32.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_fcheckResu;
+            this.layoutControlItem10.Location = new System.Drawing.Point(660, 56);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_fcheckDate;
+            this.layoutControlItem2.Location = new System.Drawing.Point(660, 84);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_fsubmitDate;
+            this.layoutControlItem16.Location = new System.Drawing.Point(660, 112);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem16.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_fsubmitBy;
+            this.layoutControlItem15.Location = new System.Drawing.Point(660, 140);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem15.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_fsubmit;
+            this.layoutControlItem14.Location = new System.Drawing.Point(660, 168);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem14.TextVisible = false;
+            // 
             // xtraTabControl2
             // 
             this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
             this.xtraTabControl2.Name = "xtraTabControl2";
             this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 394);
+            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 434);
             this.xtraTabControl2.TabIndex = 3;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1745,7 +1685,7 @@
             this.tabMxPage1.Controls.Add(this.splitMx2);
             this.tabMxPage1.Controls.Add(this.panMsg);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1340, 362);
+            this.tabMxPage1.Size = new System.Drawing.Size(1340, 402);
             this.tabMxPage1.Text = "鎶芥牱淇℃伅";
             // 
             // splitMx2
@@ -1764,7 +1704,7 @@
             // 
             this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
             this.splitMx2.Panel2.Text = "Panel2";
-            this.splitMx2.Size = new System.Drawing.Size(1340, 315);
+            this.splitMx2.Size = new System.Drawing.Size(1340, 355);
             this.splitMx2.SplitterPosition = 287;
             this.splitMx2.TabIndex = 3;
             // 
@@ -2050,7 +1990,7 @@
             this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
             this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn10.Caption = "缂洪櫡鎻忚堪";
+            this.gridColumn10.Caption = "寮傚父鎻忚堪";
             this.gridColumn10.ColumnEdit = this.rptDefectDetails;
             this.gridColumn10.FieldName = "defectDetails";
             this.gridColumn10.MinWidth = 25;
@@ -2083,7 +2023,7 @@
             // 
             this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
             this.splitYangLi.Panel2.Text = "Panel2";
-            this.splitYangLi.Size = new System.Drawing.Size(1340, 16);
+            this.splitYangLi.Size = new System.Drawing.Size(1340, 56);
             this.splitYangLi.SplitterPosition = 676;
             this.splitYangLi.TabIndex = 4;
             // 
@@ -2093,7 +2033,7 @@
             this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupControl1.Location = new System.Drawing.Point(0, 0);
             this.groupControl1.Name = "groupControl1";
-            this.groupControl1.Size = new System.Drawing.Size(676, 16);
+            this.groupControl1.Size = new System.Drawing.Size(676, 56);
             this.groupControl1.TabIndex = 3;
             this.groupControl1.Text = "妫�娴嬬粨鏋�";
             // 
@@ -2103,7 +2043,7 @@
             this.gcMx2.Location = new System.Drawing.Point(2, 28);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(672, 0);
+            this.gcMx2.Size = new System.Drawing.Size(672, 26);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2188,7 +2128,7 @@
             this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupControl2.Location = new System.Drawing.Point(0, 0);
             this.groupControl2.Name = "groupControl2";
-            this.groupControl2.Size = new System.Drawing.Size(652, 16);
+            this.groupControl2.Size = new System.Drawing.Size(652, 56);
             this.groupControl2.TabIndex = 4;
             this.groupControl2.Text = "鏍锋湰缁撴灉";
             // 
@@ -2198,7 +2138,7 @@
             this.gcMx3.Location = new System.Drawing.Point(2, 28);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(648, 0);
+            this.gcMx3.Size = new System.Drawing.Size(648, 26);
             this.gcMx3.TabIndex = 0;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -2351,23 +2291,23 @@
             this.layoutControlItem19});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
-            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition18.Width = 100D;
-            columnDefinition19.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition19.Width = 110D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition8.Width = 110D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition16,
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19});
-            rowDefinition21.Height = 100D;
-            rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition21});
+            rowDefinition9});
             this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
             this.layoutControlGroup1.TextVisible = false;
@@ -2415,247 +2355,25 @@
             // 
             // tabMxPage2
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx14);
-            this.tabMxPage2.Controls.Add(this.panel1);
+            this.tabMxPage2.Controls.Add(this.ucChouJianList1);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1340, 362);
+            this.tabMxPage2.Size = new System.Drawing.Size(1340, 402);
             this.tabMxPage2.Text = "浜у搧鏉$爜鏄庣粏";
             // 
-            // gcMx14
+            // ucChouJianList1
             // 
-            this.gcMx14.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx14.Location = new System.Drawing.Point(0, 47);
-            this.gcMx14.MainView = this.gvMx14;
-            this.gcMx14.Name = "gcMx14";
-            this.gcMx14.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1});
-            this.gcMx14.Size = new System.Drawing.Size(1340, 315);
-            this.gcMx14.TabIndex = 1;
-            this.gcMx14.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx14});
-            // 
-            // gvMx14
-            // 
-            this.gvMx14.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx14.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx14.Appearance.Row.Options.UseFont = true;
-            this.gvMx14.ColumnPanelRowHeight = 50;
-            this.gvMx14.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2guid,
-            this.gridColumn12,
-            this.gvMx2itemBarcode,
-            this.gvMx2quantity,
-            this.gridColumn16,
-            this.gvMx2itemSname,
-            this.gridColumn34,
-            this.gridColumn35,
-            this.gridColumn36,
-            this.gridColumn11,
-            this.gridColumn31});
-            this.gvMx14.GridControl = this.gcMx14;
-            this.gvMx14.Name = "gvMx14";
-            this.gvMx14.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx14.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx14.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx2guid
-            // 
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "涓婚敭GUID";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 94;
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "鏄惁鎶芥";
-            this.gridColumn12.FieldName = "isCheck";
-            this.gridColumn12.MaxWidth = 50;
-            this.gridColumn12.MinWidth = 50;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 0;
-            this.gridColumn12.Width = 50;
-            // 
-            // gvMx2itemBarcode
-            // 
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鏉$爜缂栧彿";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 94;
-            // 
-            // gvMx2quantity
-            // 
-            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "宸ュ崟缂栧彿";
-            this.gvMx2quantity.FieldName = "daa001";
-            this.gvMx2quantity.MinWidth = 50;
-            this.gvMx2quantity.Name = "gvMx2quantity";
-            this.gvMx2quantity.Tag = "query_a.QUANTITY";
-            this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 2;
-            this.gvMx2quantity.Width = 94;
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "浜у搧缂栫爜";
-            this.gridColumn16.FieldName = "itemNo";
-            this.gridColumn16.MinWidth = 25;
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 3;
-            this.gridColumn16.Width = 94;
-            // 
-            // gvMx2itemSname
-            // 
-            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
-            this.gvMx2itemSname.FieldName = "itemName";
-            this.gvMx2itemSname.MinWidth = 50;
-            this.gvMx2itemSname.Name = "gvMx2itemSname";
-            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
-            this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 4;
-            this.gvMx2itemSname.Width = 94;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "鍗曚綅";
-            this.gridColumn34.FieldName = "dwName";
-            this.gridColumn34.MinWidth = 25;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 5;
-            this.gridColumn34.Width = 94;
-            // 
-            // gridColumn35
-            // 
-            this.gridColumn35.Caption = "鏁伴噺";
-            this.gridColumn35.FieldName = "quantity";
-            this.gridColumn35.MinWidth = 25;
-            this.gridColumn35.Name = "gridColumn35";
-            this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 6;
-            this.gridColumn35.Width = 94;
-            // 
-            // gridColumn36
-            // 
-            this.gridColumn36.Caption = "寰呭叆搴撴暟";
-            this.gridColumn36.FieldName = "wrkQty";
-            this.gridColumn36.MinWidth = 25;
-            this.gridColumn36.Name = "gridColumn36";
-            this.gridColumn36.Visible = true;
-            this.gridColumn36.VisibleIndex = 7;
-            this.gridColumn36.Width = 94;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "宸插叆搴撴暟";
-            this.gridColumn11.FieldName = "rkQty";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 8;
-            this.gridColumn11.Width = 94;
-            // 
-            // gridColumn31
-            // 
-            this.gridColumn31.Caption = "绠卞彿";
-            this.gridColumn31.FieldName = "tbNo";
-            this.gridColumn31.MinWidth = 25;
-            this.gridColumn31.Name = "gridColumn31";
-            this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 9;
-            this.gridColumn31.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.layoutMxMsg2);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1340, 47);
-            this.panel1.TabIndex = 2;
-            // 
-            // layoutMxMsg2
-            // 
-            this.layoutMxMsg2.Controls.Add(this.txtChouJian);
-            this.layoutMxMsg2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMxMsg2.Location = new System.Drawing.Point(0, 0);
-            this.layoutMxMsg2.Name = "layoutMxMsg2";
-            this.layoutMxMsg2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 157, 812, 500);
-            this.layoutMxMsg2.Root = this.layoutControlGroup2;
-            this.layoutMxMsg2.Size = new System.Drawing.Size(1340, 47);
-            this.layoutMxMsg2.TabIndex = 0;
-            this.layoutMxMsg2.Text = "layoutControl1";
-            // 
-            // txtChouJian
-            // 
-            this.txtChouJian.Location = new System.Drawing.Point(121, 4);
-            this.txtChouJian.Name = "txtChouJian";
-            this.txtChouJian.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.txtChouJian.Properties.Appearance.Options.UseFont = true;
-            this.txtChouJian.Size = new System.Drawing.Size(324, 36);
-            this.txtChouJian.StyleController = this.layoutMxMsg2;
-            this.txtChouJian.TabIndex = 4;
-            // 
-            // layoutControlGroup2
-            // 
-            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup2.GroupBordersVisible = false;
-            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem30});
-            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup2.Name = "Root";
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.Width = 100D;
-            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition21.Width = 100D;
-            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition22.Width = 100D;
-            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition20,
-            columnDefinition21,
-            columnDefinition22});
-            rowDefinition22.Height = 100D;
-            rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition22});
-            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1340, 47);
-            this.layoutControlGroup2.TextVisible = false;
-            // 
-            // layoutControlItem30
-            // 
-            this.layoutControlItem30.Control = this.txtChouJian;
-            this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.Size = new System.Drawing.Size(445, 43);
-            this.layoutControlItem30.Text = "璇锋壂鎶芥鐨勬潯鐮�";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(105, 18);
+            this.ucChouJianList1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucChouJianList1.Location = new System.Drawing.Point(0, 0);
+            this.ucChouJianList1.Name = "ucChouJianList1";
+            this.ucChouJianList1.pGuid = null;
+            this.ucChouJianList1.Size = new System.Drawing.Size(1340, 402);
+            this.ucChouJianList1.TabIndex = 0;
             // 
             // tabMxPage3
             // 
             this.tabMxPage3.Controls.Add(this.ucUpFileList1);
             this.tabMxPage3.Name = "tabMxPage3";
-            this.tabMxPage3.Size = new System.Drawing.Size(1340, 362);
+            this.tabMxPage3.Size = new System.Drawing.Size(1340, 402);
             this.tabMxPage3.Text = "闄勪欢淇℃伅";
             // 
             // ucUpFileList1
@@ -2665,7 +2383,7 @@
             this.ucUpFileList1.Name = "ucUpFileList1";
             this.ucUpFileList1.parentGroup = null;
             this.ucUpFileList1.pGuid = null;
-            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 362);
+            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 402);
             this.ucUpFileList1.TabIndex = 0;
             // 
             // repositoryItemComboBox2
@@ -2731,6 +2449,7 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.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();
@@ -2754,51 +2473,49 @@
             ((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_fzrIdTxt.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((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.layoutControlItem27)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2836,15 +2553,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).EndInit();
-            this.layoutMxMsg2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
             this.tabMxPage3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -2872,7 +2580,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
         private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
         private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
@@ -2885,7 +2592,6 @@
         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_fngHandle;
         private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
         private DevExpress.XtraEditors.TextEdit txt_remarks;
         private DevExpress.XtraEditors.TextEdit txt_itemNo;
@@ -2970,7 +2676,6 @@
         private UserControl.UcLookCustomer txt_suppId;
         private UserControl.UcDictionary txt_msg;
         private DevExpress.XtraEditors.TextEdit txt_workNo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
         private DevExpress.XtraEditors.TextEdit txt_checkStates;
         private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
         private DevExpress.XtraEditors.TextEdit txt_createBy;
@@ -2978,48 +2683,21 @@
         private DevExpress.XtraEditors.TextEdit txt_itemName;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
         private UserControl.UCUpFileList ucUpFileList1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraEditors.TextEdit txt_fzrIdTxt;
-        private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt;
-        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 layoutControlItem27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptDefectLevel;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails;
-        private DevExpress.XtraEditors.TextEdit txt_zrType;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
         private DevExpress.XtraEditors.ButtonEdit txt_kbList;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraEditors.ButtonEdit txt_lotNo;
         private DevExpress.XtraEditors.TextEdit txt_lineName;
         private DevExpress.XtraEditors.TextEdit txt_itemId;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111;
-        private DevExpress.XtraLayout.LayoutControlItem txt_lineName111;
-        private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
@@ -3029,24 +2707,34 @@
         private DevExpress.XtraEditors.TextEdit txt_lineId;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraGrid.GridControl gcMx14;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx14;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
-        private System.Windows.Forms.Panel panel1;
-        private DevExpress.XtraLayout.LayoutControl layoutMxMsg2;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
-        private DevExpress.XtraEditors.TextEdit txtChouJian;
+        private UcChouJianList ucChouJianList1;
+        private DevExpress.XtraEditors.TextEdit txt_kbSl;
+        private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_zrType;
+        private UserControl.UcLookStaff txt_fzrId;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private DevExpress.XtraLayout.LayoutControlItem txt_lineName111;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3