lu
2025-04-25 91a3be4ec1a61bbeb2271efd51fb23e6bfcf5184
首检
已修改8个文件
已添加2个文件
1213 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs 1012 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/inlinesizelegend_16x16.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/inlinesizelegend_32x32.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" />
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="G-MES V2.0" />
        <add key="PageSize" value="50" />
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -39,13 +39,11 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -57,7 +55,6 @@
            this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -77,20 +74,12 @@
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
            this.txt_lineId = new Gs.DevApp.UserControl.UcLookWorkline();
            this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_workNo = new Gs.DevApp.UserControl.UcLookGx();
            this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff();
            this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_fsecondResu = new DevExpress.XtraEditors.TextEdit();
            this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
            this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
            this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
@@ -103,49 +92,38 @@
            this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
            this.txt_fmanageNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
            this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
            this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_lotNo2 = new DevExpress.XtraEditors.TextEdit();
            this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
            this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
            this.txt_fngDesc = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -223,8 +201,6 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
@@ -237,49 +213,38 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmanageNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.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();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
            this.xtraTabControl2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -385,7 +350,7 @@
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1342, 688);
            this.split1.SplitterPosition = 94;
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 4;
            // 
            // gcMain1
@@ -394,7 +359,7 @@
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1342, 544);
            this.gcMain1.Size = new System.Drawing.Size(1342, 638);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -411,7 +376,6 @@
            this.gv_releaseNo,
            this.gv_lotNo,
            this.gridColumn23,
            this.gv_lifnr,
            this.gv_itemId,
            this.gv_itemNo,
            this.gv_boardStyle,
@@ -431,8 +395,7 @@
            this.gridColumn30,
            this.gridColumn13,
            this.gridColumn17,
            this.gridColumn6,
            this.gridColumn7});
            this.gridColumn5});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -490,19 +453,6 @@
            this.gridColumn23.VisibleIndex = 3;
            this.gridColumn23.Width = 94;
            // 
            // gv_lifnr
            //
            this.gv_lifnr.AppearanceCell.Options.UseFont = true;
            this.gv_lifnr.Caption = "客户名称";
            this.gv_lifnr.FieldName = "cusName";
            this.gv_lifnr.MinWidth = 30;
            this.gv_lifnr.Name = "gv_lifnr";
            this.gv_lifnr.OptionsColumn.AllowEdit = false;
            this.gv_lifnr.Tag = "query_a.lifnr";
            this.gv_lifnr.Visible = true;
            this.gv_lifnr.VisibleIndex = 4;
            this.gv_lifnr.Width = 200;
            //
            // gv_itemId
            // 
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
@@ -513,7 +463,7 @@
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.item_id";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 5;
            this.gv_itemId.VisibleIndex = 6;
            this.gv_itemId.Width = 30;
            // 
            // gv_itemNo
@@ -526,7 +476,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_a.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 6;
            this.gv_itemNo.VisibleIndex = 7;
            this.gv_itemNo.Width = 136;
            // 
            // gv_boardStyle
@@ -539,7 +489,7 @@
            this.gv_boardStyle.OptionsColumn.AllowEdit = false;
            this.gv_boardStyle.Tag = "query_a.board_style";
            this.gv_boardStyle.Visible = true;
            this.gv_boardStyle.VisibleIndex = 7;
            this.gv_boardStyle.VisibleIndex = 8;
            this.gv_boardStyle.Width = 164;
            // 
            // gridColumn14
@@ -550,7 +500,7 @@
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.OptionsColumn.ReadOnly = true;
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 8;
            this.gridColumn14.VisibleIndex = 9;
            this.gridColumn14.Width = 200;
            // 
            // gv_fcovertQty
@@ -564,7 +514,7 @@
            this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
            this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
            this.gv_fcovertQty.Visible = true;
            this.gv_fcovertQty.VisibleIndex = 9;
            this.gv_fcovertQty.VisibleIndex = 10;
            this.gv_fcovertQty.Width = 60;
            // 
            // gv_fbatchQty
@@ -577,7 +527,7 @@
            this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
            this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
            this.gv_fbatchQty.Visible = true;
            this.gv_fbatchQty.VisibleIndex = 10;
            this.gv_fbatchQty.VisibleIndex = 11;
            this.gv_fbatchQty.Width = 80;
            // 
            // gv_fcheckResu
@@ -590,7 +540,7 @@
            this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
            this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
            this.gv_fcheckResu.Visible = true;
            this.gv_fcheckResu.VisibleIndex = 11;
            this.gv_fcheckResu.VisibleIndex = 5;
            this.gv_fcheckResu.Width = 50;
            // 
            // gv_remarks
@@ -712,7 +662,7 @@
            // gridColumn13
            // 
            this.gridColumn13.Caption = "产线ID";
            this.gridColumn13.FieldName = "lineId";
            this.gridColumn13.FieldName = "daa020";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
@@ -727,31 +677,21 @@
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Width = 94;
            // 
            // gridColumn6
            // gridColumn5
            // 
            this.gridColumn6.Caption = "判定结果";
            this.gridColumn6.FieldName = "fsecondResu";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 22;
            this.gridColumn6.Width = 94;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "检验类型";
            this.gridColumn7.FieldName = "djType";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 23;
            this.gridColumn7.Width = 94;
            this.gridColumn5.Caption = "检验状态";
            this.gridColumn5.FieldName = "checkStates";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.Width = 94;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 544);
            this.pageBar1.Location = new System.Drawing.Point(0, 638);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
@@ -784,19 +724,12 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1342, 688);
            this.splitMx1.SplitterPosition = 282;
            this.splitMx1.SplitterPosition = 185;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_itemId);
            this.layoutMx1.Controls.Add(this.txt_lineId);
            this.layoutMx1.Controls.Add(this.txt_msg);
            this.layoutMx1.Controls.Add(this.txt_workNo);
            this.layoutMx1.Controls.Add(this.txt_fzrId);
            this.layoutMx1.Controls.Add(this.txt_suppId);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_fsecondResu);
            this.layoutMx1.Controls.Add(this.txt_remarks);
            this.layoutMx1.Controls.Add(this.txt_fcheckResu);
            this.layoutMx1.Controls.Add(this.txt_releaseNo);
@@ -809,82 +742,26 @@
            this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
            this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
            this.layoutMx1.Controls.Add(this.txt_fsubmit);
            this.layoutMx1.Controls.Add(this.txt_fmanageNo);
            this.layoutMx1.Controls.Add(this.txt_guid);
            this.layoutMx1.Controls.Add(this.txt_lifnr);
            this.layoutMx1.Controls.Add(this.txt_djType);
            this.layoutMx1.Controls.Add(this.txt_lotNo);
            this.layoutMx1.Controls.Add(this.txt_lotNo2);
            this.layoutMx1.Controls.Add(this.textEdit5);
            this.layoutMx1.Controls.Add(this.txt_epTag);
            this.layoutMx1.Controls.Add(this.txt_checkStates);
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_createDate);
            this.layoutMx1.Controls.Add(this.txt_itemName);
            this.layoutMx1.Controls.Add(this.txt_lineName);
            this.layoutMx1.Controls.Add(this.txt_itemId);
            this.layoutMx1.Controls.Add(this.txt_fngDesc);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem17,
            this.layoutControlItem21});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(267, 359, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(827, 475, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
            this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // txt_itemId
            //
            this.txt_itemId.Location = new System.Drawing.Point(84, 109);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton()});
            this.txt_itemId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_itemId.Size = new System.Drawing.Size(254, 24);
            this.txt_itemId.StyleController = this.layoutMx1;
            this.txt_itemId.TabIndex = 824;
            //
            // txt_lineId
            //
            this.txt_lineId.IsReadly = false;
            this.txt_lineId.Location = new System.Drawing.Point(84, 76);
            this.txt_lineId.Name = "txt_lineId";
            this.txt_lineId.Size = new System.Drawing.Size(254, 24);
            this.txt_lineId.TabIndex = 821;
            //
            // txt_msg
            //
            this.txt_msg.BtnTxt = "违规类别";
            this.txt_msg.Location = new System.Drawing.Point(672, 175);
            this.txt_msg.Name = "txt_msg";
            this.txt_msg.Size = new System.Drawing.Size(326, 95);
            this.txt_msg.TabIndex = 814;
            this.txt_msg.TextTxt = "";
            this.txt_msg.WhereTxt = null;
            //
            // txt_workNo
            //
            this.txt_workNo.IsReadly = false;
            this.txt_workNo.Location = new System.Drawing.Point(414, 208);
            this.txt_workNo.Margin = new System.Windows.Forms.Padding(0);
            this.txt_workNo.Name = "txt_workNo";
            this.txt_workNo.Size = new System.Drawing.Size(254, 24);
            this.txt_workNo.TabIndex = 813;
            //
            // txt_fzrId
            //
            this.txt_fzrId.IsReadly = false;
            this.txt_fzrId.Location = new System.Drawing.Point(744, 142);
            this.txt_fzrId.Name = "txt_fzrId";
            this.txt_fzrId.Size = new System.Drawing.Size(254, 24);
            this.txt_fzrId.TabIndex = 812;
            //
            // txt_suppId
            //
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(744, 43);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(254, 24);
            this.txt_suppId.TabIndex = 811;
            // 
            // lbGuid
            // 
@@ -895,138 +772,122 @@
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            // 
            // txt_fsecondResu
            //
            this.txt_fsecondResu.Location = new System.Drawing.Point(414, 175);
            this.txt_fsecondResu.Name = "txt_fsecondResu";
            this.txt_fsecondResu.Size = new System.Drawing.Size(254, 24);
            this.txt_fsecondResu.StyleController = this.layoutMx1;
            this.txt_fsecondResu.TabIndex = 801;
            this.txt_fsecondResu.Tag = "readonly";
            //
            // txt_remarks
            // 
            this.txt_remarks.Location = new System.Drawing.Point(84, 241);
            this.txt_remarks.Location = new System.Drawing.Point(84, 124);
            this.txt_remarks.Name = "txt_remarks";
            this.txt_remarks.Properties.Appearance.Options.UseFont = true;
            this.txt_remarks.Size = new System.Drawing.Size(584, 24);
            this.txt_remarks.Size = new System.Drawing.Size(574, 24);
            this.txt_remarks.StyleController = this.layoutMx1;
            this.txt_remarks.TabIndex = 797;
            // 
            // txt_fcheckResu
            // 
            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 142);
            this.txt_fcheckResu.Location = new System.Drawing.Point(734, 124);
            this.txt_fcheckResu.Name = "txt_fcheckResu";
            this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
            this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
            this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
            this.txt_fcheckResu.StyleController = this.layoutMx1;
            this.txt_fcheckResu.TabIndex = 798;
            this.txt_fcheckResu.Tag = "readonly";
            // 
            // txt_releaseNo
            // 
            this.txt_releaseNo.Location = new System.Drawing.Point(84, 43);
            this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
            this.txt_releaseNo.Name = "txt_releaseNo";
            this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
            this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
            this.txt_releaseNo.Size = new System.Drawing.Size(249, 24);
            this.txt_releaseNo.StyleController = this.layoutMx1;
            this.txt_releaseNo.TabIndex = 213;
            this.txt_releaseNo.Tag = "readonly";
            // 
            // txt_fcheckDate
            // 
            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 43);
            this.txt_fcheckDate.Location = new System.Drawing.Point(734, 40);
            this.txt_fcheckDate.Name = "txt_fcheckDate";
            this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
            this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
            this.txt_fcheckDate.StyleController = this.layoutMx1;
            this.txt_fcheckDate.TabIndex = 216;
            this.txt_fcheckDate.Tag = "readonly";
            // 
            // txt_lotNo1
            // 
            this.txt_lotNo1.Location = new System.Drawing.Point(744, 76);
            this.txt_lotNo1.Location = new System.Drawing.Point(734, 12);
            this.txt_lotNo1.Name = "txt_lotNo1";
            this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
            this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
            this.txt_lotNo1.Size = new System.Drawing.Size(249, 24);
            this.txt_lotNo1.StyleController = this.layoutMx1;
            this.txt_lotNo1.TabIndex = 262;
            this.txt_lotNo1.Tag = "";
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(84, 142);
            this.txt_itemNo.Location = new System.Drawing.Point(409, 68);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
            this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 789;
            this.txt_itemNo.Tag = "readonly";
            // 
            // txt_itemModel
            // 
            this.txt_itemModel.Location = new System.Drawing.Point(84, 208);
            this.txt_itemModel.Location = new System.Drawing.Point(409, 96);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
            this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
            this.txt_itemModel.StyleController = this.layoutMx1;
            this.txt_itemModel.TabIndex = 801;
            this.txt_itemModel.Tag = "readonly";
            // 
            // txt_fcheckBy
            // 
            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 76);
            this.txt_fcheckBy.Location = new System.Drawing.Point(734, 68);
            this.txt_fcheckBy.Name = "txt_fcheckBy";
            this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
            this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
            this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
            this.txt_fcheckBy.StyleController = this.layoutMx1;
            this.txt_fcheckBy.TabIndex = 217;
            this.txt_fcheckBy.Tag = "readonly";
            // 
            // txt_fbatchQty
            // 
            this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12);
            this.txt_fbatchQty.Location = new System.Drawing.Point(409, 12);
            this.txt_fbatchQty.Name = "txt_fbatchQty";
            this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
            this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
            this.txt_fbatchQty.StyleController = this.layoutMx1;
            this.txt_fbatchQty.TabIndex = 222;
            this.txt_fbatchQty.Tag = "";
            // 
            // txt_fsubmitBy
            // 
            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 109);
            this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 96);
            this.txt_fsubmitBy.Name = "txt_fsubmitBy";
            this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
            this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
            this.txt_fsubmitBy.StyleController = this.layoutMx1;
            this.txt_fsubmitBy.TabIndex = 804;
            this.txt_fsubmitBy.Tag = "readonly";
            // 
            // txt_fsubmitDate
            // 
            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 76);
            this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 68);
            this.txt_fsubmitDate.Name = "txt_fsubmitDate";
            this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
            this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
            this.txt_fsubmitDate.StyleController = this.layoutMx1;
            this.txt_fsubmitDate.TabIndex = 805;
            this.txt_fsubmitDate.Tag = "readonly";
            // 
            // txt_fsubmit
            // 
            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 142);
            this.txt_fsubmit.Location = new System.Drawing.Point(987, 124);
            this.txt_fsubmit.Name = "txt_fsubmit";
            this.txt_fsubmit.Properties.Caption = "审核标识";
            this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
            this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
            this.txt_fsubmit.StyleController = this.layoutMx1;
            this.txt_fsubmit.TabIndex = 806;
            this.txt_fsubmit.Tag = "readonly";
            //
            // txt_fmanageNo
            //
            this.txt_fmanageNo.Location = new System.Drawing.Point(1074, 175);
            this.txt_fmanageNo.Name = "txt_fmanageNo";
            this.txt_fmanageNo.Size = new System.Drawing.Size(256, 24);
            this.txt_fmanageNo.StyleController = this.layoutMx1;
            this.txt_fmanageNo.TabIndex = 807;
            this.txt_fmanageNo.Tag = "";
            // 
            // txt_guid
            // 
@@ -1037,91 +898,76 @@
            this.txt_guid.TabIndex = 808;
            this.txt_guid.Tag = "readonly";
            // 
            // txt_lifnr
            //
            this.txt_lifnr.Location = new System.Drawing.Point(744, 12);
            this.txt_lifnr.Name = "txt_lifnr";
            this.txt_lifnr.Size = new System.Drawing.Size(254, 24);
            this.txt_lifnr.StyleController = this.layoutMx1;
            this.txt_lifnr.TabIndex = 809;
            //
            // txt_djType
            //
            this.txt_djType.EditValue = "-请选择-";
            this.txt_djType.Location = new System.Drawing.Point(84, 12);
            this.txt_djType.Name = "txt_djType";
            this.txt_djType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_djType.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "1:常规流程"});
            this.txt_djType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_djType.Size = new System.Drawing.Size(254, 24);
            this.txt_djType.StyleController = this.layoutMx1;
            this.txt_djType.TabIndex = 810;
            //
            // txt_lotNo
            // 
            this.txt_lotNo.Location = new System.Drawing.Point(1074, 241);
            this.txt_lotNo.Location = new System.Drawing.Point(84, 40);
            this.txt_lotNo.Name = "txt_lotNo";
            this.txt_lotNo.Size = new System.Drawing.Size(256, 24);
            this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
            this.txt_lotNo.StyleController = this.layoutMx1;
            this.txt_lotNo.TabIndex = 815;
            this.txt_lotNo.Tag = "readonly";
            // 
            // txt_lotNo2
            // txt_checkStates
            // 
            this.txt_lotNo2.Location = new System.Drawing.Point(1074, 208);
            this.txt_lotNo2.Name = "txt_lotNo2";
            this.txt_lotNo2.Size = new System.Drawing.Size(256, 24);
            this.txt_lotNo2.StyleController = this.layoutMx1;
            this.txt_lotNo2.TabIndex = 816;
            //
            // textEdit5
            //
            this.textEdit5.Location = new System.Drawing.Point(414, 109);
            this.textEdit5.Name = "textEdit5";
            this.textEdit5.Size = new System.Drawing.Size(254, 24);
            this.textEdit5.StyleController = this.layoutMx1;
            this.textEdit5.TabIndex = 819;
            this.textEdit5.Tag = "readonly";
            //
            // txt_epTag
            //
            this.txt_epTag.Location = new System.Drawing.Point(744, 109);
            this.txt_epTag.Name = "txt_epTag";
            this.txt_epTag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_epTag.Size = new System.Drawing.Size(254, 24);
            this.txt_epTag.StyleController = this.layoutMx1;
            this.txt_epTag.TabIndex = 820;
            this.txt_checkStates.Location = new System.Drawing.Point(734, 96);
            this.txt_checkStates.Name = "txt_checkStates";
            this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
            this.txt_checkStates.Size = new System.Drawing.Size(249, 24);
            this.txt_checkStates.StyleController = this.layoutMx1;
            this.txt_checkStates.TabIndex = 819;
            this.txt_checkStates.Tag = "readonly";
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(1074, 12);
            this.txt_createBy.Location = new System.Drawing.Point(1059, 12);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Size = new System.Drawing.Size(256, 24);
            this.txt_createBy.Size = new System.Drawing.Size(250, 24);
            this.txt_createBy.StyleController = this.layoutMx1;
            this.txt_createBy.TabIndex = 822;
            this.txt_createBy.Tag = "readonly";
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(1074, 43);
            this.txt_createDate.Location = new System.Drawing.Point(1059, 40);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Size = new System.Drawing.Size(256, 24);
            this.txt_createDate.Size = new System.Drawing.Size(250, 24);
            this.txt_createDate.StyleController = this.layoutMx1;
            this.txt_createDate.TabIndex = 823;
            this.txt_createDate.Tag = "readonly";
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(84, 175);
            this.txt_itemName.Location = new System.Drawing.Point(84, 96);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Size = new System.Drawing.Size(254, 24);
            this.txt_itemName.Size = new System.Drawing.Size(249, 24);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 825;
            this.txt_itemName.Tag = "readonly";
            //
            // txt_lineName
            //
            this.txt_lineName.Location = new System.Drawing.Point(409, 40);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Size = new System.Drawing.Size(249, 24);
            this.txt_lineName.StyleController = this.layoutMx1;
            this.txt_lineName.TabIndex = 826;
            //
            // txt_itemId
            //
            this.txt_itemId.Location = new System.Drawing.Point(84, 68);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Size = new System.Drawing.Size(249, 24);
            this.txt_itemId.StyleController = this.layoutMx1;
            this.txt_itemId.TabIndex = 827;
            //
            // txt_fngDesc
            //
            this.txt_fngDesc.Location = new System.Drawing.Point(84, 152);
            this.txt_fngDesc.Name = "txt_fngDesc";
            this.txt_fngDesc.Size = new System.Drawing.Size(574, 24);
            this.txt_fngDesc.StyleController = this.layoutMx1;
            this.txt_fngDesc.TabIndex = 828;
            // 
            // layoutControlItem17
            // 
@@ -1151,35 +997,26 @@
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
            this.layoutControlItem23,
            this.layoutControlItem8,
            this.layoutControlItem2,
            this.layoutControlItem9,
            this.layoutControlItem25,
            this.layoutControlItem3,
            this.layoutControlItem24,
            this.layoutControlItem27,
            this.layoutControlItem22,
            this.txt_epTagtxt,
            this.layoutControlItem13,
            this.layoutControlItem10,
            this.layoutControlItem32,
            this.layoutControlItem12,
            this.layoutControlItem26,
            this.layoutControlItem18,
            this.layoutControlItem29,
            this.layoutControlItem5,
            this.layoutControlItem30,
            this.layoutControlItem4,
            this.layoutControlItem6,
            this.layoutControlItem34,
            this.layoutControlItem31,
            this.layoutControlItem33,
            this.layoutControlItem16,
            this.layoutControlItem15,
            this.layoutControlItem14,
            this.layoutControlItem28});
            this.layoutControlItem1,
            this.layoutControlItem28,
            this.layoutControlItem3,
            this.layoutControlItem2,
            this.layoutControlItem8,
            this.layoutControlItem32,
            this.layoutControlItem10,
            this.layoutControlItem7,
            this.layoutControlItem4,
            this.layoutControlItem5,
            this.layoutControlItem34,
            this.layoutControlItem6,
            this.layoutControlItem12,
            this.layoutControlItem13});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1207,334 +1044,230 @@
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1342, 282);
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1321, 188);
            this.Root.TextVisible = false;
            //
            // layoutControlItem1
            //
            this.layoutControlItem1.Control = this.txt_releaseNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
            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.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem8.Text = "检验人员";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_fcheckDate;
            this.layoutControlItem2.Location = new System.Drawing.Point(330, 31);
            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.Text = "检验日期";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_fbatchQty;
            this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
            this.layoutControlItem9.Location = new System.Drawing.Point(325, 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(325, 28);
            this.layoutControlItem9.Text = "抽检数量";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_fzrId;
            this.layoutControlItem25.Location = new System.Drawing.Point(660, 130);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem25.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem25.Text = "责任人";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_lotNo1;
            this.layoutControlItem3.Location = new System.Drawing.Point(660, 64);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem3.Text = "送检批号";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.Control = this.txt_suppId;
            this.layoutControlItem24.Location = new System.Drawing.Point(660, 31);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem24.Text = "客户编码";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_msg;
            this.layoutControlItem27.Location = new System.Drawing.Point(660, 163);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
            this.layoutControlItem27.Size = new System.Drawing.Size(330, 99);
            this.layoutControlItem27.Text = "违规类别";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem27.TextVisible = false;
            //
            // layoutControlItem22
            //
            this.layoutControlItem22.Control = this.txt_lifnr;
            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.Text = "客户订单";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
            //
            // txt_epTagtxt
            //
            this.txt_epTagtxt.Control = this.txt_epTag;
            this.txt_epTagtxt.Location = new System.Drawing.Point(660, 97);
            this.txt_epTagtxt.Name = "txt_epTagtxt";
            this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 2;
            this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 3;
            this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33);
            this.txt_epTagtxt.Text = "环保标识";
            this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_fsecondResu;
            this.layoutControlItem13.Location = new System.Drawing.Point(330, 163);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem13.Text = "处置结果";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_fcheckResu;
            this.layoutControlItem10.Location = new System.Drawing.Point(330, 130);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem10.Text = "检验结果";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem32
            //
            this.layoutControlItem32.Control = this.textEdit5;
            this.layoutControlItem32.Location = new System.Drawing.Point(330, 97);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem32.Text = "检验状态";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_remarks;
            this.layoutControlItem12.Location = new System.Drawing.Point(0, 229);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
            this.layoutControlItem12.Text = "备注说明";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_workNo;
            this.layoutControlItem26.Location = new System.Drawing.Point(330, 196);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem26.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem26.Text = "返工工序";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_fmanageNo;
            this.layoutControlItem18.Location = new System.Drawing.Point(990, 163);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem18.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem18.Text = "流程编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem29
            //
            this.layoutControlItem29.Control = this.txt_lotNo2;
            this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem29.Text = "返工单号";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_itemNo;
            this.layoutControlItem5.CustomizationFormText = "产品编码";
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 130);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem5.Text = "物料编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem30
            //
            this.layoutControlItem30.Control = this.txt_lineId;
            this.layoutControlItem30.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem30.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem30.Text = "选择产线";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_itemId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 97);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem4.Text = "选择产品";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_itemModel;
            this.layoutControlItem6.CustomizationFormText = "产品规格";
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 196);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem6.Text = "物料规格";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem34
            //
            this.layoutControlItem34.Control = this.txt_itemName;
            this.layoutControlItem34.Location = new System.Drawing.Point(0, 163);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem34.Text = "产品名称";
            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem31
            // 
            this.layoutControlItem31.Control = this.txt_createBy;
            this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
            this.layoutControlItem31.Location = new System.Drawing.Point(975, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem31.Size = new System.Drawing.Size(332, 31);
            this.layoutControlItem31.Text = "创建人";
            this.layoutControlItem31.Size = new System.Drawing.Size(326, 28);
            this.layoutControlItem31.Text = "创建人员";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem33
            // 
            this.layoutControlItem33.Control = this.txt_createDate;
            this.layoutControlItem33.Location = new System.Drawing.Point(990, 31);
            this.layoutControlItem33.Location = new System.Drawing.Point(975, 28);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem33.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem33.Size = new System.Drawing.Size(326, 28);
            this.layoutControlItem33.Text = "创建时间";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_fsubmitDate;
            this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
            this.layoutControlItem16.Location = new System.Drawing.Point(975, 56);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem16.Text = "审核人";
            this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
            this.layoutControlItem16.Text = "审核人员";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_fsubmitBy;
            this.layoutControlItem15.Location = new System.Drawing.Point(990, 97);
            this.layoutControlItem15.Location = new System.Drawing.Point(975, 84);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem15.Size = new System.Drawing.Size(326, 28);
            this.layoutControlItem15.Text = "审核日期";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_fsubmit;
            this.layoutControlItem14.Location = new System.Drawing.Point(990, 130);
            this.layoutControlItem14.Location = new System.Drawing.Point(975, 112);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
            this.layoutControlItem14.Text = "审核标识";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
            // 
            // layoutControlItem1
            //
            this.layoutControlItem1.Control = this.txt_releaseNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem1.Text = "检验单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_lotNo;
            this.layoutControlItem28.Location = new System.Drawing.Point(990, 229);
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem28.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem28.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem28.Text = "生产工单";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_lotNo1;
            this.layoutControlItem3.Location = new System.Drawing.Point(650, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem3.Text = "送检批号";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_fcheckDate;
            this.layoutControlItem2.Location = new System.Drawing.Point(650, 28);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem2.Text = "检验日期";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_fcheckBy;
            this.layoutControlItem8.Location = new System.Drawing.Point(650, 56);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem8.Text = "检验人员";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem32
            //
            this.layoutControlItem32.Control = this.txt_checkStates;
            this.layoutControlItem32.Location = new System.Drawing.Point(650, 84);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem32.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem32.Text = "检验状态";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_fcheckResu;
            this.layoutControlItem10.Location = new System.Drawing.Point(650, 112);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem10.Text = "检验结果";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_lineName;
            this.layoutControlItem7.Location = new System.Drawing.Point(325, 28);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem7.Text = "产线名称";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_itemId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem4.Text = "产品ID";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_itemNo;
            this.layoutControlItem5.CustomizationFormText = "产品编码";
            this.layoutControlItem5.Location = new System.Drawing.Point(325, 56);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem5.Text = "物料编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem34
            //
            this.layoutControlItem34.Control = this.txt_itemName;
            this.layoutControlItem34.Location = new System.Drawing.Point(0, 84);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem34.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem34.Text = "产品名称";
            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_itemModel;
            this.layoutControlItem6.CustomizationFormText = "产品规格";
            this.layoutControlItem6.Location = new System.Drawing.Point(325, 84);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
            this.layoutControlItem6.Text = "物料规格";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_remarks;
            this.layoutControlItem12.Location = new System.Drawing.Point(0, 112);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem12.Size = new System.Drawing.Size(650, 28);
            this.layoutControlItem12.Text = "备注说明";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_fngDesc;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 140);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(650, 28);
            this.layoutControlItem13.Text = "异常备注";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // xtraTabControl2
            // 
@@ -1542,7 +1275,7 @@
            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl2.Name = "xtraTabControl2";
            this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 394);
            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 491);
            this.xtraTabControl2.TabIndex = 3;
            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1553,7 +1286,7 @@
            this.tabMxPage1.Controls.Add(this.splitMx2);
            this.tabMxPage1.Controls.Add(this.panMsg);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1340, 362);
            this.tabMxPage1.Size = new System.Drawing.Size(1340, 459);
            this.tabMxPage1.Text = "抽样信息";
            // 
            // splitMx2
@@ -1572,7 +1305,7 @@
            // 
            this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
            this.splitMx2.Panel2.Text = "Panel2";
            this.splitMx2.Size = new System.Drawing.Size(1340, 315);
            this.splitMx2.Size = new System.Drawing.Size(1340, 412);
            this.splitMx2.SplitterPosition = 287;
            this.splitMx2.TabIndex = 3;
            // 
@@ -1837,7 +1570,7 @@
            // 
            this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
            this.splitYangLi.Panel2.Text = "Panel2";
            this.splitYangLi.Size = new System.Drawing.Size(1340, 16);
            this.splitYangLi.Size = new System.Drawing.Size(1340, 113);
            this.splitYangLi.SplitterPosition = 676;
            this.splitYangLi.TabIndex = 4;
            // 
@@ -1847,7 +1580,7 @@
            this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupControl1.Location = new System.Drawing.Point(0, 0);
            this.groupControl1.Name = "groupControl1";
            this.groupControl1.Size = new System.Drawing.Size(676, 16);
            this.groupControl1.Size = new System.Drawing.Size(676, 113);
            this.groupControl1.TabIndex = 3;
            this.groupControl1.Text = "检测结果";
            // 
@@ -1857,7 +1590,7 @@
            this.gcMx2.Location = new System.Drawing.Point(2, 28);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(672, 0);
            this.gcMx2.Size = new System.Drawing.Size(672, 83);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -1912,6 +1645,7 @@
            this.gridColumn20.FieldName = "fstand";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.OptionsColumn.ReadOnly = true;
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 1;
            this.gridColumn20.Width = 94;
@@ -1922,6 +1656,7 @@
            this.gridColumn21.FieldName = "createBy";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.OptionsColumn.ReadOnly = true;
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 2;
            this.gridColumn21.Width = 94;
@@ -1932,6 +1667,7 @@
            this.gridColumn25.FieldName = "createDate";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.OptionsColumn.ReadOnly = true;
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 3;
            this.gridColumn25.Width = 94;
@@ -1942,7 +1678,7 @@
            this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.groupControl2.Location = new System.Drawing.Point(0, 0);
            this.groupControl2.Name = "groupControl2";
            this.groupControl2.Size = new System.Drawing.Size(652, 16);
            this.groupControl2.Size = new System.Drawing.Size(652, 113);
            this.groupControl2.TabIndex = 4;
            this.groupControl2.Text = "样本结果";
            // 
@@ -1952,7 +1688,7 @@
            this.gcMx3.Location = new System.Drawing.Point(2, 28);
            this.gcMx3.MainView = this.gvMx3;
            this.gcMx3.Name = "gcMx3";
            this.gcMx3.Size = new System.Drawing.Size(648, 0);
            this.gcMx3.Size = new System.Drawing.Size(648, 83);
            this.gcMx3.TabIndex = 0;
            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx3});
@@ -1998,6 +1734,7 @@
            this.gridColumn28.FieldName = "fcheckItem";
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.OptionsColumn.ReadOnly = true;
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 1;
            this.gridColumn28.Width = 94;
@@ -2008,6 +1745,7 @@
            this.gridColumn29.FieldName = "fcheckResu";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.OptionsColumn.ReadOnly = true;
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 2;
            this.gridColumn29.Width = 94;
@@ -2018,6 +1756,7 @@
            this.gridColumn24.FieldName = "fstand";
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.OptionsColumn.ReadOnly = true;
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 3;
            this.gridColumn24.Width = 94;
@@ -2028,6 +1767,7 @@
            this.gridColumn26.FieldName = "createBy";
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.OptionsColumn.ReadOnly = true;
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 4;
            this.gridColumn26.Width = 94;
@@ -2038,6 +1778,7 @@
            this.gridColumn27.FieldName = "createDate";
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.OptionsColumn.ReadOnly = true;
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 5;
            this.gridColumn27.Width = 94;
@@ -2106,10 +1847,10 @@
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition9});
            rowDefinition7});
            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
            this.layoutControlGroup1.TextVisible = false;
@@ -2144,7 +1885,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.ucUpFileList1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1340, 362);
            this.tabMxPage2.Size = new System.Drawing.Size(1340, 459);
            this.tabMxPage2.Text = "附件信息";
            // 
            // ucUpFileList1
@@ -2154,7 +1895,7 @@
            this.ucUpFileList1.Name = "ucUpFileList1";
            this.ucUpFileList1.parentGroup = null;
            this.ucUpFileList1.pGuid = null;
            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 362);
            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459);
            this.ucUpFileList1.TabIndex = 0;
            // 
            // repositoryItemComboBox2
@@ -2220,8 +1961,6 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
@@ -2234,49 +1973,38 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fmanageNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.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();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
            this.xtraTabControl2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2330,7 +2058,6 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
        private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
@@ -2350,7 +2077,6 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
        private DevExpress.XtraEditors.TextEdit txt_fsecondResu;
        private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
        private DevExpress.XtraEditors.TextEdit txt_remarks;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
@@ -2400,7 +2126,6 @@
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraEditors.TextEdit txt_fmanageNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraEditors.SimpleButton btnIpt;
@@ -2428,54 +2153,37 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraEditors.TextEdit txt_lifnr;
        private DevExpress.XtraEditors.ComboBoxEdit txt_djType;
        private UserControl.UcLookStaff txt_fzrId;
        private UserControl.UcLookCustomer txt_suppId;
        private UserControl.UcLookGx txt_workNo;
        private UserControl.UcDictionary txt_msg;
        private DevExpress.XtraEditors.TextEdit txt_lotNo;
        private DevExpress.XtraEditors.TextEdit txt_lotNo2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
        private DevExpress.XtraEditors.TextEdit textEdit5;
        private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
        private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private UserControl.UcLookWorkline txt_lineId;
        private DevExpress.XtraEditors.TextEdit txt_checkStates;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private UserControl.UCUpFileList ucUpFileList1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraEditors.TextEdit txt_lineName;
        private DevExpress.XtraEditors.TextEdit txt_itemId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraEditors.TextEdit txt_fngDesc;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,4 @@
using DevExpress.XtraPivotGrid.Data;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -30,6 +31,7 @@
            this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
            this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -87,6 +89,7 @@
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -127,6 +130,58 @@
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// 生成首检
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnShouJianClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定重新生成首检吗?"))
                return;
            var _obj = new
            {
                guid = rowGuid,
                inFieldValue ="",
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmitShouJian",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    //if (xtraTabControl1.SelectedTabPageIndex == 1)
                    //{
                    //    getModel(lbGuid.Text.Trim());
                    //}
                    //else
                    //{
                    //    //注意,这里和其它页面有点不一样
                    //    getPageList(this.pageBar1.CurrentPage);
                    //    int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                    //    gridView1.FocusedRowHandle = rowHandle;
                    //}
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 结案
        /// </summary>
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1910,6 +1910,8 @@
    <None Include="Resources\sendpdf_32x32.png" />
    <None Include="Resources\exporttopdf_16x16.png" />
    <None Include="Resources\chartswitchrowcolumn_16x16.png" />
    <None Include="Resources\inlinesizelegend_32x32.png" />
    <None Include="Resources\inlinesizelegend_16x16.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1333,6 +1333,26 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap inlinesizelegend_16x16 {
            get {
                object obj = ResourceManager.GetObject("inlinesizelegend_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap inlinesizelegend_32x32 {
            get {
                object obj = ResourceManager.GetObject("inlinesizelegend_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap insertdatafield_16x16 {
            get {
                object obj = ResourceManager.GetObject("insertdatafield_16x16", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -168,6 +168,9 @@
  <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -293,11 +296,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -310,6 +308,9 @@
    <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -539,6 +540,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="inlinesizelegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\inlinesizelegend_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="zoom100_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zoom100_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -552,8 +556,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap,
@@ -567,11 +571,6 @@
  </data>
  <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -706,6 +705,9 @@
  </data>
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -855,8 +857,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
@@ -1030,8 +1034,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -1044,7 +1050,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/inlinesizelegend_16x16.png
DevApp/Gs.DevApp/Resources/inlinesizelegend_32x32.png
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -66,6 +66,7 @@
            this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFont = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnShouJian = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -118,13 +119,13 @@
            this.btnHelp,
            this.btnLayout,
            this.btnOa,
            this.btnFont});
            this.btnFont,
            this.btnShouJian});
            this.barManager1.MainMenu = this.bar2;
            this.barManager1.MaxItemId = 56;
            this.barManager1.MaxItemId = 58;
            // 
            // bar2
            // 
            this.bar2.BarAppearance.Disabled.Options.UseFont = true;
            this.bar2.BarAppearance.Hovered.Options.UseFont = true;
            this.bar2.BarAppearance.Normal.Options.UseFont = true;
@@ -159,6 +160,7 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.btnLog),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnTzbl),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnKg),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnShouJian),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnWg),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnZhongTai),
            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
@@ -180,9 +182,7 @@
            this.btnAdd.Id = 3;
            this.btnAdd.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16;
            this.btnAdd.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
            this.btnAdd.ItemAppearance.Normal.Options.UseFont = true;
            this.btnAdd.ItemInMenuAppearance.Normal.Options.UseFont = true;
            this.btnAdd.Name = "btnAdd";
            this.btnAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -193,7 +193,6 @@
            this.btnEdit.Id = 5;
            this.btnEdit.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_16x16;
            this.btnEdit.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
            this.btnEdit.ItemAppearance.Normal.Options.UseFont = true;
            this.btnEdit.Name = "btnEdit";
            this.btnEdit.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -204,7 +203,6 @@
            this.btnSave.Id = 6;
            this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x16;
            this.btnSave.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.exportfile_32x32;
            this.btnSave.ItemAppearance.Normal.Options.UseFont = true;
            this.btnSave.Name = "btnSave";
            this.btnSave.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -215,7 +213,6 @@
            this.btnEsc.Id = 9;
            this.btnEsc.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnEsc.ImageOptions.Image")));
            this.btnEsc.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnEsc.ImageOptions.LargeImage")));
            this.btnEsc.ItemAppearance.Normal.Options.UseFont = true;
            this.btnEsc.Name = "btnEsc";
            this.btnEsc.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -226,7 +223,6 @@
            this.btnLoad.Id = 10;
            this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.convert_16x16;
            this.btnLoad.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.convert_32x32;
            this.btnLoad.ItemAppearance.Normal.Options.UseFont = true;
            this.btnLoad.Name = "btnLoad";
            this.btnLoad.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -237,7 +233,6 @@
            this.btnDel.Id = 4;
            this.btnDel.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            this.btnDel.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.removegroupfooter_32x32;
            this.btnDel.ItemAppearance.Normal.Options.UseFont = true;
            this.btnDel.Name = "btnDel";
            this.btnDel.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -248,7 +243,6 @@
            this.btnChk.Id = 13;
            this.btnChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16;
            this.btnChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbox2_32x32;
            this.btnChk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnChk.Name = "btnChk";
            this.btnChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -259,7 +253,6 @@
            this.btnFchk.Id = 14;
            this.btnFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x16;
            this.btnFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x32;
            this.btnFchk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnFchk.Name = "btnFchk";
            this.btnFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -270,7 +263,6 @@
            this.btnHb.Id = 16;
            this.btnHb.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.Image")));
            this.btnHb.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnHb.ImageOptions.LargeImage")));
            this.btnHb.ItemAppearance.Normal.Options.UseFont = true;
            this.btnHb.Name = "btnHb";
            this.btnHb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -281,7 +273,6 @@
            this.btnQuery.Id = 23;
            this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
            this.btnQuery.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.viewmergeddata_32x32;
            this.btnQuery.ItemAppearance.Normal.Options.UseFont = true;
            this.btnQuery.Name = "btnQuery";
            this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -292,7 +283,6 @@
            this.btnIn.Id = 17;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sendxls_16x16;
            this.btnIn.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.sendxls_32x32;
            this.btnIn.ItemAppearance.Normal.Options.UseFont = true;
            this.btnIn.Name = "btnIn";
            this.btnIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -304,7 +294,6 @@
            this.btnOut.Id = 12;
            this.btnOut.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wraptext2_16x16;
            this.btnOut.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.wraptext2_32x32;
            this.btnOut.ItemAppearance.Normal.Options.UseFont = true;
            this.btnOut.Name = "btnOut";
            this.btnOut.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -315,7 +304,6 @@
            this.btnReport.Id = 22;
            this.btnReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printlayoutview_16x16;
            this.btnReport.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.printlayoutview_32x32;
            this.btnReport.ItemAppearance.Normal.Options.UseFont = true;
            this.btnReport.Name = "btnReport";
            this.btnReport.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
@@ -327,7 +315,6 @@
            this.btnDesign.Id = 26;
            this.btnDesign.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.Image")));
            this.btnDesign.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.LargeImage")));
            this.btnDesign.ItemAppearance.Normal.Options.UseFont = true;
            this.btnDesign.Name = "btnDesign";
            this.btnDesign.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -338,7 +325,6 @@
            this.btnJianYan.Id = 27;
            this.btnJianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x16;
            this.btnJianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x32;
            this.btnJianYan.ItemAppearance.Normal.Options.UseFont = true;
            this.btnJianYan.Name = "btnJianYan";
            this.btnJianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -349,7 +335,6 @@
            this.btnFjianYan.Id = 28;
            this.btnFjianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.radiobuttons_16x16;
            this.btnFjianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.radiobuttons_32x32;
            this.btnFjianYan.ItemAppearance.Normal.Options.UseFont = true;
            this.btnFjianYan.Name = "btnFjianYan";
            this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -360,7 +345,6 @@
            this.btnPiZhun.Id = 29;
            this.btnPiZhun.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x161;
            this.btnPiZhun.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.boposition2_32x32;
            this.btnPiZhun.ItemAppearance.Normal.Options.UseFont = true;
            this.btnPiZhun.Name = "btnPiZhun";
            this.btnPiZhun.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -371,7 +355,6 @@
            this.btnZhiLiangChk.Id = 31;
            this.btnZhiLiangChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x162;
            this.btnZhiLiangChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x321;
            this.btnZhiLiangChk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnZhiLiangChk.Name = "btnZhiLiangChk";
            this.btnZhiLiangChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -382,7 +365,6 @@
            this.btnZhiLiangFchk.Id = 33;
            this.btnZhiLiangFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x161;
            this.btnZhiLiangFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x321;
            this.btnZhiLiangFchk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnZhiLiangFchk.Name = "btnZhiLiangFchk";
            this.btnZhiLiangFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -393,7 +375,6 @@
            this.btnBoHui.Id = 37;
            this.btnBoHui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.updatetableofcontents_16x16;
            this.btnBoHui.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.updatetableofcontents_32x32;
            this.btnBoHui.ItemAppearance.Normal.Options.UseFont = true;
            this.btnBoHui.Name = "btnBoHui";
            this.btnBoHui.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -404,7 +385,6 @@
            this.btnCaiGouChk.Id = 34;
            this.btnCaiGouChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_16x16;
            this.btnCaiGouChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.trackingchanges_showmarkup_32x32;
            this.btnCaiGouChk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnCaiGouChk.Name = "btnCaiGouChk";
            this.btnCaiGouChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -424,7 +404,6 @@
            this.btnLog.Id = 18;
            this.btnLog.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
            this.btnLog.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
            this.btnLog.ItemAppearance.Normal.Options.UseFont = true;
            this.btnLog.Name = "btnLog";
            this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -434,7 +413,6 @@
            this.btnTzbl.Caption = "通知备料";
            this.btnTzbl.Id = 41;
            this.btnTzbl.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.announcement_32x32;
            this.btnTzbl.ItemAppearance.Normal.Options.UseFont = true;
            this.btnTzbl.Name = "btnTzbl";
            this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
@@ -445,7 +423,6 @@
            this.btnKg.Caption = "开工";
            this.btnKg.Id = 42;
            this.btnKg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_32x323;
            this.btnKg.ItemAppearance.Normal.Options.UseFont = true;
            this.btnKg.Name = "btnKg";
            this.btnKg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
@@ -456,7 +433,6 @@
            this.btnWg.Caption = "手动完工";
            this.btnWg.Id = 45;
            this.btnWg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_32x32;
            this.btnWg.ItemAppearance.Normal.Options.UseFont = true;
            this.btnWg.Name = "btnWg";
            this.btnWg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
@@ -467,7 +443,6 @@
            this.btnZhongTai.Caption = "状态修改";
            this.btnZhongTai.Id = 44;
            this.btnZhongTai.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_32x32;
            this.btnZhongTai.ItemAppearance.Normal.Options.UseFont = true;
            this.btnZhongTai.Name = "btnZhongTai";
            this.btnZhongTai.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
@@ -478,7 +453,6 @@
            this.btnJieAn.Caption = "结案";
            this.btnJieAn.Id = 38;
            this.btnJieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copymodeldifferences_32x32;
            this.btnJieAn.ItemAppearance.Normal.Options.UseFont = true;
            this.btnJieAn.Name = "btnJieAn";
            this.btnJieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -488,7 +462,6 @@
            this.btnFjieAn.Caption = "反结案";
            this.btnFjieAn.Id = 39;
            this.btnFjieAn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wordwrap_32x32;
            this.btnFjieAn.ItemAppearance.Normal.Options.UseFont = true;
            this.btnFjieAn.Name = "btnFjieAn";
            this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -499,7 +472,6 @@
            this.btnOa.Id = 54;
            this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16;
            this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321;
            this.btnOa.ItemAppearance.Normal.Options.UseFont = true;
            this.btnOa.Name = "btnOa";
            this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -510,7 +482,6 @@
            this.btnLayout.Id = 51;
            this.btnLayout.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.subreport_16x16;
            this.btnLayout.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.subreport_32x32;
            this.btnLayout.ItemAppearance.Normal.Options.UseFont = true;
            this.btnLayout.Name = "btnLayout";
            // 
@@ -529,9 +500,17 @@
            this.btnHelp.Id = 49;
            this.btnHelp.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.knowledgebasearticle_32x32;
            this.btnHelp.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.knowledgebasearticle_32x32;
            this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
            this.btnHelp.Name = "btnHelp";
            //
            // btnShouJian
            //
            this.btnShouJian.Caption = "生成首检";
            this.btnShouJian.Id = 56;
            this.btnShouJian.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.inlinesizelegend_16x16;
            this.btnShouJian.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.inlinesizelegend_32x32;
            this.btnShouJian.Name = "btnShouJian";
            this.btnShouJian.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barDockControlTop
            // 
@@ -539,13 +518,13 @@
            this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
            this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
            this.barDockControlTop.Manager = this.barManager1;
            this.barDockControlTop.Size = new System.Drawing.Size(1543, 148);
            this.barDockControlTop.Size = new System.Drawing.Size(1543, 142);
            // 
            // barDockControlBottom
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 61);
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 67);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
            // 
@@ -553,7 +532,7 @@
            // 
            this.barDockControlLeft.CausesValidation = false;
            this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
            this.barDockControlLeft.Location = new System.Drawing.Point(0, 148);
            this.barDockControlLeft.Location = new System.Drawing.Point(0, 142);
            this.barDockControlLeft.Manager = this.barManager1;
            this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
            // 
@@ -561,7 +540,7 @@
            // 
            this.barDockControlRight.CausesValidation = false;
            this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
            this.barDockControlRight.Location = new System.Drawing.Point(1543, 148);
            this.barDockControlRight.Location = new System.Drawing.Point(1543, 142);
            this.barDockControlRight.Manager = this.barManager1;
            this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
            // 
@@ -574,7 +553,7 @@
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Name = "UcToolBarMenu";
            this.Size = new System.Drawing.Size(1543, 61);
            this.Size = new System.Drawing.Size(1543, 67);
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();
@@ -621,5 +600,7 @@
        private DevExpress.XtraBars.BarLargeButtonItem btnLayout;
        private DevExpress.XtraBars.BarLargeButtonItem btnOa;
        private DevExpress.XtraBars.BarLargeButtonItem btnFont;
        private DevExpress.XtraBars.BarLargeButtonItem btnShouJian;
    }
}
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -57,6 +57,7 @@
            btnHelp.ItemClick += BtnHelp_ItemClick;
            btnLayout.ItemClick += BtnLayout_ItemClick;
            btnFont.ItemClick += BtnFont_ItemClick;
            btnShouJian.ItemClick += BtnShouJian_ItemClick;
            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
@@ -65,9 +66,7 @@
            actions = lst;
        }
        /// <summary>
        ///     初始化按钮状态
        /// </summary>
@@ -328,6 +327,13 @@
            //    parameter = chkParameter
            //};
            //_ckService(1.ToString());
        }
        private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnShouJianClick != null)
                btnShouJianClick(this, e);
            else
                return;
        }
        private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
@@ -1016,7 +1022,10 @@
        /// </summary>
        public event EventHandler btnWgClick;
        /// <summary>
        /// 生成首检
        /// </summary>
        public event EventHandler btnShouJianClick;
        //public event EventHandler btnLayoutClick;
        #endregion