From 9ec7cf906a983509fccd9ab360e1ac0e46a904eb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 12 四月 2025 15:38:48 +0800
Subject: [PATCH] 生产退料

---
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs |  333 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 184 insertions(+), 149 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
index 5b383cb..8ba5d46 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -29,19 +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.RowDefinition rowDefinition9 = 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();
@@ -111,6 +111,7 @@
             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();
@@ -123,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();
@@ -133,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();
@@ -141,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();
@@ -193,9 +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.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+            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();
@@ -244,6 +246,7 @@
             ((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();
@@ -256,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();
@@ -266,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();
@@ -274,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();
@@ -307,9 +312,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             this.SuspendLayout();
             // 
             // repositoryItemComboBox1
@@ -835,7 +837,7 @@
             // txt_fmrmode
             // 
             this.txt_fmrmode.IsReadly = false;
-            this.txt_fmrmode.Location = new System.Drawing.Point(1074, 215);
+            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);
@@ -845,7 +847,7 @@
             // txt_fzrId
             // 
             this.txt_fzrId.IsReadly = false;
-            this.txt_fzrId.Location = new System.Drawing.Point(1074, 157);
+            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;
@@ -1029,7 +1031,7 @@
             // 
             // txt_workNo
             // 
-            this.txt_workNo.Location = new System.Drawing.Point(1074, 186);
+            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;
@@ -1142,6 +1144,22 @@
             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
             // 
             this.layoutControlItem17.Control = this.lbGuid;
@@ -1179,7 +1197,6 @@
             this.txt_epTagtxt,
             this.layoutControlItem10,
             this.layoutControlItem32,
-            this.layoutControlItem29,
             this.layoutControlItem5,
             this.layoutControlItem6,
             this.layoutControlItem34,
@@ -1189,7 +1206,6 @@
             this.layoutControlItem28,
             this.layoutControlItem4,
             this.layoutControlItem27,
-            this.layoutControlItem26,
             this.layoutControlItem33,
             this.layoutControlItem31,
             this.layoutControlItem16,
@@ -1197,53 +1213,55 @@
             this.layoutControlItem14,
             this.layoutControlItem13,
             this.layoutControlItem11,
-            this.layoutControlItem25,
             this.layoutControlItem12,
-            this.layoutControlItem35,
-            this.layoutControlItem23});
+            this.layoutControlItem23,
+            this.layoutControlItem26,
+            this.layoutControlItem29,
+            this.layoutControlItem25,
+            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;
-            rowDefinition9.Height = 28D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            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,
-            rowDefinition9});
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15,
+            rowDefinition16,
+            rowDefinition17,
+            rowDefinition18});
             this.Root.Size = new System.Drawing.Size(1342, 282);
             this.Root.TextVisible = false;
             // 
@@ -1343,17 +1361,6 @@
             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, 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);
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_itemNo;
@@ -1452,17 +1459,6 @@
             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, 203);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem26.Size = new System.Drawing.Size(332, 31);
-            this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.txt_createDate;
@@ -1543,17 +1539,6 @@
             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, 145);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem25.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem25.Text = "璐d换浜�";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_remarks;
@@ -1564,6 +1549,61 @@
             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
             // 
@@ -1637,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;
@@ -2119,42 +2161,33 @@
             // 
             this.gridView4.Name = "gridView4";
             // 
-            // txt_zrType
+            // gridColumn6
             // 
-            this.txt_zrType.EditValue = "1:鐢熶骇璐d换";
-            this.txt_zrType.Location = new System.Drawing.Point(744, 246);
-            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(254, 24);
-            this.txt_zrType.StyleController = this.layoutMx1;
-            this.txt_zrType.TabIndex = 829;
+            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;
             // 
-            // layoutControlItem35
+            // gridColumn8
             // 
-            this.layoutControlItem35.Control = this.txt_zrType;
-            this.layoutControlItem35.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem35.CustomizationFormText = "璐d换鍒ゅ畾";
-            this.layoutControlItem35.Location = new System.Drawing.Point(660, 234);
-            this.layoutControlItem35.Name = "layoutControlItem35";
-            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem35.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem35.Text = "璐d换鍒ゅ畾";
-            this.layoutControlItem35.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);
+            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
             // 
@@ -2214,6 +2247,7 @@
             ((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();
@@ -2226,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();
@@ -2236,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();
@@ -2244,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);
@@ -2277,9 +2313,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2404,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;
@@ -2424,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;
@@ -2432,11 +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 layoutControlItem35;
         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