From a80c1ccadaa85132c7ac26474e7aab3da7706cbc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 02 六月 2025 13:24:13 +0800
Subject: [PATCH] iqc导出

---
 DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.resx            |    0 
 DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.Designer.cs    |    6 
 DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs              |  264 +++++
 DevApp/Gs.DevApp/Gs.DevApp.csproj                       |   24 
 DevApp/Gs.DevApp/App.config                             |    4 
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs |    4 
 DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs         |  744 +--------------
 DevApp/Gs.DevApp/ToolBox/MsgHelper.cs                   |   16 
 DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs                  |  193 ---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs    |    2 
 /dev/null                                               |  120 --
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs    |   62 +
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs           |   86 
 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs    |   61 +
 DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs     |  854 +++++++++++++++++
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs             |  345 ++++--
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs                      |   69 
 DevApp/Gs.DevApp/Program.cs                             |    2 
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs          |    4 
 DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.cs             |    4 
 20 files changed, 1,653 insertions(+), 1,211 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 057f052..cee2aa3 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/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" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
deleted file mode 100644
index 5e6a1bb..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
+++ /dev/null
@@ -1,454 +0,0 @@
-锘�
-namespace Gs.DevApp.DevFrm
-{
-    partial class Frm_Holidy
-    {
-
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.gv_createTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_time2 = new DevExpress.XtraEditors.LabelControl();
-            this.gv_time2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_time1 = new DevExpress.XtraEditors.LabelControl();
-            this.gv_time1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_name = new DevExpress.XtraEditors.LabelControl();
-            this.txt_name = new DevExpress.XtraEditors.TextEdit();
-            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_workName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.weekdayName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_workshopNo = new DevExpress.XtraEditors.LookUpEdit();
-            this.txt_endTime = new System.Windows.Forms.DateTimePicker();
-            this.txt_begTime = new System.Windows.Forms.DateTimePicker();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            this.xtraTabPage2.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gv_createTime
-            // 
-            this.gv_createTime.AppearanceCell.Options.UseFont = true;
-            this.gv_createTime.Caption = "寤虹珛鏃堕棿";
-            this.gv_createTime.FieldName = "createTime";
-            this.gv_createTime.MinWidth = 25;
-            this.gv_createTime.Name = "gv_createTime";
-            this.gv_createTime.OptionsColumn.AllowEdit = false;
-            this.gv_createTime.Visible = true;
-            this.gv_createTime.VisibleIndex = 8;
-            this.gv_createTime.Width = 94;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "寤虹珛鑰�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 25;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 7;
-            this.gv_createBy.Width = 94;
-            // 
-            // gv_isStatus
-            // 
-            this.gv_isStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_isStatus.Caption = "鐘舵��";
-            this.gv_isStatus.FieldName = "isStatusTxt";
-            this.gv_isStatus.MinWidth = 25;
-            this.gv_isStatus.Name = "gv_isStatus";
-            this.gv_isStatus.OptionsColumn.AllowEdit = false;
-            this.gv_isStatus.Visible = true;
-            this.gv_isStatus.VisibleIndex = 5;
-            this.gv_isStatus.Width = 94;
-            // 
-            // lb_time2
-            // 
-            this.lb_time2.Appearance.Options.UseFont = true;
-            this.lb_time2.Location = new System.Drawing.Point(27, 167);
-            this.lb_time2.Name = "lb_time2";
-            this.lb_time2.Size = new System.Drawing.Size(85, 21);
-            this.lb_time2.TabIndex = 216;
-            this.lb_time2.Tag = "time2";
-            this.lb_time2.Text = "缁撴潫鏃堕棿锛�";
-            // 
-            // gv_time2
-            // 
-            this.gv_time2.AppearanceCell.Options.UseFont = true;
-            this.gv_time2.Caption = "缁撴潫鏃堕棿";
-            this.gv_time2.FieldName = "endTime";
-            this.gv_time2.MinWidth = 25;
-            this.gv_time2.Name = "gv_time2";
-            this.gv_time2.OptionsColumn.AllowEdit = false;
-            this.gv_time2.Visible = true;
-            this.gv_time2.VisibleIndex = 3;
-            this.gv_time2.Width = 94;
-            // 
-            // lb_time1
-            // 
-            this.lb_time1.Appearance.Options.UseFont = true;
-            this.lb_time1.Location = new System.Drawing.Point(27, 110);
-            this.lb_time1.Name = "lb_time1";
-            this.lb_time1.Size = new System.Drawing.Size(85, 21);
-            this.lb_time1.TabIndex = 213;
-            this.lb_time1.Tag = "time1";
-            this.lb_time1.Text = "寮�濮嬫椂闂达細";
-            // 
-            // gv_time1
-            // 
-            this.gv_time1.AppearanceCell.Options.UseFont = true;
-            this.gv_time1.Caption = "寮�濮嬫椂闂�";
-            this.gv_time1.FieldName = "begTime";
-            this.gv_time1.MinWidth = 25;
-            this.gv_time1.Name = "gv_time1";
-            this.gv_time1.OptionsColumn.AllowEdit = false;
-            this.gv_time1.Visible = true;
-            this.gv_time1.VisibleIndex = 2;
-            this.gv_time1.Width = 94;
-            // 
-            // lb_name
-            // 
-            this.lb_name.Appearance.Options.UseFont = true;
-            this.lb_name.Location = new System.Drawing.Point(27, 61);
-            this.lb_name.Name = "lb_name";
-            this.lb_name.Size = new System.Drawing.Size(85, 21);
-            this.lb_name.TabIndex = 211;
-            this.lb_name.Tag = "name";
-            this.lb_name.Text = "鍋囨棩鍚嶇О锛�";
-            // 
-            // txt_name
-            // 
-            this.txt_name.Location = new System.Drawing.Point(115, 57);
-            this.txt_name.Name = "txt_name";
-            this.txt_name.Properties.Appearance.Options.UseFont = true;
-            this.txt_name.Size = new System.Drawing.Size(170, 28);
-            this.txt_name.TabIndex = 211;
-            this.txt_name.Tag = "name";
-            // 
-            // gv_name
-            // 
-            this.gv_name.AppearanceCell.Options.UseFont = true;
-            this.gv_name.Caption = "鍋囨棩鍚嶇О";
-            this.gv_name.FieldName = "name";
-            this.gv_name.MinWidth = 25;
-            this.gv_name.Name = "gv_name";
-            this.gv_name.OptionsColumn.AllowEdit = false;
-            this.gv_name.Visible = true;
-            this.gv_name.VisibleIndex = 1;
-            this.gv_name.Width = 94;
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = "MES_HOLIDAY,check_date,check_status,check_by";
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = "";
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1139, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = "xlsOut_holiday{}";
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1137, 345);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_workName,
-            this.gv_name,
-            this.gv_time1,
-            this.gv_time2,
-            this.weekdayName,
-            this.gv_isStatus,
-            this.gridColumn1,
-            this.gv_createBy,
-            this.gv_createTime});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gv_workName
-            // 
-            this.gv_workName.Caption = "浜х嚎鍚嶇О";
-            this.gv_workName.FieldName = "workName";
-            this.gv_workName.MinWidth = 25;
-            this.gv_workName.Name = "gv_workName";
-            this.gv_workName.OptionsColumn.AllowEdit = false;
-            this.gv_workName.Visible = true;
-            this.gv_workName.VisibleIndex = 0;
-            this.gv_workName.Width = 94;
-            // 
-            // weekdayName
-            // 
-            this.weekdayName.Caption = "鏄熸湡";
-            this.weekdayName.FieldName = "weekdayName";
-            this.weekdayName.MinWidth = 25;
-            this.weekdayName.Name = "weekdayName";
-            this.weekdayName.OptionsColumn.AllowEdit = false;
-            this.weekdayName.Visible = true;
-            this.weekdayName.VisibleIndex = 4;
-            this.weekdayName.Width = 94;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "瀹℃牳";
-            this.gridColumn1.FieldName = "checkStatus";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.OptionsColumn.AllowEdit = false;
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 6;
-            this.gridColumn1.Width = 94;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1139, 416);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1137, 384);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 345);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1137, 39);
-            this.pageBar1.TabIndex = 3;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.panel1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-           
-            this.xtraTabPage2.Size = new System.Drawing.Size(1137, 384);
-            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.labelControl8);
-            this.panel1.Controls.Add(this.txt_workshopNo);
-            this.panel1.Controls.Add(this.txt_endTime);
-            this.panel1.Controls.Add(this.txt_begTime);
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_time2);
-            this.panel1.Controls.Add(this.lb_time1);
-            this.panel1.Controls.Add(this.lb_name);
-            this.panel1.Controls.Add(this.txt_name);
-            this.panel1.Location = new System.Drawing.Point(76, 20);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(330, 288);
-            this.panel1.TabIndex = 1;
-            // 
-            // labelControl8
-            // 
-            this.labelControl8.Appearance.Options.UseFont = true;
-            this.labelControl8.Location = new System.Drawing.Point(27, 17);
-            this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(85, 21);
-            this.labelControl8.TabIndex = 238;
-            this.labelControl8.Text = "閫夋嫨杞﹂棿锛�";
-            // 
-            // txt_workshopNo
-            // 
-            this.txt_workshopNo.Location = new System.Drawing.Point(115, 13);
-            this.txt_workshopNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txt_workshopNo.Name = "txt_workshopNo";
-            this.txt_workshopNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_workshopNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_workshopNo.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] {
-            new DevExpress.XtraEditors.Controls.LookUpColumnInfo("name", "杞﹂棿鍚嶇О"),
-            new DevExpress.XtraEditors.Controls.LookUpColumnInfo("guid", "Name4", 20, DevExpress.Utils.FormatType.None, "", false, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)});
-            this.txt_workshopNo.Properties.NullText = "";
-            this.txt_workshopNo.Size = new System.Drawing.Size(170, 28);
-            this.txt_workshopNo.TabIndex = 237;
-            // 
-            // txt_endTime
-            // 
-            this.txt_endTime.CustomFormat = "yyyy-MM-dd";
-            this.txt_endTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.txt_endTime.Location = new System.Drawing.Point(115, 163);
-            this.txt_endTime.MinDate = new System.DateTime(2024, 10, 1, 0, 0, 0, 0);
-            this.txt_endTime.Name = "txt_endTime";
-            this.txt_endTime.Size = new System.Drawing.Size(170, 28);
-            this.txt_endTime.TabIndex = 218;
-            this.txt_endTime.Value = new System.DateTime(2024, 10, 1, 0, 0, 0, 0);
-            // 
-            // txt_begTime
-            // 
-            this.txt_begTime.CustomFormat = "yyyy-MM-dd";
-            this.txt_begTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.txt_begTime.Location = new System.Drawing.Point(115, 106);
-            this.txt_begTime.MinDate = new System.DateTime(2024, 10, 1, 0, 0, 0, 0);
-            this.txt_begTime.Name = "txt_begTime";
-            this.txt_begTime.Size = new System.Drawing.Size(170, 28);
-            this.txt_begTime.TabIndex = 217;
-            this.txt_begTime.Value = new System.DateTime(2024, 10, 1, 0, 0, 0, 0);
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(56, 227);
-            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(45, 18);
-            this.labelControl11.TabIndex = 130;
-            this.labelControl11.Text = "涓婚敭锛�";
-            this.labelControl11.Visible = false;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(107, 227);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Visible = false;
-            // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(947, 55);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 4;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
-            // 
-            // Frm_Holidy
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1139, 496);
-            this.Controls.Add(this.picCheckBox);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_Holidy";
-            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            this.xtraTabPage2.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-        #endregion
-        private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private UserControls.Data.UcPageBar pageBar1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createTime;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_time2;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_time2;
-
-        private DevExpress.XtraEditors.LabelControl lb_time1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_time1;
-
-        private DevExpress.XtraEditors.LabelControl lb_name;
-        private DevExpress.XtraEditors.TextEdit txt_name;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_name;
-        private System.Windows.Forms.DateTimePicker txt_endTime;
-        private System.Windows.Forms.DateTimePicker txt_begTime;
-        private DevExpress.XtraGrid.Columns.GridColumn weekdayName;
-        private DevExpress.XtraEditors.LabelControl labelControl8;
-        private DevExpress.XtraEditors.LookUpEdit txt_workshopNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_workName;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private System.Windows.Forms.PictureBox picCheckBox;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
deleted file mode 100644
index 347feb1..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ /dev/null
@@ -1,369 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-
-namespace Gs.DevApp.DevFrm
-{
-    public partial class Frm_Holidy : XtraForm
-    {
-        private List<FilterEntity> _filterList = new List<FilterEntity>();
-        private readonly string _webServiceName = "Holiday/";
-
-        public Frm_Holidy()
-        {
-            InitializeComponent();
-            getTree();
-            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
-            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
-            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
-            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
-            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-            
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1);
-            getPageList(1, UtilityHelper.GetPageSize());
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
-        }
- 
-        /// <summary>
-        ///     鍙嶅鏍�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_name, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-        }
-
-        /// <summary>
-        ///     瀹℃牳浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_name, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-        }
-
-        /// <summary>
-        ///     鍙屽嚮浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            var rowGuid =
-                UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
-            if (!string.IsNullOrEmpty(rowGuid))
-                getModel(rowGuid, false, 999);
-        }
-
-        /// <summary>
-        ///     鍒嗛〉浜嬩欢
-        /// </summary>
-        /// <param name="curPage"></param>
-        /// <param name="pageSize"></param>
-        private void PageBar1_PagerEvent(int curPage, int pageSize)
-        {
-            getPageList(curPage, pageSize);
-        }
-
-        /// <summary>
-        ///     鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
-        }
-
-        /// <summary>
-        ///     鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
-        }
-
-        /// <summary>
-        ///     鍙栨秷浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-        }
-        /// <summary>
-        ///     淇敼浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
-        {
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_name, gridView1);
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            getModel(rowGuid, true, 1);
-
-        }
-        /// <summary>
-        ///     鍒犻櫎浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
-        {
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_name, gridView1, "name");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
-                return;
-            var _obj = new
-            {
-                guidList = rowGuid //涓诲缓
-            };
-            var strJson = "";
-            try
-            {
-                strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "DeleteModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
-                    getPageList(1, UtilityHelper.GetPageSize());
-                }
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        ///     鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim(), false, 999);
-            else
-                getPageList(1, UtilityHelper.GetPageSize());
-        }
-
-        /// <summary>
-        ///     鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 1);
-            lbGuid.Text = "";
-            UtilityHelper.CleanValueByControl(panel1.Controls, true);
-        }
-
-        /// <summary>
-        ///     淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.isSetBtn = false;
-            if (txt_workshopNo.EditValue == null ||
-                string.IsNullOrEmpty(txt_workshopNo.EditValue.ToString()))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浜х嚎锛�");
-                txt_workshopNo.Focus();
-                return;
-            }
-
-            if (string.IsNullOrEmpty(txt_name.Text.Trim()))
-            {
-                MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
-                txt_name.Focus();
-                return;
-            }
-
-            if (txt_begTime.Value.Date > txt_endTime.Value.Date)
-            {
-                MsgHelper.Warning("寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂达紒");
-                txt_begTime.Focus();
-                return;
-            }
-
-            var _obj = new
-            {
-                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                name = txt_name.Text.Trim(),
-                time1 = txt_begTime.Value.Date,
-                time2 = txt_endTime.Value.Date,
-                workshopNo = txt_workshopNo.EditValue.ToString()
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "EditModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    lbGuid.Text = _rtn.rtnData;
-                    toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage, int pageSize)
-        {
-            var _sbSqlWhere = new StringBuilder();
-            foreach (var itm in _filterList)
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
-                                   itm.fileValue + "'");
-            var pgq = new PageQueryModel(curPage, pageSize, "begTime", "asc",
-                "", _sbSqlWhere.ToString());
-            var json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                    _webServiceName + "GetListPage", json);
-                var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
-                    gcMain.DataSource = dt;
-                    gcMain.ForceInitialize();
-                    int dddd = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.TotalPages = dddd;
-                    pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.setTxt();
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        private void getModel(string strGuid, bool isEdit, int tabIdx)
-        {
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
-            var _obj = new
-            {
-                guid = strGuid //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "GetModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    var dy = _rtn.rtnData;
-                    lbGuid.Text = strGuid;
-                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
-                }
-                else
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        private void getTree()
-        {
-            var pgq = new PageQueryModel(1, 999999, "departmentid", "asc",
-                "notree", " and is_Status=1");
-            var json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                    "SysDepartmentManager/GetListPage", json);
-                var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = dd.rtnData.list;
-                txt_workshopNo.Properties.DataSource = dt;
-                txt_workshopNo.Properties.DisplayMember = "departmentname"; // 鏄剧ず鐨勫垪
-                txt_workshopNo.Properties.ValueMember = "guid"; // 瀹為檯鍊肩殑鍒�
-                txt_workshopNo.Properties.TextEditStyle =
-                    TextEditStyles.DisableTextEditor;
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
deleted file mode 100644
index 9063447..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
+++ /dev/null
@@ -1,339 +0,0 @@
-/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
-{
-    partial class Frm_MesDaaDirectOut
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_workshop = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
-            this.txt_workshop = new Gs.DevApp.UserControl.UcLookWorkshop();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.lb_itemId = new DevExpress.XtraEditors.LabelControl();
-            this.lb_workshop = new DevExpress.XtraEditors.LabelControl();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gv_itemId
-            // 
-            
-            this.gv_itemId.AppearanceCell.Options.UseFont = true;
-            this.gv_itemId.Caption = "鐗╂枡ID";
-            this.gv_itemId.FieldName = "itemId";
-            this.gv_itemId.MinWidth = 50;
-            this.gv_itemId.Name = "gv_itemId";
-            this.gv_itemId.OptionsColumn.AllowEdit = false;
-            this.gv_itemId.Tag = "query_a.item_id";
-            this.gv_itemId.Visible = true;
-            this.gv_itemId.VisibleIndex = 3;
-            this.gv_itemId.Width = 94;
-            // 
-            // gv_workshop
-            // 
-            this.gv_workshop.AppearanceCell.Options.UseFont = true;
-            this.gv_workshop.Caption = "杞﹂棿ID";
-            this.gv_workshop.FieldName = "workshop";
-            this.gv_workshop.MinWidth = 50;
-            this.gv_workshop.Name = "gv_workshop";
-            this.gv_workshop.OptionsColumn.AllowEdit = false;
-            this.gv_workshop.Tag = "query_a.workshop";
-            this.gv_workshop.Visible = true;
-            this.gv_workshop.VisibleIndex = 1;
-            this.gv_workshop.Width = 94;
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
-            this.gcMain.Location = new System.Drawing.Point(0, 54);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1126, 477);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn1,
-            this.gv_workshop,
-            this.gridColumn2,
-            this.gv_itemId,
-            this.gridColumn5,
-            this.gridColumn3,
-            this.gridColumn4});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "浣跨敤缁勭粐";
-            this.gridColumn1.FieldName = "fSubsidiary";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 0;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "杞﹂棿鍚嶇О";
-            this.gridColumn2.FieldName = "workshopName";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 2;
-            this.gridColumn2.Width = 94;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "鐗╂枡缂栫爜";
-            this.gridColumn5.FieldName = "itemNo";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 4;
-            this.gridColumn5.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn3.FieldName = "itemName";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 5;
-            this.gridColumn3.Width = 94;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn4.FieldName = "itemModel";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 6;
-            this.gridColumn4.Width = 94;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Controls.Add(this.panel1);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.textEdit1);
-            this.panel1.Controls.Add(this.txt_itemId);
-            this.panel1.Controls.Add(this.txt_workshop);
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_itemId);
-            this.panel1.Controls.Add(this.lb_workshop);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 54);
-            this.panel1.TabIndex = 4;
-            // 
-            // txt_itemId
-            // 
-            this.txt_itemId.Enabled = false;
-            this.txt_itemId.IsReadly = false;
-            this.txt_itemId.Location = new System.Drawing.Point(372, 9);
-            this.txt_itemId.Name = "txt_itemId";
-            this.txt_itemId.Size = new System.Drawing.Size(266, 33);
-            this.txt_itemId.TabIndex = 218;
-            this.txt_itemId.Tag = "no";
-            // 
-            // txt_workshop
-            // 
-            this.txt_workshop.Enabled = false;
-            this.txt_workshop.IsReadly = false;
-            this.txt_workshop.Location = new System.Drawing.Point(78, 11);
-            this.txt_workshop.Name = "txt_workshop";
-            this.txt_workshop.Size = new System.Drawing.Size(193, 29);
-            this.txt_workshop.TabIndex = 217;
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(791, 15);
-            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(45, 18);
-            this.labelControl11.TabIndex = 130;
-            this.labelControl11.Text = "涓婚敭锛�";
-            this.labelControl11.Visible = false;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(842, 15);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Visible = false;
-            // 
-            // lb_itemId
-            // 
-            this.lb_itemId.Appearance.Options.UseFont = true;
-            this.lb_itemId.Location = new System.Drawing.Point(305, 15);
-            this.lb_itemId.Name = "lb_itemId";
-            this.lb_itemId.Size = new System.Drawing.Size(57, 21);
-            this.lb_itemId.TabIndex = 216;
-            this.lb_itemId.Text = "鐗╂枡ID ";
-            // 
-            // lb_workshop
-            // 
-            this.lb_workshop.Appearance.Options.UseFont = true;
-            this.lb_workshop.Location = new System.Drawing.Point(15, 15);
-            this.lb_workshop.Name = "lb_workshop";
-            this.lb_workshop.Size = new System.Drawing.Size(57, 21);
-            this.lb_workshop.TabIndex = 213;
-            this.lb_workshop.Text = "杞﹂棿ID ";
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 531);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
-            this.pageBar1.TabIndex = 3;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // textEdit1
-            // 
-            this.textEdit1.Location = new System.Drawing.Point(924, 12);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Size = new System.Drawing.Size(125, 24);
-            this.textEdit1.TabIndex = 219;
-            this.textEdit1.Visible = false;
-            // 
-            // Frm_MesDaaDirectOut
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesDaaDirectOut";
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-        #endregion
-        private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private UserControls.Data.UcPageBar pageBar1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_workshop;
-        private System.Windows.Forms.Panel panel1;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl lb_itemId;
-        private DevExpress.XtraEditors.LabelControl lb_workshop;
-        private UserControl.UcLookItems txt_itemId;
-        private UserControl.UcLookWorkshop txt_workshop;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
deleted file mode 100644
index a8813fd..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm
-{
-    public partial class Frm_MesDaaDirectOut : DevExpress.XtraEditors.XtraForm
-    {
-        string _webServiceName = "MesDaaDirectOutManager/";
-        List<FilterEntity> _filterList = new List<FilterEntity>();
-        public Frm_MesDaaDirectOut()
-        {
-            InitializeComponent();
-            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
-            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
-            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
-            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            getPageList(1);
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1);
-            gridView1.CustomDrawRowIndicator += (s, e) =>
-            {
-                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                {
-                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
-                }
-            };
-            gridView1.CustomDrawEmptyForeground += (s, e) =>
-            {
-                string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                Font f = new Font("寰蒋闆呴粦", 16);
-                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
-                e.Graphics.DrawString(str, f, Brushes.Gray, r);
-            };
-        }
-        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
-           Task.Delay(100);
-            getPageList(1);
-        }
-       
-        /// <summary>
-        /// 鍒嗛〉浜嬩欢
-        /// </summary>
-        /// <param name="curPage"></param>
-        /// <param name="pageSize"></param>
-        private void PageBar1_PagerEvent(int curPage, int pageSize)
-        {
-            getPageList(curPage);
-        }
-        /// <summary>
-        /// 鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            gridView1.ActiveFilter.Clear();
-            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
-        }
-        /// <summary>
-        /// 鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1);
-        }
-
-        /// <summary>
-        /// 鍙栨秷浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-        }
-
-        /// <summary>
-        /// 鍒犻櫎浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
-        {
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, textEdit1, gridView1);
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
-                return;
-            List<dynamic> lst = new List<dynamic>();
-            lst.Add(rowGuid);
-            var _obj = lst;
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    if (xtraTabControl1.SelectedTabPageIndex == 0)
-                    { }
-                    else
-                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
-                    getPageList(this.pageBar1.CurrentPage);
-                }
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            //if (xtraTabControl1.SelectedTabPageIndex == 1)
-            //    getModel(lbGuid.Text.Trim());
-            //else
-            //{
-            //    //_filterList.Clear();
-            //    //if (gridView1.ActiveFilter.Count > 0)
-            //    //{
-            //    //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            //    //    gridView1.ActiveFilter.Clear();
-            //    //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            //    //}
-            //    //getPageList(1);
-            //    getPageList(this.pageBar1.CurrentPage);
-            //}
-        }
-       
-        /// <summary>
-        /// 鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            lbGuid.Text = "";
-            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
-
-        }
-        /// <summary>
-        /// 淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.isSetBtn = false;
-            string _workshop = txt_workshop.GetId();
-            string _itemId=txt_itemId.GetId();
-            if (string.IsNullOrEmpty(_workshop.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
-                txt_workshop.Focus();
-                return;
-            }
-            if (string.IsNullOrEmpty(_itemId.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏃犺亰锛�");
-                txt_itemId.Focus();
-                return;
-            }
-            var _obj = new
-            {
-                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                Workshop= _workshop,
-                ItemId= _itemId
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    lbGuid.Text = _rtn.rtnData;
-                    toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private   void getPageList(int curPage)
-        {
-            
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "b.item_no",
-            "asc", "", _sbSqlWhere.ToString());
-            var json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                    _webServiceName + "GetListPage", json);
-                var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-            
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="strGuid">涓婚敭</param>
-        /// <param name="isEdit">鏄惁鍙紪杈�</param>
-        /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
-        private void getModel(string strGuid, bool isEdit, int tabIdx)
-        {
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
-            var _obj = new
-            {
-                guid = strGuid,//涓诲缓
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    dynamic dy = _rtn.rtnData;
-                    lbGuid.Text = strGuid;
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
-
-                }
-                else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.resx
deleted file mode 100644
index d58980a..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
deleted file mode 100644
index adc9ad0..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
+++ /dev/null
@@ -1,566 +0,0 @@
-/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
-{
-    partial class Frm_MesPosition
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.lb_fforbidstatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
-            this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_disabledDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_disabledDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_disabledDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_disabledBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_disabledBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_disabledBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_creationDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_creationDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_creationDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_department = new DevExpress.XtraEditors.LabelControl();
-            this.txt_department = new DevExpress.XtraEditors.TextEdit();
-            this.gv_department = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_positionDescription = new DevExpress.XtraEditors.LabelControl();
-            this.txt_positionDescription = new DevExpress.XtraEditors.TextEdit();
-            this.gv_positionDescription = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_positionName = new DevExpress.XtraEditors.LabelControl();
-            this.txt_positionName = new DevExpress.XtraEditors.TextEdit();
-            this.gv_positionName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_positionId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_positionId = new DevExpress.XtraEditors.TextEdit();
-            this.gv_positionId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_disabledDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_disabledBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_creationDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_department.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_positionDescription.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_positionName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_positionId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            this.xtraTabPage2.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // lb_fforbidstatus
-            // 
-            
-            this.lb_fforbidstatus.Appearance.Options.UseFont = true;
-            this.lb_fforbidstatus.Location = new System.Drawing.Point(276, 92);
-            this.lb_fforbidstatus.Name = "lb_fforbidstatus";
-            this.lb_fforbidstatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_fforbidstatus.TabIndex = 252;
-            this.lb_fforbidstatus.Text = "绂佺敤鐘舵�� ";
-            // 
-            // txt_fforbidstatus
-            // 
-            this.txt_fforbidstatus.Location = new System.Drawing.Point(351, 88);
-            this.txt_fforbidstatus.Name = "txt_fforbidstatus";
-            this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_fforbidstatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_fforbidstatus.TabIndex = 252;
-            // 
-            // gv_fforbidstatus
-            // 
-            this.gv_fforbidstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_fforbidstatus.Caption = "绂佺敤鐘舵�� ";
-            this.gv_fforbidstatus.FieldName = "fforbidstatus";
-            this.gv_fforbidstatus.MinWidth = 50;
-            this.gv_fforbidstatus.Name = "gv_fforbidstatus";
-            this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
-            this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
-            this.gv_fforbidstatus.Visible = true;
-            this.gv_fforbidstatus.VisibleIndex = 8;
-            this.gv_fforbidstatus.Width = 94;
-            // 
-            // lb_disabledDate
-            // 
-            this.lb_disabledDate.Appearance.Options.UseFont = true;
-            this.lb_disabledDate.Location = new System.Drawing.Point(276, 54);
-            this.lb_disabledDate.Name = "lb_disabledDate";
-            this.lb_disabledDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_disabledDate.TabIndex = 228;
-            this.lb_disabledDate.Text = "绂佺敤鏃ユ湡 ";
-            // 
-            // txt_disabledDate
-            // 
-            this.txt_disabledDate.Location = new System.Drawing.Point(351, 50);
-            this.txt_disabledDate.Name = "txt_disabledDate";
-            this.txt_disabledDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_disabledDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_disabledDate.TabIndex = 228;
-            // 
-            // gv_disabledDate
-            // 
-            this.gv_disabledDate.AppearanceCell.Options.UseFont = true;
-            this.gv_disabledDate.Caption = "绂佺敤鏃ユ湡 ";
-            this.gv_disabledDate.FieldName = "disabledDate";
-            this.gv_disabledDate.MinWidth = 50;
-            this.gv_disabledDate.Name = "gv_disabledDate";
-            this.gv_disabledDate.OptionsColumn.AllowEdit = false;
-            this.gv_disabledDate.Tag = "query_a.disabled_date";
-            this.gv_disabledDate.Visible = true;
-            this.gv_disabledDate.VisibleIndex = 7;
-            this.gv_disabledDate.Width = 94;
-            // 
-            // lb_disabledBy
-            // 
-            this.lb_disabledBy.Appearance.Options.UseFont = true;
-            this.lb_disabledBy.Location = new System.Drawing.Point(276, 129);
-            this.lb_disabledBy.Name = "lb_disabledBy";
-            this.lb_disabledBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_disabledBy.TabIndex = 226;
-            this.lb_disabledBy.Text = "绂佺敤浜� ";
-            // 
-            // txt_disabledBy
-            // 
-            this.txt_disabledBy.Location = new System.Drawing.Point(351, 125);
-            this.txt_disabledBy.Name = "txt_disabledBy";
-            this.txt_disabledBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_disabledBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_disabledBy.TabIndex = 226;
-            // 
-            // gv_disabledBy
-            // 
-            this.gv_disabledBy.AppearanceCell.Options.UseFont = true;
-            this.gv_disabledBy.Caption = "绂佺敤浜� ";
-            this.gv_disabledBy.FieldName = "disabledBy";
-            this.gv_disabledBy.MinWidth = 50;
-            this.gv_disabledBy.Name = "gv_disabledBy";
-            this.gv_disabledBy.OptionsColumn.AllowEdit = false;
-            this.gv_disabledBy.Tag = "query_a.disabled_by";
-            this.gv_disabledBy.Visible = true;
-            this.gv_disabledBy.VisibleIndex = 6;
-            this.gv_disabledBy.Width = 94;
-            // 
-            // lb_creationDate
-            // 
-           
-            this.lb_creationDate.Appearance.Options.UseFont = true;
-            this.lb_creationDate.Location = new System.Drawing.Point(276, 14);
-            this.lb_creationDate.Name = "lb_creationDate";
-            this.lb_creationDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_creationDate.TabIndex = 222;
-            this.lb_creationDate.Text = "寤虹珛鏃ユ湡 ";
-            // 
-            // txt_creationDate
-            // 
-            this.txt_creationDate.Location = new System.Drawing.Point(351, 10);
-            this.txt_creationDate.Name = "txt_creationDate";
-            this.txt_creationDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_creationDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_creationDate.TabIndex = 222;
-            // 
-            // gv_creationDate
-            // 
-            this.gv_creationDate.AppearanceCell.Options.UseFont = true;
-            this.gv_creationDate.Caption = "寤虹珛鏃ユ湡 ";
-            this.gv_creationDate.FieldName = "creationDate";
-            this.gv_creationDate.MinWidth = 50;
-            this.gv_creationDate.Name = "gv_creationDate";
-            this.gv_creationDate.OptionsColumn.AllowEdit = false;
-            this.gv_creationDate.Tag = "query_a.creation_date";
-            this.gv_creationDate.Visible = true;
-            this.gv_creationDate.VisibleIndex = 5;
-            this.gv_creationDate.Width = 94;
-            // 
-            // lb_department
-            // 
-            this.lb_department.Appearance.Options.UseFont = true;
-            this.lb_department.Location = new System.Drawing.Point(4, 129);
-            this.lb_department.Name = "lb_department";
-            this.lb_department.Size = new System.Drawing.Size(73, 21);
-            this.lb_department.TabIndex = 219;
-            this.lb_department.Text = "鎵�灞為儴闂� ";
-            // 
-            // txt_department
-            // 
-            this.txt_department.Location = new System.Drawing.Point(86, 125);
-            this.txt_department.Name = "txt_department";
-            
-            this.txt_department.Properties.Appearance.Options.UseFont = true;
-            this.txt_department.Size = new System.Drawing.Size(150, 28);
-            this.txt_department.TabIndex = 219;
-            // 
-            // gv_department
-            // 
-            this.gv_department.AppearanceCell.Options.UseFont = true;
-            this.gv_department.Caption = "鎵�灞為儴闂� ";
-            this.gv_department.FieldName = "department";
-            this.gv_department.MinWidth = 50;
-            this.gv_department.Name = "gv_department";
-            this.gv_department.OptionsColumn.AllowEdit = false;
-            this.gv_department.Tag = "query_a.department";
-            this.gv_department.Visible = true;
-            this.gv_department.VisibleIndex = 4;
-            this.gv_department.Width = 94;
-            // 
-            // lb_positionDescription
-            // 
-            this.lb_positionDescription.Appearance.Options.UseFont = true;
-            this.lb_positionDescription.Location = new System.Drawing.Point(4, 92);
-            this.lb_positionDescription.Name = "lb_positionDescription";
-            this.lb_positionDescription.Size = new System.Drawing.Size(73, 21);
-            this.lb_positionDescription.TabIndex = 217;
-            this.lb_positionDescription.Text = "宀椾綅鎻忚堪 ";
-            // 
-            // txt_positionDescription
-            // 
-            this.txt_positionDescription.Location = new System.Drawing.Point(86, 88);
-            this.txt_positionDescription.Name = "txt_positionDescription";
-            this.txt_positionDescription.Properties.Appearance.Options.UseFont = true;
-            this.txt_positionDescription.Size = new System.Drawing.Size(150, 28);
-            this.txt_positionDescription.TabIndex = 217;
-            // 
-            // gv_positionDescription
-            // 
-            this.gv_positionDescription.AppearanceCell.Options.UseFont = true;
-            this.gv_positionDescription.Caption = "宀椾綅鎻忚堪 ";
-            this.gv_positionDescription.FieldName = "positionDescription";
-            this.gv_positionDescription.MinWidth = 50;
-            this.gv_positionDescription.Name = "gv_positionDescription";
-            this.gv_positionDescription.OptionsColumn.AllowEdit = false;
-            this.gv_positionDescription.Tag = "query_a.position_description";
-            this.gv_positionDescription.Visible = true;
-            this.gv_positionDescription.VisibleIndex = 3;
-            this.gv_positionDescription.Width = 94;
-            // 
-            // lb_positionName
-            // 
-            this.lb_positionName.Appearance.Options.UseFont = true;
-            this.lb_positionName.Location = new System.Drawing.Point(4, 54);
-            this.lb_positionName.Name = "lb_positionName";
-            this.lb_positionName.Size = new System.Drawing.Size(73, 21);
-            this.lb_positionName.TabIndex = 216;
-            this.lb_positionName.Text = "宀椾綅鍚嶇О ";
-            // 
-            // txt_positionName
-            // 
-            this.txt_positionName.Location = new System.Drawing.Point(86, 50);
-            this.txt_positionName.Name = "txt_positionName";
-            this.txt_positionName.Properties.Appearance.Options.UseFont = true;
-            this.txt_positionName.Size = new System.Drawing.Size(150, 28);
-            this.txt_positionName.TabIndex = 216;
-            // 
-            // gv_positionName
-            // 
-            
-            this.gv_positionName.AppearanceCell.Options.UseFont = true;
-            this.gv_positionName.Caption = "宀椾綅鍚嶇О ";
-            this.gv_positionName.FieldName = "positionName";
-            this.gv_positionName.MinWidth = 50;
-            this.gv_positionName.Name = "gv_positionName";
-            this.gv_positionName.OptionsColumn.AllowEdit = false;
-            this.gv_positionName.Tag = "query_a.position_name";
-            this.gv_positionName.Visible = true;
-            this.gv_positionName.VisibleIndex = 2;
-            this.gv_positionName.Width = 94;
-            // 
-            // lb_positionId
-            // 
-            
-            this.lb_positionId.Appearance.Options.UseFont = true;
-            this.lb_positionId.Location = new System.Drawing.Point(4, 14);
-            this.lb_positionId.Name = "lb_positionId";
-            this.lb_positionId.Size = new System.Drawing.Size(73, 21);
-            this.lb_positionId.TabIndex = 213;
-            this.lb_positionId.Text = "宀椾綅缂栧彿 ";
-            // 
-            // txt_positionId
-            // 
-            this.txt_positionId.Location = new System.Drawing.Point(86, 10);
-            this.txt_positionId.Name = "txt_positionId";
-          
-            this.txt_positionId.Properties.Appearance.Options.UseFont = true;
-            this.txt_positionId.Size = new System.Drawing.Size(150, 28);
-            this.txt_positionId.TabIndex = 213;
-            // 
-            // gv_positionId
-            // 
-           
-            this.gv_positionId.AppearanceCell.Options.UseFont = true;
-            this.gv_positionId.Caption = "宀椾綅缂栧彿 ";
-            this.gv_positionId.FieldName = "positionId";
-            this.gv_positionId.MinWidth = 50;
-            this.gv_positionId.Name = "gv_positionId";
-            this.gv_positionId.OptionsColumn.AllowEdit = false;
-            this.gv_positionId.Tag = "query_a.position_id";
-            this.gv_positionId.Visible = true;
-            this.gv_positionId.VisibleIndex = 1;
-            this.gv_positionId.Width = 94;
-            // 
-            // gv_id
-            // 
-         
-            this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "宀椾綅ID";
-            this.gv_id.FieldName = "id";
-            this.gv_id.MinWidth = 50;
-            this.gv_id.Name = "gv_id";
-            this.gv_id.OptionsColumn.AllowEdit = false;
-            this.gv_id.Tag = "query_a.id";
-            this.gv_id.Visible = true;
-            this.gv_id.VisibleIndex = 0;
-            this.gv_id.Width = 94;
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = null;
-            this.toolBarMenu1.currentAction = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(914, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = "xlsOut_position{}";
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(912, 318);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_id,
-            this.gv_positionId,
-            this.gv_positionName,
-            this.gv_positionDescription,
-            this.gv_department,
-            this.gv_creationDate,
-            this.gv_disabledBy,
-            this.gv_disabledDate,
-            this.gv_fforbidstatus});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(914, 389);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(912, 357);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 318);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(912, 39);
-            this.pageBar1.TabIndex = 3;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.panel1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(912, 357);
-            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_fforbidstatus);
-            this.panel1.Controls.Add(this.txt_fforbidstatus);
-            this.panel1.Controls.Add(this.lb_disabledDate);
-            this.panel1.Controls.Add(this.txt_disabledDate);
-            this.panel1.Controls.Add(this.lb_disabledBy);
-            this.panel1.Controls.Add(this.txt_disabledBy);
-            this.panel1.Controls.Add(this.lb_creationDate);
-            this.panel1.Controls.Add(this.txt_creationDate);
-            this.panel1.Controls.Add(this.lb_department);
-            this.panel1.Controls.Add(this.txt_department);
-            this.panel1.Controls.Add(this.lb_positionDescription);
-            this.panel1.Controls.Add(this.txt_positionDescription);
-            this.panel1.Controls.Add(this.lb_positionName);
-            this.panel1.Controls.Add(this.txt_positionName);
-            this.panel1.Controls.Add(this.lb_positionId);
-            this.panel1.Controls.Add(this.txt_positionId);
-
-            this.panel1.Location = new System.Drawing.Point(76, 20);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(566, 215);
-            this.panel1.TabIndex = 1;
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(45, 181);
-            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(45, 18);
-            this.labelControl11.TabIndex = 130;
-            this.labelControl11.Text = "涓婚敭锛�";
-            this.labelControl11.Visible = false;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(96, 181);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Visible = false;
-            // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(814, 55);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 6;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
-            // 
-            // Frm_MesPosition
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(914, 469);
-            this.Controls.Add(this.picCheckBox);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesPosition";
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_disabledDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_disabledBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_creationDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_department.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_positionDescription.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_positionName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_positionId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            this.xtraTabPage2.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-        #endregion
-        private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private UserControls.Data.UcPageBar pageBar1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
-        //BQCreateConrolObejct
-        private DevExpress.XtraEditors.LabelControl lb_fforbidstatus;
-        private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_disabledDate;
-        private DevExpress.XtraEditors.TextEdit txt_disabledDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_disabledDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_disabledBy;
-        private DevExpress.XtraEditors.TextEdit txt_disabledBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_disabledBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_creationDate;
-        private DevExpress.XtraEditors.TextEdit txt_creationDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_creationDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_department;
-        private DevExpress.XtraEditors.TextEdit txt_department;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_department;
-
-        private DevExpress.XtraEditors.LabelControl lb_positionDescription;
-        private DevExpress.XtraEditors.TextEdit txt_positionDescription;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_positionDescription;
-
-        private DevExpress.XtraEditors.LabelControl lb_positionName;
-        private DevExpress.XtraEditors.TextEdit txt_positionName;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_positionName;
-
-        private DevExpress.XtraEditors.LabelControl lb_positionId;
-        private DevExpress.XtraEditors.TextEdit txt_positionId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_positionId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-        private System.Windows.Forms.PictureBox picCheckBox;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
deleted file mode 100644
index 6796e62..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-
-namespace Gs.DevApp.DevFrm
-{
-    public partial class Frm_MesPosition : XtraForm
-    {
-        private List<FilterEntity> _filterList = new List<FilterEntity>();
-        private readonly string _webServiceName = "MesPositionManager/";
-        public Frm_MesPosition()
-        {
-            InitializeComponent();
-            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-            gvList.Add(gridView1);
-            Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
-            getPageList(1);
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
-        }
-        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
-           Task.Delay(100);
-            getPageList(1);
-        }
-
-        /// <summary>
-        ///     鍙屽嚮浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            var rowGuid =
-                UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
-            if (!string.IsNullOrEmpty(rowGuid))
-                getModel(rowGuid, false, 999);
-        }
-
-        /// <summary>
-        ///     鍒嗛〉浜嬩欢
-        /// </summary>
-        /// <param name="curPage"></param>
-        /// <param name="pageSize"></param>
-        private void PageBar1_PagerEvent(int curPage, int pageSize)
-        {
-            getPageList(curPage);
-        }
-
-        /// <summary>
-        ///     鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            gridView1.ActiveFilter.Clear();
-            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
-        }
-
-        /// <summary>
-        ///     鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1);
-        }
-
-        /// <summary>
-        ///     鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            //if (xtraTabControl1.SelectedTabPageIndex == 1)
-            //    getModel(lbGuid.Text.Trim());
-            //else
-            //{
-            //    //_filterList.Clear();
-            //    //if (gridView1.ActiveFilter.Count > 0)
-            //    //{
-            //    //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            //    //    gridView1.ActiveFilter.Clear();
-            //    //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            //    //}
-            //    //getPageList(1);
-            //    getPageList(this.pageBar1.CurrentPage);
-            //}
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private   void getPageList(int curPage)
-        {
-            
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "position_name",
-                "asc", "", _sbSqlWhere.ToString());
-            var json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                    _webServiceName + "GetListPage", json);
-                var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="strGuid">涓婚敭</param>
-        /// <param name="isEdit">鏄惁鍙紪杈�</param>
-        /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
-        private void getModel(string strGuid, bool isEdit, int tabIdx)
-        {
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-
-            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
-            var _obj = new
-            {
-                guid = strGuid //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "GetModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    var dy = _rtn.rtnData;
-                    lbGuid.Text = strGuid;
-                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
-                }
-                else
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.resx
deleted file mode 100644
index d58980a..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
index 0d27d01..4730b26 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.Designer.cs
@@ -443,7 +443,7 @@
             this.txt_returnType.Size = new System.Drawing.Size(165, 24);
             this.txt_returnType.TabIndex = 533;
             this.txt_returnType.TextTxt = "";
-            this.txt_returnType.WhereTxt = "s_type=\'鐢熶骇閫�搴撳師鍥燶'";
+            this.txt_returnType.WhereTxt = "a.s_type=\'鐢熶骇閫�搴撳師鍥燶'  and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
             // 
             // btnSelect
             // 
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 860859b..2bb8427 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -928,7 +928,7 @@
             this.txt_msg.Size = new System.Drawing.Size(328, 83);
             this.txt_msg.TabIndex = 814;
             this.txt_msg.TextTxt = "";
-            this.txt_msg.WhereTxt = null;
+            this.txt_msg.WhereTxt = " a.s_type=\'杩濊绫诲埆\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
             // 
             // txt_suppId
             // 
@@ -2004,7 +2004,7 @@
             this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
             this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn10.Caption = "缂洪櫡鎻忚堪";
+            this.gridColumn10.Caption = "寮傚父鎻忚堪";
             this.gridColumn10.ColumnEdit = this.rptDefectDetails;
             this.gridColumn10.FieldName = "defectDetails";
             this.gridColumn10.MinWidth = 25;
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index cd41086..a7c743c 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -924,7 +924,7 @@
         /// <param name="curPage"></param>
         private void getRptDefectLevel()
         {
-            string _where = " and 1=1 and  s_type='缂洪櫡绛夌骇'";
+            string _where = " and 1=1 and  a.s_type='缂洪櫡绛夌骇'  and a.pid<>'00000000-0000-0000-0000-000000000000'";
             var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -952,7 +952,7 @@
             var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
-            UcDictionarySelect frm = new UcDictionarySelect("缂洪櫡鎻忚堪", " s_type='FQC缂洪櫡鎻忚堪'");
+            UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", "  a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'");
             frm.UpdateParent += (ss, ee) =>
             {
                 System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
deleted file mode 100644
index 4416be4..0000000
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
+++ /dev/null
@@ -1,2499 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.FQC
-{
-    partial class Frm_FqcDetect01Check
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = 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_msg = new Gs.DevApp.UserControl.UcDictionary();
-            this.txt_fmrmode = new Gs.DevApp.UserControl.UcLookGx();
-            this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
-            this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fcheckDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
-            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_workNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
-            this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_lineId = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
-            this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_kbSl = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_itemId11111 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = 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.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
-            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckItemDesc = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fspecRequ = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1freQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1checkQyt = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fenterQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fngRate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fngQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
-            this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.groupControl2 = new DevExpress.XtraEditors.GroupControl();
-            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.ucChouJianList1 = new Gs.DevApp.DevFrm.FQC.UcChouJianList();
-            this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
-            this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList();
-            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
-            this.split1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
-            this.split1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            this.xtraTabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
-            this.splitMx1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
-            this.splitMx1.Panel2.SuspendLayout();
-            this.splitMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
-            this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
-            ((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_workNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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.xtraTabControl2)).BeginInit();
-            this.xtraTabControl2.SuspendLayout();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel1)).BeginInit();
-            this.splitMx2.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel2)).BeginInit();
-            this.splitMx2.Panel2.SuspendLayout();
-            this.splitMx2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).BeginInit();
-            this.splitYangLi.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).BeginInit();
-            this.splitYangLi.Panel2.SuspendLayout();
-            this.splitYangLi.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
-            this.groupControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).BeginInit();
-            this.groupControl2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
-            this.tabMxPage2.SuspendLayout();
-            this.tabMxPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // repositoryItemComboBox1
-            // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Items.AddRange(new object[] {
-            "鈭�",
-            "脳"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = "0,0,0,0,000chk_iqc_detect01_submit";
-            this.toolBarMenu1.currentAction = null;
-            this.toolBarMenu1.defaultActions = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // split1
-            // 
-            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
-            this.split1.Horizontal = false;
-            this.split1.Location = new System.Drawing.Point(0, 0);
-            this.split1.Name = "split1";
-            // 
-            // split1.Panel1
-            // 
-            this.split1.Panel1.Controls.Add(this.gcMain1);
-            this.split1.Panel1.Controls.Add(this.pageBar1);
-            this.split1.Panel1.Text = "Panel1";
-            // 
-            // split1.Panel2
-            // 
-            this.split1.Panel2.Text = "Panel2";
-            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1342, 688);
-            this.split1.SplitterPosition = 106;
-            this.split1.TabIndex = 4;
-            // 
-            // gcMain1
-            // 
-            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            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, 532);
-            this.gcMain1.TabIndex = 2;
-            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
-            this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_fsubmit,
-            this.gv_releaseNo,
-            this.gv_fcheckResu,
-            this.gridColumn5,
-            this.gv_lotNo,
-            this.gridColumn23,
-            this.gv_lifnr,
-            this.gv_itemId,
-            this.gv_itemNo,
-            this.gv_boardStyle,
-            this.gridColumn14,
-            this.gv_fcovertQty,
-            this.gv_fbatchQty,
-            this.gv_remarks,
-            this.gv_fcheckBy,
-            this.gv_fcheckDate,
-            this.gv_createBy,
-            this.gridColumn15,
-            this.gv_lastupdateBy,
-            this.gv_lastupdateDate,
-            this.gridColumn18,
-            this.gridColumn19,
-            this.gridColumn30,
-            this.gridColumn13,
-            this.gridColumn17,
-            this.gridColumn7});
-            this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gv_fsubmit
-            // 
-            this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
-            this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
-            this.gv_fsubmit.FieldName = "modifyFlagTxt";
-            this.gv_fsubmit.MinWidth = 30;
-            this.gv_fsubmit.Name = "gv_fsubmit";
-            this.gv_fsubmit.OptionsColumn.AllowEdit = false;
-            this.gv_fsubmit.Tag = "query_a.fsubmit";
-            this.gv_fsubmit.UnboundDataType = typeof(bool);
-            this.gv_fsubmit.Visible = true;
-            this.gv_fsubmit.VisibleIndex = 0;
-            this.gv_fsubmit.Width = 50;
-            // 
-            // gv_releaseNo
-            // 
-            this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
-            this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
-            this.gv_releaseNo.FieldName = "releaseNo";
-            this.gv_releaseNo.MinWidth = 30;
-            this.gv_releaseNo.Name = "gv_releaseNo";
-            this.gv_releaseNo.OptionsColumn.AllowEdit = false;
-            this.gv_releaseNo.Tag = "query_a.release_no";
-            this.gv_releaseNo.Visible = true;
-            this.gv_releaseNo.VisibleIndex = 1;
-            this.gv_releaseNo.Width = 100;
-            // 
-            // gv_fcheckResu
-            // 
-            this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
-            this.gv_fcheckResu.FieldName = "fcheckResu";
-            this.gv_fcheckResu.MinWidth = 30;
-            this.gv_fcheckResu.Name = "gv_fcheckResu";
-            this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
-            this.gv_fcheckResu.Visible = true;
-            this.gv_fcheckResu.VisibleIndex = 2;
-            this.gv_fcheckResu.Width = 50;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "鍒ゅ畾缁撴灉";
-            this.gridColumn5.FieldName = "freceQty";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 3;
-            this.gridColumn5.Width = 94;
-            // 
-            // gv_lotNo
-            // 
-            this.gv_lotNo.AppearanceCell.Options.UseFont = true;
-            this.gv_lotNo.Caption = "宸ュ崟鍗曞彿";
-            this.gv_lotNo.FieldName = "lotNo";
-            this.gv_lotNo.MinWidth = 30;
-            this.gv_lotNo.Name = "gv_lotNo";
-            this.gv_lotNo.OptionsColumn.AllowEdit = false;
-            this.gv_lotNo.Tag = "query_a.lot_no";
-            this.gv_lotNo.Visible = true;
-            this.gv_lotNo.VisibleIndex = 4;
-            this.gv_lotNo.Width = 120;
-            // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "浜х嚎鍚嶇О";
-            this.gridColumn23.FieldName = "lineName";
-            this.gridColumn23.MinWidth = 25;
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 5;
-            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 = 6;
-            this.gv_lifnr.Width = 200;
-            // 
-            // gv_itemId
-            // 
-            this.gv_itemId.AppearanceCell.Options.UseFont = true;
-            this.gv_itemId.Caption = "鐗╂枡ID";
-            this.gv_itemId.FieldName = "itemId";
-            this.gv_itemId.MinWidth = 30;
-            this.gv_itemId.Name = "gv_itemId";
-            this.gv_itemId.OptionsColumn.AllowEdit = false;
-            this.gv_itemId.Tag = "query_a.item_id";
-            this.gv_itemId.Visible = true;
-            this.gv_itemId.VisibleIndex = 7;
-            this.gv_itemId.Width = 30;
-            // 
-            // gv_itemNo
-            // 
-            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
-            this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
-            this.gv_itemNo.FieldName = "itemNo2";
-            this.gv_itemNo.MinWidth = 30;
-            this.gv_itemNo.Name = "gv_itemNo";
-            this.gv_itemNo.OptionsColumn.AllowEdit = false;
-            this.gv_itemNo.Tag = "query_a.item_no";
-            this.gv_itemNo.Visible = true;
-            this.gv_itemNo.VisibleIndex = 8;
-            this.gv_itemNo.Width = 136;
-            // 
-            // gv_boardStyle
-            // 
-            this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
-            this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
-            this.gv_boardStyle.FieldName = "itemName";
-            this.gv_boardStyle.MinWidth = 30;
-            this.gv_boardStyle.Name = "gv_boardStyle";
-            this.gv_boardStyle.OptionsColumn.AllowEdit = false;
-            this.gv_boardStyle.Tag = "query_a.board_style";
-            this.gv_boardStyle.Visible = true;
-            this.gv_boardStyle.VisibleIndex = 9;
-            this.gv_boardStyle.Width = 164;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 30;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.OptionsColumn.ReadOnly = true;
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 10;
-            this.gridColumn14.Width = 200;
-            // 
-            // gv_fcovertQty
-            // 
-            this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
-            this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺";
-            this.gv_fcovertQty.FieldName = "daaQty";
-            this.gv_fcovertQty.MinWidth = 30;
-            this.gv_fcovertQty.Name = "gv_fcovertQty";
-            this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
-            this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
-            this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
-            this.gv_fcovertQty.Visible = true;
-            this.gv_fcovertQty.VisibleIndex = 11;
-            this.gv_fcovertQty.Width = 60;
-            // 
-            // gv_fbatchQty
-            // 
-            this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
-            this.gv_fbatchQty.Caption = "鎶芥鏁伴噺";
-            this.gv_fbatchQty.FieldName = "fbatchQty";
-            this.gv_fbatchQty.MinWidth = 30;
-            this.gv_fbatchQty.Name = "gv_fbatchQty";
-            this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
-            this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
-            this.gv_fbatchQty.Visible = true;
-            this.gv_fbatchQty.VisibleIndex = 12;
-            this.gv_fbatchQty.Width = 80;
-            // 
-            // gv_remarks
-            // 
-            this.gv_remarks.AppearanceCell.Options.UseFont = true;
-            this.gv_remarks.Caption = "澶囨敞璇存槑";
-            this.gv_remarks.FieldName = "remarks";
-            this.gv_remarks.MinWidth = 30;
-            this.gv_remarks.Name = "gv_remarks";
-            this.gv_remarks.OptionsColumn.AllowEdit = false;
-            this.gv_remarks.Tag = "query_a.remarks";
-            this.gv_remarks.Visible = true;
-            this.gv_remarks.VisibleIndex = 13;
-            this.gv_remarks.Width = 100;
-            // 
-            // gv_fcheckBy
-            // 
-            this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
-            this.gv_fcheckBy.FieldName = "fcheckBy";
-            this.gv_fcheckBy.MinWidth = 30;
-            this.gv_fcheckBy.Name = "gv_fcheckBy";
-            this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckBy.Tag = "query_a.fcheck_by";
-            this.gv_fcheckBy.Visible = true;
-            this.gv_fcheckBy.VisibleIndex = 14;
-            this.gv_fcheckBy.Width = 118;
-            // 
-            // gv_fcheckDate
-            // 
-            this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
-            this.gv_fcheckDate.FieldName = "fcheckDate";
-            this.gv_fcheckDate.MinWidth = 30;
-            this.gv_fcheckDate.Name = "gv_fcheckDate";
-            this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckDate.Tag = "query_a.fcheck_date";
-            this.gv_fcheckDate.Visible = true;
-            this.gv_fcheckDate.VisibleIndex = 15;
-            this.gv_fcheckDate.Width = 182;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 30;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Tag = "query_a.create_by";
-            this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 16;
-            this.gv_createBy.Width = 67;
-            // 
-            // gridColumn15
-            // 
-            this.gridColumn15.Caption = "鍒涘缓鏃ユ湡";
-            this.gridColumn15.FieldName = "createDate";
-            this.gridColumn15.MinWidth = 25;
-            this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 17;
-            this.gridColumn15.Width = 94;
-            // 
-            // gv_lastupdateBy
-            // 
-            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
-            this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            this.gv_lastupdateBy.MinWidth = 30;
-            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
-            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
-            this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 18;
-            this.gv_lastupdateBy.Width = 60;
-            // 
-            // gv_lastupdateDate
-            // 
-            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
-            this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 30;
-            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
-            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
-            this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 19;
-            this.gv_lastupdateDate.Width = 120;
-            // 
-            // gridColumn18
-            // 
-            this.gridColumn18.Caption = "瀹℃牳浜�";
-            this.gridColumn18.FieldName = "modify1By";
-            this.gridColumn18.MinWidth = 25;
-            this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 20;
-            this.gridColumn18.Width = 94;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "瀹℃牳鏃ユ湡";
-            this.gridColumn19.FieldName = "modify1Date";
-            this.gridColumn19.MinWidth = 25;
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 21;
-            this.gridColumn19.Width = 94;
-            // 
-            // gridColumn30
-            // 
-            this.gridColumn30.Caption = "绫诲瀷";
-            this.gridColumn30.FieldName = "orderType";
-            this.gridColumn30.MinWidth = 25;
-            this.gridColumn30.Name = "gridColumn30";
-            this.gridColumn30.Width = 94;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.Caption = "浜х嚎ID";
-            this.gridColumn13.FieldName = "lineId";
-            this.gridColumn13.MinWidth = 25;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 22;
-            this.gridColumn13.Width = 94;
-            // 
-            // gridColumn17
-            // 
-            this.gridColumn17.Caption = "涓婚敭Guid";
-            this.gridColumn17.FieldName = "guid";
-            this.gridColumn17.MinWidth = 25;
-            this.gridColumn17.Name = "gridColumn17";
-            this.gridColumn17.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;
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 532);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1342, 38);
-            this.pageBar1.TabIndex = 4;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
-            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
-            // 
-            // splitMx1
-            // 
-            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitMx1.Horizontal = false;
-            this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Name = "splitMx1";
-            // 
-            // splitMx1.Panel1
-            // 
-            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
-            this.splitMx1.Panel1.Text = "Panel1";
-            // 
-            // splitMx1.Panel2
-            // 
-            this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
-            this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1342, 688);
-            this.splitMx1.SplitterPosition = 268;
-            this.splitMx1.TabIndex = 0;
-            // 
-            // layoutMx1
-            // 
-            this.layoutMx1.Controls.Add(this.txt_msg);
-            this.layoutMx1.Controls.Add(this.txt_fmrmode);
-            this.layoutMx1.Controls.Add(this.txt_fzrId);
-            this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_remarks);
-            this.layoutMx1.Controls.Add(this.txt_fcheckResu);
-            this.layoutMx1.Controls.Add(this.txt_releaseNo);
-            this.layoutMx1.Controls.Add(this.txt_fcheckDate);
-            this.layoutMx1.Controls.Add(this.txt_lotNo1);
-            this.layoutMx1.Controls.Add(this.txt_itemNo);
-            this.layoutMx1.Controls.Add(this.txt_itemModel);
-            this.layoutMx1.Controls.Add(this.txt_fcheckBy);
-            this.layoutMx1.Controls.Add(this.txt_fbatchQty);
-            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_workNo);
-            this.layoutMx1.Controls.Add(this.txt_checkStates);
-            this.layoutMx1.Controls.Add(this.txt_epTag);
-            this.layoutMx1.Controls.Add(this.txt_createBy);
-            this.layoutMx1.Controls.Add(this.txt_createDate);
-            this.layoutMx1.Controls.Add(this.txt_itemName);
-            this.layoutMx1.Controls.Add(this.txt_lineId);
-            this.layoutMx1.Controls.Add(this.txt_itemId);
-            this.layoutMx1.Controls.Add(this.txt_suppId);
-            this.layoutMx1.Controls.Add(this.txt_fngHandle);
-            this.layoutMx1.Controls.Add(this.txt_zrType);
-            this.layoutMx1.Controls.Add(this.txt_kbSl);
-            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem17,
-            this.layoutControlItem21,
-            this.txt_itemId11111});
-            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(116, 530, 812, 500);
-            this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1342, 268);
-            this.layoutMx1.TabIndex = 0;
-            this.layoutMx1.Text = "layoutControl1";
-            // 
-            // txt_msg
-            // 
-            this.txt_msg.BtnTxt = "杩濊绫诲埆";
-            this.txt_msg.Location = new System.Drawing.Point(672, 180);
-            this.txt_msg.Name = "txt_msg";
-            this.txt_msg.Size = new System.Drawing.Size(326, 52);
-            this.txt_msg.TabIndex = 814;
-            this.txt_msg.TextTxt = "";
-            this.txt_msg.WhereTxt = null;
-            // 
-            // txt_fmrmode
-            // 
-            this.txt_fmrmode.IsReadly = false;
-            this.txt_fmrmode.Location = new System.Drawing.Point(1074, 208);
-            this.txt_fmrmode.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_fmrmode.Name = "txt_fmrmode";
-            this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
-            this.txt_fmrmode.TabIndex = 813;
-            this.txt_fmrmode.Tag = "readonly";
-            // 
-            // txt_fzrId
-            // 
-            this.txt_fzrId.IsReadly = false;
-            this.txt_fzrId.Location = new System.Drawing.Point(1074, 152);
-            this.txt_fzrId.Name = "txt_fzrId";
-            this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
-            this.txt_fzrId.TabIndex = 812;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.Location = new System.Drawing.Point(987, 108);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(322, 28);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Text = "lbGuid";
-            this.lbGuid.Visible = false;
-            // 
-            // txt_remarks
-            // 
-            this.txt_remarks.Location = new System.Drawing.Point(84, 208);
-            this.txt_remarks.Name = "txt_remarks";
-            this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(584, 24);
-            this.txt_remarks.StyleController = this.layoutMx1;
-            this.txt_remarks.TabIndex = 797;
-            this.txt_remarks.Tag = "readonly";
-            // 
-            // txt_fcheckResu
-            // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 152);
-            this.txt_fcheckResu.Name = "txt_fcheckResu";
-            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(254, 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(414, 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.StyleController = this.layoutMx1;
-            this.txt_releaseNo.TabIndex = 213;
-            this.txt_releaseNo.Tag = "readonly";
-            // 
-            // txt_fcheckDate
-            // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 68);
-            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.StyleController = this.layoutMx1;
-            this.txt_fcheckDate.TabIndex = 216;
-            this.txt_fcheckDate.Tag = "readonly";
-            // 
-            // txt_lotNo1
-            // 
-            this.txt_lotNo1.Location = new System.Drawing.Point(744, 68);
-            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.StyleController = this.layoutMx1;
-            this.txt_lotNo1.TabIndex = 262;
-            this.txt_lotNo1.Tag = "readonly";
-            // 
-            // txt_itemNo
-            // 
-            this.txt_itemNo.Location = new System.Drawing.Point(84, 124);
-            this.txt_itemNo.Name = "txt_itemNo";
-            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
-            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, 180);
-            this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(254, 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, 96);
-            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.StyleController = this.layoutMx1;
-            this.txt_fcheckBy.TabIndex = 217;
-            this.txt_fcheckBy.Tag = "readonly";
-            // 
-            // txt_fbatchQty
-            // 
-            this.txt_fbatchQty.Location = new System.Drawing.Point(414, 40);
-            this.txt_fbatchQty.Name = "txt_fbatchQty";
-            this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
-            this.txt_fbatchQty.StyleController = this.layoutMx1;
-            this.txt_fbatchQty.TabIndex = 222;
-            this.txt_fbatchQty.Tag = "readonly";
-            // 
-            // txt_fsubmitBy
-            // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 40);
-            this.txt_fsubmitBy.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
-            this.txt_fsubmitBy.StyleController = this.layoutMx1;
-            this.txt_fsubmitBy.TabIndex = 804;
-            this.txt_fsubmitBy.Tag = "readonly";
-            // 
-            // txt_fsubmitDate
-            // 
-            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 12);
-            this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 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, 68);
-            this.txt_fsubmit.Name = "txt_fsubmit";
-            this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
-            this.txt_fsubmit.StyleController = this.layoutMx1;
-            this.txt_fsubmit.TabIndex = 806;
-            this.txt_fsubmit.Tag = "readonly";
-            // 
-            // txt_fmanageNo
-            // 
-            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 180);
-            this.txt_fmanageNo.Name = "txt_fmanageNo";
-            this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
-            this.txt_fmanageNo.StyleController = this.layoutMx1;
-            this.txt_fmanageNo.TabIndex = 807;
-            this.txt_fmanageNo.Tag = "readonly";
-            // 
-            // txt_guid
-            // 
-            this.txt_guid.Location = new System.Drawing.Point(1065, 108);
-            this.txt_guid.Name = "txt_guid";
-            this.txt_guid.Size = new System.Drawing.Size(244, 24);
-            this.txt_guid.StyleController = this.layoutMx1;
-            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;
-            this.txt_lifnr.Tag = "readonly";
-            // 
-            // 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;
-            this.txt_djType.Tag = "readonly";
-            // 
-            // txt_lotNo
-            // 
-            this.txt_lotNo.Location = new System.Drawing.Point(84, 40);
-            this.txt_lotNo.Name = "txt_lotNo";
-            this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
-            this.txt_lotNo.StyleController = this.layoutMx1;
-            this.txt_lotNo.TabIndex = 815;
-            this.txt_lotNo.Tag = "readonly";
-            // 
-            // txt_workNo
-            // 
-            this.txt_workNo.Location = new System.Drawing.Point(1074, 180);
-            this.txt_workNo.Name = "txt_workNo";
-            this.txt_workNo.Size = new System.Drawing.Size(256, 24);
-            this.txt_workNo.StyleController = this.layoutMx1;
-            this.txt_workNo.TabIndex = 816;
-            // 
-            // txt_checkStates
-            // 
-            this.txt_checkStates.Location = new System.Drawing.Point(414, 124);
-            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(254, 24);
-            this.txt_checkStates.StyleController = this.layoutMx1;
-            this.txt_checkStates.TabIndex = 819;
-            this.txt_checkStates.Tag = "readonly";
-            // 
-            // txt_epTag
-            // 
-            this.txt_epTag.Location = new System.Drawing.Point(744, 96);
-            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_epTag.Tag = "readonly";
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Location = new System.Drawing.Point(744, 152);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Size = new System.Drawing.Size(254, 24);
-            this.txt_createBy.StyleController = this.layoutMx1;
-            this.txt_createBy.TabIndex = 822;
-            this.txt_createBy.Tag = "readonly";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(744, 124);
-            this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Size = new System.Drawing.Size(254, 24);
-            this.txt_createDate.StyleController = this.layoutMx1;
-            this.txt_createDate.TabIndex = 823;
-            this.txt_createDate.Tag = "readonly";
-            // 
-            // txt_itemName
-            // 
-            this.txt_itemName.Location = new System.Drawing.Point(84, 152);
-            this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Size = new System.Drawing.Size(254, 24);
-            this.txt_itemName.StyleController = this.layoutMx1;
-            this.txt_itemName.TabIndex = 825;
-            this.txt_itemName.Tag = "readonly";
-            // 
-            // txt_lineId
-            // 
-            this.txt_lineId.Location = new System.Drawing.Point(84, 96);
-            this.txt_lineId.Name = "txt_lineId";
-            this.txt_lineId.Size = new System.Drawing.Size(254, 24);
-            this.txt_lineId.StyleController = this.layoutMx1;
-            this.txt_lineId.TabIndex = 826;
-            this.txt_lineId.Tag = "readonly";
-            // 
-            // txt_itemId
-            // 
-            this.txt_itemId.Location = new System.Drawing.Point(84, 128);
-            this.txt_itemId.Name = "txt_itemId";
-            this.txt_itemId.Size = new System.Drawing.Size(254, 24);
-            this.txt_itemId.StyleController = this.layoutMx1;
-            this.txt_itemId.TabIndex = 827;
-            this.txt_itemId.Tag = "readonly";
-            // 
-            // txt_suppId
-            // 
-            this.txt_suppId.Location = new System.Drawing.Point(744, 40);
-            this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(254, 24);
-            this.txt_suppId.StyleController = this.layoutMx1;
-            this.txt_suppId.TabIndex = 828;
-            this.txt_suppId.Tag = "readonly";
-            // 
-            // txt_fngHandle
-            // 
-            this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
-            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 96);
-            this.txt_fngHandle.Name = "txt_fngHandle";
-            this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_fngHandle.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "1:杩斿伐",
-            "2:鐗归噰",
-            "3:鎸戦�変娇鐢�"});
-            this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
-            this.txt_fngHandle.StyleController = this.layoutMx1;
-            this.txt_fngHandle.TabIndex = 829;
-            // 
-            // txt_zrType
-            // 
-            this.txt_zrType.EditValue = "-璇烽�夋嫨-";
-            this.txt_zrType.Location = new System.Drawing.Point(1074, 124);
-            this.txt_zrType.Name = "txt_zrType";
-            this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_zrType.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "1:鐢熶骇璐d换",
-            "2:闈炵敓浜ц矗浠�"});
-            this.txt_zrType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_zrType.Size = new System.Drawing.Size(256, 24);
-            this.txt_zrType.StyleController = this.layoutMx1;
-            this.txt_zrType.TabIndex = 829;
-            // 
-            // txt_kbSl
-            // 
-            this.txt_kbSl.Location = new System.Drawing.Point(84, 68);
-            this.txt_kbSl.Name = "txt_kbSl";
-            this.txt_kbSl.Size = new System.Drawing.Size(254, 24);
-            this.txt_kbSl.StyleController = this.layoutMx1;
-            this.txt_kbSl.TabIndex = 831;
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.lbGuid;
-            this.layoutControlItem17.Location = new System.Drawing.Point(975, 96);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem17.Text = "lbGuid";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem17.TextVisible = false;
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.txt_guid;
-            this.layoutControlItem21.Location = new System.Drawing.Point(975, 96);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem21.Text = "涓婚敭GUID";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
-            // 
-            // txt_itemId11111
-            // 
-            this.txt_itemId11111.Control = this.txt_itemId;
-            this.txt_itemId11111.Location = new System.Drawing.Point(0, 116);
-            this.txt_itemId11111.Name = "txt_itemId11111";
-            this.txt_itemId11111.OptionsTableLayoutItem.RowIndex = 4;
-            this.txt_itemId11111.Size = new System.Drawing.Size(330, 29);
-            this.txt_itemId11111.Text = "鐗╂枡ID";
-            this.txt_itemId11111.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // Root
-            // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem3,
-            this.layoutControlItem22,
-            this.txt_epTagtxt,
-            this.layoutControlItem18,
-            this.layoutControlItem4,
-            this.layoutControlItem27,
-            this.layoutControlItem33,
-            this.layoutControlItem31,
-            this.layoutControlItem16,
-            this.layoutControlItem15,
-            this.layoutControlItem14,
-            this.layoutControlItem23,
-            this.layoutControlItem7,
-            this.layoutControlItem28,
-            this.layoutControlItem10,
-            this.layoutControlItem32,
-            this.layoutControlItem8,
-            this.layoutControlItem2,
-            this.layoutControlItem9,
-            this.layoutControlItem1,
-            this.layoutControlItem19,
-            this.layoutControlItem5,
-            this.layoutControlItem34,
-            this.layoutControlItem6,
-            this.layoutControlItem12,
-            this.layoutControlItem11,
-            this.layoutControlItem35,
-            this.layoutControlItem25,
-            this.layoutControlItem29,
-            this.layoutControlItem26});
-            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
-            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 24D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8,
-            rowDefinition9});
-            this.Root.Size = new System.Drawing.Size(1342, 268);
-            this.Root.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_lotNo1;
-            this.layoutControlItem3.Location = new System.Drawing.Point(660, 56);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem3.Text = "閫佹鎵瑰彿";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // 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, 28);
-            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, 84);
-            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, 28);
-            this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
-            this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_fmanageNo;
-            this.layoutControlItem18.Location = new System.Drawing.Point(330, 168);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem18.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem18.Text = "娴佺▼缂栧彿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_suppId;
-            this.layoutControlItem4.Location = new System.Drawing.Point(660, 28);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem4.Text = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_msg;
-            this.layoutControlItem27.Location = new System.Drawing.Point(660, 168);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2;
-            this.layoutControlItem27.Size = new System.Drawing.Size(330, 56);
-            this.layoutControlItem27.Text = "杩濊绫诲埆";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem27.TextVisible = false;
-            // 
-            // layoutControlItem33
-            // 
-            this.layoutControlItem33.Control = this.txt_createDate;
-            this.layoutControlItem33.Location = new System.Drawing.Point(660, 112);
-            this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem33.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem31
-            // 
-            this.layoutControlItem31.Control = this.txt_createBy;
-            this.layoutControlItem31.CustomizationFormText = "鍒涘缓浜哄憳";
-            this.layoutControlItem31.Location = new System.Drawing.Point(660, 140);
-            this.layoutControlItem31.Name = "layoutControlItem31";
-            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem31.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_fsubmitDate;
-            this.layoutControlItem16.CustomizationFormText = "瀹℃牳浜哄憳";
-            this.layoutControlItem16.Location = new System.Drawing.Point(990, 0);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(332, 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, 28);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(332, 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, 56);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(332, 28);
-            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem14.TextVisible = false;
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_djType;
-            this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_lineId;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 84);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem7.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem7.Text = "鐢熶骇绾垮埆";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_lotNo;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 28);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem28.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(330, 140);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem32
-            // 
-            this.layoutControlItem32.Control = this.txt_checkStates;
-            this.layoutControlItem32.Location = new System.Drawing.Point(330, 112);
-            this.layoutControlItem32.Name = "layoutControlItem32";
-            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem32.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_fcheckBy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(330, 84);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
-            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, 56);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
-            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, 28);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem9.Text = "鎶芥鏁伴噺";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_releaseNo;
-            this.layoutControlItem1.Location = new System.Drawing.Point(330, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_kbSl;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 56);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem19.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem19.Text = "閫佹鏁伴噺";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_itemNo;
-            this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem34
-            // 
-            this.layoutControlItem34.Control = this.txt_itemName;
-            this.layoutControlItem34.Location = new System.Drawing.Point(0, 140);
-            this.layoutControlItem34.Name = "layoutControlItem34";
-            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem34.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 168);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 196);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem12.Size = new System.Drawing.Size(660, 28);
-            this.layoutControlItem12.Text = "澶囨敞璇存槑";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // xtraTabControl2
-            // 
-            this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
-            this.xtraTabControl2.Name = "xtraTabControl2";
-            this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 408);
-            this.xtraTabControl2.TabIndex = 3;
-            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1,
-            this.tabMxPage2,
-            this.tabMxPage3});
-            // 
-            // tabMxPage1
-            // 
-            this.tabMxPage1.Controls.Add(this.splitMx2);
-            this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1340, 376);
-            this.tabMxPage1.Text = "鎶芥牱淇℃伅";
-            // 
-            // splitMx2
-            // 
-            this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitMx2.Horizontal = false;
-            this.splitMx2.Location = new System.Drawing.Point(0, 0);
-            this.splitMx2.Name = "splitMx2";
-            // 
-            // splitMx2.Panel1
-            // 
-            this.splitMx2.Panel1.Controls.Add(this.gcMx1);
-            this.splitMx2.Panel1.Text = "Panel1";
-            // 
-            // splitMx2.Panel2
-            // 
-            this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
-            this.splitMx2.Panel2.Text = "Panel2";
-            this.splitMx2.Size = new System.Drawing.Size(1340, 376);
-            this.splitMx2.SplitterPosition = 287;
-            this.splitMx2.TabIndex = 3;
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1340, 287);
-            this.gcMx1.TabIndex = 1;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx1.ColumnPanelRowHeight = 50;
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1fcheckItem,
-            this.gvMx1fcheckTool,
-            this.gvMx1fcheckItemDesc,
-            this.gvMx1fspecRequ,
-            this.gvMx1fupAllow,
-            this.gvMx1fstand,
-            this.gvMx1fdownAllow,
-            this.gvMx1freQty,
-            this.gvMx1checkQyt,
-            this.gvMx1fenterQty,
-            this.gvMx1fcheckResu,
-            this.gvMx1fngRate,
-            this.gvMx1fngQty,
-            this.gvMx1sampleSizeNo,
-            this.gvMx1fcheckLevel,
-            this.gvMx1facLevel,
-            this.gridColumn6,
-            this.gridColumn8});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
-            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
-            // 
-            // gvMx1fcheckItem
-            // 
-            this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
-            this.gvMx1fcheckItem.FieldName = "fcheckItem";
-            this.gvMx1fcheckItem.MinWidth = 50;
-            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
-            this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
-            this.gvMx1fcheckItem.Visible = true;
-            this.gvMx1fcheckItem.VisibleIndex = 0;
-            this.gvMx1fcheckItem.Width = 120;
-            // 
-            // gvMx1fcheckTool
-            // 
-            this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
-            this.gvMx1fcheckTool.FieldName = "fcheckTool";
-            this.gvMx1fcheckTool.MinWidth = 50;
-            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
-            this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
-            this.gvMx1fcheckTool.Visible = true;
-            this.gvMx1fcheckTool.VisibleIndex = 1;
-            this.gvMx1fcheckTool.Width = 100;
-            // 
-            // gvMx1fcheckItemDesc
-            // 
-            this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
-            this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
-            this.gvMx1fcheckItemDesc.MinWidth = 50;
-            this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
-            this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
-            this.gvMx1fcheckItemDesc.Visible = true;
-            this.gvMx1fcheckItemDesc.VisibleIndex = 2;
-            this.gvMx1fcheckItemDesc.Width = 120;
-            // 
-            // gvMx1fspecRequ
-            // 
-            this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
-            this.gvMx1fspecRequ.FieldName = "fspecRequ";
-            this.gvMx1fspecRequ.MinWidth = 50;
-            this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
-            this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
-            this.gvMx1fspecRequ.Visible = true;
-            this.gvMx1fspecRequ.VisibleIndex = 3;
-            this.gvMx1fspecRequ.Width = 120;
-            // 
-            // gvMx1fupAllow
-            // 
-            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fupAllow.Caption = "涓婇檺";
-            this.gvMx1fupAllow.FieldName = "fupAllow";
-            this.gvMx1fupAllow.MinWidth = 50;
-            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
-            this.gvMx1fupAllow.Tag = "query_a.fup_allow";
-            this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 4;
-            this.gvMx1fupAllow.Width = 50;
-            // 
-            // gvMx1fstand
-            // 
-            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fstand.Caption = "鏍囧噯鍊�";
-            this.gvMx1fstand.FieldName = "fstand";
-            this.gvMx1fstand.MinWidth = 50;
-            this.gvMx1fstand.Name = "gvMx1fstand";
-            this.gvMx1fstand.Tag = "query_a.fstand";
-            this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 5;
-            this.gvMx1fstand.Width = 70;
-            // 
-            // gvMx1fdownAllow
-            // 
-            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fdownAllow.Caption = "涓嬮檺";
-            this.gvMx1fdownAllow.FieldName = "fdownAllow";
-            this.gvMx1fdownAllow.MinWidth = 50;
-            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
-            this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
-            this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 6;
-            this.gvMx1fdownAllow.Width = 50;
-            // 
-            // gvMx1freQty
-            // 
-            this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1freQty.Caption = "RE鏁伴噺";
-            this.gvMx1freQty.FieldName = "freQty";
-            this.gvMx1freQty.MinWidth = 50;
-            this.gvMx1freQty.Name = "gvMx1freQty";
-            this.gvMx1freQty.Tag = "query_a.fre_qty";
-            this.gvMx1freQty.Visible = true;
-            this.gvMx1freQty.VisibleIndex = 7;
-            this.gvMx1freQty.Width = 50;
-            // 
-            // gvMx1checkQyt
-            // 
-            this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
-            this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
-            this.gvMx1checkQyt.FieldName = "checkQyt";
-            this.gvMx1checkQyt.MinWidth = 50;
-            this.gvMx1checkQyt.Name = "gvMx1checkQyt";
-            this.gvMx1checkQyt.Tag = "query_a.check_qyt";
-            this.gvMx1checkQyt.Visible = true;
-            this.gvMx1checkQyt.VisibleIndex = 8;
-            this.gvMx1checkQyt.Width = 60;
-            // 
-            // gvMx1fenterQty
-            // 
-            this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
-            this.gvMx1fenterQty.FieldName = "fenterQty";
-            this.gvMx1fenterQty.MinWidth = 60;
-            this.gvMx1fenterQty.Name = "gvMx1fenterQty";
-            this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
-            this.gvMx1fenterQty.Visible = true;
-            this.gvMx1fenterQty.VisibleIndex = 9;
-            this.gvMx1fenterQty.Width = 60;
-            // 
-            // gvMx1fcheckResu
-            // 
-            this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1fcheckResu.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
-            this.gvMx1fcheckResu.FieldName = "fcheckResu";
-            this.gvMx1fcheckResu.MinWidth = 50;
-            this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
-            this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
-            this.gvMx1fcheckResu.Visible = true;
-            this.gvMx1fcheckResu.VisibleIndex = 10;
-            this.gvMx1fcheckResu.Width = 94;
-            // 
-            // gvMx1fngRate
-            // 
-            this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
-            this.gvMx1fngRate.FieldName = "fngRateName";
-            this.gvMx1fngRate.MinWidth = 50;
-            this.gvMx1fngRate.Name = "gvMx1fngRate";
-            this.gvMx1fngRate.Tag = "query_a.fng_rate";
-            this.gvMx1fngRate.Visible = true;
-            this.gvMx1fngRate.VisibleIndex = 11;
-            this.gvMx1fngRate.Width = 94;
-            // 
-            // gvMx1fngQty
-            // 
-            this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
-            this.gvMx1fngQty.FieldName = "fngQty";
-            this.gvMx1fngQty.MinWidth = 50;
-            this.gvMx1fngQty.Name = "gvMx1fngQty";
-            this.gvMx1fngQty.Tag = "query_a.fng_qty";
-            this.gvMx1fngQty.Visible = true;
-            this.gvMx1fngQty.VisibleIndex = 12;
-            this.gvMx1fngQty.Width = 50;
-            // 
-            // gvMx1sampleSizeNo
-            // 
-            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
-            this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
-            this.gvMx1sampleSizeNo.MinWidth = 50;
-            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
-            this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
-            this.gvMx1sampleSizeNo.Visible = true;
-            this.gvMx1sampleSizeNo.VisibleIndex = 13;
-            this.gvMx1sampleSizeNo.Width = 200;
-            // 
-            // gvMx1fcheckLevel
-            // 
-            this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
-            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
-            this.gvMx1fcheckLevel.MinWidth = 50;
-            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
-            this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
-            this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 14;
-            this.gvMx1fcheckLevel.Width = 200;
-            // 
-            // gvMx1facLevel
-            // 
-            this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
-            this.gvMx1facLevel.FieldName = "facLevel";
-            this.gvMx1facLevel.MinWidth = 50;
-            this.gvMx1facLevel.Name = "gvMx1facLevel";
-            this.gvMx1facLevel.Tag = "query_a.fac_level";
-            this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 15;
-            this.gvMx1facLevel.Width = 200;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn6.AppearanceCell.Options.UseForeColor = true;
-            this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn6.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn6.Caption = "缂洪櫡绛夌骇";
-            this.gridColumn6.FieldName = "defectLevel";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 16;
-            this.gridColumn6.Width = 94;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn8.AppearanceCell.Options.UseForeColor = true;
-            this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn8.Caption = "缂洪櫡鎻忚堪";
-            this.gridColumn8.FieldName = "defectDetails";
-            this.gridColumn8.MinWidth = 25;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 17;
-            this.gridColumn8.Width = 94;
-            // 
-            // splitYangLi
-            // 
-            this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitYangLi.Location = new System.Drawing.Point(0, 0);
-            this.splitYangLi.Name = "splitYangLi";
-            // 
-            // splitYangLi.Panel1
-            // 
-            this.splitYangLi.Panel1.Controls.Add(this.groupControl1);
-            this.splitYangLi.Panel1.Text = "Panel1";
-            // 
-            // splitYangLi.Panel2
-            // 
-            this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
-            this.splitYangLi.Panel2.Text = "Panel2";
-            this.splitYangLi.Size = new System.Drawing.Size(1340, 77);
-            this.splitYangLi.SplitterPosition = 676;
-            this.splitYangLi.TabIndex = 4;
-            // 
-            // groupControl1
-            // 
-            this.groupControl1.Controls.Add(this.gcMx2);
-            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, 77);
-            this.groupControl1.TabIndex = 3;
-            this.groupControl1.Text = "妫�娴嬬粨鏋�";
-            // 
-            // gcMx2
-            // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            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, 47);
-            this.gcMx2.TabIndex = 0;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Appearance.Row.Options.UseFont = true;
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn4,
-            this.gridColumn3,
-            this.gridColumn2,
-            this.gridColumn20,
-            this.gridColumn21,
-            this.gridColumn25});
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn4.FieldName = "guid";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.OptionsColumn.ReadOnly = true;
-            this.gridColumn4.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "椤圭洰";
-            this.gridColumn3.FieldName = "fcheckItem";
-            this.gridColumn3.MaxWidth = 192;
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.OptionsColumn.ReadOnly = true;
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 0;
-            this.gridColumn3.Width = 192;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "鎶芥缁撴灉";
-            this.gridColumn2.FieldName = "fcheckResu";
-            this.gridColumn2.MaxWidth = 80;
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.OptionsColumn.ReadOnly = true;
-            this.gridColumn2.Width = 80;
-            // 
-            // gridColumn20
-            // 
-            this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
-            this.gridColumn20.FieldName = "fstand";
-            this.gridColumn20.MinWidth = 25;
-            this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 1;
-            this.gridColumn20.Width = 94;
-            // 
-            // gridColumn21
-            // 
-            this.gridColumn21.Caption = "鎿嶄綔浜�";
-            this.gridColumn21.FieldName = "createBy";
-            this.gridColumn21.MinWidth = 25;
-            this.gridColumn21.Name = "gridColumn21";
-            this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 2;
-            this.gridColumn21.Width = 94;
-            // 
-            // gridColumn25
-            // 
-            this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
-            this.gridColumn25.FieldName = "createDate";
-            this.gridColumn25.MinWidth = 25;
-            this.gridColumn25.Name = "gridColumn25";
-            this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 3;
-            this.gridColumn25.Width = 94;
-            // 
-            // groupControl2
-            // 
-            this.groupControl2.Controls.Add(this.gcMx3);
-            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, 77);
-            this.groupControl2.TabIndex = 4;
-            this.groupControl2.Text = "鏍锋湰缁撴灉";
-            // 
-            // gcMx3
-            // 
-            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            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, 47);
-            this.gcMx3.TabIndex = 0;
-            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx3});
-            // 
-            // gvMx3
-            // 
-            this.gvMx3.Appearance.Row.Options.UseFont = true;
-            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn1,
-            this.gridColumn22,
-            this.gridColumn28,
-            this.gridColumn29,
-            this.gridColumn24,
-            this.gridColumn26,
-            this.gridColumn27});
-            this.gvMx3.GridControl = this.gcMx3;
-            this.gvMx3.Name = "gvMx3";
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn1.FieldName = "guid";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.OptionsColumn.ReadOnly = true;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn22
-            // 
-            this.gridColumn22.Caption = "椤圭洰";
-            this.gridColumn22.FieldName = "fcheckItemd5";
-            this.gridColumn22.MaxWidth = 192;
-            this.gridColumn22.MinWidth = 25;
-            this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.OptionsColumn.ReadOnly = true;
-            this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 0;
-            this.gridColumn22.Width = 192;
-            // 
-            // gridColumn28
-            // 
-            this.gridColumn28.Caption = "鏍锋湰搴�";
-            this.gridColumn28.FieldName = "fcheckItem";
-            this.gridColumn28.MinWidth = 25;
-            this.gridColumn28.Name = "gridColumn28";
-            this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 1;
-            this.gridColumn28.Width = 94;
-            // 
-            // gridColumn29
-            // 
-            this.gridColumn29.Caption = "鏍锋湰鍊�";
-            this.gridColumn29.FieldName = "fcheckResu";
-            this.gridColumn29.MinWidth = 25;
-            this.gridColumn29.Name = "gridColumn29";
-            this.gridColumn29.Visible = true;
-            this.gridColumn29.VisibleIndex = 2;
-            this.gridColumn29.Width = 94;
-            // 
-            // gridColumn24
-            // 
-            this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
-            this.gridColumn24.FieldName = "fstand";
-            this.gridColumn24.MinWidth = 25;
-            this.gridColumn24.Name = "gridColumn24";
-            this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 3;
-            this.gridColumn24.Width = 94;
-            // 
-            // gridColumn26
-            // 
-            this.gridColumn26.Caption = "鎿嶄綔浜�";
-            this.gridColumn26.FieldName = "createBy";
-            this.gridColumn26.MinWidth = 25;
-            this.gridColumn26.Name = "gridColumn26";
-            this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 4;
-            this.gridColumn26.Width = 94;
-            // 
-            // gridColumn27
-            // 
-            this.gridColumn27.Caption = "鎿嶄綔鏃堕棿";
-            this.gridColumn27.FieldName = "createDate";
-            this.gridColumn27.MinWidth = 25;
-            this.gridColumn27.Name = "gridColumn27";
-            this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 5;
-            this.gridColumn27.Width = 94;
-            // 
-            // tabMxPage2
-            // 
-            this.tabMxPage2.Controls.Add(this.ucChouJianList1);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1340, 376);
-            this.tabMxPage2.Text = "浜у搧鏉$爜鏄庣粏";
-            // 
-            // ucChouJianList1
-            // 
-            this.ucChouJianList1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ucChouJianList1.Location = new System.Drawing.Point(0, 0);
-            this.ucChouJianList1.Name = "ucChouJianList1";
-            this.ucChouJianList1.pGuid = null;
-            this.ucChouJianList1.Size = new System.Drawing.Size(1340, 376);
-            this.ucChouJianList1.TabIndex = 0;
-            // 
-            // tabMxPage3
-            // 
-            this.tabMxPage3.Controls.Add(this.ucUpFileList1);
-            this.tabMxPage3.Name = "tabMxPage3";
-            this.tabMxPage3.Size = new System.Drawing.Size(1340, 376);
-            this.tabMxPage3.Text = "闄勪欢淇℃伅";
-            // 
-            // ucUpFileList1
-            // 
-            this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
-            this.ucUpFileList1.Name = "ucUpFileList1";
-            this.ucUpFileList1.parentGroup = null;
-            this.ucUpFileList1.pGuid = null;
-            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 376);
-            this.ucUpFileList1.TabIndex = 0;
-            // 
-            // repositoryItemComboBox2
-            // 
-            this.repositoryItemComboBox2.AutoHeight = false;
-            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox2.Items.AddRange(new object[] {
-            "鈭�",
-            "脳"});
-            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
-            // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(921, 42);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 6;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
-            // 
-            // gridView2
-            // 
-            this.gridView2.Name = "gridView2";
-            // 
-            // gridView3
-            // 
-            this.gridView3.Name = "gridView3";
-            // 
-            // gridView4
-            // 
-            this.gridView4.Name = "gridView4";
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_fngHandle;
-            this.layoutControlItem11.CustomizationFormText = "澶勭疆缁撴灉";
-            this.layoutControlItem11.Location = new System.Drawing.Point(990, 84);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
-            this.layoutControlItem11.Text = "澶勭疆缁撴灉";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem35
-            // 
-            this.layoutControlItem35.Control = this.txt_zrType;
-            this.layoutControlItem35.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem35.CustomizationFormText = "璐d换鍒ゅ畾";
-            this.layoutControlItem35.Location = new System.Drawing.Point(990, 112);
-            this.layoutControlItem35.Name = "layoutControlItem35";
-            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem35.Size = new System.Drawing.Size(332, 28);
-            this.layoutControlItem35.Text = "鍒ゅ畾璐d换";
-            this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_fzrId;
-            this.layoutControlItem25.Location = new System.Drawing.Point(990, 140);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem25.Size = new System.Drawing.Size(332, 28);
-            this.layoutControlItem25.Text = "璐d换浜�";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_workNo;
-            this.layoutControlItem29.Location = new System.Drawing.Point(990, 168);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem29.Size = new System.Drawing.Size(332, 28);
-            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.txt_fmrmode;
-            this.layoutControlItem26.Location = new System.Drawing.Point(990, 196);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem26.Size = new System.Drawing.Size(332, 28);
-            this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // Frm_FqcDetect01Check
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1344, 800);
-            this.Controls.Add(this.picCheckBox);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_FqcDetect01Check";
-            this.Text = "fqc瀹℃牳";
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
-            this.split1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
-            this.split1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            this.xtraTabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
-            this.splitMx1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
-            this.splitMx1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
-            this.splitMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
-            this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
-            ((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_workNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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.xtraTabControl2)).EndInit();
-            this.xtraTabControl2.ResumeLayout(false);
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel1)).EndInit();
-            this.splitMx2.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel2)).EndInit();
-            this.splitMx2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2)).EndInit();
-            this.splitMx2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).EndInit();
-            this.splitYangLi.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).EndInit();
-            this.splitYangLi.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).EndInit();
-            this.splitYangLi.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
-            this.groupControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).EndInit();
-            this.groupControl2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
-            this.tabMxPage2.ResumeLayout(false);
-            this.tabMxPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-        #endregion
-        private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private System.Windows.Forms.PictureBox picCheckBox;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraEditors.SplitContainerControl split1;
-        private DevExpress.XtraGrid.GridControl gcMain1;
-        private UserControls.Data.UcPageBar pageBar1;
-        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;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
-        private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
-        private DevExpress.XtraEditors.TextEdit txt_remarks;
-        private DevExpress.XtraEditors.TextEdit txt_itemNo;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_lotNo1;
-        private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
-        private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
-        private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
-        private DevExpress.XtraEditors.TextEdit txt_releaseNo;
-        private DevExpress.XtraLayout.LayoutControl layoutMx1;
-        private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.TextEdit txt_itemModel;
-        private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
-        private DevExpress.XtraEditors.TextEdit txt_fsubmitDate;
-        private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraEditors.SplitContainerControl splitMx2;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItemDesc;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fspecRequ;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1freQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkQyt;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fenterQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckResu;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngRate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
-        private DevExpress.XtraEditors.GroupControl groupControl1;
-        private DevExpress.XtraGrid.GridControl gcMx2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage3;
-        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.XtraGrid.Columns.GridColumn gridColumn20;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraEditors.SplitContainerControl splitYangLi;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
-        private DevExpress.XtraEditors.GroupControl groupControl2;
-        private DevExpress.XtraGrid.GridControl gcMx3;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
-        private DevExpress.XtraEditors.TextEdit txt_guid;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
-        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.UcLookGx txt_fmrmode;
-        private UserControl.UcDictionary txt_msg;
-        private DevExpress.XtraEditors.TextEdit txt_lotNo;
-        private DevExpress.XtraEditors.TextEdit txt_workNo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
-        private DevExpress.XtraEditors.TextEdit txt_checkStates;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
-        private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_itemName;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private UserControl.UCUpFileList ucUpFileList1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraEditors.TextEdit txt_lineId;
-        private DevExpress.XtraEditors.TextEdit txt_itemId;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraEditors.TextEdit txt_suppId;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_zrType;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraEditors.TextEdit txt_kbSl;
-        private DevExpress.XtraLayout.LayoutControlItem txt_itemId11111;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private UcChouJianList ucChouJianList1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
deleted file mode 100644
index 77346fb..0000000
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ /dev/null
@@ -1,591 +0,0 @@
-锘縰sing Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.FQC
-{
-    public partial class Frm_FqcDetect01Check : DevExpress.XtraEditors.XtraForm
-    {
-        string _webServiceName = "FqcManager/";
-        List<FilterEntity> _filterList = new List<FilterEntity>();
-        public Frm_FqcDetect01Check()
-        {
-            InitializeComponent();
-            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
-            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
-            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
-            this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnZhiLiangChkClick;
-            this.toolBarMenu1.getXmlConfig();
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            }, tips);
-            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
-            {
-                getModel(value, "0");
-            }, (value) =>
-            {
-                getPageList(this.pageBar1.CurrentPage);
-            }, lbGuid);
-            getPageList(1);
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
-            xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
-            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-        }
-
-        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
-            Task.Delay(100);
-            getPageList(1);
-        }
-        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
-        {
-            if (e.FocusedRowHandle >= 0)
-            {
-                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
-                string rowGuid = row["guid"].ToString();
-                if (string.IsNullOrEmpty(rowGuid))
-                    return;
-                getList12(rowGuid);
-            }
-        }
-        /// <summary>
-        ///  閲嶆柊鍔犺浇妫�楠�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnLoad_Click(object sender, EventArgs e)
-        {
-            if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛岃鎿嶄綔灏嗕細娓呯┖涔嬪墠鐨勬楠岃褰曪紵"))
-                return;
-            string strGuid = lbGuid.Text.Trim();
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            var _obj = new
-            {
-                guid = strGuid,
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/ReloadModel5", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    getModel(lbGuid.Text.Trim(), "0");
-                }
-                else
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 鍒嗛〉浜嬩欢
-        /// </summary>
-        /// <param name="curPage"></param>
-        /// <param name="pageSize"></param>
-        private void PageBar1_PagerEvent(int curPage, int pageSize)
-        {
-            getPageList(curPage);
-        }
-        /// <summary>
-        /// 鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            gridView1.ActiveFilter.Clear();
-            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
-        }
-        /// <summary>
-        /// 鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1);
-        }
-        /// <summary>
-        /// 鏃ュ織浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-        }
-        /// <summary>
-        /// 璐ㄩ噺瀹℃牳
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnZhiLiangChkClick(object sender, EventArgs e)
-        {
-            _toolCk(1);
-        }
-        /// <summary>
-        /// 鍙栨秷浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
-        {
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
-        }
-
-        /// <summary>
-        /// 鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim(), "0");
-            else
-            {
-                //_filterList.Clear();
-                //if (gridView1.ActiveFilter.Count > 0)
-                //{
-                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                //    gridView1.ActiveFilter.Clear();
-                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                //}
-                //getPageList(1);
-                getPageList(this.pageBar1.CurrentPage);
-            }
-        }
-
-        /// <summary>
-        /// 淇敼浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.currentAction = "edit";
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-            {
-                getModel(rowGuid, "0");
-            }
-            else
-            {
-                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                gvList.Add(gvMx1);
-                gvList.Add(gvMx2);
-                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
-                this.setEable(true);
-            }
-        }
-
-        /// <summary>
-        /// 淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.isSetBtn = false;
-            string _freceQty = txt_freceQty.Text.Trim();
-            string _txt_fngHandle = txt_fngHandle.Text.Trim();
-            string _txt_fmrmode = txt_fmrmode.GetCode();
-            string _txt_fzrId = txt_fzrId.GetId();
-            string _txt_workNo = txt_workNo.Text.Trim();
-            string _txt_msg = txt_msg.TextTxt;
-            string _txt_zrType = txt_zrType.Text.Trim();
-            if (txt_freceQty.SelectedIndex <= 0)
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
-                txt_freceQty.Focus();
-                return;
-            }
-            //褰撲负涓嶅悎鏍兼椂锛岃閫夋嫨澶勭疆缁撴灉
-            if (txt_freceQty.SelectedIndex != 1)
-            {
-                if (txt_fngHandle.SelectedIndex <= 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭疆缁撴灉锛�");
-                    txt_fngHandle.Focus();
-                    return;
-                }
-                if (_txt_fzrId.Length <= 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐d换浜猴紒");
-                    txt_fzrId.Focus();
-                    return;
-                }
-
-                if (txt_zrType.SelectedIndex <= 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐d换鍒ゅ畾锛�");
-                    txt_zrType.Focus();
-                    return;
-                }
-
-                //褰撳缃粨鏋滀负鍙嶅伐鏃讹紝瑕侀�夋嫨宸ュ簭鍜屽弽宸ョ紪鍙�
-                if (txt_fngHandle.SelectedIndex == 1)
-                {
-                    if (string.IsNullOrEmpty(_txt_workNo))
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰~鍐欏弽宸ュ崟鍙凤紒");
-                        txt_workNo.Focus();
-                        return;
-                    }
-                    if (string.IsNullOrEmpty(_txt_fmrmode))
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰~閫夋嫨鍙嶅伐宸ュ簭锛�");
-                        txt_fmrmode.Focus();
-                        return;
-                    }
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(_txt_workNo))
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕佸~鍐欏弽宸ュ崟鍙凤紒");
-                        txt_workNo.Focus();
-                        return;
-                    }
-                    if (!string.IsNullOrEmpty(_txt_fmrmode))
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕侀�夋嫨鍙嶅伐宸ュ簭锛�");
-                        txt_fmrmode.Focus();
-                        return;
-                    }
-                }
-            }
-            //褰撲负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜�
-            else
-            {
-                if ((_txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0 || txt_zrType.SelectedIndex > 0 || txt_fngHandle.SelectedIndex > 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒");
-                    txt_freceQty.Focus();
-                    return;
-                }
-            }
-
-            var _obj = new
-            {
-                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                freceQty = _freceQty,
-                fngHandle = _txt_fngHandle,
-                fzrId = _txt_fzrId,
-                workNo = _txt_workNo,
-                fmrmode = _txt_fmrmode,
-                msg = _txt_msg,
-                zrType = _txt_zrType,
-                edtType = 1
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    lbGuid.Text = _rtn.rtnData.outGuid;
-                    toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
-                    this.setEable(false);
-                    toolBarMenu1.currentAction = "";
-                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage)
-        {
-            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            _sbSqlWhere += " and isnull(fsubmit,0)=1";
-            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
-            string json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
-                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain1.BindingContext = new BindingContext();
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain1.DataSource = dt;
-                        gcMain1.ForceInitialize();
-                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        private void getModel(string strGuid, string guid5)
-        {
-            bool isEdit = false;
-            if (toolBarMenu1.currentAction == "add") return;
-            if (toolBarMenu1.currentAction == "edit") isEdit = true;
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            var _obj = new
-            {
-                guid = strGuid,//涓诲缓
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    dynamic dy = _rtn.rtnData;
-                    lbGuid.Text = strGuid;
-                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                    gvList.Add(gvMx1);
-                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-                    setEable(isEdit);
-                    JObject _job = JObject.Parse(strJson);
-                    JArray array = new JArray();
-                    foreach (var a in _job["rtnData"]["list5"])
-                    {
-                        array.Add(a);
-                    }
-                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMx1.DataSource = null;
-                        gcMx1.BindingContext = new BindingContext();
-                        gcMx1.DataSource = dt;
-                        gcMx1.ForceInitialize();
-                        gvMx1.BestFitColumns();
-                        ucUpFileList1.pGuid = lbGuid.Text.Trim();
-                        ucChouJianList1.pGuid = lbGuid.Text.Trim();
-                        if (guid5.Length > 10)
-                        {
-                            int rowHandle = 0;
-                            rowHandle = gvMx1.LocateByValue(1, gvMx1.Columns["guid"], guid5);
-                            if (rowHandle < 0)
-                                rowHandle = 0;
-                            gvMx1.FocusedRowHandle = rowHandle + 1;
-                        }
-                    }
-                    else
-                    {
-                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-                    }
-                }
-                else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 閫夐」鍗″垏鎹�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
-        {
-            if (e.Page.Name == "tabMxPage2")
-            {
-                ucChouJianList1.getList14();
-
-            }
-            if (e.Page.Name == "tabMxPage3")
-            {
-                ucUpFileList1.getFileList();
-            }
-        }
-        /// <summary>
-        /// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋� 
-        /// </summary>
-        /// <param name="guid5"></param>
-        private void getList12(string guid5)
-        {
-            var _obj = new
-            {
-                parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                guid = UtilityHelper.ToGuid(guid5), //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
-                JObject _job = JObject.Parse(strJson);
-                JArray array = new JArray();
-                foreach (var a in _job["rtnData"]["list"])
-                {
-                    array.Add(a);
-                }
-                DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-                gcMx2.BindingContext = new BindingContext();
-                gcMx2.DataSource = dt;
-                gcMx2.ForceInitialize();
-                gvMx2.BestFitColumns();
-                JArray array1 = new JArray();
-                foreach (var a in _job["rtnData"]["list2"])
-                {
-                    array1.Add(a);
-                }
-                DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
-                gcMx3.BindingContext = new BindingContext();
-                gcMx3.DataSource = dt1;
-                gcMx3.ForceInitialize();
-                gvMx3.BestFitColumns();
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        private void setEable(bool bl)
-        {
-            //txtJianYan.ReadOnly = !bl;
-            //btnLoad.Enabled = bl;
-            //btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
-        }
-
-        /// <summary>
-        /// 宸ュ叿鏉′簨浠�
-        /// </summary>
-        /// <param name="inFieldValue"></param>
-        private void _toolCk(int _inFieldValue)
-        {
-            string strMsg = "";
-            switch (_inFieldValue)
-            {
-                case 1:
-                    strMsg = "瀹℃牳";
-                    break;
-            };
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
-                return;
-            if (_inFieldValue == 1)
-            {
-                if (txt_fcheckResu.Text == "涓嶅悎鏍�")
-                {
-                    //if (txt_fngHandle.Text.Trim().Length == 0)
-                    //{
-                    //    MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃惰閫夋嫨澶勭悊鏂瑰紡锛�");
-                    //    return;
-                    //}
-                }
-            }
-            var _obj = new
-            {
-                guid = rowGuid,
-                inFieldValue = _inFieldValue,
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "EditModelSubmitZhiLiang",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
-                {
-                    if (_inFieldValue >= 0)
-                    {
-                        if (xtraTabControl1.SelectedTabPageIndex == 1)
-                        {
-                            getModel(lbGuid.Text.Trim(), "0");
-                        }
-                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
-                        gridView1.FocusedRowHandle = rowHandle;
-                        UtilityHelper.SetCheckIco(gridView1, "modifyFlagTxt", "modify1By", "modify1Date", picCheckBox, this, _inFieldValue.ToString());
-                    }
-                    else
-                    {
-                        //if (xtraTabControl1.SelectedTabPageIndex == 1)
-                        //    getModel(lbGuid.Text.Trim());
-                        //else
-                        //    getPageList(this.pageBar1.CurrentPage);
-                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
-                        getPageList(this.pageBar1.CurrentPage);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.resx
deleted file mode 100644
index 5160e8b..0000000
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
index c066b5e..46a0963 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
@@ -5,7 +5,9 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
+using System.Net;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -21,6 +23,7 @@
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -42,6 +45,7 @@
             gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
             btnIpt.Click += BtnIpt_Click;
         }
+
 
         /// <summary>
         /// 鎵归噺褰曞叆
@@ -120,7 +124,62 @@
                 lbGuid, txt_releaseNo, gridView1);
             toolBarMenu1.guidKey = rowGuid;
         }
-
+        /// <summary>
+        /// 瀵煎嚭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_releaseNo, gridView1, "releaseNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾瀵煎嚭鍚楋紵"))
+                return;
+            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+            {
+                folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+                if (dialogResult == DialogResult.OK)
+                {
+                    string _folder = folderBrowserDialog.SelectedPath;
+                    var _obj = new
+                    {
+                        guid = rowGuid,
+                    };
+                    try
+                    {
+                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutShouJian", JsonConvert.SerializeObject(_obj));
+                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                        if (_rtn.rtnCode > 0)
+                        {
+                            string _file = _rtn.rtnData.fileUrl.ToString();
+                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
+                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+                            using (WebClient client = new WebClient())
+                            {
+                                client.DownloadFile(_url, _folderName);
+                            }
+                            ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+                        }
+                        else
+                        {
+                            ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                    }
+                }
+            }
+        }
         /// <summary>
         /// 鍒锋柊浜嬩欢
         /// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.Designer.cs
similarity index 94%
rename from DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.Designer.cs
index 5ee8abd..5183b48 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.Designer.cs
@@ -1,6 +1,6 @@
 锘縩amespace Gs.DevApp.DevFrm.QC
 {
-    partial class DefectCodeFqc
+    partial class DefectCodeDaa
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("FQC淇℃伅");
+            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("宸ュ崟鍩虹璧勬枡");
             this.SuspendLayout();
             // 
             // defectCode1
@@ -46,7 +46,7 @@
             this.ClientSize = new System.Drawing.Size(1001, 568);
             this.Controls.Add(this.defectCode1);
             this.Name = "DefectCodeDic";
-            this.Text = "瀛楀吀-FQC淇℃伅";
+            this.Text = "瀛楀吀-浠撳簱鍩虹璧勬枡";
             this.ResumeLayout(false);
 
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.cs
similarity index 78%
rename from DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.cs
rename to DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.cs
index 2bef61b..39beeb0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDaa.cs
@@ -11,9 +11,9 @@
 
 namespace Gs.DevApp.DevFrm.QC
 {
-    public partial class DefectCodeDic : DevExpress.XtraEditors.XtraForm
+    public partial class DefectCodeDaa : DevExpress.XtraEditors.XtraForm
     {
-        public DefectCodeDic()
+        public DefectCodeDaa()
         {
             InitializeComponent();
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs
deleted file mode 100644
index 92c6049..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.QC
-{
-    partial class DefectCodeDic
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("鏅�氫俊鎭�");
-            this.SuspendLayout();
-            // 
-            // defectCode1
-            // 
-            this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.defectCode1.Location = new System.Drawing.Point(0, 0);
-            this.defectCode1.Name = "defectCode1";
-            this.defectCode1.Size = new System.Drawing.Size(1001, 568);
-            this.defectCode1.TabIndex = 0;
-            // 
-            // DefectCodeDic
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1001, 568);
-            this.Controls.Add(this.defectCode1);
-            this.Name = "DefectCodeDic";
-            this.Text = "瀛楀吀-鏅�氫俊鎭�";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DefectCode defectCode1;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.cs
deleted file mode 100644
index cbf3c9c..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.QC
-{
-    public partial class DefectCodeFqc : DevExpress.XtraEditors.XtraForm
-    {
-        public DefectCodeFqc()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs
deleted file mode 100644
index be2074d..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.QC
-{
-    partial class DefectCodeRenZheng
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("璁よ瘉淇℃伅");
-            this.SuspendLayout();
-         
-            // 
-            // defectCode1
-            // 
-            this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.defectCode1.Location = new System.Drawing.Point(0, 0);
-            this.defectCode1.Name = "defectCode1";
-            this.defectCode1.Size = new System.Drawing.Size(1001, 568);
-            this.defectCode1.TabIndex = 0;
-            // 
-            // DefectCodeRenZheng
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1001, 568);
-            this.Controls.Add(this.defectCode1);
-            this.Name = "DefectCodeRenZheng";
-            this.Text = "瀛楀吀-璁よ瘉淇℃伅";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DefectCode defectCode1;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.cs
deleted file mode 100644
index bf08f8a..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.QC
-{
-    public partial class DefectCodeRenZheng : DevExpress.XtraEditors.XtraForm
-    {
-        public DefectCodeRenZheng()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.resx b/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
deleted file mode 100644
index 0c6f6e2..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
-{
-    partial class Frm_MesDefectCode 
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.tlMenu = new DevExpress.XtraTreeList.TreeList();
-            this.tlcModuleID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            this.tl8 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            this.tl9 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItemEdt = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItemRoot = new System.Windows.Forms.ToolStripMenuItem();
-            this.treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
-            this.split1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
-            this.split1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
-            this.cms1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = null;
-            this.toolBarMenu1.currentAction = null;
-            this.toolBarMenu1.defaultActions = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // split1
-            // 
-            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
-            this.split1.Horizontal = false;
-            this.split1.Location = new System.Drawing.Point(0, 0);
-            this.split1.Name = "split1";
-            // 
-            // split1.Panel1
-            // 
-            this.split1.Panel1.Controls.Add(this.tlMenu);
-            this.split1.Panel1.Text = "Panel1";
-            // 
-            // split1.Panel2
-            // 
-            this.split1.Panel2.Text = "Panel2";
-            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 0;
-            this.split1.TabIndex = 0;
-            // 
-            // tlMenu
-            // 
-            this.tlMenu.Appearance.Row.Options.UseFont = true;
-            this.tlMenu.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
-            this.tlcModuleID,
-            this.tlcMenuCaption,
-            this.tlcMenuName,
-            this.tlcActions,
-            this.tl8,
-            this.tl9,
-            this.treeListColumn1});
-            this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
-            this.tlMenu.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tlMenu.Location = new System.Drawing.Point(0, 0);
-            this.tlMenu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.tlMenu.MinWidth = 23;
-            this.tlMenu.Name = "tlMenu";
-            this.tlMenu.OptionsBehavior.Editable = false;
-            this.tlMenu.OptionsFind.AlwaysVisible = true;
-            this.tlMenu.OptionsMenu.EnableColumnMenu = false;
-            this.tlMenu.OptionsMenu.EnableFooterMenu = false;
-            this.tlMenu.OptionsMenu.EnableNodeMenu = false;
-            this.tlMenu.OptionsMenu.ShowAddNodeItems = DevExpress.Utils.DefaultBoolean.False;
-            this.tlMenu.OptionsMenu.ShowAutoFilterRowItem = false;
-            this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
-            this.tlMenu.Size = new System.Drawing.Size(1126, 558);
-            this.tlMenu.TabIndex = 3;
-            this.tlMenu.TreeLevelWidth = 21;
-            // 
-            // tlcModuleID
-            // 
-            this.tlcModuleID.Caption = "guid";
-            this.tlcModuleID.FieldName = "guid";
-            this.tlcModuleID.MinWidth = 23;
-            this.tlcModuleID.Name = "tlcModuleID";
-            this.tlcModuleID.Visible = true;
-            this.tlcModuleID.VisibleIndex = 0;
-            this.tlcModuleID.Width = 103;
-            // 
-            // tlcMenuCaption
-            // 
-            this.tlcMenuCaption.Caption = "瀛楀吀缂栧彿";
-            this.tlcMenuCaption.FieldName = "defectCode";
-            this.tlcMenuCaption.MinWidth = 23;
-            this.tlcMenuCaption.Name = "tlcMenuCaption";
-            this.tlcMenuCaption.Visible = true;
-            this.tlcMenuCaption.VisibleIndex = 1;
-            this.tlcMenuCaption.Width = 139;
-            // 
-            // tlcMenuName
-            // 
-            this.tlcMenuName.Caption = "瀛楀吀鍚嶇О鍊�";
-            this.tlcMenuName.FieldName = "defectName";
-            this.tlcMenuName.MinWidth = 38;
-            this.tlcMenuName.Name = "tlcMenuName";
-            this.tlcMenuName.Visible = true;
-            this.tlcMenuName.VisibleIndex = 2;
-            this.tlcMenuName.Width = 215;
-            // 
-            // tlcActions
-            // 
-            this.tlcActions.Caption = "瀛楀吀鍒嗙粍";
-            this.tlcActions.FieldName = "sType";
-            this.tlcActions.MinWidth = 23;
-            this.tlcActions.Name = "tlcActions";
-            this.tlcActions.Visible = true;
-            this.tlcActions.VisibleIndex = 3;
-            this.tlcActions.Width = 50;
-            // 
-            // tl8
-            // 
-            this.tl8.Caption = "鏈�鍚庢洿鏂颁汉";
-            this.tl8.FieldName = "lastupdateBy";
-            this.tl8.Name = "tl8";
-            this.tl8.Visible = true;
-            this.tl8.VisibleIndex = 5;
-            // 
-            // tl9
-            // 
-            this.tl9.Caption = "鏈�鍚庢洿鏂版椂闂�";
-            this.tl9.FieldName = "lastupdateDate";
-            this.tl9.Name = "tl9";
-            this.tl9.Visible = true;
-            this.tl9.VisibleIndex = 6;
-            // 
-            // cms1
-            // 
-            this.cms1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.cms1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripMenuItemAdd,
-            this.toolStripMenuItemEdt,
-            this.toolStripMenuItemDel,
-            this.toolStripMenuItemRoot});
-            this.cms1.Name = "contextMenuStrip1";
-            this.cms1.Size = new System.Drawing.Size(143, 108);
-            // 
-            // toolStripMenuItemAdd
-            // 
-            this.toolStripMenuItemAdd.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16;
-            this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd";
-            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(142, 26);
-            this.toolStripMenuItemAdd.Text = "澧炲姞瀛愰」";
-            // 
-            // toolStripMenuItemEdt
-            // 
-            this.toolStripMenuItemEdt.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_trackchanges_16x16;
-            this.toolStripMenuItemEdt.Name = "toolStripMenuItemEdt";
-            this.toolStripMenuItemEdt.Size = new System.Drawing.Size(142, 26);
-            this.toolStripMenuItemEdt.Text = "缂栬緫璇ラ」";
-            // 
-            // toolStripMenuItemDel
-            // 
-            this.toolStripMenuItemDel.Image = global::Gs.DevApp.Properties.Resources.deletelist2_16x16;
-            this.toolStripMenuItemDel.Name = "toolStripMenuItemDel";
-            this.toolStripMenuItemDel.Size = new System.Drawing.Size(142, 26);
-            this.toolStripMenuItemDel.Text = "鍒犻櫎璇ラ」";
-            // 
-            // toolStripMenuItemRoot
-            // 
-            this.toolStripMenuItemRoot.Image = global::Gs.DevApp.Properties.Resources.trackingchanges_allmarkup_16x16;
-            this.toolStripMenuItemRoot.Name = "toolStripMenuItemRoot";
-            this.toolStripMenuItemRoot.Size = new System.Drawing.Size(142, 26);
-            this.toolStripMenuItemRoot.Text = "澧炲姞涓婚」";
-            // 
-            // treeListColumn1
-            // 
-            this.treeListColumn1.Caption = "鍙敤鏍囪瘑";
-            this.treeListColumn1.FieldName = "type1";
-            this.treeListColumn1.Name = "treeListColumn1";
-            this.treeListColumn1.Visible = true;
-            this.treeListColumn1.VisibleIndex = 4;
-            // 
-            // Frm_MesDefectCode
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesDefectCode";
-            this.Text = "瀛楀吀閰嶇疆";
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
-            this.split1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
-            this.split1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
-            this.cms1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-        #endregion
-      private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraEditors.SplitContainerControl split1;
-        private DevExpress.XtraTreeList.TreeList tlMenu;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn tlcModuleID;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuName;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
-        private System.Windows.Forms.ContextMenuStrip cms1;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemEdt;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn tl8;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn tl9;
-        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemRoot;
-        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
deleted file mode 100644
index 715938c..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-using DevExpress.XtraTreeList;
-using DevExpress.XtraTreeList.Nodes;
-using Gs.DevApp.DevFrm.QC;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm
-{
-    public partial class Frm_MesDefectCode : DevExpress.XtraEditors.XtraForm
-    {
-        string _webServiceName = "MesDefectCodeManager/";
-        List<FilterEntity> _filterList = new List<FilterEntity>();
-        public Frm_MesDefectCode()
-        {
-            InitializeComponent();
-            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            this.toolBarMenu1.getXmlConfig();
-            tlMenu.IndicatorWidth = 50;
-            tlMenu.CustomDrawNodeIndicator += (s, ee) =>
-            {
-                if (ee.IsNodeIndicator)
-                {
-                    var index = ee.Node.TreeList.GetVisibleIndexByNode(ee.Node);
-                    ee.Info.DisplayText = (index + 1).ToString();
-                }
-            };
-            getPageList(1);
-            this.tlMenu.MouseDown += TlMenu_MouseDown;
-            this.toolStripMenuItemAdd.Click += (s, ee) =>
-            {
-                string strGuid = "";
-                string strUpGuid = "";
-                if (tlMenu.FocusedNode != null)
-                {
-                    strUpGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
-                }
-                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid,strType);
-                frm.UpdateParent += (s2, ee2) =>
-                {
-                    getPageList(1);
-                };
-                frm.ShowDialog();
-            };
-            this.toolStripMenuItemRoot.Click += (s, ee) =>
-            {
-                string strGuid = "";
-                string strUpGuid = "";
-                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
-                frm.UpdateParent += (s2, ee2) =>
-                {
-                    getPageList(1);
-                };
-                frm.ShowDialog();
-            };
-            this.toolStripMenuItemDel.Click += (s, ee) =>
-            {
-                if (tlMenu.FocusedNode != null)
-                {
-                    string rowGuid = "";
-                    string rowName = "";
-                    rowGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
-                    rowName = tlMenu.FocusedNode.GetValue("defectName").ToString();
-                    if (string.IsNullOrEmpty(rowGuid))
-                    {
-                        ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                        return;
-                    }
-                    if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
-                        return;
-                    List<dynamic> lst = new List<dynamic>();
-                    lst.Add(rowGuid);
-                    var _obj = lst;
-                    try
-                    {
-                        string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
-                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                        if (_rtn.rtnCode > 0)
-                        {
-                            tlMenu.DeleteNode(tlMenu.FocusedNode);
-                        }
-                        else
-                            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                    }
-                    catch (Exception ex)
-                    {
-                        ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                    }
-                }
-            };
-            this.toolStripMenuItemEdt.Click += (s, ee) =>
-            {
-                string strGuid = "";
-                string strUpGuid = "";
-                if (tlMenu.FocusedNode != null)
-                {
-                    strGuid = tlMenu.FocusedNode.GetValue("guid").ToString();
-                    strUpGuid = tlMenu.FocusedNode.GetValue("pid").ToString();
-                }
-                Frm_MesDefectCodeShow frm = new Frm_MesDefectCodeShow(strGuid, strUpGuid, strType);
-                frm.UpdateParent += (s2, ee2) =>
-                {
-                    getPageList(1);
-                };
-                frm.ShowDialog();
-            };
-        }
-        /// <summary>
-        /// 鍙抽敭寮瑰嚭鑿滃崟,濡傛灉鏄锛屽鍔犲瓙椤圭洰锛屽惁鍒欏鍔犱富椤�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void TlMenu_MouseDown(object sender, MouseEventArgs e)
-        {
-            if (e.Button == MouseButtons.Right)
-            {
-                TreeListHitInfo hInfo = tlMenu.CalcHitInfo(new Point(e.X, e.Y));
-                TreeListNode node = hInfo.Node;
-                tlMenu.FocusedNode = node;
-                if (hInfo.HitInfoType == HitInfoType.Cell ||
-                    hInfo.HitInfoType ==HitInfoType.Row||
-                    hInfo.HitInfoType==HitInfoType.RowIndent ||
-                    hInfo.HitInfoType == HitInfoType.RowIndicator
-                    )
-                {
-                    if (node != null)
-                    {
-                        toolStripMenuItemAdd.Visible = true;
-                        toolStripMenuItemEdt.Visible = true;
-                        toolStripMenuItemDel.Visible = true;
-                        toolStripMenuItemRoot.Visible = false;
-                        cms1.Show(tlMenu, e.Location);
-                    }
-                }
-                else
-                {
-                    toolStripMenuItemAdd.Visible = false;
-                    toolStripMenuItemEdt.Visible = false;
-                    toolStripMenuItemDel.Visible = false;
-                    toolStripMenuItemRoot.Visible = true;
-                    cms1.Show(tlMenu, e.Location);
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// 鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
-        }
-
-        /// <summary>
-        /// 鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            _filterList.Clear();
-            getPageList(1);
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage)
-        {
-            var pgq = new PageQueryModel(1, 999999, "a.defect_code ", "asc");
-            var json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn =
-                    UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
-                var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = dd.rtnData.list;
-                tlMenu.DataSource = dt;
-                tlMenu.KeyFieldName = "guid";
-                tlMenu.ParentFieldName = "pid";
-                tlMenu.EndUpdate();
-                this.tlMenu.CollapseAll();
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx
deleted file mode 100644
index e11cb85..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="cms1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index d3a2a5d..7fa578c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -6,7 +6,9 @@
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
+using System.Net;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -27,6 +29,7 @@
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
+            toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -245,7 +248,7 @@
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1, "lotNo");
+                lbGuid, txt_releaseNo, gridView1, "releaseNo");
             toolBarMenu1.guidKey = rowGuid;
             if (string.IsNullOrEmpty(rowGuid))
             {
@@ -301,7 +304,62 @@
         {
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
         }
-
+        /// <summary>
+        /// 瀵煎嚭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_releaseNo, gridView1, "releaseNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾瀵煎嚭鍚楋紵"))
+                return;
+            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+            {
+                folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+                if (dialogResult == DialogResult.OK)
+                {
+                    string _folder = folderBrowserDialog.SelectedPath;
+                    var _obj = new
+                    {
+                        guid = rowGuid,
+                    };
+                    try
+                    {
+                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutIqc", JsonConvert.SerializeObject(_obj));
+                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                        if (_rtn.rtnCode > 0)
+                        {
+                            string _file = _rtn.rtnData.fileUrl.ToString();
+                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
+                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+                            using (WebClient client = new WebClient())
+                            {
+                                client.DownloadFile(_url, _folderName);
+                            }
+                            ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+                        }
+                        else
+                        {
+                            ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+                    }
+                }
+            }
+        }
 
         /// <summary>
         /// 鍒锋柊浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
deleted file mode 100644
index 7d1a4be..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ /dev/null
@@ -1,2291 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.QC
-{
-    partial class Frm_MesQaItemsDetect01Check
-    {
-
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_iqcDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptBtnError = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            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.lbGuid = new System.Windows.Forms.Label();
-            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fcovertQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fcheckDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
-            this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_modify1Flag = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_slOrg = new DevExpress.XtraEditors.TextEdit();
-            this.txt_modify1Date = new DevExpress.XtraEditors.TextEdit();
-            this.txt_modify1By = new DevExpress.XtraEditors.TextEdit();
-            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
-            this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_freceQty1111 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.modify1By = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
-            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckItemDesc = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fspecRequ = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1freQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1checkQyt = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fenterQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fngRate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fngQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
-            this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.groupControl2 = new DevExpress.XtraEditors.GroupControl();
-            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx4 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
-            this.split1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
-            this.split1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).BeginInit();
-            this.xtraTabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
-            this.splitMx1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
-            this.splitMx1.Panel2.SuspendLayout();
-            this.splitMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
-            this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcovertQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Date.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1By.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty1111)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.modify1By)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
-            this.xtraTabControl2.SuspendLayout();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel1)).BeginInit();
-            this.splitMx2.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel2)).BeginInit();
-            this.splitMx2.Panel2.SuspendLayout();
-            this.splitMx2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).BeginInit();
-            this.splitYangLi.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).BeginInit();
-            this.splitYangLi.Panel2.SuspendLayout();
-            this.splitYangLi.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
-            this.groupControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).BeginInit();
-            this.groupControl2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
-            this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = "1,1,1,1,000chk_iqc_detect01_check";
-            this.toolBarMenu1.currentAction = null;
-            this.toolBarMenu1.defaultActions = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1434, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1434, 720);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1432, 688);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // split1
-            // 
-            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
-            this.split1.Horizontal = false;
-            this.split1.Location = new System.Drawing.Point(0, 0);
-            this.split1.Name = "split1";
-            // 
-            // split1.Panel1
-            // 
-            this.split1.Panel1.Controls.Add(this.gcMain1);
-            this.split1.Panel1.Controls.Add(this.pageBar1);
-            this.split1.Panel1.Text = "Panel1";
-            // 
-            // split1.Panel2
-            // 
-            this.split1.Panel2.Text = "Panel2";
-            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1432, 688);
-            this.split1.SplitterPosition = 0;
-            this.split1.TabIndex = 0;
-            // 
-            // gcMain1
-            // 
-            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Location = new System.Drawing.Point(0, 0);
-            this.gcMain1.MainView = this.gridView1;
-            this.gcMain1.Name = "gcMain1";
-            this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptBtnError});
-            this.gcMain1.Size = new System.Drawing.Size(1432, 637);
-            this.gcMain1.TabIndex = 5;
-            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.ColumnPanelRowHeight = 50;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn19,
-            this.gridColumn12,
-            this.gridColumn13,
-            this.gv_fcheckResu,
-            this.gv_lotNo,
-            this.gv_releaseNo,
-            this.gv_itemNo,
-            this.gv_boardStyle,
-            this.gridColumn14,
-            this.gv_fbatchQty,
-            this.gv_fcovertQty,
-            this.gv_lifnr,
-            this.gv_remarks,
-            this.gv_createBy,
-            this.gv_fcheckBy,
-            this.gv_fcheckDate,
-            this.gv_createDate,
-            this.gv_lastupdateBy,
-            this.gv_lastupdateDate,
-            this.gv_fngHandle,
-            this.gv_iqcDate,
-            this.gridColumn18,
-            this.gridColumn17,
-            this.gridColumn15,
-            this.gridColumn20,
-            this.gridColumn31,
-            this.gridColumn32,
-            this.gridColumn33,
-            this.gridColumn34});
-            this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "鏀舵枡缁勭粐";
-            this.gridColumn19.FieldName = "receivingOrg";
-            this.gridColumn19.MinWidth = 50;
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Tag = "org.fnamber";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 12;
-            this.gridColumn19.Width = 250;
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "瀹℃牳鏍囪瘑";
-            this.gridColumn12.FieldName = "modifyFlagTxt";
-            this.gridColumn12.MinWidth = 10;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Tag = "query_a.quality_audit";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 0;
-            this.gridColumn12.Width = 50;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
-            this.gridColumn13.FieldName = "urgentLagTxt";
-            this.gridColumn13.MinWidth = 10;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.OptionsColumn.ReadOnly = true;
-            this.gridColumn13.Tag = "query_a.fsubmit";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 1;
-            this.gridColumn13.Width = 50;
-            // 
-            // gv_fcheckResu
-            // 
-            this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
-            this.gv_fcheckResu.FieldName = "fcheckResu";
-            this.gv_fcheckResu.MinWidth = 10;
-            this.gv_fcheckResu.Name = "gv_fcheckResu";
-            this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
-            this.gv_fcheckResu.Visible = true;
-            this.gv_fcheckResu.VisibleIndex = 2;
-            this.gv_fcheckResu.Width = 70;
-            // 
-            // gv_lotNo
-            // 
-            this.gv_lotNo.AppearanceCell.Options.UseFont = true;
-            this.gv_lotNo.Caption = "閫佹鎵规";
-            this.gv_lotNo.FieldName = "lotNo";
-            this.gv_lotNo.MinWidth = 50;
-            this.gv_lotNo.Name = "gv_lotNo";
-            this.gv_lotNo.OptionsColumn.AllowEdit = false;
-            this.gv_lotNo.Tag = "query_a.lot_no";
-            this.gv_lotNo.Visible = true;
-            this.gv_lotNo.VisibleIndex = 4;
-            this.gv_lotNo.Width = 150;
-            // 
-            // gv_releaseNo
-            // 
-            this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
-            this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
-            this.gv_releaseNo.FieldName = "releaseNo";
-            this.gv_releaseNo.MinWidth = 50;
-            this.gv_releaseNo.Name = "gv_releaseNo";
-            this.gv_releaseNo.OptionsColumn.AllowEdit = false;
-            this.gv_releaseNo.Tag = "query_a.release_no";
-            this.gv_releaseNo.Visible = true;
-            this.gv_releaseNo.VisibleIndex = 5;
-            this.gv_releaseNo.Width = 150;
-            // 
-            // gv_itemNo
-            // 
-            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
-            this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
-            this.gv_itemNo.FieldName = "itemNo";
-            this.gv_itemNo.MinWidth = 50;
-            this.gv_itemNo.Name = "gv_itemNo";
-            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.Width = 100;
-            // 
-            // gv_boardStyle
-            // 
-            this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
-            this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
-            this.gv_boardStyle.FieldName = "itemName";
-            this.gv_boardStyle.MinWidth = 50;
-            this.gv_boardStyle.Name = "gv_boardStyle";
-            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.Width = 200;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 50;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.OptionsColumn.ReadOnly = true;
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 8;
-            this.gridColumn14.Width = 200;
-            // 
-            // gv_fbatchQty
-            // 
-            this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
-            this.gv_fbatchQty.Caption = "鍒拌揣鏁伴噺";
-            this.gv_fbatchQty.FieldName = "fbatchQty";
-            this.gv_fbatchQty.MinWidth = 50;
-            this.gv_fbatchQty.Name = "gv_fbatchQty";
-            this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
-            this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
-            this.gv_fbatchQty.Visible = true;
-            this.gv_fbatchQty.VisibleIndex = 9;
-            this.gv_fbatchQty.Width = 80;
-            // 
-            // gv_fcovertQty
-            // 
-            this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
-            this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
-            this.gv_fcovertQty.FieldName = "fcovertQty";
-            this.gv_fcovertQty.MinWidth = 50;
-            this.gv_fcovertQty.Name = "gv_fcovertQty";
-            this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
-            this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
-            this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
-            this.gv_fcovertQty.Visible = true;
-            this.gv_fcovertQty.VisibleIndex = 10;
-            this.gv_fcovertQty.Width = 100;
-            // 
-            // gv_lifnr
-            // 
-            this.gv_lifnr.AppearanceCell.Options.UseFont = true;
-            this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
-            this.gv_lifnr.FieldName = "suppName";
-            this.gv_lifnr.MinWidth = 50;
-            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 = 11;
-            this.gv_lifnr.Width = 250;
-            // 
-            // gv_remarks
-            // 
-            this.gv_remarks.AppearanceCell.Options.UseFont = true;
-            this.gv_remarks.Caption = "澶囨敞璇存槑";
-            this.gv_remarks.FieldName = "remarks";
-            this.gv_remarks.MinWidth = 50;
-            this.gv_remarks.Name = "gv_remarks";
-            this.gv_remarks.OptionsColumn.AllowEdit = false;
-            this.gv_remarks.Tag = "query_a.remarks";
-            this.gv_remarks.Visible = true;
-            this.gv_remarks.VisibleIndex = 13;
-            this.gv_remarks.Width = 150;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Tag = "query_a.create_by";
-            this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 14;
-            this.gv_createBy.Width = 100;
-            // 
-            // gv_fcheckBy
-            // 
-            this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
-            this.gv_fcheckBy.FieldName = "fcheckBy";
-            this.gv_fcheckBy.MinWidth = 50;
-            this.gv_fcheckBy.Name = "gv_fcheckBy";
-            this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckBy.Tag = "query_a.fcheck_by";
-            this.gv_fcheckBy.Visible = true;
-            this.gv_fcheckBy.VisibleIndex = 15;
-            this.gv_fcheckBy.Width = 100;
-            // 
-            // gv_fcheckDate
-            // 
-            this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
-            this.gv_fcheckDate.FieldName = "fcheckDate";
-            this.gv_fcheckDate.MinWidth = 50;
-            this.gv_fcheckDate.Name = "gv_fcheckDate";
-            this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckDate.Tag = "query_a.fcheck_date";
-            this.gv_fcheckDate.Visible = true;
-            this.gv_fcheckDate.VisibleIndex = 16;
-            this.gv_fcheckDate.Width = 180;
-            // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
-            this.gv_createDate.Name = "gv_createDate";
-            this.gv_createDate.OptionsColumn.AllowEdit = false;
-            this.gv_createDate.Tag = "query_a.create_date";
-            this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 17;
-            this.gv_createDate.Width = 180;
-            // 
-            // gv_lastupdateBy
-            // 
-            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateBy.Caption = "鏇存柊浜�";
-            this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            this.gv_lastupdateBy.MinWidth = 50;
-            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
-            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
-            this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 18;
-            this.gv_lastupdateBy.Width = 100;
-            // 
-            // gv_lastupdateDate
-            // 
-            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
-            this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 50;
-            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
-            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
-            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
-            this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 19;
-            this.gv_lastupdateDate.Width = 180;
-            // 
-            // gv_fngHandle
-            // 
-            this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
-            this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
-            this.gv_fngHandle.FieldName = "fngHandle";
-            this.gv_fngHandle.MinWidth = 50;
-            this.gv_fngHandle.Name = "gv_fngHandle";
-            this.gv_fngHandle.OptionsColumn.AllowEdit = false;
-            this.gv_fngHandle.Tag = "query_a.fng_handle";
-            this.gv_fngHandle.Visible = true;
-            this.gv_fngHandle.VisibleIndex = 20;
-            this.gv_fngHandle.Width = 100;
-            // 
-            // gv_iqcDate
-            // 
-            this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
-            this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
-            this.gv_iqcDate.FieldName = "iqcDate";
-            this.gv_iqcDate.MinWidth = 50;
-            this.gv_iqcDate.Name = "gv_iqcDate";
-            this.gv_iqcDate.OptionsColumn.AllowEdit = false;
-            this.gv_iqcDate.Tag = "query_a.iqc_date";
-            this.gv_iqcDate.Visible = true;
-            this.gv_iqcDate.VisibleIndex = 21;
-            this.gv_iqcDate.Width = 180;
-            // 
-            // gridColumn18
-            // 
-            this.gridColumn18.Caption = "瀹℃牳浜�";
-            this.gridColumn18.FieldName = "modify1By";
-            this.gridColumn18.MinWidth = 50;
-            this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 22;
-            this.gridColumn18.Width = 50;
-            // 
-            // gridColumn17
-            // 
-            this.gridColumn17.Caption = "瀹℃牳鏃堕棿";
-            this.gridColumn17.FieldName = "modify1Date";
-            this.gridColumn17.MinWidth = 50;
-            this.gridColumn17.Name = "gridColumn17";
-            this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 23;
-            this.gridColumn17.Width = 180;
-            // 
-            // gridColumn15
-            // 
-            this.gridColumn15.Caption = "鐗╂枡ID";
-            this.gridColumn15.FieldName = "itemId";
-            this.gridColumn15.MinWidth = 25;
-            this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 24;
-            this.gridColumn15.Width = 94;
-            // 
-            // gridColumn20
-            // 
-            this.gridColumn20.Caption = "涓婚敭Guid";
-            this.gridColumn20.FieldName = "guid";
-            this.gridColumn20.MinWidth = 25;
-            this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Width = 94;
-            // 
-            // gridColumn31
-            // 
-            this.gridColumn31.Caption = "閲囪喘鍗曞彿";
-            this.gridColumn31.FieldName = "cgdNo";
-            this.gridColumn31.MinWidth = 25;
-            this.gridColumn31.Name = "gridColumn31";
-            this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 25;
-            this.gridColumn31.Width = 94;
-            // 
-            // gridColumn32
-            // 
-            this.gridColumn32.Caption = "绫诲瀷";
-            this.gridColumn32.FieldName = "orderType";
-            this.gridColumn32.MinWidth = 25;
-            this.gridColumn32.Name = "gridColumn32";
-            this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 26;
-            this.gridColumn32.Width = 94;
-            // 
-            // gridColumn33
-            // 
-            this.gridColumn33.Caption = "鍒ゅ畾缁撴灉";
-            this.gridColumn33.FieldName = "freceQty";
-            this.gridColumn33.MinWidth = 25;
-            this.gridColumn33.Name = "gridColumn33";
-            this.gridColumn33.Visible = true;
-            this.gridColumn33.VisibleIndex = 3;
-            this.gridColumn33.Width = 94;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "寮傚父鎶ュ憡";
-            this.gridColumn34.ColumnEdit = this.rptBtnError;
-            this.gridColumn34.MinWidth = 25;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 27;
-            this.gridColumn34.Width = 94;
-            // 
-            // rptBtnError
-            // 
-            this.rptBtnError.AutoHeight = false;
-            this.rptBtnError.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.rptBtnError.Name = "rptBtnError";
-            this.rptBtnError.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnError_ButtonClick);
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 637);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1432, 39);
-            this.pageBar1.TabIndex = 6;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1432, 688);
-            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
-            // 
-            // splitMx1
-            // 
-            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitMx1.Horizontal = false;
-            this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Name = "splitMx1";
-            // 
-            // splitMx1.Panel1
-            // 
-            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
-            this.splitMx1.Panel1.Text = "Panel1";
-            // 
-            // splitMx1.Panel2
-            // 
-            this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
-            this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1432, 688);
-            this.splitMx1.SplitterPosition = 179;
-            this.splitMx1.TabIndex = 0;
-            // 
-            // layoutMx1
-            // 
-            this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_fmrmode);
-            this.layoutMx1.Controls.Add(this.txt_remarks);
-            this.layoutMx1.Controls.Add(this.txt_fngHandle);
-            this.layoutMx1.Controls.Add(this.txt_suppName);
-            this.layoutMx1.Controls.Add(this.txt_releaseNo);
-            this.layoutMx1.Controls.Add(this.txt_fcovertQty);
-            this.layoutMx1.Controls.Add(this.txt_fbatchQty);
-            this.layoutMx1.Controls.Add(this.txt_fcheckBy);
-            this.layoutMx1.Controls.Add(this.txt_itemName);
-            this.layoutMx1.Controls.Add(this.txt_fcheckDate);
-            this.layoutMx1.Controls.Add(this.txt_fcheckResu);
-            this.layoutMx1.Controls.Add(this.txt_itemNo);
-            this.layoutMx1.Controls.Add(this.txt_itemModel);
-            this.layoutMx1.Controls.Add(this.txt_lotNo);
-            this.layoutMx1.Controls.Add(this.txt_modify1Flag);
-            this.layoutMx1.Controls.Add(this.txt_slOrg);
-            this.layoutMx1.Controls.Add(this.txt_modify1Date);
-            this.layoutMx1.Controls.Add(this.txt_modify1By);
-            this.layoutMx1.Controls.Add(this.txt_guid);
-            this.layoutMx1.Controls.Add(this.txt_freceQty);
-            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem16,
-            this.layoutControlItem19});
-            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(614, 459, 812, 500);
-            this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1432, 179);
-            this.layoutMx1.TabIndex = 0;
-            this.layoutMx1.Text = "layoutControl1";
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.Location = new System.Drawing.Point(987, 140);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(322, 28);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Text = "lbGuid";
-            this.lbGuid.Visible = false;
-            // 
-            // txt_fmrmode
-            // 
-            this.txt_fmrmode.EditValue = "-璇烽�夋嫨-";
-            this.txt_fmrmode.Location = new System.Drawing.Point(795, 139);
-            this.txt_fmrmode.Name = "txt_fmrmode";
-            this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_fmrmode.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "閫�鏂欒ˉ鏂�",
-            "閫�鏂欏苟鎵f"});
-            this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fmrmode.Size = new System.Drawing.Size(272, 24);
-            this.txt_fmrmode.TabIndex = 795;
-            // 
-            // txt_remarks
-            // 
-            this.txt_remarks.Location = new System.Drawing.Point(89, 139);
-            this.txt_remarks.Name = "txt_remarks";
-            this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(625, 24);
-            this.txt_remarks.StyleController = this.layoutMx1;
-            this.txt_remarks.TabIndex = 810;
-            this.txt_remarks.Tag = "readonly";
-            // 
-            // txt_fngHandle
-            // 
-            this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
-            this.txt_fngHandle.Location = new System.Drawing.Point(795, 107);
-            this.txt_fngHandle.Name = "txt_fngHandle";
-            this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_fngHandle.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "閫�璐�",
-            "鐗归噰鐩存帴浣跨敤"});
-            this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fngHandle.Size = new System.Drawing.Size(272, 24);
-            this.txt_fngHandle.StyleController = this.layoutMx1;
-            this.txt_fngHandle.TabIndex = 793;
-            // 
-            // txt_suppName
-            // 
-            this.txt_suppName.EnterMoveNextControl = true;
-            this.txt_suppName.Location = new System.Drawing.Point(795, 12);
-            this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Size = new System.Drawing.Size(272, 24);
-            this.txt_suppName.StyleController = this.layoutMx1;
-            this.txt_suppName.TabIndex = 802;
-            this.txt_suppName.Tag = "readonly";
-            // 
-            // txt_releaseNo
-            // 
-            this.txt_releaseNo.EnterMoveNextControl = true;
-            this.txt_releaseNo.Location = new System.Drawing.Point(89, 12);
-            this.txt_releaseNo.Name = "txt_releaseNo";
-            this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_releaseNo.Size = new System.Drawing.Size(272, 24);
-            this.txt_releaseNo.StyleController = this.layoutMx1;
-            this.txt_releaseNo.TabIndex = 213;
-            this.txt_releaseNo.Tag = "readonly";
-            // 
-            // txt_fcovertQty
-            // 
-            this.txt_fcovertQty.EnterMoveNextControl = true;
-            this.txt_fcovertQty.Location = new System.Drawing.Point(442, 43);
-            this.txt_fcovertQty.Name = "txt_fcovertQty";
-            this.txt_fcovertQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcovertQty.Size = new System.Drawing.Size(272, 24);
-            this.txt_fcovertQty.StyleController = this.layoutMx1;
-            this.txt_fcovertQty.TabIndex = 804;
-            this.txt_fcovertQty.Tag = "readonly";
-            // 
-            // txt_fbatchQty
-            // 
-            this.txt_fbatchQty.EnterMoveNextControl = true;
-            this.txt_fbatchQty.Location = new System.Drawing.Point(442, 12);
-            this.txt_fbatchQty.Name = "txt_fbatchQty";
-            this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbatchQty.Size = new System.Drawing.Size(272, 24);
-            this.txt_fbatchQty.StyleController = this.layoutMx1;
-            this.txt_fbatchQty.TabIndex = 222;
-            this.txt_fbatchQty.Tag = "readonly";
-            // 
-            // txt_fcheckBy
-            // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(442, 107);
-            this.txt_fcheckBy.Name = "txt_fcheckBy";
-            this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckBy.Size = new System.Drawing.Size(272, 24);
-            this.txt_fcheckBy.StyleController = this.layoutMx1;
-            this.txt_fcheckBy.TabIndex = 217;
-            this.txt_fcheckBy.Tag = "readonly";
-            // 
-            // txt_itemName
-            // 
-            this.txt_itemName.EnterMoveNextControl = true;
-            this.txt_itemName.Location = new System.Drawing.Point(89, 43);
-            this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(272, 24);
-            this.txt_itemName.StyleController = this.layoutMx1;
-            this.txt_itemName.TabIndex = 801;
-            this.txt_itemName.Tag = "readonly";
-            // 
-            // txt_fcheckDate
-            // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(1148, 139);
-            this.txt_fcheckDate.Name = "txt_fcheckDate";
-            this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckDate.Size = new System.Drawing.Size(272, 24);
-            this.txt_fcheckDate.StyleController = this.layoutMx1;
-            this.txt_fcheckDate.TabIndex = 216;
-            this.txt_fcheckDate.Tag = "readonly";
-            // 
-            // txt_fcheckResu
-            // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(795, 43);
-            this.txt_fcheckResu.Name = "txt_fcheckResu";
-            this.txt_fcheckResu.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckResu.Size = new System.Drawing.Size(272, 24);
-            this.txt_fcheckResu.StyleController = this.layoutMx1;
-            this.txt_fcheckResu.TabIndex = 235;
-            this.txt_fcheckResu.Tag = "readonly";
-            // 
-            // txt_itemNo
-            // 
-            this.txt_itemNo.EnterMoveNextControl = true;
-            this.txt_itemNo.Location = new System.Drawing.Point(89, 75);
-            this.txt_itemNo.Name = "txt_itemNo";
-            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(272, 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(89, 107);
-            this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(272, 24);
-            this.txt_itemModel.StyleController = this.layoutMx1;
-            this.txt_itemModel.TabIndex = 802;
-            this.txt_itemModel.Tag = "readonly";
-            // 
-            // txt_lotNo
-            // 
-            this.txt_lotNo.EnterMoveNextControl = true;
-            this.txt_lotNo.Location = new System.Drawing.Point(442, 75);
-            this.txt_lotNo.Name = "txt_lotNo";
-            this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_lotNo.Size = new System.Drawing.Size(272, 24);
-            this.txt_lotNo.StyleController = this.layoutMx1;
-            this.txt_lotNo.TabIndex = 262;
-            this.txt_lotNo.Tag = "readonly";
-            // 
-            // txt_modify1Flag
-            // 
-            this.txt_modify1Flag.Location = new System.Drawing.Point(1071, 75);
-            this.txt_modify1Flag.Name = "txt_modify1Flag";
-            this.txt_modify1Flag.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_modify1Flag.Size = new System.Drawing.Size(349, 24);
-            this.txt_modify1Flag.StyleController = this.layoutMx1;
-            this.txt_modify1Flag.TabIndex = 811;
-            this.txt_modify1Flag.Tag = "readonly";
-            // 
-            // txt_slOrg
-            // 
-            this.txt_slOrg.Location = new System.Drawing.Point(1148, 107);
-            this.txt_slOrg.Name = "txt_slOrg";
-            this.txt_slOrg.Size = new System.Drawing.Size(272, 24);
-            this.txt_slOrg.StyleController = this.layoutMx1;
-            this.txt_slOrg.TabIndex = 812;
-            this.txt_slOrg.Tag = "readonly";
-            // 
-            // txt_modify1Date
-            // 
-            this.txt_modify1Date.Location = new System.Drawing.Point(1148, 43);
-            this.txt_modify1Date.Name = "txt_modify1Date";
-            this.txt_modify1Date.Size = new System.Drawing.Size(272, 24);
-            this.txt_modify1Date.StyleController = this.layoutMx1;
-            this.txt_modify1Date.TabIndex = 813;
-            this.txt_modify1Date.Tag = "readonly";
-            // 
-            // txt_modify1By
-            // 
-            this.txt_modify1By.Location = new System.Drawing.Point(1148, 12);
-            this.txt_modify1By.Name = "txt_modify1By";
-            this.txt_modify1By.Size = new System.Drawing.Size(272, 24);
-            this.txt_modify1By.StyleController = this.layoutMx1;
-            this.txt_modify1By.TabIndex = 814;
-            this.txt_modify1By.Tag = "readonly";
-            // 
-            // txt_guid
-            // 
-            this.txt_guid.Location = new System.Drawing.Point(1065, 140);
-            this.txt_guid.Name = "txt_guid";
-            this.txt_guid.Size = new System.Drawing.Size(244, 24);
-            this.txt_guid.StyleController = this.layoutMx1;
-            this.txt_guid.TabIndex = 815;
-            this.txt_guid.Tag = "readonly";
-            // 
-            // txt_freceQty
-            // 
-            this.txt_freceQty.EditValue = "-璇烽�夋嫨-";
-            this.txt_freceQty.Location = new System.Drawing.Point(795, 75);
-            this.txt_freceQty.Name = "txt_freceQty";
-            this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_freceQty.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_freceQty.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "Y:鍚堟牸",
-            "N:涓嶅悎鏍�"});
-            this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_freceQty.Size = new System.Drawing.Size(272, 24);
-            this.txt_freceQty.StyleController = this.layoutMx1;
-            this.txt_freceQty.TabIndex = 816;
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.lbGuid;
-            this.layoutControlItem16.Location = new System.Drawing.Point(975, 128);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem16.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem16.Text = "lbGuid";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem16.TextVisible = false;
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_guid;
-            this.layoutControlItem19.Location = new System.Drawing.Point(975, 128);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem19.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem19.Text = "涓婚敭GUID";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(50, 20);
-            // 
-            // Root
-            // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem2,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem8,
-            this.layoutControlItem10,
-            this.layoutControlItem9,
-            this.layoutControlItem3,
-            this.layoutControlItem5,
-            this.txt_freceQty1111,
-            this.layoutControlItem14,
-            this.layoutControlItem15,
-            this.layoutControlItem12,
-            this.modify1By,
-            this.layoutControlItem18,
-            this.layoutControlItem13,
-            this.layoutControlItem17,
-            this.layoutControlItem4,
-            this.layoutControlItem11});
-            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
-            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1432, 179);
-            this.Root.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(353, 31);
-            this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_fbatchQty;
-            this.layoutControlItem2.Location = new System.Drawing.Point(353, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(353, 31);
-            this.layoutControlItem2.Text = "鍒拌揣鏁伴噺";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_itemName;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 31);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem6.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_itemNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 63);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_itemModel;
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 95);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_fcovertQty;
-            this.layoutControlItem10.Location = new System.Drawing.Point(353, 31);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem10.Text = "杞崲鏁伴噺";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_lotNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(353, 63);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem9.Text = "鎵规鍙�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_fcheckBy;
-            this.layoutControlItem3.Location = new System.Drawing.Point(353, 95);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem3.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem3.Text = "妫�楠屼汉鍛� ";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_fcheckResu;
-            this.layoutControlItem5.Location = new System.Drawing.Point(706, 31);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem5.Text = "妫�楠岀粨鏋�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // txt_freceQty1111
-            // 
-            this.txt_freceQty1111.Control = this.txt_freceQty;
-            this.txt_freceQty1111.Location = new System.Drawing.Point(706, 63);
-            this.txt_freceQty1111.Name = "txt_freceQty1111";
-            this.txt_freceQty1111.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.txt_freceQty1111.OptionsTableLayoutItem.RowIndex = 2;
-            this.txt_freceQty1111.Size = new System.Drawing.Size(353, 32);
-            this.txt_freceQty1111.Text = "鍒ゅ畾缁撴灉";
-            this.txt_freceQty1111.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_fngHandle;
-            this.layoutControlItem14.Location = new System.Drawing.Point(706, 95);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem14.Text = "澶勭悊缁撴灉";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_fmrmode;
-            this.layoutControlItem15.Location = new System.Drawing.Point(706, 127);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem15.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem15.Text = "澶勭悊鏂瑰紡";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_suppName;
-            this.layoutControlItem12.Location = new System.Drawing.Point(706, 0);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(353, 31);
-            this.layoutControlItem12.Text = "渚涘簲鍟�";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // modify1By
-            // 
-            this.modify1By.Control = this.txt_modify1By;
-            this.modify1By.Location = new System.Drawing.Point(1059, 0);
-            this.modify1By.Name = "modify1By";
-            this.modify1By.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.modify1By.Size = new System.Drawing.Size(353, 31);
-            this.modify1By.Text = "瀹℃牳浜�";
-            this.modify1By.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_modify1Date;
-            this.layoutControlItem18.Location = new System.Drawing.Point(1059, 31);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem18.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem18.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_modify1Flag;
-            this.layoutControlItem13.Location = new System.Drawing.Point(1059, 63);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem13.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem13.TextVisible = false;
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_slOrg;
-            this.layoutControlItem17.Location = new System.Drawing.Point(1059, 95);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem17.Text = "鏀舵枡缁勭粐";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_fcheckDate;
-            this.layoutControlItem4.Location = new System.Drawing.Point(1059, 127);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem4.Size = new System.Drawing.Size(353, 32);
-            this.layoutControlItem4.Text = "妫�楠屾棩鏈�";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_remarks;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 127);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem11.Size = new System.Drawing.Size(706, 32);
-            this.layoutControlItem11.Text = "澶囨敞璇存槑";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // xtraTabControl2
-            // 
-            this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
-            this.xtraTabControl2.Name = "xtraTabControl2";
-            this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(1432, 497);
-            this.xtraTabControl2.TabIndex = 3;
-            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1,
-            this.tabMxPage2});
-            // 
-            // tabMxPage1
-            // 
-            this.tabMxPage1.Controls.Add(this.splitMx2);
-            this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1430, 465);
-            this.tabMxPage1.Text = "鎶芥牱淇℃伅";
-            // 
-            // splitMx2
-            // 
-            this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitMx2.Horizontal = false;
-            this.splitMx2.Location = new System.Drawing.Point(0, 0);
-            this.splitMx2.Name = "splitMx2";
-            // 
-            // splitMx2.Panel1
-            // 
-            this.splitMx2.Panel1.Controls.Add(this.gcMx1);
-            this.splitMx2.Panel1.Text = "Panel1";
-            // 
-            // splitMx2.Panel2
-            // 
-            this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
-            this.splitMx2.Panel2.Text = "Panel2";
-            this.splitMx2.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx2.Size = new System.Drawing.Size(1430, 465);
-            this.splitMx2.SplitterPosition = 241;
-            this.splitMx2.TabIndex = 3;
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1430, 241);
-            this.gcMx1.TabIndex = 2;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx1.ColumnPanelRowHeight = 50;
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1fcheckItem,
-            this.gvMx1fcheckTool,
-            this.gvMx1fcheckItemDesc,
-            this.gvMx1fspecRequ,
-            this.gvMx1fupAllow,
-            this.gvMx1fstand,
-            this.gvMx1fdownAllow,
-            this.gvMx1freQty,
-            this.gvMx1checkQyt,
-            this.gvMx1fenterQty,
-            this.gvMx1fcheckResu,
-            this.gvMx1fngRate,
-            this.gvMx1fngQty,
-            this.gvMx1sampleSizeNo,
-            this.gvMx1fcheckLevel,
-            this.gvMx1facLevel});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
-            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
-            // 
-            // gvMx1fcheckItem
-            // 
-            this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
-            this.gvMx1fcheckItem.FieldName = "fcheckItem";
-            this.gvMx1fcheckItem.MinWidth = 50;
-            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
-            this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
-            this.gvMx1fcheckItem.Visible = true;
-            this.gvMx1fcheckItem.VisibleIndex = 0;
-            this.gvMx1fcheckItem.Width = 120;
-            // 
-            // gvMx1fcheckTool
-            // 
-            this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
-            this.gvMx1fcheckTool.FieldName = "fcheckTool";
-            this.gvMx1fcheckTool.MinWidth = 50;
-            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
-            this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
-            this.gvMx1fcheckTool.Visible = true;
-            this.gvMx1fcheckTool.VisibleIndex = 1;
-            this.gvMx1fcheckTool.Width = 100;
-            // 
-            // gvMx1fcheckItemDesc
-            // 
-            this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
-            this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
-            this.gvMx1fcheckItemDesc.MinWidth = 50;
-            this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
-            this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
-            this.gvMx1fcheckItemDesc.Visible = true;
-            this.gvMx1fcheckItemDesc.VisibleIndex = 2;
-            this.gvMx1fcheckItemDesc.Width = 120;
-            // 
-            // gvMx1fspecRequ
-            // 
-            this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
-            this.gvMx1fspecRequ.FieldName = "fspecRequ";
-            this.gvMx1fspecRequ.MinWidth = 50;
-            this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
-            this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
-            this.gvMx1fspecRequ.Visible = true;
-            this.gvMx1fspecRequ.VisibleIndex = 3;
-            this.gvMx1fspecRequ.Width = 120;
-            // 
-            // gvMx1fupAllow
-            // 
-            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fupAllow.Caption = "涓婇檺";
-            this.gvMx1fupAllow.FieldName = "fupAllow";
-            this.gvMx1fupAllow.MinWidth = 50;
-            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
-            this.gvMx1fupAllow.Tag = "query_a.fup_allow";
-            this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 4;
-            this.gvMx1fupAllow.Width = 50;
-            // 
-            // gvMx1fstand
-            // 
-            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fstand.Caption = "鏍囧噯鍊�";
-            this.gvMx1fstand.FieldName = "fstand";
-            this.gvMx1fstand.MinWidth = 50;
-            this.gvMx1fstand.Name = "gvMx1fstand";
-            this.gvMx1fstand.Tag = "query_a.fstand";
-            this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 5;
-            this.gvMx1fstand.Width = 50;
-            // 
-            // gvMx1fdownAllow
-            // 
-            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fdownAllow.Caption = "涓嬮檺";
-            this.gvMx1fdownAllow.FieldName = "fdownAllow";
-            this.gvMx1fdownAllow.MinWidth = 50;
-            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
-            this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
-            this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 6;
-            this.gvMx1fdownAllow.Width = 50;
-            // 
-            // gvMx1freQty
-            // 
-            this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1freQty.Caption = "RE鏁伴噺";
-            this.gvMx1freQty.FieldName = "freQty";
-            this.gvMx1freQty.MinWidth = 50;
-            this.gvMx1freQty.Name = "gvMx1freQty";
-            this.gvMx1freQty.Tag = "query_a.fre_qty";
-            this.gvMx1freQty.Visible = true;
-            this.gvMx1freQty.VisibleIndex = 7;
-            this.gvMx1freQty.Width = 50;
-            // 
-            // gvMx1checkQyt
-            // 
-            this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
-            this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
-            this.gvMx1checkQyt.FieldName = "checkQyt";
-            this.gvMx1checkQyt.MinWidth = 60;
-            this.gvMx1checkQyt.Name = "gvMx1checkQyt";
-            this.gvMx1checkQyt.Tag = "query_a.check_qyt";
-            this.gvMx1checkQyt.Visible = true;
-            this.gvMx1checkQyt.VisibleIndex = 8;
-            this.gvMx1checkQyt.Width = 60;
-            // 
-            // gvMx1fenterQty
-            // 
-            this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
-            this.gvMx1fenterQty.FieldName = "fenterQty";
-            this.gvMx1fenterQty.MinWidth = 60;
-            this.gvMx1fenterQty.Name = "gvMx1fenterQty";
-            this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
-            this.gvMx1fenterQty.Visible = true;
-            this.gvMx1fenterQty.VisibleIndex = 9;
-            this.gvMx1fenterQty.Width = 60;
-            // 
-            // gvMx1fcheckResu
-            // 
-            this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1fcheckResu.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
-            this.gvMx1fcheckResu.FieldName = "fcheckResu";
-            this.gvMx1fcheckResu.MinWidth = 50;
-            this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
-            this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
-            this.gvMx1fcheckResu.Visible = true;
-            this.gvMx1fcheckResu.VisibleIndex = 10;
-            this.gvMx1fcheckResu.Width = 94;
-            // 
-            // gvMx1fngRate
-            // 
-            this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
-            this.gvMx1fngRate.FieldName = "fngRateName";
-            this.gvMx1fngRate.MinWidth = 50;
-            this.gvMx1fngRate.Name = "gvMx1fngRate";
-            this.gvMx1fngRate.Tag = "query_a.fng_rate";
-            this.gvMx1fngRate.Visible = true;
-            this.gvMx1fngRate.VisibleIndex = 11;
-            this.gvMx1fngRate.Width = 94;
-            // 
-            // gvMx1fngQty
-            // 
-            this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
-            this.gvMx1fngQty.FieldName = "fngQty";
-            this.gvMx1fngQty.MinWidth = 50;
-            this.gvMx1fngQty.Name = "gvMx1fngQty";
-            this.gvMx1fngQty.Tag = "query_a.fng_qty";
-            this.gvMx1fngQty.Visible = true;
-            this.gvMx1fngQty.VisibleIndex = 12;
-            this.gvMx1fngQty.Width = 50;
-            // 
-            // gvMx1sampleSizeNo
-            // 
-            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
-            this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
-            this.gvMx1sampleSizeNo.MinWidth = 50;
-            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
-            this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
-            this.gvMx1sampleSizeNo.Visible = true;
-            this.gvMx1sampleSizeNo.VisibleIndex = 13;
-            this.gvMx1sampleSizeNo.Width = 200;
-            // 
-            // gvMx1fcheckLevel
-            // 
-            this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
-            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
-            this.gvMx1fcheckLevel.MinWidth = 50;
-            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
-            this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
-            this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 14;
-            this.gvMx1fcheckLevel.Width = 200;
-            // 
-            // gvMx1facLevel
-            // 
-            this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
-            this.gvMx1facLevel.FieldName = "facLevel";
-            this.gvMx1facLevel.MinWidth = 50;
-            this.gvMx1facLevel.Name = "gvMx1facLevel";
-            this.gvMx1facLevel.Tag = "query_a.fac_level";
-            this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 15;
-            this.gvMx1facLevel.Width = 200;
-            // 
-            // splitYangLi
-            // 
-            this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitYangLi.Location = new System.Drawing.Point(0, 0);
-            this.splitYangLi.Name = "splitYangLi";
-            // 
-            // splitYangLi.Panel1
-            // 
-            this.splitYangLi.Panel1.Controls.Add(this.groupControl1);
-            this.splitYangLi.Panel1.Text = "Panel1";
-            // 
-            // splitYangLi.Panel2
-            // 
-            this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
-            this.splitYangLi.Panel2.Text = "Panel2";
-            this.splitYangLi.Size = new System.Drawing.Size(1430, 212);
-            this.splitYangLi.SplitterPosition = 583;
-            this.splitYangLi.TabIndex = 0;
-            // 
-            // groupControl1
-            // 
-            this.groupControl1.Controls.Add(this.gcMx2);
-            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(583, 212);
-            this.groupControl1.TabIndex = 4;
-            this.groupControl1.Text = "妫�娴嬬粨鏋�";
-            // 
-            // gcMx2
-            // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            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(579, 182);
-            this.gcMx2.TabIndex = 0;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn1,
-            this.gridColumn3,
-            this.gridColumn2,
-            this.gridColumn21,
-            this.gridColumn22,
-            this.gridColumn25});
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn1.FieldName = "guid";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.OptionsColumn.ReadOnly = true;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "椤圭洰";
-            this.gridColumn3.FieldName = "fcheckItem";
-            this.gridColumn3.MaxWidth = 192;
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.OptionsColumn.ReadOnly = true;
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 0;
-            this.gridColumn3.Width = 192;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "鎶芥缁撴灉";
-            this.gridColumn2.FieldName = "fcheckResu";
-            this.gridColumn2.MaxWidth = 80;
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.OptionsColumn.ReadOnly = true;
-            this.gridColumn2.Width = 80;
-            // 
-            // gridColumn21
-            // 
-            this.gridColumn21.Caption = "鍒ゅ畾鏍囧織";
-            this.gridColumn21.FieldName = "fstand";
-            this.gridColumn21.MinWidth = 25;
-            this.gridColumn21.Name = "gridColumn21";
-            this.gridColumn21.OptionsColumn.ReadOnly = true;
-            this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 1;
-            this.gridColumn21.Width = 94;
-            // 
-            // gridColumn22
-            // 
-            this.gridColumn22.Caption = "鎿嶄綔浜�";
-            this.gridColumn22.FieldName = "createBy";
-            this.gridColumn22.MinWidth = 25;
-            this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.OptionsColumn.ReadOnly = true;
-            this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 2;
-            this.gridColumn22.Width = 94;
-            // 
-            // gridColumn25
-            // 
-            this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
-            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;
-            // 
-            // groupControl2
-            // 
-            this.groupControl2.Controls.Add(this.gcMx3);
-            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(835, 212);
-            this.groupControl2.TabIndex = 5;
-            this.groupControl2.Text = "鏍锋湰缁撴灉";
-            // 
-            // gcMx3
-            // 
-            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            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(831, 182);
-            this.gcMx3.TabIndex = 0;
-            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx3});
-            // 
-            // gvMx3
-            // 
-            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn23,
-            this.gridColumn24,
-            this.gridColumn28,
-            this.gridColumn29,
-            this.gridColumn26,
-            this.gridColumn27,
-            this.gridColumn30});
-            this.gvMx3.GridControl = this.gcMx3;
-            this.gvMx3.Name = "gvMx3";
-            // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn23.FieldName = "guid";
-            this.gridColumn23.MinWidth = 25;
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.OptionsColumn.ReadOnly = true;
-            this.gridColumn23.Width = 94;
-            // 
-            // gridColumn24
-            // 
-            this.gridColumn24.Caption = "椤圭洰";
-            this.gridColumn24.FieldName = "fcheckItemd5";
-            this.gridColumn24.MaxWidth = 192;
-            this.gridColumn24.MinWidth = 25;
-            this.gridColumn24.Name = "gridColumn24";
-            this.gridColumn24.OptionsColumn.ReadOnly = true;
-            this.gridColumn24.Width = 192;
-            // 
-            // gridColumn28
-            // 
-            this.gridColumn28.Caption = "鏍锋湰搴�";
-            this.gridColumn28.FieldName = "fcheckItem";
-            this.gridColumn28.MinWidth = 25;
-            this.gridColumn28.Name = "gridColumn28";
-            this.gridColumn28.OptionsColumn.ReadOnly = true;
-            this.gridColumn28.Width = 94;
-            // 
-            // gridColumn29
-            // 
-            this.gridColumn29.Caption = "鏍锋湰鍊�";
-            this.gridColumn29.FieldName = "fcheckResu";
-            this.gridColumn29.MinWidth = 25;
-            this.gridColumn29.Name = "gridColumn29";
-            this.gridColumn29.OptionsColumn.ReadOnly = true;
-            this.gridColumn29.Width = 94;
-            // 
-            // gridColumn26
-            // 
-            this.gridColumn26.Caption = "鍒ゅ畾鏍囧織";
-            this.gridColumn26.FieldName = "fstand";
-            this.gridColumn26.MinWidth = 25;
-            this.gridColumn26.Name = "gridColumn26";
-            this.gridColumn26.OptionsColumn.ReadOnly = true;
-            this.gridColumn26.Width = 94;
-            // 
-            // gridColumn27
-            // 
-            this.gridColumn27.Caption = "鎿嶄綔浜�";
-            this.gridColumn27.FieldName = "createBy";
-            this.gridColumn27.MinWidth = 25;
-            this.gridColumn27.Name = "gridColumn27";
-            this.gridColumn27.OptionsColumn.ReadOnly = true;
-            this.gridColumn27.Width = 94;
-            // 
-            // gridColumn30
-            // 
-            this.gridColumn30.Caption = "鎿嶄綔鏃堕棿";
-            this.gridColumn30.FieldName = "createDate";
-            this.gridColumn30.MinWidth = 25;
-            this.gridColumn30.Name = "gridColumn30";
-            this.gridColumn30.OptionsColumn.ReadOnly = true;
-            this.gridColumn30.Width = 94;
-            // 
-            // tabMxPage2
-            // 
-            this.tabMxPage2.Controls.Add(this.gcMx4);
-            this.tabMxPage2.Controls.Add(this.ucUpFile1);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1430, 465);
-            this.tabMxPage2.Text = "闄勪欢淇℃伅";
-            // 
-            // gcMx4
-            // 
-            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx4.Location = new System.Drawing.Point(0, 57);
-            this.gcMx4.MainView = this.gvMx4;
-            this.gcMx4.Name = "gcMx4";
-            this.gcMx4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemButtonEdit2,
-            this.repositoryItemButtonEdit3});
-            this.gcMx4.Size = new System.Drawing.Size(1430, 408);
-            this.gcMx4.TabIndex = 1;
-            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx4});
-            // 
-            // gvMx4
-            // 
-            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn4,
-            this.gridColumn5,
-            this.gridColumn11,
-            this.gridColumn6,
-            this.gridColumn7,
-            this.gridColumn8,
-            this.gridColumn10,
-            this.gridColumn16,
-            this.gridColumn9});
-            this.gvMx4.GridControl = this.gcMx4;
-            this.gvMx4.Name = "gvMx4";
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn4.FieldName = "guid";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.OptionsColumn.ReadOnly = true;
-            this.gridColumn4.Width = 94;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "闄勪欢鍚嶇О";
-            this.gridColumn5.FieldName = "fileTitle";
-            this.gridColumn5.MinWidth = 100;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.OptionsColumn.ReadOnly = true;
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 0;
-            this.gridColumn5.Width = 100;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "闄勪欢绫诲瀷";
-            this.gridColumn11.FieldName = "fileType";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 1;
-            this.gridColumn11.Width = 94;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "娴忚鍦板潃";
-            this.gridColumn6.FieldName = "urlPath";
-            this.gridColumn6.MinWidth = 200;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.OptionsColumn.ReadOnly = true;
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 2;
-            this.gridColumn6.Width = 200;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "涓婁紶鑰�";
-            this.gridColumn7.FieldName = "createBy";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 3;
-            this.gridColumn7.Width = 94;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "涓婁紶鏃堕棿";
-            this.gridColumn8.FieldName = "createDate";
-            this.gridColumn8.MinWidth = 25;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.OptionsColumn.ReadOnly = true;
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 4;
-            this.gridColumn8.Width = 94;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "娴忚";
-            this.gridColumn10.ColumnEdit = this.repositoryItemButtonEdit2;
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 5;
-            this.gridColumn10.Width = 94;
-            // 
-            // repositoryItemButtonEdit2
-            // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "涓嬭浇";
-            this.gridColumn16.ColumnEdit = this.repositoryItemButtonEdit3;
-            this.gridColumn16.MinWidth = 25;
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 6;
-            this.gridColumn16.Width = 94;
-            // 
-            // repositoryItemButtonEdit3
-            // 
-            this.repositoryItemButtonEdit3.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
-            this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "绉诲嚭";
-            this.gridColumn9.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gridColumn9.MinWidth = 25;
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 7;
-            this.gridColumn9.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // ucUpFile1
-            // 
-            this.ucUpFile1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.ucUpFile1.Location = new System.Drawing.Point(0, 0);
-            this.ucUpFile1.Name = "ucUpFile1";
-            this.ucUpFile1.parentGroup = null;
-            this.ucUpFile1.parentGuid = null;
-            this.ucUpFile1.Size = new System.Drawing.Size(1430, 57);
-            this.ucUpFile1.TabIndex = 0;
-            // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(903, 30);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 7;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
-            // 
-            // Frm_MesQaItemsDetect01Check
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1434, 800);
-            this.Controls.Add(this.picCheckBox);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesQaItemsDetect01Check";
-            this.Text = "iqc瀹℃牳";
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
-            this.split1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
-            this.split1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).EndInit();
-            this.xtraTabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
-            this.splitMx1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
-            this.splitMx1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
-            this.splitMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
-            this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcovertQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1Date.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_modify1By.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty1111)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.modify1By)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
-            this.xtraTabControl2.ResumeLayout(false);
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel1)).EndInit();
-            this.splitMx2.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2.Panel2)).EndInit();
-            this.splitMx2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx2)).EndInit();
-            this.splitMx2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).EndInit();
-            this.splitYangLi.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).EndInit();
-            this.splitYangLi.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).EndInit();
-            this.splitYangLi.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
-            this.groupControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).EndInit();
-            this.groupControl2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
-            this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-        #endregion
-        private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private System.Windows.Forms.PictureBox picCheckBox;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
-        private DevExpress.XtraLayout.LayoutControl layoutMx1;
-        private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.TextEdit txt_remarks;
-        private DevExpress.XtraEditors.TextEdit txt_fcovertQty;
-        private DevExpress.XtraEditors.TextEdit txt_suppName;
-        private DevExpress.XtraEditors.TextEdit txt_itemName;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
-        private DevExpress.XtraEditors.TextEdit txt_itemNo;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_lotNo;
-        private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
-        private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
-        private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
-        private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
-        private DevExpress.XtraEditors.TextEdit txt_releaseNo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraEditors.TextEdit txt_itemModel;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraEditors.CheckEdit txt_modify1Flag;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraEditors.SplitContainerControl splitMx2;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItemDesc;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fspecRequ;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1freQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkQyt;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fenterQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckResu;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngRate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraGrid.GridControl gcMx4;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private UserControl.UCUpFile ucUpFile1;
-        private DevExpress.XtraEditors.TextEdit txt_slOrg;
-        private DevExpress.XtraEditors.TextEdit txt_modify1Date;
-        private DevExpress.XtraEditors.TextEdit txt_modify1By;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraEditors.SplitContainerControl split1;
-        private DevExpress.XtraGrid.GridControl gcMain1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_iqcDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
-        private UserControls.Data.UcPageBar pageBar1;
-        private DevExpress.XtraEditors.SplitContainerControl splitYangLi;
-        private DevExpress.XtraEditors.GroupControl groupControl1;
-        private DevExpress.XtraGrid.GridControl gcMx2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
-        private DevExpress.XtraEditors.GroupControl groupControl2;
-        private DevExpress.XtraGrid.GridControl gcMx3;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
-        private DevExpress.XtraEditors.TextEdit txt_guid;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
-        private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem txt_freceQty1111;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem modify1By;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnError;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
deleted file mode 100644
index f4937ee..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ /dev/null
@@ -1,695 +0,0 @@
-锘縰sing Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Net;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.QC
-{
-    public partial class Frm_MesQaItemsDetect01Check : DevExpress.XtraEditors.XtraForm
-    {
-        string _webServiceName = "MesQaItemsDetect01Manager/";
-        List<FilterEntity> _filterList = new List<FilterEntity>();
-        public Frm_MesQaItemsDetect01Check()
-        {
-            InitializeComponent();
-            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
-            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
-            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnZhiLiangChkClick;
-            this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnZhiLiangFchkClick;
-            this.toolBarMenu1.btnBoHuiClick += ToolBarMenu1_btnBoHuiClick;
-            toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
-            toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
-            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
-            this.toolBarMenu1.getXmlConfig();
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
-           {
-               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-           }, tips);
-            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
-            {
-                getModel(value);
-            }, (value) =>
-            {
-                getPageList(this.pageBar1.CurrentPage);
-            }, lbGuid);
-            getPageList(1);
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
-            ucUpFile1.UpChanged += UcUpFile1_UpChanged;
-            xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
-            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-        }
-        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
-            Task.Delay(100);
-            getPageList(1);
-        }
-        private void GcMx1_MouseClick(object sender, MouseEventArgs e)
-        {
-            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
-            if (string.IsNullOrEmpty(rowGuid))
-                return;
-            getList12(rowGuid);
-        }
-        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
-        {
-            if (e.FocusedRowHandle >= 0)
-            {
-                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
-                string rowGuid = row["guid"].ToString();
-                if (string.IsNullOrEmpty(rowGuid))
-                    return;
-                getList12(rowGuid);
-            }
-        }
-        /// <summary>
-        /// 鍒嗛〉浜嬩欢
-        /// </summary>
-        /// <param name="curPage"></param>
-        /// <param name="pageSize"></param>
-        private void PageBar1_PagerEvent(int curPage, int pageSize)
-        {
-            getPageList(curPage);
-        }
-        /// <summary>
-        /// 鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            gridView1.ActiveFilter.Clear();
-            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
-        }
-        /// <summary>
-        /// 鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1);
-        }
-        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-        }
-        /// <summary>
-        /// 鍙栨秷浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
-        {
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
-        }
-        /// <summary>
-        /// 淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-
-            toolBarMenu1.isSetBtn = false;
-            if (txt_freceQty.SelectedIndex <= 0)
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
-                txt_freceQty.Focus();
-                return;
-            }
-            if (txt_freceQty.SelectedIndex == 1)
-            {
-                if ((txt_fmrmode.SelectedIndex > 0) || txt_fngHandle.SelectedIndex > 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.Warning("浣犲垽瀹氫簡鍚堟牸锛屽氨涓嶈兘鍐嶉�夋嫨鍏跺畠澶勭悊鏂瑰紡浜嗭紒");
-                    txt_fmrmode.Focus();
-                    return;
-                }
-            }
-            else
-            {
-                //褰撻�夋嫨涓嶅悎鏍兼椂锛岃濉啓鍘熷洜
-                if (txt_freceQty.SelectedIndex == 2)
-                {
-                    if ((txt_fngHandle.SelectedIndex <= 0))
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊缁撴灉锛�");
-                        txt_fngHandle.Focus();
-                        return;
-                    }
-                    if (txt_fngHandle.SelectedIndex == 1)
-                    {
-                        if ((txt_fmrmode.SelectedIndex <= 0))
-                        {
-                            Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
-                            txt_fmrmode.Focus();
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        if ((txt_fmrmode.SelectedIndex > 0))
-                        {
-                            Gs.DevApp.ToolBox.MsgHelper.Warning("浣犻�夋嫨浜嗙壒閲囦娇鐢紝灏变笉鑳藉啀閫夋嫨閫�鏂欐柟寮忎簡锛�");
-                            txt_fmrmode.Focus();
-                            return;
-                        }
-                    }
-                }
-            }
-            string _fmrmode = txt_fmrmode.SelectedIndex > 0 ? txt_fmrmode.Text.Trim() : "";
-            string _freceQty = txt_freceQty.SelectedIndex > 0 ? txt_freceQty.Text.Trim() : "";
-            string _fngHandle = txt_fngHandle.SelectedIndex > 0 ? txt_fngHandle.Text.Trim() : "";
-            var _obj = new
-            {
-                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                freceQty = _freceQty,
-                fngHandle = _fngHandle,
-                fmrmode = _fmrmode,
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    lbGuid.Text = _rtn.rtnData;
-                    toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
-                    toolBarMenu1.currentAction = "";
-                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 淇敼浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.currentAction = "edit";
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-            {
-                getModel(rowGuid);
-            }
-            else
-            {
-                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                gvList.Add(gvMx1);
-                gvList.Add(gvMx2);
-                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
-            }
-        }
-        private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
-        {
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_itemName, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-            toolBarMenu1.rptParameter = "rpt_Detect01{}";
-        }
-        private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
-        {
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_itemName, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-            this.toolBarMenu1.rptParameter = "rpt_Detect01{" + "1"
-                   + "," + "1"
-                   + "," + "1"
-                   + "," + "1"
-                   + "," + "1"
-                   + "}";
-        }
-
-        /// <summary>
-        /// 椹冲洖
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnBoHuiClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            _toolCk(-1);
-        }
-        /// <summary>
-        /// 璐ㄩ噺鍙嶅鏍�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnZhiLiangFchkClick(object sender, EventArgs e)
-        {
-            _toolCk(0);
-        }
-        /// <summary>
-        /// 璐ㄩ噺瀹℃牳
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnZhiLiangChkClick(object sender, EventArgs e)
-        {
-            _toolCk(1);
-        }
-
-        /// <summary>
-        /// 鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim());
-            else
-            {
-                //_filterList.Clear();
-                //if (gridView1.ActiveFilter.Count > 0)
-                //{
-                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                //    gridView1.ActiveFilter.Clear();
-                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                //}
-                //getPageList(1);
-                getPageList(this.pageBar1.CurrentPage);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage)
-        {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            _sbSqlWhere += " and isnull(fsubmit,0)=1";
-            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
-            string json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
-                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain1.BindingContext = new BindingContext();
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain1.DataSource = dt;
-                        gcMain1.ForceInitialize();
-                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-
-        }
-        private void getModel(string strGuid)
-        {
-            bool isEdit = false;
-            if (toolBarMenu1.currentAction == "add") return;
-            if (toolBarMenu1.currentAction == "edit") isEdit = true;
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            var _obj = new
-            {
-                guid = strGuid,//涓诲缓
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    dynamic dy = _rtn.rtnData;
-                    lbGuid.Text = strGuid;
-                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                    gvList.Add(gvMx1);
-                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-                    JObject _job = JObject.Parse(strJson);
-                    JArray array = new JArray();
-                    foreach (var a in _job["rtnData"]["list5"])
-                    {
-                        array.Add(a);
-                    }
-                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMx1.BindingContext = new BindingContext();
-                        gcMx1.DataSource = dt;
-                        gcMx1.ForceInitialize();
-                        gvMx1.BestFitColumns();
-                        ucUpFile1.parentGuid = lbGuid.Text.Trim();
-                        getList12(dt.Rows[0]["guid"].ToString());
-                    }
-                    else
-                    {
-                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-                    }
-                }
-                else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-
-        }
-        /// <summary>
-        /// 閫夐」鍗″垏鎹�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
-        {
-            if (e.Page.Name == "tabMxPage2")
-            {
-                getFileList();
-            }
-        }
-        /// <summary>
-        /// 涓婁紶鍚庡埛鏂版枃浠跺垪琛�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void UcUpFile1_UpChanged(object sender, EventArgs e)
-        {
-            getFileList();
-        }
-        private void getFileList()
-        {
-            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
-            _sbSqlWhere.Append(" and parent_Guid='" + lbGuid.Text.Trim() + "'");
-            PageQueryModel pgq = new PageQueryModel(1, 100, "create_date", "asc", "", _sbSqlWhere.ToString());
-            string json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                string strReturn = UtilityHelper.HttpPost("", "MesFile/GetListPage", json);
-                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMx4.BindingContext = new BindingContext();
-                    gcMx4.DataSource = dt;
-                    gcMx4.ForceInitialize();
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        /// <summary>
-        /// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋� 
-        /// </summary>
-        /// <param name="guid5"></param>
-        private void getList12(string guid5)
-        {
-            var _obj = new
-            {
-                parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                guid = UtilityHelper.ToGuid(guid5), //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
-                JObject _job = JObject.Parse(strJson);
-                JArray array = new JArray();
-                foreach (var a in _job["rtnData"]["list"])
-                {
-                    array.Add(a);
-                }
-                DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-                gcMx2.BindingContext = new BindingContext();
-                gcMx2.DataSource = dt;
-                gcMx2.ForceInitialize();
-                gvMx2.BestFitColumns();
-                JArray array1 = new JArray();
-                foreach (var a in _job["rtnData"]["list2"])
-                {
-                    array1.Add(a);
-                }
-                DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
-                gcMx4.BindingContext = new BindingContext();
-                gcMx4.DataSource = dt1;
-                gcMx4.ForceInitialize();
-                gvMx4.BestFitColumns();
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        /// <summary>
-        /// 鍒犻櫎
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            var rowhandle = gvMx4.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                var dr = gvMx4.GetDataRow(rowhandle);
-                var mxGuid = dr["guid"].ToString();
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                var strJson = "";
-                var lst = new List<string>();
-                lst.Add(mxGuid);
-                try
-                {
-                    strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
-                        JsonConvert.SerializeObject(lst));
-                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) gvMx4.DeleteRow(rowhandle);
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            }
-        }
-        /// <summary>
-        /// 娴忚
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            var rowhandle = gvMx4.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                try
-                {
-                    var dr = gvMx4.GetDataRow(rowhandle);
-                    var urlPath = dr["urlPath"].ToString();
-                    Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
-                    frm.ShowDialog();
-                }
-                catch (Exception ex)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
-                }
-            }
-        }
-        /// <summary>
-        /// 涓嬭浇
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            var rowhandle = gvMx4.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                try
-                {
-                    var dr = gvMx4.GetDataRow(rowhandle);
-                    var urlPath = dr["urlPath"].ToString();
-                    using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
-                    {
-                        folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
-                        DialogResult dialogResult = folderBrowserDialog.ShowDialog();
-                        if (dialogResult == DialogResult.OK)
-                        {
-                            string _folder = folderBrowserDialog.SelectedPath;
-                            string _folderName = _folder + "\\" + urlPath;
-                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + "upload/" + urlPath;
-                            using (WebClient client = new WebClient())
-                            {
-                                client.DownloadFile(_url, _folderName);
-                            }
-                            ToolBox.MsgHelper.ShowInformation("涓嬭浇鎴愬姛锛�");
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 宸ュ叿鏉′簨浠�
-        /// </summary>
-        /// <param name="inFieldValue"></param>
-        private void _toolCk(int _inFieldValue)
-        {
-            string strMsg = "";
-            switch (_inFieldValue)
-            {
-                case 1:
-                    strMsg = "瀹℃牳";
-                    break;
-                case 0:
-                    strMsg = "鍙嶅鏍�";
-                    break;
-                case -1:
-                    strMsg = "椹冲洖";
-                    break;
-            };
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
-                return;
-            if (_inFieldValue == 1)
-            {
-                if (txt_fcheckResu.Text == "涓嶅悎鏍�")
-                {
-                    if (txt_fngHandle.Text.Trim().Length == 0)
-                    {
-                        MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃惰閫夋嫨澶勭悊鏂瑰紡锛�");
-                        return;
-                    }
-                }
-            }
-            var _obj = new
-            {
-                guid = rowGuid,
-                inFieldValue = _inFieldValue,
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "EditModelSubmitZhiLiang",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
-                {
-                    if (_inFieldValue >= 0)
-                    {
-                        if (xtraTabControl1.SelectedTabPageIndex == 1)
-                        {
-                            getModel(lbGuid.Text.Trim());
-                        }
-                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
-                        gridView1.FocusedRowHandle = rowHandle;
-                        UtilityHelper.SetCheckIco(gridView1, "modifyFlagTxt", "modify1By", "modify1Date", picCheckBox, this, _inFieldValue.ToString());
-                    }
-                    else
-                    {
-                        //if (xtraTabControl1.SelectedTabPageIndex == 1)
-                        //    getModel(lbGuid.Text.Trim());
-                        //else
-                        //    getPageList(this.pageBar1.CurrentPage);
-                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
-                        getPageList(this.pageBar1.CurrentPage);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        public event Action CallMainFormMethod; // 瀹氫箟涓�涓簨浠�
-        /// <summary>
-        /// 鏌ョ湅寮傚父鎶ュ憡
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void rptBtnError_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            CallMainFormMethod?.Invoke(); // 瑙﹀彂浜嬩欢锛岃皟鐢ㄤ富绐椾綋鐨勬柟娉�
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
deleted file mode 100644
index 6a00c3f..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
+++ /dev/null
@@ -1,145 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
-        bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
-        lDGrVWBzo7oBRibyYgWmWYtQoams4gAHghawaMABAgGZIg1CacUWKxUISqG8jBUrMJaVFFwz99v9M4fx
-        JE/uh3POc8/NPUSpMxAAhIarXLXNr/A6v1ZWEW09XdsNeY1pXFZlrD2YKfWnebdyjZwU03qam+953kdc
-        dkYluQtPHpGeqRI49cM/oGukHdPOZxidcaJcdwPppaHOM1cDT/n4v/0qU59Z1fWSYNHnx+OKxFfq8fMd
-        Baaf9mLgcQ+ezP0NG+WR1QR13zmobocjVs67QOsXSy7rXwj2JHgFHUjdgWy1GlrzfRgtOvRa+zFkd84z
-        MD0L/XA3SlrjIL64HQHC0B1U4vpCcNTrmrzyMxy/JIbRNgfTxBx6Jp+iZ+o/NA876JMaoRlLhFIdBt5X
-        W2uo4JUFQdBB38eKmt04ppSiyWJH+5gDut8oY7PQjEzimrYSV1ou4WpnDEravkBQJNtGBe4Lgi0RUc79
-        p2IgrtOiQD+Fhn47Gs12VNxRo/hGISo6tMjX2xBfkApFbSg4wo1OKmB9zM8h7JCzhIQkqGyHL3QiVtWD
-        9OZxnNVOoMT4O1RNlzE40YIuSxtM5ge4/6iX0oeK67ccVPAGxWVTcDYh3hxuPT/uAMIzC/B1vgGiygHc
-        HvwT3UMWVN9sR1bRLxAr6hErqUNSRh3iU6tm+RFZCSyPVa9TiRtZyX5z96Z9K/GtIhx80TfIrW6A1jSG
-        9Dw1SquNaDcM4nt5GfZGZ8yfrR1m/HixDRu3y4dWfyBcSyWE5cXzrORFeiMx91O03DMiq7AVpr5x2B1/
-        IUmqRKftD6Skn0NimhKHUnJhm5pBQ/MDrOekaRmBm/vypW+t+uSdIp+A4Ge39ANIljVictoB65MZBISm
-        QCTJYVYOYfuPgCM4BsuvUzCYhrGem+EgEZITjMSVwlq+2jcku+SmWRhf9k+zph/9IxOIEmXP3/xl5FHE
-        fJeLsEgJjL2jKKu+i3WbxTqyJjiTvMeJZiQulMWUZe/6BLN5gpxRUVoNfiptBn9fMrw+3IWd9MwrbkJM
-        cjk2cKUjnu8LfBd2mmFr2HnC3ZvPyNxWePp7bOCeSPAPlN31C5RZ/badpiNLx9dtlhjWfHQ4ieXhvYLW
-        LXpJwKHNWwR5hFkSGv9P9BplGcXjOcz3LaG4rmWfJP8CiUU9Vuoq7pwAAAAASUVORK5CYII=
-</value>
-  </data>
-  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index a2e74cc..eacaeb1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -29,18 +29,18 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -67,8 +67,6 @@
             this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
             this.btnCopy = new DevExpress.XtraEditors.SimpleButton();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
-            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
             this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
             this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
@@ -77,19 +75,23 @@
             this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
             this.txt_ftype = new DevExpress.XtraEditors.TextEdit();
             this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
+            this.txt_mc = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -120,9 +122,11 @@
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.rptStation = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptGroup = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -150,19 +154,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -176,8 +184,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptStation)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -491,8 +500,6 @@
             // 
             this.layoutMx1.Controls.Add(this.btnCopy);
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
-            this.layoutMx1.Controls.Add(this.txt_itemId);
             this.layoutMx1.Controls.Add(this.txt_foneCheckdate);
             this.layoutMx1.Controls.Add(this.txt_foneCheckor);
             this.layoutMx1.Controls.Add(this.txt_itemNo);
@@ -501,6 +508,9 @@
             this.layoutMx1.Controls.Add(this.txt_foneChecked);
             this.layoutMx1.Controls.Add(this.txt_ftype);
             this.layoutMx1.Controls.Add(this.txt_isenabled);
+            this.layoutMx1.Controls.Add(this.txt_itemId);
+            this.layoutMx1.Controls.Add(this.txt_mc);
+            this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem13});
@@ -530,23 +540,6 @@
             this.lbGuid.Size = new System.Drawing.Size(269, 28);
             this.lbGuid.TabIndex = 387;
             this.lbGuid.Text = "label1";
-            // 
-            // txt_fSubsidiary
-            // 
-            this.txt_fSubsidiary.IsReadly = false;
-            this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
-            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
-            this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
-            this.txt_fSubsidiary.TabIndex = 383;
-            // 
-            // txt_itemId
-            // 
-            this.txt_itemId.IsReadly = false;
-            this.txt_itemId.Location = new System.Drawing.Point(84, 43);
-            this.txt_itemId.Name = "txt_itemId";
-            this.txt_itemId.Size = new System.Drawing.Size(200, 24);
-            this.txt_itemId.TabIndex = 380;
-            this.txt_itemId.Tag = "no";
             // 
             // txt_foneCheckdate
             // 
@@ -580,10 +573,10 @@
             // 
             // txt_memo
             // 
-            this.txt_memo.Location = new System.Drawing.Point(84, 74);
+            this.txt_memo.Location = new System.Drawing.Point(360, 74);
             this.txt_memo.Name = "txt_memo";
             this.txt_memo.Properties.Appearance.Options.UseFont = true;
-            this.txt_memo.Size = new System.Drawing.Size(477, 24);
+            this.txt_memo.Size = new System.Drawing.Size(201, 24);
             this.txt_memo.StyleController = this.layoutMx1;
             this.txt_memo.TabIndex = 219;
             // 
@@ -625,6 +618,34 @@
             this.txt_isenabled.TabIndex = 390;
             this.txt_isenabled.Tag = "readOnly";
             // 
+            // txt_itemId
+            // 
+            this.txt_itemId.Location = new System.Drawing.Point(84, 12);
+            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.Size = new System.Drawing.Size(200, 24);
+            this.txt_itemId.StyleController = this.layoutMx1;
+            this.txt_itemId.TabIndex = 391;
+            // 
+            // txt_mc
+            // 
+            this.txt_mc.Location = new System.Drawing.Point(84, 43);
+            this.txt_mc.Name = "txt_mc";
+            this.txt_mc.Size = new System.Drawing.Size(200, 24);
+            this.txt_mc.StyleController = this.layoutMx1;
+            this.txt_mc.TabIndex = 392;
+            this.txt_mc.Tag = "readOnly";
+            // 
+            // txt_fSubsidiary
+            // 
+            this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 74);
+            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+            this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
+            this.txt_fSubsidiary.StyleController = this.layoutMx1;
+            this.txt_fSubsidiary.TabIndex = 393;
+            this.txt_fSubsidiary.Tag = "readOnly";
+            // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.lbGuid;
@@ -642,74 +663,45 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem4,
-            this.layoutControlItem2,
             this.layoutControlItem10,
             this.layoutControlItem11,
             this.layoutControlItem12,
             this.layoutControlItem14,
             this.layoutControlItem3,
             this.layoutControlItem7,
+            this.layoutControlItem5,
+            this.layoutControlItem1,
             this.layoutControlItem8,
-            this.layoutControlItem5});
+            this.layoutControlItem2,
+            this.layoutControlItem4,
+            this.layoutControlItem6});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition9.Width = 100D;
-            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition10.Width = 100D;
-            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition11.Width = 100D;
-            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition12.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition9,
-            columnDefinition10,
-            columnDefinition11,
-            columnDefinition12});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition7,
-            rowDefinition8,
-            rowDefinition9});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3});
             this.Root.Size = new System.Drawing.Size(1127, 113);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_fSubsidiary;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_itemId;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_memo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 62);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(553, 31);
-            this.layoutControlItem2.Text = "澶囨敞";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
@@ -779,17 +771,6 @@
             this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_gg;
-            this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
-            this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_isenabled;
@@ -801,6 +782,57 @@
             this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem5.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_itemId;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem1.Text = "閫夋嫨鐗╂枡";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_gg;
+            this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_memo;
+            this.layoutControlItem2.Location = new System.Drawing.Point(276, 62);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem2.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem2.Text = "澶囨敞";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_mc;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fSubsidiary;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 62);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem6.Text = "浣跨敤缁勭粐";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
             // tabMx
             // 
@@ -835,7 +867,8 @@
             this.repositoryItemButtonEdit1,
             this.rptShunXui,
             this.rptStation,
-            this.repositoryItemCheckEdit1});
+            this.repositoryItemCheckEdit1,
+            this.rptGroup});
             this.gcMx1.Size = new System.Drawing.Size(1125, 413);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -861,7 +894,8 @@
             this.gridColumn19,
             this.gvMxDel,
             this.gridColumn6,
-            this.gridColumn9});
+            this.gridColumn9,
+            this.gridColumn10});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1007,8 +1041,6 @@
             this.sampleSizeName.Name = "sampleSizeName";
             this.sampleSizeName.OptionsColumn.ReadOnly = true;
             this.sampleSizeName.Tag = "edit";
-            this.sampleSizeName.Visible = true;
-            this.sampleSizeName.VisibleIndex = 5;
             this.sampleSizeName.Width = 150;
             // 
             // gvMx1fcheckLevel
@@ -1020,7 +1052,7 @@
             this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
             this.gvMx1fcheckLevel.Tag = "edit";
             this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 6;
+            this.gvMx1fcheckLevel.VisibleIndex = 5;
             this.gvMx1fcheckLevel.Width = 200;
             // 
             // rptJYSP
@@ -1040,7 +1072,7 @@
             this.gvMx1facLevel.Name = "gvMx1facLevel";
             this.gvMx1facLevel.Tag = "edit";
             this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 7;
+            this.gvMx1facLevel.VisibleIndex = 6;
             this.gvMx1facLevel.Width = 150;
             // 
             // rptJSSP
@@ -1059,7 +1091,7 @@
             this.gvMx1fupAllow.Name = "gvMx1fupAllow";
             this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 8;
+            this.gvMx1fupAllow.VisibleIndex = 7;
             this.gvMx1fupAllow.Width = 60;
             // 
             // gvMx1fstand
@@ -1070,7 +1102,7 @@
             this.gvMx1fstand.Name = "gvMx1fstand";
             this.gvMx1fstand.Tag = "yz_quantity_0_edit";
             this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 9;
+            this.gvMx1fstand.VisibleIndex = 8;
             this.gvMx1fstand.Width = 60;
             // 
             // gvMx1fdownAllow
@@ -1081,7 +1113,7 @@
             this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
             this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 10;
+            this.gvMx1fdownAllow.VisibleIndex = 9;
             this.gvMx1fdownAllow.Width = 60;
             // 
             // gridColumn19
@@ -1091,7 +1123,7 @@
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Tag = "edit";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 11;
+            this.gridColumn19.VisibleIndex = 10;
             this.gridColumn19.Width = 94;
             // 
             // gvMxDel
@@ -1107,10 +1139,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1124,7 +1156,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "edit";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 12;
+            this.gridColumn6.VisibleIndex = 11;
             this.gridColumn6.Width = 94;
             // 
             // rptStation
@@ -1143,9 +1175,34 @@
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Tag = "edit";
+            this.gridColumn9.UnboundDataType = typeof(bool);
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 13;
+            this.gridColumn9.VisibleIndex = 12;
             this.gridColumn9.Width = 94;
+            // 
+            // repositoryItemCheckEdit1
+            // 
+            this.repositoryItemCheckEdit1.AutoHeight = false;
+            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鎵�灞炲ぇ绫�";
+            this.gridColumn10.ColumnEdit = this.rptGroup;
+            this.gridColumn10.FieldName = "fcheckType";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Tag = "edit";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 13;
+            this.gridColumn10.Width = 94;
+            // 
+            // rptGroup
+            // 
+            this.rptGroup.AutoHeight = false;
+            this.rptGroup.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptGroup.Name = "rptGroup";
             // 
             // picCheckBox
             // 
@@ -1157,11 +1214,6 @@
             this.picCheckBox.TabIndex = 6;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
-            // 
-            // repositoryItemCheckEdit1
-            // 
-            this.repositoryItemCheckEdit1.AutoHeight = false;
-            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
             // 
             // Jyxm
             // 
@@ -1199,19 +1251,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1225,8 +1281,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptStation)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1255,14 +1312,10 @@
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private UserControl.UcLookOrg txt_fSubsidiary;
-        private UserControl.UcLookItems txt_itemId;
         private DevExpress.XtraEditors.TextEdit txt_itemNo;
         private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
         private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
         private DevExpress.XtraEditors.TextEdit txt_memo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraEditors.TextEdit txt_gg;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
@@ -1293,7 +1346,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
@@ -1307,11 +1359,20 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptStation;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraEditors.TextEdit txt_mc;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.TextEdit txt_fSubsidiary;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGroup;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 3a34c9e..48fb1fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -18,7 +18,6 @@
     public partial class Jyxm : DevExpress.XtraEditors.XtraUserControl
     {
         private List<FilterEntity> _filterList = new List<FilterEntity>();
-        string _ucItem = "";//鐗╂枡
         private readonly string _webServiceName = "MesQmCheckitemManager/";
         public string strType = "";//iqc type
         public decimal dfValue = 1;  //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
@@ -91,7 +90,7 @@
                     Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
                     return;
                 }
-                JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType);
+                JyxmShowCopy frm = new JyxmShowCopy(lbGuid.Text.Trim(), strType);
                 frm.ShowDialog();
             };
         }
@@ -257,14 +256,7 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string _orgId = txt_fSubsidiary.GetId();
-            if (string.IsNullOrEmpty(_orgId))
-            {
-                MsgHelper.Warning("璇烽�夋嫨浣跨敤缁勭粐锛�");
-                txt_fSubsidiary.Focus();
-                return;
-            }
-            string _ItemId = txt_itemId.GetId();
+            string _ItemId = txt_itemId.EditValue.ToString().Trim();
             if (string.IsNullOrEmpty(_ItemId))
             {
                 MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -369,6 +361,7 @@
                             FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
                             ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
                             stationName = row["stationName"].ToString(),
+                            FcheckType = row["FcheckType"].ToString(),
                             isRzxx = _isRzxx,
                         });
                     }
@@ -488,12 +481,10 @@
                 if (_rtn.rtnCode > 0)
                 {
                     var dy = _rtn.rtnData;
-                    _ucItem = dy.itemId;
                     lbGuid.Text = strGuid;
                     var gvList = new List<GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-                    _ucItem = "";
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -596,19 +587,27 @@
         #region 浠ヤ笅涓虹绉嶄笅鎷�
         private void _setIno()
         {
-            this.txt_fSubsidiary.EditChanged += (s, e) =>
+            txt_itemId.Click += (s, e) =>
             {
-                string _orgId = txt_fSubsidiary.GetId();
-                if (string.IsNullOrEmpty(_orgId))
-                    return;
-                txt_itemId.getSuppler(_orgId, _ucItem, " ", strType);
-            };
-            txt_itemId.EditChanged += (s, e) =>
-            {
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetModel()))
-                    txt_gg.Text = this.txt_itemId.GetModel();
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
-                    txt_itemNo.Text = this.txt_itemId.GetCode();
+                var frm = new JyxmShow(this.strType);
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    try
+                    {
+                        var lst = new List<dynamic>();
+                        lst = ee.DynamicList;
+                        txt_itemId.Text = lst[0].itemId;
+                        txt_gg.Text = lst[0].itemModel;
+                        txt_mc.Text = lst[0].itemName;
+                        txt_itemNo.Text = lst[0].itemNo;
+                        txt_fSubsidiary.Text = lst[0].fSubsidiary;
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
+                };
+                frm.ShowDialog();
             };
             _getListJyxm();
             _getListJygj();
@@ -616,7 +615,9 @@
             _getListJssp();
             _getListJysp();
             _getListStation();
+            _getListGroup();
         }
+
         /// <summary>
         /// 璇诲彇妫�楠岄」鐩�
         /// </summary>
@@ -702,8 +703,6 @@
                 foreach (DataRow dr in dt.Rows)
                 {
                     rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //string ddddd = dr["SampleSizeName"].ToString();
                 }
             }
             catch (Exception ex)
@@ -748,7 +747,22 @@
                 ,"7.鐗规畩妫�楠屾按骞�(S4)"
             });
         }
-
+        /// <summary>
+        /// 璇诲彇妫�楠屾按骞�
+        /// </summary>
+        private void _getListGroup()
+        {
+            rptGroup.Items.AddRange(new string[] {
+               "澶栬"
+               ,"棰滆壊"
+               ,"灏哄"
+               , "鍏抽敭閮ㄤ欢涓�鑷存��"
+               , "鍝佹按娴嬭瘯"
+                ,"鍒剁儹鎬ц兘"
+                ,"杩涙按鍘嬪姏"
+                ,"鐢垫皵鎬ц兘"
+            });
+        }
         /// <summary>
         /// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
         /// </summary>
@@ -812,6 +826,5 @@
             }
         }
         #endregion
-
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
index 6acc0ab..a4e60e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
@@ -33,431 +33,45 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
-            this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.sampleSizeName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.wizardPage1 = new DevExpress.XtraWizard.WizardPage();
-            this.splitLeft = new DevExpress.XtraEditors.SplitContainerControl();
+            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gvMain = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.panBom = new DevExpress.XtraEditors.PanelControl();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
-            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
-            this.gcMainCopy = new DevExpress.XtraGrid.GridControl();
-            this.gvMainCopy = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptBtnDel = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage();
-            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit();
-            this.wizardControl1.SuspendLayout();
-            this.welcomeWizardPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.wizardPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).BeginInit();
-            this.splitLeft.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).BeginInit();
-            this.splitLeft.Panel2.SuspendLayout();
-            this.splitLeft.SuspendLayout();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+            this.panelControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panBom)).BeginInit();
-            this.panBom.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitRight)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).BeginInit();
-            this.splitRight.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).BeginInit();
-            this.splitRight.Panel2.SuspendLayout();
-            this.splitRight.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.SuspendLayout();
             // 
-            // wizardControl1
+            // panelControl1
             // 
-            this.wizardControl1.CancelText = "鍙栨秷";
-            this.wizardControl1.Controls.Add(this.welcomeWizardPage1);
-            this.wizardControl1.Controls.Add(this.wizardPage1);
-            this.wizardControl1.Controls.Add(this.completionWizardPage1);
-            this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.wizardControl1.FinishText = "&淇濆瓨";
-            this.wizardControl1.ImageOptions.ImageWidth = 100;
-            this.wizardControl1.Margin = new System.Windows.Forms.Padding(4);
-            this.wizardControl1.MinimumSize = new System.Drawing.Size(133, 138);
-            this.wizardControl1.Name = "wizardControl1";
-            this.wizardControl1.NextText = "&涓嬩竴姝� >";
-            this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] {
-            this.welcomeWizardPage1,
-            this.wizardPage1,
-            this.completionWizardPage1});
-            this.wizardControl1.PreviousText = "< &涓婁竴姝�";
-            this.wizardControl1.Size = new System.Drawing.Size(1038, 718);
-            this.wizardControl1.Text = "";
+            this.panelControl1.Controls.Add(this.pageBar1);
+            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panelControl1.Location = new System.Drawing.Point(0, 642);
+            this.panelControl1.Name = "panelControl1";
+            this.panelControl1.Size = new System.Drawing.Size(947, 42);
+            this.panelControl1.TabIndex = 0;
             // 
-            // welcomeWizardPage1
+            // pageBar1
             // 
-            this.welcomeWizardPage1.Controls.Add(this.gcMx1);
-            this.welcomeWizardPage1.IntroductionText = "璇ュ悜瀵硷紝灏嗘妸褰撳墠鐗╂枡鐨勬楠岄」鐩紝澶嶅埗涓�涓垨澶氫釜鐗╂枡锛屽鍒惰繃绋嬩腑锛岃嫢閲嶅閫夋嫨浜嗙墿鏂欙紝灏嗚嚜鍔ㄨ繃婊わ紝鍙細澶嶅埗涓�娆★紒";
-            this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4);
-            this.welcomeWizardPage1.Name = "welcomeWizardPage1";
-            this.welcomeWizardPage1.ProceedText = "鐐瑰嚮 Next 缁х画杩涜";
-            this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553);
-            this.welcomeWizardPage1.Text = "褰撳墠妫�楠岄」鐩俊鎭�";
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptJYXM,
-            this.rptJYGJ,
-            this.rptJYBZ,
-            this.rptJSSP,
-            this.rptJYSP,
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(898, 553);
-            this.gcMx1.TabIndex = 1;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1pid,
-            this.gvMx1fcheckItem,
-            this.gvMx1forder,
-            this.gridColumn5,
-            this.gvMx1memo,
-            this.gvMx1fcheckTool,
-            this.gvMx1sampleSizeNo,
-            this.sampleSizeName,
-            this.gvMx1fcheckLevel,
-            this.gvMx1facLevel,
-            this.gvMx1fupAllow,
-            this.gvMx1fstand,
-            this.gvMx1fdownAllow,
-            this.gridColumn19});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
-            // 
-            // gvMx1pid
-            // 
-            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pid.Caption = "pid";
-            this.gvMx1pid.FieldName = "pid";
-            this.gvMx1pid.Name = "gvMx1pid";
-            this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Width = 94;
-            // 
-            // gvMx1fcheckItem
-            // 
-            this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
-            this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
-            this.gvMx1fcheckItem.FieldName = "fcheckItem";
-            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
-            this.gvMx1fcheckItem.Tag = "edit";
-            this.gvMx1fcheckItem.Visible = true;
-            this.gvMx1fcheckItem.VisibleIndex = 0;
-            this.gvMx1fcheckItem.Width = 150;
-            // 
-            // rptJYXM
-            // 
-            this.rptJYXM.AutoHeight = false;
-            this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYXM.Name = "rptJYXM";
-            // 
-            // gvMx1forder
-            // 
-            this.gvMx1forder.AppearanceCell.Options.UseFont = true;
-            this.gvMx1forder.Caption = "椤哄簭";
-            this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
-            this.gvMx1forder.FieldName = "forder";
-            this.gvMx1forder.Name = "gvMx1forder";
-            this.gvMx1forder.Tag = "yz_quantity_0_edit";
-            this.gvMx1forder.Visible = true;
-            this.gvMx1forder.VisibleIndex = 1;
-            this.gvMx1forder.Width = 50;
-            // 
-            // repositoryItemComboBox1
-            // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Items.AddRange(new object[] {
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
-            this.gridColumn5.FieldName = "fspecRequ";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Tag = "edit";
-            this.gridColumn5.Width = 150;
-            // 
-            // gvMx1memo
-            // 
-            this.gvMx1memo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
-            this.gvMx1memo.FieldName = "memo";
-            this.gvMx1memo.Name = "gvMx1memo";
-            this.gvMx1memo.Tag = "edit";
-            this.gvMx1memo.Width = 150;
-            // 
-            // gvMx1fcheckTool
-            // 
-            this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
-            this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
-            this.gvMx1fcheckTool.FieldName = "fcheckTool";
-            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
-            this.gvMx1fcheckTool.Tag = "edit";
-            this.gvMx1fcheckTool.Visible = true;
-            this.gvMx1fcheckTool.VisibleIndex = 2;
-            this.gvMx1fcheckTool.Width = 150;
-            // 
-            // rptJYGJ
-            // 
-            this.rptJYGJ.AutoHeight = false;
-            this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYGJ.Name = "rptJYGJ";
-            this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1sampleSizeNo
-            // 
-            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
-            this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
-            this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
-            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
-            this.gvMx1sampleSizeNo.Tag = "edit";
-            this.gvMx1sampleSizeNo.Visible = true;
-            this.gvMx1sampleSizeNo.VisibleIndex = 3;
-            this.gvMx1sampleSizeNo.Width = 150;
-            // 
-            // rptJYBZ
-            // 
-            this.rptJYBZ.AutoHeight = false;
-            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYBZ.Name = "rptJYBZ";
-            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // sampleSizeName
-            // 
-            this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
-            this.sampleSizeName.FieldName = "sampleSizeNo";
-            this.sampleSizeName.Name = "sampleSizeName";
-            this.sampleSizeName.OptionsColumn.ReadOnly = true;
-            this.sampleSizeName.Tag = "edit";
-            this.sampleSizeName.Width = 150;
-            // 
-            // gvMx1fcheckLevel
-            // 
-            this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
-            this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
-            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
-            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
-            this.gvMx1fcheckLevel.Tag = "edit";
-            this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 4;
-            this.gvMx1fcheckLevel.Width = 200;
-            // 
-            // rptJYSP
-            // 
-            this.rptJYSP.AutoHeight = false;
-            this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYSP.Name = "rptJYSP";
-            this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1facLevel
-            // 
-            this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
-            this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
-            this.gvMx1facLevel.FieldName = "facLevel";
-            this.gvMx1facLevel.Name = "gvMx1facLevel";
-            this.gvMx1facLevel.Tag = "edit";
-            this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 5;
-            this.gvMx1facLevel.Width = 150;
-            // 
-            // rptJSSP
-            // 
-            this.rptJSSP.AutoHeight = false;
-            this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJSSP.Name = "rptJSSP";
-            this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1fupAllow
-            // 
-            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fupAllow.Caption = "涓婇檺";
-            this.gvMx1fupAllow.FieldName = "fupAllow";
-            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
-            this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
-            this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 6;
-            this.gvMx1fupAllow.Width = 60;
-            // 
-            // gvMx1fstand
-            // 
-            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fstand.Caption = "鏍囧噯鍊�";
-            this.gvMx1fstand.FieldName = "fstand";
-            this.gvMx1fstand.Name = "gvMx1fstand";
-            this.gvMx1fstand.Tag = "yz_quantity_0_edit";
-            this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 7;
-            this.gvMx1fstand.Width = 60;
-            // 
-            // gvMx1fdownAllow
-            // 
-            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fdownAllow.Caption = "涓嬮檺";
-            this.gvMx1fdownAllow.FieldName = "fdownAllow";
-            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
-            this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
-            this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 8;
-            this.gvMx1fdownAllow.Width = 60;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
-            this.gridColumn19.FieldName = "ypsl";
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Tag = "edit";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 9;
-            this.gridColumn19.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            // 
-            // wizardPage1
-            // 
-            this.wizardPage1.Controls.Add(this.splitLeft);
-            this.wizardPage1.DescriptionText = "浣犲彲閫夋嫨涓�涓垨澶氫釜锛岄噸澶嶆垨宸茶缃殑鐗╂枡锛屼繚瀛樻椂灏嗚嚜鍔ㄥ拷鐣�";
-            this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
-            this.wizardPage1.Name = "wizardPage1";
-            this.wizardPage1.Size = new System.Drawing.Size(998, 540);
-            this.wizardPage1.Text = "閫夋嫨鐗╂枡";
-            // 
-            // splitLeft
-            // 
-            this.splitLeft.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitLeft.Location = new System.Drawing.Point(0, 0);
-            this.splitLeft.Name = "splitLeft";
-            // 
-            // splitLeft.Panel1
-            // 
-            this.splitLeft.Panel1.Controls.Add(this.gcMain);
-            this.splitLeft.Panel1.Controls.Add(this.panBom);
-            this.splitLeft.Panel1.Text = "Panel1";
-            // 
-            // splitLeft.Panel2
-            // 
-            this.splitLeft.Panel2.Controls.Add(this.splitRight);
-            this.splitLeft.Panel2.Text = "Panel2";
-            this.splitLeft.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitLeft.Size = new System.Drawing.Size(998, 540);
-            this.splitLeft.SplitterPosition = 519;
-            this.splitLeft.TabIndex = 1;
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pageBar1.Location = new System.Drawing.Point(2, 2);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(943, 38);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
             // 
             // gcMain
             // 
@@ -465,8 +79,10 @@
             this.gcMain.Location = new System.Drawing.Point(0, 0);
             this.gcMain.MainView = this.gvMain;
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(519, 496);
-            this.gcMain.TabIndex = 7;
+            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMain.Size = new System.Drawing.Size(947, 642);
+            this.gcMain.TabIndex = 8;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMain});
             // 
@@ -477,29 +93,19 @@
             this.gvMain.Appearance.Row.Options.UseFont = true;
             this.gvMain.ColumnPanelRowHeight = 50;
             this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.colChkInt,
             this.gv_guid,
             this.gridColumn1,
             this.gv2,
             this.gv_salesOrderId,
             this.gv_orderLineId,
-            this.gv_itemId});
+            this.gv_itemId,
+            this.gridColumn2});
             this.gvMain.GridControl = this.gcMain;
             this.gvMain.IndicatorWidth = 50;
             this.gvMain.Name = "gvMain";
             this.gvMain.OptionsFind.ShowSearchNavButtons = false;
             this.gvMain.OptionsView.ShowAutoFilterRow = true;
             this.gvMain.OptionsView.ShowGroupPanel = false;
-            // 
-            // colChkInt
-            // 
-            this.colChkInt.Caption = ".";
-            this.colChkInt.FieldName = "chkInt";
-            this.colChkInt.MinWidth = 25;
-            this.colChkInt.Name = "colChkInt";
-            this.colChkInt.Visible = true;
-            this.colChkInt.VisibleIndex = 0;
-            this.colChkInt.Width = 94;
             // 
             // gv_guid
             // 
@@ -531,7 +137,7 @@
             this.gv2.OptionsColumn.AllowEdit = false;
             this.gv2.Tag = "a.id";
             this.gv2.Visible = true;
-            this.gv2.VisibleIndex = 1;
+            this.gv2.VisibleIndex = 0;
             this.gv2.Width = 50;
             // 
             // gv_salesOrderId
@@ -543,7 +149,7 @@
             this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
             this.gv_salesOrderId.Tag = "a.item_no";
             this.gv_salesOrderId.Visible = true;
-            this.gv_salesOrderId.VisibleIndex = 2;
+            this.gv_salesOrderId.VisibleIndex = 1;
             this.gv_salesOrderId.Width = 50;
             // 
             // gv_orderLineId
@@ -555,7 +161,7 @@
             this.gv_orderLineId.OptionsColumn.AllowEdit = false;
             this.gv_orderLineId.Tag = "a.item_name";
             this.gv_orderLineId.Visible = true;
-            this.gv_orderLineId.VisibleIndex = 3;
+            this.gv_orderLineId.VisibleIndex = 2;
             this.gv_orderLineId.Width = 50;
             // 
             // gv_itemId
@@ -566,256 +172,57 @@
             this.gv_itemId.Name = "gv_itemId";
             this.gv_itemId.OptionsColumn.AllowEdit = false;
             this.gv_itemId.Tag = "a.item_model";
+            this.gv_itemId.Visible = true;
+            this.gv_itemId.VisibleIndex = 3;
             this.gv_itemId.Width = 50;
             // 
-            // panBom
+            // gridColumn2
             // 
-            this.panBom.Controls.Add(this.pageBar1);
-            this.panBom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panBom.Location = new System.Drawing.Point(0, 496);
-            this.panBom.Name = "panBom";
-            this.panBom.Size = new System.Drawing.Size(519, 44);
-            this.panBom.TabIndex = 6;
+            this.gridColumn2.Caption = "閫夋嫨";
+            this.gridColumn2.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 5;
+            this.gridColumn2.Width = 94;
             // 
-            // pageBar1
+            // repositoryItemButtonEdit1
             // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pageBar1.Location = new System.Drawing.Point(2, 2);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(515, 40);
-            this.pageBar1.TabIndex = 3;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // splitRight
-            // 
-            this.splitRight.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitRight.Location = new System.Drawing.Point(0, 0);
-            this.splitRight.Name = "splitRight";
-            // 
-            // splitRight.Panel1
-            // 
-            this.splitRight.Panel1.Controls.Add(this.btnIn);
-            this.splitRight.Panel1.Text = "Panel1";
-            // 
-            // splitRight.Panel2
-            // 
-            this.splitRight.Panel2.Controls.Add(this.gcMainCopy);
-            this.splitRight.Panel2.Text = "Panel2";
-            this.splitRight.Size = new System.Drawing.Size(467, 540);
-            this.splitRight.SplitterPosition = 45;
-            this.splitRight.TabIndex = 3;
-            // 
-            // btnIn
-            // 
-            this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.btnIn.Appearance.Options.UseForeColor = true;
-            this.btnIn.Location = new System.Drawing.Point(4, 199);
-            this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(39, 29);
-            this.btnIn.TabIndex = 0;
-            this.btnIn.Text = ">>";
-            // 
-            // gcMainCopy
-            // 
-            this.gcMainCopy.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMainCopy.Location = new System.Drawing.Point(0, 0);
-            this.gcMainCopy.MainView = this.gvMainCopy;
-            this.gcMainCopy.Name = "gcMainCopy";
-            this.gcMainCopy.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptBtnDel});
-            this.gcMainCopy.Size = new System.Drawing.Size(410, 540);
-            this.gcMainCopy.TabIndex = 2;
-            this.gcMainCopy.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMainCopy});
-            // 
-            // gvMainCopy
-            // 
-            this.gvMainCopy.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn11,
-            this.gridColumn12,
-            this.gridColumn13,
-            this.gridColumn14,
-            this.gridColumn15,
-            this.gridColumn6,
-            this.gridColumn9});
-            this.gvMainCopy.GridControl = this.gcMainCopy;
-            this.gvMainCopy.Name = "gvMainCopy";
-            this.gvMainCopy.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
-            this.gvMainCopy.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMainCopy.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.AppearanceCell.Options.UseFont = true;
-            this.gridColumn11.Caption = "浣跨敤缁勭粐";
-            this.gridColumn11.FieldName = "fSubsidiary";
-            this.gridColumn11.MinWidth = 10;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.OptionsColumn.ReadOnly = true;
-            this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 0;
-            this.gridColumn11.Width = 150;
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "鐗╂枡ID";
-            this.gridColumn12.FieldName = "id";
-            this.gridColumn12.MinWidth = 10;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.OptionsColumn.ReadOnly = true;
-            this.gridColumn12.Tag = "query_a.item_id";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 1;
-            this.gridColumn12.Width = 150;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.AppearanceCell.Options.UseFont = true;
-            this.gridColumn13.Caption = "鐗╂枡缂栧彿";
-            this.gridColumn13.FieldName = "itemNo";
-            this.gridColumn13.MinWidth = 10;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.OptionsColumn.ReadOnly = true;
-            this.gridColumn13.Tag = "query_a.item_no";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 2;
-            this.gridColumn13.Width = 150;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.AppearanceCell.Options.UseFont = true;
-            this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn14.FieldName = "itemName";
-            this.gridColumn14.MinWidth = 10;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.OptionsColumn.ReadOnly = true;
-            this.gridColumn14.Tag = "query_a.item_name";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 3;
-            this.gridColumn14.Width = 150;
-            // 
-            // gridColumn15
-            // 
-            this.gridColumn15.AppearanceCell.Options.UseFont = true;
-            this.gridColumn15.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn15.FieldName = "itemModel";
-            this.gridColumn15.MinWidth = 10;
-            this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.OptionsColumn.ReadOnly = true;
-            this.gridColumn15.Tag = "query_a.item_model";
-            this.gridColumn15.Width = 150;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "绉诲嚭";
-            this.gridColumn6.ColumnEdit = this.rptBtnDel;
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 94;
-            // 
-            // rptBtnDel
-            // 
-            this.rptBtnDel.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.rptBtnDel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.rptBtnDel.Name = "rptBtnDel";
-            this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick);
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "gridColumn9";
-            this.gridColumn9.FieldName = "guid";
-            this.gridColumn9.MinWidth = 25;
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Width = 94;
-            // 
-            // completionWizardPage1
-            // 
-            this.completionWizardPage1.FinishText = "鏈�鍚庝竴姝ワ紝鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
-            this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4);
-            this.completionWizardPage1.Name = "completionWizardPage1";
-            this.completionWizardPage1.ProceedText = "鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
-            this.completionWizardPage1.Size = new System.Drawing.Size(898, 553);
-            this.completionWizardPage1.Text = "淇濆瓨淇℃伅";
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // JyxmShow
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1038, 718);
-            this.Controls.Add(this.wizardControl1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.ClientSize = new System.Drawing.Size(947, 684);
+            this.Controls.Add(this.gcMain);
+            this.Controls.Add(this.panelControl1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "JyxmShow";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "妫�楠岄」鐩鍒�";
-            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
-            this.wizardControl1.ResumeLayout(false);
-            this.welcomeWizardPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.wizardPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).EndInit();
-            this.splitLeft.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).EndInit();
-            this.splitLeft.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).EndInit();
-            this.splitLeft.ResumeLayout(false);
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "JyxmShow2";
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+            this.panelControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panBom)).EndInit();
-            this.panBom.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).EndInit();
-            this.splitRight.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).EndInit();
-            this.splitRight.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitRight)).EndInit();
-            this.splitRight.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private DevExpress.XtraWizard.WizardControl wizardControl1;
-        private DevExpress.XtraWizard.WelcomeWizardPage welcomeWizardPage1;
-        private DevExpress.XtraWizard.WizardPage wizardPage1;
-        private DevExpress.XtraWizard.CompletionWizardPage completionWizardPage1;
-        private DevExpress.XtraEditors.SplitContainerControl splitLeft;
-        private DevExpress.XtraGrid.GridControl gcMainCopy;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMainCopy;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnDel;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraEditors.SplitContainerControl splitRight;
-        private DevExpress.XtraEditors.SimpleButton btnIn;
-        private DevExpress.XtraEditors.PanelControl panBom;
+        private DevExpress.XtraEditors.PanelControl panelControl1;
         private DevExpress.XtraGrid.GridControl gcMain;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMain;
         private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
@@ -825,30 +232,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
         private UserControls.Data.UcPageBar pageBar1;
-        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
-        private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
index 37d21ee..e7f4fa1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
@@ -1,8 +1,6 @@
-锘縰sing DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -15,116 +13,21 @@
     {
         private List<FilterEntity> _filterList = new List<FilterEntity>();
         private readonly string _webServiceName = "MesQmCheckitemManager/";
-        private string strType = "";//iqc,ipqc,fqc
-        private string sourceGuid = "";//婧恎uid
+        public string strType = "";//iqc type
         /// <summary>
         /// 
         /// </summary>
         /// <param name="_sourceGuid"></param>
         /// <param name="_strType"></param>
-        public JyxmShow(string _sourceGuid, string _strType)
+        public JyxmShow(string strType)
         {
             InitializeComponent();
-            strType = _strType;
-            sourceGuid = _sourceGuid;
-            this.gvMain.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
-            this.gvMain.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gvMain); };
-            this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.colChkInt.OptionsFilter.AllowAutoFilter = false;
-            this.colChkInt.OptionsFilter.AllowFilter = false;
-            this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
-            this.pageBar1.setBar(false);
+            this.strType = strType;
+            this.Text = "閫夋嫨鐗╂枡-" + strType;
             getPageList(1);
-            getModel(_sourceGuid);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMainCopy);
-            UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
-            btnIn.Click += (s, e) =>
-            {
-                gvMain.PostEditor();
-                gvMain.UpdateCurrentRow();
-                var list = new List<string>();
-                DataTable _oldTable = (DataTable)gcMainCopy.DataSource;
-                DataTable dt = this.gcMain.DataSource as DataTable;
-                {
-                    foreach (DataRow dr in dt.Rows)
-                    {
-                        string checkBox = dr["chkInt"].ToString();
-                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
-                        {
-                            _oldTable.ImportRow(dr);
-                        }
-                    }
-                }
-                if (_oldTable.Rows.Count <= 0)
-                {
-                    MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
-                    return;
-                }
-                gcMainCopy.BindingContext = new BindingContext();
-                gcMainCopy.DataSource = _oldTable;
-                gcMainCopy.ForceInitialize();
-                gvMainCopy.BestFitColumns();
-            };
-            this.wizardControl1.FinishClick += (s, e) =>
-            {
-                int _rows = gvMainCopy.RowCount;
-                if (_rows <= 0)
-                {
-                    MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
-                    e.Cancel = true;
-                    return;
-                }
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
-                {
-                    e.Cancel = true;
-                    return;
-                }
-                System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
-                for (var i = 0; i < gvMainCopy.DataRowCount; i++)
-                {
-                    var row = gvMainCopy.GetDataRow(i);
-                    if (_sbGuids.Length > 0)
-                        _sbGuids.Append(",");
-                    Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
-                    _sbGuids.Append(_guid.ToString());
-                }
-                var _obj = new
-                {
-                    sourceGuid = UtilityHelper.ToGuid(sourceGuid),
-                    itemGuids = _sbGuids.ToString(),
-                    iqcType = this.strType,
-                };
-                try
-                {
-                    var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
-                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                    if (_rtn.rtnCode > 0)
-                    {
-                        UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            };
-            this.wizardControl1.NextClick += (s, e) =>
-            {
-                string pageText = e.Page.Text;
-                if (pageText == "閫夋嫨鐗╂枡")
-                {
-                    int _rows = gvMainCopy.RowCount;
-                    if (_rows <= 0)
-                    {
-                        MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
-                        e.Handled = true;
-                        return;
-                    }
-                }
-            };
+
         }
 
         #region 婧愮墿鏂欐暟鎹粦瀹�
@@ -152,9 +55,8 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain.DataSource = null; 
+            gcMain.DataSource = null;
             var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            //_sbSqlWhere += "  and q.guid is  null";
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -192,73 +94,44 @@
 
         #endregion
 
-        private void getModel(string strGuid)
-        {
-            var _obj = new
-            {
-                guid = strGuid //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                         _webServiceName + "GetModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn =
-                    UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    var dy = _rtn.rtnData;
-                    var gvList = new List<GridView>();
-                    gvList.Add(gvMx1);
-                    var _job = JObject.Parse(strJson);
-                    var array = new JArray();
-                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
-                    var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMx1.BindingContext = new BindingContext();
-                        gcMx1.DataSource = dt;
-                        gcMx1.ForceInitialize();
-                        gvMx1.BestFitColumns();
-                    }
-                    else
-                    {
-                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-                    }
-                    UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
-                }
-                else
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
 
         /// <summary>
-        /// 鍒犻櫎澶嶅埗椤�
+        /// 纭畾閫夋嫨
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void rptBtnDel_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            gvMainCopy.CloseEditor();
-            gvMainCopy.UpdateCurrentRow();
-            var rowhandle = gvMainCopy.FocusedRowHandle;
+            var rowhandle = gvMain.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
             if (e.Button.Index == 0)
             {
-                var dr = gvMainCopy.GetDataRow(rowhandle);
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                var dr = gvMain.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (string.IsNullOrEmpty(mxGuid))
+                {
                     return;
-                gvMainCopy.DeleteRow(rowhandle);
-                return;
+                }
+                var list = new List<dynamic>();
+                list.Add(new
+                {
+                    guid = dr["guid"].ToString(),
+                    itemId = dr["id"].ToString(),
+                    itemName = dr["itemName"].ToString(),
+                    itemNo = dr["itemNo"].ToString(),
+                    itemModel = dr["itemModel"].ToString(),
+                    fSubsidiary= dr["fSubsidiary"].ToString(),
+                });
+                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+                Close();
             }
         }
+
+        /// <summary>
+        ///     閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
new file mode 100644
index 0000000..76ab316
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
@@ -0,0 +1,854 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+    partial class JyxmShowCopy
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
+            this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.sampleSizeName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.wizardPage1 = new DevExpress.XtraWizard.WizardPage();
+            this.splitLeft = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gvMain = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panBom = new DevExpress.XtraEditors.PanelControl();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
+            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            this.gcMainCopy = new DevExpress.XtraGrid.GridControl();
+            this.gvMainCopy = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptBtnDel = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.completionWizardPage1 = new DevExpress.XtraWizard.CompletionWizardPage();
+            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).BeginInit();
+            this.wizardControl1.SuspendLayout();
+            this.welcomeWizardPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            this.wizardPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).BeginInit();
+            this.splitLeft.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).BeginInit();
+            this.splitLeft.Panel2.SuspendLayout();
+            this.splitLeft.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panBom)).BeginInit();
+            this.panBom.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitRight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).BeginInit();
+            this.splitRight.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).BeginInit();
+            this.splitRight.Panel2.SuspendLayout();
+            this.splitRight.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // wizardControl1
+            // 
+            this.wizardControl1.CancelText = "鍙栨秷";
+            this.wizardControl1.Controls.Add(this.welcomeWizardPage1);
+            this.wizardControl1.Controls.Add(this.wizardPage1);
+            this.wizardControl1.Controls.Add(this.completionWizardPage1);
+            this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.wizardControl1.FinishText = "&淇濆瓨";
+            this.wizardControl1.ImageOptions.ImageWidth = 100;
+            this.wizardControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.wizardControl1.MinimumSize = new System.Drawing.Size(133, 138);
+            this.wizardControl1.Name = "wizardControl1";
+            this.wizardControl1.NextText = "&涓嬩竴姝� >";
+            this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] {
+            this.welcomeWizardPage1,
+            this.wizardPage1,
+            this.completionWizardPage1});
+            this.wizardControl1.PreviousText = "< &涓婁竴姝�";
+            this.wizardControl1.Size = new System.Drawing.Size(1038, 718);
+            this.wizardControl1.Text = "";
+            // 
+            // welcomeWizardPage1
+            // 
+            this.welcomeWizardPage1.Controls.Add(this.gcMx1);
+            this.welcomeWizardPage1.IntroductionText = "璇ュ悜瀵硷紝灏嗘妸褰撳墠鐗╂枡鐨勬楠岄」鐩紝澶嶅埗涓�涓垨澶氫釜鐗╂枡锛屽鍒惰繃绋嬩腑锛岃嫢閲嶅閫夋嫨浜嗙墿鏂欙紝灏嗚嚜鍔ㄨ繃婊わ紝鍙細澶嶅埗涓�娆★紒";
+            this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.welcomeWizardPage1.Name = "welcomeWizardPage1";
+            this.welcomeWizardPage1.ProceedText = "鐐瑰嚮 Next 缁х画杩涜";
+            this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553);
+            this.welcomeWizardPage1.Text = "褰撳墠妫�楠岄」鐩俊鎭�";
+            // 
+            // gcMx1
+            // 
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.rptJYXM,
+            this.rptJYGJ,
+            this.rptJYBZ,
+            this.rptJSSP,
+            this.rptJYSP,
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemComboBox1});
+            this.gcMx1.Size = new System.Drawing.Size(898, 553);
+            this.gcMx1.TabIndex = 1;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1guid,
+            this.gvMx1pid,
+            this.gvMx1fcheckItem,
+            this.gvMx1forder,
+            this.gridColumn5,
+            this.gvMx1memo,
+            this.gvMx1fcheckTool,
+            this.gvMx1sampleSizeNo,
+            this.sampleSizeName,
+            this.gvMx1fcheckLevel,
+            this.gvMx1facLevel,
+            this.gvMx1fupAllow,
+            this.gvMx1fstand,
+            this.gvMx1fdownAllow,
+            this.gridColumn19});
+            this.gvMx1.GridControl = this.gcMx1;
+            this.gvMx1.Name = "gvMx1";
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx1guid
+            // 
+            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1guid.Caption = "guid";
+            this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.Tag = "query_a.guid";
+            this.gvMx1guid.Width = 94;
+            // 
+            // gvMx1pid
+            // 
+            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1pid.Caption = "pid";
+            this.gvMx1pid.FieldName = "pid";
+            this.gvMx1pid.Name = "gvMx1pid";
+            this.gvMx1pid.Tag = "query_a.pid";
+            this.gvMx1pid.Width = 94;
+            // 
+            // gvMx1fcheckItem
+            // 
+            this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
+            this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
+            this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
+            this.gvMx1fcheckItem.FieldName = "fcheckItem";
+            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
+            this.gvMx1fcheckItem.Tag = "edit";
+            this.gvMx1fcheckItem.Visible = true;
+            this.gvMx1fcheckItem.VisibleIndex = 0;
+            this.gvMx1fcheckItem.Width = 150;
+            // 
+            // rptJYXM
+            // 
+            this.rptJYXM.AutoHeight = false;
+            this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptJYXM.Name = "rptJYXM";
+            // 
+            // gvMx1forder
+            // 
+            this.gvMx1forder.AppearanceCell.Options.UseFont = true;
+            this.gvMx1forder.Caption = "椤哄簭";
+            this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
+            this.gvMx1forder.FieldName = "forder";
+            this.gvMx1forder.Name = "gvMx1forder";
+            this.gvMx1forder.Tag = "yz_quantity_0_edit";
+            this.gvMx1forder.Visible = true;
+            this.gvMx1forder.VisibleIndex = 1;
+            this.gvMx1forder.Width = 50;
+            // 
+            // repositoryItemComboBox1
+            // 
+            this.repositoryItemComboBox1.AutoHeight = false;
+            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox1.Items.AddRange(new object[] {
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "10",
+            "11",
+            "12",
+            "13",
+            "14",
+            "15"});
+            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
+            this.gridColumn5.FieldName = "fspecRequ";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Tag = "edit";
+            this.gridColumn5.Width = 150;
+            // 
+            // gvMx1memo
+            // 
+            this.gvMx1memo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
+            this.gvMx1memo.FieldName = "memo";
+            this.gvMx1memo.Name = "gvMx1memo";
+            this.gvMx1memo.Tag = "edit";
+            this.gvMx1memo.Width = 150;
+            // 
+            // gvMx1fcheckTool
+            // 
+            this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
+            this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
+            this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
+            this.gvMx1fcheckTool.FieldName = "fcheckTool";
+            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
+            this.gvMx1fcheckTool.Tag = "edit";
+            this.gvMx1fcheckTool.Visible = true;
+            this.gvMx1fcheckTool.VisibleIndex = 2;
+            this.gvMx1fcheckTool.Width = 150;
+            // 
+            // rptJYGJ
+            // 
+            this.rptJYGJ.AutoHeight = false;
+            this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptJYGJ.Name = "rptJYGJ";
+            this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // gvMx1sampleSizeNo
+            // 
+            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
+            this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
+            this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
+            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
+            this.gvMx1sampleSizeNo.Tag = "edit";
+            this.gvMx1sampleSizeNo.Visible = true;
+            this.gvMx1sampleSizeNo.VisibleIndex = 3;
+            this.gvMx1sampleSizeNo.Width = 150;
+            // 
+            // rptJYBZ
+            // 
+            this.rptJYBZ.AutoHeight = false;
+            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptJYBZ.Name = "rptJYBZ";
+            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // sampleSizeName
+            // 
+            this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
+            this.sampleSizeName.FieldName = "sampleSizeNo";
+            this.sampleSizeName.Name = "sampleSizeName";
+            this.sampleSizeName.OptionsColumn.ReadOnly = true;
+            this.sampleSizeName.Tag = "edit";
+            this.sampleSizeName.Width = 150;
+            // 
+            // gvMx1fcheckLevel
+            // 
+            this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
+            this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
+            this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
+            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
+            this.gvMx1fcheckLevel.Tag = "edit";
+            this.gvMx1fcheckLevel.Visible = true;
+            this.gvMx1fcheckLevel.VisibleIndex = 4;
+            this.gvMx1fcheckLevel.Width = 200;
+            // 
+            // rptJYSP
+            // 
+            this.rptJYSP.AutoHeight = false;
+            this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptJYSP.Name = "rptJYSP";
+            this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // gvMx1facLevel
+            // 
+            this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
+            this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
+            this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
+            this.gvMx1facLevel.FieldName = "facLevel";
+            this.gvMx1facLevel.Name = "gvMx1facLevel";
+            this.gvMx1facLevel.Tag = "edit";
+            this.gvMx1facLevel.Visible = true;
+            this.gvMx1facLevel.VisibleIndex = 5;
+            this.gvMx1facLevel.Width = 150;
+            // 
+            // rptJSSP
+            // 
+            this.rptJSSP.AutoHeight = false;
+            this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptJSSP.Name = "rptJSSP";
+            this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // gvMx1fupAllow
+            // 
+            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
+            this.gvMx1fupAllow.Caption = "涓婇檺";
+            this.gvMx1fupAllow.FieldName = "fupAllow";
+            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
+            this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
+            this.gvMx1fupAllow.Visible = true;
+            this.gvMx1fupAllow.VisibleIndex = 6;
+            this.gvMx1fupAllow.Width = 60;
+            // 
+            // gvMx1fstand
+            // 
+            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
+            this.gvMx1fstand.Caption = "鏍囧噯鍊�";
+            this.gvMx1fstand.FieldName = "fstand";
+            this.gvMx1fstand.Name = "gvMx1fstand";
+            this.gvMx1fstand.Tag = "yz_quantity_0_edit";
+            this.gvMx1fstand.Visible = true;
+            this.gvMx1fstand.VisibleIndex = 7;
+            this.gvMx1fstand.Width = 60;
+            // 
+            // gvMx1fdownAllow
+            // 
+            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
+            this.gvMx1fdownAllow.Caption = "涓嬮檺";
+            this.gvMx1fdownAllow.FieldName = "fdownAllow";
+            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
+            this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
+            this.gvMx1fdownAllow.Visible = true;
+            this.gvMx1fdownAllow.VisibleIndex = 8;
+            this.gvMx1fdownAllow.Width = 60;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
+            this.gridColumn19.FieldName = "ypsl";
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Tag = "edit";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 9;
+            this.gridColumn19.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            // 
+            // wizardPage1
+            // 
+            this.wizardPage1.Controls.Add(this.splitLeft);
+            this.wizardPage1.DescriptionText = "浣犲彲閫夋嫨涓�涓垨澶氫釜锛岄噸澶嶆垨宸茶缃殑鐗╂枡锛屼繚瀛樻椂灏嗚嚜鍔ㄥ拷鐣�";
+            this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.wizardPage1.Name = "wizardPage1";
+            this.wizardPage1.Size = new System.Drawing.Size(998, 540);
+            this.wizardPage1.Text = "閫夋嫨鐗╂枡";
+            // 
+            // splitLeft
+            // 
+            this.splitLeft.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitLeft.Location = new System.Drawing.Point(0, 0);
+            this.splitLeft.Name = "splitLeft";
+            // 
+            // splitLeft.Panel1
+            // 
+            this.splitLeft.Panel1.Controls.Add(this.gcMain);
+            this.splitLeft.Panel1.Controls.Add(this.panBom);
+            this.splitLeft.Panel1.Text = "Panel1";
+            // 
+            // splitLeft.Panel2
+            // 
+            this.splitLeft.Panel2.Controls.Add(this.splitRight);
+            this.splitLeft.Panel2.Text = "Panel2";
+            this.splitLeft.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitLeft.Size = new System.Drawing.Size(998, 540);
+            this.splitLeft.SplitterPosition = 519;
+            this.splitLeft.TabIndex = 1;
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.Location = new System.Drawing.Point(0, 0);
+            this.gcMain.MainView = this.gvMain;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.Size = new System.Drawing.Size(519, 496);
+            this.gcMain.TabIndex = 7;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMain});
+            // 
+            // gvMain
+            // 
+            this.gvMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMain.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMain.Appearance.Row.Options.UseFont = true;
+            this.gvMain.ColumnPanelRowHeight = 50;
+            this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.colChkInt,
+            this.gv_guid,
+            this.gridColumn1,
+            this.gv2,
+            this.gv_salesOrderId,
+            this.gv_orderLineId,
+            this.gv_itemId});
+            this.gvMain.GridControl = this.gcMain;
+            this.gvMain.IndicatorWidth = 50;
+            this.gvMain.Name = "gvMain";
+            this.gvMain.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMain.OptionsView.ShowAutoFilterRow = true;
+            this.gvMain.OptionsView.ShowGroupPanel = false;
+            // 
+            // colChkInt
+            // 
+            this.colChkInt.Caption = ".";
+            this.colChkInt.FieldName = "chkInt";
+            this.colChkInt.MinWidth = 25;
+            this.colChkInt.Name = "colChkInt";
+            this.colChkInt.Visible = true;
+            this.colChkInt.VisibleIndex = 0;
+            this.colChkInt.Width = 94;
+            // 
+            // gv_guid
+            // 
+            this.gv_guid.AppearanceCell.Options.UseFont = true;
+            this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+            this.gv_guid.FieldName = "guid";
+            this.gv_guid.MinWidth = 50;
+            this.gv_guid.Name = "gv_guid";
+            this.gv_guid.OptionsColumn.AllowEdit = false;
+            this.gv_guid.Tag = "a.guid";
+            this.gv_guid.Width = 94;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "浣跨敤缁勭粐";
+            this.gridColumn1.FieldName = "fSubsidiary";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Tag = "org.FNumber";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 4;
+            this.gridColumn1.Width = 50;
+            // 
+            // gv2
+            // 
+            this.gv2.AppearanceCell.Options.UseFont = true;
+            this.gv2.Caption = "鐗╂枡ID";
+            this.gv2.FieldName = "id";
+            this.gv2.Name = "gv2";
+            this.gv2.OptionsColumn.AllowEdit = false;
+            this.gv2.Tag = "a.id";
+            this.gv2.Visible = true;
+            this.gv2.VisibleIndex = 1;
+            this.gv2.Width = 50;
+            // 
+            // gv_salesOrderId
+            // 
+            this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
+            this.gv_salesOrderId.Caption = "鐗╂枡缂栫爜";
+            this.gv_salesOrderId.FieldName = "itemNo";
+            this.gv_salesOrderId.Name = "gv_salesOrderId";
+            this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
+            this.gv_salesOrderId.Tag = "a.item_no";
+            this.gv_salesOrderId.Visible = true;
+            this.gv_salesOrderId.VisibleIndex = 2;
+            this.gv_salesOrderId.Width = 50;
+            // 
+            // gv_orderLineId
+            // 
+            this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
+            this.gv_orderLineId.Caption = "鐗╂枡鍚嶇О";
+            this.gv_orderLineId.FieldName = "itemName";
+            this.gv_orderLineId.Name = "gv_orderLineId";
+            this.gv_orderLineId.OptionsColumn.AllowEdit = false;
+            this.gv_orderLineId.Tag = "a.item_name";
+            this.gv_orderLineId.Visible = true;
+            this.gv_orderLineId.VisibleIndex = 3;
+            this.gv_orderLineId.Width = 50;
+            // 
+            // gv_itemId
+            // 
+            this.gv_itemId.AppearanceCell.Options.UseFont = true;
+            this.gv_itemId.Caption = "鐗╂枡瑙勬牸";
+            this.gv_itemId.FieldName = "itemModel";
+            this.gv_itemId.Name = "gv_itemId";
+            this.gv_itemId.OptionsColumn.AllowEdit = false;
+            this.gv_itemId.Tag = "a.item_model";
+            this.gv_itemId.Width = 50;
+            // 
+            // panBom
+            // 
+            this.panBom.Controls.Add(this.pageBar1);
+            this.panBom.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panBom.Location = new System.Drawing.Point(0, 496);
+            this.panBom.Name = "panBom";
+            this.panBom.Size = new System.Drawing.Size(519, 44);
+            this.panBom.TabIndex = 6;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pageBar1.Location = new System.Drawing.Point(2, 2);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(515, 40);
+            this.pageBar1.TabIndex = 3;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // splitRight
+            // 
+            this.splitRight.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitRight.Location = new System.Drawing.Point(0, 0);
+            this.splitRight.Name = "splitRight";
+            // 
+            // splitRight.Panel1
+            // 
+            this.splitRight.Panel1.Controls.Add(this.btnIn);
+            this.splitRight.Panel1.Text = "Panel1";
+            // 
+            // splitRight.Panel2
+            // 
+            this.splitRight.Panel2.Controls.Add(this.gcMainCopy);
+            this.splitRight.Panel2.Text = "Panel2";
+            this.splitRight.Size = new System.Drawing.Size(467, 540);
+            this.splitRight.SplitterPosition = 45;
+            this.splitRight.TabIndex = 3;
+            // 
+            // btnIn
+            // 
+            this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue;
+            this.btnIn.Appearance.Options.UseForeColor = true;
+            this.btnIn.Location = new System.Drawing.Point(4, 199);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(39, 29);
+            this.btnIn.TabIndex = 0;
+            this.btnIn.Text = ">>";
+            // 
+            // gcMainCopy
+            // 
+            this.gcMainCopy.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMainCopy.Location = new System.Drawing.Point(0, 0);
+            this.gcMainCopy.MainView = this.gvMainCopy;
+            this.gcMainCopy.Name = "gcMainCopy";
+            this.gcMainCopy.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.rptBtnDel});
+            this.gcMainCopy.Size = new System.Drawing.Size(410, 540);
+            this.gcMainCopy.TabIndex = 2;
+            this.gcMainCopy.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMainCopy});
+            // 
+            // gvMainCopy
+            // 
+            this.gvMainCopy.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn6,
+            this.gridColumn9});
+            this.gvMainCopy.GridControl = this.gcMainCopy;
+            this.gvMainCopy.Name = "gvMainCopy";
+            this.gvMainCopy.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMainCopy.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMainCopy.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.Options.UseFont = true;
+            this.gridColumn11.Caption = "浣跨敤缁勭粐";
+            this.gridColumn11.FieldName = "fSubsidiary";
+            this.gridColumn11.MinWidth = 10;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.OptionsColumn.ReadOnly = true;
+            this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 0;
+            this.gridColumn11.Width = 150;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鐗╂枡ID";
+            this.gridColumn12.FieldName = "id";
+            this.gridColumn12.MinWidth = 10;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.OptionsColumn.ReadOnly = true;
+            this.gridColumn12.Tag = "query_a.item_id";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 1;
+            this.gridColumn12.Width = 150;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.AppearanceCell.Options.UseFont = true;
+            this.gridColumn13.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn13.FieldName = "itemNo";
+            this.gridColumn13.MinWidth = 10;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.OptionsColumn.ReadOnly = true;
+            this.gridColumn13.Tag = "query_a.item_no";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 2;
+            this.gridColumn13.Width = 150;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.AppearanceCell.Options.UseFont = true;
+            this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn14.FieldName = "itemName";
+            this.gridColumn14.MinWidth = 10;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.ReadOnly = true;
+            this.gridColumn14.Tag = "query_a.item_name";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 3;
+            this.gridColumn14.Width = 150;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.AppearanceCell.Options.UseFont = true;
+            this.gridColumn15.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn15.FieldName = "itemModel";
+            this.gridColumn15.MinWidth = 10;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.OptionsColumn.ReadOnly = true;
+            this.gridColumn15.Tag = "query_a.item_model";
+            this.gridColumn15.Width = 150;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "绉诲嚭";
+            this.gridColumn6.ColumnEdit = this.rptBtnDel;
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 94;
+            // 
+            // rptBtnDel
+            // 
+            this.rptBtnDel.AutoHeight = false;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.rptBtnDel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.rptBtnDel.Name = "rptBtnDel";
+            this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick);
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "gridColumn9";
+            this.gridColumn9.FieldName = "guid";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Width = 94;
+            // 
+            // completionWizardPage1
+            // 
+            this.completionWizardPage1.FinishText = "鏈�鍚庝竴姝ワ紝鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
+            this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.completionWizardPage1.Name = "completionWizardPage1";
+            this.completionWizardPage1.ProceedText = "鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
+            this.completionWizardPage1.Size = new System.Drawing.Size(898, 553);
+            this.completionWizardPage1.Text = "淇濆瓨淇℃伅";
+            // 
+            // JyxmShow
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1038, 718);
+            this.Controls.Add(this.wizardControl1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "JyxmShow";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "妫�楠岄」鐩鍒�";
+            ((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
+            this.wizardControl1.ResumeLayout(false);
+            this.welcomeWizardPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            this.wizardPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel1)).EndInit();
+            this.splitLeft.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitLeft.Panel2)).EndInit();
+            this.splitLeft.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitLeft)).EndInit();
+            this.splitLeft.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panBom)).EndInit();
+            this.panBom.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel1)).EndInit();
+            this.splitRight.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitRight.Panel2)).EndInit();
+            this.splitRight.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitRight)).EndInit();
+            this.splitRight.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMainCopy)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMainCopy)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptBtnDel)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraWizard.WizardControl wizardControl1;
+        private DevExpress.XtraWizard.WelcomeWizardPage welcomeWizardPage1;
+        private DevExpress.XtraWizard.WizardPage wizardPage1;
+        private DevExpress.XtraWizard.CompletionWizardPage completionWizardPage1;
+        private DevExpress.XtraEditors.SplitContainerControl splitLeft;
+        private DevExpress.XtraGrid.GridControl gcMainCopy;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMainCopy;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnDel;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraEditors.SplitContainerControl splitRight;
+        private DevExpress.XtraEditors.SimpleButton btnIn;
+        private DevExpress.XtraEditors.PanelControl panBom;
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMain;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv2;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
+        private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
new file mode 100644
index 0000000..5e48fe7
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
@@ -0,0 +1,264 @@
+锘縰sing DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.QC
+{
+    public partial class JyxmShowCopy : DevExpress.XtraEditors.XtraForm
+    {
+        private List<FilterEntity> _filterList = new List<FilterEntity>();
+        private readonly string _webServiceName = "MesQmCheckitemManager/";
+        private string strType = "";//iqc,ipqc,fqc
+        private string sourceGuid = "";//婧恎uid
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="_sourceGuid"></param>
+        /// <param name="_strType"></param>
+        public JyxmShowCopy(string _sourceGuid, string _strType)
+        {
+            InitializeComponent();
+            strType = _strType;
+            sourceGuid = _sourceGuid;
+            this.gvMain.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+            this.gvMain.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gvMain); };
+            this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+            this.colChkInt.OptionsFilter.AllowFilter = false;
+            this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+            this.pageBar1.setBar(false);
+            getPageList(1);
+            getModel(_sourceGuid);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMainCopy);
+            UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
+            btnIn.Click += (s, e) =>
+            {
+                gvMain.PostEditor();
+                gvMain.UpdateCurrentRow();
+                var list = new List<string>();
+                DataTable _oldTable = (DataTable)gcMainCopy.DataSource;
+                DataTable dt = this.gcMain.DataSource as DataTable;
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        string checkBox = dr["chkInt"].ToString();
+                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+                        {
+                            _oldTable.ImportRow(dr);
+                        }
+                    }
+                }
+                if (_oldTable.Rows.Count <= 0)
+                {
+                    MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
+                    return;
+                }
+                gcMainCopy.BindingContext = new BindingContext();
+                gcMainCopy.DataSource = _oldTable;
+                gcMainCopy.ForceInitialize();
+                gvMainCopy.BestFitColumns();
+            };
+            this.wizardControl1.FinishClick += (s, e) =>
+            {
+                int _rows = gvMainCopy.RowCount;
+                if (_rows <= 0)
+                {
+                    MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
+                    e.Cancel = true;
+                    return;
+                }
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
+                {
+                    e.Cancel = true;
+                    return;
+                }
+                System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
+                for (var i = 0; i < gvMainCopy.DataRowCount; i++)
+                {
+                    var row = gvMainCopy.GetDataRow(i);
+                    if (_sbGuids.Length > 0)
+                        _sbGuids.Append(",");
+                    Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+                    _sbGuids.Append(_guid.ToString());
+                }
+                var _obj = new
+                {
+                    sourceGuid = UtilityHelper.ToGuid(sourceGuid),
+                    itemGuids = _sbGuids.ToString(),
+                    iqcType = this.strType,
+                };
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            };
+            this.wizardControl1.NextClick += (s, e) =>
+            {
+                string pageText = e.Page.Text;
+                if (pageText == "閫夋嫨鐗╂枡")
+                {
+                    int _rows = gvMainCopy.RowCount;
+                    if (_rows <= 0)
+                    {
+                        MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
+                        e.Handled = true;
+                        return;
+                    }
+                }
+            };
+        }
+
+        #region 婧愮墿鏂欐暟鎹粦瀹�
+
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gvMain.Columns, gvMain);
+            Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        ///     鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain.DataSource = null; 
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            //_sbSqlWhere += "  and q.guid is  null";
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
+            var json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    gvMain.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain.DataSource = dt;
+                        gcMain.ForceInitialize();
+                        gvMain.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMain);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain, gvMain);
+                    gvMain.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        #endregion
+
+        private void getModel(string strGuid)
+        {
+            var _obj = new
+            {
+                guid = strGuid //涓诲缓
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                         _webServiceName + "GetModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn =
+                    UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    var dy = _rtn.rtnData;
+                    var gvList = new List<GridView>();
+                    gvList.Add(gvMx1);
+                    var _job = JObject.Parse(strJson);
+                    var array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
+                    var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = dt;
+                        gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
+                    }
+                    else
+                    {
+                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+                    }
+                    UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
+                }
+                else
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 鍒犻櫎澶嶅埗椤�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rptBtnDel_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            gvMainCopy.CloseEditor();
+            gvMainCopy.UpdateCurrentRow();
+            var rowhandle = gvMainCopy.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvMainCopy.GetDataRow(rowhandle);
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                    return;
+                gvMainCopy.DeleteRow(rowhandle);
+                return;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.resx b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.resx
rename to DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.Designer.cs
deleted file mode 100644
index 2cb8ce9..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.Designer.cs
+++ /dev/null
@@ -1,511 +0,0 @@
-锘�
-namespace Gs.DevApp.DevFrm.Sys
-{
-    partial class EasyCode
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.xtra4 = new DevExpress.XtraTab.XtraTabPage();
-            this.btnMes = new DevExpress.XtraEditors.SimpleButton();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txtMesResult = new DevExpress.XtraEditors.MemoEdit();
-            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
-            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
-            this.btnUp = new DevExpress.XtraEditors.SimpleButton();
-            this.btnUpSelect = new System.Windows.Forms.Button();
-            this.txtUpUrl = new System.Windows.Forms.TextBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
-            this.label6 = new System.Windows.Forms.Label();
-            this.txt_table = new DevExpress.XtraEditors.CheckedComboBoxEdit();
-            this.label2 = new System.Windows.Forms.Label();
-            this.lbMsg = new System.Windows.Forms.Label();
-            this.btnCode = new DevExpress.XtraEditors.SimpleButton();
-            this.label4 = new System.Windows.Forms.Label();
-            this.btnPathSelect = new System.Windows.Forms.Button();
-            this.txtPath = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
-            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
-            this.txtTable1 = new DevExpress.XtraEditors.TextEdit();
-            this.btnTable = new DevExpress.XtraEditors.SimpleButton();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
-            this.btnRemark = new DevExpress.XtraEditors.SimpleButton();
-            this.txtOracleDec = new DevExpress.XtraEditors.MemoEdit();
-            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txtTable2 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.xtra4.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMesResult.Properties)).BeginInit();
-            this.xtraTabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
-            this.panelControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            this.tabControl1.SuspendLayout();
-            this.tabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_table.Properties)).BeginInit();
-            this.tabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
-            this.panelControl2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTable1.Properties)).BeginInit();
-            this.tabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
-            this.panelControl3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtOracleDec.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTable2.Properties)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // xtra4
-            // 
-            this.xtra4.Controls.Add(this.btnMes);
-            this.xtra4.Controls.Add(this.labelControl1);
-            this.xtra4.Controls.Add(this.txtMesResult);
-            this.xtra4.Name = "xtra4";
-            this.xtra4.Size = new System.Drawing.Size(887, 507);
-            this.xtra4.Text = "鍚慚es鎺ㄦ暟鎹�";
-            // 
-            // btnMes
-            // 
-            this.btnMes.Location = new System.Drawing.Point(129, 312);
-            this.btnMes.Name = "btnMes";
-            this.btnMes.Size = new System.Drawing.Size(94, 29);
-            this.btnMes.TabIndex = 2;
-            this.btnMes.Text = "纭畾鎺ㄩ��";
-            this.btnMes.Click += new System.EventHandler(this.btnMes_Click);
-            // 
-            // labelControl1
-            // 
-            this.labelControl1.Location = new System.Drawing.Point(129, 79);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(45, 18);
-            this.labelControl1.TabIndex = 1;
-            this.labelControl1.Text = "缁撴灉锛�";
-            // 
-            // txtMesResult
-            // 
-            this.txtMesResult.Location = new System.Drawing.Point(212, 77);
-            this.txtMesResult.Name = "txtMesResult";
-            this.txtMesResult.Size = new System.Drawing.Size(495, 194);
-            this.txtMesResult.TabIndex = 0;
-            // 
-            // xtraTabPage3
-            // 
-            this.xtraTabPage3.Controls.Add(this.panelControl1);
-            this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(887, 507);
-            this.xtraTabPage3.Text = "Dev鏂囦欢涓婁紶";
-            // 
-            // panelControl1
-            // 
-            this.panelControl1.Controls.Add(this.btnUp);
-            this.panelControl1.Controls.Add(this.btnUpSelect);
-            this.panelControl1.Controls.Add(this.txtUpUrl);
-            this.panelControl1.Controls.Add(this.label7);
-            this.panelControl1.Location = new System.Drawing.Point(106, 83);
-            this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(609, 331);
-            this.panelControl1.TabIndex = 0;
-            // 
-            // btnUp
-            // 
-            this.btnUp.Location = new System.Drawing.Point(157, 179);
-            this.btnUp.Name = "btnUp";
-            this.btnUp.Size = new System.Drawing.Size(94, 29);
-            this.btnUp.TabIndex = 270;
-            this.btnUp.Text = "纭畾涓婁紶";
-            // 
-            // btnUpSelect
-            // 
-            this.btnUpSelect.Location = new System.Drawing.Point(472, 97);
-            this.btnUpSelect.Margin = new System.Windows.Forms.Padding(4);
-            this.btnUpSelect.Name = "btnUpSelect";
-            this.btnUpSelect.Size = new System.Drawing.Size(79, 26);
-            this.btnUpSelect.TabIndex = 269;
-            this.btnUpSelect.Text = "閫夋嫨璺緞";
-            this.btnUpSelect.UseVisualStyleBackColor = true;
-            // 
-            // txtUpUrl
-            // 
-            this.txtUpUrl.Location = new System.Drawing.Point(157, 97);
-            this.txtUpUrl.Margin = new System.Windows.Forms.Padding(4);
-            this.txtUpUrl.Name = "txtUpUrl";
-            this.txtUpUrl.Size = new System.Drawing.Size(307, 26);
-            this.txtUpUrl.TabIndex = 268;
-            // 
-            // label7
-            // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(44, 101);
-            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(83, 18);
-            this.label7.TabIndex = 267;
-            this.label7.Text = "閫夋嫨鏂囦欢锛�";
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(889, 539);
-            this.xtraTabControl1.TabIndex = 0;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage3,
-            this.xtra4});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Appearance.PageClient.BackColor = System.Drawing.Color.White;
-            this.xtraTabPage1.Appearance.PageClient.Options.UseBackColor = true;
-            this.xtraTabPage1.Controls.Add(this.tabControl1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(887, 507);
-            this.xtraTabPage1.Text = "Dev浠g爜鐢熸垚鍣�";
-            // 
-            // tabControl1
-            // 
-            this.tabControl1.Controls.Add(this.tabPage1);
-            this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Controls.Add(this.tabPage3);
-            this.tabControl1.Location = new System.Drawing.Point(45, 59);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(758, 408);
-            this.tabControl1.TabIndex = 269;
-            // 
-            // tabPage1
-            // 
-            this.tabPage1.Controls.Add(this.label6);
-            this.tabPage1.Controls.Add(this.txt_table);
-            this.tabPage1.Controls.Add(this.label2);
-            this.tabPage1.Controls.Add(this.lbMsg);
-            this.tabPage1.Controls.Add(this.btnCode);
-            this.tabPage1.Controls.Add(this.label4);
-            this.tabPage1.Controls.Add(this.btnPathSelect);
-            this.tabPage1.Controls.Add(this.txtPath);
-            this.tabPage1.Controls.Add(this.label5);
-            this.tabPage1.Controls.Add(this.label1);
-            this.tabPage1.Location = new System.Drawing.Point(4, 27);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(750, 377);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "绠�鏄撲唬鐮佺敓鎴愶紝璇风敓鎴愬悗浣滅浉搴斾慨鏀�";
-            this.tabPage1.UseVisualStyleBackColor = true;
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(152, 91);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(443, 18);
-            this.label6.TabIndex = 282;
-            this.label6.Text = "濡傛灉閫夋嫨涓�涓〃锛屽垯涓哄崟琛ㄧ被鍨嬶紱閫夋嫨浜嗗琛紝鍒欎负涓昏〃瀛愯〃绫诲瀷";
-            // 
-            // txt_table
-            // 
-            this.txt_table.Location = new System.Drawing.Point(152, 45);
-            this.txt_table.Name = "txt_table";
-            this.txt_table.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_table.Size = new System.Drawing.Size(221, 24);
-            this.txt_table.TabIndex = 281;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(16, 91);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(113, 18);
-            this.label2.TabIndex = 280;
-            this.label2.Text = "閫夋嫨鐢熸垚绫诲埆锛�";
-            // 
-            // lbMsg
-            // 
-            this.lbMsg.AutoSize = true;
-            this.lbMsg.Location = new System.Drawing.Point(149, 201);
-            this.lbMsg.Name = "lbMsg";
-            this.lbMsg.Size = new System.Drawing.Size(0, 18);
-            this.lbMsg.TabIndex = 268;
-            // 
-            // btnCode
-            // 
-            this.btnCode.Location = new System.Drawing.Point(152, 242);
-            this.btnCode.Name = "btnCode";
-            this.btnCode.Size = new System.Drawing.Size(94, 29);
-            this.btnCode.TabIndex = 278;
-            this.btnCode.Text = "纭畾鐢熸垚";
-            this.btnCode.Click += new System.EventHandler(this.btnOk_Click);
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(152, 161);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(293, 18);
-            this.label4.TabIndex = 277;
-            this.label4.Text = "寤鸿浣犻�夋嫨椤圭洰鏂囦欢澶癸紝鐩存帴鐢熸垚鍒伴」鐩腑";
-            // 
-            // btnPathSelect
-            // 
-            this.btnPathSelect.Location = new System.Drawing.Point(381, 131);
-            this.btnPathSelect.Margin = new System.Windows.Forms.Padding(4);
-            this.btnPathSelect.Name = "btnPathSelect";
-            this.btnPathSelect.Size = new System.Drawing.Size(79, 26);
-            this.btnPathSelect.TabIndex = 276;
-            this.btnPathSelect.Text = "閫夋嫨璺緞";
-            this.btnPathSelect.UseVisualStyleBackColor = true;
-            // 
-            // txtPath
-            // 
-            this.txtPath.Location = new System.Drawing.Point(152, 131);
-            this.txtPath.Margin = new System.Windows.Forms.Padding(4);
-            this.txtPath.Name = "txtPath";
-            this.txtPath.Size = new System.Drawing.Size(221, 26);
-            this.txtPath.TabIndex = 275;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(31, 135);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(98, 18);
-            this.label5.TabIndex = 274;
-            this.label5.Text = "鏂囦欢鍒涘缓鍒帮細";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(16, 48);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(113, 18);
-            this.label1.TabIndex = 268;
-            this.label1.Text = "閫夋嫨琛ㄦ垨瑙嗗浘锛�";
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.panelControl2);
-            this.tabPage2.Location = new System.Drawing.Point(4, 27);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(750, 377);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "浠巓racle琛ㄦ壒閲忚鍙栨暟鎹嚦sql";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // panelControl2
-            // 
-            this.panelControl2.Controls.Add(this.labelControl4);
-            this.panelControl2.Controls.Add(this.txtTable1);
-            this.panelControl2.Controls.Add(this.btnTable);
-            this.panelControl2.Location = new System.Drawing.Point(174, 46);
-            this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(403, 284);
-            this.panelControl2.TabIndex = 1;
-            // 
-            // labelControl4
-            // 
-            this.labelControl4.Location = new System.Drawing.Point(34, 22);
-            this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(90, 18);
-            this.labelControl4.TabIndex = 4;
-            this.labelControl4.Text = "璇疯緭鍏ヨ〃鍚嶏細";
-            // 
-            // txtTable1
-            // 
-            this.txtTable1.Location = new System.Drawing.Point(34, 60);
-            this.txtTable1.Name = "txtTable1";
-            this.txtTable1.Size = new System.Drawing.Size(189, 24);
-            this.txtTable1.TabIndex = 3;
-            // 
-            // btnTable
-            // 
-            this.btnTable.Location = new System.Drawing.Point(34, 117);
-            this.btnTable.Name = "btnTable";
-            this.btnTable.Size = new System.Drawing.Size(170, 29);
-            this.btnTable.TabIndex = 2;
-            this.btnTable.Text = "纭畾瀵煎叆琛ㄧ粨鏋滃拰鏁版嵁";
-            this.btnTable.Click += new System.EventHandler(this.btnTable_Click);
-            // 
-            // tabPage3
-            // 
-            this.tabPage3.Controls.Add(this.panelControl3);
-            this.tabPage3.Location = new System.Drawing.Point(4, 27);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage3.Size = new System.Drawing.Size(750, 377);
-            this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "鎶妎racle澶囨敞鎵归噺杞瑂ql澶囨敞";
-            this.tabPage3.UseVisualStyleBackColor = true;
-            // 
-            // panelControl3
-            // 
-            this.panelControl3.Controls.Add(this.btnRemark);
-            this.panelControl3.Controls.Add(this.txtOracleDec);
-            this.panelControl3.Controls.Add(this.labelControl3);
-            this.panelControl3.Controls.Add(this.txtTable2);
-            this.panelControl3.Controls.Add(this.labelControl2);
-            this.panelControl3.Location = new System.Drawing.Point(213, 50);
-            this.panelControl3.Name = "panelControl3";
-            this.panelControl3.Size = new System.Drawing.Size(324, 277);
-            this.panelControl3.TabIndex = 2;
-            // 
-            // btnRemark
-            // 
-            this.btnRemark.Location = new System.Drawing.Point(28, 192);
-            this.btnRemark.Name = "btnRemark";
-            this.btnRemark.Size = new System.Drawing.Size(188, 29);
-            this.btnRemark.TabIndex = 275;
-            this.btnRemark.Text = "纭畾鎵归噺淇敼澶囨敞";
-            this.btnRemark.Click += new System.EventHandler(this.btnRemark_Click);
-            // 
-            // txtOracleDec
-            // 
-            this.txtOracleDec.Location = new System.Drawing.Point(29, 42);
-            this.txtOracleDec.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.txtOracleDec.Name = "txtOracleDec";
-          
-            this.txtOracleDec.Properties.Appearance.Options.UseFont = true;
-            this.txtOracleDec.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
-            this.txtOracleDec.Size = new System.Drawing.Size(189, 68);
-            this.txtOracleDec.TabIndex = 274;
-            // 
-            // labelControl3
-            // 
-            this.labelControl3.Location = new System.Drawing.Point(31, 15);
-            this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(188, 18);
-            this.labelControl3.TabIndex = 0;
-            this.labelControl3.Text = "鎵归噺鏇挎崲oracle涓殑澶囨敞鎻忚堪";
-            // 
-            // txtTable2
-            // 
-            this.txtTable2.Location = new System.Drawing.Point(28, 145);
-            this.txtTable2.Name = "txtTable2";
-            this.txtTable2.Size = new System.Drawing.Size(189, 24);
-            this.txtTable2.TabIndex = 1;
-            // 
-            // labelControl2
-            // 
-            this.labelControl2.Location = new System.Drawing.Point(28, 121);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(90, 18);
-            this.labelControl2.TabIndex = 0;
-            this.labelControl2.Text = "璇疯緭鍏ヨ〃鍚嶏細";
-            // 
-            // EasyCode
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(889, 539);
-            this.Controls.Add(this.xtraTabControl1);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "EasyCode";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "EasyCode";
-            this.TopMost = true;
-            this.xtra4.ResumeLayout(false);
-            this.xtra4.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMesResult.Properties)).EndInit();
-            this.xtraTabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
-            this.panelControl1.ResumeLayout(false);
-            this.panelControl1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            this.tabControl1.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
-            this.tabPage1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_table.Properties)).EndInit();
-            this.tabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
-            this.panelControl2.ResumeLayout(false);
-            this.panelControl2.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTable1.Properties)).EndInit();
-            this.tabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
-            this.panelControl3.ResumeLayout(false);
-            this.panelControl3.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtOracleDec.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTable2.Properties)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraTab.XtraTabPage xtra4;
-        private DevExpress.XtraEditors.SimpleButton btnMes;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.MemoEdit txtMesResult;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
-        private DevExpress.XtraEditors.PanelControl panelControl1;
-        private DevExpress.XtraEditors.SimpleButton btnUp;
-        private System.Windows.Forms.Button btnUpSelect;
-        private System.Windows.Forms.TextBox txtUpUrl;
-        private System.Windows.Forms.Label label7;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private System.Windows.Forms.TabControl tabControl1;
-        private System.Windows.Forms.TabPage tabPage1;
-        private DevExpress.XtraEditors.SimpleButton btnCode;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Button btnPathSelect;
-        private System.Windows.Forms.TextBox txtPath;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label lbMsg;
-        private System.Windows.Forms.Label label2;
-        private DevExpress.XtraEditors.CheckedComboBoxEdit txt_table;
-        private System.Windows.Forms.Label label6;
-        private System.Windows.Forms.TabPage tabPage2;
-        private System.Windows.Forms.TabPage tabPage3;
-        private DevExpress.XtraEditors.PanelControl panelControl2;
-        private DevExpress.XtraEditors.LabelControl labelControl4;
-        private DevExpress.XtraEditors.TextEdit txtTable1;
-        private DevExpress.XtraEditors.SimpleButton btnTable;
-        private DevExpress.XtraEditors.PanelControl panelControl3;
-        private DevExpress.XtraEditors.SimpleButton btnRemark;
-        private DevExpress.XtraEditors.MemoEdit txtOracleDec;
-        private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit txtTable2;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
deleted file mode 100644
index c48a70f..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
+++ /dev/null
@@ -1,799 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Data.SqlClient;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using Oracle.ManagedDataAccess.Client;
-
-namespace Gs.DevApp.DevFrm.Sys
-{
-    public partial class EasyCode : XtraForm
-    {
-        private readonly string oracleCon =
-            "User Id=system;Password=admin110;Data Source=localhost:1521/MYTEST2;";
-
-        //this.txt_sqlconn.Text = "Data Source=2kn4sh70028.vicp.fun,26144;Initial Catalog=gs_Mes;User ID=sa;Password =admin110";
-        private readonly string sqlCon =
-            "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=sa;Password =qixi123";
-
-        public EasyCode()
-        {
-            InitializeComponent();
-            getTable();
-            btnPathSelect.Click += (s, e) =>
-            {
-                var _GetfilePath = FileSelector.BrowseFilePathForSave();
-                txtPath.Text = _GetfilePath;
-            };
-            btnUpSelect.Click += BtnUpSelect_Click;
-            btnUp.Click += BtnUp_Click;
-        }
-
-        #region 鎵归噺璇诲彇
-
-        private void btnTable_Click(object sender, EventArgs e)
-        {
-            using (var connection = new OracleConnection(oracleCon))
-            {
-                try
-                {
-                    connection.Open();
-                    using (var command = connection.CreateCommand())
-                    {
-                        command.CommandText =
-                            "SELECT * FROM " + txtTable1.Text.Trim();
-                        using (var oracleDataReader = command.ExecuteReader())
-                        {
-                            using (var bulkCopy = new SqlBulkCopy(sqlCon))
-                            {
-                                bulkCopy.DestinationTableName =
-                                    txtTable1.Text.Trim();
-                                bulkCopy.WriteToServer(oracleDataReader);
-                            }
-                        }
-                    }
-
-                    MsgHelper.ShowInformation("鎻愮ず锛屾搷浣滄垚鍔燂紒");
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine(ex.Message);
-                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
-                }
-                finally
-                {
-                    if (connection.State != ConnectionState.Closed)
-                        connection.Close();
-                }
-            }
-        }
-
-        #endregion
-
-        #region 鎵归噺鍑嗗
-
-        private void btnRemark_Click(object sender, EventArgs e)
-        {
-            if (txtTable2.Text.Trim().Length <= 0)
-            {
-                MessageBox.Show("璇疯緭鍏ヨ〃鍚�");
-                return;
-            }
-
-            using (var conn = new SqlConnection(sqlCon))
-            {
-                using (var cmd = new SqlCommand("[tmp_property]", conn))
-                {
-                    try
-                    {
-                        conn.Open();
-                        cmd.CommandType = CommandType.StoredProcedure;
-                        SqlParameter[] parameters =
-                        {
-                            new SqlParameter("@tabname", txtTable2.Text.Trim()),
-                            new SqlParameter("@com", txtOracleDec.Text.Trim())
-                        };
-                        foreach (var parameter in parameters)
-                            cmd.Parameters.Add(parameter);
-                        cmd.ExecuteNonQuery();
-                        MsgHelper.ShowInformation("鎻愮ず锛屾搷浣滄垚鍔燂紒");
-                    }
-                    catch (Exception ex)
-                    {
-                        MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
-                    }
-                    finally
-                    {
-                        conn.Close();
-                    }
-                }
-            }
-        }
-
-        #endregion
-
-        #region 浠g爜鐢熸垚
-
-        /// <summary>
-        ///     纭畾鐢熸垚
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnOk_Click(object sender, EventArgs e)
-        {
-            if (txt_table.EditValue == null ||
-                string.IsNullOrEmpty(txt_table.EditValue.ToString()))
-            {
-                MessageBox.Show("璇烽�夋嫨琛�");
-                return;
-            }
-
-            if (txtPath.Text.Trim() == "")
-            {
-                MessageBox.Show("璇烽�夋嫨鐢熸垚璺緞");
-                return;
-            }
-
-            var _strName = _getClassName();
-            var list = txt_table.Properties.Items.GetCheckedValues();
-            var dt1 = _getCol(_getTableName(list[0].ToString()));
-            var dtList = new List<DataTable>();
-            var j = 0;
-            foreach (var obj in list)
-            {
-                if (j > 0)
-                    dtList.Add(_getCol(_getTableName(obj.ToString())));
-                j++;
-            }
-
-            ReadMainFile(dt1, _strName, dtList);
-            ReadDesignerFile(dt1, _strName, dtList);
-            ReadResxFile(dt1, _strName);
-            var path = txtPath.Text;
-            lbMsg.Text = "鐢熸垚鎴愬姛锛岃矾寰勶細" + path;
-        }
-
-        /// <summary>
-        ///     璇诲彇鏁版嵁搴撹〃
-        /// </summary>
-        private void getTable()
-        {
-            var dset = new DataSet();
-            using (var connection = new SqlConnection(sqlCon))
-            {
-                connection.Open();
-                var cmd = new SqlCommand();
-                cmd.Connection = connection;
-                cmd.CommandText =
-                    "SELECT TABLE_NAME,(SELECT top 1 value AS ExtendedPropertyValue FROM sys.extended_properties WHERE minor_id=0 and major_id = OBJECT_ID(''+TABLE_NAME+''))  as TABLE_DESC  FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' order by TABLE_NAME asc";
-                using (var dt = new SqlDataAdapter(cmd))
-                {
-                    dt.Fill(dset, "0");
-                }
-            }
-
-            if (dset != null && dset.Tables.Count > 0)
-            {
-                txt_table.Properties.Items.Clear();
-                var strs = new string[dset.Tables[0].Rows.Count];
-                for (var i = 0; i < dset.Tables[0].Rows.Count; i++)
-                    strs[i] = dset.Tables[0].Rows[i]["TABLE_NAME"] + "(" +
-                              dset.Tables[0].Rows[i]["TABLE_DESC"] + ")";
-                txt_table.Properties.Items.AddRange(strs);
-            }
-        }
-
-        /// <summary>
-        ///     璇诲彇鍒楀悕
-        /// </summary>
-        /// <returns></returns>
-        private DataTable _getCol(string tableName)
-        {
-            var sb = new StringBuilder();
-            sb.Append(
-                "SELECT COLUMN_NAME = a.name, DATA_TYPE = b.name, REMARK = isnull(g.[value],a.name) ");
-            sb.Append(
-                " FROM syscolumns a  left join systypes b on a.xusertype = b.xusertype inner join sysobjects d on a.id = d.id and d.xtype = 'U'  and d.name<>'dtproperties' ");
-            sb.Append(" left join syscomments e on a.cdefault = e.id ");
-            sb.Append(
-                " left join sys.extended_properties g on a.id = G.major_id and a.colid = g.minor_id ");
-            sb.Append(
-                " left join sys.extended_properties f on d.id = f.major_id and f.minor_id = 0 ");
-            sb.Append(" where d.name = '" + tableName + "'");
-            sb.Append(" order by  a.id, a.colorder");
-            var dset = new DataSet();
-            using (var connection = new SqlConnection(sqlCon))
-            {
-                connection.Open();
-                var cmd = new SqlCommand();
-                cmd.Connection = connection;
-                cmd.CommandText = sb.ToString();
-                using (var dt = new SqlDataAdapter(cmd))
-                {
-                    dt.Fill(dset, "0");
-                }
-            }
-
-            if (dset != null && dset.Tables.Count > 0) return dset.Tables[0];
-            return null;
-        }
-
-        /// <summary>
-        ///     璇绘ā鐗堣矾寰�
-        /// </summary>
-        /// <param name="fileType">cs,Designer.cs</param>
-        /// <returns></returns>
-        private string _getTemple(string fileType)
-        {
-            if (txt_table.Properties.Items.GetCheckedValues().Count < 2)
-                return @"\templeEasyCode\category1\category." + fileType;
-            return @"\templeEasyCode\category2\category." + fileType;
-        }
-
-        /// <summary>
-        ///     璇诲彇鏂囦欢绫诲悕
-        /// </summary>
-        /// <returns></returns>
-        private string _getClassName()
-        {
-            var str = UtilityHelper.ToCamelCase(_getMainTable());
-            var result = str.Substring(0, 1).ToUpper() + str.Substring(1);
-            return "Frm_" + result;
-        }
-
-        /// <summary>
-        ///     璇诲彇涓昏〃
-        /// </summary>
-        /// <returns></returns>
-        private string _getMainTable()
-        {
-            var ckList = txt_table.Properties.Items.GetCheckedValues();
-            var _strName = ckList[0].ToString();
-            foreach (string str in ckList)
-                if (str.Length < _strName.Length)
-                    _strName = str;
-            return _getTableName(_strName);
-        }
-
-        /// <summary>
-        ///     鎴彇琛ㄥ悕
-        /// </summary>
-        /// <param name="strName"></param>
-        /// <returns></returns>
-        private string _getTableName(string strName)
-        {
-            var _tableName = strName.Split('(')[0];
-            return _tableName;
-        }
-
-        /// <summary>
-        ///     绗竴涓枃浠�
-        /// </summary>
-        /// <param name="dt"></param>
-        /// <param name="_FileName"></param>
-        private void ReadMainFile(DataTable dt, string _FileName,
-            List<DataTable> dtList = null)
-        {
-            var _tempPath = Application.StartupPath + _getTemple("cs");
-            var contents = File.ReadAllText(_tempPath);
-            var line = Environment.NewLine;
-            var sb = new StringBuilder();
-            sb.Append(contents);
-            sb.Replace("{clsName}", _getClassName());
-            var _fullPath = txtPath.Text + "\\" + _FileName + ".cs";
-            if (File.Exists(_fullPath))
-                File.Delete(_fullPath);
-            var sw = File.CreateText(_fullPath);
-            sw.Write(sb.ToString());
-            sw.Close();
-            sw.Dispose();
-        }
-
-        /// <summary>
-        ///     绗簩涓枃浠�
-        /// </summary>
-        /// <param name="dt"></param>
-        /// <param name="_FileName"></param>
-        private void ReadDesignerFile(DataTable dt, string _FileName,
-            List<DataTable> dtList = null)
-        {
-            var _tempPath = Application.StartupPath + _getTemple("Designer.cs");
-            var contents = File.ReadAllText(_tempPath);
-            var strbuilder = new StringBuilder();
-            var line = Environment.NewLine;
-            strbuilder.Append(contents);
-            strbuilder.Replace("{clsName}", _getClassName());
-            var _RowCount = dt.Rows.Count;
-            if (dt.Rows.Count > 0)
-            {
-                var _FieldName = ""; //瀛楁鍚�
-                var _FieldText = ""; //瀛楁鏂囨湰
-                var _FieldNameSql = ""; //鍘熷瀛楁鍚嶏紝涓昏鐢ㄤ簬鏌ヨ
-                int _x = 0, _y = 0, _Tabindex = 210;
-                var _ControlType = "TextEdit"; //鎺т欢绫诲瀷锛岀洰鍓嶄笉浣滃垽鏂兘涓烘枃鏈
-                var _lbType = "LabelControl";
-                var _gvItemCol = new StringBuilder();
-                for (var c = 0; c < _RowCount; c++)
-                {
-                    _x = 20 + c % 4 * 250; //璁$畻鎺т欢鍦╔杞翠綅缃�
-                    if (c % 4 == 0) _y = 20 + 32 * c / 4; //璁$畻鎺т欢鍦╕杞寸殑浣嶇疆
-                    _Tabindex = c % 4 + c / 4 + _Tabindex;
-                    switch (dt.Rows[c]["DATA_TYPE"].ToString())
-                    {
-                        default:
-                            _FieldName = UtilityHelper.ToCamelCase(
-                                dt.Rows[c]["COLUMN_NAME"].ToString().Trim());
-                            _FieldText = dt.Rows[c]["REMARK"].ToString().Trim();
-                            _FieldNameSql = "query_a." +
-                                            dt.Rows[c]["COLUMN_NAME"].ToString()
-                                                .Trim();
-                            break;
-                    }
-
-                    var _labName = "lb_" + _FieldName; //label鍚�
-                    var _txtName = "txt_" + _FieldName; //鏂囨湰妗嗗悕
-                    var _gvName = "gv_" + _FieldName; //gv涓殑鍒楀悕
-                    if (_gvItemCol.Length > 0)
-                        _gvItemCol.Append(",");
-                    _gvItemCol.Append("this." + _gvName);
-                    //BQSetControlObject  瀹炰緥鍖栨帶浠�
-                    var BQSetControlObject = "BQSetControlObject" + line +
-                                             "this." + _labName +
-                                             " =  new DevExpress.XtraEditors." +
-                                             _lbType + "();" + line;
-                    BQSetControlObject = BQSetControlObject + "this." +
-                                         _txtName +
-                                         " = new DevExpress.XtraEditors." +
-                                         _ControlType + "(); " + line;
-                    BQSetControlObject = BQSetControlObject + "this." +
-                                         _gvName +
-                                         " = new DevExpress.XtraGrid.Columns.GridColumn(); " +
-                                         line;
-                    strbuilder.Replace("BQSetControlObject",
-                        BQSetControlObject);
-                    //BQSetControlInfo  璁剧疆鎺т欢淇℃伅浣嶇疆澶у皬鍚嶇О
-                    var BQSetControlInfo = "BQSetControlInfo" + line
-                        //label
-                        + "//" + line
-                        + "//" + _labName + line
-                        + "//" + line
-                        + "this." + _labName +
-                        ".Location = new System.Drawing.Point(" + _x + ", " +
-                        _y + ");" + line
-                        + "this." + _labName + ".Name = \"" + _labName + "\";" +
-                        line
-                        + "this." + _labName +
-                        ".Size = new System.Drawing.Size(150,21);" + line
-                        + "this." + _labName + ".TabIndex = " + _Tabindex +
-                        ";" + line
-                        + "this." + _labName +
-                        ".Appearance.Font = new System.Drawing.Font(\"Tahoma\", 10F);" +
-                        line
-                        + "this." + _labName + ".Text = \"" + _FieldText +
-                        " \";" + line
-                        //鏂囨湰
-                        + "//" + line
-                        + "//" + _txtName + line
-                        + "//" + line
-                        + "this." + _txtName +
-                        ".Location = new System.Drawing.Point(" + (_x + 60) +
-                        ", " + _y + ");" + line
-                        + "this." + _txtName + ".Name = \"" + _txtName + "\";" +
-                        line
-                        + "this." + _txtName +
-                        ".Size = new System.Drawing.Size(150,21);" + line
-                        + "this." + _txtName + ".TabIndex = " + _Tabindex +
-                        ";" + line
-                        + "this." + _txtName +
-                        ".Properties.Appearance.Font = new System.Drawing.Font(\"Tahoma\", 10F);" +
-                        line
-                        //涓籫ridView
-                        + "//" + line
-                        + "//" + _gvName + line
-                        + "//" + line
-                        + "this." + _gvName +
-                        ".AppearanceCell.Font = new System.Drawing.Font(\"Tahoma\", 10F);" +
-                        line
-                        + "this." + _gvName +
-                        ".AppearanceCell.Options.UseFont = true;" + line
-                        + "this." + _gvName + ".FieldName = \"" + _FieldName +
-                        "\";" + line
-                        + "this." + _gvName + ".Caption =  \"" + _FieldText +
-                        " \";" + line
-                        + "this." + _gvName + ".Tag = \"" + _FieldNameSql +
-                        "\";" + line
-                        + "this." + _gvName + ".MinWidth =50;" + line
-                        + "this." + _gvName + ".Visible = true;" + line
-                        + "this." + _gvName + ".Width =94;" + line
-                        + "this." + _gvName +
-                        ".OptionsColumn.AllowEdit = false;" + line
-                        + "this." + _gvName + ".VisibleIndex = 0;" + line;
-                    strbuilder.Replace("BQSetControlInfo", BQSetControlInfo);
-                    //BQAddControltoMContainer//灏嗘帶浠舵坊鍔犲埌panel1瀹瑰櫒涓�
-                    var BQAddControltoMContainer = "BQAddControltoMContainer" +
-                                                   line +
-                                                   "  this.panel1.Controls.Add(this." +
-                                                   _labName + ");" + line;
-                    BQAddControltoMContainer +=
-                        " this.panel1.Controls.Add(this." + _txtName + ");" +
-                        line;
-                    strbuilder.Replace("BQAddControltoMContainer",
-                        BQAddControltoMContainer);
-                    //BQCreateConrolObejct //鍒涘缓鎺т欢 
-                    var BQCreateConrolObejct = "BQCreateConrolObejct" + line +
-                                               "private DevExpress.XtraEditors." +
-                                               _lbType + " " + _labName + ";" +
-                                               line;
-                    BQCreateConrolObejct += "private DevExpress.XtraEditors." +
-                                            _ControlType + " " + _txtName +
-                                            ";" + line;
-                    BQCreateConrolObejct +=
-                        " private DevExpress.XtraGrid.Columns.GridColumn " +
-                        _gvName + ";" + line;
-                    strbuilder.Replace("BQCreateConrolObejct",
-                        BQCreateConrolObejct);
-                }
-
-                //鎶婂垪鍔犲叆鍒癵ridview涓�
-                strbuilder.Replace("{colList}", _gvItemCol.ToString());
-                //鏋勫缓鏄庣粏gridview1
-                if (dtList != null && dtList.Count > 0)
-                {
-                    var _idx = 1;
-                    var _tabItem = new StringBuilder();
-                    foreach (var dt2 in dtList)
-                    {
-                        var _tabMxPage = "tabMxPage" + _idx;
-                        var _gcMx = "gcMx" + _idx;
-                        var _gvMx = "gvMx" + _idx;
-                        if (_tabItem.Length > 0)
-                            _tabItem.Append(",");
-                        _tabItem.Append("this." + _tabMxPage);
-                        //BQSetControlObject 瀹炰緥鍖栨帶浠�
-                        var ss = "BQSetControlObject" + line;
-                        ss += " this." + _tabMxPage +
-                              " = new DevExpress.XtraTab.XtraTabPage();" + line;
-                        ss += " this." + _gcMx +
-                              " = new DevExpress.XtraGrid.GridControl();" +
-                              line;
-                        ss += " this." + _gvMx +
-                              " = new DevExpress.XtraGrid.Views.Grid.GridView();";
-                        strbuilder.Replace("BQSetControlObject", ss);
-                        //BQSetControlInfo 璁剧疆鎺т欢淇℃伅浣嶇疆澶у皬鍚嶇О
-                        var inf = "BQSetControlInfo" + line
-                            + "this." + _tabMxPage + ".Controls.Add(this." +
-                            _gcMx + ");"
-                            + "this." + _tabMxPage + ".Name = \"" + _tabMxPage +
-                            "\";" + line
-                            + "this." + _tabMxPage +
-                            ".Size = new System.Drawing.Size(1186, 112);" + line
-                            + "this." + _tabMxPage + ".Text = \"鏄庣粏" + _idx +
-                            "\";" + line
-                            + "//" + line
-                            + "//" + _gcMx + line
-                            + "//" + line
-                            + " this." + _gcMx +
-                            ".Dock = System.Windows.Forms.DockStyle.Fill;" +
-                            line
-                            + " this." + _gcMx +
-                            ".Location = new System.Drawing.Point(0, 0);" + line
-                            + " this." + _gcMx + ".MainView = this." + _gvMx +
-                            ";" + line
-                            + " this." + _gcMx + ".Name = \"" + _gcMx + "\";" +
-                            line
-                            + " this." + _gcMx +
-                            ".Size = new System.Drawing.Size(1124, 215);" + line
-                            + " this." + _gcMx + ".TabIndex = 0;" + line
-                            + " this." + _gcMx +
-                            ".ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this." +
-                            _gvMx + "});" + line
-                            + "//" + line
-                            + "//" + _gvMx + line
-                            + "//" + line
-                            + " this." + _gvMx + ".GridControl = this." +
-                            _gcMx + ";" + line
-                            + " this." + _gvMx + ".Name = \"" + _gvMx + "\";" +
-                            line
-                            + " this." + _gvMx +
-                            ".OptionsFind.ShowSearchNavButtons = false;" + line
-                            + " this." + _gvMx +
-                            ".OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;" +
-                            line
-                            + " this." + _gvMx +
-                            ".OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;" +
-                            line
-                            + " this." + _gvMx +
-                            ".OptionsView.ShowGroupPanel = false;" + line
-                            + " this." + _gvMx +
-                            ".Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { {colMx1List}});";
-                        strbuilder.Replace("BQSetControlInfo", inf);
-                        //BQCreateConrolObejct //鍒涘缓鎺т欢 
-                        var _cc = "BQCreateConrolObejct" + line;
-                        _cc += " private DevExpress.XtraTab.XtraTabPage " +
-                               _tabMxPage + ";" + line;
-                        _cc += " private DevExpress.XtraGrid.GridControl " +
-                               _gcMx + ";" + line;
-                        _cc +=
-                            " private DevExpress.XtraGrid.Views.Grid.GridView " +
-                            _gvMx + ";";
-                        strbuilder.Replace("BQCreateConrolObejct", _cc);
-                        var _layout = new StringBuilder();
-                        _layout.Append("this.tabMxPage1.SuspendLayout();");
-                        strbuilder.Replace("{layoutList}", _layout.ToString());
-                        var _resume = new StringBuilder();
-                        _resume.Append("this.tabMxPage1.ResumeLayout(false);");
-                        strbuilder.Replace("{resumeLayout}",
-                            _resume.ToString());
-                        var _beg = new StringBuilder();
-                        _beg.Append(
-                            "((System.ComponentModel.ISupportInitialize)(this." +
-                            _gcMx + ")).BeginInit();" + line);
-                        _beg.Append(
-                            " ((System.ComponentModel.ISupportInitialize)(this." +
-                            _gvMx + ")).BeginInit();" + line);
-                        strbuilder.Replace("{begInit}", _beg.ToString());
-                        ///////////////////
-                        _RowCount = dt2.Rows.Count;
-                        _gvItemCol = new StringBuilder();
-                        for (var c = 0; c < _RowCount; c++)
-                        {
-                            switch (dt2.Rows[c]["DATA_TYPE"].ToString())
-                            {
-                                default:
-                                    _FieldName =
-                                        UtilityHelper.ToCamelCase(
-                                            dt2.Rows[c]["COLUMN_NAME"]
-                                                .ToString());
-                                    _FieldText = dt2.Rows[c]["REMARK"]
-                                        .ToString();
-                                    _FieldNameSql = "query_a." +
-                                                    dt2.Rows[c]["COLUMN_NAME"];
-                                    break;
-                            }
-
-                            var _gvColName = _gvMx + _FieldName;
-                            if (_gvItemCol.Length > 0)
-                                _gvItemCol.Append(",");
-                            _gvItemCol.Append("this." + _gvColName);
-                            //BQSetControlObject  瀹炰緥鍖栨帶浠�
-                            var BQSetControlObject =
-                                "BQSetControlObject" + line;
-                            BQSetControlObject += "this." + _gvColName +
-                                                  " = new DevExpress.XtraGrid.Columns.GridColumn(); ";
-                            strbuilder.Replace("BQSetControlObject",
-                                BQSetControlObject);
-                            //BQSetControlInfo  璁剧疆鎺т欢淇℃伅浣嶇疆澶у皬鍚嶇О
-                            var BQSetControlInfo = "BQSetControlInfo" + line
-                                + "this." + _gvColName +
-                                ".AppearanceCell.Font = new System.Drawing.Font(\"Tahoma\", 10F);" +
-                                line
-                                + "this." + _gvColName +
-                                ".AppearanceCell.Options.UseFont = true;" + line
-                                + "this." + _gvColName + ".FieldName = \"" +
-                                _FieldName + "\";" + line
-                                + "this." + _gvColName + ".Caption =  \"" +
-                                _FieldText + " \";" + line
-                                + "this." + _gvColName + ".Tag = \"" +
-                                _FieldNameSql + "\";" + line
-                                + "this." + _gvColName + ".MinWidth = 50;" +
-                                line
-                                + "this." + _gvColName + ".Visible = true;" +
-                                line
-                                + "this." + _gvColName + ".Width =94;" + line
-                                + "this." + _gvColName +
-                                ".OptionsColumn.AllowEdit = true;" + line
-                                + "this." + _gvColName + ".VisibleIndex = 0;" +
-                                line;
-                            strbuilder.Replace("BQSetControlInfo",
-                                BQSetControlInfo);
-                            //BQCreateConrolObejct //鍒涘缓鎺т欢 
-                            var BQCreateConrolObejct =
-                                "BQCreateConrolObejct" + line;
-                            BQCreateConrolObejct +=
-                                " private DevExpress.XtraGrid.Columns.GridColumn " +
-                                _gvColName + ";";
-                            strbuilder.Replace("BQCreateConrolObejct",
-                                BQCreateConrolObejct);
-                        }
-
-                        strbuilder.Replace("{colMx1List}",
-                            _gvItemCol.ToString());
-                        _idx++;
-                    }
-
-                    strbuilder.Replace("{tabMx1List}", _tabItem.ToString());
-                }
-
-                File.Delete(txtPath.Text + "\\" + _FileName + ".Designer.cs");
-                var path = txtPath.Text;
-                var sw =
-                    File.CreateText(path + "\\" + _FileName + ".Designer.cs");
-                sw.Write(strbuilder.ToString());
-                sw.Close();
-                sw.Dispose();
-            }
-        }
-
-
-        /// <summary>
-        ///     绗笁涓枃浠�
-        /// </summary>
-        /// <param name="dt"></param>
-        /// <param name="_FileName"></param>
-        private void ReadResxFile(DataTable dt, string _FileName)
-        {
-            var _Temppath = Application.StartupPath + _getTemple("resx");
-            var contents = File.ReadAllText(_Temppath);
-            var strbuilder = new StringBuilder();
-            var line = Environment.NewLine;
-            strbuilder.Append(contents);
-            File.Delete(txtPath.Text + "\\" + _FileName + ".resx");
-            var path = txtPath.Text;
-            var sw = File.CreateText(path + "\\" + _FileName + ".resx");
-            sw.Write(strbuilder.ToString());
-            sw.Close();
-            sw.Dispose();
-        }
-
-        #endregion
-
-
-        #region 鏂囦欢涓婁紶
-
-        /// <summary>
-        ///     閫夋嫨涓婁紶鏂囦欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnUpSelect_Click(object sender, EventArgs e)
-        {
-            var openFileDialog = new OpenFileDialog();
-            // 璁剧疆鍒濆鐩綍
-            openFileDialog.InitialDirectory = "c:\\";
-            // 璁剧疆鏂囦欢杩囨护閫夐」锛屽锛�"鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"
-            openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
-            // 璁剧疆鏍囬
-            openFileDialog.Title = "閫夋嫨鏂囦欢";
-            // 鏄剧ず瀵硅瘽妗�
-            var result = openFileDialog.ShowDialog();
-            // 纭鐢ㄦ埛娌℃湁鍙栨秷鎿嶄綔
-            if (result == DialogResult.OK)
-            {
-                // 鑾峰彇閫変腑鐨勬枃浠惰矾寰�
-                var filePath = openFileDialog.FileName;
-                Console.WriteLine($"閫変腑鐨勬枃浠�: {filePath}");
-                txtUpUrl.Text = filePath;
-            }
-        }
-
-        /// <summary>
-        ///     纭畾涓婁紶
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private async  void BtnUp_Click(object sender, EventArgs e)
-        {
-            var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl");
-            var address = WebApiUrl + "Upload/UploadFile";
-            var filePath = txtUpUrl.Text.Trim();
-            var apiUrl = address; // 鏇挎崲涓轰綘鐨凙PI鍦板潃
-            await UploadFileAsync(apiUrl, filePath);
-        }
-
-        private async  Task UploadFileAsync(string url, string filePath)
-        {
-            using (var httpClient = new HttpClient())
-            using (var form = new MultipartFormDataContent())
-            {
-                httpClient.DefaultRequestHeaders.Add("token",
-                    UtilityHelper.GetBasicAuthTicket());
-                using (var fs = File.OpenRead(filePath))
-                using (var streamContent = new StreamContent(fs))
-                {
-                    form.Add(streamContent, "file", Path.GetFileName(filePath));
-                    var response = await httpClient.PostAsync(url, form);
-                    var responseString =
-                        await response.Content.ReadAsStringAsync();
-                    MessageBox.Show(responseString);
-                }
-            }
-        }
-
-        #endregion
-
-
-        #region 鎺ㄩ�佹祴璇�
-
-        /// <summary>
-        ///     纭畾鎺ㄩ��
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void btnMes_Click(object sender, EventArgs e)
-        {
-            var _list = new List<dynamic>();
-            for (var i = 0; i < 20; i++)
-                _list.Add(new
-                {
-                    t1 = "test1_" + i, //鍗曚綅缂栧彿
-                    t2 = "hi2_" + i //鍗曚綅鍚嶇О
-                });
-            var _json = new
-            {
-                category = "鍗曚綅淇℃伅",
-                list = _list
-            };
-            try
-            {
-                var _apiUrl = "http://localhost:5263/";
-                var _strReturnJson = HttpPost(_apiUrl,
-                    "ErpMes/PushMesByCategory",
-                    JsonConvert.SerializeObject(_json));
-                txtMesResult.Text = _strReturnJson;
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="url">apiUrl鏍瑰湴鍧�</param>
-        /// <param name="meth">apiUrl鏂规硶鍚�</param>
-        /// <param name="param">json鍙傛暟</param>
-        /// <returns></returns>
-        public static string HttpPost(string url, string meth, string param)
-        {
-            //杩欐槸涓�涓櫄鎷熺殑token锛屼笉鑳藉垹闄�
-            var token = Guid.NewGuid() + "~" + Guid.NewGuid();
-            var request = (HttpWebRequest)WebRequest.Create(url + meth);
-            request.Method = "POST";
-            request.ContentType = "application/json";
-            request.Headers.Add("token", token);
-            request.Accept = "*/*";
-            request.Timeout = 15000;
-            request.AllowAutoRedirect = false;
-            StreamWriter requestStream = null;
-            WebResponse response = null;
-            string responseStr = null;
-            try
-            {
-                requestStream = new StreamWriter(request.GetRequestStream());
-                requestStream.Write(param);
-                requestStream.Close();
-                response = request.GetResponse();
-                if (response != null)
-                {
-                    var reader = new StreamReader(response.GetResponseStream(),
-                        Encoding.UTF8);
-                    responseStr = reader.ReadToEnd();
-                    reader.Close();
-                }
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-            finally
-            {
-                request = null;
-                requestStream = null;
-                response = null;
-            }
-
-            return responseStr;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.resx b/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.resx
deleted file mode 100644
index bfad99e..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.resx
+++ /dev/null
@@ -1,134 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-    <!-- 
-      Microsoft ResX Schema 
-      
-      Version 2.0
-      
-      The primary goals of this format is to allow a simple XML format 
-      that is mostly human readable. The generation and parsing of the 
-      various data types are done through the TypeConverter classes 
-      associated with the data types.
-      
-      Example:
-      
-      ... ado.net/XML headers & schema ...
-      <resheader name="resmimetype">text/microsoft-resx</resheader>
-      <resheader name="version">2.0</resheader>
-      <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-      <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-      <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-      <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-      <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-          <value>[base64 mime encoded serialized .NET Framework object]</value>
-      </data>
-      <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-          <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-          <comment>This is a comment</comment>
-      </data>
-                  
-      There are any number of "resheader" rows that contain simple 
-      name/value pairs.
-      
-      Each data row contains a name, and value. The row also contains a 
-      type or mimetype. Type corresponds to a .NET class that support 
-      text/value conversion through the TypeConverter architecture. 
-      Classes that don't support this are serialized and stored with the 
-      mimetype set.
-      
-      The mimetype is used for serialized objects, and tells the 
-      ResXResourceReader how to depersist the object. This is currently not 
-      extensible. For a given mimetype the value must be set accordingly:
-      
-      Note - application/x-microsoft.net.object.binary.base64 is the format 
-      that the ResXResourceWriter will generate, however the reader can 
-      read any of the formats listed below.
-      
-      mimetype: application/x-microsoft.net.object.binary.base64
-      value   : The object must be serialized with 
-              : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-              : and then encoded with base64 encoding.
-      
-      mimetype: application/x-microsoft.net.object.soap.base64
-      value   : The object must be serialized with 
-              : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-              : and then encoded with base64 encoding.
-  
-      mimetype: application/x-microsoft.net.object.bytearray.base64
-      value   : The object must be serialized into a byte array 
-              : using a System.ComponentModel.TypeConverter
-              : and then encoded with base64 encoding.
-      -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
-                xmlns="">
-        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-        <xsd:element name="root" msdata:IsDataSet="true">
-            <xsd:complexType>
-                <xsd:choice maxOccurs="unbounded">
-                    <xsd:element name="metadata">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string"
-                                             minOccurs="0"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" use="required"
-                                           type="xsd:string"/>
-                            <xsd:attribute name="type" type="xsd:string"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="assembly">
-                        <xsd:complexType>
-                            <xsd:attribute name="alias" type="xsd:string"/>
-                            <xsd:attribute name="name" type="xsd:string"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="data">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string"
-                                             minOccurs="0" msdata:Ordinal="1"/>
-                                <xsd:element name="comment" type="xsd:string"
-                                             minOccurs="0" msdata:Ordinal="2"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string"
-                                           use="required" msdata:Ordinal="1"/>
-                            <xsd:attribute name="type" type="xsd:string"
-                                           msdata:Ordinal="3"/>
-                            <xsd:attribute name="mimetype" type="xsd:string"
-                                           msdata:Ordinal="4"/>
-                            <xsd:attribute ref="xml:space"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                    <xsd:element name="resheader">
-                        <xsd:complexType>
-                            <xsd:sequence>
-                                <xsd:element name="value" type="xsd:string"
-                                             minOccurs="0" msdata:Ordinal="1"/>
-                            </xsd:sequence>
-                            <xsd:attribute name="name" type="xsd:string"
-                                           use="required"/>
-                        </xsd:complexType>
-                    </xsd:element>
-                </xsd:choice>
-            </xsd:complexType>
-        </xsd:element>
-    </xsd:schema>
-    <resheader name="resmimetype">
-        <value>text/microsoft-resx</value>
-    </resheader>
-    <resheader name="version">
-        <value>2.0</value>
-    </resheader>
-    <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms,
-            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-        </value>
-    </resheader>
-    <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
-            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-        </value>
-    </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
deleted file mode 100644
index fa90895..0000000
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
+++ /dev/null
@@ -1,1719 +0,0 @@
-/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
-{
-    partial class Frm_MesWomdaahb
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.daaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2xh = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2womdaahbNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2pbomNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa006 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa007 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa024 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb002 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb001 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb003 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb004 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb005 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb006 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb007 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb008 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb010 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb011 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb012 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb013 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb014 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb016 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb017 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb018 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb019 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb020 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb021 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb022 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb023 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb024 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1womdaahbNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb025 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dabhb026 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1depotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1positionNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lot = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1mtono = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_depotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_freezeFlag = new DevExpress.XtraEditors.LabelControl();
-            this.gv_freezeFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_daahb013name = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_daahb022 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_daahb020 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
-            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
-            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_daahb015 = new DevExpress.XtraEditors.LabelControl();
-            this.gv_daahb015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_daahb013 = new DevExpress.XtraEditors.LabelControl();
-            this.gv_daahb013 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_daahb009 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_daahb009 = new DevExpress.XtraEditors.TextEdit();
-            this.gv_daahb009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_womdaahbNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_womdaahbNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_womdaahbNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
-            this.txt_daahb015 = new Gs.DevApp.UserControl.UcLookWorkline();
-            this.txt_daahb013 = new Gs.DevApp.UserControl.UcLookWorkshop();
-            this.txt_freezeFlag = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daahb009.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_womdaahbNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            this.xtraTabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
-            this.tabMx.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freezeFlag.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // tabMxPage2
-            // 
-            this.tabMxPage2.Controls.Add(this.gcMx1);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 388);
-            this.tabMxPage2.Text = "鍚堝苟宸ュ崟鍒楄〃";
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 388);
-            this.gcMx1.TabIndex = 0;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMxDel,
-            this.gvMx2guid,
-            this.daaGuid,
-            this.gvMx2xh,
-            this.gvMx2womdaahbNo,
-            this.gvMx2pbomNo,
-            this.gvMx2itemId,
-            this.gvMx2daa002,
-            this.gvMx2daa003,
-            this.gvMx2daa004,
-            this.gvMx2daa008,
-            this.gvMx2daa005,
-            this.gvMx2daa006,
-            this.gvMx2daa007,
-            this.gvMx2daa015,
-            this.gvMx2daa009,
-            this.gvMx2daa024,
-            this.gvMx2daa014});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
-            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 0;
-            this.gvMxDel.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // gvMx2guid
-            // 
-            
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "guid ";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.OptionsColumn.ReadOnly = true;
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Visible = true;
-            this.gvMx2guid.VisibleIndex = 1;
-            this.gvMx2guid.Width = 94;
-            // 
-            // daaGuid
-            // 
-            this.daaGuid.Caption = "daaGuid";
-            this.daaGuid.FieldName = "daaGuid";
-            this.daaGuid.MinWidth = 25;
-            this.daaGuid.Name = "daaGuid";
-            this.daaGuid.OptionsColumn.ReadOnly = true;
-            this.daaGuid.Visible = true;
-            this.daaGuid.VisibleIndex = 2;
-            this.daaGuid.Width = 94;
-            // 
-            // gvMx2xh
-            // 
-            
-            this.gvMx2xh.AppearanceCell.Options.UseFont = true;
-            this.gvMx2xh.Caption = "搴忓彿 ";
-            this.gvMx2xh.FieldName = "xh";
-            this.gvMx2xh.MinWidth = 50;
-            this.gvMx2xh.Name = "gvMx2xh";
-            this.gvMx2xh.OptionsColumn.ReadOnly = true;
-            this.gvMx2xh.Tag = "query_a.xh";
-            this.gvMx2xh.Visible = true;
-            this.gvMx2xh.VisibleIndex = 3;
-            this.gvMx2xh.Width = 94;
-            // 
-            // gvMx2womdaahbNo
-            // 
-             
-            this.gvMx2womdaahbNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2womdaahbNo.Caption = "鍚堝苟宸ュ崟 ";
-            this.gvMx2womdaahbNo.FieldName = "womdaahbNo";
-            this.gvMx2womdaahbNo.MinWidth = 50;
-            this.gvMx2womdaahbNo.Name = "gvMx2womdaahbNo";
-            this.gvMx2womdaahbNo.OptionsColumn.ReadOnly = true;
-            this.gvMx2womdaahbNo.Tag = "query_a.womdaahb_no";
-            this.gvMx2womdaahbNo.Visible = true;
-            this.gvMx2womdaahbNo.VisibleIndex = 4;
-            this.gvMx2womdaahbNo.Width = 94;
-            // 
-            // gvMx2pbomNo
-            // 
-            
-            this.gvMx2pbomNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2pbomNo.Caption = "宸ュ崟鍗曞彿 ";
-            this.gvMx2pbomNo.FieldName = "pbomNo";
-            this.gvMx2pbomNo.MinWidth = 50;
-            this.gvMx2pbomNo.Name = "gvMx2pbomNo";
-            this.gvMx2pbomNo.OptionsColumn.ReadOnly = true;
-            this.gvMx2pbomNo.Tag = "query_a.pbom_no";
-            this.gvMx2pbomNo.Visible = true;
-            this.gvMx2pbomNo.VisibleIndex = 5;
-            this.gvMx2pbomNo.Width = 94;
-            // 
-            // gvMx2itemId
-            // 
-           
-            this.gvMx2itemId.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemId.Caption = "鐗╂枡id ";
-            this.gvMx2itemId.FieldName = "itemId";
-            this.gvMx2itemId.MinWidth = 50;
-            this.gvMx2itemId.Name = "gvMx2itemId";
-            this.gvMx2itemId.OptionsColumn.ReadOnly = true;
-            this.gvMx2itemId.Tag = "query_a.item_id";
-            this.gvMx2itemId.Visible = true;
-            this.gvMx2itemId.VisibleIndex = 6;
-            this.gvMx2itemId.Width = 94;
-            // 
-            // gvMx2daa002
-            // 
-          
-            this.gvMx2daa002.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa002.Caption = "浜у搧缂栫爜 ";
-            this.gvMx2daa002.FieldName = "daa002";
-            this.gvMx2daa002.MinWidth = 50;
-            this.gvMx2daa002.Name = "gvMx2daa002";
-            this.gvMx2daa002.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa002.Tag = "query_a.daa002";
-            this.gvMx2daa002.Visible = true;
-            this.gvMx2daa002.VisibleIndex = 7;
-            this.gvMx2daa002.Width = 94;
-            // 
-            // gvMx2daa003
-            // 
-           
-            this.gvMx2daa003.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa003.Caption = "浜у搧鍚嶇О ";
-            this.gvMx2daa003.FieldName = "daa003";
-            this.gvMx2daa003.MinWidth = 50;
-            this.gvMx2daa003.Name = "gvMx2daa003";
-            this.gvMx2daa003.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa003.Tag = "query_a.daa003";
-            this.gvMx2daa003.Visible = true;
-            this.gvMx2daa003.VisibleIndex = 8;
-            this.gvMx2daa003.Width = 94;
-            // 
-            // gvMx2daa004
-            // 
-          
-            this.gvMx2daa004.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa004.Caption = "浜у搧瑙勬牸 ";
-            this.gvMx2daa004.FieldName = "daa004";
-            this.gvMx2daa004.MinWidth = 50;
-            this.gvMx2daa004.Name = "gvMx2daa004";
-            this.gvMx2daa004.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa004.Tag = "query_a.daa004";
-            this.gvMx2daa004.Visible = true;
-            this.gvMx2daa004.VisibleIndex = 9;
-            this.gvMx2daa004.Width = 94;
-            // 
-            // gvMx2daa008
-            // 
-            
-            this.gvMx2daa008.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa008.Caption = "宸ュ崟鏁伴噺 ";
-            this.gvMx2daa008.FieldName = "daa008";
-            this.gvMx2daa008.MinWidth = 50;
-            this.gvMx2daa008.Name = "gvMx2daa008";
-            this.gvMx2daa008.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa008.Tag = "query_a.daa008";
-            this.gvMx2daa008.Visible = true;
-            this.gvMx2daa008.VisibleIndex = 10;
-            this.gvMx2daa008.Width = 94;
-            // 
-            // gvMx2daa005
-            // 
-           
-            this.gvMx2daa005.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa005.Caption = "鍗曚綅";
-            this.gvMx2daa005.FieldName = "daa005";
-            this.gvMx2daa005.MinWidth = 50;
-            this.gvMx2daa005.Name = "gvMx2daa005";
-            this.gvMx2daa005.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa005.Tag = "query_a.daa005";
-            this.gvMx2daa005.Visible = true;
-            this.gvMx2daa005.VisibleIndex = 11;
-            this.gvMx2daa005.Width = 94;
-            // 
-            // gvMx2daa006
-            // 
-           
-            this.gvMx2daa006.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa006.Caption = "棰勮寮�宸ユ椂闂� ";
-            this.gvMx2daa006.FieldName = "daa006";
-            this.gvMx2daa006.MinWidth = 50;
-            this.gvMx2daa006.Name = "gvMx2daa006";
-            this.gvMx2daa006.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa006.Tag = "query_a.daa006";
-            this.gvMx2daa006.Visible = true;
-            this.gvMx2daa006.VisibleIndex = 12;
-            this.gvMx2daa006.Width = 94;
-            // 
-            // gvMx2daa007
-            // 
-           
-            this.gvMx2daa007.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa007.Caption = "棰勮瀹屽伐鏃堕棿 ";
-            this.gvMx2daa007.FieldName = "daa007";
-            this.gvMx2daa007.MinWidth = 50;
-            this.gvMx2daa007.Name = "gvMx2daa007";
-            this.gvMx2daa007.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa007.Tag = "query_a.daa007";
-            this.gvMx2daa007.Visible = true;
-            this.gvMx2daa007.VisibleIndex = 13;
-            this.gvMx2daa007.Width = 94;
-            // 
-            // gvMx2daa015
-            // 
-           
-            this.gvMx2daa015.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa015.Caption = "鐢熶骇绾垮埆 ";
-            this.gvMx2daa015.FieldName = "daa015";
-            this.gvMx2daa015.MinWidth = 50;
-            this.gvMx2daa015.Name = "gvMx2daa015";
-            this.gvMx2daa015.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa015.Tag = "query_a.daa015";
-            this.gvMx2daa015.Visible = true;
-            this.gvMx2daa015.VisibleIndex = 14;
-            this.gvMx2daa015.Width = 94;
-            // 
-            // gvMx2daa009
-            // 
-           
-            this.gvMx2daa009.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx2daa009.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa009.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx2daa009.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx2daa009.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx2daa009.Caption = "澶囨敞 ";
-            this.gvMx2daa009.FieldName = "daa009";
-            this.gvMx2daa009.MinWidth = 50;
-            this.gvMx2daa009.Name = "gvMx2daa009";
-            this.gvMx2daa009.Tag = "query_a.daa009";
-            this.gvMx2daa009.Visible = true;
-            this.gvMx2daa009.VisibleIndex = 15;
-            this.gvMx2daa009.Width = 94;
-            // 
-            // gvMx2daa024
-            // 
-           
-            this.gvMx2daa024.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa024.Caption = "鎺掍骇鏃ユ湡 ";
-            this.gvMx2daa024.FieldName = "daa024";
-            this.gvMx2daa024.MinWidth = 50;
-            this.gvMx2daa024.Name = "gvMx2daa024";
-            this.gvMx2daa024.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa024.Tag = "query_a.daa024";
-            this.gvMx2daa024.Visible = true;
-            this.gvMx2daa024.VisibleIndex = 16;
-            this.gvMx2daa024.Width = 94;
-            // 
-            // gvMx2daa014
-            // 
-            
-            this.gvMx2daa014.AppearanceCell.Options.UseFont = true;
-            this.gvMx2daa014.Caption = "鎶曟枡鍗曞崟鍙� ";
-            this.gvMx2daa014.FieldName = "daa014";
-            this.gvMx2daa014.MinWidth = 50;
-            this.gvMx2daa014.Name = "gvMx2daa014";
-            this.gvMx2daa014.OptionsColumn.ReadOnly = true;
-            this.gvMx2daa014.Tag = "query_a.daa014";
-            this.gvMx2daa014.Visible = true;
-            this.gvMx2daa014.VisibleIndex = 17;
-            this.gvMx2daa014.Width = 94;
-            // 
-            // tabMxPage1
-            // 
-            this.tabMxPage1.Controls.Add(this.gcMx2);
-            this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 381);
-            this.tabMxPage1.Text = "鍚堝苟宸ュ崟鏄庣粏";
-            // 
-            // gcMx2
-            // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.Location = new System.Drawing.Point(0, 0);
-            this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1124, 381);
-            this.gcMx2.TabIndex = 0;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1id,
-            this.gvMx1pid,
-            this.gvMx1dabhb002,
-            this.gvMx1dabhb001,
-            this.gvMx1dabhb003,
-            this.gvMx1dabhb004,
-            this.gvMx1dabhb005,
-            this.gvMx1dabhb006,
-            this.gvMx1dabhb009,
-            this.gvMx1dabhb007,
-            this.gvMx1dabhb008,
-            this.gvMx1dabhb010,
-            this.gvMx1dabhb011,
-            this.gvMx1dabhb012,
-            this.gvMx1dabhb013,
-            this.gvMx1dabhb014,
-            this.gvMx1dabhb015,
-            this.gvMx1dabhb016,
-            this.gvMx1dabhb017,
-            this.gvMx1dabhb018,
-            this.gvMx1dabhb019,
-            this.gvMx1dabhb020,
-            this.gvMx1dabhb021,
-            this.gvMx1dabhb022,
-            this.gvMx1dabhb023,
-            this.gvMx1dabhb024,
-            this.gvMx1womdaahbNo,
-            this.gvMx1dabhb025,
-            this.gvMx1dabhb026,
-            this.gvMx1depotNo,
-            this.gvMx1positionNo,
-            this.gvMx1lot,
-            this.gvMx1mtono});
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
-            this.gvMx2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx1guid
-            // 
-           
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid ";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Visible = true;
-            this.gvMx1guid.VisibleIndex = 0;
-            this.gvMx1guid.Width = 94;
-            // 
-            // gvMx1id
-            // 
-            
-            this.gvMx1id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1id.Caption = "id ";
-            this.gvMx1id.FieldName = "id";
-            this.gvMx1id.MinWidth = 50;
-            this.gvMx1id.Name = "gvMx1id";
-            this.gvMx1id.Tag = "query_a.id";
-            this.gvMx1id.Visible = true;
-            this.gvMx1id.VisibleIndex = 1;
-            this.gvMx1id.Width = 94;
-            // 
-            // gvMx1pid
-            // 
-           
-            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pid.Caption = "pid ";
-            this.gvMx1pid.FieldName = "pid";
-            this.gvMx1pid.MinWidth = 50;
-            this.gvMx1pid.Name = "gvMx1pid";
-            this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Visible = true;
-            this.gvMx1pid.VisibleIndex = 2;
-            this.gvMx1pid.Width = 94;
-            // 
-            // gvMx1dabhb002
-            // 
-          
-            this.gvMx1dabhb002.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb002.Caption = "搴忓彿 ";
-            this.gvMx1dabhb002.FieldName = "dabhb002";
-            this.gvMx1dabhb002.MinWidth = 50;
-            this.gvMx1dabhb002.Name = "gvMx1dabhb002";
-            this.gvMx1dabhb002.Tag = "query_a.dabhb002";
-            this.gvMx1dabhb002.Visible = true;
-            this.gvMx1dabhb002.VisibleIndex = 4;
-            this.gvMx1dabhb002.Width = 94;
-            // 
-            // gvMx1dabhb001
-            // 
-       
-            this.gvMx1dabhb001.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb001.Caption = "宸ュ崟鍗曞彿 ";
-            this.gvMx1dabhb001.FieldName = "dabhb001";
-            this.gvMx1dabhb001.MinWidth = 50;
-            this.gvMx1dabhb001.Name = "gvMx1dabhb001";
-            this.gvMx1dabhb001.Tag = "query_a.dabhb001";
-            this.gvMx1dabhb001.Visible = true;
-            this.gvMx1dabhb001.VisibleIndex = 3;
-            this.gvMx1dabhb001.Width = 94;
-            // 
-            // gvMx1dabhb003
-            // 
-    
-            this.gvMx1dabhb003.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb003.Caption = "鏉愭枡缂栫爜";
-            this.gvMx1dabhb003.FieldName = "dabhb003";
-            this.gvMx1dabhb003.MinWidth = 50;
-            this.gvMx1dabhb003.Name = "gvMx1dabhb003";
-            this.gvMx1dabhb003.Tag = "query_a.dabhb003";
-            this.gvMx1dabhb003.Visible = true;
-            this.gvMx1dabhb003.VisibleIndex = 5;
-            this.gvMx1dabhb003.Width = 94;
-            // 
-            // gvMx1dabhb004
-            // 
-        
-            this.gvMx1dabhb004.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb004.Caption = "鏉愭枡鍚嶇О";
-            this.gvMx1dabhb004.FieldName = "dabhb004";
-            this.gvMx1dabhb004.MinWidth = 50;
-            this.gvMx1dabhb004.Name = "gvMx1dabhb004";
-            this.gvMx1dabhb004.Tag = "query_a.dabhb004";
-            this.gvMx1dabhb004.Visible = true;
-            this.gvMx1dabhb004.VisibleIndex = 6;
-            this.gvMx1dabhb004.Width = 94;
-            // 
-            // gvMx1dabhb005
-            // 
-          
-            this.gvMx1dabhb005.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb005.Caption = "鐗╂枡|瑙勬牸";
-            this.gvMx1dabhb005.FieldName = "dabhb005";
-            this.gvMx1dabhb005.MinWidth = 50;
-            this.gvMx1dabhb005.Name = "gvMx1dabhb005";
-            this.gvMx1dabhb005.Tag = "query_a.dabhb005";
-            this.gvMx1dabhb005.Visible = true;
-            this.gvMx1dabhb005.VisibleIndex = 7;
-            this.gvMx1dabhb005.Width = 94;
-            // 
-            // gvMx1dabhb006
-            // 
-           
-            this.gvMx1dabhb006.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb006.Caption = "宸ュ崟鏁伴噺";
-            this.gvMx1dabhb006.FieldName = "dabhb006";
-            this.gvMx1dabhb006.MinWidth = 50;
-            this.gvMx1dabhb006.Name = "gvMx1dabhb006";
-            this.gvMx1dabhb006.Tag = "query_a.dabhb006";
-            this.gvMx1dabhb006.Visible = true;
-            this.gvMx1dabhb006.VisibleIndex = 8;
-            this.gvMx1dabhb006.Width = 94;
-            // 
-            // gvMx1dabhb009
-            // 
-            
-            this.gvMx1dabhb009.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb009.Caption = "鍗曚綅(鍐呯爜) ";
-            this.gvMx1dabhb009.FieldName = "dabhb009";
-            this.gvMx1dabhb009.MinWidth = 50;
-            this.gvMx1dabhb009.Name = "gvMx1dabhb009";
-            this.gvMx1dabhb009.Tag = "query_a.dabhb009";
-            this.gvMx1dabhb009.Visible = true;
-            this.gvMx1dabhb009.VisibleIndex = 11;
-            this.gvMx1dabhb009.Width = 94;
-            // 
-            // gvMx1dabhb007
-            // 
-           
-            this.gvMx1dabhb007.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb007.Caption = "宸查鐢ㄩ噺 ";
-            this.gvMx1dabhb007.FieldName = "dabhb007";
-            this.gvMx1dabhb007.MinWidth = 50;
-            this.gvMx1dabhb007.Name = "gvMx1dabhb007";
-            this.gvMx1dabhb007.Tag = "query_a.dabhb007";
-            this.gvMx1dabhb007.Visible = true;
-            this.gvMx1dabhb007.VisibleIndex = 9;
-            this.gvMx1dabhb007.Width = 94;
-            // 
-            // gvMx1dabhb008
-            // 
-          
-            this.gvMx1dabhb008.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb008.Caption = "宸ヨ壓 ";
-            this.gvMx1dabhb008.FieldName = "dabhb008";
-            this.gvMx1dabhb008.MinWidth = 50;
-            this.gvMx1dabhb008.Name = "gvMx1dabhb008";
-            this.gvMx1dabhb008.Tag = "query_a.dabhb008";
-            this.gvMx1dabhb008.Visible = true;
-            this.gvMx1dabhb008.VisibleIndex = 10;
-            this.gvMx1dabhb008.Width = 94;
-            // 
-            // gvMx1dabhb010
-            // 
-           
-            this.gvMx1dabhb010.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb010.Caption = "鏉愭枡绫诲瀷 ";
-            this.gvMx1dabhb010.FieldName = "dabhb010";
-            this.gvMx1dabhb010.MinWidth = 50;
-            this.gvMx1dabhb010.Name = "gvMx1dabhb010";
-            this.gvMx1dabhb010.Tag = "query_a.dabhb010";
-            this.gvMx1dabhb010.Visible = true;
-            this.gvMx1dabhb010.VisibleIndex = 12;
-            this.gvMx1dabhb010.Width = 94;
-            // 
-            // gvMx1dabhb011
-            // 
-       
-            this.gvMx1dabhb011.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb011.Caption = "涓绘枡 ";
-            this.gvMx1dabhb011.FieldName = "dabhb011";
-            this.gvMx1dabhb011.MinWidth = 50;
-            this.gvMx1dabhb011.Name = "gvMx1dabhb011";
-            this.gvMx1dabhb011.Tag = "query_a.dabhb011";
-            this.gvMx1dabhb011.Visible = true;
-            this.gvMx1dabhb011.VisibleIndex = 13;
-            this.gvMx1dabhb011.Width = 94;
-            // 
-            // gvMx1dabhb012
-            // 
-           
-            this.gvMx1dabhb012.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb012.Caption = "缁勬垚鐢ㄩ噺 ";
-            this.gvMx1dabhb012.FieldName = "dabhb012";
-            this.gvMx1dabhb012.MinWidth = 50;
-            this.gvMx1dabhb012.Name = "gvMx1dabhb012";
-            this.gvMx1dabhb012.Tag = "query_a.dabhb012";
-            this.gvMx1dabhb012.Visible = true;
-            this.gvMx1dabhb012.VisibleIndex = 14;
-            this.gvMx1dabhb012.Width = 94;
-            // 
-            // gvMx1dabhb013
-            // 
-            
-            this.gvMx1dabhb013.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb013.Caption = "搴曟暟 ";
-            this.gvMx1dabhb013.FieldName = "dabhb013";
-            this.gvMx1dabhb013.MinWidth = 50;
-            this.gvMx1dabhb013.Name = "gvMx1dabhb013";
-            this.gvMx1dabhb013.Tag = "query_a.dabhb013";
-            this.gvMx1dabhb013.Visible = true;
-            this.gvMx1dabhb013.VisibleIndex = 15;
-            this.gvMx1dabhb013.Width = 94;
-            // 
-            // gvMx1dabhb014
-            // 
-          
-            this.gvMx1dabhb014.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb014.Caption = "鏄惁鏇挎枡 ";
-            this.gvMx1dabhb014.FieldName = "dabhb014";
-            this.gvMx1dabhb014.MinWidth = 50;
-            this.gvMx1dabhb014.Name = "gvMx1dabhb014";
-            this.gvMx1dabhb014.Tag = "query_a.dabhb014";
-            this.gvMx1dabhb014.Visible = true;
-            this.gvMx1dabhb014.VisibleIndex = 16;
-            this.gvMx1dabhb014.Width = 94;
-            // 
-            // gvMx1dabhb015
-            // 
-           
-            this.gvMx1dabhb015.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb015.Caption = "鐐逛綅 ";
-            this.gvMx1dabhb015.FieldName = "dabhb015";
-            this.gvMx1dabhb015.MinWidth = 50;
-            this.gvMx1dabhb015.Name = "gvMx1dabhb015";
-            this.gvMx1dabhb015.Tag = "query_a.dabhb015";
-            this.gvMx1dabhb015.Visible = true;
-            this.gvMx1dabhb015.VisibleIndex = 17;
-            this.gvMx1dabhb015.Width = 94;
-            // 
-            // gvMx1dabhb016
-            // 
-         
-            this.gvMx1dabhb016.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb016.Caption = "鎶曟枡鍗曞彿 ";
-            this.gvMx1dabhb016.FieldName = "dabhb016";
-            this.gvMx1dabhb016.MinWidth = 50;
-            this.gvMx1dabhb016.Name = "gvMx1dabhb016";
-            this.gvMx1dabhb016.Tag = "query_a.dabhb016";
-            this.gvMx1dabhb016.Visible = true;
-            this.gvMx1dabhb016.VisibleIndex = 18;
-            this.gvMx1dabhb016.Width = 94;
-            // 
-            // gvMx1dabhb017
-            // 
-         
-            this.gvMx1dabhb017.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb017.Caption = "浠撳簱缂栫爜 ";
-            this.gvMx1dabhb017.FieldName = "dabhb017";
-            this.gvMx1dabhb017.MinWidth = 50;
-            this.gvMx1dabhb017.Name = "gvMx1dabhb017";
-            this.gvMx1dabhb017.Tag = "query_a.dabhb017";
-            this.gvMx1dabhb017.Visible = true;
-            this.gvMx1dabhb017.VisibleIndex = 19;
-            this.gvMx1dabhb017.Width = 94;
-            // 
-            // gvMx1dabhb018
-            // 
-       
-            this.gvMx1dabhb018.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb018.Caption = "浠撳簱|鍚嶇О ";
-            this.gvMx1dabhb018.FieldName = "dabhb018";
-            this.gvMx1dabhb018.MinWidth = 50;
-            this.gvMx1dabhb018.Name = "gvMx1dabhb018";
-            this.gvMx1dabhb018.Tag = "query_a.dabhb018";
-            this.gvMx1dabhb018.Visible = true;
-            this.gvMx1dabhb018.VisibleIndex = 20;
-            this.gvMx1dabhb018.Width = 94;
-            // 
-            // gvMx1dabhb019
-            // 
-       
-            this.gvMx1dabhb019.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb019.Caption = "浜ゆ帴纭浜� ";
-            this.gvMx1dabhb019.FieldName = "dabhb019";
-            this.gvMx1dabhb019.MinWidth = 50;
-            this.gvMx1dabhb019.Name = "gvMx1dabhb019";
-            this.gvMx1dabhb019.Tag = "query_a.dabhb019";
-            this.gvMx1dabhb019.Visible = true;
-            this.gvMx1dabhb019.VisibleIndex = 21;
-            this.gvMx1dabhb019.Width = 94;
-            // 
-            // gvMx1dabhb020
-            // 
-           
-            this.gvMx1dabhb020.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb020.Caption = "浜ゆ帴纭鏃堕棿 ";
-            this.gvMx1dabhb020.FieldName = "dabhb020";
-            this.gvMx1dabhb020.MinWidth = 50;
-            this.gvMx1dabhb020.Name = "gvMx1dabhb020";
-            this.gvMx1dabhb020.Tag = "query_a.dabhb020";
-            this.gvMx1dabhb020.Visible = true;
-            this.gvMx1dabhb020.VisibleIndex = 22;
-            this.gvMx1dabhb020.Width = 94;
-            // 
-            // gvMx1dabhb021
-            // 
-            
-            this.gvMx1dabhb021.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb021.Caption = "浜ゆ帴纭鏍囪瘑 ";
-            this.gvMx1dabhb021.FieldName = "dabhb021";
-            this.gvMx1dabhb021.MinWidth = 50;
-            this.gvMx1dabhb021.Name = "gvMx1dabhb021";
-            this.gvMx1dabhb021.Tag = "query_a.dabhb021";
-            this.gvMx1dabhb021.Visible = true;
-            this.gvMx1dabhb021.VisibleIndex = 23;
-            this.gvMx1dabhb021.Width = 94;
-            // 
-            // gvMx1dabhb022
-            // 
-           
-            this.gvMx1dabhb022.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb022.Caption = "鍙戞枡浠撳簱 ";
-            this.gvMx1dabhb022.FieldName = "dabhb022";
-            this.gvMx1dabhb022.MinWidth = 50;
-            this.gvMx1dabhb022.Name = "gvMx1dabhb022";
-            this.gvMx1dabhb022.Tag = "query_a.dabhb022";
-            this.gvMx1dabhb022.Visible = true;
-            this.gvMx1dabhb022.VisibleIndex = 24;
-            this.gvMx1dabhb022.Width = 94;
-            // 
-            // gvMx1dabhb023
-            // 
-           
-            this.gvMx1dabhb023.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb023.Caption = "鍙戞枡鏂瑰紡 ";
-            this.gvMx1dabhb023.FieldName = "dabhb023";
-            this.gvMx1dabhb023.MinWidth = 50;
-            this.gvMx1dabhb023.Name = "gvMx1dabhb023";
-            this.gvMx1dabhb023.Tag = "query_a.dabhb023";
-            this.gvMx1dabhb023.Visible = true;
-            this.gvMx1dabhb023.VisibleIndex = 25;
-            this.gvMx1dabhb023.Width = 94;
-            // 
-            // gvMx1dabhb024
-            // 
-           
-            this.gvMx1dabhb024.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb024.Caption = "澶囨枡鏁伴噺 ";
-            this.gvMx1dabhb024.FieldName = "dabhb024";
-            this.gvMx1dabhb024.MinWidth = 50;
-            this.gvMx1dabhb024.Name = "gvMx1dabhb024";
-            this.gvMx1dabhb024.Tag = "query_a.dabhb024";
-            this.gvMx1dabhb024.Visible = true;
-            this.gvMx1dabhb024.VisibleIndex = 26;
-            this.gvMx1dabhb024.Width = 94;
-            // 
-            // gvMx1womdaahbNo
-            // 
-     
-            this.gvMx1womdaahbNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1womdaahbNo.Caption = "鍚堝苟鍗曞彿 ";
-            this.gvMx1womdaahbNo.FieldName = "womdaahbNo";
-            this.gvMx1womdaahbNo.MinWidth = 50;
-            this.gvMx1womdaahbNo.Name = "gvMx1womdaahbNo";
-            this.gvMx1womdaahbNo.Tag = "query_a.womdaahb_no";
-            this.gvMx1womdaahbNo.Visible = true;
-            this.gvMx1womdaahbNo.VisibleIndex = 27;
-            this.gvMx1womdaahbNo.Width = 94;
-            // 
-            // gvMx1dabhb025
-            // 
-          
-            this.gvMx1dabhb025.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb025.Caption = "鑴氬瀷 ";
-            this.gvMx1dabhb025.FieldName = "dabhb025";
-            this.gvMx1dabhb025.MinWidth = 50;
-            this.gvMx1dabhb025.Name = "gvMx1dabhb025";
-            this.gvMx1dabhb025.Tag = "query_a.dabhb025";
-            this.gvMx1dabhb025.Visible = true;
-            this.gvMx1dabhb025.VisibleIndex = 28;
-            this.gvMx1dabhb025.Width = 94;
-            // 
-            // gvMx1dabhb026
-            // 
-           
-            this.gvMx1dabhb026.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dabhb026.Caption = "璁″垝璺熻釜鍙� ";
-            this.gvMx1dabhb026.FieldName = "dabhb026";
-            this.gvMx1dabhb026.MinWidth = 50;
-            this.gvMx1dabhb026.Name = "gvMx1dabhb026";
-            this.gvMx1dabhb026.Tag = "query_a.dabhb026";
-            this.gvMx1dabhb026.Visible = true;
-            this.gvMx1dabhb026.VisibleIndex = 29;
-            this.gvMx1dabhb026.Width = 94;
-            // 
-            // gvMx1depotNo
-            // 
-           
-            this.gvMx1depotNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1depotNo.Caption = "浠撳簱缂栫爜 ";
-            this.gvMx1depotNo.FieldName = "depotNo";
-            this.gvMx1depotNo.MinWidth = 50;
-            this.gvMx1depotNo.Name = "gvMx1depotNo";
-            this.gvMx1depotNo.Tag = "query_a.depot_no";
-            this.gvMx1depotNo.Visible = true;
-            this.gvMx1depotNo.VisibleIndex = 30;
-            this.gvMx1depotNo.Width = 94;
-            // 
-            // gvMx1positionNo
-            // 
-         
-            this.gvMx1positionNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1positionNo.Caption = "浣嶇疆鍙� ";
-            this.gvMx1positionNo.FieldName = "positionNo";
-            this.gvMx1positionNo.MinWidth = 50;
-            this.gvMx1positionNo.Name = "gvMx1positionNo";
-            this.gvMx1positionNo.Tag = "query_a.position_no";
-            this.gvMx1positionNo.Visible = true;
-            this.gvMx1positionNo.VisibleIndex = 31;
-            this.gvMx1positionNo.Width = 94;
-            // 
-            // gvMx1lot
-            // 
-         
-            this.gvMx1lot.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lot.Caption = "鎵瑰彿 ";
-            this.gvMx1lot.FieldName = "lot";
-            this.gvMx1lot.MinWidth = 50;
-            this.gvMx1lot.Name = "gvMx1lot";
-            this.gvMx1lot.Tag = "query_a.lot";
-            this.gvMx1lot.Visible = true;
-            this.gvMx1lot.VisibleIndex = 32;
-            this.gvMx1lot.Width = 94;
-            // 
-            // gvMx1mtono
-            // 
-         
-            this.gvMx1mtono.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mtono.Caption = "璁″垝璺熻釜鍙� ";
-            this.gvMx1mtono.FieldName = "mtono";
-            this.gvMx1mtono.MinWidth = 50;
-            this.gvMx1mtono.Name = "gvMx1mtono";
-            this.gvMx1mtono.Tag = "query_a.mtono";
-            this.gvMx1mtono.Visible = true;
-            this.gvMx1mtono.VisibleIndex = 33;
-            this.gvMx1mtono.Width = 94;
-            // 
-            // gv_depotNo
-            // 
-            
-            this.gv_depotNo.AppearanceCell.Options.UseFont = true;
-            this.gv_depotNo.Caption = "浠撳簱缂栫爜";
-            this.gv_depotNo.FieldName = "depotNo";
-            this.gv_depotNo.MinWidth = 50;
-            this.gv_depotNo.Name = "gv_depotNo";
-            this.gv_depotNo.OptionsColumn.AllowEdit = false;
-            this.gv_depotNo.Tag = "query_a.depot_no";
-            this.gv_depotNo.Visible = true;
-            this.gv_depotNo.VisibleIndex = 9;
-            this.gv_depotNo.Width = 94;
-            // 
-            // lb_freezeFlag
-            // 
-           
-            this.lb_freezeFlag.Appearance.Options.UseFont = true;
-            this.lb_freezeFlag.Location = new System.Drawing.Point(689, 84);
-            this.lb_freezeFlag.Name = "lb_freezeFlag";
-            this.lb_freezeFlag.Size = new System.Drawing.Size(68, 21);
-            this.lb_freezeFlag.TabIndex = 298;
-            this.lb_freezeFlag.Text = "鍚堝苟鍐荤粨";
-            // 
-            // gv_freezeFlag
-            // 
-            
-            this.gv_freezeFlag.AppearanceCell.Options.UseFont = true;
-            this.gv_freezeFlag.Caption = "鍚堝苟鍐荤粨鏍囪瘑";
-            this.gv_freezeFlag.FieldName = "freezeFlag";
-            this.gv_freezeFlag.MinWidth = 50;
-            this.gv_freezeFlag.Name = "gv_freezeFlag";
-            this.gv_freezeFlag.OptionsColumn.AllowEdit = false;
-            this.gv_freezeFlag.Tag = "query_a.freeze_flag";
-            this.gv_freezeFlag.Visible = true;
-            this.gv_freezeFlag.VisibleIndex = 3;
-            this.gv_freezeFlag.Width = 94;
-            // 
-            // gv_daahb013name
-            // 
-           
-            this.gv_daahb013name.AppearanceCell.Options.UseFont = true;
-            this.gv_daahb013name.Caption = "宸ヤ綔杞﹂棿";
-            this.gv_daahb013name.FieldName = "daahb013name";
-            this.gv_daahb013name.MinWidth = 50;
-            this.gv_daahb013name.Name = "gv_daahb013name";
-            this.gv_daahb013name.OptionsColumn.AllowEdit = false;
-            this.gv_daahb013name.Tag = "query_a.daahb013name";
-            this.gv_daahb013name.Visible = true;
-            this.gv_daahb013name.VisibleIndex = 7;
-            this.gv_daahb013name.Width = 94;
-            // 
-            // gv_daahb022
-            // 
-           
-            this.gv_daahb022.AppearanceCell.Options.UseFont = true;
-            this.gv_daahb022.Caption = "鍙戞枡瀹屾垚";
-            this.gv_daahb022.FieldName = "daahb022";
-            this.gv_daahb022.MinWidth = 50;
-            this.gv_daahb022.Name = "gv_daahb022";
-            this.gv_daahb022.OptionsColumn.AllowEdit = false;
-            this.gv_daahb022.Tag = "query_a.daahb022";
-            this.gv_daahb022.Visible = true;
-            this.gv_daahb022.VisibleIndex = 4;
-            this.gv_daahb022.Width = 94;
-            // 
-            // lb_createBy
-            // 
-           
-            this.lb_createBy.Appearance.Options.UseFont = true;
-            this.lb_createBy.Location = new System.Drawing.Point(314, 13);
-            this.lb_createBy.Name = "lb_createBy";
-            this.lb_createBy.Size = new System.Drawing.Size(51, 21);
-            this.lb_createBy.TabIndex = 280;
-            this.lb_createBy.Text = "鍒涘缓浜�";
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Enabled = false;
-            this.txt_createBy.Location = new System.Drawing.Point(368, 9);
-            this.txt_createBy.Name = "txt_createBy";
-           
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(178, 28);
-            this.txt_createBy.TabIndex = 280;
-            // 
-            // gv_createBy
-            // 
-            
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Tag = "query_a.create_by";
-            this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 10;
-            this.gv_createBy.Width = 94;
-            // 
-            // gv_daahb020
-            // 
-          
-            this.gv_daahb020.AppearanceCell.Options.UseFont = true;
-            this.gv_daahb020.Caption = "绾垮埆缂栫爜";
-            this.gv_daahb020.FieldName = "daahb020";
-            this.gv_daahb020.MinWidth = 50;
-            this.gv_daahb020.Name = "gv_daahb020";
-            this.gv_daahb020.OptionsColumn.AllowEdit = false;
-            this.gv_daahb020.Tag = "query_a.daahb020";
-            this.gv_daahb020.Visible = true;
-            this.gv_daahb020.VisibleIndex = 15;
-            this.gv_daahb020.Width = 94;
-            // 
-            // lb_checkUser
-            // 
-            
-            this.lb_checkUser.Appearance.Options.UseFont = true;
-            this.lb_checkUser.Location = new System.Drawing.Point(582, 13);
-            this.lb_checkUser.Name = "lb_checkUser";
-            this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
-            this.lb_checkUser.TabIndex = 262;
-            this.lb_checkUser.Text = "瀹℃牳浜� ";
-            // 
-            // txt_checkUser
-            // 
-            this.txt_checkUser.Enabled = false;
-            this.txt_checkUser.Location = new System.Drawing.Point(643, 9);
-            this.txt_checkUser.Name = "txt_checkUser";
-            
-            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(162, 28);
-            this.txt_checkUser.TabIndex = 262;
-            // 
-            // gv_checkUser
-            // 
-           
-            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
-            this.gv_checkUser.Caption = "瀹℃牳浜�";
-            this.gv_checkUser.FieldName = "checkUser";
-            this.gv_checkUser.MinWidth = 50;
-            this.gv_checkUser.Name = "gv_checkUser";
-            this.gv_checkUser.OptionsColumn.AllowEdit = false;
-            this.gv_checkUser.Tag = "query_a.check_user";
-            this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 14;
-            this.gv_checkUser.Width = 94;
-            // 
-            // lb_checkDate
-            // 
-            
-            this.lb_checkDate.Appearance.Options.UseFont = true;
-            this.lb_checkDate.Location = new System.Drawing.Point(565, 49);
-            this.lb_checkDate.Name = "lb_checkDate";
-            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_checkDate.TabIndex = 258;
-            this.lb_checkDate.Text = "瀹℃牳鏃ユ湡 ";
-            // 
-            // txt_checkDate
-            // 
-            this.txt_checkDate.Enabled = false;
-            this.txt_checkDate.Location = new System.Drawing.Point(643, 45);
-            this.txt_checkDate.Name = "txt_checkDate";
-            
-            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(162, 28);
-            this.txt_checkDate.TabIndex = 258;
-            // 
-            // gv_checkDate
-            // 
-            
-            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
-            this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡";
-            this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 50;
-            this.gv_checkDate.Name = "gv_checkDate";
-            this.gv_checkDate.OptionsColumn.AllowEdit = false;
-            this.gv_checkDate.Tag = "query_a.check_date";
-            this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 13;
-            this.gv_checkDate.Width = 94;
-            // 
-            // lb_fstatus
-            // 
-            
-            this.lb_fstatus.Appearance.Options.UseFont = true;
-            this.lb_fstatus.Location = new System.Drawing.Point(582, 84);
-            this.lb_fstatus.Name = "lb_fstatus";
-            this.lb_fstatus.Size = new System.Drawing.Size(56, 21);
-            this.lb_fstatus.TabIndex = 252;
-            this.lb_fstatus.Text = "瀹℃牳鐮� ";
-            // 
-            // gv_fstatus
-            // 
-            
-            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_fstatus.Caption = "瀹℃牳鐮�";
-            this.gv_fstatus.FieldName = "fstatus";
-            this.gv_fstatus.MinWidth = 50;
-            this.gv_fstatus.Name = "gv_fstatus";
-            this.gv_fstatus.OptionsColumn.AllowEdit = false;
-            this.gv_fstatus.Tag = "query_a.fstatus";
-            this.gv_fstatus.Visible = true;
-            this.gv_fstatus.VisibleIndex = 2;
-            this.gv_fstatus.Width = 94;
-            // 
-            // lb_daahb015
-            // 
-         
-            this.lb_daahb015.Appearance.Options.UseFont = true;
-            this.lb_daahb015.Location = new System.Drawing.Point(12, 84);
-            this.lb_daahb015.Name = "lb_daahb015";
-            this.lb_daahb015.Size = new System.Drawing.Size(68, 21);
-            this.lb_daahb015.TabIndex = 247;
-            this.lb_daahb015.Text = "閫夋嫨浜х嚎";
-            // 
-            // gv_daahb015
-            // 
-         
-            this.gv_daahb015.AppearanceCell.Options.UseFont = true;
-            this.gv_daahb015.Caption = "鐢熶骇绾垮埆";
-            this.gv_daahb015.FieldName = "daahb015";
-            this.gv_daahb015.MinWidth = 50;
-            this.gv_daahb015.Name = "gv_daahb015";
-            this.gv_daahb015.OptionsColumn.AllowEdit = false;
-            this.gv_daahb015.Tag = "query_a.daahb015";
-            this.gv_daahb015.Visible = true;
-            this.gv_daahb015.VisibleIndex = 8;
-            this.gv_daahb015.Width = 94;
-            // 
-            // lb_daahb013
-            // 
-          
-            this.lb_daahb013.Appearance.Options.UseFont = true;
-            this.lb_daahb013.Location = new System.Drawing.Point(12, 49);
-            this.lb_daahb013.Name = "lb_daahb013";
-            this.lb_daahb013.Size = new System.Drawing.Size(68, 21);
-            this.lb_daahb013.TabIndex = 243;
-            this.lb_daahb013.Text = "閫夋嫨杞﹂棿";
-            // 
-            // gv_daahb013
-            // 
-          
-            this.gv_daahb013.AppearanceCell.Options.UseFont = true;
-            this.gv_daahb013.Caption = "宸ヤ綔杞﹂棿缂栫爜";
-            this.gv_daahb013.FieldName = "daahb013";
-            this.gv_daahb013.MinWidth = 50;
-            this.gv_daahb013.Name = "gv_daahb013";
-            this.gv_daahb013.OptionsColumn.AllowEdit = false;
-            this.gv_daahb013.Tag = "query_a.daahb013";
-            this.gv_daahb013.Visible = true;
-            this.gv_daahb013.VisibleIndex = 6;
-            this.gv_daahb013.Width = 94;
-            // 
-            // lb_daahb009
-            // 
-         
-            this.lb_daahb009.Appearance.Options.UseFont = true;
-            this.lb_daahb009.Location = new System.Drawing.Point(326, 84);
-            this.lb_daahb009.Name = "lb_daahb009";
-            this.lb_daahb009.Size = new System.Drawing.Size(39, 21);
-            this.lb_daahb009.TabIndex = 240;
-            this.lb_daahb009.Text = "澶囨敞 ";
-            // 
-            // txt_daahb009
-            // 
-            this.txt_daahb009.Location = new System.Drawing.Point(368, 80);
-            this.txt_daahb009.Name = "txt_daahb009";
-          
-            this.txt_daahb009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daahb009.Size = new System.Drawing.Size(180, 28);
-            this.txt_daahb009.TabIndex = 240;
-            // 
-            // gv_daahb009
-            // 
-        
-            this.gv_daahb009.AppearanceCell.Options.UseFont = true;
-            this.gv_daahb009.Caption = "澶囨敞";
-            this.gv_daahb009.FieldName = "daahb009";
-            this.gv_daahb009.MinWidth = 50;
-            this.gv_daahb009.Name = "gv_daahb009";
-            this.gv_daahb009.OptionsColumn.AllowEdit = false;
-            this.gv_daahb009.Tag = "query_a.daahb009";
-            this.gv_daahb009.Visible = true;
-            this.gv_daahb009.VisibleIndex = 12;
-            this.gv_daahb009.Width = 94;
-            // 
-            // lb_createDate
-            // 
-           
-            this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(297, 49);
-            this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(68, 21);
-            this.lb_createDate.TabIndex = 228;
-            this.lb_createDate.Text = "鍒涘缓鏃堕棿";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Enabled = false;
-            this.txt_createDate.Location = new System.Drawing.Point(368, 45);
-            this.txt_createDate.Name = "txt_createDate";
-            
-            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(178, 28);
-            this.txt_createDate.TabIndex = 228;
-            // 
-            // gv_createDate
-            // 
-           
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
-            this.gv_createDate.Name = "gv_createDate";
-            this.gv_createDate.OptionsColumn.AllowEdit = false;
-            this.gv_createDate.Tag = "query_a.create_date";
-            this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 11;
-            this.gv_createDate.Width = 94;
-            // 
-            // lb_womdaahbNo
-            // 
-          
-            this.lb_womdaahbNo.Appearance.Options.UseFont = true;
-            this.lb_womdaahbNo.Location = new System.Drawing.Point(46, 13);
-            this.lb_womdaahbNo.Name = "lb_womdaahbNo";
-            this.lb_womdaahbNo.Size = new System.Drawing.Size(34, 21);
-            this.lb_womdaahbNo.TabIndex = 213;
-            this.lb_womdaahbNo.Text = "鍗曞彿";
-            // 
-            // txt_womdaahbNo
-            // 
-            this.txt_womdaahbNo.Enabled = false;
-            this.txt_womdaahbNo.Location = new System.Drawing.Point(89, 9);
-            this.txt_womdaahbNo.Name = "txt_womdaahbNo";
-            
-            this.txt_womdaahbNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_womdaahbNo.Size = new System.Drawing.Size(188, 28);
-            this.txt_womdaahbNo.TabIndex = 213;
-            // 
-            // gv_womdaahbNo
-            // 
-           
-            this.gv_womdaahbNo.AppearanceCell.Options.UseFont = true;
-            this.gv_womdaahbNo.Caption = "鍗曞彿";
-            this.gv_womdaahbNo.FieldName = "womdaahbNo";
-            this.gv_womdaahbNo.MinWidth = 50;
-            this.gv_womdaahbNo.Name = "gv_womdaahbNo";
-            this.gv_womdaahbNo.OptionsColumn.AllowEdit = false;
-            this.gv_womdaahbNo.Tag = "query_a.womdaahb_no";
-            this.gv_womdaahbNo.Visible = true;
-            this.gv_womdaahbNo.VisibleIndex = 5;
-            this.gv_womdaahbNo.Width = 94;
-            // 
-            // gv_id
-            // 
-         
-            this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "id";
-            this.gv_id.FieldName = "id";
-            this.gv_id.MinWidth = 50;
-            this.gv_id.Name = "gv_id";
-            this.gv_id.OptionsColumn.AllowEdit = false;
-            this.gv_id.Tag = "query_a.id";
-            this.gv_id.Visible = true;
-            this.gv_id.VisibleIndex = 1;
-            this.gv_id.Width = 94;
-            // 
-            // gv_guid
-            // 
-           
-            this.gv_guid.AppearanceCell.Options.UseFont = true;
-            this.gv_guid.Caption = "guid";
-            this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 50;
-            this.gv_guid.Name = "gv_guid";
-            this.gv_guid.OptionsColumn.AllowEdit = false;
-            this.gv_guid.Tag = "query_a.guid";
-            this.gv_guid.Visible = true;
-            this.gv_guid.VisibleIndex = 0;
-            this.gv_guid.Width = 94;
-            // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1126, 532);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_guid,
-            this.gv_id,
-            this.gv_fstatus,
-            this.gv_freezeFlag,
-            this.gv_daahb022,
-            this.gv_womdaahbNo,
-            this.gv_daahb013,
-            this.gv_daahb013name,
-            this.gv_daahb015,
-            this.gv_depotNo,
-            this.gv_createBy,
-            this.gv_createDate,
-            this.gv_daahb009,
-            this.gv_checkDate,
-            this.gv_checkUser,
-            this.gv_daahb020});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 532);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 38);
-            this.pageBar1.TabIndex = 3;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.tabMx);
-            this.xtraTabPage2.Controls.Add(this.panel1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-           
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
-            // 
-            // tabMx
-            // 
-            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 150);
-            this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage2;
-            this.tabMx.Size = new System.Drawing.Size(1126, 420);
-            this.tabMx.TabIndex = 2;
-            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage2,
-            this.tabMxPage1});
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.btnSelect);
-            this.panel1.Controls.Add(this.txt_daahb015);
-            this.panel1.Controls.Add(this.txt_daahb013);
-            this.panel1.Controls.Add(this.txt_freezeFlag);
-            this.panel1.Controls.Add(this.txt_fstatus);
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_freezeFlag);
-            this.panel1.Controls.Add(this.lb_createBy);
-            this.panel1.Controls.Add(this.txt_createBy);
-            this.panel1.Controls.Add(this.lb_checkUser);
-            this.panel1.Controls.Add(this.txt_checkUser);
-            this.panel1.Controls.Add(this.lb_checkDate);
-            this.panel1.Controls.Add(this.txt_checkDate);
-            this.panel1.Controls.Add(this.lb_fstatus);
-            this.panel1.Controls.Add(this.lb_daahb015);
-            this.panel1.Controls.Add(this.lb_daahb013);
-            this.panel1.Controls.Add(this.lb_daahb009);
-            this.panel1.Controls.Add(this.txt_daahb009);
-            this.panel1.Controls.Add(this.lb_createDate);
-            this.panel1.Controls.Add(this.txt_createDate);
-            this.panel1.Controls.Add(this.lb_womdaahbNo);
-            this.panel1.Controls.Add(this.txt_womdaahbNo);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 150);
-            this.panel1.TabIndex = 1;
-            // 
-            // btnSelect
-            // 
-            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 116);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(94, 29);
-            this.btnSelect.TabIndex = 457;
-            this.btnSelect.Text = "閫夊彇宸ュ崟";
-            // 
-            // txt_daahb015
-            // 
-            this.txt_daahb015.IsReadly = false;
-            this.txt_daahb015.Location = new System.Drawing.Point(89, 80);
-            this.txt_daahb015.Name = "txt_daahb015";
-            this.txt_daahb015.Size = new System.Drawing.Size(188, 28);
-            this.txt_daahb015.TabIndex = 302;
-            // 
-            // txt_daahb013
-            // 
-            this.txt_daahb013.IsReadly = false;
-            this.txt_daahb013.Location = new System.Drawing.Point(89, 45);
-            this.txt_daahb013.Name = "txt_daahb013";
-            this.txt_daahb013.Size = new System.Drawing.Size(188, 28);
-            this.txt_daahb013.TabIndex = 301;
-            // 
-            // txt_freezeFlag
-            // 
-            this.txt_freezeFlag.Location = new System.Drawing.Point(782, 82);
-            this.txt_freezeFlag.Name = "txt_freezeFlag";
-            this.txt_freezeFlag.Properties.Caption = "";
-            this.txt_freezeFlag.Size = new System.Drawing.Size(44, 24);
-            this.txt_freezeFlag.TabIndex = 300;
-            // 
-            // txt_fstatus
-            // 
-            this.txt_fstatus.Enabled = false;
-            this.txt_fstatus.Location = new System.Drawing.Point(643, 82);
-            this.txt_fstatus.Name = "txt_fstatus";
-            this.txt_fstatus.Properties.Caption = "";
-            this.txt_fstatus.Size = new System.Drawing.Size(40, 24);
-            this.txt_fstatus.TabIndex = 299;
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(946, 42);
-            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(45, 18);
-            this.labelControl11.TabIndex = 130;
-            this.labelControl11.Text = "涓婚敭锛�";
-            this.labelControl11.Visible = false;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(997, 42);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Visible = false;
-            // 
-            // Frm_MesWomdaahb
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesWomdaahb";
-            this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daahb009.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_womdaahbNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            this.xtraTabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
-            this.tabMx.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_freezeFlag.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-        #endregion
-        private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private UserControls.Data.UcPageBar pageBar1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
-        private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_freezeFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_freezeFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daahb013name;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daahb022;
-
-        private DevExpress.XtraEditors.LabelControl lb_createBy;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daahb020;
-
-        private DevExpress.XtraEditors.LabelControl lb_checkUser;
-        private DevExpress.XtraEditors.TextEdit txt_checkUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
-
-        private DevExpress.XtraEditors.LabelControl lb_checkDate;
-        private DevExpress.XtraEditors.TextEdit txt_checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_fstatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_daahb015;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daahb015;
-
-        private DevExpress.XtraEditors.LabelControl lb_daahb013;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daahb013;
-
-        private DevExpress.XtraEditors.LabelControl lb_daahb009;
-        private DevExpress.XtraEditors.TextEdit txt_daahb009;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_daahb009;
-
-        private DevExpress.XtraEditors.LabelControl lb_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_womdaahbNo;
-        private DevExpress.XtraEditors.TextEdit txt_womdaahbNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_womdaahbNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
-        private DevExpress.XtraEditors.CheckEdit txt_freezeFlag;
-        private DevExpress.XtraEditors.CheckEdit txt_fstatus;
-        private UserControl.UcLookWorkshop txt_daahb013;
-        private UserControl.UcLookWorkline txt_daahb015;
-        private DevExpress.XtraEditors.SimpleButton btnSelect;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2womdaahbNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbomNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa002;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa003;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa004;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa005;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa006;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa007;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa008;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa009;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa015;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa024;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa014;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2xh;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemId;
-        private DevExpress.XtraGrid.GridControl gcMx2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb001;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb002;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb003;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb004;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb005;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb006;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb007;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb008;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb009;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb010;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb011;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb012;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb013;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb014;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb015;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb016;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb017;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb018;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb019;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb020;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb021;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb022;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb023;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb024;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1womdaahbNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb025;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb026;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1positionNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lot;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mtono;
-        private DevExpress.XtraGrid.Columns.GridColumn daaGuid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
deleted file mode 100644
index 92cc38d..0000000
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
+++ /dev/null
@@ -1,560 +0,0 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm
-{
-    public partial class Frm_MesWomdaahb : DevExpress.XtraEditors.XtraForm
-    {
-        string _webServiceName = "MesWomdaahbManager/";
-        List<FilterEntity> _filterList = new List<FilterEntity>();
-        public Frm_MesWomdaahb()
-        {
-            InitializeComponent();
-            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
-            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
-            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
-            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
-            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-            
-            getPageList(1);
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
-            gridView1.CustomDrawRowIndicator += (s, e) =>
-            {
-                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                {
-                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
-                }
-            };
-            gridView1.CustomDrawEmptyForeground += (s, e) =>
-            {
-                string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                Font f = new Font("寰蒋闆呴粦", 16);
-                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
-                e.Graphics.DrawString(str, f, Brushes.Gray, r);
-            };
-            txt_daahb013.EditChanged += Txt_daahb013_EditChanged;
-            //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
-            btnSelect.Click += (s, e) =>
-            {
-                if (string.IsNullOrEmpty(this.txt_daahb013.GetId()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
-                    return;
-                }
-                var frm = new SelectWomdaahb(this.txt_daahb013.Text);
-                //璧嬪�肩粰鏄庣粏琛�
-                frm.UpdateParent += (ss, ee) =>
-                {
-                    try
-                    {
-                        var lst = new List<string>();
-                        lst = ee.StringList;
-                        var _obj = lst;
-                        var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectViewResult",
-                            JsonConvert.SerializeObject(_obj));
-                        var dt = UtilityHelper.ReturnToList(strReturn);
-                        DataTable _newTable = dt.rtnData;
-                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
-                        DataRow[] sourceRows = _newTable.Select();
-                        for (int i = 0; i < sourceRows.Length; i++)
-                        {
-                            _oldTable.ImportRow(sourceRows[i]);
-                        }
-                        gcMx1.BindingContext = new BindingContext();
-                        gcMx1.DataSource = _oldTable;
-                        gcMx1.ForceInitialize();
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message);
-                    }
-                };
-                frm.ShowDialog();
-            };
-        }
-
-        private void Txt_daahb013_EditChanged(object sender, EventArgs e)
-        {
-            string workGuid = this.txt_daahb013.GetGuid();
-            txt_daahb015.getSuppler(workGuid);
-        }
-
-        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
-           Task.Delay(100);
-            getPageList(1);
-        }
-        /// <summary>
-        /// 鍙屽嚮浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
-        {
-            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
-            if (!string.IsNullOrEmpty(rowGuid))
-                getModel(rowGuid, false, 999);
-        }
-        /// <summary>
-        /// 鍒嗛〉浜嬩欢
-        /// </summary>
-        /// <param name="curPage"></param>
-        /// <param name="pageSize"></param>
-        private void PageBar1_PagerEvent(int curPage, int pageSize)
-        {
-            getPageList(curPage);
-        }
-        /// <summary>
-        /// 鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            gridView1.ActiveFilter.Clear();
-            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
-        }
-        /// <summary>
-        /// 鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1);
-        }
-
-        /// <summary>
-        /// 鍙栨秷浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-        }
-        /// <summary>
-        ///     瀹℃牳浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private   void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
-        {
-            _toolCk(1);
-        }
-
-        /// <summary>
-        ///     鍙嶅鏍�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private   void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
-        {
-            _toolCk(0);
-        }
-
-        /// <summary>
-        /// 鍒犻櫎浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
-        {
-            string rowGuid = "", rowName = "";
-             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_womdaahbNo, gridView1, "womdaahbNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
-                return;
-            var _obj = new
-            {
-                guid = rowGuid,
-                mxGuid = Guid.Empty.ToString(),
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModelOrMx", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    if (xtraTabControl1.SelectedTabPageIndex == 0)
-                    { }
-                    else
-                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
-                    getPageList(this.pageBar1.CurrentPage);
-                }
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            //if (xtraTabControl1.SelectedTabPageIndex == 1)
-            //    getModel(lbGuid.Text.Trim());
-            //else
-            //{
-            //    //_filterList.Clear();
-            //    //if (gridView1.ActiveFilter.Count > 0)
-            //    //{
-            //    //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            //    //    gridView1.ActiveFilter.Clear();
-            //    //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            //    //}
-            //    //getPageList(1);
-            //    getPageList(this.pageBar1.CurrentPage);
-            //}
-        }
-        /// <summary>
-        /// 淇敼浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
-        {
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_womdaahbNo, gridView1, "womdaahbNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            getModel(rowGuid, true, 1);
-        }
-        /// <summary>
-        /// 鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            UtilityHelper.JumpToTab(xtraTabControl1, 1);
-            lbGuid.Text = "";
-            List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-            gridViews.Add(gvMx1);
-            gridViews.Add(gvMx2);
-            UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
-            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-        }
-        /// <summary>
-        /// 淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.isSetBtn = false;
-            string workId = txt_daahb013.GetId();
-            if (string.IsNullOrEmpty(workId.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
-                txt_daahb013.Focus();
-                return;
-            }
-            string lineId = txt_daahb015.GetId();
-            //if (string.IsNullOrEmpty(lineId.Trim()))
-            //{
-            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浜х嚎锛�");
-            //    txt_daahb015.Focus();
-            //    return;
-            //}
-            var _obj = new
-            {
-                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                bz = txt_daahb009.Text.Trim(),
-                cjId = workId,
-                cxId = lineId,
-                list = new List<dynamic>(),
-            };
-            gvMx1.CloseEditor();
-            gvMx1.PostEditor();
-            gvMx1.UpdateCurrentRow();
-            if (gvMx1.DataRowCount <= 0)
-            {
-                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
-                return;
-            }
-            for (var i = 0; i < gvMx1.DataRowCount; i++)
-            {
-                var row = gvMx1.GetDataRow(i);
-                if (row != null)
-                {
-                    Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
-                    //string _msl = row["quantity"].ToString();
-                    //if (string.IsNullOrEmpty(_msl))
-                    //{
-                    //    MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
-                    //    return;
-                    //}
-                    _obj.list.Add(new
-                    {
-                        Guid = _guid,
-                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["daaGuid"].ToString()),
-                         LineId = 1,//浜х嚎id
-                        //Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
-                        //Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
-                        //Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
-                         Bz = row["daa009"].ToString(),//澶囨敞
-                        //Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
-                        //Pcsl = row["daa008"].ToString()//鎺掍骇鏁伴噺
-                    });
-                }
-            }
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    lbGuid.Text = _rtn.rtnData;
-                    toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private   void getPageList(int curPage)
-        {
-            
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
-            string json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
-                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
-            }
-            
-        }
-        private void getModel(string strGuid, bool isEdit, int tabIdx)
-        {
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
-            var _obj = new
-            {
-                guid = strGuid,//涓诲缓
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    dynamic dy = _rtn.rtnData;
-                    lbGuid.Text = strGuid;
-                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                    gvList.Add(gvMx1);
-                    gvList.Add(gvMx2);
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
-                    JObject _job = JObject.Parse(strJson);
-                    JArray array = new JArray();
-                    foreach (var a in _job["rtnData"]["list"])
-                    {
-                        array.Add(a);
-                    }
-                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMx1.BindingContext = new BindingContext();
-                        gcMx1.DataSource = dt;
-                        gcMx1.ForceInitialize();
-                    }
-                    else
-                    {
-                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-                    }
-
-                    JArray array2 = new JArray();
-                    foreach (var a in _job["rtnData"]["list2"])
-                    {
-                        array2.Add(a);
-                    }
-                    DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMx2.BindingContext = new BindingContext();
-                        gcMx2.DataSource = dt2;
-                        gcMx2.ForceInitialize();
-                    }
-                    else
-                    {
-                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
-                    }
-                }
-                else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            var rowhandle = gvMx1.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                var dr = gvMx1.GetDataRow(rowhandle);
-                var mxGuid = dr["guid"].ToString();
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                if (string.IsNullOrEmpty(mxGuid))
-                {
-                    gvMx1.DeleteRow(rowhandle);
-                    return;
-                }
-                var _obj = new
-                {
-                    guid = lbGuid.Text.Trim(),
-                    mxGuid = mxGuid,
-                };
-                try
-                {
-                    var strJson = UtilityHelper.HttpPost("",
-                        _webServiceName + "DeleteModelOrMx",
-                        JsonConvert.SerializeObject(_obj));
-                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0)
-                    {
-                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
-                    }
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// 宸ュ叿鏉′簨浠�
-        /// </summary>
-        /// <param name="inFieldValue"></param>
-        private   void _toolCk(int _inFieldValue)
-        {
-            string strMsg = "";
-            switch (_inFieldValue)
-            {
-                case 1:
-                    strMsg = "瀹℃牳";
-                    break;
-                case 0:
-                    strMsg = "鍙嶅鏍�";
-                    break;
-            };
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,lbGuid, txt_womdaahbNo, gridView1, "womdaahbNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
-                return;
-            
-            var _obj = new
-            {
-                guid = rowGuid,
-                inFieldValue = _inFieldValue,
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "EditModelSubmit",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-                if (_rtn.rtnCode > 0)
-                {
-                    if (xtraTabControl1.SelectedTabPageIndex == 1)
-                        getModel(lbGuid.Text.Trim(), false, 999);
-                    else
-                        getPageList(1);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-            
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.resx
deleted file mode 100644
index d58980a..0000000
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index f929511..147fcaa 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -443,6 +443,12 @@
     <Compile Include="DevFrm\QC\DefectCodeRk.Designer.cs">
       <DependentUpon>DefectCodeRk.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\QC\DefectCodeDaa.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\DefectCodeDaa.Designer.cs">
+      <DependentUpon>DefectCodeDaa.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\QC\DefectCodeXianChang.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -472,6 +478,12 @@
     </Compile>
     <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs">
       <DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\QC\JyxmShowCopy.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\QC\JyxmShowCopy.Designer.cs">
+      <DependentUpon>JyxmShowCopy.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\QC\JyxmShow.cs">
       <SubType>Form</SubType>
@@ -1230,12 +1242,6 @@
     <Compile Include="UserControl\UCUpFileList.Designer.cs">
       <DependentUpon>UCUpFileList.cs</DependentUpon>
     </Compile>
-    <Compile Include="XtraForm1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="XtraForm1.Designer.cs">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
-    </Compile>
     <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
       <DependentUpon>Frm_Customer.cs</DependentUpon>
     </EmbeddedResource>
@@ -1374,6 +1380,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\JyxmShow.resx">
       <DependentUpon>JyxmShow.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\QC\JyxmShowCopy.resx">
+      <DependentUpon>JyxmShowCopy.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\MesQcExceptionalShow.resx">
       <DependentUpon>MesQcExceptionalShow.cs</DependentUpon>
@@ -1732,9 +1741,6 @@
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UCUpFileList.resx">
       <DependentUpon>UCUpFileList.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="XtraForm1.resx">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="App.config" />
     <None Include="packages.config" />
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 27de65a..fcf7616 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -42,8 +42,6 @@
         /// </summary>
         private static void _startLogin()
         {
-            //Application.Run(new XtraForm1());
-            //return;
             CefSettings settings = new CefSettings();
             settings.Locale = "zh-CN";
             Cef.Initialize(settings);
diff --git a/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs b/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs
index 7e42e87..4300e16 100644
--- a/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/MsgHelper.cs
@@ -53,22 +53,6 @@
             Warning(s);
         }
 
-        public static void ShowException(Exception ex, string customMessage)
-        {
-            //if (ex is CustomException)
-            //{
-            //    ShowException(ex);
-            //}
-            //else if (customMessage != "")
-            //{
-            //    Warning(customMessage);
-            //}
-            //else
-            //{
-            //    Warning(ex.Message);
-            //}
-        }
-
         /// <summary>
         ///     淇℃伅鎻愮ず妗�
         /// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 73e5650..c8cdce5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -330,45 +330,47 @@
 
         private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (string.IsNullOrEmpty(this.xlsOutParameter))
-            {
-                ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-                return;
-            }
-            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
-            {
-                folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
-                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
-                if (dialogResult == DialogResult.OK)
-                {
-                    string _folder = folderBrowserDialog.SelectedPath;
-                    var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
-                    try
-                    {
-                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
-                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                        if (_rtn.rtnCode > 0)
-                        {
-                            string _file = _rtn.rtnData.fileUrl.ToString();
-                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
-                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
-                            using (WebClient client = new WebClient())
-                            {
-                                client.DownloadFile(_url, _folderName);
-                            }
-                            ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
-                        }
-                        else
-                        {
-                            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                    }
-                }
-            }
+            if (btnOutClick != null) btnOutClick(this, e);
+
+            //if (string.IsNullOrEmpty(this.xlsOutParameter))
+            //{
+            //    ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+            //    return;
+            //}
+            //using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+            //{
+            //    folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+            //    DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+            //    if (dialogResult == DialogResult.OK)
+            //    {
+            //        string _folder = folderBrowserDialog.SelectedPath;
+            //        var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
+            //        try
+            //        {
+            //            string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
+            //            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+            //            if (_rtn.rtnCode > 0)
+            //            {
+            //                string _file = _rtn.rtnData.fileUrl.ToString();
+            //                string _folderName = _folder + "\\" + _file.Replace("down/", "");
+            //                string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+            //                using (WebClient client = new WebClient())
+            //                {
+            //                    client.DownloadFile(_url, _folderName);
+            //                }
+            //                ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+            //            }
+            //            else
+            //            {
+            //                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            //            }
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            //        }
+            //    }
+            //}
         }
 
         private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
@@ -1036,6 +1038,12 @@
         /// </summary>
         public event EventHandler btnOaClick;
 
+
+        /// <summary>
+        ///    瀵煎嚭
+        /// </summary>
+        public event EventHandler btnOutClick;
+
         #endregion
 
         #region 鍏叡灞炴��
diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
deleted file mode 100644
index 3224325..0000000
--- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-锘縩amespace Gs.DevApp
-{
-    partial class XtraForm1
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
-            this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.SuspendLayout();
-            // 
-            // simpleButton1
-            // 
-            this.simpleButton1.Location = new System.Drawing.Point(57, 107);
-            this.simpleButton1.Name = "simpleButton1";
-            this.simpleButton1.Size = new System.Drawing.Size(94, 29);
-            this.simpleButton1.TabIndex = 0;
-            this.simpleButton1.Text = "鐢垫鏁版嵁";
-            this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click_1);
-            // 
-            // simpleButton2
-            // 
-            this.simpleButton2.Location = new System.Drawing.Point(57, 173);
-            this.simpleButton2.Name = "simpleButton2";
-            this.simpleButton2.Size = new System.Drawing.Size(94, 29);
-            this.simpleButton2.TabIndex = 1;
-            this.simpleButton2.Text = "姘存鏁版嵁";
-            this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Location = new System.Drawing.Point(57, 227);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(740, 240);
-            this.richTextBox1.TabIndex = 2;
-            this.richTextBox1.Text = "";
-            // 
-            // XtraForm1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(887, 659);
-            this.Controls.Add(this.richTextBox1);
-            this.Controls.Add(this.simpleButton2);
-            this.Controls.Add(this.simpleButton1);
-            this.Name = "XtraForm1";
-            this.Text = "XtraForm1";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraEditors.SimpleButton simpleButton1;
-        private DevExpress.XtraEditors.SimpleButton simpleButton2;
-        private System.Windows.Forms.RichTextBox richTextBox1;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
deleted file mode 100644
index 4071ae3..0000000
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using NModbus;
-using System;
-using System.Data;
-using System.IO;
-using System.Net.Sockets;
-using System.Text;
-
-namespace Gs.DevApp
-{
-    public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
-    {
-        public XtraForm1()
-        {
-            InitializeComponent();
-
-        }
-        /// <summary>
-        /// 鏄惁绗竴娆℃姇鍏�,0涓虹涓�娆℃姇鍏ワ紝1涓虹淮淇繃鏉ヨ鎶ュ簾鐨�2涓哄凡缁忔姤搴熻繃浜嗙殑锛�3杩斿伐杩囨潵閲嶆姇鐨�4娓呭熬宸ュ崟鐨勬姤搴�
-        /// </summary>
-        private string flagFirst = "0";  //鏄惁绗竴娆℃姇鍏�
-
-
-        private void simpleButton1_Click_1(object sender, EventArgs e)
-        {
-            AddDianJian();
-        }
-
-        //娣诲姞鐢垫鏁版嵁
-        private string AddDianJian()
-        {
-            string TM = "";
-            string JD = "";
-            string JY = "";
-            string JN = "";
-            string XL = "";
-            string GV = "";
-            string JDV = "";
-            string JYV = "";
-            string JNV = "";
-            string XLV = "";
-            string GVV = "";
-            //if (imaQAB009.EditValue.ToString() != VSLoginInfo.SystemParam["DianJianNo"].ToString())
-            //{
-            //    return "";
-            //}
-            //string sql = string.Format(@" select MIG006 from BASMIG(nolock) where MIG001='DianJianQuShu' and MIG003='{0}' and MIG005='Y'", txtDAA042.EditValue.ToString());
-            //DataTable dt = manager.GetDataTable(sql, "tmpBASMIG");
-            //if (dt == null || dt.Rows.Count <= 0)
-            //{
-            //    return "";
-            //}
-            try
-            {
-                //FileStream fs = new FileStream(dt.Rows[0][0].ToString(), FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                //int fsLen = (int)fs.Length;
-                //byte[] heByte = new byte[fsLen];
-                //fs.Read(heByte, 0, heByte.Length);
-                //string myStr = System.Text.Encoding.Default.GetString(heByte);
-                //fs.Close();
-                string strPath = @"D:\uploadData.txt";
-                string myStr = File.ReadAllText(strPath, Encoding.Default);
-                if (myStr == "")
-                {
-                    return "NULL";
-                }
-                File.WriteAllText(strPath, "");
-                JArray dsTemp = JArray.Parse(myStr);
-
-                foreach (var ss in dsTemp)  //鏌ユ壘鏌愪釜瀛楁涓庡��
-                {
-                    TM = (((JObject)ss)["TiaoMa"] == null) ? "" : ((JObject)ss)["TiaoMa"].ToString();
-                    JD = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["state"].ToString();
-                    JY = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["state"].ToString();
-                    JN = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["state"].ToString();
-                    XL = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["state"].ToString();
-                    GV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["state"].ToString();
-                    JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ", ");
-                    JYV = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["value"].ToString().Replace(" ", ", ");
-                    JNV = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["value"].ToString().Replace(" ", ", ");
-                    XLV = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["value"].ToString().Replace(" ", ", ");
-                    GVV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["value"].ToString().Replace(" ", ", ");
-                    Gs.DevApp.ToolBox.LogHelper.Debug("TM", TM);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("JD", JD);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("JY", JY);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("XL", XL);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("XLV", XLV);
-                    Gs.DevApp.ToolBox.LogHelper.Debug("GVV", GVV);
-                }
-                return "宸查噰闆�";
-            }
-            catch (Exception e)
-            {
-                return "鏂囦欢鎵撳紑澶辫触," + e.Message;
-            }
-        }
-
-        private void simpleButton2_Click(object sender, EventArgs e)
-        {
-            string strCsl1 = "";
-            string strSw1 = "";
-            string strCsl2 = "";
-            string strSw2 = "";
-            string strCsl3 = "";
-            string strSw3 = "";
-            string strCsl4 = "";
-            string strSw4 = "";
-            string strCsl5 = "";
-            string strSw5 = "";
-            string SJJG = "";
-            try//姘存鍙栨暟锛屽悗闈㈣ˉ鍏�
-            {
-                System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
-                string hostname = "192.168.60.52";
-                ModbusFactory modbusFactory = new ModbusFactory();
-                IModbusMaster master = modbusFactory.CreateMaster(new TcpClient(hostname, 502));
-                master.Transport.ReadTimeout = 10000;
-                master.Transport.Retries = 10000;
-                DataTable dt = new DataTable();
-                //鍙傛暟(鍒嗗埆涓轰粠绔欏湴鍧�,璧峰鍦板潃,闀垮害)
-                byte slaveAddress = byte.Parse(1.ToString());
-                ushort numberOfPoints = ushort.Parse("1");
-                float fsw = 0;
-                DataTable dt1 = new DataTable();
-                ushort[] csl1 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(32.ToString()), numberOfPoints);
-                strCsl1 = csl1[0].ToString();
-
-                ushort[] sw1 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(31.ToString()), numberOfPoints);
-                strSw1 = (float.Parse(sw1[0].ToString()) / 10).ToString();
-
-                ushort[] csl2 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(34.ToString()), numberOfPoints);
-                strCsl2 = csl2[0].ToString();
-
-                ushort[] sw2 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(33.ToString()), numberOfPoints);
-                strSw2 = (float.Parse(sw2[0].ToString()) / 10).ToString();
-
-                ushort[] csl3 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(36.ToString()), numberOfPoints);
-                strCsl3 = csl3[0].ToString();
-
-                ushort[] sw3 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(35.ToString()), numberOfPoints);
-                strSw3 = (float.Parse(sw3[0].ToString()) / 10).ToString();
-
-                ushort[] csl4 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(38.ToString()), numberOfPoints);
-                strCsl4 = csl4[0].ToString();
-
-                ushort[] sw4 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(37.ToString()), numberOfPoints);
-                strSw4 = (float.Parse(sw4[0].ToString()) / 10).ToString();
-
-                ushort[] csl5 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(40.ToString()), numberOfPoints);
-                strCsl5 = csl5[0].ToString();
-
-                ushort[] sw5 = master.ReadHoldingRegisters(slaveAddress, ushort.Parse(39.ToString()), numberOfPoints);
-                strSw5 = (float.Parse(sw5[0].ToString()) / 10).ToString();
-
-                bool[] sjjg = master.ReadCoils(slaveAddress, ushort.Parse(77.ToString()), numberOfPoints);
-                SJJG = sjjg[0].ToString();
-                ///////////////////
-                ///
-
-                // 3. 璇诲彇浠庣珯璁惧鐨勫瘎瀛樺櫒
-                ushort startAddress = 0;   // 瀵勫瓨鍣ㄨ捣濮嬪湴鍧�
-                ushort numRegisters = 10;  // 璇诲彇 10 涓瘎瀛樺櫒
-                try
-                {
-                    // 璇诲彇淇濇寔瀵勫瓨鍣紙浠庣珯鍦板潃涓� 1锛�
-                    ushort[] registers = master.ReadHoldingRegisters(1, startAddress, numRegisters);
-                    // 杈撳嚭缁撴灉
-                    Console.WriteLine("璇诲彇鍒扮殑瀵勫瓨鍣ㄥ�硷細");
-                    foreach (var register in registers)
-                    {
-                        Console.WriteLine(register);
-                        stringBuilder.Append(register);
-                    }
-                    richTextBox1.Text = stringBuilder.ToString();
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"璇诲彇閿欒: {ex.Message}");
-                }
-
-            }
-            catch (Exception ex)
-            {
-                //VisiblePanel(txtDQBarCode.EditValue.ToString(), ex.Message, "NG", Color.Yellow);
-                //txtGWM.EditValue = "";
-                return;
-            }
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.resx b/DevApp/Gs.DevApp/XtraForm1.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/XtraForm1.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file

--
Gitblit v1.9.3