From ecb7a60de1639f520712ce95f99414b0dd2c9713 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 14 四月 2025 08:30:40 +0800
Subject: [PATCH] 自动打印

---
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs |  497 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 287 insertions(+), 210 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
index 51c34ac..8ba5d46 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -29,18 +29,19 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            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 rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+            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();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -50,6 +51,8 @@
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = 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();
@@ -59,7 +62,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();
@@ -109,11 +111,11 @@
             this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
             this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -122,7 +124,6 @@
             this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -132,7 +133,6 @@
             this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -140,8 +140,12 @@
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -192,7 +196,8 @@
             this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -241,11 +246,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -254,7 +259,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
@@ -264,7 +268,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
@@ -272,8 +275,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -451,6 +458,29 @@
             this.gv_releaseNo.VisibleIndex = 1;
             this.gv_releaseNo.Width = 100;
             // 
+            // 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 = 2;
+            this.gv_fcheckResu.Width = 50;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鍒ゅ畾缁撴灉";
+            this.gridColumn5.FieldName = "freceQty";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 94;
+            // 
             // gv_lotNo
             // 
             this.gv_lotNo.AppearanceCell.Options.UseFont = true;
@@ -563,19 +593,6 @@
             this.gv_fbatchQty.Visible = true;
             this.gv_fbatchQty.VisibleIndex = 12;
             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 = 2;
-            this.gv_fcheckResu.Width = 50;
             // 
             // gv_remarks
             // 
@@ -794,6 +811,7 @@
             this.layoutMx1.Controls.Add(this.txt_suppId);
             this.layoutMx1.Controls.Add(this.txt_fngHandle);
             this.layoutMx1.Controls.Add(this.txt_freceQty);
+            this.layoutMx1.Controls.Add(this.txt_zrType);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem17,
@@ -809,9 +827,9 @@
             // txt_msg
             // 
             this.txt_msg.BtnTxt = "杩濊绫诲埆";
-            this.txt_msg.Location = new System.Drawing.Point(672, 208);
+            this.txt_msg.Location = new System.Drawing.Point(672, 186);
             this.txt_msg.Name = "txt_msg";
-            this.txt_msg.Size = new System.Drawing.Size(326, 62);
+            this.txt_msg.Size = new System.Drawing.Size(326, 56);
             this.txt_msg.TabIndex = 814;
             this.txt_msg.TextTxt = "";
             this.txt_msg.WhereTxt = null;
@@ -819,7 +837,7 @@
             // txt_fmrmode
             // 
             this.txt_fmrmode.IsReadly = false;
-            this.txt_fmrmode.Location = new System.Drawing.Point(1074, 241);
+            this.txt_fmrmode.Location = new System.Drawing.Point(1074, 246);
             this.txt_fmrmode.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fmrmode.Name = "txt_fmrmode";
             this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
@@ -829,7 +847,7 @@
             // txt_fzrId
             // 
             this.txt_fzrId.IsReadly = false;
-            this.txt_fzrId.Location = new System.Drawing.Point(1074, 175);
+            this.txt_fzrId.Location = new System.Drawing.Point(1074, 186);
             this.txt_fzrId.Name = "txt_fzrId";
             this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
             this.txt_fzrId.TabIndex = 812;
@@ -845,7 +863,7 @@
             // 
             // txt_remarks
             // 
-            this.txt_remarks.Location = new System.Drawing.Point(84, 241);
+            this.txt_remarks.Location = new System.Drawing.Point(84, 215);
             this.txt_remarks.Name = "txt_remarks";
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
             this.txt_remarks.Size = new System.Drawing.Size(584, 24);
@@ -855,7 +873,7 @@
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 142);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 128);
             this.txt_fcheckResu.Name = "txt_fcheckResu";
             this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckResu.StyleController = this.layoutMx1;
@@ -864,7 +882,7 @@
             // 
             // txt_releaseNo
             // 
-            this.txt_releaseNo.Location = new System.Drawing.Point(84, 43);
+            this.txt_releaseNo.Location = new System.Drawing.Point(84, 41);
             this.txt_releaseNo.Name = "txt_releaseNo";
             this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
             this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
@@ -874,7 +892,7 @@
             // 
             // txt_fcheckDate
             // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 43);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 41);
             this.txt_fcheckDate.Name = "txt_fcheckDate";
             this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
             this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
@@ -884,7 +902,7 @@
             // 
             // txt_lotNo1
             // 
-            this.txt_lotNo1.Location = new System.Drawing.Point(744, 76);
+            this.txt_lotNo1.Location = new System.Drawing.Point(744, 70);
             this.txt_lotNo1.Name = "txt_lotNo1";
             this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
             this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
@@ -894,7 +912,7 @@
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(84, 142);
+            this.txt_itemNo.Location = new System.Drawing.Point(84, 128);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
             this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
@@ -904,7 +922,7 @@
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(84, 208);
+            this.txt_itemModel.Location = new System.Drawing.Point(84, 186);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
@@ -913,7 +931,7 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 76);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 70);
             this.txt_fcheckBy.Name = "txt_fcheckBy";
             this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
             this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
@@ -933,7 +951,7 @@
             // 
             // txt_fsubmitBy
             // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43);
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 41);
             this.txt_fsubmitBy.Name = "txt_fsubmitBy";
             this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
             this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -951,7 +969,7 @@
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 76);
+            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 70);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
             this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
@@ -961,7 +979,7 @@
             // 
             // txt_fmanageNo
             // 
-            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208);
+            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 186);
             this.txt_fmanageNo.Name = "txt_fmanageNo";
             this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
             this.txt_fmanageNo.StyleController = this.layoutMx1;
@@ -1004,7 +1022,7 @@
             // 
             // txt_lotNo
             // 
-            this.txt_lotNo.Location = new System.Drawing.Point(414, 175);
+            this.txt_lotNo.Location = new System.Drawing.Point(414, 157);
             this.txt_lotNo.Name = "txt_lotNo";
             this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
             this.txt_lotNo.StyleController = this.layoutMx1;
@@ -1013,7 +1031,7 @@
             // 
             // txt_workNo
             // 
-            this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
+            this.txt_workNo.Location = new System.Drawing.Point(1074, 215);
             this.txt_workNo.Name = "txt_workNo";
             this.txt_workNo.Size = new System.Drawing.Size(256, 24);
             this.txt_workNo.StyleController = this.layoutMx1;
@@ -1021,7 +1039,7 @@
             // 
             // txt_states
             // 
-            this.txt_states.Location = new System.Drawing.Point(414, 109);
+            this.txt_states.Location = new System.Drawing.Point(414, 99);
             this.txt_states.Name = "txt_states";
             this.txt_states.Size = new System.Drawing.Size(254, 24);
             this.txt_states.StyleController = this.layoutMx1;
@@ -1030,7 +1048,7 @@
             // 
             // txt_epTag
             // 
-            this.txt_epTag.Location = new System.Drawing.Point(744, 109);
+            this.txt_epTag.Location = new System.Drawing.Point(744, 99);
             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)});
@@ -1041,7 +1059,7 @@
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(744, 175);
+            this.txt_createBy.Location = new System.Drawing.Point(744, 157);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Size = new System.Drawing.Size(254, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
@@ -1050,7 +1068,7 @@
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(744, 142);
+            this.txt_createDate.Location = new System.Drawing.Point(744, 128);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Size = new System.Drawing.Size(254, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
@@ -1059,7 +1077,7 @@
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(84, 175);
+            this.txt_itemName.Location = new System.Drawing.Point(84, 157);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Size = new System.Drawing.Size(254, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
@@ -1068,7 +1086,7 @@
             // 
             // txt_lineId
             // 
-            this.txt_lineId.Location = new System.Drawing.Point(84, 76);
+            this.txt_lineId.Location = new System.Drawing.Point(84, 70);
             this.txt_lineId.Name = "txt_lineId";
             this.txt_lineId.Size = new System.Drawing.Size(254, 24);
             this.txt_lineId.StyleController = this.layoutMx1;
@@ -1077,7 +1095,7 @@
             // 
             // txt_itemId
             // 
-            this.txt_itemId.Location = new System.Drawing.Point(84, 109);
+            this.txt_itemId.Location = new System.Drawing.Point(84, 99);
             this.txt_itemId.Name = "txt_itemId";
             this.txt_itemId.Size = new System.Drawing.Size(254, 24);
             this.txt_itemId.StyleController = this.layoutMx1;
@@ -1086,7 +1104,7 @@
             // 
             // txt_suppId
             // 
-            this.txt_suppId.Location = new System.Drawing.Point(744, 43);
+            this.txt_suppId.Location = new System.Drawing.Point(744, 41);
             this.txt_suppId.Name = "txt_suppId";
             this.txt_suppId.Size = new System.Drawing.Size(254, 24);
             this.txt_suppId.StyleController = this.layoutMx1;
@@ -1096,7 +1114,7 @@
             // txt_fngHandle
             // 
             this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
-            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 142);
+            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 128);
             this.txt_fngHandle.Name = "txt_fngHandle";
             this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1113,7 +1131,7 @@
             // txt_freceQty
             // 
             this.txt_freceQty.EditValue = "-璇烽�夋嫨-";
-            this.txt_freceQty.Location = new System.Drawing.Point(1074, 109);
+            this.txt_freceQty.Location = new System.Drawing.Point(1074, 99);
             this.txt_freceQty.Name = "txt_freceQty";
             this.txt_freceQty.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1125,6 +1143,22 @@
             this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
             this.txt_freceQty.StyleController = this.layoutMx1;
             this.txt_freceQty.TabIndex = 830;
+            // 
+            // txt_zrType
+            // 
+            this.txt_zrType.EditValue = "-璇烽�夋嫨-";
+            this.txt_zrType.Location = new System.Drawing.Point(1074, 157);
+            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 = 829;
             // 
             // layoutControlItem17
             // 
@@ -1155,7 +1189,6 @@
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
-            this.layoutControlItem23,
             this.layoutControlItem8,
             this.layoutControlItem2,
             this.layoutControlItem9,
@@ -1164,7 +1197,6 @@
             this.txt_epTagtxt,
             this.layoutControlItem10,
             this.layoutControlItem32,
-            this.layoutControlItem29,
             this.layoutControlItem5,
             this.layoutControlItem6,
             this.layoutControlItem34,
@@ -1174,7 +1206,6 @@
             this.layoutControlItem28,
             this.layoutControlItem4,
             this.layoutControlItem27,
-            this.layoutControlItem26,
             this.layoutControlItem33,
             this.layoutControlItem31,
             this.layoutControlItem16,
@@ -1182,89 +1213,87 @@
             this.layoutControlItem14,
             this.layoutControlItem13,
             this.layoutControlItem11,
+            this.layoutControlItem12,
+            this.layoutControlItem23,
+            this.layoutControlItem26,
+            this.layoutControlItem29,
             this.layoutControlItem25,
-            this.layoutControlItem12});
+            this.layoutControlItem35});
             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;
+            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.Percent;
+            columnDefinition8.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;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition11.Height = 100D;
+            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            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 = 28D;
+            rowDefinition18.SizeType = System.Windows.Forms.SizeType.AutoSize;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15,
+            rowDefinition16,
+            rowDefinition17,
+            rowDefinition18});
             this.Root.Size = new System.Drawing.Size(1342, 282);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txt_releaseNo;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 29);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem1.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_djType;
-            this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.Size = new System.Drawing.Size(330, 31);
-            this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_fcheckBy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(330, 64);
+            this.layoutControlItem8.Location = new System.Drawing.Point(330, 58);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem8.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_fcheckDate;
-            this.layoutControlItem2.Location = new System.Drawing.Point(330, 31);
+            this.layoutControlItem2.Location = new System.Drawing.Point(330, 29);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem2.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1274,18 +1303,18 @@
             this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem9.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem9.Text = "鎶芥鏁伴噺";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_lotNo1;
-            this.layoutControlItem3.Location = new System.Drawing.Point(660, 64);
+            this.layoutControlItem3.Location = new System.Drawing.Point(660, 58);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem3.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem3.Text = "閫佹鎵瑰彿";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1295,62 +1324,51 @@
             this.layoutControlItem22.Location = new System.Drawing.Point(660, 0);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem22.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
             // 
             // txt_epTagtxt
             // 
             this.txt_epTagtxt.Control = this.txt_epTag;
-            this.txt_epTagtxt.Location = new System.Drawing.Point(660, 97);
+            this.txt_epTagtxt.Location = new System.Drawing.Point(660, 87);
             this.txt_epTagtxt.Name = "txt_epTagtxt";
             this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 2;
             this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 3;
-            this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33);
+            this.txt_epTagtxt.Size = new System.Drawing.Size(330, 29);
             this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
             this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(330, 130);
+            this.layoutControlItem10.Location = new System.Drawing.Point(330, 116);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem10.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.txt_states;
-            this.layoutControlItem32.Location = new System.Drawing.Point(330, 97);
+            this.layoutControlItem32.Location = new System.Drawing.Point(330, 87);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem32.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_workNo;
-            this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_itemNo;
             this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 130);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 116);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem5.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1358,108 +1376,97 @@
             // 
             this.layoutControlItem6.Control = this.txt_itemModel;
             this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 174);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
+            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, 163);
+            this.layoutControlItem34.Location = new System.Drawing.Point(0, 145);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem34.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem34.Text = "浜у搧鍚嶇О";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_lineId;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 58);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem7.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem7.Text = "鐢熶骇绾垮埆";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
             // 
             // txt_itemId11111
             // 
             this.txt_itemId11111.Control = this.txt_itemId;
-            this.txt_itemId11111.Location = new System.Drawing.Point(0, 97);
+            this.txt_itemId11111.Location = new System.Drawing.Point(0, 87);
             this.txt_itemId11111.Name = "txt_itemId11111";
             this.txt_itemId11111.OptionsTableLayoutItem.RowIndex = 3;
-            this.txt_itemId11111.Size = new System.Drawing.Size(330, 33);
+            this.txt_itemId11111.Size = new System.Drawing.Size(330, 29);
             this.txt_itemId11111.Text = "鐗╂枡ID";
             this.txt_itemId11111.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_fmanageNo;
-            this.layoutControlItem18.Location = new System.Drawing.Point(330, 196);
+            this.layoutControlItem18.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, 33);
+            this.layoutControlItem18.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem18.Text = "娴佺▼缂栧彿";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_lotNo;
-            this.layoutControlItem28.Location = new System.Drawing.Point(330, 163);
+            this.layoutControlItem28.Location = new System.Drawing.Point(330, 145);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem28.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_suppId;
-            this.layoutControlItem4.Location = new System.Drawing.Point(660, 31);
+            this.layoutControlItem4.Location = new System.Drawing.Point(660, 29);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem4.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem4.Text = "瀹㈡埛鍚嶇О";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_msg;
-            this.layoutControlItem27.Location = new System.Drawing.Point(660, 196);
+            this.layoutControlItem27.Location = new System.Drawing.Point(660, 174);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
             this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2;
-            this.layoutControlItem27.Size = new System.Drawing.Size(330, 66);
+            this.layoutControlItem27.Size = new System.Drawing.Size(330, 60);
             this.layoutControlItem27.Text = "杩濊绫诲埆";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem27.TextVisible = false;
             // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.txt_fmrmode;
-            this.layoutControlItem26.Location = new System.Drawing.Point(990, 229);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem26.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.txt_createDate;
-            this.layoutControlItem33.Location = new System.Drawing.Point(660, 130);
+            this.layoutControlItem33.Location = new System.Drawing.Point(660, 116);
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem33.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem33.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1467,11 +1474,11 @@
             // 
             this.layoutControlItem31.Control = this.txt_createBy;
             this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳";
-            this.layoutControlItem31.Location = new System.Drawing.Point(660, 163);
+            this.layoutControlItem31.Location = new System.Drawing.Point(660, 145);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem31.Size = new System.Drawing.Size(330, 33);
+            this.layoutControlItem31.Size = new System.Drawing.Size(330, 29);
             this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1482,29 +1489,29 @@
             this.layoutControlItem16.Location = new System.Drawing.Point(990, 0);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(332, 31);
+            this.layoutControlItem16.Size = new System.Drawing.Size(332, 29);
             this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_fsubmitBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(990, 31);
+            this.layoutControlItem15.Location = new System.Drawing.Point(990, 29);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem15.Size = new System.Drawing.Size(332, 29);
             this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_fsubmit;
-            this.layoutControlItem14.Location = new System.Drawing.Point(990, 64);
+            this.layoutControlItem14.Location = new System.Drawing.Point(990, 58);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem14.Size = new System.Drawing.Size(332, 29);
             this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem14.TextVisible = false;
@@ -1512,11 +1519,11 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_freceQty;
-            this.layoutControlItem13.Location = new System.Drawing.Point(990, 97);
+            this.layoutControlItem13.Location = new System.Drawing.Point(990, 87);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem13.Size = new System.Drawing.Size(332, 29);
             this.layoutControlItem13.Text = "鍒ゅ畾缁撴灉";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1524,35 +1531,79 @@
             // 
             this.layoutControlItem11.Control = this.txt_fngHandle;
             this.layoutControlItem11.CustomizationFormText = "澶勭疆缁撴灉";
-            this.layoutControlItem11.Location = new System.Drawing.Point(990, 130);
+            this.layoutControlItem11.Location = new System.Drawing.Point(990, 116);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
+            this.layoutControlItem11.Size = new System.Drawing.Size(332, 29);
             this.layoutControlItem11.Text = "澶勭疆缁撴灉";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_fzrId;
-            this.layoutControlItem25.Location = new System.Drawing.Point(990, 163);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem25.Size = new System.Drawing.Size(332, 33);
-            this.layoutControlItem25.Text = "璐d换浜�";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 229);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 203);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
+            this.layoutControlItem12.Size = new System.Drawing.Size(660, 31);
             this.layoutControlItem12.Text = "澶囨敞璇存槑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem23
+            // 
+            this.layoutControlItem23.Control = this.txt_djType;
+            this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem23.Name = "layoutControlItem23";
+            this.layoutControlItem23.Size = new System.Drawing.Size(330, 29);
+            this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.txt_fmrmode;
+            this.layoutControlItem26.Location = new System.Drawing.Point(990, 234);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 8;
+            this.layoutControlItem26.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_workNo;
+            this.layoutControlItem29.Location = new System.Drawing.Point(990, 203);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem29.Size = new System.Drawing.Size(332, 31);
+            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_fzrId;
+            this.layoutControlItem25.Location = new System.Drawing.Point(990, 174);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem25.Size = new System.Drawing.Size(332, 29);
+            this.layoutControlItem25.Text = "璐d换浜�";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.txt_zrType;
+            this.layoutControlItem35.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem35.CustomizationFormText = "璐d换鍒ゅ畾";
+            this.layoutControlItem35.Location = new System.Drawing.Point(990, 145);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem35.Size = new System.Drawing.Size(332, 29);
+            this.layoutControlItem35.Text = "鍒ゅ畾璐d换";
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
             // 
             // xtraTabControl2
             // 
@@ -1626,7 +1677,9 @@
             this.gvMx1fngQty,
             this.gvMx1sampleSizeNo,
             this.gvMx1fcheckLevel,
-            this.gvMx1facLevel});
+            this.gvMx1facLevel,
+            this.gridColumn6,
+            this.gridColumn8});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2108,15 +2161,33 @@
             // 
             this.gridView4.Name = "gridView4";
             // 
-            // gridColumn5
+            // gridColumn6
             // 
-            this.gridColumn5.Caption = "鍒ゅ畾缁撴灉";
-            this.gridColumn5.FieldName = "freceQty";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 3;
-            this.gridColumn5.Width = 94;
+            this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn6.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn6.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn6.Caption = "缂洪櫡绛夌骇";
+            this.gridColumn6.FieldName = "defectLevel";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 16;
+            this.gridColumn6.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn8.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn8.Caption = "缂洪櫡鎻忚堪";
+            this.gridColumn8.FieldName = "defectDetails";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 17;
+            this.gridColumn8.Width = 94;
             // 
             // Frm_FqcDetect01Check
             // 
@@ -2176,11 +2247,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -2189,7 +2260,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
@@ -2199,7 +2269,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
@@ -2207,8 +2276,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2352,7 +2425,6 @@
         private DevExpress.XtraEditors.TextEdit txt_lotNo;
         private DevExpress.XtraEditors.TextEdit txt_workNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
@@ -2365,7 +2437,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
         private DevExpress.XtraEditors.TextEdit txt_createBy;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraEditors.TextEdit txt_itemName;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
@@ -2385,7 +2456,6 @@
         private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
         private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
@@ -2393,8 +2463,15 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_zrType;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3