From 03302e55e6a3c830ea310b1ec63e0e2e48985e2e Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期四, 13 十一月 2025 17:34:51 +0800
Subject: [PATCH] 更新

---
 DevApp/Gs.DevApp/UserControl/SelectCgDhMx.Designer.cs     |  444 +++++++
 DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx            |  120 ++
 DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs       |  152 +-
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx         |    2 
 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.cs                 |  152 ++
 DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs           |    5 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs   |    4 
 DevApp/Gs.DevApp/FastReport.Editor.dll                    |    0 
 DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs              |  139 ++
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx        |   83 
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx           |   53 
 DevApp/Gs.DevApp/FastReport.Bars.dll                      |    0 
 DevApp/Gs.DevApp/Program.cs                               |    2 
 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs        |  387 ++++++
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs |  957 +++++++++------
 DevApp/Gs.DevApp/Gs.DevApp.csproj                         |   29 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs  |  556 ++++----
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs                 |  109 +
 README.md                                                 |    4 
 DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.resx               |    0 
 /dev/null                                                 |  107 -
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs    |   42 
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs             |   70 +
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs          |   32 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs           |   35 
 DevApp/Gs.DevApp/FastReport.dll                           |    0 
 26 files changed, 2,538 insertions(+), 946 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..c6aac63 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -1,5 +1,6 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
 using DevExpress.XtraGrid.Views.Grid;
 using Gs.DevApp.DevFrm.Rk;
 using Gs.DevApp.Entity;
@@ -35,6 +36,7 @@
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+            toolBarMenu1.btnRefuseClick += ToolBarMenu1_btnRefuseClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -48,7 +50,11 @@
             }, (value) =>
             {
                 getPageList(this.pageBar1.CurrentPage);
-            }, lbGuid);
+            }, lbGuid, toolBarMenu1
+            , () =>
+            {
+                ucRptCgdhd1.Initialize();
+            });
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             //璁剧疆缁勭粐
@@ -145,6 +151,8 @@
                         MessageBox.Show(ex.Message);
                     }
                 };
+          
+                
                 frm.ShowDialog();
             };
         }
@@ -174,12 +182,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>
@@ -205,7 +218,13 @@
                 lbGuid, txt_billNo, gridView1);
             toolBarMenu1.guidKey = rowGuid;
         }
-
+        private void ToolBarMenu1_btnRefuseClick(object sender, EventArgs e)
+        {
+            string _billNo =  txt_billNo.Text.Trim();
+            var frm = new SelectCgDhMx(_billNo);
+            frm.ShowDialog();
+        }
+        
         private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
         {
             _toolCk("EditModelSubmit");
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/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 8c52b90..d1cc259 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -31,61 +31,61 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesDbck));
-            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 rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            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 editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions13 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject49 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions15 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject57 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject58 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject59 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject60 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions16 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject61 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject62 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject63 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject64 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions17 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject65 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject66 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject67 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject68 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions18 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject69 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject70 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject71 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject72 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.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();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            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();
+            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();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -156,6 +156,7 @@
             this.txt_qt026 = new DevExpress.XtraEditors.CheckEdit();
             this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
             this.btnScdd = new DevExpress.XtraEditors.SimpleButton();
+            this.txt_FSourceOrder = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -182,8 +183,9 @@
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -233,10 +235,15 @@
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.btnTest1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.btnSelect1 = new DevExpress.XtraEditors.SimpleButton();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -278,6 +285,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_FSourceOrder.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
@@ -304,8 +312,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -325,6 +334,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.btnTest1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -336,10 +346,10 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1022, 62);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1460, 97);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -347,10 +357,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 97);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1022, 469);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1460, 737);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -359,8 +370,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1020, 443);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1458, 699);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -369,6 +381,7 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -381,17 +394,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1020, 443);
+            this.split1.Size = new System.Drawing.Size(1458, 699);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1020, 402);
+            this.gcMain1.Size = new System.Drawing.Size(1458, 635);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -401,7 +416,7 @@
             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 = 39;
+            this.gridView1.ColumnPanelRowHeight = 61;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_isWc,
             this.gv_shState,
@@ -436,9 +451,9 @@
             this.gridColumn51,
             this.gridColumn52,
             this.gridColumn53});
-            this.gridView1.DetailHeight = 272;
+            this.gridView1.DetailHeight = 427;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 43;
+            this.gridView1.IndicatorWidth = 61;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -449,341 +464,342 @@
             this.gv_isWc.AppearanceCell.Options.UseFont = true;
             this.gv_isWc.Caption = "瀹岀粨鏍囪瘑 ";
             this.gv_isWc.FieldName = "wjStatus";
-            this.gv_isWc.MinWidth = 22;
+            this.gv_isWc.MinWidth = 31;
             this.gv_isWc.Name = "gv_isWc";
             this.gv_isWc.OptionsColumn.AllowEdit = false;
             this.gv_isWc.Tag = "query_a.is_wc";
             this.gv_isWc.Visible = true;
             this.gv_isWc.VisibleIndex = 0;
-            this.gv_isWc.Width = 43;
+            this.gv_isWc.Width = 61;
             // 
             // gv_shState
             // 
             this.gv_shState.AppearanceCell.Options.UseFont = true;
             this.gv_shState.Caption = "瀹℃牳鐘舵�� ";
             this.gv_shState.FieldName = "chkStatus";
-            this.gv_shState.MinWidth = 22;
+            this.gv_shState.MinWidth = 31;
             this.gv_shState.Name = "gv_shState";
             this.gv_shState.OptionsColumn.AllowEdit = false;
             this.gv_shState.Tag = "query_a.sh_state";
             this.gv_shState.Visible = true;
             this.gv_shState.VisibleIndex = 1;
-            this.gv_shState.Width = 43;
+            this.gv_shState.Width = 61;
             // 
             // gv_billno
             // 
             this.gv_billno.AppearanceCell.Options.UseFont = true;
             this.gv_billno.Caption = "鐢宠鍗曞崟鍙�";
             this.gv_billno.FieldName = "fBillNo";
-            this.gv_billno.MinWidth = 22;
+            this.gv_billno.MinWidth = 31;
             this.gv_billno.Name = "gv_billno";
             this.gv_billno.OptionsColumn.AllowEdit = false;
             this.gv_billno.Tag = "query_a.billno";
             this.gv_billno.Visible = true;
             this.gv_billno.VisibleIndex = 3;
-            this.gv_billno.Width = 87;
+            this.gv_billno.Width = 124;
             // 
             // gridColumn25
             // 
             this.gridColumn25.Caption = "鍗曟嵁鐘舵��";
             this.gridColumn25.FieldName = "fDocumentStatusTxt";
-            this.gridColumn25.MinWidth = 22;
+            this.gridColumn25.MinWidth = 31;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
             this.gridColumn25.VisibleIndex = 4;
-            this.gridColumn25.Width = 82;
+            this.gridColumn25.Width = 117;
             // 
             // gridColumn26
             // 
             this.gridColumn26.Caption = "鐢宠鏃ユ湡";
             this.gridColumn26.FieldName = "fDate";
-            this.gridColumn26.MinWidth = 22;
+            this.gridColumn26.MinWidth = 31;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
             this.gridColumn26.VisibleIndex = 5;
-            this.gridColumn26.Width = 82;
+            this.gridColumn26.Width = 117;
             // 
             // gridColumn27
             // 
             this.gridColumn27.Caption = "鐢宠绫诲瀷";
             this.gridColumn27.FieldName = "fBillTypeID";
-            this.gridColumn27.MinWidth = 22;
+            this.gridColumn27.MinWidth = 31;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
             this.gridColumn27.VisibleIndex = 6;
-            this.gridColumn27.Width = 82;
+            this.gridColumn27.Width = 117;
             // 
             // gridColumn28
             // 
             this.gridColumn28.Caption = "璋冩嫧绫诲瀷";
             this.gridColumn28.FieldName = "ftranstype";
-            this.gridColumn28.MinWidth = 22;
+            this.gridColumn28.MinWidth = 31;
             this.gridColumn28.Name = "gridColumn28";
             this.gridColumn28.Visible = true;
             this.gridColumn28.VisibleIndex = 7;
-            this.gridColumn28.Width = 82;
+            this.gridColumn28.Width = 117;
             // 
             // gridColumn29
             // 
             this.gridColumn29.Caption = "璋冩嫧鏂瑰悜";
             this.gridColumn29.FieldName = "fTransferDirect";
-            this.gridColumn29.MinWidth = 22;
+            this.gridColumn29.MinWidth = 31;
             this.gridColumn29.Name = "gridColumn29";
             this.gridColumn29.Visible = true;
             this.gridColumn29.VisibleIndex = 8;
-            this.gridColumn29.Width = 82;
+            this.gridColumn29.Width = 117;
             // 
             // gridColumn30
             // 
             this.gridColumn30.Caption = "璋冨嚭璐т富绫诲瀷";
             this.gridColumn30.FieldName = "fOwnerTypeIdHead";
-            this.gridColumn30.MinWidth = 22;
+            this.gridColumn30.MinWidth = 31;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
             this.gridColumn30.VisibleIndex = 9;
-            this.gridColumn30.Width = 82;
+            this.gridColumn30.Width = 117;
             // 
             // gridColumn31
             // 
             this.gridColumn31.Caption = "璋冨叆璐т富绫诲瀷";
             this.gridColumn31.FieldName = "fOwnerTypeInIdHead";
-            this.gridColumn31.MinWidth = 22;
+            this.gridColumn31.MinWidth = 31;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 10;
-            this.gridColumn31.Width = 82;
+            this.gridColumn31.Width = 117;
             // 
             // gridColumn32
             // 
             this.gridColumn32.Caption = "澶囨敞";
             this.gridColumn32.FieldName = "fRemarks";
-            this.gridColumn32.MinWidth = 22;
+            this.gridColumn32.MinWidth = 31;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
             this.gridColumn32.VisibleIndex = 11;
-            this.gridColumn32.Width = 82;
+            this.gridColumn32.Width = 117;
             // 
             // gridColumn33
             // 
             this.gridColumn33.Caption = "鍒涘缓浜篒D";
             this.gridColumn33.FieldName = "fCreatorId";
-            this.gridColumn33.MinWidth = 22;
+            this.gridColumn33.MinWidth = 31;
             this.gridColumn33.Name = "gridColumn33";
-            this.gridColumn33.Width = 82;
+            this.gridColumn33.Width = 117;
             // 
             // gridColumn34
             // 
             this.gridColumn34.Caption = "鍒涘缓鏃ユ湡";
             this.gridColumn34.FieldName = "fCreateDate";
-            this.gridColumn34.MinWidth = 22;
+            this.gridColumn34.MinWidth = 31;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.Visible = true;
             this.gridColumn34.VisibleIndex = 12;
-            this.gridColumn34.Width = 82;
+            this.gridColumn34.Width = 117;
             // 
             // gridColumn35
             // 
             this.gridColumn35.Caption = "鏈�鍚庝慨鏀逛汉ID";
             this.gridColumn35.FieldName = "fModifierId";
-            this.gridColumn35.MinWidth = 22;
+            this.gridColumn35.MinWidth = 31;
             this.gridColumn35.Name = "gridColumn35";
-            this.gridColumn35.Width = 82;
+            this.gridColumn35.Width = 117;
             // 
             // gridColumn36
             // 
             this.gridColumn36.Caption = "鏈�鍚庝慨鏀规棩鏈�";
             this.gridColumn36.FieldName = "fModifyDate";
-            this.gridColumn36.MinWidth = 22;
+            this.gridColumn36.MinWidth = 31;
             this.gridColumn36.Name = "gridColumn36";
             this.gridColumn36.Visible = true;
             this.gridColumn36.VisibleIndex = 13;
-            this.gridColumn36.Width = 82;
+            this.gridColumn36.Width = 117;
             // 
             // gridColumn37
             // 
             this.gridColumn37.Caption = "瀹℃牳鏃ユ湡";
             this.gridColumn37.FieldName = "fapprovedate";
-            this.gridColumn37.MinWidth = 22;
+            this.gridColumn37.MinWidth = 31;
             this.gridColumn37.Name = "gridColumn37";
             this.gridColumn37.Visible = true;
             this.gridColumn37.VisibleIndex = 14;
-            this.gridColumn37.Width = 82;
+            this.gridColumn37.Width = 117;
             // 
             // gridColumn38
             // 
             this.gridColumn38.Caption = "瀹℃牳浜�";
             this.gridColumn38.FieldNameSortGroup = "fapproveby";
-            this.gridColumn38.MinWidth = 22;
+            this.gridColumn38.MinWidth = 31;
             this.gridColumn38.Name = "gridColumn38";
             this.gridColumn38.Visible = true;
             this.gridColumn38.VisibleIndex = 15;
-            this.gridColumn38.Width = 82;
+            this.gridColumn38.Width = 117;
             // 
             // gridColumn39
             // 
             this.gridColumn39.Caption = "鍏抽棴鐘舵��";
             this.gridColumn39.FieldName = "fCloseStatusTxt";
-            this.gridColumn39.MinWidth = 22;
+            this.gridColumn39.MinWidth = 31;
             this.gridColumn39.Name = "gridColumn39";
             this.gridColumn39.Visible = true;
             this.gridColumn39.VisibleIndex = 18;
-            this.gridColumn39.Width = 82;
+            this.gridColumn39.Width = 117;
             // 
             // gridColumn40
             // 
             this.gridColumn40.Caption = "鍏抽棴浜�";
             this.gridColumn40.FieldNameSortGroup = "fCloserId";
-            this.gridColumn40.MinWidth = 22;
+            this.gridColumn40.MinWidth = 31;
             this.gridColumn40.Name = "gridColumn40";
-            this.gridColumn40.Width = 82;
+            this.gridColumn40.Width = 117;
             // 
             // gridColumn41
             // 
             this.gridColumn41.Caption = "鍏抽棴鏃ユ湡";
             this.gridColumn41.FieldNameSortGroup = "fCloseDate";
-            this.gridColumn41.MinWidth = 22;
+            this.gridColumn41.MinWidth = 31;
             this.gridColumn41.Name = "gridColumn41";
-            this.gridColumn41.Width = 82;
+            this.gridColumn41.Width = 117;
             // 
             // gridColumn42
             // 
             this.gridColumn42.Caption = "BOM鐗堟湰";
             this.gridColumn42.FieldNameSortGroup = "fUnwBaseBombb";
-            this.gridColumn42.MinWidth = 22;
+            this.gridColumn42.MinWidth = 31;
             this.gridColumn42.Name = "gridColumn42";
-            this.gridColumn42.Width = 82;
+            this.gridColumn42.Width = 117;
             // 
             // gridColumn43
             // 
             this.gridColumn43.Caption = "鐖堕」鐗╂枡缂栧彿";
             this.gridColumn43.FieldNameSortGroup = "fUnwBaseFxwlbm";
-            this.gridColumn43.MinWidth = 22;
+            this.gridColumn43.MinWidth = 31;
             this.gridColumn43.Name = "gridColumn43";
-            this.gridColumn43.Width = 82;
+            this.gridColumn43.Width = 117;
             // 
             // gridColumn44
             // 
             this.gridColumn44.Caption = "鐢宠缁勭粐ID";
             this.gridColumn44.FieldName = "fapporgid";
-            this.gridColumn44.MinWidth = 22;
+            this.gridColumn44.MinWidth = 31;
             this.gridColumn44.Name = "gridColumn44";
-            this.gridColumn44.Width = 82;
+            this.gridColumn44.Width = 117;
             // 
             // gridColumn45
             // 
             this.gridColumn45.Caption = "涓氬姟绫诲瀷";
             this.gridColumn45.FieldName = "fBusinessType";
-            this.gridColumn45.MinWidth = 22;
+            this.gridColumn45.MinWidth = 31;
             this.gridColumn45.Name = "gridColumn45";
             this.gridColumn45.Visible = true;
             this.gridColumn45.VisibleIndex = 19;
-            this.gridColumn45.Width = 82;
+            this.gridColumn45.Width = 117;
             // 
             // gridColumn46
             // 
             this.gridColumn46.Caption = "鍒涘缓浜�";
             this.gridColumn46.FieldName = "fCreatorName";
-            this.gridColumn46.MinWidth = 22;
+            this.gridColumn46.MinWidth = 31;
             this.gridColumn46.Name = "gridColumn46";
             this.gridColumn46.Visible = true;
             this.gridColumn46.VisibleIndex = 20;
-            this.gridColumn46.Width = 82;
+            this.gridColumn46.Width = 117;
             // 
             // gridColumn47
             // 
             this.gridColumn47.Caption = "鐢宠缁勭粐";
             this.gridColumn47.FieldName = "fapporgName";
-            this.gridColumn47.MinWidth = 22;
+            this.gridColumn47.MinWidth = 31;
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.Visible = true;
             this.gridColumn47.VisibleIndex = 21;
-            this.gridColumn47.Width = 82;
+            this.gridColumn47.Width = 117;
             // 
             // gridColumn48
             // 
             this.gridColumn48.Caption = "鏈�鍚庝慨鏀逛汉";
             this.gridColumn48.FieldName = "fModifierName";
-            this.gridColumn48.MinWidth = 22;
+            this.gridColumn48.MinWidth = 31;
             this.gridColumn48.Name = "gridColumn48";
             this.gridColumn48.Visible = true;
             this.gridColumn48.VisibleIndex = 22;
-            this.gridColumn48.Width = 82;
+            this.gridColumn48.Width = 117;
             // 
             // gridColumn49
             // 
             this.gridColumn49.Caption = "鍗曟嵁绫诲瀷";
             this.gridColumn49.FieldName = "djtype";
-            this.gridColumn49.MinWidth = 22;
+            this.gridColumn49.MinWidth = 31;
             this.gridColumn49.Name = "gridColumn49";
             this.gridColumn49.Visible = true;
             this.gridColumn49.VisibleIndex = 23;
-            this.gridColumn49.Width = 82;
+            this.gridColumn49.Width = 117;
             // 
             // gridColumn50
             // 
             this.gridColumn50.Caption = "鏉ユ簮";
             this.gridColumn50.FieldName = "source";
-            this.gridColumn50.MinWidth = 22;
+            this.gridColumn50.MinWidth = 31;
             this.gridColumn50.Name = "gridColumn50";
             this.gridColumn50.Visible = true;
             this.gridColumn50.VisibleIndex = 24;
-            this.gridColumn50.Width = 82;
+            this.gridColumn50.Width = 117;
             // 
             // gv_id
             // 
             this.gv_id.Caption = "涓婚敭GUID";
             this.gv_id.FieldName = "id";
-            this.gv_id.MinWidth = 22;
+            this.gv_id.MinWidth = 31;
             this.gv_id.Name = "gv_id";
-            this.gv_id.Width = 82;
+            this.gv_id.Width = 117;
             // 
             // gridColumn51
             // 
             this.gridColumn51.Caption = "鍞悗瀹℃牳";
             this.gridColumn51.FieldName = "qt026Chk";
-            this.gridColumn51.MinWidth = 22;
+            this.gridColumn51.MinWidth = 31;
             this.gridColumn51.Name = "gridColumn51";
             this.gridColumn51.Visible = true;
             this.gridColumn51.VisibleIndex = 2;
-            this.gridColumn51.Width = 82;
+            this.gridColumn51.Width = 117;
             // 
             // gridColumn52
             // 
             this.gridColumn52.Caption = "鍞悗瀹℃牳浜�";
             this.gridColumn52.FieldName = "qt028";
-            this.gridColumn52.MinWidth = 22;
+            this.gridColumn52.MinWidth = 31;
             this.gridColumn52.Name = "gridColumn52";
             this.gridColumn52.Visible = true;
             this.gridColumn52.VisibleIndex = 16;
-            this.gridColumn52.Width = 82;
+            this.gridColumn52.Width = 117;
             // 
             // gridColumn53
             // 
             this.gridColumn53.Caption = "鍞悗瀹℃牳鏃堕棿";
             this.gridColumn53.FieldName = "qt027";
-            this.gridColumn53.MinWidth = 22;
+            this.gridColumn53.MinWidth = 31;
             this.gridColumn53.Name = "gridColumn53";
             this.gridColumn53.Visible = true;
             this.gridColumn53.VisibleIndex = 17;
-            this.gridColumn53.Width = 82;
+            this.gridColumn53.Width = 117;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 402);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.pageBar1.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1020, 31);
+            this.pageBar1.Size = new System.Drawing.Size(1458, 49);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.splitMx1);
+            this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1020, 443);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1458, 699);
             this.xtraTabPage3.Text = "鏁版嵁璇︽儏";
             // 
             // splitMx1
@@ -791,6 +807,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -803,8 +820,8 @@
             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(1020, 443);
-            this.splitMx1.SplitterPosition = 193;
+            this.splitMx1.Size = new System.Drawing.Size(1458, 699);
+            this.splitMx1.SplitterPosition = 310;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -836,6 +853,7 @@
             this.layoutMx1.Controls.Add(this.txt_qt026);
             this.layoutMx1.Controls.Add(this.btnSelect);
             this.layoutMx1.Controls.Add(this.btnScdd);
+            this.layoutMx1.Controls.Add(this.txt_FSourceOrder);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem16,
@@ -844,19 +862,21 @@
             this.layoutControlItem25,
             this.layoutControlItem29});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(576, 777, 1060, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1020, 193);
+            this.layoutMx1.Size = new System.Drawing.Size(1458, 310);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // btnCopyXls
             // 
             this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
-            this.btnCopyXls.Location = new System.Drawing.Point(12, 157);
+            this.btnCopyXls.Location = new System.Drawing.Point(12, 252);
+            this.btnCopyXls.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnCopyXls.Name = "btnCopyXls";
-            this.btnCopyXls.Size = new System.Drawing.Size(101, 20);
+            this.btnCopyXls.Size = new System.Drawing.Size(146, 34);
             this.btnCopyXls.StyleController = this.layoutMx1;
             this.btnCopyXls.TabIndex = 445;
             this.btnCopyXls.Text = "蹇嵎褰曞叆";
@@ -864,7 +884,8 @@
             // txt_djtype
             // 
             this.txt_djtype.EditValue = "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)";
-            this.txt_djtype.Location = new System.Drawing.Point(341, 128);
+            this.txt_djtype.Location = new System.Drawing.Point(491, 204);
+            this.txt_djtype.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_djtype.Name = "txt_djtype";
             this.txt_djtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -873,32 +894,35 @@
             "濮斿鐩存帴璋冩嫧鍗�(WWDB01_SYS)"});
             this.txt_djtype.Properties.ReadOnly = true;
             this.txt_djtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_djtype.Size = new System.Drawing.Size(158, 20);
+            this.txt_djtype.Size = new System.Drawing.Size(235, 28);
             this.txt_djtype.StyleController = this.layoutMx1;
             this.txt_djtype.TabIndex = 391;
             this.txt_djtype.Tag = "readonly";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(735, 95);
+            this.lbGuid.Location = new System.Drawing.Point(1050, 149);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(239, 25);
+            this.lbGuid.Size = new System.Drawing.Size(341, 39);
             this.lbGuid.TabIndex = 389;
             this.lbGuid.Text = "lbGuid";
             // 
             // txt_fRemarks
             // 
-            this.txt_fRemarks.Location = new System.Drawing.Point(96, 128);
+            this.txt_fRemarks.Location = new System.Drawing.Point(132, 204);
+            this.txt_fRemarks.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fRemarks.Name = "txt_fRemarks";
             this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_fRemarks.Size = new System.Drawing.Size(157, 20);
+            this.txt_fRemarks.Size = new System.Drawing.Size(235, 28);
             this.txt_fRemarks.StyleController = this.layoutMx1;
             this.txt_fRemarks.TabIndex = 371;
             // 
             // txt_fOwnerTypeInIdHead
             // 
             this.txt_fOwnerTypeInIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
-            this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(341, 99);
+            this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(491, 156);
+            this.txt_fOwnerTypeInIdHead.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
             this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -907,16 +931,17 @@
             "渚涘簲鍟�(BD_Supplier)",
             "瀹㈡埛(BD_Customer)"});
             this.txt_fOwnerTypeInIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(158, 20);
+            this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(235, 28);
             this.txt_fOwnerTypeInIdHead.StyleController = this.layoutMx1;
             this.txt_fOwnerTypeInIdHead.TabIndex = 382;
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(587, 41);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(850, 60);
+            this.txt_fCreateDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fCreateDate.Name = "txt_fCreateDate";
             this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreateDate.Size = new System.Drawing.Size(158, 20);
+            this.txt_fCreateDate.Size = new System.Drawing.Size(235, 28);
             this.txt_fCreateDate.StyleController = this.layoutMx1;
             this.txt_fCreateDate.TabIndex = 386;
             this.txt_fCreateDate.Tag = "readonly";
@@ -924,7 +949,8 @@
             // txt_fOwnerTypeIdHead
             // 
             this.txt_fOwnerTypeIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
-            this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(341, 70);
+            this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(491, 108);
+            this.txt_fOwnerTypeIdHead.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
             this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -933,14 +959,15 @@
             "渚涘簲鍟�(BD_Supplier)",
             "瀹㈡埛(BD_Customer)"});
             this.txt_fOwnerTypeIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(158, 20);
+            this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(235, 28);
             this.txt_fOwnerTypeIdHead.StyleController = this.layoutMx1;
             this.txt_fOwnerTypeIdHead.TabIndex = 380;
             // 
             // txt_fBusinessType
             // 
             this.txt_fBusinessType.EditValue = "鏍囧噯(NORMAL)";
-            this.txt_fBusinessType.Location = new System.Drawing.Point(96, 70);
+            this.txt_fBusinessType.Location = new System.Drawing.Point(132, 108);
+            this.txt_fBusinessType.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fBusinessType.Name = "txt_fBusinessType";
             this.txt_fBusinessType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -950,43 +977,45 @@
             this.txt_fBusinessType.Properties.ReadOnly = true;
             this.txt_fBusinessType.Properties.Tag = "readonly";
             this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fBusinessType.Size = new System.Drawing.Size(157, 20);
+            this.txt_fBusinessType.Size = new System.Drawing.Size(235, 28);
             this.txt_fBusinessType.StyleController = this.layoutMx1;
             this.txt_fBusinessType.TabIndex = 374;
             this.txt_fBusinessType.Tag = "readonly";
             // 
             // txt_fTransferDirect
             // 
-            this.txt_fTransferDirect.EditValue = "-璇烽�夋嫨-";
-            this.txt_fTransferDirect.Location = new System.Drawing.Point(96, 99);
+            this.txt_fTransferDirect.EditValue = "鏅��(GENERAL)";
+            this.txt_fTransferDirect.Location = new System.Drawing.Point(132, 156);
+            this.txt_fTransferDirect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fTransferDirect.Name = "txt_fTransferDirect";
             this.txt_fTransferDirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_fTransferDirect.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
-            "閫�璐�(RETURN)",
-            "鏅��(GENERAL)"});
+            "鏅��(GENERAL)",
+            "閫�璐�(RETURN)"});
             this.txt_fTransferDirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fTransferDirect.Size = new System.Drawing.Size(157, 20);
+            this.txt_fTransferDirect.Size = new System.Drawing.Size(235, 28);
             this.txt_fTransferDirect.StyleController = this.layoutMx1;
             this.txt_fTransferDirect.TabIndex = 362;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(587, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(850, 12);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(158, 20);
+            this.txt_createBy.Size = new System.Drawing.Size(235, 28);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 384;
             this.txt_createBy.Tag = "readonly";
             // 
             // txt_fBillNo
             // 
-            this.txt_fBillNo.Location = new System.Drawing.Point(96, 12);
+            this.txt_fBillNo.Location = new System.Drawing.Point(132, 12);
+            this.txt_fBillNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fBillNo.Name = "txt_fBillNo";
             this.txt_fBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_fBillNo.Size = new System.Drawing.Size(157, 20);
+            this.txt_fBillNo.Size = new System.Drawing.Size(235, 28);
             this.txt_fBillNo.StyleController = this.layoutMx1;
             this.txt_fBillNo.TabIndex = 327;
             this.txt_fBillNo.Tag = "readonly";
@@ -994,7 +1023,8 @@
             // txt_ftranstype
             // 
             this.txt_ftranstype.EditValue = "缁勭粐鍐呰皟鎷�(InnerOrgTransfer)";
-            this.txt_ftranstype.Location = new System.Drawing.Point(341, 41);
+            this.txt_ftranstype.Location = new System.Drawing.Point(491, 60);
+            this.txt_ftranstype.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_ftranstype.Name = "txt_ftranstype";
             this.txt_ftranstype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1002,23 +1032,24 @@
             "缁勭粐鍐呰皟鎷�(InnerOrgTransfer)",
             "璺ㄧ粍缁囪皟鎷�(OverOrgTransfer)"});
             this.txt_ftranstype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_ftranstype.Size = new System.Drawing.Size(158, 20);
+            this.txt_ftranstype.Size = new System.Drawing.Size(235, 28);
             this.txt_ftranstype.StyleController = this.layoutMx1;
             this.txt_ftranstype.TabIndex = 378;
             // 
             // txt_fapporgid
             // 
             this.txt_fapporgid.IsReadly = false;
-            this.txt_fapporgid.Location = new System.Drawing.Point(341, 12);
-            this.txt_fapporgid.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.txt_fapporgid.Location = new System.Drawing.Point(491, 12);
+            this.txt_fapporgid.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.txt_fapporgid.Name = "txt_fapporgid";
-            this.txt_fapporgid.Size = new System.Drawing.Size(158, 20);
+            this.txt_fapporgid.Size = new System.Drawing.Size(235, 28);
             this.txt_fapporgid.TabIndex = 376;
             // 
             // txt_fBillTypeID
             // 
             this.txt_fBillTypeID.EditValue = "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)";
-            this.txt_fBillTypeID.Location = new System.Drawing.Point(96, 41);
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(132, 60);
+            this.txt_fBillTypeID.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fBillTypeID.Name = "txt_fBillTypeID";
             this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1028,110 +1059,121 @@
             this.txt_fBillTypeID.Properties.SuppressMouseEventOnOuterMouseClick = true;
             this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.txt_fBillTypeID.Properties.EditValueChanged += new System.EventHandler(this.txt_fBillTypeID_EditValueChanged);
-            this.txt_fBillTypeID.Size = new System.Drawing.Size(157, 20);
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(235, 28);
             this.txt_fBillTypeID.StyleController = this.layoutMx1;
             this.txt_fBillTypeID.TabIndex = 361;
             // 
             // txt_chkBy
             // 
-            this.txt_chkBy.Location = new System.Drawing.Point(833, 12);
+            this.txt_chkBy.Location = new System.Drawing.Point(1209, 12);
+            this.txt_chkBy.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_chkBy.Name = "txt_chkBy";
             this.txt_chkBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_chkBy.Size = new System.Drawing.Size(158, 20);
+            this.txt_chkBy.Size = new System.Drawing.Size(237, 28);
             this.txt_chkBy.StyleController = this.layoutMx1;
             this.txt_chkBy.TabIndex = 258;
             this.txt_chkBy.Tag = "readonly";
             // 
             // txt_fapprovedate
             // 
-            this.txt_fapprovedate.Location = new System.Drawing.Point(833, 41);
+            this.txt_fapprovedate.Location = new System.Drawing.Point(1209, 60);
+            this.txt_fapprovedate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fapprovedate.Name = "txt_fapprovedate";
             this.txt_fapprovedate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fapprovedate.Size = new System.Drawing.Size(158, 20);
+            this.txt_fapprovedate.Size = new System.Drawing.Size(237, 28);
             this.txt_fapprovedate.StyleController = this.layoutMx1;
             this.txt_fapprovedate.TabIndex = 262;
             this.txt_fapprovedate.Tag = "readonly";
             // 
             // txt_wjStatus
             // 
-            this.txt_wjStatus.Location = new System.Drawing.Point(749, 128);
+            this.txt_wjStatus.Location = new System.Drawing.Point(1089, 204);
+            this.txt_wjStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_wjStatus.Name = "txt_wjStatus";
             this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
-            this.txt_wjStatus.Size = new System.Drawing.Size(242, 20);
+            this.txt_wjStatus.Size = new System.Drawing.Size(357, 27);
             this.txt_wjStatus.StyleController = this.layoutMx1;
             this.txt_wjStatus.TabIndex = 387;
             this.txt_wjStatus.Tag = "readonly";
             // 
             // txt_chkStatus
             // 
-            this.txt_chkStatus.Location = new System.Drawing.Point(749, 70);
+            this.txt_chkStatus.Location = new System.Drawing.Point(1089, 108);
+            this.txt_chkStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_chkStatus.Name = "txt_chkStatus";
             this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_chkStatus.Size = new System.Drawing.Size(242, 20);
+            this.txt_chkStatus.Size = new System.Drawing.Size(357, 27);
             this.txt_chkStatus.StyleController = this.layoutMx1;
             this.txt_chkStatus.TabIndex = 388;
             this.txt_chkStatus.Tag = "readonly";
             // 
             // txt_source
             // 
-            this.txt_source.Location = new System.Drawing.Point(587, 128);
+            this.txt_source.Location = new System.Drawing.Point(850, 204);
+            this.txt_source.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_source.Name = "txt_source";
-            this.txt_source.Size = new System.Drawing.Size(158, 20);
+            this.txt_source.Size = new System.Drawing.Size(235, 28);
             this.txt_source.StyleController = this.layoutMx1;
             this.txt_source.TabIndex = 390;
             this.txt_source.Tag = "readonly";
             // 
             // txt_fCloserId
             // 
-            this.txt_fCloserId.Location = new System.Drawing.Point(587, 99);
+            this.txt_fCloserId.Location = new System.Drawing.Point(850, 156);
+            this.txt_fCloserId.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fCloserId.Name = "txt_fCloserId";
-            this.txt_fCloserId.Size = new System.Drawing.Size(158, 20);
+            this.txt_fCloserId.Size = new System.Drawing.Size(235, 28);
             this.txt_fCloserId.StyleController = this.layoutMx1;
             this.txt_fCloserId.TabIndex = 392;
             this.txt_fCloserId.Tag = "readonly";
             // 
             // txt_fCloseDate
             // 
-            this.txt_fCloseDate.Location = new System.Drawing.Point(833, 99);
+            this.txt_fCloseDate.Location = new System.Drawing.Point(1209, 156);
+            this.txt_fCloseDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fCloseDate.Name = "txt_fCloseDate";
-            this.txt_fCloseDate.Size = new System.Drawing.Size(158, 20);
+            this.txt_fCloseDate.Size = new System.Drawing.Size(237, 28);
             this.txt_fCloseDate.StyleController = this.layoutMx1;
             this.txt_fCloseDate.TabIndex = 393;
             this.txt_fCloseDate.Tag = "readonly";
             // 
             // txt_fCloseStatusTxt
             // 
-            this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(587, 70);
+            this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(850, 108);
+            this.txt_fCloseStatusTxt.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_fCloseStatusTxt.Name = "txt_fCloseStatusTxt";
-            this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(158, 20);
+            this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(235, 28);
             this.txt_fCloseStatusTxt.StyleController = this.layoutMx1;
             this.txt_fCloseStatusTxt.TabIndex = 394;
             this.txt_fCloseStatusTxt.Tag = "readonly";
             // 
             // txt_qt028
             // 
-            this.txt_qt028.Location = new System.Drawing.Point(808, 81);
+            this.txt_qt028.Location = new System.Drawing.Point(1154, 127);
+            this.txt_qt028.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_qt028.Name = "txt_qt028";
-            this.txt_qt028.Size = new System.Drawing.Size(150, 20);
+            this.txt_qt028.Size = new System.Drawing.Size(214, 28);
             this.txt_qt028.StyleController = this.layoutMx1;
             this.txt_qt028.TabIndex = 395;
             this.txt_qt028.Tag = "readonly";
             // 
             // txt_qt027
             // 
-            this.txt_qt027.Location = new System.Drawing.Point(808, 106);
+            this.txt_qt027.Location = new System.Drawing.Point(1154, 167);
+            this.txt_qt027.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_qt027.Name = "txt_qt027";
-            this.txt_qt027.Size = new System.Drawing.Size(150, 20);
+            this.txt_qt027.Size = new System.Drawing.Size(214, 28);
             this.txt_qt027.StyleController = this.layoutMx1;
             this.txt_qt027.TabIndex = 396;
             this.txt_qt027.Tag = "readonly";
             // 
             // txt_qt026
             // 
-            this.txt_qt026.Location = new System.Drawing.Point(749, 119);
+            this.txt_qt026.Location = new System.Drawing.Point(1070, 187);
+            this.txt_qt026.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_qt026.Name = "txt_qt026";
             this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鐘舵��";
-            this.txt_qt026.Size = new System.Drawing.Size(244, 20);
+            this.txt_qt026.Size = new System.Drawing.Size(349, 27);
             this.txt_qt026.StyleController = this.layoutMx1;
             this.txt_qt026.TabIndex = 397;
             this.txt_qt026.Tag = "readonly";
@@ -1139,9 +1181,10 @@
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSelect.ImageOptions.Image")));
-            this.btnSelect.Location = new System.Drawing.Point(257, 157);
+            this.btnSelect.Location = new System.Drawing.Point(371, 252);
+            this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(143, 25);
+            this.btnSelect.Size = new System.Drawing.Size(206, 42);
             this.btnSelect.StyleController = this.layoutMx1;
             this.btnSelect.TabIndex = 445;
             this.btnSelect.Text = "閫夋嫨鐢熶骇/濮斿鍗曟嵁";
@@ -1149,12 +1192,24 @@
             // btnScdd
             // 
             this.btnScdd.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnScdd.ImageOptions.Image")));
-            this.btnScdd.Location = new System.Drawing.Point(511, 157);
+            this.btnScdd.Location = new System.Drawing.Point(730, 247);
+            this.btnScdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnScdd.Name = "btnScdd";
-            this.btnScdd.Size = new System.Drawing.Size(128, 27);
+            this.btnScdd.Size = new System.Drawing.Size(183, 42);
             this.btnScdd.StyleController = this.layoutMx1;
             this.btnScdd.TabIndex = 445;
             this.btnScdd.Text = "閫夋嫨璁㈠崟";
+            // 
+            // txt_FSourceOrder
+            // 
+            this.txt_FSourceOrder.Location = new System.Drawing.Point(850, 252);
+            this.txt_FSourceOrder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.txt_FSourceOrder.Name = "txt_FSourceOrder";
+            this.txt_FSourceOrder.Properties.ReadOnly = true;
+            this.txt_FSourceOrder.Size = new System.Drawing.Size(235, 28);
+            this.txt_FSourceOrder.StyleController = this.layoutMx1;
+            this.txt_FSourceOrder.TabIndex = 390;
+            this.txt_FSourceOrder.Tag = "readonly";
             // 
             // layoutControlItem16
             // 
@@ -1177,7 +1232,7 @@
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem23.Size = new System.Drawing.Size(341, 38);
             this.layoutControlItem23.Text = "鍞悗瀹℃牳浜哄憳";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(78, 14);
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(111, 0);
             // 
             // layoutControlItem24
             // 
@@ -1188,7 +1243,7 @@
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem24.Size = new System.Drawing.Size(341, 38);
             this.layoutControlItem24.Text = "鍞悗瀹℃牳鏃堕棿";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(78, 14);
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(111, 22);
             // 
             // layoutControlItem25
             // 
@@ -1208,8 +1263,8 @@
             this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem29.CustomizationFormText = "蹇嵎褰曞叆";
             this.layoutControlItem29.Location = new System.Drawing.Point(718, 235);
-            this.layoutControlItem29.MaxSize = new System.Drawing.Size(131, 29);
-            this.layoutControlItem29.MinSize = new System.Drawing.Size(98, 29);
+            this.layoutControlItem29.MaxSize = new System.Drawing.Size(187, 46);
+            this.layoutControlItem29.MinSize = new System.Drawing.Size(140, 46);
             this.layoutControlItem29.Name = "layoutControlItem29";
             this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 5;
@@ -1244,190 +1299,191 @@
             this.layoutControlItem21,
             this.layoutControlItem17,
             this.layoutControlItem11,
-            this.layoutControlItem1,
-            this.layoutControlItem27});
+            this.layoutControlItem27,
+            this.layoutControlItem30,
+            this.layoutControlItem1});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            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;
+            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[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            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;
+            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[] {
-            rowDefinition7,
-            rowDefinition8,
-            rowDefinition9,
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12});
-            this.Root.Size = new System.Drawing.Size(1003, 194);
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
+            this.Root.Size = new System.Drawing.Size(1458, 310);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_fapporgid;
-            this.layoutControlItem2.Location = new System.Drawing.Point(245, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(359, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem2.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem2.Text = "鐢宠缁勭粐";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_createBy;
-            this.layoutControlItem3.Location = new System.Drawing.Point(491, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(718, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem3.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem3.Text = "鐢宠浜哄憳";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_fBillTypeID;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 29);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(245, 29);
+            this.layoutControlItem4.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem4.Text = "鐢宠绫诲瀷";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_ftranstype;
-            this.layoutControlItem5.Location = new System.Drawing.Point(245, 29);
+            this.layoutControlItem5.Location = new System.Drawing.Point(359, 48);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem5.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem5.Text = "璋冩嫧绫诲瀷 ";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_fCreateDate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(491, 29);
+            this.layoutControlItem6.Location = new System.Drawing.Point(718, 48);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem6.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem6.Text = "鐢宠鏃堕棿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_fBusinessType;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 58);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(245, 29);
+            this.layoutControlItem7.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_fOwnerTypeIdHead;
-            this.layoutControlItem8.Location = new System.Drawing.Point(245, 58);
+            this.layoutControlItem8.Location = new System.Drawing.Point(359, 96);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem8.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem8.Text = "璋冨嚭璐т富绫诲瀷";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_chkBy;
-            this.layoutControlItem9.Location = new System.Drawing.Point(737, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(1077, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem9.Size = new System.Drawing.Size(361, 48);
             this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fapprovedate;
-            this.layoutControlItem10.Location = new System.Drawing.Point(737, 29);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1077, 48);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem10.Size = new System.Drawing.Size(361, 48);
             this.layoutControlItem10.Tag = "readonly";
             this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_fTransferDirect;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 87);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 144);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(245, 29);
+            this.layoutControlItem13.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem13.Text = "璋冩嫧鏂瑰悜";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_fOwnerTypeInIdHead;
-            this.layoutControlItem14.Location = new System.Drawing.Point(245, 87);
+            this.layoutControlItem14.Location = new System.Drawing.Point(359, 144);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem14.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem14.Text = "璋冨叆璐т富绫诲瀷";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_djtype;
-            this.layoutControlItem19.Location = new System.Drawing.Point(245, 116);
+            this.layoutControlItem19.Location = new System.Drawing.Point(359, 192);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem19.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem19.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem19.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_fRemarks;
-            this.layoutControlItem15.Location = new System.Drawing.Point(0, 116);
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 192);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem15.Size = new System.Drawing.Size(245, 29);
+            this.layoutControlItem15.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem15.Text = "鐢宠澶囨敞";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_chkStatus;
-            this.layoutControlItem12.Location = new System.Drawing.Point(737, 58);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1077, 96);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem12.Size = new System.Drawing.Size(361, 48);
             this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -1435,23 +1491,23 @@
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.txt_fCloseStatusTxt;
-            this.layoutControlItem22.Location = new System.Drawing.Point(491, 58);
+            this.layoutControlItem22.Location = new System.Drawing.Point(718, 96);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem22.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem22.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem22.Text = "鍏抽棴鐘舵��";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem26
             // 
             this.layoutControlItem26.Control = this.btnCopyXls;
-            this.layoutControlItem26.Location = new System.Drawing.Point(0, 145);
-            this.layoutControlItem26.MaxSize = new System.Drawing.Size(105, 24);
-            this.layoutControlItem26.MinSize = new System.Drawing.Size(78, 24);
+            this.layoutControlItem26.Location = new System.Drawing.Point(0, 240);
+            this.layoutControlItem26.MaxSize = new System.Drawing.Size(150, 38);
+            this.layoutControlItem26.MinSize = new System.Drawing.Size(111, 38);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem26.Size = new System.Drawing.Size(245, 29);
+            this.layoutControlItem26.Size = new System.Drawing.Size(359, 50);
             this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem26.Text = "蹇嵎褰曞叆";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
@@ -1460,81 +1516,95 @@
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_fCloserId;
-            this.layoutControlItem20.Location = new System.Drawing.Point(491, 87);
+            this.layoutControlItem20.Location = new System.Drawing.Point(718, 144);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem20.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem20.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem20.Text = "鍏抽棴浜哄憳";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_fCloseDate;
-            this.layoutControlItem21.Location = new System.Drawing.Point(737, 87);
+            this.layoutControlItem21.Location = new System.Drawing.Point(1077, 144);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem21.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem21.Size = new System.Drawing.Size(361, 48);
             this.layoutControlItem21.Text = "鍏抽棴鏃堕棿";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_source;
-            this.layoutControlItem17.Location = new System.Drawing.Point(491, 116);
+            this.layoutControlItem17.Location = new System.Drawing.Point(718, 192);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem17.Size = new System.Drawing.Size(359, 48);
             this.layoutControlItem17.Text = "婧愬崟绫诲瀷";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_wjStatus;
-            this.layoutControlItem11.Location = new System.Drawing.Point(737, 116);
+            this.layoutControlItem11.Location = new System.Drawing.Point(1077, 192);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem11.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem11.Size = new System.Drawing.Size(361, 48);
             this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_fBillNo;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(245, 29);
-            this.layoutControlItem1.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.btnSelect;
             this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem27.CustomizationFormText = "蹇嵎褰曞叆";
-            this.layoutControlItem27.Location = new System.Drawing.Point(245, 145);
-            this.layoutControlItem27.MaxSize = new System.Drawing.Size(147, 29);
-            this.layoutControlItem27.MinSize = new System.Drawing.Size(98, 29);
+            this.layoutControlItem27.Location = new System.Drawing.Point(359, 240);
+            this.layoutControlItem27.MaxSize = new System.Drawing.Size(210, 46);
+            this.layoutControlItem27.MinSize = new System.Drawing.Size(140, 46);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem27.Size = new System.Drawing.Size(246, 29);
+            this.layoutControlItem27.Size = new System.Drawing.Size(359, 50);
             this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem27.Text = "閫夋嫨鐢熶骇璁㈠崟";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem27.TextVisible = false;
             // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_FSourceOrder;
+            this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem30.CustomizationFormText = "宸ュ崟鍗曞彿";
+            this.layoutControlItem30.Location = new System.Drawing.Point(718, 240);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem30.Size = new System.Drawing.Size(359, 50);
+            this.layoutControlItem30.Text = "宸ュ崟鍗曞彿";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_fBillNo;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(359, 48);
+            this.layoutControlItem1.Text = "鐢宠鍗曞彿";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
+            // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1020, 240);
+            this.tabMx.Size = new System.Drawing.Size(1458, 374);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1542,15 +1612,18 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1018, 214);
+            this.tabMxPage1.Size = new System.Drawing.Size(1456, 336);
             this.tabMxPage1.Text = "璋冩嫧鐢宠鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemSearchLookUpEdit1,
@@ -1564,7 +1637,7 @@
             this.rptDrHz,
             this.rptDcHz,
             this.btnTest1});
-            this.gcMx1.Size = new System.Drawing.Size(1018, 214);
+            this.gcMx1.Size = new System.Drawing.Size(1456, 336);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1599,8 +1672,11 @@
             this.gridColumn19,
             this.gridColumn20,
             this.gridColumn21,
-            this.gridColumn22});
-            this.gvMx1.DetailHeight = 272;
+            this.gridColumn22,
+            this.gridColumn54,
+            this.gridColumn55,
+            this.gridColumn56});
+            this.gvMx1.DetailHeight = 427;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1613,22 +1689,22 @@
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
             this.gvMx1id.Caption = "ID";
             this.gvMx1id.FieldName = "id";
-            this.gvMx1id.MinWidth = 43;
+            this.gvMx1id.MinWidth = 61;
             this.gvMx1id.Name = "gvMx1id";
             this.gvMx1id.OptionsColumn.ReadOnly = true;
             this.gvMx1id.Tag = "query_a.id";
-            this.gvMx1id.Width = 82;
+            this.gvMx1id.Width = 117;
             // 
             // gvMx1mid
             // 
             this.gvMx1mid.AppearanceCell.Options.UseFont = true;
             this.gvMx1mid.Caption = "MID";
             this.gvMx1mid.FieldName = "pid";
-            this.gvMx1mid.MinWidth = 43;
+            this.gvMx1mid.MinWidth = 61;
             this.gvMx1mid.Name = "gvMx1mid";
             this.gvMx1mid.OptionsColumn.ReadOnly = true;
             this.gvMx1mid.Tag = "query_a.mid";
-            this.gvMx1mid.Width = 82;
+            this.gvMx1mid.Width = 117;
             // 
             // gvMx1bld012
             // 
@@ -1639,12 +1715,12 @@
             this.gvMx1bld012.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1bld012.Caption = "璇烽�夋嫨";
             this.gvMx1bld012.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
-            this.gvMx1bld012.MinWidth = 43;
+            this.gvMx1bld012.MinWidth = 61;
             this.gvMx1bld012.Name = "gvMx1bld012";
             this.gvMx1bld012.Tag = "edit";
             this.gvMx1bld012.Visible = true;
             this.gvMx1bld012.VisibleIndex = 0;
-            this.gvMx1bld012.Width = 82;
+            this.gvMx1bld012.Width = 117;
             // 
             // repositoryItemSearchLookUpEdit1
             // 
@@ -1667,7 +1743,7 @@
             this.gridColumn5,
             this.gridColumn7,
             this.gridColumn6});
-            this.gridView2.DetailHeight = 272;
+            this.gridView2.DetailHeight = 427;
             this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
             this.gridView2.Name = "gridView2";
             this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1677,100 +1753,100 @@
             // 
             this.gridColumn2.Caption = "鐗╂枡ID";
             this.gridColumn2.FieldName = "id";
-            this.gridColumn2.MinWidth = 17;
+            this.gridColumn2.MinWidth = 24;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 0;
-            this.gridColumn2.Width = 36;
+            this.gridColumn2.Width = 51;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡缂栧彿";
             this.gridColumn3.FieldName = "itemNo";
-            this.gridColumn3.MinWidth = 17;
+            this.gridColumn3.MinWidth = 24;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 1;
-            this.gridColumn3.Width = 36;
+            this.gridColumn3.Width = 51;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn4.FieldName = "itemName";
-            this.gridColumn4.MinWidth = 17;
+            this.gridColumn4.MinWidth = 24;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 2;
-            this.gridColumn4.Width = 80;
+            this.gridColumn4.Width = 114;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn5.FieldName = "itemModel";
-            this.gridColumn5.MinWidth = 17;
+            this.gridColumn5.MinWidth = 24;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 3;
-            this.gridColumn5.Width = 87;
+            this.gridColumn5.Width = 124;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "鍗曚綅";
             this.gridColumn7.FieldName = "dwName";
-            this.gridColumn7.MinWidth = 17;
+            this.gridColumn7.MinWidth = 24;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 4;
-            this.gridColumn7.Width = 49;
+            this.gridColumn7.Width = 70;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "浣跨敤缁勭粐";
             this.gridColumn6.FieldName = "fSubsidiary";
-            this.gridColumn6.MinWidth = 17;
+            this.gridColumn6.MinWidth = 24;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 5;
-            this.gridColumn6.Width = 38;
+            this.gridColumn6.Width = 54;
             // 
             // gvMx1bld002
             // 
             this.gvMx1bld002.AppearanceCell.Options.UseFont = true;
             this.gvMx1bld002.Caption = "鐗╂枡缂栧彿";
             this.gvMx1bld002.FieldName = "itemNo";
-            this.gvMx1bld002.MinWidth = 22;
+            this.gvMx1bld002.MinWidth = 31;
             this.gvMx1bld002.Name = "gvMx1bld002";
             this.gvMx1bld002.OptionsColumn.ReadOnly = true;
             this.gvMx1bld002.Tag = "query_a.bld002";
             this.gvMx1bld002.Visible = true;
             this.gvMx1bld002.VisibleIndex = 1;
-            this.gvMx1bld002.Width = 87;
+            this.gvMx1bld002.Width = 124;
             // 
             // gvMx1bld003
             // 
             this.gvMx1bld003.AppearanceCell.Options.UseFont = true;
             this.gvMx1bld003.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1bld003.FieldName = "itemName";
-            this.gvMx1bld003.MinWidth = 22;
+            this.gvMx1bld003.MinWidth = 31;
             this.gvMx1bld003.Name = "gvMx1bld003";
             this.gvMx1bld003.OptionsColumn.ReadOnly = true;
             this.gvMx1bld003.Tag = "query_a.bld003";
             this.gvMx1bld003.Visible = true;
             this.gvMx1bld003.VisibleIndex = 2;
-            this.gvMx1bld003.Width = 105;
+            this.gvMx1bld003.Width = 150;
             // 
             // itemModel
             // 
             this.itemModel.AppearanceCell.Options.UseFont = true;
             this.itemModel.Caption = "瑙勬牸鍨嬪彿";
             this.itemModel.FieldName = "itemModel";
-            this.itemModel.MinWidth = 22;
+            this.itemModel.MinWidth = 31;
             this.itemModel.Name = "itemModel";
             this.itemModel.OptionsColumn.ReadOnly = true;
             this.itemModel.Tag = "query_a.bld004";
             this.itemModel.Visible = true;
             this.itemModel.VisibleIndex = 3;
-            this.itemModel.Width = 105;
+            this.itemModel.Width = 150;
             // 
             // gvMx1bld007
             // 
@@ -1781,12 +1857,12 @@
             this.gvMx1bld007.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1bld007.Caption = "鐢宠鏁伴噺";
             this.gvMx1bld007.FieldName = "shNum";
-            this.gvMx1bld007.MinWidth = 43;
+            this.gvMx1bld007.MinWidth = 61;
             this.gvMx1bld007.Name = "gvMx1bld007";
             this.gvMx1bld007.Tag = "yz_quantity_0_edit";
             this.gvMx1bld007.Visible = true;
             this.gvMx1bld007.VisibleIndex = 4;
-            this.gvMx1bld007.Width = 82;
+            this.gvMx1bld007.Width = 117;
             // 
             // gvMx1bld010
             // 
@@ -1797,35 +1873,35 @@
             this.gvMx1bld010.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1bld010.Caption = "澶囨敞";
             this.gvMx1bld010.FieldName = "remark";
-            this.gvMx1bld010.MinWidth = 43;
+            this.gvMx1bld010.MinWidth = 61;
             this.gvMx1bld010.Name = "gvMx1bld010";
             this.gvMx1bld010.Tag = "edit";
             this.gvMx1bld010.Visible = true;
             this.gvMx1bld010.VisibleIndex = 5;
-            this.gvMx1bld010.Width = 131;
+            this.gvMx1bld010.Width = 187;
             // 
             // gvMx1bld008
             // 
             this.gvMx1bld008.AppearanceCell.Options.UseFont = true;
             this.gvMx1bld008.Caption = "宸叉壂鏁伴噺";
             this.gvMx1bld008.FieldName = "sQty";
-            this.gvMx1bld008.MinWidth = 43;
+            this.gvMx1bld008.MinWidth = 61;
             this.gvMx1bld008.Name = "gvMx1bld008";
             this.gvMx1bld008.OptionsColumn.ReadOnly = true;
             this.gvMx1bld008.Tag = "query_a.bld008";
             this.gvMx1bld008.Visible = true;
             this.gvMx1bld008.VisibleIndex = 6;
-            this.gvMx1bld008.Width = 82;
+            this.gvMx1bld008.Width = 117;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鍗曚綅鍚嶇О";
             this.gridColumn1.FieldName = "itemUnit";
-            this.gridColumn1.MinWidth = 22;
+            this.gridColumn1.MinWidth = 31;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 7;
-            this.gridColumn1.Width = 82;
+            this.gridColumn1.Width = 117;
             // 
             // gridColumn9
             // 
@@ -1836,18 +1912,18 @@
             this.gridColumn9.Caption = "璋冨嚭缁勭粐";
             this.gridColumn9.ColumnEdit = this.rptDcOrg;
             this.gridColumn9.FieldName = "dcOrg";
-            this.gridColumn9.MinWidth = 22;
+            this.gridColumn9.MinWidth = 31;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 8;
-            this.gridColumn9.Width = 82;
+            this.gridColumn9.Width = 117;
             // 
             // rptDcOrg
             // 
             this.rptDcOrg.AutoHeight = false;
-            editorButtonImageOptions10.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
             this.rptDcOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDcOrg.Name = "rptDcOrg";
             this.rptDcOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcOrg_ButtonClick);
             // 
@@ -1860,18 +1936,18 @@
             this.gridColumn10.Caption = "璋冨嚭浠撳簱";
             this.gridColumn10.ColumnEdit = this.rptDcCk;
             this.gridColumn10.FieldName = "dcCk";
-            this.gridColumn10.MinWidth = 22;
+            this.gridColumn10.MinWidth = 31;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 9;
-            this.gridColumn10.Width = 82;
+            this.gridColumn10.Width = 117;
             // 
             // rptDcCk
             // 
             this.rptDcCk.AutoHeight = false;
-            editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDcCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDcCk.Name = "rptDcCk";
             this.rptDcCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCk_ButtonClick);
             // 
@@ -1882,16 +1958,16 @@
             this.gridColumn11.Caption = "璋冨嚭浠撲綅";
             this.gridColumn11.ColumnEdit = this.rptDcCw;
             this.gridColumn11.FieldName = "dcCw";
-            this.gridColumn11.MinWidth = 22;
+            this.gridColumn11.MinWidth = 31;
             this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Width = 82;
+            this.gridColumn11.Width = 117;
             // 
             // rptDcCw
             // 
             this.rptDcCw.AutoHeight = false;
-            editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDcCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.rptDcCw.Name = "rptDcCw";
             this.rptDcCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCw_ButtonClick);
             // 
@@ -1904,18 +1980,18 @@
             this.gridColumn12.Caption = "璋冨叆缁勭粐";
             this.gridColumn12.ColumnEdit = this.rptDrOrg;
             this.gridColumn12.FieldName = "drOrg";
-            this.gridColumn12.MinWidth = 22;
+            this.gridColumn12.MinWidth = 31;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 10;
-            this.gridColumn12.Width = 82;
+            this.gridColumn12.Width = 117;
             // 
             // rptDrOrg
             // 
             this.rptDrOrg.AutoHeight = false;
-            editorButtonImageOptions13.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", 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.rptDrOrg.Name = "rptDrOrg";
             this.rptDrOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrOrg_ButtonClick);
             // 
@@ -1928,18 +2004,18 @@
             this.gridColumn16.Caption = "璋冨叆浠撳簱";
             this.gridColumn16.ColumnEdit = this.rptDrCk;
             this.gridColumn16.FieldName = "drCk";
-            this.gridColumn16.MinWidth = 22;
+            this.gridColumn16.MinWidth = 31;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 11;
-            this.gridColumn16.Width = 82;
+            this.gridColumn16.Width = 117;
             // 
             // rptDrCk
             // 
             this.rptDrCk.AutoHeight = false;
-            editorButtonImageOptions14.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", 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.rptDrCk.Name = "rptDrCk";
             this.rptDrCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCk_ButtonClick);
             // 
@@ -1948,16 +2024,16 @@
             this.gridColumn17.Caption = "璋冨叆浠撲綅";
             this.gridColumn17.ColumnEdit = this.rptDrCw;
             this.gridColumn17.FieldName = "drCw";
-            this.gridColumn17.MinWidth = 22;
+            this.gridColumn17.MinWidth = 31;
             this.gridColumn17.Name = "gridColumn17";
-            this.gridColumn17.Width = 82;
+            this.gridColumn17.Width = 117;
             // 
             // rptDrCw
             // 
             this.rptDrCw.AutoHeight = false;
-            editorButtonImageOptions15.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions15, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject57, serializableAppearanceObject58, serializableAppearanceObject59, serializableAppearanceObject60, "", 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.rptDrCw.Name = "rptDrCw";
             this.rptDrCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCw_ButtonClick);
             // 
@@ -1970,18 +2046,18 @@
             this.gridColumn23.Caption = "璋冨嚭璐т富";
             this.gridColumn23.ColumnEdit = this.rptDcHz;
             this.gridColumn23.FieldName = "dcHz";
-            this.gridColumn23.MinWidth = 22;
+            this.gridColumn23.MinWidth = 31;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
             this.gridColumn23.VisibleIndex = 12;
-            this.gridColumn23.Width = 82;
+            this.gridColumn23.Width = 117;
             // 
             // rptDcHz
             // 
             this.rptDcHz.AutoHeight = false;
-            editorButtonImageOptions16.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions16, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject61, serializableAppearanceObject62, serializableAppearanceObject63, serializableAppearanceObject64, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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)});
             this.rptDcHz.Name = "rptDcHz";
             this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
             // 
@@ -1994,18 +2070,18 @@
             this.gridColumn24.Caption = "璋冨叆璐т富";
             this.gridColumn24.ColumnEdit = this.rptDrHz;
             this.gridColumn24.FieldName = "drHz";
-            this.gridColumn24.MinWidth = 22;
+            this.gridColumn24.MinWidth = 31;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
             this.gridColumn24.VisibleIndex = 13;
-            this.gridColumn24.Width = 82;
+            this.gridColumn24.Width = 117;
             // 
             // rptDrHz
             // 
             this.rptDrHz.AutoHeight = false;
-            editorButtonImageOptions17.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions17, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject65, serializableAppearanceObject66, serializableAppearanceObject67, serializableAppearanceObject68, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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)});
             this.rptDrHz.Name = "rptDrHz";
             this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
             // 
@@ -2013,19 +2089,19 @@
             // 
             this.gvMxDel.Caption = "绉诲嚭";
             this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 22;
+            this.gvMxDel.MinWidth = 31;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 14;
-            this.gvMxDel.Width = 82;
+            this.gvMxDel.VisibleIndex = 16;
+            this.gvMxDel.Width = 117;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions18.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions18.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions9.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, editorButtonImageOptions18, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject69, serializableAppearanceObject70, serializableAppearanceObject71, serializableAppearanceObject72, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2034,74 +2110,92 @@
             // 
             this.gridColumn8.Caption = "鐗╂枡ID";
             this.gridColumn8.FieldName = "itemId";
-            this.gridColumn8.MinWidth = 22;
+            this.gridColumn8.MinWidth = 31;
             this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Width = 82;
+            this.gridColumn8.Width = 117;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "璋冨嚭缁勭粐Guid";
             this.gridColumn14.FieldName = "dcOrgGuid";
-            this.gridColumn14.MinWidth = 22;
+            this.gridColumn14.MinWidth = 31;
             this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Width = 82;
+            this.gridColumn14.Width = 117;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "璋冨嚭浠撳簱Guid";
             this.gridColumn15.FieldName = "dcCkGuid";
-            this.gridColumn15.MinWidth = 22;
+            this.gridColumn15.MinWidth = 31;
             this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.Width = 82;
+            this.gridColumn15.Width = 117;
             // 
             // gridColumn13
             // 
             this.gridColumn13.Caption = "璋冨嚭浠撲綅Guid";
             this.gridColumn13.FieldName = "dcCwGuid";
-            this.gridColumn13.MinWidth = 22;
+            this.gridColumn13.MinWidth = 31;
             this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Width = 82;
+            this.gridColumn13.Width = 117;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "璋冨叆缁勭粐Guid";
             this.gridColumn18.FieldName = "drOrgGuid";
-            this.gridColumn18.MinWidth = 22;
+            this.gridColumn18.MinWidth = 31;
             this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Width = 82;
+            this.gridColumn18.Width = 117;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "璋冨叆浠撳簱Guid";
             this.gridColumn19.FieldName = "drCkGuid";
-            this.gridColumn19.MinWidth = 22;
+            this.gridColumn19.MinWidth = 31;
             this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Width = 82;
+            this.gridColumn19.Width = 117;
             // 
             // gridColumn20
             // 
             this.gridColumn20.Caption = "璋冨叆浠撲綅Guid";
             this.gridColumn20.FieldName = "drCwGuid";
-            this.gridColumn20.MinWidth = 22;
+            this.gridColumn20.MinWidth = 31;
             this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Width = 82;
+            this.gridColumn20.Width = 117;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "璋冨嚭璐т富Guid";
             this.gridColumn21.ColumnEdit = this.rptDcHz;
             this.gridColumn21.FieldName = "dcHzGuid";
-            this.gridColumn21.MinWidth = 22;
+            this.gridColumn21.MinWidth = 31;
             this.gridColumn21.Name = "gridColumn21";
-            this.gridColumn21.Width = 82;
+            this.gridColumn21.Width = 117;
             // 
             // gridColumn22
             // 
             this.gridColumn22.Caption = "璋冨叆璐т富Guid";
             this.gridColumn22.FieldName = "drHzGuid";
-            this.gridColumn22.MinWidth = 22;
+            this.gridColumn22.MinWidth = 31;
             this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Width = 82;
+            this.gridColumn22.Width = 117;
+            // 
+            // gridColumn54
+            // 
+            this.gridColumn54.Caption = "宸ュ崟鍗曞彿";
+            this.gridColumn54.FieldName = "daa001";
+            this.gridColumn54.MinWidth = 30;
+            this.gridColumn54.Name = "gridColumn54";
+            this.gridColumn54.Visible = true;
+            this.gridColumn54.VisibleIndex = 14;
+            this.gridColumn54.Width = 112;
+            // 
+            // gridColumn55
+            // 
+            this.gridColumn55.Caption = "澶囨枡鏄庣粏guid";
+            this.gridColumn55.FieldName = "dabErpId";
+            this.gridColumn55.MinWidth = 30;
+            this.gridColumn55.Name = "gridColumn55";
+            this.gridColumn55.Width = 112;
             // 
             // btnTest1
             // 
@@ -2113,9 +2207,10 @@
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(832, 43);
+            this.picCheckBox.Location = new System.Drawing.Point(1189, 68);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+            this.picCheckBox.Size = new System.Drawing.Size(126, 61);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 8;
             this.picCheckBox.TabStop = false;
@@ -2130,14 +2225,50 @@
             this.layoutControlItem18.Size = new System.Drawing.Size(276, 37);
             this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
+            // btnSelect1
+            // 
+            this.btnSelect1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSelect1.ImageOptions.Image")));
+            this.btnSelect1.Location = new System.Drawing.Point(12, 12);
+            this.btnSelect1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.btnSelect1.Name = "btnSelect1";
+            this.btnSelect1.Size = new System.Drawing.Size(206, 42);
+            this.btnSelect1.TabIndex = 445;
+            this.btnSelect1.Text = "閫夋嫨鐢熶骇/濮斿鍗曟嵁";
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.btnSelect1;
+            this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem28.CustomizationFormText = "蹇嵎褰曞叆";
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem28.MaxSize = new System.Drawing.Size(210, 46);
+            this.layoutControlItem28.MinSize = new System.Drawing.Size(140, 46);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.Size = new System.Drawing.Size(359, 48);
+            this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem28.Text = "閫夋嫨鐢熶骇璁㈠崟";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem28.TextVisible = false;
+            // 
+            // gridColumn56
+            // 
+            this.gridColumn56.Caption = "鐗╂枡瀵瑰簲浠撶";
+            this.gridColumn56.FieldName = "depotMan";
+            this.gridColumn56.MinWidth = 30;
+            this.gridColumn56.Name = "gridColumn56";
+            this.gridColumn56.Visible = true;
+            this.gridColumn56.VisibleIndex = 15;
+            this.gridColumn56.Width = 112;
+            // 
             // Frm_MesDbck
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1022, 531);
+            this.ClientSize = new System.Drawing.Size(1460, 834);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "Frm_MesDbck";
             this.Text = "璋冩嫧鍑哄簱鐢宠";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2181,6 +2312,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_FSourceOrder.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
@@ -2207,8 +2339,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2228,6 +2361,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.btnTest1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2380,8 +2514,15 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraEditors.SimpleButton btnSelect;
         private DevExpress.XtraEditors.SimpleButton btnScdd;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraEditors.SimpleButton btnSelect1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraEditors.TextEdit txt_FSourceOrder;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index c020bd1..dd1ec75 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -171,14 +171,39 @@
                     try
                     {
                         var lst = new List<string>();
+                        var lst_gd = new List<dynamic>();
                         lst = ee.StringList;
+                        lst_gd = ee.DynamicList;
                         var _obj = new
                         {
                             lst = ee.StringList,
                             workId = ee.Data,
+                            ftype = txt_fBusinessType.Text
+                        };
+                        txt_FSourceOrder.Text = "";
+                        for (int i=0;i< lst_gd.Count; i++)
+                        {
+                            if (i+1 < lst_gd.Count)
+                            {
+                                txt_FSourceOrder.Text = txt_FSourceOrder.Text + lst_gd[i].ToString()+",";
+                            }
+                            else
+                            {
+                                txt_FSourceOrder.Text = txt_FSourceOrder.Text + lst_gd[i].ToString();
+                            };
                         };
                         var strReturn = UtilityHelper.HttpPost("", "MesInvItemMovesManager/SelectScddToView", JsonConvert.SerializeObject(_obj));
                         var dt = UtilityHelper.ReturnToList(strReturn);
+                        if (dt.rtnCode == -102 && dt.rtnMsg=="濮斿")
+                        {
+                            MsgHelper.ShowError("鎻愮ず锛氫笟鍔$被鍨嬩负濮斿(WW)鏃讹紝鍙兘閫夋嫨濮斿璁㈠崟锛�");
+                            return;
+                        }
+                        else if(dt.rtnCode == -102 && dt.rtnMsg == "鐢熶骇")
+                        {
+                            MsgHelper.ShowError("鎻愮ず锛氫笟鍔$被鍨嬩负鏍囧噯(NORMAL)鏃讹紝鍙兘閫夋嫨鐢熶骇璁㈠崟锛�");
+                            return;
+                        };
                         DataTable _newTable = dt.rtnData;
                         DataTable _oldTable = (DataTable)gcMx1.DataSource;
                         DataRow[] sourceRows = _newTable.Select();
@@ -434,13 +459,14 @@
             string dblx = txt_ftranstype.Text.ToString();
             string dchzlx = txt_fOwnerTypeIdHead.Text.ToString();
             string drhzlx = txt_fOwnerTypeInIdHead.Text.ToString();
+            string gdbh = txt_FSourceOrder.Text.ToString();
             //if (txt_fBillTypeID.SelectedIndex <= 0)
             //{
             //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
             //    txt_fBillTypeID.Focus();
             //    return;
             //}
-            if (txt_fTransferDirect.SelectedIndex <= 0)
+            if (string.IsNullOrEmpty(dbfx))
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
                 txt_fTransferDirect.Focus();
@@ -476,6 +502,7 @@
                 drhzlx = drhzlx,//璋冨叆璐т富绫诲瀷
                 inRemark = txt_fRemarks.Text.Trim(),//澶囨敞
                 list = new List<dynamic>(),
+                gdbh = gdbh //宸ュ崟鍗曞彿
             };
             gvMx1.CloseEditor();
             gvMx1.PostEditor();
@@ -539,6 +566,9 @@
                         drck = (row["drCkGuid"].ToString()),
                         dchz = (row["dcHzGuid"].ToString()),
                         drhz = (row["drHzGuid"].ToString()),
+                        gd = (row["daa001"].ToString()),
+                        gdmx = (row["dabErpId"].ToString()),
+                        bgy = (row["depotMan"].ToString()),
                     });
                 }
             }
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
index 45e4c99..7745767 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
@@ -122,54 +122,71 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
-        O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
-        Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
-        11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
-        SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
-        oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
-        lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
-        ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
-        hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
-        9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
-        aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
-        zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+        O4ktWcsAAAJzSURBVDhPjZNLSFRhFMdPmY6jV4Okx6ZF+9q2KIIgCNrWJrIHWARJFJmFhanV+ChNfI9G
+        gTlTJhQZVkpGMwzqZDg9sMCE2mSlk86dud7r3Lmvf3yf43QHWvTBb3Hgnt/355z7EQBaQRCEjFZPyN/u
+        fYc273u0eUNo8YTQzOiZQFPPBBrujAUEQcha6Uk1JwWZLZ4JWBZgWRbHZJjLGKaFW3ffQhAEZ0pARKuI
+        KIOI1jgcjtz+4SmoqgoxqnAWRAWRaBwxWUNCN3GzK8gEOXZBRk1n0F/X9Qa1neOo7Qyixj2KancQLncQ
+        1ztGcbs3hLAoQ9VM1HSMMEGuXZBZ7R5Ji22PzmJXNgXw83cU8YSBquYAEwh2Qda1ViawIC/pnMUlgyPJ
+        Bo9d3uDD91kRimqgvNHHBHl2gaOs3sdvjCk6ogxZh7iocdit51wv8XVmHpKi42LdMBPk2wXZF2qHeVzW
+        EJE1RBY1xGQdclyHqhl49noK4QUJSlzDC/8XOJ3OAjb05PAp53Tlc+iGhXA0gXBUxZyoQlI0zAz1Y7qi
+        OMVH1wEE63emwQS5p8oHoBsmZkUVESkBSUlgIbaE6SvFgM/LiXtvoPfwFkB8yJEmXbzmghOXnkLTTfyK
+        LO/73uBnHLw6lOJk03mUdm9N48fgsb+CotInfNoS24KiYu/ZPozL4PRNhrG/bDPm0c0Z+1bFa7sgu/DM
+        ff/Rksc4UvIIfQMfuKDi1RynqH2cN3g+7eJcfrCN1237NqFuz4YGJlhNRE4iyieitUS08X8ERLSO/UNp
+        jym51+zthW7Y2X18fRo7DhU08mZ2/iFYSSTYyLPBakfyO/oDc1CK6m0Ap7gAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnSelect.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
-        O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
-        Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
-        11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
-        SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
-        oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
-        lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
-        ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
-        hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
-        9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
-        aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
-        zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+        O4ktWcsAAAJzSURBVDhPjZNLSFRhFMdPmY6jV4Okx6ZF+9q2KIIgCNrWJrIHWARJFJmFhanV+ChNfI9G
+        gTlTJhQZVkpGMwzqZDg9sMCE2mSlk86dud7r3Lmvf3yf43QHWvTBb3Hgnt/355z7EQBaQRCEjFZPyN/u
+        fYc273u0eUNo8YTQzOiZQFPPBBrujAUEQcha6Uk1JwWZLZ4JWBZgWRbHZJjLGKaFW3ffQhAEZ0pARKuI
+        KIOI1jgcjtz+4SmoqgoxqnAWRAWRaBwxWUNCN3GzK8gEOXZBRk1n0F/X9Qa1neOo7Qyixj2KancQLncQ
+        1ztGcbs3hLAoQ9VM1HSMMEGuXZBZ7R5Ji22PzmJXNgXw83cU8YSBquYAEwh2Qda1ViawIC/pnMUlgyPJ
+        Bo9d3uDD91kRimqgvNHHBHl2gaOs3sdvjCk6ogxZh7iocdit51wv8XVmHpKi42LdMBPk2wXZF2qHeVzW
+        EJE1RBY1xGQdclyHqhl49noK4QUJSlzDC/8XOJ3OAjb05PAp53Tlc+iGhXA0gXBUxZyoQlI0zAz1Y7qi
+        OMVH1wEE63emwQS5p8oHoBsmZkUVESkBSUlgIbaE6SvFgM/LiXtvoPfwFkB8yJEmXbzmghOXnkLTTfyK
+        LO/73uBnHLw6lOJk03mUdm9N48fgsb+CotInfNoS24KiYu/ZPozL4PRNhrG/bDPm0c0Z+1bFa7sgu/DM
+        ff/Rksc4UvIIfQMfuKDi1RynqH2cN3g+7eJcfrCN1237NqFuz4YGJlhNRE4iyieitUS08X8ERLSO/UNp
+        jym51+zthW7Y2X18fRo7DhU08mZ2/iFYSSTYyLPBakfyO/oDc1CK6m0Ap7gAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnScdd.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
-        O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
-        Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
-        11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
-        SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
-        oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
-        lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
-        ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
-        hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
-        9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
-        aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
-        zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+        O4ktWcsAAAJzSURBVDhPjZNLSFRhFMdPmY6jV4Okx6ZF+9q2KIIgCNrWJrIHWARJFJmFhanV+ChNfI9G
+        gTlTJhQZVkpGMwzqZDg9sMCE2mSlk86dud7r3Lmvf3yf43QHWvTBb3Hgnt/355z7EQBaQRCEjFZPyN/u
+        fYc273u0eUNo8YTQzOiZQFPPBBrujAUEQcha6Uk1JwWZLZ4JWBZgWRbHZJjLGKaFW3ffQhAEZ0pARKuI
+        KIOI1jgcjtz+4SmoqgoxqnAWRAWRaBwxWUNCN3GzK8gEOXZBRk1n0F/X9Qa1neOo7Qyixj2KancQLncQ
+        1ztGcbs3hLAoQ9VM1HSMMEGuXZBZ7R5Ji22PzmJXNgXw83cU8YSBquYAEwh2Qda1ViawIC/pnMUlgyPJ
+        Bo9d3uDD91kRimqgvNHHBHl2gaOs3sdvjCk6ogxZh7iocdit51wv8XVmHpKi42LdMBPk2wXZF2qHeVzW
+        EJE1RBY1xGQdclyHqhl49noK4QUJSlzDC/8XOJ3OAjb05PAp53Tlc+iGhXA0gXBUxZyoQlI0zAz1Y7qi
+        OMVH1wEE63emwQS5p8oHoBsmZkUVESkBSUlgIbaE6SvFgM/LiXtvoPfwFkB8yJEmXbzmghOXnkLTTfyK
+        LO/73uBnHLw6lOJk03mUdm9N48fgsb+CotInfNoS24KiYu/ZPozL4PRNhrG/bDPm0c0Z+1bFa7sgu/DM
+        ff/Rksc4UvIIfQMfuKDi1RynqH2cN3g+7eJcfrCN1237NqFuz4YGJlhNRE4iyieitUS08X8ERLSO/UNp
+        jym51+zthW7Y2X18fRo7DhU08mZ2/iFYSSTYyLPBakfyO/oDc1CK6m0Ap7gAAAAASUVORK5CYII=
 </value>
   </data>
   <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <data name="btnSelect1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
+        O4ktWcsAAAJzSURBVDhPjZNLSFRhFMdPmY6jV4Okx6ZF+9q2KIIgCNrWJrIHWARJFJmFhanV+ChNfI9G
+        gTlTJhQZVkpGMwzqZDg9sMCE2mSlk86dud7r3Lmvf3yf43QHWvTBb3Hgnt/355z7EQBaQRCEjFZPyN/u
+        fYc273u0eUNo8YTQzOiZQFPPBBrujAUEQcha6Uk1JwWZLZ4JWBZgWRbHZJjLGKaFW3ffQhAEZ0pARKuI
+        KIOI1jgcjtz+4SmoqgoxqnAWRAWRaBwxWUNCN3GzK8gEOXZBRk1n0F/X9Qa1neOo7Qyixj2KancQLncQ
+        1ztGcbs3hLAoQ9VM1HSMMEGuXZBZ7R5Ji22PzmJXNgXw83cU8YSBquYAEwh2Qda1ViawIC/pnMUlgyPJ
+        Bo9d3uDD91kRimqgvNHHBHl2gaOs3sdvjCk6ogxZh7iocdit51wv8XVmHpKi42LdMBPk2wXZF2qHeVzW
+        EJE1RBY1xGQdclyHqhl49noK4QUJSlzDC/8XOJ3OAjb05PAp53Tlc+iGhXA0gXBUxZyoQlI0zAz1Y7qi
+        OMVH1wEE63emwQS5p8oHoBsmZkUVESkBSUlgIbaE6SvFgM/LiXtvoPfwFkB8yJEmXbzmghOXnkLTTfyK
+        LO/73uBnHLw6lOJk03mUdm9N48fgsb+CotInfNoS24KiYu/ZPozL4PRNhrG/bDPm0c0Z+1bFa7sgu/DM
+        ff/Rksc4UvIIfQMfuKDi1RynqH2cN3g+7eJcfrCN1237NqFuz4YGJlhNRE4iyieitUS08X8ERLSO/UNp
+        jym51+zthW7Y2X18fRo7DhU08mZ2/iFYSSTYyLPBakfyO/oDc1CK6m0Ap7gAAAAASUVORK5CYII=
+</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs
index a5faef1..b24ee7f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/SelectSqmx.cs
@@ -40,6 +40,7 @@
                 gridView1.PostEditor();
                 gridView1.UpdateCurrentRow();
                 var list = new List<string>();
+                var list_gd = new List<dynamic>();
                 workId = (radioGroup1.SelectedIndex + 1).ToString();
                 DataTable dt = this.gcMain.DataSource as DataTable;
                 {
@@ -64,11 +65,13 @@
                             //    daa008 = dr["daa008"].ToString()
                             //});
                             string _guid = dr["guid"].ToString();
+                            string _gddh = dr["scdd"].ToString();
                             list.Add(_guid);
+                            list_gd.Add(_gddh);
                         }
                     }
                 }
-                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list , Data = workId }); Close();
+                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list , Data = workId , DynamicList = list_gd }); Close();
             };
             radioGroup1.SelectedIndexChanged += (s, e) =>
             {
diff --git a/DevApp/Gs.DevApp/FastReport.Bars.dll b/DevApp/Gs.DevApp/FastReport.Bars.dll
new file mode 100644
index 0000000..1ed0d59
--- /dev/null
+++ b/DevApp/Gs.DevApp/FastReport.Bars.dll
Binary files differ
diff --git a/DevApp/Gs.DevApp/FastReport.Editor.dll b/DevApp/Gs.DevApp/FastReport.Editor.dll
new file mode 100644
index 0000000..b64b4e2
--- /dev/null
+++ b/DevApp/Gs.DevApp/FastReport.Editor.dll
Binary files differ
diff --git a/DevApp/Gs.DevApp/FastReport.dll b/DevApp/Gs.DevApp/FastReport.dll
new file mode 100644
index 0000000..e5e41c0
--- /dev/null
+++ b/DevApp/Gs.DevApp/FastReport.dll
Binary files differ
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 4f5e5b7..036363a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+锘�<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" />
   <Import Project="..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" />
   <Import Project="..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" />
@@ -848,6 +848,12 @@
     <Compile Include="DevFrm\Rpt\SysTuiSong.Designer.cs">
       <DependentUpon>SysTuiSong.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\Rpt\UcRptCgdhd.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Rpt\UcRptCgdhd.Designer.cs">
+      <DependentUpon>UcRptCgdhd.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Rpt\WomShjh.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1334,6 +1340,12 @@
     <Compile Include="UserControl\CopyXls.Designer.cs">
       <DependentUpon>CopyXls.cs</DependentUpon>
     </Compile>
+    <Compile Include="UserControl\SelectCgDhMx.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UserControl\SelectCgDhMx.Designer.cs">
+      <DependentUpon>SelectCgDhMx.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserControl\SelectCk.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1369,12 +1381,6 @@
     </Compile>
     <Compile Include="UserControl\UcBtnPrintOne.Designer.cs">
       <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UserControl\UcPrintPanel.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UserControl\UcPrintPanel.Designer.cs">
-      <DependentUpon>UcPrintPanel.cs</DependentUpon>
     </Compile>
     <Compile Include="UserControl\UcCheckFlow.cs">
       <SubType>UserControl</SubType>
@@ -2062,6 +2068,9 @@
     <EmbeddedResource Include="DevFrm\Rpt\SysTuiSong.resx">
       <DependentUpon>SysTuiSong.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx">
+      <DependentUpon>UcRptCgdhd.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
       <DependentUpon>WomShjh.cs</DependentUpon>
     </EmbeddedResource>
@@ -2298,6 +2307,9 @@
     <EmbeddedResource Include="UserControl\CopyXls.resx">
       <DependentUpon>CopyXls.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UserControl\SelectCgDhMx.resx">
+      <DependentUpon>SelectCgDhMx.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControl\SelectCk.resx">
       <DependentUpon>SelectCk.cs</DependentUpon>
     </EmbeddedResource>
@@ -2315,9 +2327,6 @@
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
       <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UserControl\UcPrintPanel.resx">
-      <DependentUpon>UcPrintPanel.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\UcCheckFlow.resx">
       <DependentUpon>UcCheckFlow.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 0d7d10c..1220f48 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -53,7 +53,7 @@
                 fmLogin.ShowDialog();
                 if (fmLogin.DialogResult == DialogResult.OK)
                 {
-                    Application.Run(new DevFrm.User.SysMenu());
+                    //Application.Run(new DevFrm.User.SysMenu());
                     //return;
                     Application.Run(new FrmMain());
                 }
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/SelectCgDhMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.Designer.cs
new file mode 100644
index 0000000..55dab5c
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.Designer.cs
@@ -0,0 +1,444 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+    partial class SelectCgDhMx
+    {
+
+        /// <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.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+            this.panelControl2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+            this.panelControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panelControl2
+            // 
+            this.panelControl2.Controls.Add(this.xtraTabControl1);
+            this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelControl2.Location = new System.Drawing.Point(0, 0);
+            this.panelControl2.Name = "panelControl2";
+            this.panelControl2.Size = new System.Drawing.Size(1336, 531);
+            this.panelControl2.TabIndex = 4;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(2, 2);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1332, 527);
+            this.xtraTabControl1.TabIndex = 7;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.gcMain);
+            this.xtraTabPage1.Controls.Add(this.panelControl1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1330, 501);
+            this.xtraTabPage1.Text = "鍒拌揣鍗曟槑缁�";
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.Location = new System.Drawing.Point(0, 0);
+            this.gcMain.MainView = this.gridView1;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.Size = new System.Drawing.Size(1330, 467);
+            this.gcMain.TabIndex = 2;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1,
+            this.gridView3,
+            this.gridView4});
+            // 
+            // 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 = 39;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.colChkInt,
+            this.gv_billNo,
+            this.gv_guid,
+            this.gv_ebelnK3id,
+            this.gridColumn3,
+            this.gv_supplierItemCode,
+            this.gv_supplierItemName,
+            this.gridColumn6,
+            this.gridColumn9,
+            this.gridColumn7,
+            this.gv_purchaseUnit,
+            this.gv_remarks,
+            this.gridColumn5,
+            this.gridColumn10,
+            this.gridColumn2,
+            this.gridColumn4,
+            this.gridColumn1});
+            this.gridView1.DetailHeight = 272;
+            this.gridView1.GridControl = this.gcMain;
+            this.gridView1.IndicatorWidth = 43;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 52;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowFooter = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // colChkInt
+            // 
+            this.colChkInt.Caption = ".";
+            this.colChkInt.FieldName = "chkInt";
+            this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.colChkInt.MinWidth = 22;
+            this.colChkInt.Name = "colChkInt";
+            this.colChkInt.Visible = true;
+            this.colChkInt.VisibleIndex = 0;
+            this.colChkInt.Width = 82;
+            // 
+            // gv_billNo
+            // 
+            this.gv_billNo.AppearanceCell.Options.UseFont = true;
+            this.gv_billNo.Caption = "閲囪喘鍗曞彿";
+            this.gv_billNo.FieldName = "billNo";
+            this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.gv_billNo.MinWidth = 10;
+            this.gv_billNo.Name = "gv_billNo";
+            this.gv_billNo.OptionsColumn.AllowEdit = false;
+            this.gv_billNo.OptionsColumn.ReadOnly = true;
+            this.gv_billNo.Tag = "query_a.BILL_NO";
+            this.gv_billNo.Visible = true;
+            this.gv_billNo.VisibleIndex = 1;
+            this.gv_billNo.Width = 90;
+            // 
+            // gv_guid
+            // 
+            this.gv_guid.AppearanceCell.Options.UseFont = true;
+            this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+            this.gv_guid.FieldName = "guid";
+            this.gv_guid.MinWidth = 43;
+            this.gv_guid.Name = "gv_guid";
+            this.gv_guid.OptionsColumn.AllowEdit = false;
+            this.gv_guid.OptionsColumn.ReadOnly = true;
+            this.gv_guid.Tag = "query_a.guid";
+            this.gv_guid.Width = 82;
+            // 
+            // gv_ebelnK3id
+            // 
+            this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
+            this.gv_ebelnK3id.Caption = "ERP琛孖D鍙�";
+            this.gv_ebelnK3id.FieldName = "erpMxId";
+            this.gv_ebelnK3id.MinWidth = 87;
+            this.gv_ebelnK3id.Name = "gv_ebelnK3id";
+            this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
+            this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
+            this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
+            this.gv_ebelnK3id.Width = 87;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "閲囪喘鏃堕棿";
+            this.gridColumn3.FieldName = "purchaseDate";
+            this.gridColumn3.MinWidth = 10;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.ReadOnly = true;
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 12;
+            this.gridColumn3.Width = 60;
+            // 
+            // gv_supplierItemCode
+            // 
+            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+            this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
+            this.gv_supplierItemCode.FieldName = "wlbm";
+            this.gv_supplierItemCode.MinWidth = 10;
+            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+            this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
+            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+            this.gv_supplierItemCode.Visible = true;
+            this.gv_supplierItemCode.VisibleIndex = 3;
+            this.gv_supplierItemCode.Width = 117;
+            // 
+            // gv_supplierItemName
+            // 
+            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+            this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
+            this.gv_supplierItemName.FieldName = "wlmc";
+            this.gv_supplierItemName.MinWidth = 10;
+            this.gv_supplierItemName.Name = "gv_supplierItemName";
+            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
+            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+            this.gv_supplierItemName.Visible = true;
+            this.gv_supplierItemName.VisibleIndex = 4;
+            this.gv_supplierItemName.Width = 83;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "閲囪喘鏁伴噺";
+            this.gridColumn6.FieldName = "purchaseQty";
+            this.gridColumn6.MinWidth = 10;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.ReadOnly = true;
+            this.gridColumn6.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "purchaseQty", "閲囪喘:{0:0.##}")});
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 5;
+            this.gridColumn6.Width = 70;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "宸叉敹鏁伴噺";
+            this.gridColumn9.FieldName = "yssl";
+            this.gridColumn9.MinWidth = 10;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
+            this.gridColumn9.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "yssl", "宸叉敹:{0:0.##}")});
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 6;
+            this.gridColumn9.Width = 62;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn7.Caption = "鏈敹鏁伴噺";
+            this.gridColumn7.FieldName = "wssl";
+            this.gridColumn7.MinWidth = 10;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.ReadOnly = true;
+            this.gridColumn7.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "wssl", "鏈敹={0:0.##}")});
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 7;
+            this.gridColumn7.Width = 57;
+            // 
+            // gv_purchaseUnit
+            // 
+            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
+            this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅";
+            this.gv_purchaseUnit.FieldName = "fname";
+            this.gv_purchaseUnit.MinWidth = 10;
+            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
+            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
+            this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
+            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
+            this.gv_purchaseUnit.Visible = true;
+            this.gv_purchaseUnit.VisibleIndex = 8;
+            this.gv_purchaseUnit.Width = 84;
+            // 
+            // gv_remarks
+            // 
+            this.gv_remarks.AppearanceCell.Options.UseFont = true;
+            this.gv_remarks.Caption = "澶囨敞";
+            this.gv_remarks.FieldName = "remarks";
+            this.gv_remarks.MinWidth = 10;
+            this.gv_remarks.Name = "gv_remarks";
+            this.gv_remarks.OptionsColumn.AllowEdit = false;
+            this.gv_remarks.OptionsColumn.ReadOnly = true;
+            this.gv_remarks.Tag = "query_a.REMARKS";
+            this.gv_remarks.Visible = true;
+            this.gv_remarks.VisibleIndex = 13;
+            this.gv_remarks.Width = 52;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn5.FieldName = "wlgg";
+            this.gridColumn5.MinWidth = 10;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.ReadOnly = true;
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 9;
+            this.gridColumn5.Width = 104;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "渚涘簲鍟�";
+            this.gridColumn10.FieldName = "gysName";
+            this.gridColumn10.MinWidth = 10;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 2;
+            this.gridColumn10.Width = 154;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鏀舵枡缁勭粐";
+            this.gridColumn2.FieldName = "fSubsidiary";
+            this.gridColumn2.MinWidth = 10;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 11;
+            this.gridColumn2.Width = 123;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "閿�鍞鍗�";
+            this.gridColumn4.FieldName = "xxdd";
+            this.gridColumn4.MinWidth = 10;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.ReadOnly = true;
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 10;
+            this.gridColumn4.Width = 91;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
+            this.gridColumn1.FieldName = "documentTypeTxt";
+            this.gridColumn1.MinWidth = 10;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 14;
+            this.gridColumn1.Width = 54;
+            // 
+            // panelControl1
+            // 
+            this.panelControl1.Controls.Add(this.btnIn);
+            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panelControl1.Location = new System.Drawing.Point(0, 467);
+            this.panelControl1.Name = "panelControl1";
+            this.panelControl1.Size = new System.Drawing.Size(1330, 34);
+            this.panelControl1.TabIndex = 5;
+            // 
+            // btnIn
+            // 
+            this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+            this.btnIn.Appearance.Options.UseBackColor = true;
+            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+            this.btnIn.Location = new System.Drawing.Point(1245, 2);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(83, 30);
+            this.btnIn.TabIndex = 4;
+            this.btnIn.Text = "纭畾";
+            // 
+            // gridView3
+            // 
+            this.gridView3.GridControl = this.gcMain;
+            this.gridView3.Name = "gridView3";
+            // 
+            // gridView4
+            // 
+            this.gridView4.GridControl = this.gcMain;
+            this.gridView4.Name = "gridView4";
+            // 
+            // SelectCgDhMx
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1336, 531);
+            this.Controls.Add(this.panelControl2);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "SelectCgDhMx";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "閫夋嫨鐗╂枡锛屽彧鏄剧ず鏈楠岀殑鍗曟嵁";
+            this.TopMost = true;
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+            this.panelControl2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+            this.panelControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private DevExpress.XtraEditors.PanelControl panelControl2;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraEditors.PanelControl panelControl1;
+        private DevExpress.XtraEditors.SimpleButton btnIn;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs
new file mode 100644
index 0000000..280bb87
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.cs
@@ -0,0 +1,139 @@
+锘縰sing CefSharp;
+using DevExpress.Data;
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+using System.Windows.Input;
+
+namespace Gs.DevApp.UserControl
+{
+    public partial class SelectCgDhMx : XtraForm
+    {
+        private readonly string _webServiceName = "MesInvItemArnManager/";
+        private string suppId = "";
+        private string receiveOrgId = "";
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="_billNo">鍒拌揣鍗曞彿</param>
+       
+        public SelectCgDhMx(string _billNo)
+        {
+            InitializeComponent();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+            getPageList(1, _billNo);
+            btnIn.Click += (s, e) =>
+            {
+                gridView1.PostEditor();
+                gridView1.UpdateCurrentRow();
+                var selectedGuids = new List<string>(); // 瀛樺偍鍕鹃�夌殑guid闆嗗悎
+                DataTable dt = this.gcMain.DataSource as DataTable;
+
+                if (dt != null)
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        string checkBox = dr["chkInt"].ToString();
+                        string _guid = dr["guid"].ToString();
+                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+                        {
+                            selectedGuids.Add(_guid); // 鏀堕泦鍕鹃�夌殑guid
+                        }
+                    }
+                }
+
+                // 鍏抽敭锛氳皟鐢⊿electMxBtn鎺ュ彛锛屼紶鍏ュ嬀閫夌殑guid闆嗗悎
+                CallSelectMxBtnApi(selectedGuids);
+
+                // 鍥炰紶鏁版嵁骞跺叧闂〃鍗曪紙淇濇寔鍘熸湁閫昏緫锛�
+                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = selectedGuids });
+                Close();
+            };
+        }
+
+        /// <summary>
+        ///     閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage,string billNo)
+        {
+            
+            var _obj = new
+            {
+                currentPage = curPage,
+                everyPageSize = 999999,
+                sortName = "",
+                keyWhere = "",
+                // inBusType = (radioGroup1.SelectedIndex + 1),//1鏄噰璐紝2鏄澶�
+                // inReceiveOrgId = this.receiveOrgId,//缁勭粐
+                inBusType = "",
+                inReceiveOrgId = "",
+                inSupId = billNo//渚涘簲鍟�
+             
+            };
+            var json = JsonConvert.SerializeObject(_obj);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",_webServiceName + "SelectMxForm", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                var dt = dd.rtnData.list;
+                gcMain.BindingContext = new BindingContext();
+                gcMain.DataSource = dt;
+                gcMain.ForceInitialize();
+                gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 璋冪敤SelectMxBtn鎺ュ彛锛屼紶閫掑嬀閫夌殑guid闆嗗悎
+        /// </summary>
+        /// <param name="selectedGuids">鍕鹃�夌殑璁板綍guid鍒楄〃</param>
+        private void CallSelectMxBtnApi(List<string> selectedGuids)
+        {
+            if (selectedGuids == null || selectedGuids.Count == 0)
+            {
+                MsgHelper.Warning("璇峰厛鍕鹃�夐渶瑕佸鐞嗙殑鏄庣粏");
+                return;
+            }
+            // 鏋勫缓鎺ュ彛璇锋眰鍙傛暟锛堜笌SelectMxForm鎺ュ彛鏍煎紡淇濇寔涓�鑷达級
+            var requestParams = new{  guidList = selectedGuids};
+            try
+            {
+                // 搴忓垪鍖栧弬鏁颁负JSON
+                string jsonParams = JsonConvert.SerializeObject(requestParams);
+
+                // 璋冪敤鍚庣SelectMxBtn鎺ュ彛锛堜笌SelectMxForm鍚屾牱浣跨敤HttpPost锛�
+                string apiUrl = _webServiceName + "SelectMxBtn"; // 鎺ュ彛鍦板潃
+                string response = UtilityHelper.HttpPost("", apiUrl, jsonParams);
+                var _rtn = UtilityHelper.ReturnToDynamic(response);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+            
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgDhMx.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index cc1a5ef..c4ce141 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -95,19 +95,17 @@
             this.panelControl2.Controls.Add(this.panelControl3);
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
-            this.panelControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(1410, 834);
+            this.panelControl2.Size = new System.Drawing.Size(987, 531);
             this.panelControl2.TabIndex = 4;
             // 
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(2, 48);
-            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.xtraTabControl1.Location = new System.Drawing.Point(2, 31);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1406, 784);
+            this.xtraTabControl1.Size = new System.Drawing.Size(983, 498);
             this.xtraTabControl1.TabIndex = 7;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -117,20 +115,17 @@
             // 
             this.xtraTabPage1.Controls.Add(this.gcMain);
             this.xtraTabPage1.Controls.Add(this.panelControl1);
-            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1404, 746);
+            this.xtraTabPage1.Size = new System.Drawing.Size(981, 472);
             this.xtraTabPage1.Text = "鏅�氬埌璐у崟";
             // 
             // gcMain
             // 
             this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain.Location = new System.Drawing.Point(0, 0);
             this.gcMain.MainView = this.gridView1;
-            this.gcMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1404, 693);
+            this.gcMain.Size = new System.Drawing.Size(981, 438);
             this.gcMain.TabIndex = 2;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -140,7 +135,7 @@
             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 = 61;
+            this.gridView1.ColumnPanelRowHeight = 39;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.colChkInt,
             this.gv_billNo,
@@ -159,12 +154,12 @@
             this.gridColumn2,
             this.gridColumn4,
             this.gridColumn1});
-            this.gridView1.DetailHeight = 428;
+            this.gridView1.DetailHeight = 272;
             this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.IndicatorWidth = 43;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 75;
+            this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 52;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowFooter = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
@@ -174,11 +169,11 @@
             this.colChkInt.Caption = ".";
             this.colChkInt.FieldName = "chkInt";
             this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
-            this.colChkInt.MinWidth = 31;
+            this.colChkInt.MinWidth = 22;
             this.colChkInt.Name = "colChkInt";
             this.colChkInt.Visible = true;
             this.colChkInt.VisibleIndex = 0;
-            this.colChkInt.Width = 117;
+            this.colChkInt.Width = 82;
             // 
             // gv_billNo
             // 
@@ -186,103 +181,103 @@
             this.gv_billNo.Caption = "閲囪喘鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
             this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
-            this.gv_billNo.MinWidth = 12;
+            this.gv_billNo.MinWidth = 8;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.OptionsColumn.ReadOnly = true;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 1;
-            this.gv_billNo.Width = 12;
+            this.gv_billNo.Width = 8;
             // 
             // gv_guid
             // 
             this.gv_guid.AppearanceCell.Options.UseFont = true;
             this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
             this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 62;
+            this.gv_guid.MinWidth = 43;
             this.gv_guid.Name = "gv_guid";
             this.gv_guid.OptionsColumn.AllowEdit = false;
             this.gv_guid.OptionsColumn.ReadOnly = true;
             this.gv_guid.Tag = "query_a.guid";
-            this.gv_guid.Width = 117;
+            this.gv_guid.Width = 82;
             // 
             // gv_ebelnK3id
             // 
             this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
             this.gv_ebelnK3id.Caption = "ERP琛孖D鍙�";
             this.gv_ebelnK3id.FieldName = "erpMxId";
-            this.gv_ebelnK3id.MinWidth = 125;
+            this.gv_ebelnK3id.MinWidth = 87;
             this.gv_ebelnK3id.Name = "gv_ebelnK3id";
             this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
             this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
             this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
-            this.gv_ebelnK3id.Width = 125;
+            this.gv_ebelnK3id.Width = 87;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "閲囪喘鏃堕棿";
             this.gridColumn3.FieldName = "purchaseDate";
-            this.gridColumn3.MinWidth = 12;
+            this.gridColumn3.MinWidth = 8;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.ReadOnly = true;
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 2;
-            this.gridColumn3.Width = 12;
+            this.gridColumn3.Width = 8;
             // 
             // gv_supplierItemCode
             // 
             this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
             this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
             this.gv_supplierItemCode.FieldName = "wlbm";
-            this.gv_supplierItemCode.MinWidth = 12;
+            this.gv_supplierItemCode.MinWidth = 8;
             this.gv_supplierItemCode.Name = "gv_supplierItemCode";
             this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
             this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
             this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
             this.gv_supplierItemCode.Visible = true;
             this.gv_supplierItemCode.VisibleIndex = 3;
-            this.gv_supplierItemCode.Width = 12;
+            this.gv_supplierItemCode.Width = 8;
             // 
             // gv_supplierItemName
             // 
             this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
             this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
             this.gv_supplierItemName.FieldName = "wlmc";
-            this.gv_supplierItemName.MinWidth = 12;
+            this.gv_supplierItemName.MinWidth = 8;
             this.gv_supplierItemName.Name = "gv_supplierItemName";
             this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
             this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
             this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
             this.gv_supplierItemName.Visible = true;
             this.gv_supplierItemName.VisibleIndex = 4;
-            this.gv_supplierItemName.Width = 12;
+            this.gv_supplierItemName.Width = 8;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "閲囪喘鏁伴噺";
             this.gridColumn6.FieldName = "purchaseQty";
-            this.gridColumn6.MinWidth = 12;
+            this.gridColumn6.MinWidth = 8;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "purchaseQty", "閲囪喘:{0:0.##}")});
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 5;
-            this.gridColumn6.Width = 14;
+            this.gridColumn6.Width = 10;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "宸叉敹鏁伴噺";
             this.gridColumn9.FieldName = "yssl";
-            this.gridColumn9.MinWidth = 12;
+            this.gridColumn9.MinWidth = 8;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "yssl", "宸叉敹:{0:0.##}")});
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 6;
-            this.gridColumn9.Width = 62;
+            this.gridColumn9.Width = 43;
             // 
             // gridColumn7
             // 
@@ -292,103 +287,102 @@
             this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn7.Caption = "鏈敹鏁伴噺";
             this.gridColumn7.FieldName = "wssl";
-            this.gridColumn7.MinWidth = 12;
+            this.gridColumn7.MinWidth = 8;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "wssl", "鏈敹={0:0.##}")});
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 7;
-            this.gridColumn7.Width = 12;
+            this.gridColumn7.Width = 8;
             // 
             // gv_purchaseUnit
             // 
             this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
             this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅";
             this.gv_purchaseUnit.FieldName = "fname";
-            this.gv_purchaseUnit.MinWidth = 12;
+            this.gv_purchaseUnit.MinWidth = 8;
             this.gv_purchaseUnit.Name = "gv_purchaseUnit";
             this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
             this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
             this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
             this.gv_purchaseUnit.Visible = true;
             this.gv_purchaseUnit.VisibleIndex = 8;
-            this.gv_purchaseUnit.Width = 62;
+            this.gv_purchaseUnit.Width = 43;
             // 
             // gv_remarks
             // 
             this.gv_remarks.AppearanceCell.Options.UseFont = true;
             this.gv_remarks.Caption = "澶囨敞";
             this.gv_remarks.FieldName = "remarks";
-            this.gv_remarks.MinWidth = 12;
+            this.gv_remarks.MinWidth = 8;
             this.gv_remarks.Name = "gv_remarks";
             this.gv_remarks.OptionsColumn.AllowEdit = false;
             this.gv_remarks.OptionsColumn.ReadOnly = true;
             this.gv_remarks.Tag = "query_a.REMARKS";
             this.gv_remarks.Visible = true;
             this.gv_remarks.VisibleIndex = 9;
-            this.gv_remarks.Width = 12;
+            this.gv_remarks.Width = 8;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn5.FieldName = "wlgg";
-            this.gridColumn5.MinWidth = 12;
+            this.gridColumn5.MinWidth = 8;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 10;
-            this.gridColumn5.Width = 14;
+            this.gridColumn5.Width = 10;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "渚涘簲鍟�";
             this.gridColumn10.FieldName = "gysName";
-            this.gridColumn10.MinWidth = 12;
+            this.gridColumn10.MinWidth = 8;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 11;
-            this.gridColumn10.Width = 156;
+            this.gridColumn10.Width = 109;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鏀舵枡缁勭粐";
             this.gridColumn2.FieldName = "fSubsidiary";
-            this.gridColumn2.MinWidth = 12;
+            this.gridColumn2.MinWidth = 8;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 12;
-            this.gridColumn2.Width = 12;
+            this.gridColumn2.Width = 8;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "閿�鍞鍗�";
             this.gridColumn4.FieldName = "xxdd";
-            this.gridColumn4.MinWidth = 12;
+            this.gridColumn4.MinWidth = 8;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 13;
-            this.gridColumn4.Width = 150;
+            this.gridColumn4.Width = 105;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
             this.gridColumn1.FieldName = "documentTypeTxt";
-            this.gridColumn1.MinWidth = 12;
+            this.gridColumn1.MinWidth = 8;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 14;
-            this.gridColumn1.Width = 31;
+            this.gridColumn1.Width = 22;
             // 
             // panelControl1
             // 
             this.panelControl1.Controls.Add(this.btnIn);
             this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelControl1.Location = new System.Drawing.Point(0, 693);
-            this.panelControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panelControl1.Location = new System.Drawing.Point(0, 438);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(1404, 53);
+            this.panelControl1.Size = new System.Drawing.Size(981, 34);
             this.panelControl1.TabIndex = 5;
             // 
             // btnIn
@@ -397,32 +391,28 @@
             this.btnIn.Appearance.Options.UseBackColor = true;
             this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1284, 2);
-            this.btnIn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnIn.Location = new System.Drawing.Point(896, 2);
             this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(118, 49);
+            this.btnIn.Size = new System.Drawing.Size(83, 30);
             this.btnIn.TabIndex = 4;
             this.btnIn.Text = "纭畾瀵煎叆";
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.gridControl2);
-            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1404, 746);
+            this.xtraTabPage2.Size = new System.Drawing.Size(981, 472);
             this.xtraTabPage2.Text = "SRM鍒拌揣鍗�";
             // 
             // gridControl2
             // 
             this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gridControl2.Location = new System.Drawing.Point(0, 0);
             this.gridControl2.MainView = this.gridView2;
-            this.gridControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gridControl2.Name = "gridControl2";
             this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.rptSrm});
-            this.gridControl2.Size = new System.Drawing.Size(1404, 746);
+            this.gridControl2.Size = new System.Drawing.Size(981, 472);
             this.gridControl2.TabIndex = 4;
             this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView2});
@@ -437,7 +427,7 @@
             this.gv_userName,
             this.gv_Btn,
             this.gridColumn11});
-            this.gridView2.DetailHeight = 428;
+            this.gridView2.DetailHeight = 272;
             this.gridView2.GridControl = this.gridControl2;
             this.gridView2.Name = "gridView2";
             this.gridView2.OptionsFind.ShowSearchNavButtons = false;
@@ -449,59 +439,59 @@
             this.gv_operationTime.AppearanceCell.Options.UseFont = true;
             this.gv_operationTime.Caption = "鏀舵枡缁勭粐";
             this.gv_operationTime.FieldName = "orgName";
-            this.gv_operationTime.MinWidth = 12;
+            this.gv_operationTime.MinWidth = 8;
             this.gv_operationTime.Name = "gv_operationTime";
             this.gv_operationTime.OptionsColumn.AllowEdit = false;
             this.gv_operationTime.Tag = "query_OPERATION_TIME";
             this.gv_operationTime.Visible = true;
             this.gv_operationTime.VisibleIndex = 0;
-            this.gv_operationTime.Width = 375;
+            this.gv_operationTime.Width = 262;
             // 
             // gv_operationTable
             // 
             this.gv_operationTable.AppearanceCell.Options.UseFont = true;
             this.gv_operationTable.Caption = "閫佽揣渚涘簲鍟�";
             this.gv_operationTable.FieldName = "suppName";
-            this.gv_operationTable.MinWidth = 12;
+            this.gv_operationTable.MinWidth = 8;
             this.gv_operationTable.Name = "gv_operationTable";
             this.gv_operationTable.OptionsColumn.AllowEdit = false;
             this.gv_operationTable.Tag = "query_OPERATION_TABLE";
             this.gv_operationTable.Visible = true;
             this.gv_operationTable.VisibleIndex = 1;
-            this.gv_operationTable.Width = 125;
+            this.gv_operationTable.Width = 87;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鍗曟嵁绫诲瀷";
             this.gridColumn8.FieldName = "documentTypeTxt";
-            this.gridColumn8.MinWidth = 31;
+            this.gridColumn8.MinWidth = 22;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 3;
-            this.gridColumn8.Width = 117;
+            this.gridColumn8.Width = 82;
             // 
             // gv_userName
             // 
             this.gv_userName.AppearanceCell.Options.UseFont = true;
             this.gv_userName.Caption = "閫佽揣鍗曞彿";
             this.gv_userName.FieldName = "deliveryNo";
-            this.gv_userName.MinWidth = 12;
+            this.gv_userName.MinWidth = 8;
             this.gv_userName.Name = "gv_userName";
             this.gv_userName.OptionsColumn.AllowEdit = false;
             this.gv_userName.Tag = "query_USER_NAME";
             this.gv_userName.Visible = true;
             this.gv_userName.VisibleIndex = 2;
-            this.gv_userName.Width = 312;
+            this.gv_userName.Width = 218;
             // 
             // gv_Btn
             // 
             this.gv_Btn.Caption = "閫夋嫨";
             this.gv_Btn.ColumnEdit = this.rptSrm;
-            this.gv_Btn.MinWidth = 31;
+            this.gv_Btn.MinWidth = 22;
             this.gv_Btn.Name = "gv_Btn";
             this.gv_Btn.Visible = true;
             this.gv_Btn.VisibleIndex = 5;
-            this.gv_Btn.Width = 117;
+            this.gv_Btn.Width = 82;
             // 
             // rptSrm
             // 
@@ -518,11 +508,11 @@
             // 
             this.gridColumn11.Caption = "寤虹珛鏃堕棿";
             this.gridColumn11.FieldName = "createDate";
-            this.gridColumn11.MinWidth = 31;
+            this.gridColumn11.MinWidth = 22;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 4;
-            this.gridColumn11.Width = 117;
+            this.gridColumn11.Width = 82;
             // 
             // panelControl3
             // 
@@ -530,41 +520,37 @@
             this.panelControl3.Controls.Add(this.radioGroup1);
             this.panelControl3.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl3.Location = new System.Drawing.Point(2, 2);
-            this.panelControl3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panelControl3.Name = "panelControl3";
-            this.panelControl3.Size = new System.Drawing.Size(1406, 46);
+            this.panelControl3.Size = new System.Drawing.Size(983, 29);
             this.panelControl3.TabIndex = 6;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(68, 13);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(48, 8);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(154, 22);
+            this.label1.Size = new System.Drawing.Size(103, 14);
             this.label1.TabIndex = 1;
             this.label1.Text = "閫夋嫨閲囪喘鍗曠被鍨嬶細";
             // 
             // radioGroup1
             // 
             this.radioGroup1.EditValue = ((short)(0));
-            this.radioGroup1.Location = new System.Drawing.Point(236, 5);
-            this.radioGroup1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.radioGroup1.Location = new System.Drawing.Point(165, 3);
             this.radioGroup1.Name = "radioGroup1";
             this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
             new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(0)), "閲囪喘"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "濮斿")});
-            this.radioGroup1.Size = new System.Drawing.Size(246, 42);
+            this.radioGroup1.Size = new System.Drawing.Size(172, 27);
             this.radioGroup1.TabIndex = 0;
             // 
             // SelectCgMx
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.ClientSize = new System.Drawing.Size(987, 531);
             this.Controls.Add(this.panelControl2);
             this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "SelectCgMx";
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index dbba1ce..5ff9a65 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -76,6 +76,7 @@
             this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
             this.btnTBPrint = new DevExpress.XtraBars.BarLargeButtonItem();
+            this.btnRefuse = new DevExpress.XtraBars.BarLargeButtonItem();
             this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -139,9 +140,10 @@
             this.btnLianBan,
             this.btnGx,
             this.btnBaoGao,
-            this.btnTBPrint});
+            this.btnTBPrint,
+            this.btnRefuse});
             this.barManager1.MainMenu = this.bar2;
-            this.barManager1.MaxItemId = 76;
+            this.barManager1.MaxItemId = 77;
             // 
             // bar2
             // 
@@ -196,7 +198,8 @@
             new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
             new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnBaoGao),
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnTBPrint)});
+            new DevExpress.XtraBars.LinkPersistInfo(this.btnTBPrint),
+            new DevExpress.XtraBars.LinkPersistInfo(this.btnRefuse)});
             this.bar2.OptionsBar.DrawDragBorder = false;
             this.bar2.OptionsBar.MultiLine = true;
             this.bar2.OptionsBar.UseWholeRow = true;
@@ -620,48 +623,62 @@
             this.btnTBPrint.Name = "btnTBPrint";
             this.btnTBPrint.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             // 
+            // btnRefuse
+            // 
+            this.btnRefuse.Caption = "鎷掔";
+            this.btnRefuse.Id = 76;
+            this.btnRefuse.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnRefuse.ImageOptions.Image")));
+            this.btnRefuse.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnRefuse.ImageOptions.LargeImage")));
+            this.btnRefuse.Name = "btnRefuse";
+            this.btnRefuse.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+            // 
             // barDockControlTop
             // 
             this.barDockControlTop.CausesValidation = false;
             this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
             this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
             this.barDockControlTop.Manager = this.barManager1;
-            this.barDockControlTop.Size = new System.Drawing.Size(1543, 213);
+            this.barDockControlTop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.barDockControlTop.Size = new System.Drawing.Size(1350, 114);
             // 
             // barDockControlBottom
             // 
             this.barDockControlBottom.CausesValidation = false;
             this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.barDockControlBottom.Location = new System.Drawing.Point(0, 226);
+            this.barDockControlBottom.Location = new System.Drawing.Point(0, 176);
             this.barDockControlBottom.Manager = this.barManager1;
-            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
+            this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
             // 
             // barDockControlLeft
             // 
             this.barDockControlLeft.CausesValidation = false;
             this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
-            this.barDockControlLeft.Location = new System.Drawing.Point(0, 213);
+            this.barDockControlLeft.Location = new System.Drawing.Point(0, 114);
             this.barDockControlLeft.Manager = this.barManager1;
-            this.barDockControlLeft.Size = new System.Drawing.Size(0, 13);
+            this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.barDockControlLeft.Size = new System.Drawing.Size(0, 62);
             // 
             // barDockControlRight
             // 
             this.barDockControlRight.CausesValidation = false;
             this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
-            this.barDockControlRight.Location = new System.Drawing.Point(1543, 213);
+            this.barDockControlRight.Location = new System.Drawing.Point(1350, 114);
             this.barDockControlRight.Manager = this.barManager1;
-            this.barDockControlRight.Size = new System.Drawing.Size(0, 13);
+            this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.barDockControlRight.Size = new System.Drawing.Size(0, 62);
             // 
             // UcToolBarMenu
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.barDockControlLeft);
             this.Controls.Add(this.barDockControlRight);
             this.Controls.Add(this.barDockControlBottom);
             this.Controls.Add(this.barDockControlTop);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "UcToolBarMenu";
-            this.Size = new System.Drawing.Size(1543, 226);
+            this.Size = new System.Drawing.Size(1350, 176);
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -718,5 +735,6 @@
         private DevExpress.XtraBars.BarLargeButtonItem btnGx;
         private DevExpress.XtraBars.BarLargeButtonItem btnBaoGao;
         private DevExpress.XtraBars.BarLargeButtonItem btnTBPrint;
+        private DevExpress.XtraBars.BarLargeButtonItem btnRefuse;
     }
 }
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c4a25cf..12a6e95 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -66,6 +66,7 @@
             btnGx.ItemClick += BtnGx_ItemClick;
             btnBaoGao.ItemClick += BtnBaoGao_ItemClick;
             btnTBPrint.ItemClick += BtnTBPrint_ItemClick;
+            btnRefuse.ItemClick += BtnRefuse_ItemClick;
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
                 if (item is BarLargeButtonItem largeButtonItem)
@@ -79,8 +80,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>
@@ -211,6 +253,24 @@
             UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
             frm.ShowDialog();
         }
+
+        //鎷掔
+        private void BtnRefuse_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnRefuseClick != null) btnRefuseClick(this, e);
+            else
+                return;
+      
+            /*     if (string.IsNullOrEmpty(guidKey))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
+            frm.ShowDialog();*/
+        
+        }
+
 
         private void BtnPiZhun_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -473,6 +533,7 @@
                 lst.Add(btnGx.Name);
                 lst.Add(btnBaoGao.Name);
                 lst.Add(btnTBPrint.Name);
+                lst.Add(btnRefuse.Name);
                 _enabledBtn(lst);
                 this.currentAction = "esc";
                 if (btnEscClick != null) btnEscClick(this, e);
@@ -527,6 +588,8 @@
                     lst.Add(btnGx.Name);
                     lst.Add(btnBaoGao.Name);
                     lst.Add(btnTBPrint.Name);
+                    lst.Add(btnRefuse.Name);
+
                     _enabledBtn(lst);
                 }
             }
@@ -930,7 +993,10 @@
         /// </summary>
         public event EventHandler btnLogClick;
 
-
+        /// <summary>
+        ///   鎷掔
+        /// </summary>
+        public event EventHandler btnRefuseClick;
         /// <summary>
         ///   閲囪喘瀹℃牳
         /// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index b01a577..4751ce3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -527,6 +527,59 @@
         IbIgvBMhsY3btPuajr/ofExu8lLbQwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <data name="btnRefuse.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAEdyaWQ7Rml4ZWRXaWR0aDvWXAxK
+        AAACCUlEQVQ4T6XNS08TURgG4JN4W3mJYNEBUm0bqGlJgI1/xIVFdy4UMRoFCypOOxQErS1tEbAUNZC0
+        BZ12eqFQDAb1J1ivK1moGBExkUtYvX5nWrRJJzHGkzz5zrznzTcMwH/RDP+FZpi2NmK24ZioWOpZ3FzH
+        pqyN4iOTlZ5KuyUBFzaYJbnWirSlQUyZ68WI4ShCwhFJq1sScGN6I4sazZJSUweZ/jxeZZKGK6o0u5ph
+        WF/LZINFHKs04aFgRKS6Rgzp9JpdzXBSbxYfCAYMlFdK/jJBCpZXY1x3WNTqlgRcoEyAb/8hybvvIPPu
+        rWDuPTrJvfsAPZV2+dlGdhTZ+Re7imxnTt/0c1fgCbguPzcLiTh9WTj7afZn4SCidwaiZwY3PNPo9GTQ
+        eSeDjr7ECyZRces4vFkocwt5TxcQoxmf+wC5yLXbU4U2aEEajG9cWd3E95+buO7O4L7yTjXKxd+qQvH3
+        GJXpTtp7U1j6saGy9yTB+Mart9IqvrGjL6WW2nuTsNO030ziCteTQFtBa7eCVpeCy644mJ2KX1fWyYZa
+        HJ54oxqaJNHXGJx4hSEyGMm71BXD4vIaPpOLzhhYW3cCX+hjcXld3TgQyf0RzcEfziEQfvnbBYeMT9/W
+        8HFple6PwWxn7s6fOh/ClpMtI6qmliCazpHmEdiagwX3YDubnyfI8dP+Z78A9LmPpjWj5zAAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="btnRefuse.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAEdyaWQ7Rml4ZWRXaWR0aDvWXAxK
+        AAAHC0lEQVRYR62Wd3BUVRTGsaAIUhMUER3H9o+MDXAcS4h1VMZeIAQcdUYEZLCB0VATkmwaISABAiGA
+        UYRskk2y6b0gJgTRNFSwDUaKhBLSgZnj95333rJZFmUc78xvz31v757vu+fde/f1E5F/xaNdcgEudetr
+        85bLE683PXFrFLkcXAH6g8vcrgeYkffUhLdcnni96YnZmLR/2QvPh+146UXJf2ZSBK6vBoPTHnvclvfk
+        U7Jt4qO8dyWgUa+5PPF60xOzMemAiueek97GCtm3PEy2+j8Sm+I3MbY5KkTv2R/y5+BBgFXwmssTrzc9
+        MZsaWHPH2JjaOa9Luz1W6ufPlO8+miHtqTFSNiNAgsfctBxjaOD/qcB9/tPkvomBzMXGR8BnPDzk5ltX
+        Vc6YIm1fREhbSrgUvfmKvDdqzGp8NxK4HsG9D75GkMp7fuL1psUEv0CZ4DdVxvsFKMhJA75xd49ftfON
+        V+VI1Fw5bJstFZOflaW33EED14IB9zzwqpC7zeiZ1x2vNy3GPTxFAHJq46wGxd85bnnV1OflYMjb4pjk
+        L+lP+8kfQdOlYNJjEnzDbfEYMwToTrjr/pf7AaTynp9cbGP5ud2GJo4dJy1BgWJ/4kF5fcQ1iYHDRq7f
+        6j9Bfpv5goSNuZ0ZRwBuUdd5cLGNP7DgbN3hjJh06Ns+o1bO9R0t04eNZMlvJJMH+yS8NcRXXhk0/DNc
+        DwfWeeCZx8LScTXetA4ULiJv8KAZDK4BowGft4/JKHC9eW8oGAg4/iovnHdg8aN/XFJ5RXxytaxIrpIV
+        G02SqiRuY6XEIcZuqJCY9RUSnVgqUetKQCn6ZRK9rkyi1paILaFYIteUSOTaMoAxjPiO17Y1pQYJpRKB
+        MctWFVRCkyY4cf24Mi6pEmuib0v88hupa2rpw66GP2RXowWvW6QW92obDkhN/QGNtfW4Rr/m+wOyessO
+        M9u5FvZZMdcKq+EyMCB2Q6X0nD4r3b3kjEbOonr371JQvU/ySdVPklcNqvYBxh8ll1SCinPkKD9Iee0v
+        Eo7KdPWccdENQlcW0YDrxKSBgTGJ5dIDUfeBkShbZd1vKpBXCUEKWWKIKlT+ozjLf1Cyy/aKEzCS0pqf
+        Mdsi6ew+Dc4YIO/S+AIa4HpSA/wYGIXn1dVz1hxo/MCWUCLlu35VISeBWA6FLMoMskr3KpkWJXvFAUp2
+        /oznXSjtXaeVDsDcS+LyzzMwiAuI7jowoB1wcPjqYimr+cUUwqxMIZcYRJRiCLpoFkcRYlGzFO3YL6GY
+        7alOGuhF7NW8C2PzaIAHFneeGrg6HAtj5aYqCUfJWLawVX3hTEjoSjeQPEQpNKPB0hUkXyNnyz7j4rg8
+        7IoSWbxcDXC7ugwMpkg7nLbBZVsHYkevihR/vV9nQzJIIWMTYpOkFzQqaQXsN0lafqPYgca8BsnHuqHY
+        SeQ60d4rJwlyfxqVQwPD3A0M4SxO4cuT7T3mwF4JwQwKq/dLOsVU0BBNA/b8BhXTCDF7boOk5tVLam69
+        bEd/e0695GKdLIrNkeOneuQE0IjcQTYnDfDEVAP8GLIEYpw1B1qDl6Bk+dhyKkQRiKUiqpBLDEBsm4Xz
+        e/nKJAfrZEF0jhxr65HWtm7Ebs37cUQWDfA/w2Vg6CKUiu446BgG8UeLYnN1+22nGJNDzBCiQF+xrdnk
+        O9maBRC/zNoj2SXN8mlkthw92a20EuSdH55JAzzC+f+iBoYthBjd6SD+AEYWxORoGSnmEnIaAoYIYMzc
+        o3xhkkIc32J3NMsntiz560S3SZca+WiZ4zwDw1mqCJxaC6KdWrbgKKcEox8clY1Fky3BkU5EgBl9YmEz
+        CFKyVIwxyJYpQSjzx+EkU0vOWbO/MDoXUQ34uhsYQRG6O3K8ywVFslDGlMxvdUYpjj3yOaI7W5TdyuYM
+        Uieb0+tkE8gobJT5YZly6FiXSaccRt73Q9JpgK9vaoAfPpzFEZTpEAZwEH/AWfBg+RzJyRYIWGxOt6Dg
+        bhVMJmm7ZBNIttdhtzTIvGUZcqi1Uw4SGGDe95ak0QD/1vmPqAZ8Wa4j+PIgaSWdWipHUaMpwlkZgipG
+        kTREuyGWbK+VjegboJ9aqzvlw9AM+bO1Q/482qkw71zDAN8dzhmYh1IdpjgHYhAHzwtzYN83YEamoAq5
+        ixj9JPSTIKhst6jR3fNBaLq0/NUhLUdpwmDOotTzDPh8GOpwzZwlO4Q+F2EWHkFmcRMqYaCnIKpC0vGM
+        z9GgZq1oN5mPSVCUBizeNQy4HoGehAHvJFRMm7NBSOC7iCBw9nrtk6noT50FGEHArES9ZgyYSdbJFMQp
+        Gg0mv2Oxtk//pbfi+UbkOor5PkAn/HfiymRp+I53Ia67CPjOeCGYn+J8z9Q3IustmG5o5L/g+QL7T3A8
+        taDZ75K/Ac6hxSfLJAohAAAAAElFTkSuQmCC
+</value>
+  </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>79</value>
   </metadata>
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