From 970ac0e5ddee13a06a5215d29ed028eb756215f0 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期二, 11 十一月 2025 13:42:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent

---
 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx              |    0 
 /dev/null                                                |  107 ----
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs            |   43 +
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs  |    4 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs          |   23 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs |  556 ++++++++++++-----------
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx        |    2 
 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs       |  387 ++++++++++++++++
 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs                |  152 ++++++
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs                |  109 ++++
 README.md                                                |    4 
 11 files changed, 992 insertions(+), 395 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs
deleted file mode 100644
index b579993..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs
+++ /dev/null
@@ -1,1440 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.BarCode
-{
-    partial class Frm_BoxCode
-    {
-        /// <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.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();
-            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_org = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createBy = 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_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isZxbg = 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_orgId = new Gs.DevApp.UserControl.UcLookOrg();
-            this.txt_taskNo = new DevExpress.XtraEditors.ButtonEdit();
-            this.txt_cusId = new Gs.DevApp.UserControl.UcLookCustomer();
-            this.txt_isSource = new DevExpress.XtraEditors.RadioGroup();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_dwmc = new DevExpress.XtraEditors.TextEdit();
-            this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_memo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daaSumQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daaSyQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_quantity = new DevExpress.XtraEditors.TextEdit();
-            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_cusDh = new DevExpress.XtraEditors.TextEdit();
-            this.txt_saleDh = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
-            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
-            this.txt_extDate = new DevExpress.XtraEditors.DateEdit();
-            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.瀹㈡埛鍚嶇О = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            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();
-            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_taskNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isSource.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dwmc.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSumQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSyQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cusDh.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDh.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.瀹㈡埛鍚嶇О)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
-            this.tabMx.SuspendLayout();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            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,
-            this.xtraTabPage2});
-            // 
-            // 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.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.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 558;
-            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.Size = new System.Drawing.Size(1126, 519);
-            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.ColumnPanelRowHeight = 50;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_org,
-            this.gridColumn1,
-            this.gv_lineNo,
-            this.gv_name,
-            this.gv_remark,
-            this.gv_createBy,
-            this.gv_createDate,
-            this.gv_lastupdateBy,
-            this.gv_lastupdateDate,
-            this.gv_lineType,
-            this.gv_isZxbg});
-            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_org
-            // 
-            this.gv_org.AppearanceCell.Options.UseFont = true;
-            this.gv_org.Caption = "浣跨敤缁勭粐";
-            this.gv_org.FieldName = "fSubsidiary";
-            this.gv_org.MinWidth = 50;
-            this.gv_org.Name = "gv_org";
-            this.gv_org.OptionsColumn.AllowEdit = false;
-            this.gv_org.Tag = "org.fnamber";
-            this.gv_org.Visible = true;
-            this.gv_org.VisibleIndex = 0;
-            this.gv_org.Width = 254;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "鎵�鍦ㄩ儴闂�";
-            this.gridColumn1.FieldName = "departName";
-            this.gridColumn1.MinWidth = 60;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Tag = "query_a.departName";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 1;
-            this.gridColumn1.Width = 94;
-            // 
-            // gv_lineNo
-            // 
-            this.gv_lineNo.AppearanceCell.Options.UseFont = true;
-            this.gv_lineNo.Caption = "浜х嚎缂栧彿";
-            this.gv_lineNo.FieldName = "lineNo";
-            this.gv_lineNo.MinWidth = 50;
-            this.gv_lineNo.Name = "gv_lineNo";
-            this.gv_lineNo.OptionsColumn.AllowEdit = false;
-            this.gv_lineNo.Tag = "query_a.line_no";
-            this.gv_lineNo.Visible = true;
-            this.gv_lineNo.VisibleIndex = 2;
-            this.gv_lineNo.Width = 82;
-            // 
-            // gv_name
-            // 
-            this.gv_name.AppearanceCell.Options.UseFont = true;
-            this.gv_name.Caption = "浜х嚎鍚嶇О";
-            this.gv_name.FieldName = "name";
-            this.gv_name.MinWidth = 60;
-            this.gv_name.Name = "gv_name";
-            this.gv_name.OptionsColumn.AllowEdit = false;
-            this.gv_name.Tag = "query_a.name";
-            this.gv_name.Visible = true;
-            this.gv_name.VisibleIndex = 3;
-            this.gv_name.Width = 100;
-            // 
-            // gv_remark
-            // 
-            this.gv_remark.AppearanceCell.Options.UseFont = true;
-            this.gv_remark.Caption = "澶囨敞";
-            this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 50;
-            this.gv_remark.Name = "gv_remark";
-            this.gv_remark.OptionsColumn.AllowEdit = false;
-            this.gv_remark.Tag = "query_a.remark";
-            this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 4;
-            this.gv_remark.Width = 79;
-            // 
-            // 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 = 5;
-            this.gv_createBy.Width = 63;
-            // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "寤虹珛鏃堕棿";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 180;
-            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 = 6;
-            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 = 7;
-            this.gv_lastupdateBy.Width = 63;
-            // 
-            // gv_lastupdateDate
-            // 
-            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿";
-            this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 180;
-            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 = 8;
-            this.gv_lastupdateDate.Width = 180;
-            // 
-            // gv_lineType
-            // 
-            this.gv_lineType.AppearanceCell.Options.UseFont = true;
-            this.gv_lineType.Caption = "绾夸綋绫诲埆";
-            this.gv_lineType.FieldName = "lineType";
-            this.gv_lineType.MinWidth = 80;
-            this.gv_lineType.Name = "gv_lineType";
-            this.gv_lineType.OptionsColumn.AllowEdit = false;
-            this.gv_lineType.Tag = "query_a.line_type";
-            this.gv_lineType.Visible = true;
-            this.gv_lineType.VisibleIndex = 9;
-            this.gv_lineType.Width = 80;
-            // 
-            // gv_isZxbg
-            // 
-            this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
-            this.gv_isZxbg.Caption = "鏁寸嚎鎶ュ伐";
-            this.gv_isZxbg.FieldName = "isZxbg";
-            this.gv_isZxbg.MinWidth = 50;
-            this.gv_isZxbg.Name = "gv_isZxbg";
-            this.gv_isZxbg.OptionsColumn.AllowEdit = false;
-            this.gv_isZxbg.Tag = "query_a.is_zxbg";
-            this.gv_isZxbg.Visible = true;
-            this.gv_isZxbg.VisibleIndex = 10;
-            this.gv_isZxbg.Width = 50;
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 519);
-            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 = 4;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
-            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.tabMx);
-            this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 201;
-            this.splitMx1.TabIndex = 0;
-            // 
-            // layoutMx1
-            // 
-            this.layoutMx1.Controls.Add(this.txt_orgId);
-            this.layoutMx1.Controls.Add(this.txt_taskNo);
-            this.layoutMx1.Controls.Add(this.txt_cusId);
-            this.layoutMx1.Controls.Add(this.txt_isSource);
-            this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_dwmc);
-            this.layoutMx1.Controls.Add(this.txt_lotNo);
-            this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
-            this.layoutMx1.Controls.Add(this.txt_memo);
-            this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
-            this.layoutMx1.Controls.Add(this.txt_daaSumQty);
-            this.layoutMx1.Controls.Add(this.txt_daaSyQty);
-            this.layoutMx1.Controls.Add(this.txt_quantity);
-            this.layoutMx1.Controls.Add(this.txt_psnQty_1);
-            this.layoutMx1.Controls.Add(this.txt_iCount_1);
-            this.layoutMx1.Controls.Add(this.txt_cusDh);
-            this.layoutMx1.Controls.Add(this.txt_saleDh);
-            this.layoutMx1.Controls.Add(this.txt_itemId);
-            this.layoutMx1.Controls.Add(this.txt_itemName);
-            this.layoutMx1.Controls.Add(this.txt_itemModel);
-            this.layoutMx1.Controls.Add(this.txt_extDate);
-            this.layoutMx1.Controls.Add(this.txt_itemNo);
-            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem9});
-            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(713, 530, 812, 500);
-            this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 201);
-            this.layoutMx1.TabIndex = 0;
-            this.layoutMx1.Text = "layoutControl1";
-            // 
-            // txt_orgId
-            // 
-            this.txt_orgId.IsReadly = false;
-            this.txt_orgId.Location = new System.Drawing.Point(99, 12);
-            this.txt_orgId.Name = "txt_orgId";
-            this.txt_orgId.Size = new System.Drawing.Size(180, 24);
-            this.txt_orgId.TabIndex = 549;
-            // 
-            // txt_taskNo
-            // 
-            this.txt_taskNo.Location = new System.Drawing.Point(99, 76);
-            this.txt_taskNo.Name = "txt_taskNo";
-            this.txt_taskNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.txt_taskNo.Size = new System.Drawing.Size(180, 24);
-            this.txt_taskNo.StyleController = this.layoutMx1;
-            this.txt_taskNo.TabIndex = 546;
-            // 
-            // txt_cusId
-            // 
-            this.txt_cusId.IsReadly = false;
-            this.txt_cusId.Location = new System.Drawing.Point(641, 12);
-            this.txt_cusId.Name = "txt_cusId";
-            this.txt_cusId.Size = new System.Drawing.Size(180, 24);
-            this.txt_cusId.TabIndex = 545;
-            // 
-            // txt_isSource
-            // 
-            this.txt_isSource.EditValue = "1";
-            this.txt_isSource.Location = new System.Drawing.Point(99, 42);
-            this.txt_isSource.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_isSource.MaximumSize = new System.Drawing.Size(0, 26);
-            this.txt_isSource.Name = "txt_isSource";
-            this.txt_isSource.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
-            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夊伐鍗�"),
-            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犲伐鍗�")});
-            this.txt_isSource.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.txt_isSource.Size = new System.Drawing.Size(180, 26);
-            this.txt_isSource.StyleController = this.layoutMx1;
-            this.txt_isSource.TabIndex = 534;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.Location = new System.Drawing.Point(554, 107);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(267, 28);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Text = "lbGuid";
-            this.lbGuid.Visible = false;
-            // 
-            // txt_dwmc
-            // 
-            this.txt_dwmc.Location = new System.Drawing.Point(641, 108);
-            this.txt_dwmc.Name = "txt_dwmc";
-            this.txt_dwmc.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwmc.Size = new System.Drawing.Size(180, 24);
-            this.txt_dwmc.StyleController = this.layoutMx1;
-            this.txt_dwmc.TabIndex = 216;
-            this.txt_dwmc.Tag = "readonly";
-            // 
-            // txt_lotNo
-            // 
-            this.txt_lotNo.Location = new System.Drawing.Point(370, 140);
-            this.txt_lotNo.Name = "txt_lotNo";
-            this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_lotNo.Size = new System.Drawing.Size(180, 24);
-            this.txt_lotNo.StyleController = this.layoutMx1;
-            this.txt_lotNo.TabIndex = 217;
-            // 
-            // txt_lastupdateDate
-            // 
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(912, 44);
-            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
-            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateDate.Size = new System.Drawing.Size(181, 24);
-            this.txt_lastupdateDate.StyleController = this.layoutMx1;
-            this.txt_lastupdateDate.TabIndex = 231;
-            this.txt_lastupdateDate.Tag = "readonly";
-            // 
-            // txt_memo
-            // 
-            this.txt_memo.Location = new System.Drawing.Point(912, 76);
-            this.txt_memo.Name = "txt_memo";
-            this.txt_memo.Properties.Appearance.Options.UseFont = true;
-            this.txt_memo.Size = new System.Drawing.Size(181, 24);
-            this.txt_memo.StyleController = this.layoutMx1;
-            this.txt_memo.TabIndex = 219;
-            // 
-            // txt_lastupdateBy
-            // 
-            this.txt_lastupdateBy.Location = new System.Drawing.Point(912, 12);
-            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
-            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateBy.Size = new System.Drawing.Size(181, 24);
-            this.txt_lastupdateBy.StyleController = this.layoutMx1;
-            this.txt_lastupdateBy.TabIndex = 228;
-            this.txt_lastupdateBy.Tag = "readonly";
-            // 
-            // txt_daaSumQty
-            // 
-            this.txt_daaSumQty.Location = new System.Drawing.Point(99, 108);
-            this.txt_daaSumQty.Name = "txt_daaSumQty";
-            this.txt_daaSumQty.Size = new System.Drawing.Size(180, 24);
-            this.txt_daaSumQty.StyleController = this.layoutMx1;
-            this.txt_daaSumQty.TabIndex = 535;
-            this.txt_daaSumQty.Tag = "readonly";
-            // 
-            // txt_daaSyQty
-            // 
-            this.txt_daaSyQty.Location = new System.Drawing.Point(99, 140);
-            this.txt_daaSyQty.Name = "txt_daaSyQty";
-            this.txt_daaSyQty.Size = new System.Drawing.Size(180, 24);
-            this.txt_daaSyQty.StyleController = this.layoutMx1;
-            this.txt_daaSyQty.TabIndex = 536;
-            this.txt_daaSyQty.Tag = "readonly";
-            // 
-            // txt_quantity
-            // 
-            this.txt_quantity.Location = new System.Drawing.Point(99, 172);
-            this.txt_quantity.Name = "txt_quantity";
-            this.txt_quantity.Size = new System.Drawing.Size(180, 24);
-            this.txt_quantity.StyleController = this.layoutMx1;
-            this.txt_quantity.TabIndex = 537;
-            // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(370, 172);
-            this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Size = new System.Drawing.Size(180, 24);
-            this.txt_psnQty_1.StyleController = this.layoutMx1;
-            this.txt_psnQty_1.TabIndex = 538;
-            // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(641, 172);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Size = new System.Drawing.Size(180, 24);
-            this.txt_iCount_1.StyleController = this.layoutMx1;
-            this.txt_iCount_1.TabIndex = 539;
-            // 
-            // txt_cusDh
-            // 
-            this.txt_cusDh.Location = new System.Drawing.Point(641, 44);
-            this.txt_cusDh.Name = "txt_cusDh";
-            this.txt_cusDh.Size = new System.Drawing.Size(180, 24);
-            this.txt_cusDh.StyleController = this.layoutMx1;
-            this.txt_cusDh.TabIndex = 540;
-            // 
-            // txt_saleDh
-            // 
-            this.txt_saleDh.Location = new System.Drawing.Point(641, 76);
-            this.txt_saleDh.Name = "txt_saleDh";
-            this.txt_saleDh.Size = new System.Drawing.Size(180, 24);
-            this.txt_saleDh.StyleController = this.layoutMx1;
-            this.txt_saleDh.TabIndex = 541;
-            // 
-            // txt_itemId
-            // 
-            this.txt_itemId.Location = new System.Drawing.Point(370, 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(180, 24);
-            this.txt_itemId.StyleController = this.layoutMx1;
-            this.txt_itemId.TabIndex = 542;
-            // 
-            // txt_itemName
-            // 
-            this.txt_itemName.Location = new System.Drawing.Point(370, 76);
-            this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Size = new System.Drawing.Size(180, 24);
-            this.txt_itemName.StyleController = this.layoutMx1;
-            this.txt_itemName.TabIndex = 543;
-            this.txt_itemName.Tag = "readonly";
-            // 
-            // txt_itemModel
-            // 
-            this.txt_itemModel.Location = new System.Drawing.Point(370, 108);
-            this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(180, 24);
-            this.txt_itemModel.StyleController = this.layoutMx1;
-            this.txt_itemModel.TabIndex = 544;
-            this.txt_itemModel.Tag = "readonly";
-            // 
-            // txt_extDate
-            // 
-            this.txt_extDate.EditValue = null;
-            this.txt_extDate.Location = new System.Drawing.Point(641, 140);
-            this.txt_extDate.Name = "txt_extDate";
-            this.txt_extDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_extDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_extDate.Size = new System.Drawing.Size(180, 24);
-            this.txt_extDate.StyleController = this.layoutMx1;
-            this.txt_extDate.TabIndex = 547;
-            // 
-            // txt_itemNo
-            // 
-            this.txt_itemNo.Location = new System.Drawing.Point(370, 44);
-            this.txt_itemNo.Name = "txt_itemNo";
-            this.txt_itemNo.Size = new System.Drawing.Size(180, 24);
-            this.txt_itemNo.StyleController = this.layoutMx1;
-            this.txt_itemNo.TabIndex = 548;
-            this.txt_itemNo.Tag = "readonly";
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.lbGuid;
-            this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem9.Text = "lbGuid";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem9.TextVisible = false;
-            // 
-            // Root
-            // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem7,
-            this.layoutControlItem5,
-            this.layoutControlItem6,
-            this.layoutControlItem12,
-            this.layoutControlItem1,
-            this.layoutControlItem11,
-            this.layoutControlItem21,
-            this.layoutControlItem15,
-            this.layoutControlItem19,
-            this.layoutControlItem8,
-            this.layoutControlItem20,
-            this.瀹㈡埛鍚嶇О,
-            this.layoutControlItem17,
-            this.layoutControlItem18,
-            this.layoutControlItem2,
-            this.layoutControlItem16,
-            this.layoutControlItem13,
-            this.layoutControlItem14,
-            this.layoutControlItem3,
-            this.layoutControlItem10,
-            this.layoutControlItem4});
-            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;
-            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1105, 212);
-            this.Root.TextVisible = false;
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_itemId;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem7.Text = "閫夋嫨浜у搧";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_lastupdateBy;
-            this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem5.Text = "鏈�鍚庢洿鏂颁汉";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_lastupdateDate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(813, 32);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem6.Text = "鏇存柊鏃堕棿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_daaSumQty;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem12.Text = "宸ュ崟鎬婚噺";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_taskNo;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 64);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem1.Text = "閫夋嫨宸ュ崟";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_isSource;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 32);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
-            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem11.Text = "閫夋嫨鏉ユ簮";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.txt_orgId;
-            this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem21.Text = "閫夋嫨缁勭粐";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_psnQty_1;
-            this.layoutControlItem15.Location = new System.Drawing.Point(271, 160);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem15.Text = "鍐呭寘瑁呮暟閲�";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_itemModel;
-            this.layoutControlItem19.Location = new System.Drawing.Point(271, 96);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem19.Text = "瑙勬牸鍨嬪彿";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_itemName;
-            this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem8.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_itemNo;
-            this.layoutControlItem20.Location = new System.Drawing.Point(271, 32);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem20.Text = "浜у搧缂栫爜";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // 瀹㈡埛鍚嶇О
-            // 
-            this.瀹㈡埛鍚嶇О.Control = this.txt_cusId;
-            this.瀹㈡埛鍚嶇О.Location = new System.Drawing.Point(542, 0);
-            this.瀹㈡埛鍚嶇О.Name = "瀹㈡埛鍚嶇О";
-            this.瀹㈡埛鍚嶇О.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.瀹㈡埛鍚嶇О.Size = new System.Drawing.Size(271, 32);
-            this.瀹㈡埛鍚嶇О.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_cusDh;
-            this.layoutControlItem17.Location = new System.Drawing.Point(542, 32);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem17.Text = "瀹㈡埛鍗曞彿";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_saleDh;
-            this.layoutControlItem18.Location = new System.Drawing.Point(542, 64);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem18.Text = "閿�鍞崟鍙�";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_dwmc;
-            this.layoutControlItem2.Location = new System.Drawing.Point(542, 96);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem2.Text = "鍗曚綅";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_iCount_1;
-            this.layoutControlItem16.Location = new System.Drawing.Point(542, 160);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem16.Text = "鎵撳嵃鏁伴噺";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_daaSyQty;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 128);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem13.Text = "鍓╀綑鏁伴噺";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_quantity;
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 160);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem14.Text = "鐢熶骇鏁伴噺";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_lotNo;
-            this.layoutControlItem3.Location = new System.Drawing.Point(271, 128);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem3.Text = "鐢熶骇鎵规";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_extDate;
-            this.layoutControlItem10.Location = new System.Drawing.Point(542, 128);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem10.Text = "鐢熶骇鏃ユ湡";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_memo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(813, 64);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem4.Text = "鏍囪";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // tabMx
-            // 
-            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 0);
-            this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 357);
-            this.tabMx.TabIndex = 4;
-            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1});
-            // 
-            // tabMxPage1
-            // 
-            this.tabMxPage1.Controls.Add(this.gcMx1);
-            this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 325);
-            this.tabMxPage1.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, 325);
-            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.Appearance.Row.Options.UseFont = true;
-            this.gvMx1.ColumnPanelRowHeight = 50;
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2guid,
-            this.gridColumn20,
-            this.gridColumn19,
-            this.gvMx2itemBarcode,
-            this.gvMx2quantity,
-            this.gvMx2unit,
-            this.gridColumn18,
-            this.gvMx2itemSname,
-            this.gridColumn17,
-            this.gvMx2createBy,
-            this.gvMx2createDate,
-            this.gridColumn28,
-            this.gridColumn29,
-            this.gridColumn30,
-            this.gridColumn31,
-            this.gridColumn32,
-            this.gvBtnAlawys});
-            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;
-            // 
-            // gvMx2guid
-            // 
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "guid ";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 94;
-            // 
-            // gridColumn20
-            // 
-            this.gridColumn20.Caption = "鎶ュ伐鏍囪瘑";
-            this.gridColumn20.FieldName = "isBg";
-            this.gridColumn20.MaxWidth = 50;
-            this.gridColumn20.MinWidth = 50;
-            this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 0;
-            this.gridColumn20.Width = 50;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
-            this.gridColumn19.FieldName = "isRk";
-            this.gridColumn19.MaxWidth = 50;
-            this.gridColumn19.MinWidth = 50;
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 1;
-            this.gridColumn19.Width = 50;
-            // 
-            // gvMx2itemBarcode
-            // 
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 ";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 2;
-            this.gvMx2itemBarcode.Width = 94;
-            // 
-            // gvMx2quantity
-            // 
-            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "鏁伴噺 ";
-            this.gvMx2quantity.FieldName = "quantity";
-            this.gvMx2quantity.MinWidth = 50;
-            this.gvMx2quantity.Name = "gvMx2quantity";
-            this.gvMx2quantity.Tag = "query_a.QUANTITY";
-            this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 3;
-            this.gvMx2quantity.Width = 94;
-            // 
-            // gvMx2unit
-            // 
-            this.gvMx2unit.AppearanceCell.Options.UseFont = true;
-            this.gvMx2unit.Caption = "鍗曚綅 ";
-            this.gvMx2unit.FieldName = "dwName";
-            this.gvMx2unit.MinWidth = 50;
-            this.gvMx2unit.Name = "gvMx2unit";
-            this.gvMx2unit.Tag = "query_a.UNIT";
-            this.gvMx2unit.Visible = true;
-            this.gvMx2unit.VisibleIndex = 4;
-            this.gvMx2unit.Width = 94;
-            // 
-            // gridColumn18
-            // 
-            this.gridColumn18.Caption = "鐗╂枡缂栫爜";
-            this.gridColumn18.FieldName = "itemNo";
-            this.gridColumn18.MinWidth = 25;
-            this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 5;
-            this.gridColumn18.Width = 94;
-            // 
-            // gvMx2itemSname
-            // 
-            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
-            this.gvMx2itemSname.FieldName = "itemName";
-            this.gvMx2itemSname.MinWidth = 50;
-            this.gvMx2itemSname.Name = "gvMx2itemSname";
-            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
-            this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 6;
-            this.gvMx2itemSname.Width = 94;
-            // 
-            // gridColumn17
-            // 
-            this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn17.FieldName = "itemModel";
-            this.gridColumn17.MinWidth = 25;
-            this.gridColumn17.Name = "gridColumn17";
-            this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 7;
-            this.gridColumn17.Width = 94;
-            // 
-            // gvMx2createBy
-            // 
-            this.gvMx2createBy.AppearanceCell.Options.UseFont = true;
-            this.gvMx2createBy.Caption = "鍒涘缓浜� ";
-            this.gvMx2createBy.FieldName = "createBy";
-            this.gvMx2createBy.MinWidth = 50;
-            this.gvMx2createBy.Name = "gvMx2createBy";
-            this.gvMx2createBy.Tag = "query_a.CREATE_BY";
-            this.gvMx2createBy.Visible = true;
-            this.gvMx2createBy.VisibleIndex = 8;
-            this.gvMx2createBy.Width = 94;
-            // 
-            // gvMx2createDate
-            // 
-            this.gvMx2createDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx2createDate.Caption = "鍒涘缓鏃堕棿 ";
-            this.gvMx2createDate.FieldName = "createDate";
-            this.gvMx2createDate.MinWidth = 50;
-            this.gvMx2createDate.Name = "gvMx2createDate";
-            this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
-            this.gvMx2createDate.Visible = true;
-            this.gvMx2createDate.VisibleIndex = 9;
-            this.gvMx2createDate.Width = 94;
-            // 
-            // gridColumn28
-            // 
-            this.gridColumn28.Caption = "鎶ュ伐浜�";
-            this.gridColumn28.FieldName = "bgYg";
-            this.gridColumn28.MinWidth = 25;
-            this.gridColumn28.Name = "gridColumn28";
-            this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 10;
-            this.gridColumn28.Width = 94;
-            // 
-            // gridColumn29
-            // 
-            this.gridColumn29.Caption = "鎶ュ伐鏃堕棿";
-            this.gridColumn29.FieldName = "bgTime";
-            this.gridColumn29.MinWidth = 25;
-            this.gridColumn29.Name = "gridColumn29";
-            this.gridColumn29.Visible = true;
-            this.gridColumn29.VisibleIndex = 11;
-            this.gridColumn29.Width = 94;
-            // 
-            // gridColumn30
-            // 
-            this.gridColumn30.Caption = "鍏ュ簱浜�";
-            this.gridColumn30.FieldName = "rkUser";
-            this.gridColumn30.MinWidth = 25;
-            this.gridColumn30.Name = "gridColumn30";
-            this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 12;
-            this.gridColumn30.Width = 94;
-            // 
-            // gridColumn31
-            // 
-            this.gridColumn31.Caption = "鍏ュ簱鏃ユ湡";
-            this.gridColumn31.FieldName = "rkDate";
-            this.gridColumn31.MinWidth = 25;
-            this.gridColumn31.Name = "gridColumn31";
-            this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 13;
-            this.gridColumn31.Width = 94;
-            // 
-            // gridColumn32
-            // 
-            this.gridColumn32.Caption = "鍏ュ簱浣�";
-            this.gridColumn32.FieldName = "rkPositon";
-            this.gridColumn32.MinWidth = 25;
-            this.gridColumn32.Name = "gridColumn32";
-            this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 14;
-            this.gridColumn32.Width = 94;
-            // 
-            // gvBtnAlawys
-            // 
-            this.gvBtnAlawys.Caption = "绉诲嚭";
-            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvBtnAlawys.MinWidth = 25;
-            this.gvBtnAlawys.Name = "gvBtnAlawys";
-            this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 15;
-            this.gvBtnAlawys.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;
-            // 
-            // Frm_BoxCode
-            // 
-            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_BoxCode";
-            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.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_taskNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_isSource.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dwmc.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSumQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSyQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cusDh.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDh.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.瀹㈡埛鍚嶇О)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
-            this.tabMx.ResumeLayout(false);
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            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.XtraGrid.GridControl gcMain1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_org;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_name;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-        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_lineType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;
-        private UserControls.Data.UcPageBar pageBar1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-        private DevExpress.XtraEditors.TextEdit txt_memo;
-        private DevExpress.XtraEditors.TextEdit txt_lotNo;
-        private DevExpress.XtraEditors.TextEdit txt_dwmc;
-        private DevExpress.XtraLayout.LayoutControl layoutMx1;
-        private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraEditors.RadioGroup txt_isSource;
-        private DevExpress.XtraEditors.TextEdit txt_daaSumQty;
-        private DevExpress.XtraEditors.TextEdit txt_daaSyQty;
-        private DevExpress.XtraEditors.TextEdit txt_quantity;
-        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
-        private DevExpress.XtraEditors.TextEdit txt_cusDh;
-        private DevExpress.XtraEditors.TextEdit txt_saleDh;
-        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private UserControl.UcLookCustomer txt_cusId;
-        private DevExpress.XtraEditors.TextEdit txt_itemName;
-        private DevExpress.XtraEditors.TextEdit txt_itemModel;
-        private DevExpress.XtraEditors.ButtonEdit txt_taskNo;
-        private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
-        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraEditors.DateEdit txt_extDate;
-        private DevExpress.XtraEditors.TextEdit txt_itemNo;
-        private UserControl.UcLookOrg txt_orgId;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem 瀹㈡埛鍚嶇О;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs
deleted file mode 100644
index aa3aa73..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs
+++ /dev/null
@@ -1,415 +0,0 @@
-锘縰sing 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.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.BarCode
-{
-    public partial class Frm_BoxCode : DevExpress.XtraEditors.XtraForm
-    {
-        string _webServiceName = "Box/";
-        List<FilterEntity> _filterList = new List<FilterEntity>();
-        public Frm_BoxCode()
-        {
-            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;
-            this.toolBarMenu1.getXmlConfig();
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (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;
-            txt_itemId.Click += (s, e) =>
-            {
-                string _orgId = txt_orgId.GetId();
-                var frm = new SelectBoxItem(_orgId);
-                frm.UpdateParent += (ss, ee) =>
-                {
-                    try
-                    {
-                        var lst = new List<dynamic>();
-                        lst = ee.DynamicList;
-                        txt_itemId.Text = lst[0].itemId;
-                        txt_itemModel.Text = lst[0].itemModel;
-                        txt_itemName.Text = lst[0].itemName;
-                        txt_itemNo.Text = lst[0].itemNo;
-                        txt_lotNo.Text = lst[0].gdbh;
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message);
-                    }
-                };
-                frm.ShowDialog();
-            };
-            txt_taskNo.Click += (s, e) =>
-            {
-                string _orgId = txt_orgId.GetId();
-                var frm = new SelectBoxDaa(_orgId);
-                frm.UpdateParent += (ss, ee) =>
-                {
-                    try
-                    {
-                        var lst = new List<dynamic>();
-                        lst = ee.DynamicList;
-                        txt_itemId.Text = lst[0].itemId;
-                        txt_itemModel.Text = lst[0].itemModel;
-                        txt_itemName.Text = lst[0].itemName;
-                        txt_itemNo.Text = lst[0].itemNo;
-                        txt_lotNo.Text = lst[0].gdbh;
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message);
-                    }
-                };
-                frm.ShowDialog();
-            };
-        }
-        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
-            await 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)
-        {
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 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_dwmc, gridView1, "lineNo");
-            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_btnEdtClick(object sender, EventArgs e)
-        {
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_lotNo, gridView1);
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-            {
-                getModel(rowGuid);
-            }
-            else
-            {
-                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
-            }
-        }
-        /// <summary>
-        /// 鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            lbGuid.Text = "";
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
-            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
-        }
-        /// <summary>
-        /// 淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.isSetBtn = false;
-            string _txt_orgId = txt_orgId.GetId();
-            string _txt_taskNo = txt_taskNo.Text.Trim();
-            string _txt_itemId = txt_itemId.Text.Trim();
-            string _txt_lotNo = txt_lotNo.Text.Trim();
-            string _txt_cusId = txt_cusId.GetId();
-            string _txt_cusDh = txt_cusDh.Text.Trim();
-            string _txt_saleDh = txt_saleDh.Text.Trim();
-            string _txt_memo = txt_memo.Text.Trim();
-            string _txt_extDate = txt_extDate.Text;
-            string _txt_quantity = txt_quantity.Text.Trim();
-            string _txt_psnQty_1 = txt_psnQty_1.Text.Trim();
-            string _txt_iCount_1 = txt_iCount_1.Text.Trim();
-            if (string.IsNullOrEmpty(_txt_orgId.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("缁勭粐涓嶈兘涓虹┖锛�");
-                txt_orgId.Focus();
-                return;
-            }
-            if (txt_isSource.SelectedIndex == 0)
-            {
-                if (_txt_taskNo.Trim().Length <= 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨宸ュ崟锛�");
-                    txt_taskNo.Focus();
-                    return;
-                }
-            }
-            if (string.IsNullOrEmpty(_txt_itemId.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("浜у搧ID涓嶈兘涓虹┖锛�");
-                txt_itemId.Focus();
-                return;
-            }
-            if (string.IsNullOrEmpty(_txt_quantity.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鐢熶骇鏁伴噺涓嶈兘涓虹┖锛�");
-                txt_quantity.Focus();
-                return;
-            }
-            if (string.IsNullOrEmpty(_txt_psnQty_1.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鍐呭寘瑁呮暟閲忎笉鑳戒负绌猴紒");
-                txt_psnQty_1.Focus();
-                return;
-            }
-            if (string.IsNullOrEmpty(_txt_iCount_1.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鎵撳嵃鏁伴噺涓嶈兘涓虹┖锛�");
-                txt_iCount_1.Focus();
-                return;
-            }
-            var _obj = new
-            {
-                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                orgId = _txt_orgId,
-                taskNo = _txt_taskNo,
-                itemId = _txt_itemId,
-                lotNo = _txt_lotNo,
-                cusId = _txt_cusId,
-                cusDh = _txt_cusDh,
-                saleDh = _txt_saleDh,
-                memo = _txt_memo,
-                extDate = _txt_extDate,
-                //
-                quantity = _txt_quantity,
-                psnQty_1 = _txt_psnQty_1,
-                iCount_1 = _txt_iCount_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);
-                    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)
-        {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,c.departmentcode asc,a.line_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;
-                    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)
-            {
-                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 = 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;
-                    UtilityHelper.SetValueByObj(this.layoutMx1.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/BarCode/SelectBoxDaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs
deleted file mode 100644
index bd76296..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.BarCode
-{
-    partial class SelectBoxDaa
-    {
-        /// <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 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.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1});
-            this.gcMain.Size = new System.Drawing.Size(581, 489);
-            this.gcMain.TabIndex = 3;
-            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.gridColumn7,
-            this.gridColumn1,
-            this.gridColumn2,
-            this.gridColumn3,
-            this.gridColumn4,
-            this.gridColumn5,
-            this.gridColumn6,
-            this.gv_Btn});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gv_Btn
-            // 
-            this.gv_Btn.Caption = "閫夋嫨";
-            this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gv_Btn.MinWidth = 25;
-            this.gv_Btn.Name = "gv_Btn";
-            this.gv_Btn.Visible = true;
-            this.gv_Btn.VisibleIndex = 6;
-            this.gv_Btn.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
-            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);
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "浜х嚎";
-            this.gridColumn1.FieldName = "lineName";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 1;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "宸ュ崟缂栧彿";
-            this.gridColumn2.FieldName = "gdbh";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 2;
-            this.gridColumn2.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "浜у搧ID";
-            this.gridColumn3.FieldName = "itemId";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 3;
-            this.gridColumn3.Width = 94;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "浜у搧缂栫爜";
-            this.gridColumn4.FieldName = "itemNo";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 4;
-            this.gridColumn4.Width = 94;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "浜у搧鍚嶇О";
-            this.gridColumn5.FieldName = "itemName";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 5;
-            this.gridColumn5.Width = 94;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 6;
-            this.gridColumn6.Width = 94;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "涓婚敭Guid";
-            this.gridColumn7.FieldName = "guid";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Width = 94;
-            // 
-            // SelectFqcItem
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(581, 489);
-            this.Controls.Add(this.gcMain);
-            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "SelectFqcItem";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "閫夋嫨缁勭粐";
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs
deleted file mode 100644
index 395930e..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Windows.Forms;
-
-
-namespace Gs.DevApp.DevFrm.BarCode
-{
-    public partial class SelectBoxDaa : DevExpress.XtraEditors.XtraForm
-    {
-        private readonly string _webServiceName = "FqcManager/";
-        string orgId = "";
-        public SelectBoxDaa(string _orgIdId)
-        {
-            InitializeComponent();
-            this.orgId = _orgIdId;
-            getPageList(1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage)
-        {
-            var _obj = new
-            {
-                currentPage = curPage,
-                everyPageSize = 999999,
-                sortName = "",
-                keyWhere = "",
-                lineId = this.orgId
-            };
-            var json = JsonConvert.SerializeObject(_obj);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                   _webServiceName + "SelectFqcItem", json);
-                var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
-                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            var rowhandle = gridView1.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                var dr = gridView1.GetDataRow(rowhandle);
-                var mxGuid = dr["guid"].ToString();
-                if (string.IsNullOrEmpty(mxGuid))
-                {
-                    return;
-                }
-                var list = new List<dynamic>();
-                list.Add(new
-                {
-                    guid = dr["guid"].ToString(),
-                    itemId = dr["itemId"].ToString(),
-                    itemName = dr["itemName"].ToString(),
-                    itemNo = dr["itemNo"].ToString(),
-                    itemModel = dr["itemModel"].ToString(),
-                    gdbh = dr["gdbh"].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/BarCode/SelectBoxItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs
deleted file mode 100644
index 76f3b9c..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.BarCode
-{
-    partial class SelectBoxItem
-    {
-        /// <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 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.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1});
-            this.gcMain.Size = new System.Drawing.Size(581, 489);
-            this.gcMain.TabIndex = 3;
-            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.gridColumn7,
-            this.gridColumn1,
-            this.gridColumn2,
-            this.gridColumn3,
-            this.gridColumn4,
-            this.gridColumn5,
-            this.gridColumn6,
-            this.gv_Btn});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gv_Btn
-            // 
-            this.gv_Btn.Caption = "閫夋嫨";
-            this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gv_Btn.MinWidth = 25;
-            this.gv_Btn.Name = "gv_Btn";
-            this.gv_Btn.Visible = true;
-            this.gv_Btn.VisibleIndex = 6;
-            this.gv_Btn.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
-            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);
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "浜х嚎";
-            this.gridColumn1.FieldName = "lineName";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 1;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "宸ュ崟缂栧彿";
-            this.gridColumn2.FieldName = "gdbh";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 2;
-            this.gridColumn2.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "浜у搧ID";
-            this.gridColumn3.FieldName = "itemId";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 3;
-            this.gridColumn3.Width = 94;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "浜у搧缂栫爜";
-            this.gridColumn4.FieldName = "itemNo";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 4;
-            this.gridColumn4.Width = 94;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "浜у搧鍚嶇О";
-            this.gridColumn5.FieldName = "itemName";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 5;
-            this.gridColumn5.Width = 94;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 6;
-            this.gridColumn6.Width = 94;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "涓婚敭Guid";
-            this.gridColumn7.FieldName = "guid";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Width = 94;
-            // 
-            // SelectFqcItem
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(581, 489);
-            this.Controls.Add(this.gcMain);
-            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "SelectFqcItem";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "閫夋嫨缁勭粐";
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs
deleted file mode 100644
index cea91de..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-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.BarCode
-{
-    public partial class SelectBoxItem : DevExpress.XtraEditors.XtraForm
-    {
-        private readonly string _webServiceName = "FqcManager/";
-        string orgId = "";
-        public SelectBoxItem(string _orgIdId)
-        {
-            InitializeComponent();
-            this.orgId = _orgIdId;
-            getPageList(1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage)
-        {
-            var _obj = new
-            {
-                currentPage = curPage,
-                everyPageSize = 999999,
-                sortName = "",
-                keyWhere = "",
-                lineId = this.orgId
-            };
-            var json = JsonConvert.SerializeObject(_obj);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                   _webServiceName + "SelectFqcItem", json);
-                var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
-                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
-                }
-                else
-                {
-                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            var rowhandle = gridView1.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                var dr = gridView1.GetDataRow(rowhandle);
-                var mxGuid = dr["guid"].ToString();
-                if (string.IsNullOrEmpty(mxGuid))
-                {
-                    return;
-                }
-                var list = new List<dynamic>();
-                list.Add(new
-                {
-                    guid = dr["guid"].ToString(),
-                    itemId = dr["itemId"].ToString(),
-                    itemName = dr["itemName"].ToString(),
-                    itemNo = dr["itemNo"].ToString(),
-                    itemModel = dr["itemModel"].ToString(),
-                    gdbh = dr["gdbh"].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/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 93ccf2e..1dcec87 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -30,29 +30,29 @@
         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 rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -114,6 +114,22 @@
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -157,22 +173,8 @@
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -223,6 +225,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -230,9 +235,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -263,14 +266,15 @@
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
-            this.xtraTabPage2});
+            this.xtraTabPage2,
+            this.xtraTabPage3});
             // 
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1376, 442);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1376, 440);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -292,7 +296,7 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1376, 442);
+            this.split1.Size = new System.Drawing.Size(1376, 440);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
@@ -304,7 +308,7 @@
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1376, 402);
+            this.gcMain1.Size = new System.Drawing.Size(1376, 400);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -551,7 +555,7 @@
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 402);
+            this.pageBar1.Location = new System.Drawing.Point(0, 400);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
@@ -564,7 +568,7 @@
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1376, 442);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1376, 440);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -585,7 +589,7 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1376, 442);
+            this.splitMx1.Size = new System.Drawing.Size(1376, 440);
             this.splitMx1.SplitterPosition = 116;
             this.splitMx1.TabIndex = 0;
             // 
@@ -832,32 +836,32 @@
             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;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition9,
-            columnDefinition10,
-            columnDefinition11,
-            columnDefinition12});
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition9,
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12});
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8});
             this.Root.Size = new System.Drawing.Size(1376, 116);
             this.Root.TextVisible = false;
             // 
@@ -1020,11 +1024,195 @@
             this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage2;
-            this.tabMx.Size = new System.Drawing.Size(1376, 316);
+            this.tabMx.Size = new System.Drawing.Size(1376, 314);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
             this.tabMxPage2});
+            // 
+            // tabMxPage2
+            // 
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1374, 288);
+            this.tabMxPage2.Text = "宸叉墦鍗版潯鐮�";
+            // 
+            // gcMx2
+            // 
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.Size = new System.Drawing.Size(1374, 288);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.Appearance.Row.Options.UseFont = true;
+            this.gvMx2.ColumnPanelRowHeight = 39;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2guid,
+            this.gridColumn24,
+            this.gvMx2itemBarcode,
+            this.gvMx2itemNo,
+            this.gridColumn25,
+            this.gridColumn26,
+            this.gvMx2oldqty,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn31,
+            this.gridColumn32});
+            this.gvMx2.DetailHeight = 272;
+            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.ShowGroupPanel = false;
+            // 
+            // gvMx2guid
+            // 
+            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx2guid.Caption = "guid ";
+            this.gvMx2guid.FieldName = "guid";
+            this.gvMx2guid.MinWidth = 44;
+            this.gvMx2guid.Name = "gvMx2guid";
+            this.gvMx2guid.Tag = "query_a.guid";
+            this.gvMx2guid.Width = 82;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鏄惁鍏ュ簱";
+            this.gridColumn24.FieldName = "isRk";
+            this.gridColumn24.MaxWidth = 44;
+            this.gridColumn24.MinWidth = 44;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 0;
+            this.gridColumn24.Width = 44;
+            // 
+            // gvMx2itemBarcode
+            // 
+            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx2itemBarcode.FieldName = "itemBarcode";
+            this.gvMx2itemBarcode.MinWidth = 44;
+            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx2itemBarcode.Visible = true;
+            this.gvMx2itemBarcode.VisibleIndex = 1;
+            this.gvMx2itemBarcode.Width = 262;
+            // 
+            // gvMx2itemNo
+            // 
+            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
+            this.gvMx2itemNo.FieldName = "itemNo";
+            this.gvMx2itemNo.MinWidth = 44;
+            this.gvMx2itemNo.Name = "gvMx2itemNo";
+            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
+            this.gvMx2itemNo.Visible = true;
+            this.gvMx2itemNo.VisibleIndex = 2;
+            this.gvMx2itemNo.Width = 87;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn25.FieldName = "itemName";
+            this.gridColumn25.MinWidth = 44;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 3;
+            this.gridColumn25.Width = 131;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn26.FieldName = "itemModel";
+            this.gridColumn26.MinWidth = 44;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 4;
+            this.gridColumn26.Width = 131;
+            // 
+            // gvMx2oldqty
+            // 
+            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
+            this.gvMx2oldqty.Caption = "鏁伴噺";
+            this.gvMx2oldqty.FieldName = "quantity";
+            this.gvMx2oldqty.MinWidth = 44;
+            this.gvMx2oldqty.Name = "gvMx2oldqty";
+            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
+            this.gvMx2oldqty.Visible = true;
+            this.gvMx2oldqty.VisibleIndex = 5;
+            this.gvMx2oldqty.Width = 82;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "鍗曚綅";
+            this.gridColumn27.FieldName = "dwName";
+            this.gridColumn27.MinWidth = 22;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 6;
+            this.gridColumn27.Width = 82;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "鎵撶爜浜�";
+            this.gridColumn28.FieldName = "createBy";
+            this.gridColumn28.MinWidth = 22;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 7;
+            this.gridColumn28.Width = 82;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "鎵撶爜鏃ユ湡";
+            this.gridColumn29.FieldName = "createDate";
+            this.gridColumn29.MinWidth = 10;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 8;
+            this.gridColumn29.Width = 157;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "鍏ュ簱浜�";
+            this.gridColumn30.FieldName = "rkUser";
+            this.gridColumn30.MinWidth = 22;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 9;
+            this.gridColumn30.Width = 82;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn31.FieldName = "rkDate";
+            this.gridColumn31.MinWidth = 22;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 10;
+            this.gridColumn31.Width = 82;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "鍏ュ簱浣�";
+            this.gridColumn32.FieldName = "rkPositon";
+            this.gridColumn32.MinWidth = 22;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 11;
+            this.gridColumn32.Width = 82;
             // 
             // tabMxPage1
             // 
@@ -1395,10 +1583,10 @@
             // repositoryItemButtonEdit2
             // 
             this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
-            editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+            editorButtonImageOptions4.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, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
@@ -1416,10 +1604,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions5.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, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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);
@@ -1475,10 +1663,10 @@
             // rptHistory
             // 
             this.rptHistory.AutoHeight = false;
-            editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
-            editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
+            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptHistory.Name = "rptHistory";
             this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick);
@@ -1531,189 +1719,22 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // tabMxPage2
+            // xtraTabPage3
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1374, 290);
-            this.tabMxPage2.Text = "宸叉墦鍗版潯鐮�";
+            this.xtraTabPage3.Controls.Add(this.ucRptCgdhd1);
+            this.xtraTabPage3.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1376, 440);
+            this.xtraTabPage3.Text = "鏄庣粏鎶ヨ〃";
             // 
-            // gcMx2
+            // ucRptCgdhd1
             // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx2.Location = new System.Drawing.Point(0, 0);
-            this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1374, 290);
-            this.gcMx2.TabIndex = 1;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx2.Appearance.Row.Options.UseFont = true;
-            this.gvMx2.ColumnPanelRowHeight = 39;
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2guid,
-            this.gridColumn24,
-            this.gvMx2itemBarcode,
-            this.gvMx2itemNo,
-            this.gridColumn25,
-            this.gridColumn26,
-            this.gvMx2oldqty,
-            this.gridColumn27,
-            this.gridColumn28,
-            this.gridColumn29,
-            this.gridColumn30,
-            this.gridColumn31,
-            this.gridColumn32});
-            this.gvMx2.DetailHeight = 272;
-            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.ShowGroupPanel = false;
-            // 
-            // gvMx2guid
-            // 
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "guid ";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 44;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 82;
-            // 
-            // gridColumn24
-            // 
-            this.gridColumn24.Caption = "鏄惁鍏ュ簱";
-            this.gridColumn24.FieldName = "isRk";
-            this.gridColumn24.MaxWidth = 44;
-            this.gridColumn24.MinWidth = 44;
-            this.gridColumn24.Name = "gridColumn24";
-            this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 0;
-            this.gridColumn24.Width = 44;
-            // 
-            // gvMx2itemBarcode
-            // 
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 44;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 262;
-            // 
-            // gvMx2itemNo
-            // 
-            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
-            this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 44;
-            this.gvMx2itemNo.Name = "gvMx2itemNo";
-            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
-            this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 87;
-            // 
-            // gridColumn25
-            // 
-            this.gridColumn25.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn25.FieldName = "itemName";
-            this.gridColumn25.MinWidth = 44;
-            this.gridColumn25.Name = "gridColumn25";
-            this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 3;
-            this.gridColumn25.Width = 131;
-            // 
-            // gridColumn26
-            // 
-            this.gridColumn26.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn26.FieldName = "itemModel";
-            this.gridColumn26.MinWidth = 44;
-            this.gridColumn26.Name = "gridColumn26";
-            this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 4;
-            this.gridColumn26.Width = 131;
-            // 
-            // gvMx2oldqty
-            // 
-            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2oldqty.Caption = "鏁伴噺";
-            this.gvMx2oldqty.FieldName = "quantity";
-            this.gvMx2oldqty.MinWidth = 44;
-            this.gvMx2oldqty.Name = "gvMx2oldqty";
-            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
-            this.gvMx2oldqty.Visible = true;
-            this.gvMx2oldqty.VisibleIndex = 5;
-            this.gvMx2oldqty.Width = 82;
-            // 
-            // gridColumn27
-            // 
-            this.gridColumn27.Caption = "鍗曚綅";
-            this.gridColumn27.FieldName = "dwName";
-            this.gridColumn27.MinWidth = 22;
-            this.gridColumn27.Name = "gridColumn27";
-            this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 6;
-            this.gridColumn27.Width = 82;
-            // 
-            // gridColumn28
-            // 
-            this.gridColumn28.Caption = "鎵撶爜浜�";
-            this.gridColumn28.FieldName = "createBy";
-            this.gridColumn28.MinWidth = 22;
-            this.gridColumn28.Name = "gridColumn28";
-            this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 7;
-            this.gridColumn28.Width = 82;
-            // 
-            // gridColumn29
-            // 
-            this.gridColumn29.Caption = "鎵撶爜鏃ユ湡";
-            this.gridColumn29.FieldName = "createDate";
-            this.gridColumn29.MinWidth = 10;
-            this.gridColumn29.Name = "gridColumn29";
-            this.gridColumn29.Visible = true;
-            this.gridColumn29.VisibleIndex = 8;
-            this.gridColumn29.Width = 157;
-            // 
-            // gridColumn30
-            // 
-            this.gridColumn30.Caption = "鍏ュ簱浜�";
-            this.gridColumn30.FieldName = "rkUser";
-            this.gridColumn30.MinWidth = 22;
-            this.gridColumn30.Name = "gridColumn30";
-            this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 9;
-            this.gridColumn30.Width = 82;
-            // 
-            // gridColumn31
-            // 
-            this.gridColumn31.Caption = "鍏ュ簱鏃ユ湡";
-            this.gridColumn31.FieldName = "rkDate";
-            this.gridColumn31.MinWidth = 22;
-            this.gridColumn31.Name = "gridColumn31";
-            this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 10;
-            this.gridColumn31.Width = 82;
-            // 
-            // gridColumn32
-            // 
-            this.gridColumn32.Caption = "鍏ュ簱浣�";
-            this.gridColumn32.FieldName = "rkPositon";
-            this.gridColumn32.MinWidth = 22;
-            this.gridColumn32.Name = "gridColumn32";
-            this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 11;
-            this.gridColumn32.Width = 82;
+            this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0);
+            this.ucRptCgdhd1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.ucRptCgdhd1.Name = "ucRptCgdhd1";
+            this.ucRptCgdhd1.Size = new System.Drawing.Size(1376, 440);
+            this.ucRptCgdhd1.TabIndex = 0;
             // 
             // Frm_MesInvItemArn
             // 
@@ -1776,6 +1797,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1783,9 +1807,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1910,5 +1932,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private Rpt.UcRptCgdhd ucRptCgdhd1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 11c6b2b..3300fe3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -48,7 +48,11 @@
             }, (value) =>
             {
                 getPageList(this.pageBar1.CurrentPage);
-            }, lbGuid);
+            }, lbGuid, toolBarMenu1
+            , () =>
+            {
+                ucRptCgdhd1.Initialize();
+            });
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             //璁剧疆缁勭粐
@@ -174,12 +178,17 @@
         /// <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();
+            if (xtraTabControl1.SelectedTabPageIndex == 0)
+            {
+                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();
+                return;
+            }
+            ucRptCgdhd1.ToolBarMenu1_btnQueryClick(sender, e);
         }
 
         /// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
index 74d96bc..90ef9b3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
@@ -121,6 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>33</value>
+    <value>140</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
new file mode 100644
index 0000000..dba0ef3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
@@ -0,0 +1,387 @@
+锘縩amespace Gs.DevApp.DevFrm.Rpt
+{
+    partial class UcRptCgdhd
+    {
+        /// <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.gcMain1Report = new DevExpress.XtraGrid.GridControl();
+            this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gcMain1Report
+            // 
+            this.gcMain1Report.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1Report.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1Report.MainView = this.gridView1Report;
+            this.gcMain1Report.Name = "gcMain1Report";
+            this.gcMain1Report.Size = new System.Drawing.Size(1339, 644);
+            this.gcMain1Report.TabIndex = 2;
+            this.gcMain1Report.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1Report});
+            // 
+            // gridView1Report
+            // 
+            this.gridView1Report.Appearance.Row.Options.UseFont = true;
+            this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_guid,
+            this.gv_itemId,
+            this.gridColumn3,
+            this.gridColumn2,
+            this.gridColumn4,
+            this.gv_quantity,
+            this.gv_depotId,
+            this.gridColumn6,
+            this.gridColumn1,
+            this.gv_depotSectionsCode,
+            this.gv_ownerType,
+            this.gv_ownerId,
+            this.gridColumn5,
+            this.gv_indepUserCode,
+            this.gv_indepDate,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11});
+            this.gridView1Report.GridControl = this.gcMain1Report;
+            this.gridView1Report.IndicatorWidth = 50;
+            this.gridView1Report.Name = "gridView1Report";
+            this.gridView1Report.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1Report.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1Report.OptionsView.ShowFooter = true;
+            this.gridView1Report.OptionsView.ShowGroupPanel = false;
+            // 
+            // 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.Width = 94;
+            // 
+            // 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.Width = 73;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn3.FieldName = "itemNo";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 6;
+            this.gridColumn3.Width = 74;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn2.FieldName = "itemName";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 7;
+            this.gridColumn2.Width = 74;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn4.FieldName = "itemModel";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 9;
+            this.gridColumn4.Width = 74;
+            // 
+            // gv_quantity
+            // 
+            this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gv_quantity.AppearanceCell.Options.UseFont = true;
+            this.gv_quantity.AppearanceCell.Options.UseForeColor = true;
+            this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
+            this.gv_quantity.Caption = "鏀舵枡鏁伴噺 ";
+            this.gv_quantity.FieldName = "quantity";
+            this.gv_quantity.MinWidth = 50;
+            this.gv_quantity.Name = "gv_quantity";
+            this.gv_quantity.OptionsColumn.AllowEdit = false;
+            this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
+            this.gv_quantity.Tag = "query_a.QUANTITY";
+            this.gv_quantity.Visible = true;
+            this.gv_quantity.VisibleIndex = 2;
+            this.gv_quantity.Width = 74;
+            // 
+            // gv_depotId
+            // 
+            this.gv_depotId.AppearanceCell.Options.UseFont = true;
+            this.gv_depotId.Caption = "妫�楠岀姸鎬�";
+            this.gv_depotId.FieldName = "txtColor";
+            this.gv_depotId.MinWidth = 50;
+            this.gv_depotId.Name = "gv_depotId";
+            this.gv_depotId.OptionsColumn.AllowEdit = false;
+            this.gv_depotId.Tag = "query_a.DEPOT_ID";
+            this.gv_depotId.Visible = true;
+            this.gv_depotId.VisibleIndex = 4;
+            this.gv_depotId.Width = 73;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "妫�楠岀粨鏋�";
+            this.gridColumn6.FieldName = "checkRes";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 5;
+            this.gridColumn6.Width = 74;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "閫�璐�";
+            this.gridColumn1.FieldName = "returnFlag";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 13;
+            this.gridColumn1.Width = 74;
+            // 
+            // gv_depotSectionsCode
+            // 
+            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
+            this.gv_depotSectionsCode.Caption = "鎬ユ枡";
+            this.gv_depotSectionsCode.FieldName = "urgentFlagTxt";
+            this.gv_depotSectionsCode.MinWidth = 50;
+            this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
+            this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
+            this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
+            this.gv_depotSectionsCode.Visible = true;
+            this.gv_depotSectionsCode.VisibleIndex = 10;
+            this.gv_depotSectionsCode.Width = 74;
+            // 
+            // gv_ownerType
+            // 
+            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
+            this.gv_ownerType.Caption = "鏀舵枡缁勭粐";
+            this.gv_ownerType.FieldName = "receivingOrg";
+            this.gv_ownerType.MinWidth = 50;
+            this.gv_ownerType.Name = "gv_ownerType";
+            this.gv_ownerType.OptionsColumn.AllowEdit = false;
+            this.gv_ownerType.Tag = "query_a.Owner_Type";
+            this.gv_ownerType.Visible = true;
+            this.gv_ownerType.VisibleIndex = 17;
+            this.gv_ownerType.Width = 74;
+            // 
+            // gv_ownerId
+            // 
+            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
+            this.gv_ownerId.Caption = "閲囪喘鍗曞彿";
+            this.gv_ownerId.FieldName = "ebeln";
+            this.gv_ownerId.MinWidth = 50;
+            this.gv_ownerId.Name = "gv_ownerId";
+            this.gv_ownerId.OptionsColumn.AllowEdit = false;
+            this.gv_ownerId.Tag = "query_a.Owner_Id";
+            this.gv_ownerId.Visible = true;
+            this.gv_ownerId.VisibleIndex = 0;
+            this.gv_ownerId.Width = 74;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鍒拌揣鍗曞彿";
+            this.gridColumn5.FieldName = "dhdNo";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 1;
+            this.gridColumn5.Width = 74;
+            // 
+            // gv_indepUserCode
+            // 
+            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
+            this.gv_indepUserCode.Caption = "鏀惰揣浜�";
+            this.gv_indepUserCode.FieldName = "dhdUser";
+            this.gv_indepUserCode.MinWidth = 50;
+            this.gv_indepUserCode.Name = "gv_indepUserCode";
+            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
+            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
+            this.gv_indepUserCode.Visible = true;
+            this.gv_indepUserCode.VisibleIndex = 11;
+            this.gv_indepUserCode.Width = 74;
+            // 
+            // gv_indepDate
+            // 
+            this.gv_indepDate.AppearanceCell.Options.UseFont = true;
+            this.gv_indepDate.Caption = "鏀惰揣鏃ユ湡 ";
+            this.gv_indepDate.FieldName = "dhdDate";
+            this.gv_indepDate.MinWidth = 10;
+            this.gv_indepDate.Name = "gv_indepDate";
+            this.gv_indepDate.OptionsColumn.AllowEdit = false;
+            this.gv_indepDate.Tag = "query_a.INDEP_DATE";
+            this.gv_indepDate.Visible = true;
+            this.gv_indepDate.VisibleIndex = 12;
+            this.gv_indepDate.Width = 80;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn7.Caption = "鏀舵枡澶囨敞";
+            this.gridColumn7.FieldName = "memo";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 3;
+            this.gridColumn7.Width = 77;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "OA澶勭悊鎰忚";
+            this.gridColumn8.FieldName = "clyj";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 14;
+            this.gridColumn8.Width = 77;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "OA鎸戦�夋暟閲�";
+            this.gridColumn9.FieldName = "txsl";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 15;
+            this.gridColumn9.Width = 77;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "OA閫夊埆绫诲埆";
+            this.gridColumn10.FieldName = "xblb";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 16;
+            this.gridColumn10.Width = 88;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 644);
+            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(1339, 38);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "渚涘簲鍟�";
+            this.gridColumn11.FieldName = "gysName";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 8;
+            this.gridColumn11.Width = 94;
+            // 
+            // UcRptCgdhd
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.gcMain1Report);
+            this.Controls.Add(this.pageBar1);
+            this.Name = "UcRptCgdhd";
+            this.Size = new System.Drawing.Size(1339, 682);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private DevExpress.XtraGrid.GridControl gcMain1Report;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
new file mode 100644
index 0000000..f365707
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs
@@ -0,0 +1,152 @@
+锘縰sing DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Views.Grid;
+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.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Rpt
+{
+    public partial class UcRptCgdhd : DevExpress.XtraEditors.XtraUserControl
+    {
+        string _webServiceName = "MesInvItemArnManager/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public UcRptCgdhd()
+        {
+            InitializeComponent();
+        }
+        public bool isInitialize = false;
+        /// <summary>
+        /// 杩欏拰鏅�氶〉涓嶄竴鏍�
+        /// </summary>
+        public void Initialize()
+        {
+            if (isInitialize)
+                return;
+            string _formNamespace = this.GetType().FullName;
+            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<GridView>();
+            gvList.Add(gridView1Report);
+            GridControl gcMain = this.Controls.Find("gcMain1Report", true).OfType<GridControl>().FirstOrDefault();
+            UtilityHelper.GetUcXmlConfig(_formNamespace, gvList, gcMain);
+            Form parentForm = this.FindForm();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1Report, null, parentForm, "", "", (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;
+            this.isInitialize=true;
+        }
+
+
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1Report.Columns, gridView1Report);
+            await 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>
+        public void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1Report.ActiveFilter.Clear();
+            gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1Report.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>
+        public void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            getPageList(this.pageBar1.CurrentPage);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1Report.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageReport", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1Report.BindingContext = new BindingContext();
+                    gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1Report.DataSource = dt;
+                        gcMain1Report.ForceInitialize();
+                        gridView1Report.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1Report);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1Report, gridView1Report);
+                    gridView1Report.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);
+            }
+        }
+
+
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx
rename to DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index ee6a3a4..a3af6b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -127,8 +127,8 @@
             this.ucBtnPrintOne1.btnPrintClick += (s, e) =>
             {
                 string mainGuid = lbGuid.Text.Trim();
-                ucBtnPrint1.guidKey = mainGuid;
-                  this.ucBtnPrint1.rptParameter = "rpt_Arrival{"
+                ucBtnPrintOne1.guidKey = mainGuid;
+                  this.ucBtnPrintOne1.rptParameter = "rpt_Arrival{"
                        + "101"//涓�閿墦鍗�101
                        + "," + ""
                        + "," + ""
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 2c62325..a3251d1 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -148,6 +148,76 @@
                 : "linktoprevious_16x16") as Image;
             return image2;
         }
+        /// <summary>
+        /// 鐢ㄦ埛鎺т欢璇诲彇xml閰嶇疆
+        /// </summary>
+        /// <param name="_formNamespace"></param>
+        /// <param name="gvList"></param>
+        /// <param name="gcMain"></param>
+        public static void GetUcXmlConfig(string _formNamespace, List<DevExpress.XtraGrid.Views.Grid.GridView> gvList, GridControl gcMain)
+        {
+            JArray array = new JArray();
+            var _obj = new
+            {
+                formPath = _formNamespace,
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", "Fm/GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    JObject _job = JObject.Parse(strJson);
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    foreach (GridView gv in gvList)
+                    {
+                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
+                        if (john != null)
+                        {
+                            string controlId = john["controlId"].ToString();
+                            string controlXml = john["controlXml"].ToString();
+                            byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
+                            using (var stream = new MemoryStream(byteArray))
+                            {
+                                gv.RestoreLayoutFromStream(stream);
+                            }
+                        }
+                    }
+
+                    //璁剧疆鏌ヨ鏉′欢beg
+                    if (gcMain != null)
+                    {
+                        GridView gv1 = gcMain.MainView as GridView;
+                        if (gv1 != null)
+                        {
+                            foreach (var a in _job["rtnData"]["list2"])
+                            {
+                                string _gvColName = a["gvColName"].ToString();
+                                string _sqlField = a["sqlField"].ToString();
+                                string _sqlFieldType = a["sqlFieldType"].ToString();
+                                var column = gv1.Columns.Cast<DevExpress.XtraGrid.Columns.GridColumn>()
+                                                .FirstOrDefault(c => c.Name == _gvColName);
+                                if (column != null)
+                                {
+                                    column.Tag = _sqlField;
+                                    column.UnboundExpression = _sqlFieldType;
+                                }
+                            }
+                        }
+                    }
+                    //璁剧疆鏌ヨ鏉′欢end
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
 
         /// <summary>
         ///     鍒濆鍖栦竴涓〃
@@ -1946,19 +2016,36 @@
                     column.Width = 500;
             }
         }
-        
+        public delegate void DelegateGetUserControlList();
         /// <summary>
         /// 璁剧疆閫夐」鍗�
         /// </summary>
         /// <param name="gridView1"></param>
         /// <param name="xtraTabControl1"></param>
         /// <param name="pageBar1"></param>
-        /// <param name="action"></param>
-        /// <param name="page"></param>
-        public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null)
+        /// <param name="action">璇诲彇瀹炰綋</param>
+        /// <param name="page">璇诲彇鍒楄〃</param>
+        /// <param name="lbGuid"></param>
+        /// <param name="barMenu"></param>
+        /// <param name="ucLst">璇诲彇鎶ヨ〃</param>
+        public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null, UcToolBarMenu barMenu = null, DelegateGetUserControlList ucLst = null)
         {
             xtraTabControl1.SelectedPageChanged += (s, e) =>
             {
+                if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+                {
+                    if (barMenu != null)
+                        barMenu.SetAllButton(0);
+
+                    page(pageBar1.CurrentPage);
+                    int rowHandle = 0;
+                    rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
+                    if (rowHandle < 0)
+                        rowHandle = 0;
+                    gridView1.FocusedRowHandle = rowHandle;
+                    return;
+                }
+
                 if (xtraTabControl1.SelectedTabPageIndex == 1)
                 {
                     int _handle = gridView1.FocusedRowHandle;
@@ -1986,19 +2073,19 @@
                         return;
                     }
                     action(_guid);
+                    return;
                 }
-                if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+
+                if (barMenu != null && xtraTabControl1.SelectedTabPageIndex == 2)
                 {
-                    page(pageBar1.CurrentPage);
-                    int rowHandle = 0;
-                    rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
-                    if (rowHandle < 0)
-                        rowHandle = 0;
-                    gridView1.FocusedRowHandle = rowHandle;
+                    barMenu.SetAllButton(2);
+                    ucLst();
+                    return;
                 }
             };
         }
 
+
         /// <summary>
         /// 璁剧疆鏄庣粏grid鏍峰紡
         /// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c4a25cf..32981d0 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -79,8 +79,49 @@
         }
 
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="inType"></param>
+        public void SetAllButton(int inType)
+        {
+            var lstBtn = new List<string>();
+            if (inType == 0)
+            {
+                lstBtn.Add(btnSave.Name);
+                lstBtn.Add(btnEsc.Name);
+                foreach (BarItem item in barManager1.Items)
+                    if (item is BarLargeButtonItem largeButtonItem)
+                    {
+                        if (!lstBtn.Contains(item.Name))
+                            largeButtonItem.Enabled = true;
+                        else
+                            largeButtonItem.Enabled = false;
+                    }
+                return;
+            }
+            if (inType == 2)
+            {
+                lstBtn.Add(btnHelp.Name);
+                lstBtn.Add(btnLoad.Name);
+                lstBtn.Add(btnQuery.Name);
+                lstBtn.Add(btnLayout.Name);
+                lstBtn.Add(btnFont.Name);
+                lstBtn.Add(btnAdd.Name);
+                foreach (BarItem item in barManager1.Items)
+                    if (item is BarLargeButtonItem largeButtonItem)
+                    {
+                        if (lstBtn.Contains(item.Name))
+                            largeButtonItem.Enabled = true;
+                        else
+                            largeButtonItem.Enabled = false;
+                    }
+                return;
+            }
 
-       
+        }
+
+
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
         /// </summary>
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2d69ce2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+## LB_MesClient
+
+钃濆疂PC鍓嶇
+

--
Gitblit v1.9.3