From e9f9537f39a505a30bcaa1996dc4f61a508f50fc Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com.com>
Date: 星期二, 28 十月 2025 17:24:15 +0800
Subject: [PATCH] 采购到货单收料明细:增加需求跟踪号 采购入库单入料明细:增加需求跟踪号 到货条码打印来料明细:增加需求跟踪号

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.Designer.cs    | 1100 ++++++++++++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjl.cs                         |    7 
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .cs                     |  399 ++++
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .resx                   |  123 +
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1316 +++++++-------
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs         |  398 ++-
 DevApp/Gs.DevApp/Gs.DevApp.csproj                                |   18 
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.cs             |  543 ++++++
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs         |  444 ++--
 DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .Designer.cs            |  824 +++++++++
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.resx           |  123 +
 11 files changed, 4,310 insertions(+), 985 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.Designer.cs
new file mode 100644
index 0000000..3a0c216
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.Designer.cs
@@ -0,0 +1,1100 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+    partial class Frm_MesDepotMin
+    {
+        /// <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.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.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_zuid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_isFkc = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = 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.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
+            this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
+            this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
+            this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_description = new DevExpress.XtraEditors.TextEdit();
+            this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.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.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1depotSectionName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1description = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.bandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_DepotModel = new DevExpress.XtraEditors.ComboBoxEdit();
+            ((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.xtraTabPage3.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_isFkc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.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();
+            ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = "MES_DEPOTS,check_date,check_status,check_by";
+            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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1108, 62);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1108, 468);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            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(1106, 442);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1106, 442);
+            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(3, 2, 3, 2);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            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(1106, 402);
+            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 = 47;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gv_depotCode,
+            this.gv_depotName,
+            this.gv_depottype,
+            this.gv_createBy,
+            this.gv_zuid,
+            this.gv_isFkc,
+            this.gridColumn2,
+            this.gridColumn6,
+            this.gridColumn5,
+            this.gridColumn4,
+            this.gridColumn7,
+            this.gridColumn3,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10});
+            this.gridView1.DetailHeight = 272;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 44;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "浣跨敤缁勭粐";
+            this.gridColumn1.FieldName = "fSubsidiary";
+            this.gridColumn1.MinWidth = 44;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.Tag = "org.FNumber";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 0;
+            this.gridColumn1.Width = 219;
+            // 
+            // gv_depotCode
+            // 
+            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
+            this.gv_depotCode.Caption = "浠撳簱缂栫爜";
+            this.gv_depotCode.FieldName = "depotCode";
+            this.gv_depotCode.MinWidth = 44;
+            this.gv_depotCode.Name = "gv_depotCode";
+            this.gv_depotCode.OptionsColumn.AllowEdit = false;
+            this.gv_depotCode.Tag = "query_a.depot_code";
+            this.gv_depotCode.Visible = true;
+            this.gv_depotCode.VisibleIndex = 1;
+            this.gv_depotCode.Width = 87;
+            // 
+            // gv_depotName
+            // 
+            this.gv_depotName.AppearanceCell.Options.UseFont = true;
+            this.gv_depotName.Caption = "浠撳簱鍚嶇О";
+            this.gv_depotName.FieldName = "depotName";
+            this.gv_depotName.MinWidth = 44;
+            this.gv_depotName.Name = "gv_depotName";
+            this.gv_depotName.OptionsColumn.AllowEdit = false;
+            this.gv_depotName.Tag = "query_a.depot_name";
+            this.gv_depotName.Visible = true;
+            this.gv_depotName.VisibleIndex = 2;
+            this.gv_depotName.Width = 131;
+            // 
+            // gv_depottype
+            // 
+            this.gv_depottype.AppearanceCell.Options.UseFont = true;
+            this.gv_depottype.Caption = "浠撳簱灞炴��";
+            this.gv_depottype.FieldName = "depottype";
+            this.gv_depottype.MinWidth = 44;
+            this.gv_depottype.Name = "gv_depottype";
+            this.gv_depottype.OptionsColumn.AllowEdit = false;
+            this.gv_depottype.Tag = "query_a.depottype";
+            this.gv_depottype.Visible = true;
+            this.gv_depottype.VisibleIndex = 3;
+            this.gv_depottype.Width = 70;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "浠撳簱璐熻矗浜�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 44;
+            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 = 4;
+            this.gv_createBy.Width = 62;
+            // 
+            // gv_zuid
+            // 
+            this.gv_zuid.AppearanceCell.Options.UseFont = true;
+            this.gv_zuid.Caption = "鍒嗙粍";
+            this.gv_zuid.FieldName = "zuid";
+            this.gv_zuid.MinWidth = 44;
+            this.gv_zuid.Name = "gv_zuid";
+            this.gv_zuid.OptionsColumn.AllowEdit = false;
+            this.gv_zuid.Tag = "query_a.zuid";
+            this.gv_zuid.Width = 62;
+            // 
+            // gv_isFkc
+            // 
+            this.gv_isFkc.AppearanceCell.Options.UseFont = true;
+            this.gv_isFkc.Caption = "鍏佽璐熷簱瀛�";
+            this.gv_isFkc.FieldName = "isFkc";
+            this.gv_isFkc.MaxWidth = 52;
+            this.gv_isFkc.MinWidth = 52;
+            this.gv_isFkc.Name = "gv_isFkc";
+            this.gv_isFkc.OptionsColumn.AllowEdit = false;
+            this.gv_isFkc.Tag = "query_a.is_fkc";
+            this.gv_isFkc.Visible = true;
+            this.gv_isFkc.VisibleIndex = 5;
+            this.gv_isFkc.Width = 52;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "绂佺敤鐘舵��";
+            this.gridColumn2.FieldName = "isNg";
+            this.gridColumn2.MaxWidth = 44;
+            this.gridColumn2.MinWidth = 44;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Tag = "query_a.zuid";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 6;
+            this.gridColumn2.Width = 44;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "渚涘簲鍟�";
+            this.gridColumn6.FieldName = "suppLierId";
+            this.gridColumn6.MinWidth = 52;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 7;
+            this.gridColumn6.Width = 61;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "瀹㈡埛";
+            this.gridColumn5.FieldName = "clientId";
+            this.gridColumn5.MinWidth = 52;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Tag = "query_a.Client_Id";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 8;
+            this.gridColumn5.Width = 52;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "閮ㄩ棬";
+            this.gridColumn4.FieldName = "department";
+            this.gridColumn4.MinWidth = 52;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Tag = "query_a.department";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 9;
+            this.gridColumn4.Width = 52;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鑱旂郴鐢佃瘽";
+            this.gridColumn7.FieldName = "phone";
+            this.gridColumn7.MinWidth = 52;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Tag = "query_a.Phone";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 10;
+            this.gridColumn7.Width = 52;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鍚屾鏃堕棿";
+            this.gridColumn3.FieldName = "lastupdateDate";
+            this.gridColumn3.MinWidth = 44;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Tag = "query_a.lastupdate_date";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 13;
+            this.gridColumn3.Width = 157;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "涓婚敭Guid";
+            this.gridColumn8.FieldName = "guid";
+            this.gridColumn8.MinWidth = 22;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Width = 82;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "浠撳簱ID";
+            this.gridColumn9.FieldName = "depotId";
+            this.gridColumn9.MinWidth = 22;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 11;
+            this.gridColumn9.Width = 82;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn10.FieldName = "documentStatus";
+            this.gridColumn10.MinWidth = 22;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 12;
+            this.gridColumn10.Width = 82;
+            // 
+            // 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.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1106, 30);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.splitMx1);
+            this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1106, 442);
+            this.xtraTabPage3.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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1106, 442);
+            this.splitMx1.SplitterPosition = 113;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.ucBtnPrint1);
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_isFkc);
+            this.layoutMx1.Controls.Add(this.txt_isNg);
+            this.layoutMx1.Controls.Add(this.txt_depotCode);
+            this.layoutMx1.Controls.Add(this.txt_zuid);
+            this.layoutMx1.Controls.Add(this.txt_depotName);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_description);
+            this.layoutMx1.Controls.Add(this.txt_depottype);
+            this.layoutMx1.Controls.Add(this.txt_DepotModel);
+            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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(460, 453, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1106, 113);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // ucBtnPrint1
+            // 
+            this.ucBtnPrint1.allClickKey = null;
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(554, 74);
+            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.Size = new System.Drawing.Size(267, 27);
+            this.ucBtnPrint1.TabIndex = 292;
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(825, 74);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(269, 27);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_isFkc
+            // 
+            this.txt_isFkc.Location = new System.Drawing.Point(909, 12);
+            this.txt_isFkc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_isFkc.Name = "txt_isFkc";
+            this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
+            this.txt_isFkc.Size = new System.Drawing.Size(185, 20);
+            this.txt_isFkc.StyleController = this.layoutMx1;
+            this.txt_isFkc.TabIndex = 291;
+            this.txt_isFkc.Tag = "readonly";
+            // 
+            // txt_isNg
+            // 
+            this.txt_isNg.Location = new System.Drawing.Point(909, 43);
+            this.txt_isNg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_isNg.Name = "txt_isNg";
+            this.txt_isNg.Properties.Appearance.Options.UseFont = true;
+            this.txt_isNg.Size = new System.Drawing.Size(185, 20);
+            this.txt_isNg.StyleController = this.layoutMx1;
+            this.txt_isNg.TabIndex = 267;
+            this.txt_isNg.Tag = "readonly";
+            // 
+            // txt_depotCode
+            // 
+            this.txt_depotCode.Location = new System.Drawing.Point(96, 12);
+            this.txt_depotCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_depotCode.Name = "txt_depotCode";
+            this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
+            this.txt_depotCode.Size = new System.Drawing.Size(183, 20);
+            this.txt_depotCode.StyleController = this.layoutMx1;
+            this.txt_depotCode.TabIndex = 213;
+            this.txt_depotCode.Tag = "readonly";
+            // 
+            // txt_zuid
+            // 
+            this.txt_zuid.Location = new System.Drawing.Point(638, 43);
+            this.txt_zuid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_zuid.Name = "txt_zuid";
+            this.txt_zuid.Properties.Appearance.Options.UseFont = true;
+            this.txt_zuid.Size = new System.Drawing.Size(183, 20);
+            this.txt_zuid.StyleController = this.layoutMx1;
+            this.txt_zuid.TabIndex = 285;
+            this.txt_zuid.Tag = "readonly";
+            // 
+            // txt_depotName
+            // 
+            this.txt_depotName.Location = new System.Drawing.Point(367, 12);
+            this.txt_depotName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_depotName.Name = "txt_depotName";
+            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
+            this.txt_depotName.Size = new System.Drawing.Size(183, 20);
+            this.txt_depotName.StyleController = this.layoutMx1;
+            this.txt_depotName.TabIndex = 216;
+            this.txt_depotName.Tag = "readonly";
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(638, 12);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(183, 20);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 219;
+            this.txt_createBy.Tag = "readonly";
+            // 
+            // txt_description
+            // 
+            this.txt_description.Location = new System.Drawing.Point(96, 43);
+            this.txt_description.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_description.Name = "txt_description";
+            this.txt_description.Properties.Appearance.Options.UseFont = true;
+            this.txt_description.Size = new System.Drawing.Size(183, 20);
+            this.txt_description.StyleController = this.layoutMx1;
+            this.txt_description.TabIndex = 217;
+            this.txt_description.Tag = "readonly";
+            // 
+            // txt_depottype
+            // 
+            this.txt_depottype.Location = new System.Drawing.Point(367, 43);
+            this.txt_depottype.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_depottype.Name = "txt_depottype";
+            this.txt_depottype.Properties.Appearance.Options.UseFont = true;
+            this.txt_depottype.Size = new System.Drawing.Size(183, 20);
+            this.txt_depottype.StyleController = this.layoutMx1;
+            this.txt_depottype.TabIndex = 231;
+            this.txt_depottype.Tag = "readonly";
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.lbGuid;
+            this.layoutControlItem9.Location = new System.Drawing.Point(813, 62);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem9.Size = new System.Drawing.Size(273, 31);
+            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.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem1});
+            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;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3});
+            this.Root.Size = new System.Drawing.Size(1106, 113);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_depotName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem2.Text = "浠撳簱鍚嶇О";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_createBy;
+            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem3.Text = "浠撳簱璐熻矗浜�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_description;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem4.Text = "澶囨敞";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_depottype;
+            this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem5.Text = "浠撳簱绫诲瀷";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_zuid;
+            this.layoutControlItem6.Location = new System.Drawing.Point(542, 31);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem6.Text = "鍒嗙粍";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_isFkc;
+            this.layoutControlItem7.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem7.Size = new System.Drawing.Size(273, 31);
+            this.layoutControlItem7.Text = "鍏佽璐熷簱瀛�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_isNg;
+            this.layoutControlItem8.Location = new System.Drawing.Point(813, 31);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(273, 31);
+            this.layoutControlItem8.Text = "绂佺敤鐘舵��";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.ucBtnPrint1;
+            this.layoutControlItem10.CustomizationFormText = "鎵撳嵃鎸夐挳";
+            this.layoutControlItem10.Location = new System.Drawing.Point(542, 62);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // 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(3, 2, 3, 2);
+            this.tabMx.Name = "tabMx";
+            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.Size = new System.Drawing.Size(1106, 319);
+            this.tabMx.TabIndex = 3;
+            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabMxPage1});
+            // 
+            // tabMxPage1
+            // 
+            this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabMxPage1.Name = "tabMxPage1";
+            this.tabMxPage1.Size = new System.Drawing.Size(1104, 293);
+            this.tabMxPage1.Text = "浠撲綅鍒楄〃";
+            // 
+            // gcMx1
+            // 
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMx1.Size = new System.Drawing.Size(1104, 293);
+            this.gcMx1.TabIndex = 0;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1,
+            this.bandedGridView1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Appearance.Row.Options.UseFont = true;
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1guid,
+            this.gvMx1depotSectionCode,
+            this.gvMx1depotSectionName,
+            this.gvMx1description,
+            this.gvMx1lastupdateBy,
+            this.gvMx1lastupdateDate,
+            this.gvMxDel,
+            this.gridColumn11});
+            this.gvMx1.DetailHeight = 272;
+            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.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+            this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx1guid
+            // 
+            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+            this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.MinWidth = 44;
+            this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.OptionsColumn.ReadOnly = true;
+            this.gvMx1guid.Tag = "query_a.guid";
+            this.gvMx1guid.Width = 82;
+            // 
+            // gvMx1depotSectionCode
+            // 
+            this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
+            this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
+            this.gvMx1depotSectionCode.MinWidth = 44;
+            this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
+            this.gvMx1depotSectionCode.Tag = "edit";
+            this.gvMx1depotSectionCode.Visible = true;
+            this.gvMx1depotSectionCode.VisibleIndex = 0;
+            this.gvMx1depotSectionCode.Width = 82;
+            // 
+            // gvMx1depotSectionName
+            // 
+            this.gvMx1depotSectionName.AppearanceCell.Options.UseFont = true;
+            this.gvMx1depotSectionName.Caption = "璐т綅鍚嶇О";
+            this.gvMx1depotSectionName.FieldName = "depotSectionName";
+            this.gvMx1depotSectionName.MinWidth = 44;
+            this.gvMx1depotSectionName.Name = "gvMx1depotSectionName";
+            this.gvMx1depotSectionName.Tag = "edit";
+            this.gvMx1depotSectionName.Visible = true;
+            this.gvMx1depotSectionName.VisibleIndex = 1;
+            this.gvMx1depotSectionName.Width = 82;
+            // 
+            // gvMx1description
+            // 
+            this.gvMx1description.AppearanceCell.Options.UseFont = true;
+            this.gvMx1description.Caption = "澶囨敞";
+            this.gvMx1description.FieldName = "description";
+            this.gvMx1description.MinWidth = 44;
+            this.gvMx1description.Name = "gvMx1description";
+            this.gvMx1description.Tag = "edit";
+            this.gvMx1description.Visible = true;
+            this.gvMx1description.VisibleIndex = 2;
+            this.gvMx1description.Width = 82;
+            // 
+            // gvMx1lastupdateBy
+            // 
+            this.gvMx1lastupdateBy.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
+            this.gvMx1lastupdateBy.FieldName = "lastupdateBy";
+            this.gvMx1lastupdateBy.MinWidth = 44;
+            this.gvMx1lastupdateBy.Name = "gvMx1lastupdateBy";
+            this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true;
+            this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
+            this.gvMx1lastupdateBy.Visible = true;
+            this.gvMx1lastupdateBy.VisibleIndex = 3;
+            this.gvMx1lastupdateBy.Width = 82;
+            // 
+            // gvMx1lastupdateDate
+            // 
+            this.gvMx1lastupdateDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
+            this.gvMx1lastupdateDate.FieldName = "lastupdateDate";
+            this.gvMx1lastupdateDate.MinWidth = 44;
+            this.gvMx1lastupdateDate.Name = "gvMx1lastupdateDate";
+            this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true;
+            this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
+            this.gvMx1lastupdateDate.Visible = true;
+            this.gvMx1lastupdateDate.VisibleIndex = 4;
+            this.gvMx1lastupdateDate.Width = 157;
+            // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 22;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 6;
+            this.gvMxDel.Width = 87;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "鎵�灞炰粨搴揑D";
+            this.gridColumn11.FieldName = "depotGuid";
+            this.gridColumn11.MinWidth = 22;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 5;
+            this.gridColumn11.Width = 82;
+            // 
+            // bandedGridView1
+            // 
+            this.bandedGridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand1});
+            this.bandedGridView1.GridControl = this.gcMx1;
+            this.bandedGridView1.Name = "bandedGridView1";
+            // 
+            // gridBand1
+            // 
+            this.gridBand1.Caption = "gridBand1";
+            this.gridBand1.Name = "gridBand1";
+            this.gridBand1.VisibleIndex = 0;
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_DepotModel;
+            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem11.CustomizationFormText = "閫夋嫨搴撲綅妯℃澘";
+            this.layoutControlItem11.Location = new System.Drawing.Point(271, 62);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem11.Text = "閫夋嫨搴撲綅妯℃澘";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_depotCode;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem1.Text = "浠撳簱缂栫爜";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // txt_DepotModel
+            // 
+            this.txt_DepotModel.Location = new System.Drawing.Point(367, 74);
+            this.txt_DepotModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_DepotModel.Name = "txt_DepotModel";
+            this.txt_DepotModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_DepotModel.Properties.Items.AddRange(new object[] {
+            "搴撲綅鐮侊紙灏忥級",
+            "搴撲綅鐮侊紙澶э級"});
+            this.txt_DepotModel.Size = new System.Drawing.Size(183, 20);
+            this.txt_DepotModel.StyleController = this.layoutMx1;
+            this.txt_DepotModel.TabIndex = 272;
+            this.txt_DepotModel.Tag = "readOnly-1";
+            // 
+            // Frm_MesDepot
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1108, 530);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "Frm_MesDepot";
+            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.xtraTabPage3.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_isFkc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.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();
+            ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).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 gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_isFkc;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.TextEdit txt_isFkc;
+        private DevExpress.XtraEditors.TextEdit txt_zuid;
+        private DevExpress.XtraEditors.TextEdit txt_depottype;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_description;
+        private DevExpress.XtraEditors.TextEdit txt_depotName;
+        private DevExpress.XtraEditors.TextEdit txt_depotCode;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        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 gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraEditors.TextEdit txt_isNg;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView bandedGridView1;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+        private UserControl.UcBtnPrint ucBtnPrint1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_iCount_1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.cs
new file mode 100644
index 0000000..0606b4d
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.cs
@@ -0,0 +1,543 @@
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm
+{
+    public partial class Frm_MesDepotMin : XtraForm
+    {
+        private List<FilterEntity> _filterList = new List<FilterEntity>();
+        private readonly string _webServiceName = "MesDepotsManager/";
+
+        private DevExpress.XtraEditors.ComboBoxEdit txt_DepotModel;
+        private string _kwModel;
+
+        /*  public Frm_MesDepot()
+          {
+              InitializeComponent();
+              toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+              toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+              toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+              toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+              toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+              this.toolBarMenu1.getXmlConfig();
+              Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+              Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, 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;
+
+              //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+              this.ucBtnPrint1.btnAllClick += (s, e) =>
+              {
+                  string rowGuid = lbGuid.Text.Trim();
+                  SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "浠撲綅鐮�");
+                  string strCodeList = "";
+                  frm.UpdateParent += (ss, ee) =>
+                  {
+                      strCodeList = ee.StringSingle;
+                  };
+                  frm.ShowDialog();
+                  if (string.IsNullOrEmpty(strCodeList))
+                      return;
+                  try
+                  {
+                      string rptParameter = "rpt_KW1{"
+                      + "100"//閲嶆墦閮芥槸浼�100锛�
+                      + "," + ""
+                      + "," + ""
+                      + "," + ""
+                      + "," + ""
+                      + "," + strCodeList
+                      + "}";
+                      using (Form rpt = new RptPreview(rowGuid, rptParameter))
+                      {
+                          rpt.ShowDialog();
+                      }
+                      frm.Close();
+                  }
+                  catch (Exception ex)
+                  {
+                      MsgHelper.ShowError(ex.Message);
+                  }
+              };
+              this.ucBtnPrint1.SetPrintButton(false);
+
+          }
+       */
+
+        /*******搴撲綅鏉$爜妯℃澘鍒囨崲*****/
+        public Frm_MesDepotMin()
+        {
+            InitializeComponent();
+            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, 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;
+
+            // 鍒濆鍖杢xt_DepotModel鎺т欢
+            InitDepotModelControl();
+
+            //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+            this.ucBtnPrint1.btnAllClick += (s, e) =>
+            {
+                string rowGuid = lbGuid.Text.Trim();
+                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "浠撲綅鐮�");
+                string strCodeList = "";
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    strCodeList = ee.StringSingle;
+                };
+                frm.ShowDialog();
+                if (string.IsNullOrEmpty(strCodeList))
+                    return;
+
+                try
+                {
+                    // 鏍规嵁閫夋嫨鐨勫�艰缃姤琛ㄦā鍨�
+                    SetKwModelBySelectedValue();
+
+                    // 楠岃瘉妯″瀷鏄惁鏈夋晥
+                    if (string.IsNullOrEmpty(_kwModel))
+                    {
+                        MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶆ā鍨嬬被鍨�");
+                        return;
+                    }
+
+                    // 浣跨敤鍔ㄦ�佹ā鍨嬪悕绉版瀯寤哄弬鏁�
+                    string rptParameter = $"{_kwModel}{{"
+                        + "100" // 閲嶆墦閮芥槸浼�100
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + strCodeList
+                        + "}";
+
+                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
+                    {
+                        rpt.ShowDialog();
+                    }
+                    frm.Close();
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.ShowError(ex.Message);
+                }
+            };
+            this.ucBtnPrint1.SetPrintButton(false);
+        }
+
+        /// <summary>
+        /// 鍒濆鍖杢xt_DepotModel鎺т欢锛堟煡鎵惧苟璧嬪�硷級
+        /// </summary>
+        private void InitDepotModelControl()
+        {
+            // 閫掑綊鏌ユ壘绐椾綋涓墍鏈夋帶浠讹紙鍖呮嫭瀛愬鍣級
+            Control[] foundControls = this.Controls.Find("txt_DepotModel", true);
+            if (foundControls != null && foundControls.Length > 0 && foundControls[0] is DevExpress.XtraEditors.ComboBoxEdit)
+            {
+                txt_DepotModel = (DevExpress.XtraEditors.ComboBoxEdit)foundControls[0];
+            }
+            else
+            {
+                System.Diagnostics.Debug.WriteLine("璀﹀憡锛氭湭鎵惧埌txt_DepotModel鎺т欢锛岃妫�鏌ユ帶浠禢ame鏄惁姝g‘");
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁txt_DepotModel閫夋嫨鐨勫�艰缃甠kwModel
+        /// </summary>
+        private void SetKwModelBySelectedValue()
+        {
+            // 閲嶇疆妯″瀷鍊�
+            _kwModel = string.Empty;
+
+            // 妫�鏌ユ帶浠舵槸鍚﹀瓨鍦�
+            if (txt_DepotModel == null)
+            {
+                MsgHelper.ShowError("鏈壘鍒板簱浣嶆ā鍨嬮�夋嫨鎺т欢");
+                return;
+            }
+
+            // 鑾峰彇閫夋嫨鐨勫��
+            string selectedValue = txt_DepotModel.EditValue?.ToString().Trim() ?? string.Empty;
+            string selectedText = txt_DepotModel.Text?.Trim() ?? string.Empty;
+
+            // 鍒ゆ柇閫夋嫨鐨勫�煎苟璁剧疆瀵瑰簲鐨勬ā鍨�
+            // 杩欓噷鍚屾椂鍒ゆ柇EditValue鍜孴ext锛岀‘淇濆吋瀹规�э紙鏍规嵁瀹為檯鏁版嵁缁戝畾鎯呭喌璋冩暣锛�
+            if (selectedValue == "搴撲綅鐮侊紙灏忥級" || selectedText == "搴撲綅鐮侊紙灏忥級")
+            {
+                _kwModel = "rpt_KW";
+            }
+            else if (selectedValue == "搴撲綅鐮侊紙澶э級" || selectedText == "搴撲綅鐮侊紙澶э級")
+            {
+                _kwModel = "rpt_KW1";
+            }
+            else
+            {
+                MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶇爜绫诲瀷锛堝皬/澶э級");
+            }
+        }
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            Task.Delay(100);
+            getPageList(1);
+        }
+        /// <summary>
+        ///     鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+
+        /// <summary>
+        ///     鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+
+        /// <summary>
+        ///     鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+
+        /// <summary>
+        ///     鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        ///     鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+            }
+        }
+
+        /// <summary>
+        ///     淇敼浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.currentAction = "edit";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_depotCode, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else
+            {
+                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                gvList.Add(gvMx1);
+                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+            }
+        }
+
+
+        /// <summary>
+        ///     淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+            if (string.IsNullOrEmpty(txt_depotCode.Text.Trim()))
+            {
+                MsgHelper.Warning("浠撳簱缂栫爜涓嶈兘涓虹┖锛�");
+                txt_depotCode.Focus();
+                return;
+            }
+
+            if (string.IsNullOrEmpty(txt_depotName.Text.Trim()))
+            {
+                MsgHelper.Warning("浠撳簱鍚嶇О涓嶈兘涓虹┖锛�");
+                txt_depotName.Focus();
+                return;
+            }
+            gvMx1.CloseEditor();
+            gvMx1.UpdateCurrentRow();
+            var lst = new List<MesDepotSections>();
+            for (var i = 0; i < gvMx1.DataRowCount; i++)
+            {
+                var row = gvMx1.GetDataRow(i);
+                if (row != null)
+                {
+                    if (string.IsNullOrEmpty(row["depotSectionCode"].ToString()))
+                    {
+                        MsgHelper.ShowError("缂栫爜涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["DepotSectionName"].ToString()))
+                    {
+                        MsgHelper.ShowError("鍚嶇О涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    lst.Add(new MesDepotSections
+                    {
+                        Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
+                        DepotSectionCode = row["depotSectionCode"].ToString(),
+                        DepotSectionName = row["DepotSectionName"].ToString(),
+                        Description = row["Description"].ToString(),
+                    });
+                }
+            }
+            var _obj = new MesDepots
+            {
+                Guid = lbGuid.Text.Trim(),
+                DepotCode = txt_depotCode.Text,
+                DepotName = txt_depotName.Text,
+                Description = txt_description.Text,
+                list = lst
+            };
+
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                if (_rtn.rtnCode > 0)
+                {
+                    lbGuid.Text = _rtn.rtnData;
+                    toolBarMenu1.isSetBtn = true;
+                    var gridViews = new List<GridView>();
+                    gridViews.Add(gvMx1);
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, 
+                this.pageBar1.RowsCount, 
+                "org.FNumber asc ,a.depot_code", "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();
+                    }
+                    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);
+            }
+        }
+
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid //涓诲缓
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                { 
+                    var dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    var gvList = new List<GridView>();
+                    gvList.Add(gvMx1);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+                    var _job = JObject.Parse(strJson);
+                    var array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
+                    var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = dt;
+                        gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
+                    }
+                    else
+                    {
+                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+                    }
+                }
+                else
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        private void repositoryItemButtonEdit1_ButtonClick(object sender,
+            ButtonPressedEventArgs e)
+        {
+            gvMx1.CloseEditor();
+            gvMx1.UpdateCurrentRow();
+            var rowhandle = gvMx1.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvMx1.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                    return;
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    gvMx1.DeleteRow(rowhandle);
+                    return;
+                }
+                var strJson = "";
+                var lst = new List<string>();
+                lst.Add(mxGuid);
+                try
+                {
+                    strJson = UtilityHelper.HttpPost("",
+                        _webServiceName + "DeleteModelMx",
+                        JsonConvert.SerializeObject(lst));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.resx
new file mode 100644
index 0000000..a4826a3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepotMin.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 49c88c8..c2f2011 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -156,6 +156,7 @@
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_iqcsub = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -227,9 +228,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(5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
-            this.toolBarMenu1.Size = new System.Drawing.Size(1575, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1969, 98);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}";
@@ -237,10 +239,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1575, 601);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1969, 734);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -249,8 +252,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1573, 569);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1967, 696);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -259,6 +263,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);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -271,19 +276,21 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1573, 569);
+            this.split1.Size = new System.Drawing.Size(1967, 696);
             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);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMain1.Name = "gcMain1";
             this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit1});
-            this.gcMain1.Size = new System.Drawing.Size(1573, 518);
+            this.gcMain1.Size = new System.Drawing.Size(1967, 633);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -293,7 +300,7 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.ColumnPanelRowHeight = 33;
+            this.gridView1.ColumnPanelRowHeight = 40;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.bandedGridColumn1,
             this.gv_fType,
@@ -312,8 +319,9 @@
             this.gridColumn7,
             this.gv_isCompleted,
             this.gridColumn21});
+            this.gridView1.DetailHeight = 428;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.IndicatorWidth = 62;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
@@ -324,14 +332,14 @@
             // 
             this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
             this.bandedGridColumn1.FieldName = "receivingOrg";
-            this.bandedGridColumn1.MinWidth = 50;
+            this.bandedGridColumn1.MinWidth = 62;
             this.bandedGridColumn1.Name = "bandedGridColumn1";
             this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
             this.bandedGridColumn1.OptionsColumn.ReadOnly = true;
             this.bandedGridColumn1.Tag = "org.fnamber";
             this.bandedGridColumn1.Visible = true;
             this.bandedGridColumn1.VisibleIndex = 0;
-            this.bandedGridColumn1.Width = 61;
+            this.bandedGridColumn1.Width = 76;
             // 
             // gv_fType
             // 
@@ -340,185 +348,185 @@
             this.gv_fType.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gv_fType.Caption = "濮斿鏍囪瘑";
             this.gv_fType.FieldName = "fType";
-            this.gv_fType.MinWidth = 19;
+            this.gv_fType.MinWidth = 24;
             this.gv_fType.Name = "gv_fType";
             this.gv_fType.OptionsColumn.AllowEdit = false;
             this.gv_fType.Tag = "query_a.f_type";
             this.gv_fType.UnboundDataType = typeof(bool);
             this.gv_fType.Visible = true;
             this.gv_fType.VisibleIndex = 1;
-            this.gv_fType.Width = 67;
+            this.gv_fType.Width = 84;
             // 
             // gv_urgentFlag
             // 
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gv_urgentFlag.FieldName = "urgentFlagTxt";
-            this.gv_urgentFlag.MinWidth = 19;
+            this.gv_urgentFlag.MinWidth = 24;
             this.gv_urgentFlag.Name = "gv_urgentFlag";
             this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
             this.gv_urgentFlag.Tag = "query_a.urgent_flag";
             this.gv_urgentFlag.UnboundDataType = typeof(bool);
             this.gv_urgentFlag.Visible = true;
             this.gv_urgentFlag.VisibleIndex = 2;
-            this.gv_urgentFlag.Width = 67;
+            this.gv_urgentFlag.Width = 84;
             // 
             // gv_fstatus
             // 
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
             this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
             this.gv_fstatus.FieldName = "fstatus";
-            this.gv_fstatus.MinWidth = 19;
+            this.gv_fstatus.MinWidth = 24;
             this.gv_fstatus.Name = "gv_fstatus";
             this.gv_fstatus.OptionsColumn.AllowEdit = false;
             this.gv_fstatus.Tag = "query_a.fstatus";
             this.gv_fstatus.UnboundDataType = typeof(bool);
             this.gv_fstatus.Visible = true;
             this.gv_fstatus.VisibleIndex = 3;
-            this.gv_fstatus.Width = 67;
+            this.gv_fstatus.Width = 84;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 19;
+            this.gv_billNo.MinWidth = 24;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 4;
-            this.gv_billNo.Width = 67;
+            this.gv_billNo.Width = 84;
             // 
             // gv_createBy
             // 
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
             this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 19;
+            this.gv_createBy.MinWidth = 24;
             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 = 89;
+            this.gv_createBy.Width = 111;
             // 
             // gv_createDate
             // 
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
             this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 19;
+            this.gv_createDate.MinWidth = 24;
             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 = 193;
+            this.gv_createDate.Width = 241;
             // 
             // gv_checkUser
             // 
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "鎻愪氦妫�楠屼汉";
             this.gv_checkUser.FieldName = "checkUser";
-            this.gv_checkUser.MinWidth = 19;
+            this.gv_checkUser.MinWidth = 24;
             this.gv_checkUser.Name = "gv_checkUser";
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
             this.gv_checkUser.VisibleIndex = 7;
-            this.gv_checkUser.Width = 99;
+            this.gv_checkUser.Width = 124;
             // 
             // gv_checkDate
             // 
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "鎻愪氦妫�楠屾棩鏈�";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 19;
+            this.gv_checkDate.MinWidth = 24;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
             this.gv_checkDate.VisibleIndex = 8;
-            this.gv_checkDate.Width = 64;
+            this.gv_checkDate.Width = 80;
             // 
             // gv_suppNo
             // 
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
             this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙�";
             this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 19;
+            this.gv_suppNo.MinWidth = 24;
             this.gv_suppNo.Name = "gv_suppNo";
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
             this.gv_suppNo.VisibleIndex = 9;
-            this.gv_suppNo.Width = 69;
+            this.gv_suppNo.Width = 86;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "渚涘簲鍟嗗悕绉�";
             this.gridColumn5.FieldName = "suppName";
-            this.gridColumn5.MinWidth = 19;
+            this.gridColumn5.MinWidth = 24;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.AllowEdit = false;
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 10;
-            this.gridColumn5.Width = 70;
+            this.gridColumn5.Width = 87;
             // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞";
             this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 19;
+            this.gv_remark.MinWidth = 24;
             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 = 11;
-            this.gv_remark.Width = 90;
+            this.gv_remark.Width = 112;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "SRM鏍囪瘑";
             this.gridColumn4.FieldName = "isSrmChk";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.MinWidth = 31;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 12;
-            this.gridColumn4.Width = 94;
+            this.gridColumn4.Width = 117;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "涓婚敭GUID";
             this.gridColumn11.FieldName = "guid";
-            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.MinWidth = 31;
             this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Width = 94;
+            this.gridColumn11.Width = 117;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "SRM鍒拌揣鍗曞彿";
             this.gridColumn7.FieldName = "paperBillNo";
-            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.MinWidth = 31;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 13;
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 117;
             // 
             // gv_isCompleted
             // 
             this.gv_isCompleted.Caption = "鏄惁鍏ュ簱";
             this.gv_isCompleted.ColumnEdit = this.repositoryItemCheckEdit1;
             this.gv_isCompleted.FieldName = "isCompleted";
-            this.gv_isCompleted.MinWidth = 25;
+            this.gv_isCompleted.MinWidth = 31;
             this.gv_isCompleted.Name = "gv_isCompleted";
             this.gv_isCompleted.OptionsColumn.AllowEdit = false;
             this.gv_isCompleted.OptionsColumn.ReadOnly = true;
             this.gv_isCompleted.Visible = true;
             this.gv_isCompleted.VisibleIndex = 14;
-            this.gv_isCompleted.Width = 80;
+            this.gv_isCompleted.Width = 100;
             // 
             // repositoryItemCheckEdit1
             // 
@@ -531,31 +539,32 @@
             // 
             this.gridColumn21.Caption = "閫�璐ф爣璇�";
             this.gridColumn21.FieldName = "th";
-            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.MinWidth = 31;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.OptionsColumn.AllowEdit = false;
             this.gridColumn21.OptionsColumn.ReadOnly = true;
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 15;
-            this.gridColumn21.Width = 94;
+            this.gridColumn21.Width = 117;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 518);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Location = new System.Drawing.Point(0, 633);
+            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(1573, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1967, 48);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1573, 569);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1967, 696);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -563,6 +572,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);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -575,8 +585,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(1573, 569);
-            this.splitMx1.SplitterPosition = 149;
+            this.splitMx1.Size = new System.Drawing.Size(1967, 696);
+            this.splitMx1.SplitterPosition = 182;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -602,18 +612,20 @@
             this.layoutControlItem18,
             this.layoutControlItem9});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(758, 132, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1573, 149);
+            this.layoutMx1.Size = new System.Drawing.Size(1967, 182);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(903, 108);
+            this.lbGuid.Location = new System.Drawing.Point(1129, 132);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(295, 28);
+            this.lbGuid.Size = new System.Drawing.Size(369, 34);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
@@ -621,48 +633,53 @@
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 108);
+            this.btnSelect.Location = new System.Drawing.Point(12, 132);
+            this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
             this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(116, 27);
+            this.btnSelect.Size = new System.Drawing.Size(146, 34);
             this.btnSelect.StyleController = this.layoutMx1;
             this.btnSelect.TabIndex = 443;
             this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(487, 76);
+            this.txt_remark.Location = new System.Drawing.Point(600, 92);
+            this.txt_remark.Margin = new System.Windows.Forms.Padding(4);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(297, 24);
+            this.txt_remark.Size = new System.Drawing.Size(381, 28);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 240;
             // 
             // txt_receiveOrgId
             // 
             this.txt_receiveOrgId.IsReadly = false;
-            this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 44);
+            this.txt_receiveOrgId.Location = new System.Drawing.Point(114, 52);
+            this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(5);
             this.txt_receiveOrgId.Name = "txt_receiveOrgId";
-            this.txt_receiveOrgId.Size = new System.Drawing.Size(297, 24);
+            this.txt_receiveOrgId.Size = new System.Drawing.Size(380, 28);
             this.txt_receiveOrgId.TabIndex = 457;
             // 
             // txtSupplierCode
             // 
-            this.txtSupplierCode.Location = new System.Drawing.Point(487, 44);
+            this.txtSupplierCode.Location = new System.Drawing.Point(600, 52);
+            this.txtSupplierCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtSupplierCode.Name = "txtSupplierCode";
             this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
             this.txtSupplierCode.Properties.Tag = "";
-            this.txtSupplierCode.Size = new System.Drawing.Size(297, 24);
+            this.txtSupplierCode.Size = new System.Drawing.Size(381, 28);
             this.txtSupplierCode.StyleController = this.layoutMx1;
             this.txtSupplierCode.TabIndex = 451;
             this.txtSupplierCode.Tag = "readOnly";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
             this.txt_billNo.Properties.Tag = "";
-            this.txt_billNo.Size = new System.Drawing.Size(297, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(380, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readOnly";
@@ -670,95 +687,104 @@
             // txt_suppId
             // 
             this.txt_suppId.IsReadly = false;
-            this.txt_suppId.Location = new System.Drawing.Point(99, 76);
+            this.txt_suppId.Location = new System.Drawing.Point(114, 92);
             this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(297, 24);
+            this.txt_suppId.Size = new System.Drawing.Size(380, 28);
             this.txt_suppId.TabIndex = 440;
             // 
             // txt_fstatus
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(1176, 76);
+            this.txt_fstatus.Location = new System.Drawing.Point(1472, 92);
+            this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4);
             this.txt_fstatus.Name = "txt_fstatus";
             this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fstatus.Size = new System.Drawing.Size(385, 24);
+            this.txt_fstatus.Size = new System.Drawing.Size(483, 27);
             this.txt_fstatus.StyleController = this.layoutMx1;
             this.txt_fstatus.TabIndex = 458;
             this.txt_fstatus.Tag = "readOnly";
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(400, 12);
+            this.txt_fType.Location = new System.Drawing.Point(498, 12);
+            this.txt_fType.Margin = new System.Windows.Forms.Padding(4);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(384, 24);
+            this.txt_fType.Size = new System.Drawing.Size(483, 27);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 459;
             this.txt_fType.Tag = "readOnly";
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(875, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(1087, 12);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(297, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(381, 28);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 461;
             this.txt_createBy.Tag = "readOnly";
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(875, 44);
+            this.txt_createDate.Location = new System.Drawing.Point(1087, 52);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(297, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(381, 28);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 462;
             this.txt_createDate.Tag = "readOnly";
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(1263, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(1574, 12);
+            this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
             this.txt_checkUser.Name = "txt_checkUser";
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(298, 24);
+            this.txt_checkUser.Size = new System.Drawing.Size(381, 28);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 463;
             this.txt_checkUser.Tag = "readOnly";
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(1263, 44);
+            this.txt_checkDate.Location = new System.Drawing.Point(1574, 52);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(298, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(381, 28);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 464;
             this.txt_checkDate.Tag = "readOnly";
             // 
             // txt_guid
             // 
-            this.txt_guid.Location = new System.Drawing.Point(411, 140);
+            this.txt_guid.Location = new System.Drawing.Point(514, 171);
+            this.txt_guid.Margin = new System.Windows.Forms.Padding(4);
             this.txt_guid.Name = "txt_guid";
-            this.txt_guid.Size = new System.Drawing.Size(191, 24);
+            this.txt_guid.Size = new System.Drawing.Size(239, 28);
             this.txt_guid.StyleController = this.layoutMx1;
             this.txt_guid.TabIndex = 466;
             this.txt_guid.Tag = "readOnly";
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(875, 76);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(1087, 92);
+            this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
-            this.txt_paperBillNo.Size = new System.Drawing.Size(297, 24);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(381, 28);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 467;
             // 
             // txt_isSrm
             // 
-            this.txt_isSrm.Location = new System.Drawing.Point(1176, 108);
+            this.txt_isSrm.Location = new System.Drawing.Point(1472, 132);
+            this.txt_isSrm.Margin = new System.Windows.Forms.Padding(4);
             this.txt_isSrm.Name = "txt_isSrm";
             this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
-            this.txt_isSrm.Size = new System.Drawing.Size(385, 24);
+            this.txt_isSrm.Size = new System.Drawing.Size(483, 27);
             this.txt_isSrm.StyleController = this.layoutMx1;
             this.txt_isSrm.TabIndex = 468;
             this.txt_isSrm.Tag = "readOnly";
@@ -784,7 +810,7 @@
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem9.Size = new System.Drawing.Size(297, 32);
             this.layoutControlItem9.Text = "涓婚敭GUID";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(112, 22);
             // 
             // Root
             // 
@@ -833,88 +859,88 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1573, 149);
+            this.Root.Size = new System.Drawing.Size(1967, 182);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txt_receiveOrgId;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 40);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(486, 40);
             this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_billNo;
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);
             this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_suppId;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 80);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(486, 40);
             this.layoutControlItem3.Text = "閫変緵搴斿晢";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_createBy;
-            this.layoutControlItem11.Location = new System.Drawing.Point(776, 0);
+            this.layoutControlItem11.Location = new System.Drawing.Point(973, 0);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem11.Text = "寤虹珛浜哄憳";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_createDate;
-            this.layoutControlItem12.Location = new System.Drawing.Point(776, 32);
+            this.layoutControlItem12.Location = new System.Drawing.Point(973, 40);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem12.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_checkUser;
-            this.layoutControlItem13.Location = new System.Drawing.Point(1164, 0);
+            this.layoutControlItem13.Location = new System.Drawing.Point(1460, 0);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(389, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_checkDate;
-            this.layoutControlItem14.Location = new System.Drawing.Point(1164, 32);
+            this.layoutControlItem14.Location = new System.Drawing.Point(1460, 40);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(389, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_fstatus;
-            this.layoutControlItem7.Location = new System.Drawing.Point(1164, 64);
+            this.layoutControlItem7.Location = new System.Drawing.Point(1460, 80);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(389, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem7.TextVisible = false;
@@ -922,10 +948,10 @@
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_fType;
-            this.layoutControlItem8.Location = new System.Drawing.Point(388, 0);
+            this.layoutControlItem8.Location = new System.Drawing.Point(486, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem8.Text = "濮斿鏍囪瘑";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
@@ -933,34 +959,34 @@
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtSupplierCode;
-            this.layoutControlItem5.Location = new System.Drawing.Point(388, 32);
+            this.layoutControlItem5.Location = new System.Drawing.Point(486, 40);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_remark;
-            this.layoutControlItem17.Location = new System.Drawing.Point(388, 64);
+            this.layoutControlItem17.Location = new System.Drawing.Point(486, 80);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem17.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.btnSelect;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
-            this.layoutControlItem16.MinSize = new System.Drawing.Size(19, 31);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem16.MaxSize = new System.Drawing.Size(150, 38);
+            this.layoutControlItem16.MinSize = new System.Drawing.Size(24, 38);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(388, 33);
+            this.layoutControlItem16.Size = new System.Drawing.Size(486, 42);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -969,22 +995,22 @@
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_paperBillNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(776, 64);
+            this.layoutControlItem4.Location = new System.Drawing.Point(973, 80);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(388, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(487, 40);
             this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_isSrm;
-            this.layoutControlItem6.Location = new System.Drawing.Point(1164, 96);
+            this.layoutControlItem6.Location = new System.Drawing.Point(1460, 120);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(389, 33);
+            this.layoutControlItem6.Size = new System.Drawing.Size(487, 42);
             this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem6.TextVisible = false;
             // 
@@ -992,9 +1018,10 @@
             // 
             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);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1573, 408);
+            this.tabMx.Size = new System.Drawing.Size(1967, 499);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1002,21 +1029,24 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1571, 376);
+            this.tabMxPage1.Size = new System.Drawing.Size(1965, 461);
             this.tabMxPage1.Text = "鏀舵枡鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemButtonEdit2,
             this.rptHistory});
-            this.gcMx1.Size = new System.Drawing.Size(1571, 376);
+            this.gcMx1.Size = new System.Drawing.Size(1965, 461);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1058,7 +1088,9 @@
             this.gridColumn18,
             this.gridColumn19,
             this.gridColumn20,
-            this.gv_iqcsub});
+            this.gv_iqcsub,
+            this.gridColumn22});
+            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1070,55 +1102,55 @@
             // 
             this.gvAbtGuid.Caption = "閲囪喘鏄庣粏GUID";
             this.gvAbtGuid.FieldName = "aboutGuid";
-            this.gvAbtGuid.MinWidth = 50;
+            this.gvAbtGuid.MinWidth = 62;
             this.gvAbtGuid.Name = "gvAbtGuid";
             this.gvAbtGuid.OptionsColumn.ReadOnly = true;
-            this.gvAbtGuid.Width = 94;
+            this.gvAbtGuid.Width = 117;
             // 
             // gvMx1guid
             // 
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "鍒拌揣鏄庣粏GUID";
             this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 70;
+            this.gvMx1guid.MinWidth = 87;
             this.gvMx1guid.Name = "gvMx1guid";
             this.gvMx1guid.OptionsColumn.ReadOnly = true;
             this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 99;
+            this.gvMx1guid.Width = 124;
             // 
             // gvMx1ebelnLine
             // 
             this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnLine.Caption = "Erp琛孖d";
             this.gvMx1ebelnLine.FieldName = "lineK3id";
-            this.gvMx1ebelnLine.MinWidth = 90;
+            this.gvMx1ebelnLine.MinWidth = 112;
             this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
             this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
-            this.gvMx1ebelnLine.Width = 99;
+            this.gvMx1ebelnLine.Width = 124;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鐗╂枡ID";
             this.gridColumn1.FieldName = "itemId";
-            this.gridColumn1.MinWidth = 99;
+            this.gridColumn1.MinWidth = 124;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.ReadOnly = true;
-            this.gridColumn1.Width = 99;
+            this.gridColumn1.Width = 124;
             // 
             // gvMx1returnFlag
             // 
             this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1returnFlag.Caption = "閫�璐�";
             this.gvMx1returnFlag.FieldName = "returnFlag";
-            this.gvMx1returnFlag.MinWidth = 25;
+            this.gvMx1returnFlag.MinWidth = 31;
             this.gvMx1returnFlag.Name = "gvMx1returnFlag";
             this.gvMx1returnFlag.OptionsColumn.ReadOnly = true;
             this.gvMx1returnFlag.Tag = "query_a.return_flag";
             this.gvMx1returnFlag.UnboundDataType = typeof(bool);
             this.gvMx1returnFlag.Visible = true;
             this.gvMx1returnFlag.VisibleIndex = 0;
-            this.gvMx1returnFlag.Width = 63;
+            this.gvMx1returnFlag.Width = 79;
             // 
             // gvMx1urgentFlag
             // 
@@ -1129,113 +1161,113 @@
             this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡";
             this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
-            this.gvMx1urgentFlag.MinWidth = 25;
+            this.gvMx1urgentFlag.MinWidth = 31;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
             this.gvMx1urgentFlag.Tag = "";
             this.gvMx1urgentFlag.UnboundDataType = typeof(string);
             this.gvMx1urgentFlag.Visible = true;
             this.gvMx1urgentFlag.VisibleIndex = 1;
-            this.gvMx1urgentFlag.Width = 34;
+            this.gvMx1urgentFlag.Width = 42;
             // 
             // gvMx1isdepsIn
             // 
             this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
             this.gvMx1isdepsIn.Caption = "瀹岀粨鏍囪瘑";
             this.gvMx1isdepsIn.FieldName = "isdepsIn";
-            this.gvMx1isdepsIn.MinWidth = 25;
+            this.gvMx1isdepsIn.MinWidth = 31;
             this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
             this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
             this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
             this.gvMx1isdepsIn.UnboundDataType = typeof(bool);
-            this.gvMx1isdepsIn.Width = 50;
+            this.gvMx1isdepsIn.Width = 62;
             // 
             // gvMx1checkStates
             // 
             this.gvMx1checkStates.AppearanceCell.Options.UseFont = true;
             this.gvMx1checkStates.Caption = "妫�楠岀姸鎬�";
             this.gvMx1checkStates.FieldName = "checkStates";
-            this.gvMx1checkStates.MinWidth = 25;
+            this.gvMx1checkStates.MinWidth = 31;
             this.gvMx1checkStates.Name = "gvMx1checkStates";
             this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
             this.gvMx1checkStates.Tag = "query_a.check_states";
             this.gvMx1checkStates.Visible = true;
             this.gvMx1checkStates.VisibleIndex = 3;
-            this.gvMx1checkStates.Width = 66;
+            this.gvMx1checkStates.Width = 82;
             // 
             // gvMx1checkRes
             // 
             this.gvMx1checkRes.AppearanceCell.Options.UseFont = true;
             this.gvMx1checkRes.Caption = "妫�楠岀粨鏋�";
             this.gvMx1checkRes.FieldName = "checkRes";
-            this.gvMx1checkRes.MinWidth = 25;
+            this.gvMx1checkRes.MinWidth = 31;
             this.gvMx1checkRes.Name = "gvMx1checkRes";
             this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
             this.gvMx1checkRes.Tag = "query_a.check_res";
             this.gvMx1checkRes.Visible = true;
             this.gvMx1checkRes.VisibleIndex = 4;
-            this.gvMx1checkRes.Width = 66;
+            this.gvMx1checkRes.Width = 82;
             // 
             // gvMx1ebeln
             // 
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "ebeln";
-            this.gvMx1ebeln.MinWidth = 120;
+            this.gvMx1ebeln.MinWidth = 150;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
             this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
             this.gvMx1ebeln.VisibleIndex = 5;
-            this.gvMx1ebeln.Width = 129;
+            this.gvMx1ebeln.Width = 161;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鐗╂枡缂栧彿";
             this.gridColumn8.FieldName = "itemNo";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 31;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 6;
-            this.gridColumn8.Width = 53;
+            this.gridColumn8.Width = 66;
             // 
             // gvMx1boardStyle
             // 
             this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
             this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1boardStyle.FieldName = "itemName";
-            this.gvMx1boardStyle.MinWidth = 25;
+            this.gvMx1boardStyle.MinWidth = 31;
             this.gvMx1boardStyle.Name = "gvMx1boardStyle";
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
             this.gvMx1boardStyle.VisibleIndex = 7;
-            this.gvMx1boardStyle.Width = 73;
+            this.gvMx1boardStyle.Width = 91;
             // 
             // gvMx1ebelnQty
             // 
             this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnQty.Caption = "閲囪喘鏁伴噺";
             this.gvMx1ebelnQty.FieldName = "cgsl";
-            this.gvMx1ebelnQty.MinWidth = 25;
+            this.gvMx1ebelnQty.MinWidth = 31;
             this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
             this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
             this.gvMx1ebelnQty.VisibleIndex = 8;
-            this.gvMx1ebelnQty.Width = 64;
+            this.gvMx1ebelnQty.Width = 80;
             // 
             // gvMx1subQty
             // 
             this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1subQty.Caption = "绱鏈敹閲�";
             this.gvMx1subQty.FieldName = "wssl";
-            this.gvMx1subQty.MinWidth = 25;
+            this.gvMx1subQty.MinWidth = 31;
             this.gvMx1subQty.Name = "gvMx1subQty";
             this.gvMx1subQty.OptionsColumn.ReadOnly = true;
             this.gvMx1subQty.Tag = "query_a.sub_qty";
             this.gvMx1subQty.Visible = true;
             this.gvMx1subQty.VisibleIndex = 9;
-            this.gvMx1subQty.Width = 64;
+            this.gvMx1subQty.Width = 80;
             // 
             // gvMx1quantity
             // 
@@ -1246,12 +1278,12 @@
             this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1quantity.Caption = "鏈鏀堕噺";
             this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 25;
+            this.gvMx1quantity.MinWidth = 31;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "yz_quantity_0_edit";
             this.gvMx1quantity.Visible = true;
             this.gvMx1quantity.VisibleIndex = 10;
-            this.gvMx1quantity.Width = 64;
+            this.gvMx1quantity.Width = 80;
             // 
             // gvMx1memo
             // 
@@ -1262,104 +1294,104 @@
             this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1memo.Caption = "澶囨敞";
             this.gvMx1memo.FieldName = "memo";
-            this.gvMx1memo.MinWidth = 50;
+            this.gvMx1memo.MinWidth = 62;
             this.gvMx1memo.Name = "gvMx1memo";
             this.gvMx1memo.OptionsColumn.ReadOnly = true;
             this.gvMx1memo.Tag = "edit";
             this.gvMx1memo.Visible = true;
             this.gvMx1memo.VisibleIndex = 11;
-            this.gvMx1memo.Width = 110;
+            this.gvMx1memo.Width = 137;
             // 
             // gvMx1okRkqty
             // 
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1okRkqty.Caption = "绱瀹炴敹";
             this.gvMx1okRkqty.FieldName = "yssl";
-            this.gvMx1okRkqty.MinWidth = 25;
+            this.gvMx1okRkqty.MinWidth = 31;
             this.gvMx1okRkqty.Name = "gvMx1okRkqty";
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
             this.gvMx1okRkqty.VisibleIndex = 12;
-            this.gvMx1okRkqty.Width = 64;
+            this.gvMx1okRkqty.Width = 80;
             // 
             // gvMx1checkDate
             // 
             this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1checkDate.Caption = "妫�楠屾棩鏈�";
             this.gvMx1checkDate.FieldName = "checkDate";
-            this.gvMx1checkDate.MinWidth = 25;
+            this.gvMx1checkDate.MinWidth = 31;
             this.gvMx1checkDate.Name = "gvMx1checkDate";
             this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
             this.gvMx1checkDate.Tag = "query_a.check_date";
-            this.gvMx1checkDate.Width = 179;
+            this.gvMx1checkDate.Width = 224;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "閲囪喘鏃堕棿";
             this.gridColumn3.FieldName = "purchaseDate";
-            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.MinWidth = 31;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.ReadOnly = true;
-            this.gridColumn3.Width = 179;
+            this.gridColumn3.Width = 224;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "閲囪喘鍗曚綅";
             this.gridColumn9.FieldName = "cgUnit";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 31;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 15;
-            this.gridColumn9.Width = 40;
+            this.gridColumn9.Width = 50;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 31;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 16;
-            this.gridColumn6.Width = 119;
+            this.gridColumn6.Width = 149;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "娆″簭";
             this.gridColumn10.FieldName = "workLine";
-            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.MinWidth = 31;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 20;
-            this.gridColumn10.Width = 43;
+            this.gridColumn10.Width = 54;
             // 
             // gridColumn12
             // 
             this.gridColumn12.Caption = "閫�鏂欐椂闂�";
             this.gridColumn12.FieldName = "returnDate";
-            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.MinWidth = 31;
             this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Width = 25;
+            this.gridColumn12.Width = 31;
             // 
             // gridColumn13
             // 
             this.gridColumn13.Caption = "閫�鏂欎汉";
             this.gridColumn13.FieldName = "returnBy";
-            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.MinWidth = 31;
             this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Width = 25;
+            this.gridColumn13.Width = 31;
             // 
             // gvBtnAlawys
             // 
             this.gvBtnAlawys.Caption = "閫�鏂�";
             this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
-            this.gvBtnAlawys.MinWidth = 80;
+            this.gvBtnAlawys.MinWidth = 100;
             this.gvBtnAlawys.Name = "gvBtnAlawys";
             this.gvBtnAlawys.Visible = true;
             this.gvBtnAlawys.VisibleIndex = 22;
-            this.gvBtnAlawys.Width = 80;
+            this.gvBtnAlawys.Width = 100;
             // 
             // repositoryItemButtonEdit2
             // 
@@ -1376,11 +1408,11 @@
             // 
             this.gvMxDel.Caption = "绉诲嚭";
             this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 80;
+            this.gvMxDel.MinWidth = 100;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
             this.gvMxDel.VisibleIndex = 23;
-            this.gvMxDel.Width = 103;
+            this.gvMxDel.Width = 129;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -1397,49 +1429,49 @@
             // 
             this.gridColumn14.Caption = "鍒ゅ畾缁撴灉";
             this.gridColumn14.FieldName = "freceQty";
-            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.MinWidth = 31;
             this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 117;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "澶勭悊鎰忚";
             this.gridColumn15.FieldName = "clyj";
-            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.MinWidth = 31;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 17;
-            this.gridColumn15.Width = 137;
+            this.gridColumn15.Width = 171;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "鎸戦�夋暟閲�";
             this.gridColumn16.FieldName = "txsl";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.MinWidth = 31;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 18;
-            this.gridColumn16.Width = 114;
+            this.gridColumn16.Width = 142;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "閫夊埆绫诲埆";
             this.gridColumn2.FieldName = "xblb";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 31;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 19;
-            this.gridColumn2.Width = 114;
+            this.gridColumn2.Width = 142;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "鍒拌揣璁板綍";
             this.gridColumn17.ColumnEdit = this.rptHistory;
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.MinWidth = 31;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 21;
-            this.gridColumn17.Width = 123;
+            this.gridColumn17.Width = 154;
             // 
             // rptHistory
             // 
@@ -1456,45 +1488,57 @@
             // 
             this.gridColumn18.Caption = "ErpId";
             this.gridColumn18.FieldName = "ebelnK3id";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 31;
             this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Width = 94;
+            this.gridColumn18.Width = 117;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "绱楠岄��";
             this.gridColumn19.FieldName = "ljyt";
-            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.MinWidth = 31;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 13;
-            this.gridColumn19.Width = 94;
+            this.gridColumn19.Width = 117;
             // 
             // gridColumn20
             // 
             this.gridColumn20.Caption = "绱浠撻��";
             this.gridColumn20.FieldName = "ljct";
-            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.MinWidth = 31;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
             this.gridColumn20.VisibleIndex = 14;
-            this.gridColumn20.Width = 94;
+            this.gridColumn20.Width = 117;
             // 
             // gv_iqcsub
             // 
             this.gv_iqcsub.Caption = "妫�楠屾彁浜�";
             this.gv_iqcsub.FieldName = "iqcsub";
-            this.gv_iqcsub.MinWidth = 23;
+            this.gv_iqcsub.MinWidth = 29;
             this.gv_iqcsub.Name = "gv_iqcsub";
             this.gv_iqcsub.Visible = true;
             this.gv_iqcsub.VisibleIndex = 2;
+            this.gv_iqcsub.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "闇�姹傝窡韪彿";
+            this.gridColumn22.FieldName = "xqgz";
+            this.gridColumn22.MinWidth = 30;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 24;
+            this.gridColumn22.Width = 94;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(923, 55);
+            this.picCheckBox.Location = new System.Drawing.Point(1154, 67);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(101, 50);
+            this.picCheckBox.Size = new System.Drawing.Size(126, 61);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 6;
             this.picCheckBox.TabStop = false;
@@ -1502,12 +1546,13 @@
             // 
             // Frm_MesInvItemArn
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1575, 681);
+            this.ClientSize = new System.Drawing.Size(1969, 832);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Frm_MesInvItemArn";
             this.Text = "閲囪喘鍒拌揣鍗�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1677,5 +1722,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_isCompleted;
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
     }
 }
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index e9fc049..552197a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -138,6 +138,7 @@
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -207,9 +208,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(5, 5, 5, 5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1348, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1685, 98);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -217,10 +219,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1348, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1685, 736);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -229,8 +232,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1346, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1683, 698);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -239,6 +243,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, 4, 4, 4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -246,17 +251,19 @@
             this.split1.Panel1.Controls.Add(this.gcMain1);
             this.split1.Panel1.Controls.Add(this.pageBar1);
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1346, 570);
+            this.split1.Size = new System.Drawing.Size(1683, 698);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 4;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1346, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1683, 635);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -284,8 +291,9 @@
             this.gridColumn3,
             this.bandedGridColumn2,
             this.gv_guid});
+            this.gridView1.DetailHeight = 428;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.IndicatorWidth = 62;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -296,237 +304,252 @@
             this.gv_ischeck.AppearanceCell.Options.UseFont = true;
             this.gv_ischeck.Caption = "瀹℃牳";
             this.gv_ischeck.FieldName = "checkStatus";
+            this.gv_ischeck.MinWidth = 25;
             this.gv_ischeck.Name = "gv_ischeck";
             this.gv_ischeck.OptionsColumn.AllowEdit = false;
             this.gv_ischeck.Tag = "query_a.ISCHECK";
             this.gv_ischeck.Visible = true;
             this.gv_ischeck.VisibleIndex = 0;
-            this.gv_ischeck.Width = 94;
+            this.gv_ischeck.Width = 117;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "濮斿";
             this.gridColumn9.FieldName = "isWw";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 31;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 1;
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 117;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
             this.gv_billNo.FieldName = "billNo";
+            this.gv_billNo.MinWidth = 25;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 2;
-            this.gv_billNo.Width = 180;
+            this.gv_billNo.Width = 225;
             // 
             // gv_taskNo
             // 
             this.gv_taskNo.AppearanceCell.Options.UseFont = true;
             this.gv_taskNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_taskNo.FieldName = "taskNo";
+            this.gv_taskNo.MinWidth = 25;
             this.gv_taskNo.Name = "gv_taskNo";
             this.gv_taskNo.OptionsColumn.AllowEdit = false;
             this.gv_taskNo.Tag = "query_a.TASK_NO";
             this.gv_taskNo.Visible = true;
             this.gv_taskNo.VisibleIndex = 3;
-            this.gv_taskNo.Width = 94;
+            this.gv_taskNo.Width = 117;
             // 
             // gv_suppNo
             // 
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
             this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙�";
             this.gv_suppNo.FieldName = "supNo";
+            this.gv_suppNo.MinWidth = 25;
             this.gv_suppNo.Name = "gv_suppNo";
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.SUPP_NO";
             this.gv_suppNo.Visible = true;
             this.gv_suppNo.VisibleIndex = 4;
-            this.gv_suppNo.Width = 100;
+            this.gv_suppNo.Width = 125;
             // 
             // gv_suppId
             // 
             this.gv_suppId.AppearanceCell.Options.UseFont = true;
             this.gv_suppId.Caption = "渚涘簲鍟嗗悕绉�";
             this.gv_suppId.FieldName = "supName";
+            this.gv_suppId.MinWidth = 25;
             this.gv_suppId.Name = "gv_suppId";
             this.gv_suppId.OptionsColumn.AllowEdit = false;
             this.gv_suppId.Tag = "query_a.SUPP_ID";
             this.gv_suppId.Visible = true;
             this.gv_suppId.VisibleIndex = 5;
-            this.gv_suppId.Width = 150;
+            this.gv_suppId.Width = 187;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "浠撳簱缂栧彿";
             this.gridColumn4.FieldName = "depotCode";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.MinWidth = 31;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 6;
-            this.gridColumn4.Width = 94;
+            this.gridColumn4.Width = 117;
             // 
             // gv_depotsId
             // 
             this.gv_depotsId.AppearanceCell.Options.UseFont = true;
             this.gv_depotsId.Caption = "浠撳簱鍚嶇О";
             this.gv_depotsId.FieldName = "depotName";
+            this.gv_depotsId.MinWidth = 25;
             this.gv_depotsId.Name = "gv_depotsId";
             this.gv_depotsId.OptionsColumn.AllowEdit = false;
             this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
             this.gv_depotsId.Visible = true;
             this.gv_depotsId.VisibleIndex = 7;
-            this.gv_depotsId.Width = 100;
+            this.gv_depotsId.Width = 125;
             // 
             // gv_createBy
             // 
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜� ";
             this.gv_createBy.FieldName = "createUser";
+            this.gv_createBy.MinWidth = 25;
             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 = 8;
-            this.gv_createBy.Width = 80;
+            this.gv_createBy.Width = 100;
             // 
             // gv_createDate
             // 
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 25;
             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 = 9;
-            this.gv_createDate.Width = 180;
+            this.gv_createDate.Width = 225;
             // 
             // gv_lastupdateBy
             // 
             this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
             this.gv_lastupdateBy.FieldName = "lastupdateBy";
+            this.gv_lastupdateBy.MinWidth = 25;
             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 = 10;
-            this.gv_lastupdateBy.Width = 94;
+            this.gv_lastupdateBy.Width = 117;
             // 
             // gv_lastupdateDate
             // 
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
+            this.gv_lastupdateDate.MinWidth = 25;
             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 = 11;
-            this.gv_lastupdateDate.Width = 94;
+            this.gv_lastupdateDate.Width = 117;
             // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞璇存槑";
             this.gv_remark.FieldName = "dhgRemark";
+            this.gv_remark.MinWidth = 25;
             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 = 12;
-            this.gv_remark.Width = 120;
+            this.gv_remark.Width = 150;
             // 
             // gv_paperBillNo
             // 
             this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
             this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿 ";
             this.gv_paperBillNo.FieldName = "shdh";
+            this.gv_paperBillNo.MinWidth = 25;
             this.gv_paperBillNo.Name = "gv_paperBillNo";
             this.gv_paperBillNo.OptionsColumn.AllowEdit = false;
             this.gv_paperBillNo.Tag = "query_a.PAPER_BILL_NO";
             this.gv_paperBillNo.Visible = true;
             this.gv_paperBillNo.VisibleIndex = 13;
-            this.gv_paperBillNo.Width = 120;
+            this.gv_paperBillNo.Width = 150;
             // 
             // gv_checkUser
             // 
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
             this.gv_checkUser.FieldName = "checkUserName";
+            this.gv_checkUser.MinWidth = 25;
             this.gv_checkUser.Name = "gv_checkUser";
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
             this.gv_checkUser.VisibleIndex = 14;
-            this.gv_checkUser.Width = 60;
             // 
             // gv_checkDate
             // 
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
             this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.MinWidth = 25;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
             this.gv_checkDate.Visible = true;
             this.gv_checkDate.VisibleIndex = 15;
-            this.gv_checkDate.Width = 180;
+            this.gv_checkDate.Width = 225;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鍏ュ簱绫诲埆";
             this.gridColumn3.FieldName = "inType";
-            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.MinWidth = 31;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 16;
-            this.gridColumn3.Width = 94;
+            this.gridColumn3.Width = 117;
             // 
             // bandedGridColumn2
             // 
             this.bandedGridColumn2.Caption = "鏀舵枡缁勭粐";
             this.bandedGridColumn2.FieldName = "receivingOrg";
+            this.bandedGridColumn2.MinWidth = 25;
             this.bandedGridColumn2.Name = "bandedGridColumn2";
             this.bandedGridColumn2.Tag = "org.fnamber";
             this.bandedGridColumn2.Visible = true;
             this.bandedGridColumn2.VisibleIndex = 17;
-            this.bandedGridColumn2.Width = 250;
+            this.bandedGridColumn2.Width = 312;
             // 
             // 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.MinWidth = 62;
             this.gv_guid.Name = "gv_guid";
             this.gv_guid.OptionsColumn.AllowEdit = false;
             this.gv_guid.Tag = "query_a.GUID";
-            this.gv_guid.Width = 94;
+            this.gv_guid.Width = 117;
             // 
             // 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.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(1346, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1683, 48);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1346, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1683, 698);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -534,6 +557,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, 4, 4, 4);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -546,8 +570,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(1346, 570);
-            this.splitMx1.SplitterPosition = 144;
+            this.splitMx1.Size = new System.Drawing.Size(1683, 698);
+            this.splitMx1.SplitterPosition = 176;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -572,144 +596,160 @@
             this.layoutControlItem7,
             this.labl_guid});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(531, 330, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1346, 144);
+            this.layoutMx1.Size = new System.Drawing.Size(1683, 176);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(99, 74);
+            this.txt_dptName.Location = new System.Drawing.Point(119, 90);
+            this.txt_dptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(240, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(305, 28);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 593;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_dhgRemark
             // 
-            this.txt_dhgRemark.Location = new System.Drawing.Point(430, 105);
+            this.txt_dhgRemark.Location = new System.Drawing.Point(533, 128);
+            this.txt_dhgRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_dhgRemark.Name = "txt_dhgRemark";
             this.txt_dhgRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_dhgRemark.Size = new System.Drawing.Size(571, 24);
+            this.txt_dhgRemark.Size = new System.Drawing.Size(721, 28);
             this.txt_dhgRemark.StyleController = this.layoutMx1;
             this.txt_dhgRemark.TabIndex = 240;
             // 
             // txt_suppName
             // 
-            this.txt_suppName.Location = new System.Drawing.Point(99, 43);
+            this.txt_suppName.Location = new System.Drawing.Point(119, 52);
+            this.txt_suppName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_suppName.Name = "txt_suppName";
             this.txt_suppName.Properties.Appearance.Options.UseFont = true;
-            this.txt_suppName.Size = new System.Drawing.Size(240, 24);
+            this.txt_suppName.Size = new System.Drawing.Size(305, 28);
             this.txt_suppName.StyleController = this.layoutMx1;
             this.txt_suppName.TabIndex = 592;
             this.txt_suppName.Tag = "readonly";
             // 
             // txt_fcheckUser
             // 
-            this.txt_fcheckUser.Location = new System.Drawing.Point(1092, 12);
+            this.txt_fcheckUser.Location = new System.Drawing.Point(1363, 14);
+            this.txt_fcheckUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_fcheckUser.Name = "txt_fcheckUser";
             this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckUser.Size = new System.Drawing.Size(242, 24);
+            this.txt_fcheckUser.Size = new System.Drawing.Size(306, 28);
             this.txt_fcheckUser.StyleController = this.layoutMx1;
             this.txt_fcheckUser.TabIndex = 595;
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(1005, 139);
+            this.lbGuid.Location = new System.Drawing.Point(1256, 170);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(329, 60);
+            this.lbGuid.Size = new System.Drawing.Size(411, 73);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(430, 43);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(533, 52);
+            this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(240, 24);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(306, 28);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 243;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(1092, 43);
+            this.txt_checkDate.Location = new System.Drawing.Point(1363, 52);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(242, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(306, 28);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 587;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(119, 14);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(240, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(305, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_cbillNo
             // 
-            this.txt_cbillNo.Location = new System.Drawing.Point(430, 12);
+            this.txt_cbillNo.Location = new System.Drawing.Point(533, 14);
+            this.txt_cbillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_cbillNo.Name = "txt_cbillNo";
             this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_cbillNo.Size = new System.Drawing.Size(240, 24);
+            this.txt_cbillNo.Size = new System.Drawing.Size(306, 28);
             this.txt_cbillNo.StyleController = this.layoutMx1;
             this.txt_cbillNo.TabIndex = 507;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(761, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(948, 14);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(240, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(306, 28);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 219;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(761, 43);
+            this.txt_createDate.Location = new System.Drawing.Point(948, 52);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(240, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(306, 28);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 222;
             // 
             // txt_fstatus
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(1005, 74);
+            this.txt_fstatus.Location = new System.Drawing.Point(1258, 90);
+            this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_fstatus.Name = "txt_fstatus";
             this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_fstatus.Size = new System.Drawing.Size(329, 24);
+            this.txt_fstatus.Size = new System.Drawing.Size(411, 27);
             this.txt_fstatus.StyleController = this.layoutMx1;
             this.txt_fstatus.TabIndex = 596;
             // 
             // txt_guid
             // 
-            this.txt_guid.Location = new System.Drawing.Point(1092, 152);
+            this.txt_guid.Location = new System.Drawing.Point(1365, 186);
+            this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_guid.Name = "txt_guid";
-            this.txt_guid.Size = new System.Drawing.Size(242, 24);
+            this.txt_guid.Size = new System.Drawing.Size(302, 28);
             this.txt_guid.StyleController = this.layoutMx1;
             this.txt_guid.TabIndex = 597;
             // 
             // txt_depotCode
             // 
-            this.txt_depotCode.Location = new System.Drawing.Point(99, 105);
+            this.txt_depotCode.Location = new System.Drawing.Point(119, 128);
+            this.txt_depotCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_depotCode.Name = "txt_depotCode";
-            this.txt_depotCode.Size = new System.Drawing.Size(240, 24);
+            this.txt_depotCode.Size = new System.Drawing.Size(305, 28);
             this.txt_depotCode.StyleController = this.layoutMx1;
             this.txt_depotCode.TabIndex = 598;
             // 
             // txt_receivingOrg
             // 
-            this.txt_receivingOrg.Location = new System.Drawing.Point(430, 74);
+            this.txt_receivingOrg.Location = new System.Drawing.Point(533, 90);
+            this.txt_receivingOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_receivingOrg.Name = "txt_receivingOrg";
-            this.txt_receivingOrg.Size = new System.Drawing.Size(240, 24);
+            this.txt_receivingOrg.Size = new System.Drawing.Size(306, 28);
             this.txt_receivingOrg.StyleController = this.layoutMx1;
             this.txt_receivingOrg.TabIndex = 599;
             // 
@@ -734,7 +774,7 @@
             this.labl_guid.OptionsTableLayoutItem.RowIndex = 2;
             this.labl_guid.Size = new System.Drawing.Size(333, 70);
             this.labl_guid.Text = "涓婚敭GUID";
-            this.labl_guid.TextSize = new System.Drawing.Size(50, 20);
+            this.labl_guid.TextSize = new System.Drawing.Size(62, 24);
             // 
             // Root
             // 
@@ -782,7 +822,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1346, 144);
+            this.Root.Size = new System.Drawing.Size(1683, 176);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -790,101 +830,101 @@
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem1.Size = new System.Drawing.Size(414, 38);
             this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_cbillNo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(331, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(414, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_createBy;
-            this.layoutControlItem3.Location = new System.Drawing.Point(662, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(829, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem3.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem3.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_createDate;
-            this.layoutControlItem4.Location = new System.Drawing.Point(662, 31);
+            this.layoutControlItem4.Location = new System.Drawing.Point(829, 38);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_fcheckUser;
-            this.layoutControlItem5.Location = new System.Drawing.Point(993, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(1244, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(333, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem5.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_checkDate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(993, 31);
+            this.layoutControlItem6.Location = new System.Drawing.Point(1244, 38);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(333, 31);
+            this.layoutControlItem6.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem6.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_paperBillNo;
-            this.layoutControlItem8.Location = new System.Drawing.Point(331, 31);
+            this.layoutControlItem8.Location = new System.Drawing.Point(414, 38);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem8.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem8.Text = "閫佽揣鍗曞彿";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_suppName;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 38);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem9.Size = new System.Drawing.Size(414, 38);
             this.layoutControlItem9.Text = "渚涘簲鍟嗗悕绉�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_dptName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 62);
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 76);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(414, 38);
             this.layoutControlItem10.Text = "浠撳簱鍚嶇О";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_fstatus;
-            this.layoutControlItem12.Location = new System.Drawing.Point(993, 62);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1244, 76);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(333, 31);
+            this.layoutControlItem12.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -892,43 +932,44 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_depotCode;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 93);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 114);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem13.Size = new System.Drawing.Size(414, 38);
             this.layoutControlItem13.Text = "浠撳簱缂栧彿";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_dhgRemark;
-            this.layoutControlItem11.Location = new System.Drawing.Point(331, 93);
+            this.layoutControlItem11.Location = new System.Drawing.Point(414, 114);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem11.Size = new System.Drawing.Size(662, 31);
+            this.layoutControlItem11.Size = new System.Drawing.Size(830, 38);
             this.layoutControlItem11.Text = "澶囨敞璇存槑";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_receivingOrg;
-            this.layoutControlItem14.Location = new System.Drawing.Point(331, 62);
+            this.layoutControlItem14.Location = new System.Drawing.Point(414, 76);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(331, 31);
+            this.layoutControlItem14.Size = new System.Drawing.Size(415, 38);
             this.layoutControlItem14.Text = "鏀舵枡缁勭粐";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 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, 4, 4, 4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage2;
-            this.tabMx.Size = new System.Drawing.Size(1346, 414);
+            this.tabMx.Size = new System.Drawing.Size(1683, 507);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage2,
@@ -937,17 +978,20 @@
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx1);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1344, 382);
+            this.tabMxPage2.Size = new System.Drawing.Size(1681, 469);
             this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1344, 382);
+            this.gcMx1.Size = new System.Drawing.Size(1681, 469);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -969,7 +1013,9 @@
             this.gridColumn10,
             this.gridColumn5,
             this.gridColumn6,
-            this.gridColumn11});
+            this.gridColumn11,
+            this.gridColumn13});
+            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -981,156 +1027,168 @@
             this.gvMx2guid.AppearanceCell.Options.UseFont = true;
             this.gvMx2guid.Caption = "鏄庣粏琛ㄤ富閿瓽UID";
             this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
+            this.gvMx2guid.MinWidth = 62;
             this.gvMx2guid.Name = "gvMx2guid";
             this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 94;
+            this.gvMx2guid.Width = 117;
             // 
             // gvMx2itemId
             // 
             this.gvMx2itemId.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemId.Caption = "鐗╂枡ID";
             this.gvMx2itemId.FieldName = "itemId";
+            this.gvMx2itemId.MinWidth = 25;
             this.gvMx2itemId.Name = "gvMx2itemId";
             this.gvMx2itemId.Tag = "query_a.ITEM_ID";
-            this.gvMx2itemId.Width = 94;
+            this.gvMx2itemId.Width = 117;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鐗╂枡缂栧彿";
             this.gridColumn2.FieldName = "itemNo";
+            this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 0;
-            this.gridColumn2.Width = 94;
+            this.gridColumn2.Width = 117;
             // 
             // gvMx2itemSname
             // 
             this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
             this.gvMx2itemSname.FieldName = "itemName";
+            this.gvMx2itemSname.MinWidth = 25;
             this.gvMx2itemSname.Name = "gvMx2itemSname";
             this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx2itemSname.Visible = true;
             this.gvMx2itemSname.VisibleIndex = 1;
-            this.gvMx2itemSname.Width = 94;
+            this.gvMx2itemSname.Width = 117;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn1.FieldName = "itemModel";
+            this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 2;
-            this.gridColumn1.Width = 94;
+            this.gridColumn1.Width = 117;
             // 
             // gvMx2quantity
             // 
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx2quantity.Caption = "鏁伴噺";
             this.gvMx2quantity.FieldName = "quantity";
+            this.gvMx2quantity.MinWidth = 25;
             this.gvMx2quantity.Name = "gvMx2quantity";
             this.gvMx2quantity.Tag = "query_a.QUANTITY";
             this.gvMx2quantity.Visible = true;
             this.gvMx2quantity.VisibleIndex = 3;
-            this.gvMx2quantity.Width = 94;
+            this.gvMx2quantity.Width = 117;
             // 
             // gvMx2unit
             // 
             this.gvMx2unit.AppearanceCell.Options.UseFont = true;
             this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx2unit.FieldName = "kcUnit";
+            this.gvMx2unit.MinWidth = 25;
             this.gvMx2unit.Name = "gvMx2unit";
             this.gvMx2unit.Tag = "query_a.UNIT";
             this.gvMx2unit.Visible = true;
             this.gvMx2unit.VisibleIndex = 4;
-            this.gvMx2unit.Width = 94;
+            this.gvMx2unit.Width = 117;
             // 
             // gvMx2ebeln
             // 
             this.gvMx2ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx2ebeln.Caption = "閲囪喘鍗曞彿";
             this.gvMx2ebeln.FieldName = "cgdh";
+            this.gvMx2ebeln.MinWidth = 25;
             this.gvMx2ebeln.Name = "gvMx2ebeln";
             this.gvMx2ebeln.Tag = "query_a.EBELN";
             this.gvMx2ebeln.Visible = true;
             this.gvMx2ebeln.VisibleIndex = 5;
-            this.gvMx2ebeln.Width = 94;
+            this.gvMx2ebeln.Width = 117;
             // 
             // gvMx2ebelnK3id
             // 
             this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx2ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
             this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
+            this.gvMx2ebelnK3id.MinWidth = 25;
             this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
             this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
             this.gvMx2ebelnK3id.Visible = true;
             this.gvMx2ebelnK3id.VisibleIndex = 6;
-            this.gvMx2ebelnK3id.Width = 94;
+            this.gvMx2ebelnK3id.Width = 117;
             // 
             // gvMx2lineK3id
             // 
             this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx2lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
             this.gvMx2lineK3id.FieldName = "lineK3id";
+            this.gvMx2lineK3id.MinWidth = 25;
             this.gvMx2lineK3id.Name = "gvMx2lineK3id";
             this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
             this.gvMx2lineK3id.Visible = true;
             this.gvMx2lineK3id.VisibleIndex = 7;
-            this.gvMx2lineK3id.Width = 94;
+            this.gvMx2lineK3id.Width = 117;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "澶囨敞";
             this.gridColumn10.FieldName = "dhgRemark";
-            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.MinWidth = 31;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 8;
-            this.gridColumn10.Width = 94;
+            this.gridColumn10.Width = 117;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "寤虹珛鑰�";
             this.gridColumn5.FieldName = "createBy";
-            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.MinWidth = 31;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 9;
-            this.gridColumn5.Width = 94;
+            this.gridColumn5.Width = 117;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "寤虹珛鏃堕棿";
             this.gridColumn6.FieldName = "createDate";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 31;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 10;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.Width = 117;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
             this.gridColumn11.FieldName = "itemDabid";
-            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.MinWidth = 31;
             this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Width = 94;
+            this.gridColumn11.Width = 117;
             // 
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
+            this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1344, 382);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1681, 469);
             this.xtraTabPage3.Text = "鍏ュ簱鏉$爜";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1344, 382);
+            this.gcMx2.Size = new System.Drawing.Size(1681, 469);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1156,6 +1214,7 @@
             this.gridColumn7,
             this.gridColumn8,
             this.gridColumn12});
+            this.gvMx2.DetailHeight = 428;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1167,195 +1226,219 @@
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid ";
             this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
+            this.gvMx1guid.MinWidth = 62;
             this.gvMx1guid.Name = "gvMx1guid";
             this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
+            this.gvMx1guid.Width = 117;
             // 
             // gvMx1urgentFlag
             // 
             this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪";
             this.gvMx1urgentFlag.FieldName = "urgentFlag";
-            this.gvMx1urgentFlag.MinWidth = 50;
+            this.gvMx1urgentFlag.MinWidth = 62;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
             this.gvMx1urgentFlag.Tag = "query_a.URGENT_FLAG";
-            this.gvMx1urgentFlag.Width = 94;
+            this.gvMx1urgentFlag.Width = 117;
             // 
             // gvMx1itemBarcode
             // 
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
+            this.gvMx1itemBarcode.MinWidth = 25;
             this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
             this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx1itemBarcode.Visible = true;
             this.gvMx1itemBarcode.VisibleIndex = 0;
-            this.gvMx1itemBarcode.Width = 250;
+            this.gvMx1itemBarcode.Width = 312;
             // 
             // gvMx1workNo
             // 
             this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1workNo.Caption = "閲囪喘鍗曞彿";
             this.gvMx1workNo.FieldName = "ebeln";
+            this.gvMx1workNo.MinWidth = 25;
             this.gvMx1workNo.Name = "gvMx1workNo";
             this.gvMx1workNo.Tag = "query_a.WORK_NO";
             this.gvMx1workNo.Visible = true;
             this.gvMx1workNo.VisibleIndex = 1;
-            this.gvMx1workNo.Width = 100;
+            this.gvMx1workNo.Width = 125;
             // 
             // gvMx1cItemCode
             // 
             this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
             this.gvMx1cItemCode.FieldName = "itemNo";
+            this.gvMx1cItemCode.MinWidth = 25;
             this.gvMx1cItemCode.Name = "gvMx1cItemCode";
             this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
             this.gvMx1cItemCode.Visible = true;
             this.gvMx1cItemCode.VisibleIndex = 2;
-            this.gvMx1cItemCode.Width = 100;
+            this.gvMx1cItemCode.Width = 125;
             // 
             // gvMx1itemSname
             // 
             this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1itemSname.FieldName = "itemName";
+            this.gvMx1itemSname.MinWidth = 25;
             this.gvMx1itemSname.Name = "gvMx1itemSname";
             this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx1itemSname.Visible = true;
             this.gvMx1itemSname.VisibleIndex = 3;
-            this.gvMx1itemSname.Width = 250;
+            this.gvMx1itemSname.Width = 312;
             // 
             // gvMx1itemNo
             // 
             this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
             this.gvMx1itemNo.FieldName = "itemModel";
+            this.gvMx1itemNo.MinWidth = 25;
             this.gvMx1itemNo.Name = "gvMx1itemNo";
             this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx1itemNo.Visible = true;
             this.gvMx1itemNo.VisibleIndex = 4;
-            this.gvMx1itemNo.Width = 250;
+            this.gvMx1itemNo.Width = 312;
             // 
             // gvMx1quantity
             // 
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
+            this.gvMx1quantity.MinWidth = 25;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "query_a.QUANTITY";
             this.gvMx1quantity.Visible = true;
             this.gvMx1quantity.VisibleIndex = 5;
-            this.gvMx1quantity.Width = 94;
+            this.gvMx1quantity.Width = 117;
             // 
             // gvMx1unit
             // 
             this.gvMx1unit.AppearanceCell.Options.UseFont = true;
             this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx1unit.FieldName = "kcUnit";
+            this.gvMx1unit.MinWidth = 25;
             this.gvMx1unit.Name = "gvMx1unit";
             this.gvMx1unit.Tag = "query_a.UNIT";
             this.gvMx1unit.Visible = true;
             this.gvMx1unit.VisibleIndex = 6;
-            this.gvMx1unit.Width = 94;
+            this.gvMx1unit.Width = 117;
             // 
             // gvMx1rbillNo
             // 
             this.gvMx1rbillNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1rbillNo.Caption = "鍒拌揣鍗曞彿";
             this.gvMx1rbillNo.FieldName = "cbillNo";
+            this.gvMx1rbillNo.MinWidth = 25;
             this.gvMx1rbillNo.Name = "gvMx1rbillNo";
             this.gvMx1rbillNo.Tag = "query_a.RBILL_NO";
             this.gvMx1rbillNo.Visible = true;
             this.gvMx1rbillNo.VisibleIndex = 7;
-            this.gvMx1rbillNo.Width = 94;
+            this.gvMx1rbillNo.Width = 117;
             // 
             // gvMx1depotSectionCode
             // 
             this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
             this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
+            this.gvMx1depotSectionCode.MinWidth = 25;
             this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
             this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
             this.gvMx1depotSectionCode.Visible = true;
             this.gvMx1depotSectionCode.VisibleIndex = 8;
-            this.gvMx1depotSectionCode.Width = 94;
+            this.gvMx1depotSectionCode.Width = 117;
             // 
             // gvMx1depotCode
             // 
             this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
             this.gvMx1depotCode.FieldName = "depotCode";
+            this.gvMx1depotCode.MinWidth = 25;
             this.gvMx1depotCode.Name = "gvMx1depotCode";
             this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
             this.gvMx1depotCode.Visible = true;
             this.gvMx1depotCode.VisibleIndex = 9;
-            this.gvMx1depotCode.Width = 94;
+            this.gvMx1depotCode.Width = 117;
             // 
             // gvMx1ebelnK3id
             // 
             this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID";
             this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
+            this.gvMx1ebelnK3id.MinWidth = 25;
             this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
             this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
-            this.gvMx1ebelnK3id.Width = 94;
+            this.gvMx1ebelnK3id.Width = 117;
             // 
             // gvMx1lineK3id
             // 
             this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D";
             this.gvMx1lineK3id.FieldName = "lineK3id";
+            this.gvMx1lineK3id.MinWidth = 25;
             this.gvMx1lineK3id.Name = "gvMx1lineK3id";
             this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
-            this.gvMx1lineK3id.Width = 94;
+            this.gvMx1lineK3id.Width = 117;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "寤虹珛鑰�";
             this.gridColumn7.FieldName = "createBy";
-            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.MinWidth = 31;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 10;
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 117;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "寤虹珛鏃堕棿";
             this.gridColumn8.FieldName = "createDate";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 31;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 11;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.Width = 117;
             // 
             // gridColumn12
             // 
             this.gridColumn12.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
-            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.MinWidth = 31;
             this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.Width = 117;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(961, 55);
+            this.picCheckBox.Location = new System.Drawing.Point(1201, 67);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 6;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "闇�姹傝窡韪�";
+            this.gridColumn13.FieldName = "xqgz";
+            this.gridColumn13.MinWidth = 30;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 11;
+            this.gridColumn13.Width = 94;
+            // 
             // Frm_MesInvItemIns
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1348, 682);
+            this.ClientSize = new System.Drawing.Size(1685, 834);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Frm_MesInvItemIns";
             this.Text = "閲囪喘鍏ュ簱鍗�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1520,5 +1603,6 @@
         private DevExpress.Utils.ToolTipController tips;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjl.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjl.cs
index 83f7165..da5ecc8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjl.cs
@@ -192,6 +192,12 @@
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
             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;
@@ -265,6 +271,7 @@
             {
                 var strReturn = UtilityHelper.HttpPost("",
                     _webServiceName + "GetListPage", json);
+                //YS_mjczjl / + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
                 if (dd.rtnCode > 0)
                 {
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .Designer.cs
new file mode 100644
index 0000000..8b86b0d
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .Designer.cs
@@ -0,0 +1,824 @@
+锘縩amespace Gs.DevApp.DevFrm
+{
+    partial class YS_mjczjlMax
+    {
+        /// <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();
+            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.guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.yf = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.czrq = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.mjbm = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.mjmc = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.mjcz = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.bz = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.checkStatus = 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.lbGuid = new System.Windows.Forms.Label();
+            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_mjbm = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yf = new DevExpress.XtraEditors.TextEdit();
+            this.txt_czrq = new DevExpress.XtraEditors.TextEdit();
+            this.txt_mjmc = new DevExpress.XtraEditors.TextEdit();
+            this.txt_mjcz = new DevExpress.XtraEditors.TextEdit();
+            this.txt_bz = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.txt_createUser2 = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((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.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mjbm.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yf.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_czrq.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mjmc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mjcz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createUser2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).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.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            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, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            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.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            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);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+            this.gcMain1.TabIndex = 5;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.guid,
+            this.yf,
+            this.czrq,
+            this.mjbm,
+            this.mjmc,
+            this.mjcz,
+            this.bz,
+            this.checkUser,
+            this.checkDate,
+            this.checkStatus});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // guid
+            // 
+            this.guid.Caption = "guid";
+            this.guid.FieldName = "guid";
+            this.guid.MinWidth = 30;
+            this.guid.Name = "guid";
+            this.guid.Tag = "guid";
+            this.guid.Width = 94;
+            // 
+            // yf
+            // 
+            this.yf.Caption = "鏈堜唤";
+            this.yf.FieldName = "yf";
+            this.yf.MinWidth = 30;
+            this.yf.Name = "yf";
+            this.yf.Tag = "yf";
+            this.yf.Visible = true;
+            this.yf.VisibleIndex = 0;
+            this.yf.Width = 94;
+            // 
+            // czrq
+            // 
+            this.czrq.Caption = "鎿嶄綔鏃ユ湡";
+            this.czrq.FieldName = "czrq";
+            this.czrq.MinWidth = 30;
+            this.czrq.Name = "czrq";
+            this.czrq.Tag = "czrq";
+            this.czrq.Visible = true;
+            this.czrq.VisibleIndex = 1;
+            this.czrq.Width = 94;
+            // 
+            // mjbm
+            // 
+            this.mjbm.Caption = "妯″叿缂栫爜";
+            this.mjbm.FieldName = "mjbm";
+            this.mjbm.MinWidth = 30;
+            this.mjbm.Name = "mjbm";
+            this.mjbm.Tag = "mjbm";
+            this.mjbm.Visible = true;
+            this.mjbm.VisibleIndex = 2;
+            this.mjbm.Width = 94;
+            // 
+            // mjmc
+            // 
+            this.mjmc.Caption = "妯″叿鍚嶇О";
+            this.mjmc.FieldName = "mjmc";
+            this.mjmc.MinWidth = 30;
+            this.mjmc.Name = "mjmc";
+            this.mjmc.Tag = "mjmc";
+            this.mjmc.Visible = true;
+            this.mjmc.VisibleIndex = 3;
+            this.mjmc.Width = 112;
+            // 
+            // mjcz
+            // 
+            this.mjcz.Caption = " 妯″叿鎿嶄綔";
+            this.mjcz.FieldName = "mjcz";
+            this.mjcz.MinWidth = 30;
+            this.mjcz.Name = "mjcz";
+            this.mjcz.Tag = "mjcz";
+            this.mjcz.Visible = true;
+            this.mjcz.VisibleIndex = 5;
+            this.mjcz.Width = 112;
+            // 
+            // bz
+            // 
+            this.bz.Caption = "澶囨敞";
+            this.bz.FieldName = "bz";
+            this.bz.MinWidth = 30;
+            this.bz.Name = "bz";
+            this.bz.Tag = "bz";
+            this.bz.Visible = true;
+            this.bz.VisibleIndex = 6;
+            this.bz.Width = 112;
+            // 
+            // checkUser
+            // 
+            this.checkUser.Caption = "瀹℃牳浜�";
+            this.checkUser.FieldName = "checkUser";
+            this.checkUser.MinWidth = 30;
+            this.checkUser.Name = "checkUser";
+            this.checkUser.Tag = "checkUser";
+            this.checkUser.Visible = true;
+            this.checkUser.VisibleIndex = 4;
+            this.checkUser.Width = 112;
+            // 
+            // checkDate
+            // 
+            this.checkDate.Caption = "瀹℃牳鏃堕棿";
+            this.checkDate.FieldName = "checkDate";
+            this.checkDate.MinWidth = 30;
+            this.checkDate.Name = "checkDate";
+            this.checkDate.Tag = "checkDate";
+            this.checkDate.Visible = true;
+            this.checkDate.VisibleIndex = 7;
+            this.checkDate.Width = 112;
+            // 
+            // checkStatus
+            // 
+            this.checkStatus.Caption = "瀹℃牳鏍囪瘑";
+            this.checkStatus.FieldName = "checkStatus";
+            this.checkStatus.MinWidth = 30;
+            this.checkStatus.Name = "checkStatus";
+            this.checkStatus.Tag = "checkStatus";
+            this.checkStatus.Visible = true;
+            this.checkStatus.VisibleIndex = 8;
+            this.checkStatus.Width = 112;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            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(1408, 48);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+            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.Margin = new System.Windows.Forms.Padding(4);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+            this.splitMx1.SplitterPosition = 159;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_checkUser);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_checkStatus);
+            this.layoutMx1.Controls.Add(this.txt_Guid);
+            this.layoutMx1.Controls.Add(this.txt_mjbm);
+            this.layoutMx1.Controls.Add(this.txt_yf);
+            this.layoutMx1.Controls.Add(this.txt_czrq);
+            this.layoutMx1.Controls.Add(this.txt_mjmc);
+            this.layoutMx1.Controls.Add(this.txt_mjcz);
+            this.layoutMx1.Controls.Add(this.txt_bz);
+            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.Margin = new System.Windows.Forms.Padding(4);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1408, 159);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(692, 131);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(334, 34);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_checkUser
+            // 
+            this.txt_checkUser.Location = new System.Drawing.Point(443, 81);
+            this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkUser.Name = "txt_checkUser";
+            this.txt_checkUser.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkUser.StyleController = this.layoutMx1;
+            this.txt_checkUser.TabIndex = 247;
+            this.txt_checkUser.Tag = "readonly";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(96, 81);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 248;
+            this.txt_checkDate.Tag = "readonly";
+            // 
+            // txt_checkStatus
+            // 
+            this.txt_checkStatus.Location = new System.Drawing.Point(706, 81);
+            this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkStatus.Name = "txt_checkStatus";
+            this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
+            this.txt_checkStatus.StyleController = this.layoutMx1;
+            this.txt_checkStatus.TabIndex = 249;
+            this.txt_checkStatus.Tag = "readonly";
+            // 
+            // txt_Guid
+            // 
+            this.txt_Guid.Location = new System.Drawing.Point(1137, 81);
+            this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Guid.Name = "txt_Guid";
+            this.txt_Guid.Size = new System.Drawing.Size(259, 28);
+            this.txt_Guid.StyleController = this.layoutMx1;
+            this.txt_Guid.TabIndex = 250;
+            this.txt_Guid.Tag = "";
+            // 
+            // txt_mjbm
+            // 
+            this.txt_mjbm.Location = new System.Drawing.Point(790, 12);
+            this.txt_mjbm.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_mjbm.Name = "txt_mjbm";
+            this.txt_mjbm.Properties.Appearance.Options.UseFont = true;
+            this.txt_mjbm.Size = new System.Drawing.Size(259, 28);
+            this.txt_mjbm.StyleController = this.layoutMx1;
+            this.txt_mjbm.TabIndex = 231;
+            this.txt_mjbm.Tag = "";
+            // 
+            // txt_yf
+            // 
+            this.txt_yf.Location = new System.Drawing.Point(96, 12);
+            this.txt_yf.Name = "txt_yf";
+            this.txt_yf.Size = new System.Drawing.Size(259, 28);
+            this.txt_yf.StyleController = this.layoutMx1;
+            this.txt_yf.TabIndex = 251;
+            // 
+            // txt_czrq
+            // 
+            this.txt_czrq.Location = new System.Drawing.Point(443, 12);
+            this.txt_czrq.Name = "txt_czrq";
+            this.txt_czrq.Size = new System.Drawing.Size(259, 28);
+            this.txt_czrq.StyleController = this.layoutMx1;
+            this.txt_czrq.TabIndex = 251;
+            // 
+            // txt_mjmc
+            // 
+            this.txt_mjmc.Location = new System.Drawing.Point(1137, 12);
+            this.txt_mjmc.Name = "txt_mjmc";
+            this.txt_mjmc.Size = new System.Drawing.Size(259, 28);
+            this.txt_mjmc.StyleController = this.layoutMx1;
+            this.txt_mjmc.TabIndex = 251;
+            // 
+            // txt_mjcz
+            // 
+            this.txt_mjcz.Location = new System.Drawing.Point(96, 46);
+            this.txt_mjcz.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_mjcz.Name = "txt_mjcz";
+            this.txt_mjcz.Properties.Appearance.Options.UseFont = true;
+            this.txt_mjcz.Size = new System.Drawing.Size(259, 28);
+            this.txt_mjcz.StyleController = this.layoutMx1;
+            this.txt_mjcz.TabIndex = 231;
+            this.txt_mjcz.Tag = "";
+            // 
+            // txt_bz
+            // 
+            this.txt_bz.Location = new System.Drawing.Point(443, 46);
+            this.txt_bz.Name = "txt_bz";
+            this.txt_bz.Size = new System.Drawing.Size(259, 28);
+            this.txt_bz.StyleController = this.layoutMx1;
+            this.txt_bz.TabIndex = 251;
+            // 
+            // 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.layoutControlItem2,
+            this.layoutControlItem16,
+            this.layoutControlItem1,
+            this.layoutControlItem8,
+            this.layoutControlItem7,
+            this.layoutControlItem10,
+            this.layoutControlItem13,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem3});
+            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;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1408, 159);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_czrq;
+            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem2.CustomizationFormText = "鎿嶄綔鏃ユ湡";
+            this.layoutControlItem2.Location = new System.Drawing.Point(347, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem2.Text = "鎿嶄綔鏃ユ湡";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_mjbm;
+            this.layoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem16.CustomizationFormText = "妯″叿缂栫爜";
+            this.layoutControlItem16.Location = new System.Drawing.Point(694, 0);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem16.Text = "妯″叿缂栫爜";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_mjmc;
+            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem1.CustomizationFormText = "妯″叿鍚嶇О";
+            this.layoutControlItem1.Location = new System.Drawing.Point(1041, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem1.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem1.Text = "妯″叿鍚嶇О";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_checkDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 69);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_checkUser;
+            this.layoutControlItem7.Location = new System.Drawing.Point(347, 69);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem7.Text = "瀹℃牳浜�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_checkStatus;
+            this.layoutControlItem10.Location = new System.Drawing.Point(694, 69);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_Guid;
+            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem13.CustomizationFormText = "Guid";
+            this.layoutControlItem13.Location = new System.Drawing.Point(1041, 69);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem13.Text = "Guid";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_mjcz;
+            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem4.CustomizationFormText = "妯″叿鎿嶄綔";
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 34);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem4.Text = "妯″叿鎿嶄綔";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_bz;
+            this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem5.CustomizationFormText = "澶囨敞";
+            this.layoutControlItem5.Location = new System.Drawing.Point(347, 34);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem5.Text = "澶囨敞";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_yf;
+            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem3.CustomizationFormText = "鏈堜唤";
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem3.Text = "鏈堜唤";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 9;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // txt_createUser2
+            // 
+            this.txt_createUser2.Location = new System.Drawing.Point(96, 12);
+            this.txt_createUser2.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createUser2.Name = "txt_createUser2";
+            this.txt_createUser2.Properties.Appearance.Options.UseFont = true;
+            this.txt_createUser2.Size = new System.Drawing.Size(259, 28);
+            this.txt_createUser2.TabIndex = 231;
+            this.txt_createUser2.Tag = "readonly";
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_createUser2;
+            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem17.CustomizationFormText = "鍒涘缓浜�";
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem17.Text = "鍒涘缓浜�";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // YS_mjczjl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "YS_mjczjl";
+            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();
+            ((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_checkUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mjbm.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yf.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_czrq.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mjmc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mjcz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createUser2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).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 UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_checkUser;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn guid;
+        private DevExpress.XtraGrid.Columns.GridColumn yf;
+        private DevExpress.XtraGrid.Columns.GridColumn czrq;
+        private DevExpress.XtraGrid.Columns.GridColumn mjbm;
+        private DevExpress.XtraEditors.TextEdit txt_mjbm;
+        private DevExpress.XtraEditors.TextEdit txt_yf;
+        private DevExpress.XtraEditors.TextEdit txt_czrq;
+        private DevExpress.XtraGrid.Columns.GridColumn checkUser;
+        private DevExpress.XtraGrid.Columns.GridColumn checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn checkStatus;
+        private DevExpress.XtraEditors.TextEdit txt_Guid;
+        private DevExpress.XtraEditors.TextEdit txt_createUser2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraEditors.TextEdit txt_mjmc;
+        private DevExpress.XtraGrid.Columns.GridColumn mjmc;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraGrid.Columns.GridColumn mjcz;
+        private DevExpress.XtraGrid.Columns.GridColumn bz;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraEditors.TextEdit txt_mjcz;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.TextEdit txt_bz;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .cs b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .cs
new file mode 100644
index 0000000..9a21ce6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .cs
@@ -0,0 +1,399 @@
+锘縰sing DevExpress.ClipboardSource.SpreadsheetML;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows.Media.Animation;
+
+namespace Gs.DevApp.DevFrm
+{
+    public partial class YS_mjczjlMax : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "YS_mjczjlMAX/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+
+        public YS_mjczjlMax()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;//鏌ヨ浜嬩欢
+            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;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (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;
+        }
+
+        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_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_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_Guid, gridView1);
+            //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "hourlyType");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            List<dynamic> lst = new List<dynamic>();
+            lst.Add(rowGuid);
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
+            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
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            }
+        }
+
+        /// <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);
+            getPageList(this.pageBar1.CurrentPage);
+        }
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,lbGuid, txt_Guid, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+            getModel(rowGuid);
+            getPageList(this.pageBar1.CurrentPage);
+        }
+
+        /// <summary>
+        /// 淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+            string mjmc = txt_mjmc.Text.Trim();//妯″叿鍚嶇О
+            string yf = txt_yf.Text.Trim();//鏈堜唤
+            string czrq = txt_czrq.Text.Trim();//鎿嶄綔鏃ユ湡
+            string mjbm = txt_mjbm.Text.Trim();//妯″叿缂栫爜
+            string mjcz = txt_mjcz.Text.Trim();//妯″叿鎿嶄綔
+            string bz = txt_bz.Text.Trim();//澶囨敞
+
+            try
+            {
+                var _obj = new
+                {
+                    guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+                    mjmc = mjmc,
+                    yf = yf,
+                    czrq = czrq,
+                    mjbm = mjbm,
+                    mjcz = mjcz,
+                    bz = bz
+                };
+                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)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _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.ShowError("鎻愮ず锛�" + 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);
+            }
+        }
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            }
+            ;
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1);
+            //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_SalaryType, gridView1, "hourlyType");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "YS_mjczjl,check_Date,check_Status,check_user"
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .resx b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/YS_mjczjlMax .resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 9bc1968..0302780 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,34 +30,34 @@
         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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition31 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition32 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -317,6 +317,7 @@
             this.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
+            this.gridColumn107 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -481,10 +482,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(3, 2, 3, 2);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1478, 62);
+            this.toolBarMenu1.Size = new System.Drawing.Size(2111, 97);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -492,11 +493,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
-            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 97);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1478, 695);
+            this.xtraTabControl1.Size = new System.Drawing.Size(2111, 1093);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -505,9 +506,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1476, 669);
+            this.xtraTabPage1.Size = new System.Drawing.Size(2109, 1055);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -516,7 +517,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(3, 2, 3, 2);
+            this.split1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -530,19 +531,19 @@
             this.split1.Panel2.Controls.Add(this.xtraTabControl2);
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1476, 669);
-            this.split1.SplitterPosition = 416;
+            this.split1.Size = new System.Drawing.Size(2109, 1055);
+            this.split1.SplitterPosition = 654;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
-            this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1476, 213);
+            this.gcMain1.Size = new System.Drawing.Size(2109, 339);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -554,7 +555,7 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
             this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.ColumnPanelRowHeight = 39;
+            this.gridView1.ColumnPanelRowHeight = 61;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn13,
             this.gv_urgentFlag,
@@ -573,9 +574,9 @@
             this.gridColumn11,
             this.gv_checkDate,
             this.gridColumn106});
-            this.gridView1.DetailHeight = 272;
+            this.gridView1.DetailHeight = 427;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 44;
+            this.gridView1.IndicatorWidth = 63;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -585,212 +586,214 @@
             // 
             this.gridColumn13.Caption = "鏀舵枡缁勭粐";
             this.gridColumn13.FieldName = "receivingOrg";
-            this.gridColumn13.MinWidth = 44;
+            this.gridColumn13.MinWidth = 63;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "org.fnamber";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 219;
+            this.gridColumn13.Width = 313;
             // 
             // gv_urgentFlag
             // 
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡";
             this.gv_urgentFlag.FieldName = "urgentFlag";
-            this.gv_urgentFlag.MaxWidth = 44;
-            this.gv_urgentFlag.MinWidth = 44;
+            this.gv_urgentFlag.MaxWidth = 63;
+            this.gv_urgentFlag.MinWidth = 63;
             this.gv_urgentFlag.Name = "gv_urgentFlag";
             this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
             this.gv_urgentFlag.Tag = "query_a.urgent_flag";
             this.gv_urgentFlag.Visible = true;
             this.gv_urgentFlag.VisibleIndex = 1;
-            this.gv_urgentFlag.Width = 44;
+            this.gv_urgentFlag.Width = 63;
             // 
             // gridColumn25
             // 
             this.gridColumn25.Caption = "濮斿";
             this.gridColumn25.FieldName = "fType";
-            this.gridColumn25.MinWidth = 22;
+            this.gridColumn25.MinWidth = 31;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
             this.gridColumn25.VisibleIndex = 2;
-            this.gridColumn25.Width = 82;
+            this.gridColumn25.Width = 117;
             // 
             // gv_status
             // 
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "鍏ュ簱";
             this.gv_status.FieldName = "statusChk";
-            this.gv_status.MaxWidth = 44;
-            this.gv_status.MinWidth = 44;
+            this.gv_status.MaxWidth = 63;
+            this.gv_status.MinWidth = 63;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.status";
             this.gv_status.Visible = true;
             this.gv_status.VisibleIndex = 3;
-            this.gv_status.Width = 44;
+            this.gv_status.Width = 63;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 44;
+            this.gv_billNo.MinWidth = 63;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 4;
-            this.gv_billNo.Width = 105;
+            this.gv_billNo.Width = 150;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鏉$爜鎵撳嵃姣旂巼";
             this.gridColumn1.FieldName = "barRatio";
-            this.gridColumn1.MaxWidth = 70;
-            this.gridColumn1.MinWidth = 70;
+            this.gridColumn1.MaxWidth = 100;
+            this.gridColumn1.MinWidth = 100;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 5;
-            this.gridColumn1.Width = 70;
+            this.gridColumn1.Width = 100;
             // 
             // gv_createBy
             // 
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
             this.gv_createBy.FieldName = "cjr";
-            this.gv_createBy.MinWidth = 44;
+            this.gv_createBy.MinWidth = 63;
             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 = 7;
-            this.gv_createBy.Width = 82;
+            this.gv_createBy.Width = 117;
             // 
             // gridColumn26
             // 
             this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
             this.gridColumn26.FieldName = "createDate";
-            this.gridColumn26.MinWidth = 22;
+            this.gridColumn26.MinWidth = 31;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
             this.gridColumn26.VisibleIndex = 8;
-            this.gridColumn26.Width = 82;
+            this.gridColumn26.Width = 117;
             // 
             // gv_suppNo
             // 
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
             this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
             this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 44;
+            this.gv_suppNo.MinWidth = 63;
             this.gv_suppNo.Name = "gv_suppNo";
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
             this.gv_suppNo.VisibleIndex = 9;
-            this.gv_suppNo.Width = 82;
+            this.gv_suppNo.Width = 117;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
             this.gridColumn2.FieldName = "suppName";
-            this.gridColumn2.MinWidth = 44;
+            this.gridColumn2.MinWidth = 63;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 10;
-            this.gridColumn2.Width = 175;
+            this.gridColumn2.Width = 250;
             // 
             // gv_depotsCode
             // 
             this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
             this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜";
             this.gv_depotsCode.FieldName = "depotsCode";
-            this.gv_depotsCode.MinWidth = 44;
+            this.gv_depotsCode.MinWidth = 63;
             this.gv_depotsCode.Name = "gv_depotsCode";
             this.gv_depotsCode.OptionsColumn.AllowEdit = false;
             this.gv_depotsCode.Tag = "query_a.depots_code";
             this.gv_depotsCode.Visible = true;
             this.gv_depotsCode.VisibleIndex = 11;
-            this.gv_depotsCode.Width = 82;
+            this.gv_depotsCode.Width = 117;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鏀惰揣浠撳簱鍚嶇О";
             this.gridColumn3.FieldName = "depotName";
-            this.gridColumn3.MinWidth = 22;
+            this.gridColumn3.MinWidth = 31;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 12;
-            this.gridColumn3.Width = 82;
+            this.gridColumn3.Width = 117;
             // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞";
             this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 44;
+            this.gv_remark.MinWidth = 63;
             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 = 13;
-            this.gv_remark.Width = 82;
+            this.gv_remark.Width = 117;
             // 
             // gv_fstatus
             // 
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
             this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
             this.gv_fstatus.FieldName = "fstatus";
-            this.gv_fstatus.MaxWidth = 44;
-            this.gv_fstatus.MinWidth = 44;
+            this.gv_fstatus.MaxWidth = 63;
+            this.gv_fstatus.MinWidth = 63;
             this.gv_fstatus.Name = "gv_fstatus";
             this.gv_fstatus.OptionsColumn.AllowEdit = false;
             this.gv_fstatus.Tag = "query_a.fstatus";
-            this.gv_fstatus.Width = 44;
+            this.gv_fstatus.Width = 63;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "瀹℃牳浜�";
             this.gridColumn11.FieldName = "shr";
-            this.gridColumn11.MinWidth = 22;
+            this.gridColumn11.MinWidth = 31;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 14;
-            this.gridColumn11.Width = 82;
+            this.gridColumn11.Width = 117;
             // 
             // gv_checkDate
             // 
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 44;
+            this.gv_checkDate.MinWidth = 63;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
             this.gv_checkDate.VisibleIndex = 15;
-            this.gv_checkDate.Width = 157;
+            this.gv_checkDate.Width = 224;
             // 
             // gridColumn106
             // 
             this.gridColumn106.Caption = "鍏ュ簱姣斾緥";
             this.gridColumn106.FieldName = "rkbl";
+            this.gridColumn106.MinWidth = 29;
             this.gridColumn106.Name = "gridColumn106";
             this.gridColumn106.Visible = true;
             this.gridColumn106.VisibleIndex = 6;
+            this.gridColumn106.Width = 107;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 213);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.pageBar1.Location = new System.Drawing.Point(0, 339);
+            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(1476, 30);
+            this.pageBar1.Size = new System.Drawing.Size(2109, 47);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -798,10 +801,10 @@
             // 
             this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
-            this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.xtraTabControl2.Name = "xtraTabControl2";
             this.xtraTabControl2.SelectedTabPage = this.xtraTabPage5;
-            this.xtraTabControl2.Size = new System.Drawing.Size(1476, 416);
+            this.xtraTabControl2.Size = new System.Drawing.Size(2109, 654);
             this.xtraTabControl2.TabIndex = 4;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage5,
@@ -811,23 +814,24 @@
             // xtraTabPage5
             // 
             this.xtraTabPage5.Controls.Add(this.gcMxL2);
+            this.xtraTabPage5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.xtraTabPage5.Name = "xtraTabPage5";
-            this.xtraTabPage5.Size = new System.Drawing.Size(1474, 390);
+            this.xtraTabPage5.Size = new System.Drawing.Size(2107, 616);
             this.xtraTabPage5.Text = "鍚堝苟鏄庣粏";
             // 
             // gcMxL2
             // 
             this.gcMxL2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMxL2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMxL2.Location = new System.Drawing.Point(0, 0);
             this.gcMxL2.MainView = this.gvMxL2;
-            this.gcMxL2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMxL2.Name = "gcMxL2";
             this.gcMxL2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit7,
             this.repositoryItemButtonEdit8,
             this.repositoryItemComboBox4});
-            this.gcMxL2.Size = new System.Drawing.Size(1474, 390);
+            this.gcMxL2.Size = new System.Drawing.Size(2107, 616);
             this.gcMxL2.TabIndex = 3;
             this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMxL2});
@@ -854,7 +858,7 @@
             this.gridColumn103,
             this.gridColumn104,
             this.gridColumn105});
-            this.gvMxL2.DetailHeight = 272;
+            this.gvMxL2.DetailHeight = 427;
             this.gvMxL2.GridControl = this.gcMxL2;
             this.gvMxL2.Name = "gvMxL2";
             this.gvMxL2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -867,80 +871,80 @@
             // 
             this.gridColumn88.Caption = "abtGuid涓嶈兘鍒犻櫎";
             this.gridColumn88.FieldName = "aboutGuid";
-            this.gridColumn88.MinWidth = 44;
+            this.gridColumn88.MinWidth = 63;
             this.gridColumn88.Name = "gridColumn88";
             this.gridColumn88.OptionsColumn.ReadOnly = true;
-            this.gridColumn88.Width = 82;
+            this.gridColumn88.Width = 117;
             // 
             // gridColumn89
             // 
             this.gridColumn89.Caption = "鐗╂枡缂栧彿";
             this.gridColumn89.FieldName = "itemNo";
-            this.gridColumn89.MinWidth = 44;
+            this.gridColumn89.MinWidth = 63;
             this.gridColumn89.Name = "gridColumn89";
             this.gridColumn89.OptionsColumn.ReadOnly = true;
             this.gridColumn89.Visible = true;
             this.gridColumn89.VisibleIndex = 0;
-            this.gridColumn89.Width = 77;
+            this.gridColumn89.Width = 110;
             // 
             // gridColumn90
             // 
             this.gridColumn90.AppearanceCell.Options.UseFont = true;
             this.gridColumn90.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn90.FieldName = "itemName";
-            this.gridColumn90.MinWidth = 44;
+            this.gridColumn90.MinWidth = 63;
             this.gridColumn90.Name = "gridColumn90";
             this.gridColumn90.OptionsColumn.ReadOnly = true;
             this.gridColumn90.Tag = "query_a.board_style";
             this.gridColumn90.Visible = true;
             this.gridColumn90.VisibleIndex = 1;
-            this.gridColumn90.Width = 139;
+            this.gridColumn90.Width = 199;
             // 
             // gridColumn91
             // 
             this.gridColumn91.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn91.FieldName = "itemModel";
-            this.gridColumn91.MinWidth = 44;
+            this.gridColumn91.MinWidth = 63;
             this.gridColumn91.Name = "gridColumn91";
             this.gridColumn91.Visible = true;
             this.gridColumn91.VisibleIndex = 2;
-            this.gridColumn91.Width = 95;
+            this.gridColumn91.Width = 136;
             // 
             // gridColumn92
             // 
             this.gridColumn92.Caption = "鏈鏀惰揣鏁伴噺";
             this.gridColumn92.FieldName = "quantity";
-            this.gridColumn92.MinWidth = 44;
+            this.gridColumn92.MinWidth = 63;
             this.gridColumn92.Name = "gridColumn92";
             this.gridColumn92.Visible = true;
             this.gridColumn92.VisibleIndex = 3;
-            this.gridColumn92.Width = 73;
+            this.gridColumn92.Width = 104;
             // 
             // gridColumn93
             // 
             this.gridColumn93.AppearanceCell.Options.UseFont = true;
             this.gridColumn93.Caption = "宸插叆搴撴暟閲�";
             this.gridColumn93.FieldName = "okRkqty";
-            this.gridColumn93.MinWidth = 44;
+            this.gridColumn93.MinWidth = 63;
             this.gridColumn93.Name = "gridColumn93";
             this.gridColumn93.OptionsColumn.ReadOnly = true;
             this.gridColumn93.Tag = "query_a.ok_rkqty";
             this.gridColumn93.Visible = true;
             this.gridColumn93.VisibleIndex = 4;
-            this.gridColumn93.Width = 77;
+            this.gridColumn93.Width = 110;
             // 
             // gridColumn94
             // 
             this.gridColumn94.AppearanceCell.Options.UseFont = true;
             this.gridColumn94.Caption = "宸叉墦鍗版暟閲�";
             this.gridColumn94.FieldName = "yQty";
-            this.gridColumn94.MinWidth = 44;
+            this.gridColumn94.MinWidth = 63;
             this.gridColumn94.Name = "gridColumn94";
             this.gridColumn94.OptionsColumn.ReadOnly = true;
             this.gridColumn94.Tag = "query_a.ebeln_qty";
             this.gridColumn94.Visible = true;
             this.gridColumn94.VisibleIndex = 5;
-            this.gridColumn94.Width = 77;
+            this.gridColumn94.Width = 110;
             // 
             // gridColumn95
             // 
@@ -950,102 +954,108 @@
             this.gridColumn95.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn95.Caption = "鍙墦鍗版�婚噺";
             this.gridColumn95.FieldName = "kQty";
-            this.gridColumn95.MinWidth = 44;
+            this.gridColumn95.MinWidth = 63;
             this.gridColumn95.Name = "gridColumn95";
             this.gridColumn95.Visible = true;
             this.gridColumn95.VisibleIndex = 6;
-            this.gridColumn95.Width = 73;
+            this.gridColumn95.Width = 104;
             // 
             // gridColumn96
             // 
             this.gridColumn96.Caption = "鐗╂枡鍗曚綅";
             this.gridColumn96.FieldName = "wnDw";
-            this.gridColumn96.MinWidth = 44;
+            this.gridColumn96.MinWidth = 63;
             this.gridColumn96.Name = "gridColumn96";
             this.gridColumn96.OptionsColumn.ReadOnly = true;
-            this.gridColumn96.Width = 139;
+            this.gridColumn96.Width = 199;
             // 
             // gridColumn97
             // 
             this.gridColumn97.Caption = "閲囪喘鍗曚綅";
             this.gridColumn97.FieldName = "cgUnit";
-            this.gridColumn97.MinWidth = 44;
+            this.gridColumn97.MinWidth = 63;
             this.gridColumn97.Name = "gridColumn97";
             this.gridColumn97.OptionsColumn.ReadOnly = true;
             this.gridColumn97.Visible = true;
             this.gridColumn97.VisibleIndex = 7;
-            this.gridColumn97.Width = 73;
+            this.gridColumn97.Width = 104;
             // 
             // gridColumn98
             // 
             this.gridColumn98.Caption = "搴撳瓨鍗曚綅";
             this.gridColumn98.FieldName = "kcUnit";
-            this.gridColumn98.MinWidth = 44;
+            this.gridColumn98.MinWidth = 63;
             this.gridColumn98.Name = "gridColumn98";
             this.gridColumn98.OptionsColumn.ReadOnly = true;
-            this.gridColumn98.Width = 73;
+            this.gridColumn98.Width = 104;
             // 
             // gridColumn99
             // 
             this.gridColumn99.Caption = "妫�楠岀姸鎬�";
             this.gridColumn99.FieldName = "jyzt";
-            this.gridColumn99.MinWidth = 44;
+            this.gridColumn99.MinWidth = 63;
             this.gridColumn99.Name = "gridColumn99";
             this.gridColumn99.Visible = true;
             this.gridColumn99.VisibleIndex = 8;
-            this.gridColumn99.Width = 73;
+            this.gridColumn99.Width = 104;
             // 
             // gridColumn100
             // 
             this.gridColumn100.Caption = "妫�楠岀粨鏋�";
             this.gridColumn100.FieldName = "jyjg";
-            this.gridColumn100.MinWidth = 44;
+            this.gridColumn100.MinWidth = 63;
             this.gridColumn100.Name = "gridColumn100";
             this.gridColumn100.Visible = true;
             this.gridColumn100.VisibleIndex = 9;
-            this.gridColumn100.Width = 80;
+            this.gridColumn100.Width = 114;
             // 
             // gridColumn101
             // 
             this.gridColumn101.Caption = "澶勭悊鎰忚";
             this.gridColumn101.FieldName = "clyj";
-            this.gridColumn101.MinWidth = 22;
+            this.gridColumn101.MinWidth = 31;
             this.gridColumn101.Name = "gridColumn101";
             this.gridColumn101.Visible = true;
             this.gridColumn101.VisibleIndex = 10;
-            this.gridColumn101.Width = 82;
+            this.gridColumn101.Width = 117;
             // 
             // gridColumn102
             // 
             this.gridColumn102.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
             this.gridColumn102.FieldName = "mrtmsl";
-            this.gridColumn102.MinWidth = 22;
+            this.gridColumn102.MinWidth = 31;
             this.gridColumn102.Name = "gridColumn102";
-            this.gridColumn102.Width = 82;
+            this.gridColumn102.Width = 117;
             // 
             // gridColumn103
             // 
             this.gridColumn103.Caption = "浠撳簱缂栫爜";
             this.gridColumn103.FieldName = "depotCode";
+            this.gridColumn103.MinWidth = 29;
             this.gridColumn103.Name = "gridColumn103";
             this.gridColumn103.Visible = true;
             this.gridColumn103.VisibleIndex = 11;
+            this.gridColumn103.Width = 107;
             // 
             // gridColumn104
             // 
             this.gridColumn104.Caption = "浠撳簱鍚嶇О";
             this.gridColumn104.FieldName = "depotName";
+            this.gridColumn104.MinWidth = 29;
             this.gridColumn104.Name = "gridColumn104";
             this.gridColumn104.Visible = true;
             this.gridColumn104.VisibleIndex = 12;
+            this.gridColumn104.Width = 107;
             // 
             // gridColumn105
             // 
             this.gridColumn105.Caption = "浠撶鍛�";
             this.gridColumn105.FieldName = "staffName";
+            this.gridColumn105.MinWidth = 29;
             this.gridColumn105.Name = "gridColumn105";
             this.gridColumn105.Visible = true;
             this.gridColumn105.VisibleIndex = 13;
+            this.gridColumn105.Width = 107;
             // 
             // repositoryItemButtonEdit7
             // 
@@ -1071,23 +1081,24 @@
             // xtraTabPage4
             // 
             this.xtraTabPage4.Controls.Add(this.gcMxL1);
+            this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.xtraTabPage4.Name = "xtraTabPage4";
-            this.xtraTabPage4.Size = new System.Drawing.Size(1174, 390);
+            this.xtraTabPage4.Size = new System.Drawing.Size(2107, 616);
             this.xtraTabPage4.Text = "鏉ユ枡鏄庣粏";
             // 
             // gcMxL1
             // 
             this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMxL1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMxL1.Location = new System.Drawing.Point(0, 0);
             this.gcMxL1.MainView = this.gvMxL1;
-            this.gcMxL1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMxL1.Name = "gcMxL1";
             this.gcMxL1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit5,
             this.repositoryItemButtonEdit6,
             this.repositoryItemComboBox3});
-            this.gcMxL1.Size = new System.Drawing.Size(1174, 390);
+            this.gcMxL1.Size = new System.Drawing.Size(2107, 616);
             this.gcMxL1.TabIndex = 2;
             this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMxL1});
@@ -1118,7 +1129,7 @@
             this.gridColumn70,
             this.gridColumn71,
             this.gridColumn72});
-            this.gvMxL1.DetailHeight = 272;
+            this.gvMxL1.DetailHeight = 427;
             this.gvMxL1.GridControl = this.gcMxL1;
             this.gvMxL1.Name = "gvMxL1";
             this.gvMxL1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1131,116 +1142,116 @@
             // 
             this.gridColumn34.Caption = "abtGuid涓嶈兘鍒犻櫎";
             this.gridColumn34.FieldName = "aboutGuid";
-            this.gridColumn34.MinWidth = 44;
+            this.gridColumn34.MinWidth = 63;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.OptionsColumn.ReadOnly = true;
-            this.gridColumn34.Width = 82;
+            this.gridColumn34.Width = 117;
             // 
             // gridColumn35
             // 
             this.gridColumn35.AppearanceCell.Options.UseFont = true;
             this.gridColumn35.Caption = "guid涓嶈兘鍒犻櫎";
             this.gridColumn35.FieldName = "guid";
-            this.gridColumn35.MinWidth = 61;
+            this.gridColumn35.MinWidth = 87;
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.OptionsColumn.ReadOnly = true;
             this.gridColumn35.Tag = "query_a.guid";
-            this.gridColumn35.Width = 87;
+            this.gridColumn35.Width = 124;
             // 
             // gridColumn36
             // 
             this.gridColumn36.AppearanceCell.Options.UseFont = true;
             this.gridColumn36.Caption = "鎬ユ枡鏍囪瘑";
             this.gridColumn36.FieldName = "urgentFlag";
-            this.gridColumn36.MinWidth = 10;
+            this.gridColumn36.MinWidth = 14;
             this.gridColumn36.Name = "gridColumn36";
             this.gridColumn36.Tag = "query_a.urgent_flag";
             this.gridColumn36.Visible = true;
             this.gridColumn36.VisibleIndex = 0;
-            this.gridColumn36.Width = 10;
+            this.gridColumn36.Width = 14;
             // 
             // gridColumn51
             // 
             this.gridColumn51.AppearanceCell.Options.UseFont = true;
             this.gridColumn51.Caption = "ERP閲囪喘鍗曞彿";
             this.gridColumn51.FieldName = "ebeln";
-            this.gridColumn51.MinWidth = 44;
+            this.gridColumn51.MinWidth = 63;
             this.gridColumn51.Name = "gridColumn51";
             this.gridColumn51.OptionsColumn.ReadOnly = true;
             this.gridColumn51.Tag = "query_a.ebeln";
             this.gridColumn51.Visible = true;
             this.gridColumn51.VisibleIndex = 1;
-            this.gridColumn51.Width = 79;
+            this.gridColumn51.Width = 113;
             // 
             // gridColumn55
             // 
             this.gridColumn55.Caption = "鐗╂枡缂栧彿";
             this.gridColumn55.FieldName = "itemNo";
-            this.gridColumn55.MinWidth = 44;
+            this.gridColumn55.MinWidth = 63;
             this.gridColumn55.Name = "gridColumn55";
             this.gridColumn55.OptionsColumn.ReadOnly = true;
             this.gridColumn55.Visible = true;
             this.gridColumn55.VisibleIndex = 2;
-            this.gridColumn55.Width = 66;
+            this.gridColumn55.Width = 94;
             // 
             // gridColumn56
             // 
             this.gridColumn56.AppearanceCell.Options.UseFont = true;
             this.gridColumn56.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn56.FieldName = "itemName";
-            this.gridColumn56.MinWidth = 44;
+            this.gridColumn56.MinWidth = 63;
             this.gridColumn56.Name = "gridColumn56";
             this.gridColumn56.OptionsColumn.ReadOnly = true;
             this.gridColumn56.Tag = "query_a.board_style";
             this.gridColumn56.Visible = true;
             this.gridColumn56.VisibleIndex = 3;
-            this.gridColumn56.Width = 120;
+            this.gridColumn56.Width = 171;
             // 
             // gridColumn57
             // 
             this.gridColumn57.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn57.FieldName = "itemModel";
-            this.gridColumn57.MinWidth = 44;
+            this.gridColumn57.MinWidth = 63;
             this.gridColumn57.Name = "gridColumn57";
             this.gridColumn57.Visible = true;
             this.gridColumn57.VisibleIndex = 4;
-            this.gridColumn57.Width = 82;
+            this.gridColumn57.Width = 117;
             // 
             // gridColumn58
             // 
             this.gridColumn58.Caption = "鏈鏀惰揣鏁伴噺";
             this.gridColumn58.FieldName = "quantity";
-            this.gridColumn58.MinWidth = 44;
+            this.gridColumn58.MinWidth = 63;
             this.gridColumn58.Name = "gridColumn58";
             this.gridColumn58.Visible = true;
             this.gridColumn58.VisibleIndex = 5;
-            this.gridColumn58.Width = 178;
+            this.gridColumn58.Width = 254;
             // 
             // gridColumn59
             // 
             this.gridColumn59.AppearanceCell.Options.UseFont = true;
             this.gridColumn59.Caption = "宸插叆搴撴暟閲�";
             this.gridColumn59.FieldName = "okRkqty";
-            this.gridColumn59.MinWidth = 44;
+            this.gridColumn59.MinWidth = 63;
             this.gridColumn59.Name = "gridColumn59";
             this.gridColumn59.OptionsColumn.ReadOnly = true;
             this.gridColumn59.Tag = "query_a.ok_rkqty";
             this.gridColumn59.Visible = true;
             this.gridColumn59.VisibleIndex = 6;
-            this.gridColumn59.Width = 139;
+            this.gridColumn59.Width = 199;
             // 
             // gridColumn60
             // 
             this.gridColumn60.AppearanceCell.Options.UseFont = true;
             this.gridColumn60.Caption = "宸叉墦鍗版暟閲�";
             this.gridColumn60.FieldName = "yQty";
-            this.gridColumn60.MinWidth = 44;
+            this.gridColumn60.MinWidth = 63;
             this.gridColumn60.Name = "gridColumn60";
             this.gridColumn60.OptionsColumn.ReadOnly = true;
             this.gridColumn60.Tag = "query_a.ebeln_qty";
             this.gridColumn60.Visible = true;
             this.gridColumn60.VisibleIndex = 7;
-            this.gridColumn60.Width = 109;
+            this.gridColumn60.Width = 156;
             // 
             // gridColumn61
             // 
@@ -1250,78 +1261,78 @@
             this.gridColumn61.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn61.Caption = "鍙墦鍗版�婚噺";
             this.gridColumn61.FieldName = "kQty";
-            this.gridColumn61.MinWidth = 44;
+            this.gridColumn61.MinWidth = 63;
             this.gridColumn61.Name = "gridColumn61";
             this.gridColumn61.Visible = true;
             this.gridColumn61.VisibleIndex = 8;
-            this.gridColumn61.Width = 84;
+            this.gridColumn61.Width = 120;
             // 
             // gridColumn62
             // 
             this.gridColumn62.Caption = "鐗╂枡鍗曚綅";
             this.gridColumn62.FieldName = "wnDw";
-            this.gridColumn62.MinWidth = 44;
+            this.gridColumn62.MinWidth = 63;
             this.gridColumn62.Name = "gridColumn62";
             this.gridColumn62.OptionsColumn.ReadOnly = true;
-            this.gridColumn62.Width = 139;
+            this.gridColumn62.Width = 199;
             // 
             // gridColumn63
             // 
             this.gridColumn63.Caption = "閲囪喘鍗曚綅";
             this.gridColumn63.FieldName = "cgUnit";
-            this.gridColumn63.MinWidth = 44;
+            this.gridColumn63.MinWidth = 63;
             this.gridColumn63.Name = "gridColumn63";
             this.gridColumn63.OptionsColumn.ReadOnly = true;
             this.gridColumn63.Visible = true;
             this.gridColumn63.VisibleIndex = 9;
-            this.gridColumn63.Width = 44;
+            this.gridColumn63.Width = 63;
             // 
             // gridColumn64
             // 
             this.gridColumn64.Caption = "搴撳瓨鍗曚綅";
             this.gridColumn64.FieldName = "kcUnit";
-            this.gridColumn64.MinWidth = 44;
+            this.gridColumn64.MinWidth = 63;
             this.gridColumn64.Name = "gridColumn64";
             this.gridColumn64.OptionsColumn.ReadOnly = true;
-            this.gridColumn64.Width = 73;
+            this.gridColumn64.Width = 104;
             // 
             // gridColumn65
             // 
             this.gridColumn65.Caption = "妫�楠岀姸鎬�";
             this.gridColumn65.FieldName = "jyzt";
-            this.gridColumn65.MinWidth = 44;
+            this.gridColumn65.MinWidth = 63;
             this.gridColumn65.Name = "gridColumn65";
             this.gridColumn65.Visible = true;
             this.gridColumn65.VisibleIndex = 10;
-            this.gridColumn65.Width = 44;
+            this.gridColumn65.Width = 63;
             // 
             // gridColumn66
             // 
             this.gridColumn66.Caption = "妫�楠岀粨鏋�";
             this.gridColumn66.FieldName = "jyjg";
-            this.gridColumn66.MinWidth = 44;
+            this.gridColumn66.MinWidth = 63;
             this.gridColumn66.Name = "gridColumn66";
             this.gridColumn66.Visible = true;
             this.gridColumn66.VisibleIndex = 11;
-            this.gridColumn66.Width = 44;
+            this.gridColumn66.Width = 63;
             // 
             // gridColumn67
             // 
             this.gridColumn67.Caption = "澶勭悊鎰忚";
             this.gridColumn67.FieldName = "clyj";
-            this.gridColumn67.MinWidth = 22;
+            this.gridColumn67.MinWidth = 31;
             this.gridColumn67.Name = "gridColumn67";
             this.gridColumn67.Visible = true;
             this.gridColumn67.VisibleIndex = 12;
-            this.gridColumn67.Width = 22;
+            this.gridColumn67.Width = 31;
             // 
             // gridColumn68
             // 
             this.gridColumn68.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
             this.gridColumn68.FieldName = "mrtmsl";
-            this.gridColumn68.MinWidth = 22;
+            this.gridColumn68.MinWidth = 31;
             this.gridColumn68.Name = "gridColumn68";
-            this.gridColumn68.Width = 82;
+            this.gridColumn68.Width = 117;
             // 
             // gridColumn69
             // 
@@ -1329,11 +1340,12 @@
             this.gridColumn69.ColumnEdit = this.repositoryItemComboBox3;
             this.gridColumn69.FieldName = "rkType";
             this.gridColumn69.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            this.gridColumn69.MinWidth = 29;
             this.gridColumn69.Name = "gridColumn69";
             this.gridColumn69.OptionsColumn.ReadOnly = true;
             this.gridColumn69.Visible = true;
             this.gridColumn69.VisibleIndex = 16;
-            this.gridColumn69.Width = 66;
+            this.gridColumn69.Width = 94;
             // 
             // repositoryItemComboBox3
             // 
@@ -1346,28 +1358,31 @@
             // 
             this.gridColumn70.Caption = "浠撳簱缂栫爜";
             this.gridColumn70.FieldName = "depotCode";
+            this.gridColumn70.MinWidth = 29;
             this.gridColumn70.Name = "gridColumn70";
             this.gridColumn70.Visible = true;
             this.gridColumn70.VisibleIndex = 13;
-            this.gridColumn70.Width = 20;
+            this.gridColumn70.Width = 29;
             // 
             // gridColumn71
             // 
             this.gridColumn71.Caption = "浠撳簱鍚嶇О";
             this.gridColumn71.FieldName = "depotName";
+            this.gridColumn71.MinWidth = 29;
             this.gridColumn71.Name = "gridColumn71";
             this.gridColumn71.Visible = true;
             this.gridColumn71.VisibleIndex = 14;
-            this.gridColumn71.Width = 20;
+            this.gridColumn71.Width = 29;
             // 
             // gridColumn72
             // 
             this.gridColumn72.Caption = "浠撶鍛�";
             this.gridColumn72.FieldName = "staffName";
+            this.gridColumn72.MinWidth = 29;
             this.gridColumn72.Name = "gridColumn72";
             this.gridColumn72.Visible = true;
             this.gridColumn72.VisibleIndex = 15;
-            this.gridColumn72.Width = 20;
+            this.gridColumn72.Width = 29;
             // 
             // repositoryItemButtonEdit5
             // 
@@ -1386,19 +1401,20 @@
             // xtraTabPage6
             // 
             this.xtraTabPage6.Controls.Add(this.gcMxL3);
+            this.xtraTabPage6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.xtraTabPage6.Name = "xtraTabPage6";
-            this.xtraTabPage6.Size = new System.Drawing.Size(1174, 390);
+            this.xtraTabPage6.Size = new System.Drawing.Size(2107, 616);
             this.xtraTabPage6.Text = "宸叉墦鏉$爜鏄庣粏";
             // 
             // gcMxL3
             // 
             this.gcMxL3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMxL3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMxL3.Location = new System.Drawing.Point(0, 0);
             this.gcMxL3.MainView = this.gvMxL3;
-            this.gcMxL3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMxL3.Name = "gcMxL3";
-            this.gcMxL3.Size = new System.Drawing.Size(1174, 390);
+            this.gcMxL3.Size = new System.Drawing.Size(2107, 616);
             this.gcMxL3.TabIndex = 1;
             this.gcMxL3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMxL3});
@@ -1408,7 +1424,7 @@
             this.gvMxL3.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMxL3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMxL3.Appearance.Row.Options.UseFont = true;
-            this.gvMxL3.ColumnPanelRowHeight = 39;
+            this.gvMxL3.ColumnPanelRowHeight = 61;
             this.gvMxL3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn73,
             this.gridColumn74,
@@ -1425,7 +1441,7 @@
             this.gridColumn85,
             this.gridColumn86,
             this.gridColumn87});
-            this.gvMxL3.DetailHeight = 272;
+            this.gvMxL3.DetailHeight = 427;
             this.gvMxL3.GridControl = this.gcMxL3;
             this.gvMxL3.Name = "gvMxL3";
             this.gvMxL3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1437,160 +1453,164 @@
             this.gridColumn73.AppearanceCell.Options.UseFont = true;
             this.gridColumn73.Caption = "guid ";
             this.gridColumn73.FieldName = "guid";
-            this.gridColumn73.MinWidth = 44;
+            this.gridColumn73.MinWidth = 63;
             this.gridColumn73.Name = "gridColumn73";
             this.gridColumn73.Tag = "query_a.guid";
-            this.gridColumn73.Width = 82;
+            this.gridColumn73.Width = 117;
             // 
             // gridColumn74
             // 
             this.gridColumn74.Caption = "鏄惁鍏ュ簱";
             this.gridColumn74.FieldName = "isRk";
-            this.gridColumn74.MaxWidth = 44;
-            this.gridColumn74.MinWidth = 44;
+            this.gridColumn74.MaxWidth = 63;
+            this.gridColumn74.MinWidth = 63;
             this.gridColumn74.Name = "gridColumn74";
             this.gridColumn74.Visible = true;
             this.gridColumn74.VisibleIndex = 0;
-            this.gridColumn74.Width = 44;
+            this.gridColumn74.Width = 63;
             // 
             // gridColumn75
             // 
             this.gridColumn75.AppearanceCell.Options.UseFont = true;
             this.gridColumn75.Caption = "鐗╂枡鏉$爜";
             this.gridColumn75.FieldName = "itemBarcode";
-            this.gridColumn75.MinWidth = 44;
+            this.gridColumn75.MinWidth = 63;
             this.gridColumn75.Name = "gridColumn75";
             this.gridColumn75.Tag = "query_a.ITEM_BARCODE";
             this.gridColumn75.Visible = true;
             this.gridColumn75.VisibleIndex = 1;
-            this.gridColumn75.Width = 262;
+            this.gridColumn75.Width = 374;
             // 
             // gridColumn76
             // 
             this.gridColumn76.AppearanceCell.Options.UseFont = true;
             this.gridColumn76.Caption = "鐗╂枡缂栫爜 ";
             this.gridColumn76.FieldName = "itemNo";
-            this.gridColumn76.MinWidth = 44;
+            this.gridColumn76.MinWidth = 63;
             this.gridColumn76.Name = "gridColumn76";
             this.gridColumn76.Tag = "query_a.ITEM_NO";
             this.gridColumn76.Visible = true;
             this.gridColumn76.VisibleIndex = 2;
-            this.gridColumn76.Width = 87;
+            this.gridColumn76.Width = 124;
             // 
             // gridColumn77
             // 
             this.gridColumn77.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn77.FieldName = "itemName";
-            this.gridColumn77.MinWidth = 44;
+            this.gridColumn77.MinWidth = 63;
             this.gridColumn77.Name = "gridColumn77";
             this.gridColumn77.Visible = true;
             this.gridColumn77.VisibleIndex = 3;
-            this.gridColumn77.Width = 131;
+            this.gridColumn77.Width = 187;
             // 
             // gridColumn78
             // 
             this.gridColumn78.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn78.FieldName = "itemModel";
-            this.gridColumn78.MinWidth = 44;
+            this.gridColumn78.MinWidth = 63;
             this.gridColumn78.Name = "gridColumn78";
             this.gridColumn78.Visible = true;
             this.gridColumn78.VisibleIndex = 4;
-            this.gridColumn78.Width = 131;
+            this.gridColumn78.Width = 187;
             // 
             // gridColumn79
             // 
             this.gridColumn79.AppearanceCell.Options.UseFont = true;
             this.gridColumn79.Caption = "鏁伴噺";
             this.gridColumn79.FieldName = "quantity";
-            this.gridColumn79.MinWidth = 44;
+            this.gridColumn79.MinWidth = 63;
             this.gridColumn79.Name = "gridColumn79";
             this.gridColumn79.Tag = "query_a.OLDQTY";
             this.gridColumn79.Visible = true;
             this.gridColumn79.VisibleIndex = 5;
-            this.gridColumn79.Width = 82;
+            this.gridColumn79.Width = 117;
             // 
             // gridColumn80
             // 
             this.gridColumn80.Caption = "鍗曚綅";
             this.gridColumn80.FieldName = "dwName";
-            this.gridColumn80.MinWidth = 22;
+            this.gridColumn80.MinWidth = 31;
             this.gridColumn80.Name = "gridColumn80";
             this.gridColumn80.Visible = true;
             this.gridColumn80.VisibleIndex = 6;
-            this.gridColumn80.Width = 82;
+            this.gridColumn80.Width = 117;
             // 
             // gridColumn81
             // 
             this.gridColumn81.Caption = "鎵撶爜浜�";
             this.gridColumn81.FieldName = "createBy";
-            this.gridColumn81.MinWidth = 22;
+            this.gridColumn81.MinWidth = 31;
             this.gridColumn81.Name = "gridColumn81";
             this.gridColumn81.Visible = true;
             this.gridColumn81.VisibleIndex = 7;
-            this.gridColumn81.Width = 82;
+            this.gridColumn81.Width = 117;
             // 
             // gridColumn82
             // 
             this.gridColumn82.Caption = "鎵撶爜鏃ユ湡";
             this.gridColumn82.FieldName = "createDate";
-            this.gridColumn82.MinWidth = 10;
+            this.gridColumn82.MinWidth = 14;
             this.gridColumn82.Name = "gridColumn82";
             this.gridColumn82.Visible = true;
             this.gridColumn82.VisibleIndex = 8;
-            this.gridColumn82.Width = 157;
+            this.gridColumn82.Width = 224;
             // 
             // gridColumn83
             // 
             this.gridColumn83.Caption = "鍏ュ簱浜�";
             this.gridColumn83.FieldName = "rkUser";
-            this.gridColumn83.MinWidth = 22;
+            this.gridColumn83.MinWidth = 31;
             this.gridColumn83.Name = "gridColumn83";
             this.gridColumn83.Visible = true;
             this.gridColumn83.VisibleIndex = 9;
-            this.gridColumn83.Width = 82;
+            this.gridColumn83.Width = 117;
             // 
             // gridColumn84
             // 
             this.gridColumn84.Caption = "鍏ュ簱鏃ユ湡";
             this.gridColumn84.FieldName = "rkDate";
-            this.gridColumn84.MinWidth = 22;
+            this.gridColumn84.MinWidth = 31;
             this.gridColumn84.Name = "gridColumn84";
             this.gridColumn84.Visible = true;
             this.gridColumn84.VisibleIndex = 10;
-            this.gridColumn84.Width = 82;
+            this.gridColumn84.Width = 117;
             // 
             // gridColumn85
             // 
             this.gridColumn85.Caption = "鍏ュ簱浣�";
             this.gridColumn85.FieldName = "rkPositon";
-            this.gridColumn85.MinWidth = 22;
+            this.gridColumn85.MinWidth = 31;
             this.gridColumn85.Name = "gridColumn85";
             this.gridColumn85.Visible = true;
             this.gridColumn85.VisibleIndex = 11;
-            this.gridColumn85.Width = 82;
+            this.gridColumn85.Width = 117;
             // 
             // gridColumn86
             // 
             this.gridColumn86.Caption = "鍏ュ簱绫诲瀷";
             this.gridColumn86.FieldName = "cgrkType";
+            this.gridColumn86.MinWidth = 29;
             this.gridColumn86.Name = "gridColumn86";
             this.gridColumn86.Visible = true;
             this.gridColumn86.VisibleIndex = 12;
+            this.gridColumn86.Width = 107;
             // 
             // gridColumn87
             // 
             this.gridColumn87.Caption = "鏄惁鍚堝苟鎵撳嵃";
             this.gridColumn87.FieldName = "hbdy2";
+            this.gridColumn87.MinWidth = 29;
             this.gridColumn87.Name = "gridColumn87";
             this.gridColumn87.Visible = true;
             this.gridColumn87.VisibleIndex = 13;
+            this.gridColumn87.Width = 107;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1476, 669);
+            this.xtraTabPage2.Size = new System.Drawing.Size(2109, 1055);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -1598,7 +1618,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(3, 2, 3, 2);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -1611,8 +1631,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(1476, 669);
-            this.splitMx1.SplitterPosition = 109;
+            this.splitMx1.Size = new System.Drawing.Size(2109, 1055);
+            this.splitMx1.SplitterPosition = 171;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -1634,139 +1654,140 @@
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem14});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(638, 441, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1476, 109);
+            this.layoutMx1.Size = new System.Drawing.Size(2109, 171);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(865, 84);
+            this.lbGuid.Location = new System.Drawing.Point(1236, 132);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(282, 22);
+            this.lbGuid.Size = new System.Drawing.Size(403, 35);
             this.lbGuid.TabIndex = 471;
             this.lbGuid.Text = "lbGuid";
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(455, 36);
-            this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_dptName.Location = new System.Drawing.Point(654, 49);
+            this.txt_dptName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(272, 20);
+            this.txt_dptName.Size = new System.Drawing.Size(398, 28);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 468;
             // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(96, 60);
-            this.txt_gysNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_gysNo.Location = new System.Drawing.Point(132, 87);
+            this.txt_gysNo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_gysNo.Name = "txt_gysNo";
             this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysNo.Size = new System.Drawing.Size(271, 20);
+            this.txt_gysNo.Size = new System.Drawing.Size(398, 28);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
             // 
             // txt_depotsCode
             // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(455, 60);
-            this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_depotsCode.Location = new System.Drawing.Point(654, 87);
+            this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_depotsCode.Name = "txt_depotsCode";
             this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotsCode.Size = new System.Drawing.Size(272, 20);
+            this.txt_depotsCode.Size = new System.Drawing.Size(398, 28);
             this.txt_depotsCode.StyleController = this.layoutMx1;
             this.txt_depotsCode.TabIndex = 462;
             // 
             // txt_barcodeProgress
             // 
-            this.txt_barcodeProgress.Location = new System.Drawing.Point(815, 60);
-            this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(1176, 87);
+            this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
-            this.txt_barcodeProgress.Size = new System.Drawing.Size(272, 20);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(398, 28);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(455, 12);
-            this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(654, 12);
+            this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(272, 20);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(398, 28);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(96, 12);
-            this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_billNo.Location = new System.Drawing.Point(132, 12);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(271, 20);
+            this.txt_billNo.Size = new System.Drawing.Size(398, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(96, 36);
-            this.txt_gysName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_gysName.Location = new System.Drawing.Point(132, 49);
+            this.txt_gysName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_gysName.Name = "txt_gysName";
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysName.Size = new System.Drawing.Size(271, 20);
+            this.txt_gysName.Size = new System.Drawing.Size(398, 28);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(815, 12);
-            this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_createBy.Location = new System.Drawing.Point(1176, 12);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(272, 20);
+            this.txt_createBy.Size = new System.Drawing.Size(398, 28);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 217;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(96, 84);
-            this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_remark.Location = new System.Drawing.Point(132, 125);
+            this.txt_remark.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(631, 20);
+            this.txt_remark.Size = new System.Drawing.Size(920, 28);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(815, 36);
-            this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_createDate.Location = new System.Drawing.Point(1176, 49);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(272, 20);
+            this.txt_createDate.Size = new System.Drawing.Size(398, 28);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(1091, 12);
-            this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_fType.Location = new System.Drawing.Point(1578, 12);
+            this.txt_fType.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(356, 20);
+            this.txt_fType.Size = new System.Drawing.Size(519, 27);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 469;
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(1091, 36);
-            this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(1578, 49);
+            this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
-            this.txt_urgentFlag.Size = new System.Drawing.Size(356, 20);
+            this.txt_urgentFlag.Size = new System.Drawing.Size(519, 27);
             this.txt_urgentFlag.StyleController = this.layoutMx1;
             this.txt_urgentFlag.TabIndex = 470;
             // 
@@ -1801,33 +1822,33 @@
             this.layoutControlItem13});
             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;
+            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17.Width = 100D;
+            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition18.Width = 100D;
+            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition19.Width = 100D;
+            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition20.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;
+            columnDefinition17,
+            columnDefinition18,
+            columnDefinition19,
+            columnDefinition20});
+            rowDefinition13.Height = 100D;
+            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition14.Height = 100D;
+            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition15.Height = 100D;
+            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition16.Height = 100D;
+            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1459, 116);
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15,
+            rowDefinition16});
+            this.Root.Size = new System.Drawing.Size(2109, 171);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1835,102 +1856,102 @@
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(359, 24);
+            this.layoutControlItem1.Size = new System.Drawing.Size(522, 37);
             this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_gysName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 37);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(359, 24);
+            this.layoutControlItem2.Size = new System.Drawing.Size(522, 38);
             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_gysNo;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 75);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(359, 24);
+            this.layoutControlItem3.Size = new System.Drawing.Size(522, 38);
             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_paperBillNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(359, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(522, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem4.Size = new System.Drawing.Size(522, 37);
             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_dptName;
-            this.layoutControlItem5.Location = new System.Drawing.Point(359, 24);
+            this.layoutControlItem5.Location = new System.Drawing.Point(522, 37);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem5.Size = new System.Drawing.Size(522, 38);
             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_depotsCode;
-            this.layoutControlItem6.Location = new System.Drawing.Point(359, 48);
+            this.layoutControlItem6.Location = new System.Drawing.Point(522, 75);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem6.Size = new System.Drawing.Size(522, 38);
             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_createBy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(719, 0);
+            this.layoutControlItem7.Location = new System.Drawing.Point(1044, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem7.Size = new System.Drawing.Size(522, 37);
             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_createDate;
             this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.Location = new System.Drawing.Point(719, 24);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1044, 37);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem8.Size = new System.Drawing.Size(522, 38);
             this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_remark;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 113);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(719, 24);
+            this.layoutControlItem12.Size = new System.Drawing.Size(1044, 38);
             this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1079, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1566, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem10.Size = new System.Drawing.Size(523, 37);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -1938,11 +1959,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(1079, 24);
+            this.layoutControlItem11.Location = new System.Drawing.Point(1566, 37);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem11.Size = new System.Drawing.Size(523, 38);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -1950,22 +1971,22 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(719, 48);
+            this.layoutControlItem13.Location = new System.Drawing.Point(1044, 75);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(360, 24);
+            this.layoutControlItem13.Size = new System.Drawing.Size(522, 38);
             this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem13.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(3, 2, 3, 2);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.xtraTabPage3;
-            this.tabMx.Size = new System.Drawing.Size(1476, 550);
+            this.tabMx.Size = new System.Drawing.Size(2109, 869);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage3,
@@ -1975,8 +1996,9 @@
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
+            this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1474, 524);
+            this.xtraTabPage3.Size = new System.Drawing.Size(2107, 831);
             this.xtraTabPage3.Text = "鍚堝苟鏄庣粏";
             // 
             // splitContainerControl1
@@ -1984,6 +2006,7 @@
             this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainerControl1.Horizontal = false;
             this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainerControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.splitContainerControl1.Name = "splitContainerControl1";
             // 
             // splitContainerControl1.Panel1
@@ -1995,8 +2018,8 @@
             // 
             this.splitContainerControl1.Panel2.Controls.Add(this.gcMx3);
             this.splitContainerControl1.Panel2.Text = "Panel2";
-            this.splitContainerControl1.Size = new System.Drawing.Size(1474, 524);
-            this.splitContainerControl1.SplitterPosition = 130;
+            this.splitContainerControl1.Size = new System.Drawing.Size(2107, 831);
+            this.splitContainerControl1.SplitterPosition = 299;
             this.splitContainerControl1.TabIndex = 0;
             // 
             // lay99
@@ -2014,10 +2037,11 @@
             this.lay99.Controls.Add(this.txt_releaseNo);
             this.lay99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lay99.Location = new System.Drawing.Point(0, 0);
+            this.lay99.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.lay99.Name = "lay99";
             this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(684, 503, 650, 400);
             this.lay99.Root = this.layoutControlGroup3;
-            this.lay99.Size = new System.Drawing.Size(1474, 130);
+            this.lay99.Size = new System.Drawing.Size(2107, 299);
             this.lay99.TabIndex = 0;
             this.lay99.Text = "layoutControl2";
             // 
@@ -2025,23 +2049,23 @@
             // 
             this.layoutControl2.Controls.Add(this.txt_iCount_2);
             this.layoutControl2.Controls.Add(this.txt_yuliang_2);
-            this.layoutControl2.Location = new System.Drawing.Point(738, 48);
-            this.layoutControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.layoutControl2.Location = new System.Drawing.Point(1055, 105);
+            this.layoutControl2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.layoutControl2.Name = "layoutControl2";
             this.layoutControl2.Root = this.layoutControlGroup4;
-            this.layoutControl2.Size = new System.Drawing.Size(359, 33);
+            this.layoutControl2.Size = new System.Drawing.Size(518, 89);
             this.layoutControl2.TabIndex = 478;
             this.layoutControl2.Text = "layoutControl2";
             // 
             // txt_iCount_2
             // 
-            this.txt_iCount_2.Location = new System.Drawing.Point(86, 2);
-            this.txt_iCount_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_iCount_2.Location = new System.Drawing.Point(122, 2);
+            this.txt_iCount_2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_iCount_2.Name = "txt_iCount_2";
             this.txt_iCount_2.Properties.Appearance.Options.UseFont = true;
             this.txt_iCount_2.Properties.ReadOnly = true;
             this.txt_iCount_2.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_iCount_2.Size = new System.Drawing.Size(91, 20);
+            this.txt_iCount_2.Size = new System.Drawing.Size(135, 28);
             this.txt_iCount_2.StyleController = this.layoutControl2;
             this.txt_iCount_2.TabIndex = 264;
             this.txt_iCount_2.Tag = "ReadOnly";
@@ -2049,11 +2073,11 @@
             // 
             // txt_yuliang_2
             // 
-            this.txt_yuliang_2.Location = new System.Drawing.Point(265, 2);
-            this.txt_yuliang_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_yuliang_2.Location = new System.Drawing.Point(381, 2);
+            this.txt_yuliang_2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_yuliang_2.Name = "txt_yuliang_2";
             this.txt_yuliang_2.Properties.ReadOnly = true;
-            this.txt_yuliang_2.Size = new System.Drawing.Size(92, 20);
+            this.txt_yuliang_2.Size = new System.Drawing.Size(135, 28);
             this.txt_yuliang_2.StyleController = this.layoutControl2;
             this.txt_yuliang_2.TabIndex = 265;
             // 
@@ -2066,19 +2090,19 @@
             this.layoutControlItem32});
             this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup4.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
+            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition27.Width = 100D;
+            columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition28.Width = 100D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition27,
+            columnDefinition28});
+            rowDefinition21.Height = 100D;
+            rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5});
+            rowDefinition21});
             this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup4.Size = new System.Drawing.Size(359, 33);
+            this.layoutControlGroup4.Size = new System.Drawing.Size(518, 89);
             this.layoutControlGroup4.TextVisible = false;
             // 
             // layoutControlItem31
@@ -2086,23 +2110,23 @@
             this.layoutControlItem31.Control = this.txt_iCount_2;
             this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem31.Name = "layoutControlItem26";
-            this.layoutControlItem31.Size = new System.Drawing.Size(179, 33);
+            this.layoutControlItem31.Size = new System.Drawing.Size(259, 89);
             this.layoutControlItem31.Text = "鎵撳嵃鏁村紶鏁板��";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem31.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.txt_yuliang_2;
-            this.layoutControlItem32.Location = new System.Drawing.Point(179, 0);
+            this.layoutControlItem32.Location = new System.Drawing.Point(259, 0);
             this.layoutControlItem32.Name = "layoutControlItem27";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem32.Size = new System.Drawing.Size(180, 33);
+            this.layoutControlItem32.Size = new System.Drawing.Size(259, 89);
             this.layoutControlItem32.Text = "鎵撳嵃浣欐暟";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(108, 22);
             // 
             // radOut2
             // 
-            this.radOut2.Location = new System.Drawing.Point(1101, 48);
+            this.radOut2.Location = new System.Drawing.Point(1577, 105);
             this.radOut2.Margin = new System.Windows.Forms.Padding(0);
             this.radOut2.Name = "radOut2";
             this.radOut2.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2111,7 +2135,7 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut2.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut2.Size = new System.Drawing.Size(361, 33);
+            this.radOut2.Size = new System.Drawing.Size(518, 89);
             this.radOut2.StyleController = this.lay99;
             this.radOut2.TabIndex = 477;
             // 
@@ -2119,84 +2143,92 @@
             // 
             this.ucBtnPrint2.allClickKey = null;
             this.ucBtnPrint2.guidKey = null;
-            this.ucBtnPrint2.Location = new System.Drawing.Point(1101, 85);
+            this.ucBtnPrint2.Location = new System.Drawing.Point(1577, 198);
             this.ucBtnPrint2.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint2.Name = "ucBtnPrint2";
             this.ucBtnPrint2.rptParameter = null;
-            this.ucBtnPrint2.Size = new System.Drawing.Size(361, 33);
+            this.ucBtnPrint2.Size = new System.Drawing.Size(518, 89);
             this.ucBtnPrint2.TabIndex = 6;
             // 
             // txtItemNo
             // 
-            this.txtItemNo.Location = new System.Drawing.Point(96, 12);
+            this.txtItemNo.Location = new System.Drawing.Point(132, 12);
+            this.txtItemNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txtItemNo.Name = "txtItemNo";
             this.txtItemNo.Properties.ReadOnly = true;
             this.txtItemNo.Properties.Tag = "ReadOnly";
-            this.txtItemNo.Size = new System.Drawing.Size(275, 20);
+            this.txtItemNo.Size = new System.Drawing.Size(397, 28);
             this.txtItemNo.StyleController = this.lay99;
             this.txtItemNo.TabIndex = 4;
             // 
             // txtItemName
             // 
-            this.txtItemName.Location = new System.Drawing.Point(96, 48);
+            this.txtItemName.Location = new System.Drawing.Point(132, 105);
+            this.txtItemName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txtItemName.Name = "txtItemName";
             this.txtItemName.Properties.ReadOnly = true;
-            this.txtItemName.Size = new System.Drawing.Size(275, 20);
+            this.txtItemName.Size = new System.Drawing.Size(397, 28);
             this.txtItemName.StyleController = this.lay99;
             this.txtItemName.TabIndex = 5;
             this.txtItemName.Tag = "ReadOnly";
             // 
             // txt_kQtyHb
             // 
-            this.txt_kQtyHb.Location = new System.Drawing.Point(822, 12);
+            this.txt_kQtyHb.Location = new System.Drawing.Point(1175, 12);
+            this.txt_kQtyHb.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_kQtyHb.Name = "txt_kQtyHb";
             this.txt_kQtyHb.Properties.ReadOnly = true;
-            this.txt_kQtyHb.Size = new System.Drawing.Size(275, 20);
+            this.txt_kQtyHb.Size = new System.Drawing.Size(398, 28);
             this.txt_kQtyHb.StyleController = this.lay99;
             this.txt_kQtyHb.TabIndex = 479;
             this.txt_kQtyHb.Tag = "ReadOnly";
             // 
             // txt_psnQty_2
             // 
-            this.txt_psnQty_2.Location = new System.Drawing.Point(822, 85);
+            this.txt_psnQty_2.Location = new System.Drawing.Point(1175, 198);
+            this.txt_psnQty_2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_psnQty_2.Name = "txt_psnQty_2";
-            this.txt_psnQty_2.Size = new System.Drawing.Size(275, 20);
+            this.txt_psnQty_2.Size = new System.Drawing.Size(398, 28);
             this.txt_psnQty_2.StyleController = this.lay99;
             this.txt_psnQty_2.TabIndex = 480;
             // 
             // txtItemModel
             // 
-            this.txtItemModel.Location = new System.Drawing.Point(96, 85);
+            this.txtItemModel.Location = new System.Drawing.Point(132, 198);
+            this.txtItemModel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txtItemModel.Name = "txtItemModel";
             this.txtItemModel.Properties.ReadOnly = true;
-            this.txtItemModel.Size = new System.Drawing.Size(275, 20);
+            this.txtItemModel.Size = new System.Drawing.Size(397, 28);
             this.txtItemModel.StyleController = this.lay99;
             this.txtItemModel.TabIndex = 481;
             // 
             // txtQuantityHb
             // 
-            this.txtQuantityHb.Location = new System.Drawing.Point(459, 12);
+            this.txtQuantityHb.Location = new System.Drawing.Point(653, 12);
+            this.txtQuantityHb.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txtQuantityHb.Name = "txtQuantityHb";
             this.txtQuantityHb.Properties.ReadOnly = true;
-            this.txtQuantityHb.Size = new System.Drawing.Size(275, 20);
+            this.txtQuantityHb.Size = new System.Drawing.Size(398, 28);
             this.txtQuantityHb.StyleController = this.lay99;
             this.txtQuantityHb.TabIndex = 482;
             // 
             // txt_yQtyHb
             // 
-            this.txt_yQtyHb.Location = new System.Drawing.Point(459, 48);
+            this.txt_yQtyHb.Location = new System.Drawing.Point(653, 105);
+            this.txt_yQtyHb.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_yQtyHb.Name = "txt_yQtyHb";
             this.txt_yQtyHb.Properties.ReadOnly = true;
-            this.txt_yQtyHb.Size = new System.Drawing.Size(275, 20);
+            this.txt_yQtyHb.Size = new System.Drawing.Size(398, 28);
             this.txt_yQtyHb.StyleController = this.lay99;
             this.txt_yQtyHb.TabIndex = 483;
             // 
             // txt_releaseNo
             // 
-            this.txt_releaseNo.Location = new System.Drawing.Point(459, 85);
+            this.txt_releaseNo.Location = new System.Drawing.Point(653, 198);
+            this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_releaseNo.Name = "txt_releaseNo";
             this.txt_releaseNo.Properties.ReadOnly = true;
-            this.txt_releaseNo.Size = new System.Drawing.Size(275, 20);
+            this.txt_releaseNo.Size = new System.Drawing.Size(398, 28);
             this.txt_releaseNo.StyleController = this.lay99;
             this.txt_releaseNo.TabIndex = 484;
             // 
@@ -2219,40 +2251,40 @@
             this.layoutControlItem40});
             this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup3.Name = "Root";
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
-            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition9.Width = 100D;
-            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition10.Width = 100D;
+            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition29.Width = 100D;
+            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition30.Width = 100D;
+            columnDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition31.Width = 100D;
+            columnDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition32.Width = 100D;
             this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition7,
-            columnDefinition8,
-            columnDefinition9,
-            columnDefinition10});
-            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;
+            columnDefinition29,
+            columnDefinition30,
+            columnDefinition31,
+            columnDefinition32});
+            rowDefinition22.Height = 100D;
+            rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition23.Height = 100D;
+            rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition24.Height = 100D;
+            rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.layoutControlGroup3.Size = new System.Drawing.Size(1474, 130);
+            rowDefinition22,
+            rowDefinition23,
+            rowDefinition24});
+            this.layoutControlGroup3.Size = new System.Drawing.Size(2107, 299);
             this.layoutControlGroup3.TextVisible = false;
             // 
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.layoutControl2;
-            this.layoutControlItem33.Location = new System.Drawing.Point(726, 36);
+            this.layoutControlItem33.Location = new System.Drawing.Point(1043, 93);
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem33.Size = new System.Drawing.Size(363, 37);
+            this.layoutControlItem33.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem33.Text = "鎵撳嵃寮犳暟";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem33.TextVisible = false;
@@ -2261,22 +2293,22 @@
             // 
             this.layoutControlItem30.Control = this.radOut2;
             this.layoutControlItem30.CustomizationFormText = "鎵撳嵃妯″紡";
-            this.layoutControlItem30.Location = new System.Drawing.Point(1089, 36);
+            this.layoutControlItem30.Location = new System.Drawing.Point(1565, 93);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem30.Size = new System.Drawing.Size(365, 37);
+            this.layoutControlItem30.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem30.TextVisible = false;
             // 
             // layoutControlItem29
             // 
             this.layoutControlItem29.Control = this.ucBtnPrint2;
-            this.layoutControlItem29.Location = new System.Drawing.Point(1089, 73);
+            this.layoutControlItem29.Location = new System.Drawing.Point(1565, 186);
             this.layoutControlItem29.Name = "layoutControlItem29";
             this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem29.Size = new System.Drawing.Size(365, 37);
+            this.layoutControlItem29.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem29.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem29.TextVisible = false;
@@ -2284,107 +2316,107 @@
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txtItemName;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 36);
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 93);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem28.Size = new System.Drawing.Size(363, 37);
+            this.layoutControlItem28.Size = new System.Drawing.Size(521, 93);
             this.layoutControlItem28.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txtItemNo;
             this.layoutControlItem9.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(363, 36);
+            this.layoutControlItem9.Size = new System.Drawing.Size(521, 93);
             this.layoutControlItem9.Text = "鐗╂枡缂栧彿";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem34
             // 
             this.layoutControlItem34.Control = this.txt_kQtyHb;
-            this.layoutControlItem34.Location = new System.Drawing.Point(726, 0);
+            this.layoutControlItem34.Location = new System.Drawing.Point(1043, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem34.Size = new System.Drawing.Size(363, 36);
+            this.layoutControlItem34.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem34.Text = "鍙墦鍗版暟";
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem36
             // 
             this.layoutControlItem36.Control = this.txtItemModel;
-            this.layoutControlItem36.Location = new System.Drawing.Point(0, 73);
+            this.layoutControlItem36.Location = new System.Drawing.Point(0, 186);
             this.layoutControlItem36.Name = "layoutControlItem36";
             this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem36.Size = new System.Drawing.Size(363, 37);
+            this.layoutControlItem36.Size = new System.Drawing.Size(521, 93);
             this.layoutControlItem36.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem36.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem37
             // 
             this.layoutControlItem37.Control = this.txtQuantityHb;
-            this.layoutControlItem37.Location = new System.Drawing.Point(363, 0);
+            this.layoutControlItem37.Location = new System.Drawing.Point(521, 0);
             this.layoutControlItem37.Name = "layoutControlItem37";
             this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem37.Size = new System.Drawing.Size(363, 36);
+            this.layoutControlItem37.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem37.Text = "鏀惰揣鎬绘暟";
-            this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem38
             // 
             this.layoutControlItem38.Control = this.txt_yQtyHb;
-            this.layoutControlItem38.Location = new System.Drawing.Point(363, 36);
+            this.layoutControlItem38.Location = new System.Drawing.Point(521, 93);
             this.layoutControlItem38.Name = "layoutControlItem38";
             this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem38.Size = new System.Drawing.Size(363, 37);
+            this.layoutControlItem38.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem38.Text = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem38.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem38.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem39
             // 
             this.layoutControlItem39.Control = this.txt_releaseNo;
-            this.layoutControlItem39.Location = new System.Drawing.Point(363, 73);
+            this.layoutControlItem39.Location = new System.Drawing.Point(521, 186);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem39.Size = new System.Drawing.Size(363, 37);
+            this.layoutControlItem39.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem39.Text = "妫�楠屽崟鍙�";
-            this.layoutControlItem39.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem35
             // 
             this.layoutControlItem35.Control = this.txt_psnQty_2;
-            this.layoutControlItem35.Location = new System.Drawing.Point(726, 73);
+            this.layoutControlItem35.Location = new System.Drawing.Point(1043, 186);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem35.Size = new System.Drawing.Size(363, 37);
+            this.layoutControlItem35.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem35.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem40
             // 
-            this.layoutControlItem40.Location = new System.Drawing.Point(1089, 0);
+            this.layoutControlItem40.Location = new System.Drawing.Point(1565, 0);
             this.layoutControlItem40.Name = "layoutControlItem40";
             this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem40.Size = new System.Drawing.Size(365, 36);
+            this.layoutControlItem40.Size = new System.Drawing.Size(522, 93);
             this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem40.TextVisible = false;
             // 
             // gcMx3
             // 
             this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMx3.Location = new System.Drawing.Point(0, 0);
             this.gcMx3.MainView = this.gvMx3;
-            this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMx3.Name = "gcMx3";
             this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit3,
             this.repositoryItemButtonEdit4,
             this.repositoryItemComboBox2});
-            this.gcMx3.Size = new System.Drawing.Size(1474, 384);
+            this.gcMx3.Size = new System.Drawing.Size(2107, 517);
             this.gcMx3.TabIndex = 2;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -2411,7 +2443,7 @@
             this.gridColumn52,
             this.gridColumn53,
             this.gridColumn54});
-            this.gvMx3.DetailHeight = 272;
+            this.gvMx3.DetailHeight = 427;
             this.gvMx3.GridControl = this.gcMx3;
             this.gvMx3.Name = "gvMx3";
             this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2424,80 +2456,80 @@
             // 
             this.gridColumn33.Caption = "abtGuid涓嶈兘鍒犻櫎";
             this.gridColumn33.FieldName = "aboutGuid";
-            this.gridColumn33.MinWidth = 44;
+            this.gridColumn33.MinWidth = 63;
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.OptionsColumn.ReadOnly = true;
-            this.gridColumn33.Width = 82;
+            this.gridColumn33.Width = 117;
             // 
             // gridColumn37
             // 
             this.gridColumn37.Caption = "鐗╂枡缂栧彿";
             this.gridColumn37.FieldName = "itemNo";
-            this.gridColumn37.MinWidth = 44;
+            this.gridColumn37.MinWidth = 63;
             this.gridColumn37.Name = "gridColumn37";
             this.gridColumn37.OptionsColumn.ReadOnly = true;
             this.gridColumn37.Visible = true;
             this.gridColumn37.VisibleIndex = 0;
-            this.gridColumn37.Width = 77;
+            this.gridColumn37.Width = 110;
             // 
             // gridColumn38
             // 
             this.gridColumn38.AppearanceCell.Options.UseFont = true;
             this.gridColumn38.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn38.FieldName = "itemName";
-            this.gridColumn38.MinWidth = 44;
+            this.gridColumn38.MinWidth = 63;
             this.gridColumn38.Name = "gridColumn38";
             this.gridColumn38.OptionsColumn.ReadOnly = true;
             this.gridColumn38.Tag = "query_a.board_style";
             this.gridColumn38.Visible = true;
             this.gridColumn38.VisibleIndex = 1;
-            this.gridColumn38.Width = 139;
+            this.gridColumn38.Width = 199;
             // 
             // gridColumn39
             // 
             this.gridColumn39.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn39.FieldName = "itemModel";
-            this.gridColumn39.MinWidth = 44;
+            this.gridColumn39.MinWidth = 63;
             this.gridColumn39.Name = "gridColumn39";
             this.gridColumn39.Visible = true;
             this.gridColumn39.VisibleIndex = 2;
-            this.gridColumn39.Width = 95;
+            this.gridColumn39.Width = 136;
             // 
             // gridColumn40
             // 
             this.gridColumn40.Caption = "鏈鏀惰揣鏁伴噺";
             this.gridColumn40.FieldName = "quantity";
-            this.gridColumn40.MinWidth = 44;
+            this.gridColumn40.MinWidth = 63;
             this.gridColumn40.Name = "gridColumn40";
             this.gridColumn40.Visible = true;
             this.gridColumn40.VisibleIndex = 3;
-            this.gridColumn40.Width = 73;
+            this.gridColumn40.Width = 104;
             // 
             // gridColumn41
             // 
             this.gridColumn41.AppearanceCell.Options.UseFont = true;
             this.gridColumn41.Caption = "宸插叆搴撴暟閲�";
             this.gridColumn41.FieldName = "okRkqty";
-            this.gridColumn41.MinWidth = 44;
+            this.gridColumn41.MinWidth = 63;
             this.gridColumn41.Name = "gridColumn41";
             this.gridColumn41.OptionsColumn.ReadOnly = true;
             this.gridColumn41.Tag = "query_a.ok_rkqty";
             this.gridColumn41.Visible = true;
             this.gridColumn41.VisibleIndex = 4;
-            this.gridColumn41.Width = 77;
+            this.gridColumn41.Width = 110;
             // 
             // gridColumn42
             // 
             this.gridColumn42.AppearanceCell.Options.UseFont = true;
             this.gridColumn42.Caption = "宸叉墦鍗版暟閲�";
             this.gridColumn42.FieldName = "yQty";
-            this.gridColumn42.MinWidth = 44;
+            this.gridColumn42.MinWidth = 63;
             this.gridColumn42.Name = "gridColumn42";
             this.gridColumn42.OptionsColumn.ReadOnly = true;
             this.gridColumn42.Tag = "query_a.ebeln_qty";
             this.gridColumn42.Visible = true;
             this.gridColumn42.VisibleIndex = 5;
-            this.gridColumn42.Width = 77;
+            this.gridColumn42.Width = 110;
             // 
             // gridColumn43
             // 
@@ -2507,102 +2539,108 @@
             this.gridColumn43.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn43.Caption = "鍙墦鍗版�婚噺";
             this.gridColumn43.FieldName = "kQty";
-            this.gridColumn43.MinWidth = 44;
+            this.gridColumn43.MinWidth = 63;
             this.gridColumn43.Name = "gridColumn43";
             this.gridColumn43.Visible = true;
             this.gridColumn43.VisibleIndex = 6;
-            this.gridColumn43.Width = 73;
+            this.gridColumn43.Width = 104;
             // 
             // gridColumn44
             // 
             this.gridColumn44.Caption = "鐗╂枡鍗曚綅";
             this.gridColumn44.FieldName = "wnDw";
-            this.gridColumn44.MinWidth = 44;
+            this.gridColumn44.MinWidth = 63;
             this.gridColumn44.Name = "gridColumn44";
             this.gridColumn44.OptionsColumn.ReadOnly = true;
-            this.gridColumn44.Width = 139;
+            this.gridColumn44.Width = 199;
             // 
             // gridColumn45
             // 
             this.gridColumn45.Caption = "閲囪喘鍗曚綅";
             this.gridColumn45.FieldName = "cgUnit";
-            this.gridColumn45.MinWidth = 44;
+            this.gridColumn45.MinWidth = 63;
             this.gridColumn45.Name = "gridColumn45";
             this.gridColumn45.OptionsColumn.ReadOnly = true;
             this.gridColumn45.Visible = true;
             this.gridColumn45.VisibleIndex = 7;
-            this.gridColumn45.Width = 73;
+            this.gridColumn45.Width = 104;
             // 
             // gridColumn46
             // 
             this.gridColumn46.Caption = "搴撳瓨鍗曚綅";
             this.gridColumn46.FieldName = "kcUnit";
-            this.gridColumn46.MinWidth = 44;
+            this.gridColumn46.MinWidth = 63;
             this.gridColumn46.Name = "gridColumn46";
             this.gridColumn46.OptionsColumn.ReadOnly = true;
-            this.gridColumn46.Width = 73;
+            this.gridColumn46.Width = 104;
             // 
             // gridColumn47
             // 
             this.gridColumn47.Caption = "妫�楠岀姸鎬�";
             this.gridColumn47.FieldName = "jyzt";
-            this.gridColumn47.MinWidth = 44;
+            this.gridColumn47.MinWidth = 63;
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.Visible = true;
             this.gridColumn47.VisibleIndex = 8;
-            this.gridColumn47.Width = 73;
+            this.gridColumn47.Width = 104;
             // 
             // gridColumn48
             // 
             this.gridColumn48.Caption = "妫�楠岀粨鏋�";
             this.gridColumn48.FieldName = "jyjg";
-            this.gridColumn48.MinWidth = 44;
+            this.gridColumn48.MinWidth = 63;
             this.gridColumn48.Name = "gridColumn48";
             this.gridColumn48.Visible = true;
             this.gridColumn48.VisibleIndex = 9;
-            this.gridColumn48.Width = 80;
+            this.gridColumn48.Width = 114;
             // 
             // gridColumn49
             // 
             this.gridColumn49.Caption = "澶勭悊鎰忚";
             this.gridColumn49.FieldName = "clyj";
-            this.gridColumn49.MinWidth = 22;
+            this.gridColumn49.MinWidth = 31;
             this.gridColumn49.Name = "gridColumn49";
             this.gridColumn49.Visible = true;
             this.gridColumn49.VisibleIndex = 10;
-            this.gridColumn49.Width = 82;
+            this.gridColumn49.Width = 117;
             // 
             // gridColumn50
             // 
             this.gridColumn50.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
             this.gridColumn50.FieldName = "mrtmsl";
-            this.gridColumn50.MinWidth = 22;
+            this.gridColumn50.MinWidth = 31;
             this.gridColumn50.Name = "gridColumn50";
-            this.gridColumn50.Width = 82;
+            this.gridColumn50.Width = 117;
             // 
             // gridColumn52
             // 
             this.gridColumn52.Caption = "浠撳簱缂栫爜";
             this.gridColumn52.FieldName = "depotCode";
+            this.gridColumn52.MinWidth = 29;
             this.gridColumn52.Name = "gridColumn52";
             this.gridColumn52.Visible = true;
             this.gridColumn52.VisibleIndex = 11;
+            this.gridColumn52.Width = 107;
             // 
             // gridColumn53
             // 
             this.gridColumn53.Caption = "浠撳簱鍚嶇О";
             this.gridColumn53.FieldName = "depotName";
+            this.gridColumn53.MinWidth = 29;
             this.gridColumn53.Name = "gridColumn53";
             this.gridColumn53.Visible = true;
             this.gridColumn53.VisibleIndex = 12;
+            this.gridColumn53.Width = 107;
             // 
             // gridColumn54
             // 
             this.gridColumn54.Caption = "浠撶鍛�";
             this.gridColumn54.FieldName = "staffName";
+            this.gridColumn54.MinWidth = 29;
             this.gridColumn54.Name = "gridColumn54";
             this.gridColumn54.Visible = true;
             this.gridColumn54.VisibleIndex = 13;
+            this.gridColumn54.Width = 107;
             // 
             // repositoryItemButtonEdit3
             // 
@@ -2628,9 +2666,9 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.split99);
-            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1474, 524);
+            this.tabMxPage1.Size = new System.Drawing.Size(2107, 831);
             this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
             // 
             // split99
@@ -2638,7 +2676,7 @@
             this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.split99.Horizontal = false;
             this.split99.Location = new System.Drawing.Point(0, 0);
-            this.split99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.split99.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.split99.Name = "split99";
             // 
             // split99.Panel1
@@ -2651,8 +2689,8 @@
             this.split99.Panel2.Controls.Add(this.gcMx1);
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1474, 524);
-            this.split99.SplitterPosition = 136;
+            this.split99.Size = new System.Drawing.Size(2107, 831);
+            this.split99.SplitterPosition = 214;
             this.split99.TabIndex = 2;
             // 
             // layout99
@@ -2672,11 +2710,11 @@
             this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem24});
             this.layout99.Location = new System.Drawing.Point(0, 0);
-            this.layout99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.layout99.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.layout99.Name = "layout99";
             this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
             this.layout99.Root = this.layoutControlGroup1;
-            this.layout99.Size = new System.Drawing.Size(1474, 136);
+            this.layout99.Size = new System.Drawing.Size(2107, 214);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -2684,23 +2722,23 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(738, 89);
-            this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.layoutControl1.Location = new System.Drawing.Point(1055, 141);
+            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup2;
-            this.layoutControl1.Size = new System.Drawing.Size(359, 35);
+            this.layoutControl1.Size = new System.Drawing.Size(518, 61);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(86, 2);
-            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_iCount_1.Location = new System.Drawing.Point(122, 2);
+            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
             this.txt_iCount_1.Properties.ReadOnly = true;
             this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(91, 20);
+            this.txt_iCount_1.Size = new System.Drawing.Size(135, 28);
             this.txt_iCount_1.StyleController = this.layoutControl1;
             this.txt_iCount_1.TabIndex = 264;
             this.txt_iCount_1.Tag = "ReadOnly";
@@ -2708,11 +2746,11 @@
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(265, 2);
-            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(381, 2);
+            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_yuliang_1.Name = "txt_yuliang_1";
             this.txt_yuliang_1.Properties.ReadOnly = true;
-            this.txt_yuliang_1.Size = new System.Drawing.Size(92, 20);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(135, 28);
             this.txt_yuliang_1.StyleController = this.layoutControl1;
             this.txt_yuliang_1.TabIndex = 265;
             // 
@@ -2725,19 +2763,19 @@
             this.layoutControlItem27});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
-            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition11.Width = 100D;
-            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition12.Width = 100D;
+            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition21.Width = 100D;
+            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition22.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition11,
-            columnDefinition12});
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition21,
+            columnDefinition22});
+            rowDefinition17.Height = 100D;
+            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition9});
+            rowDefinition17});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(359, 35);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(518, 61);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem26
@@ -2745,26 +2783,26 @@
             this.layoutControlItem26.Control = this.txt_iCount_1;
             this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.Size = new System.Drawing.Size(179, 35);
+            this.layoutControlItem26.Size = new System.Drawing.Size(259, 61);
             this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_yuliang_1;
-            this.layoutControlItem27.Location = new System.Drawing.Point(179, 0);
+            this.layoutControlItem27.Location = new System.Drawing.Point(259, 0);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem27.Size = new System.Drawing.Size(180, 35);
+            this.layoutControlItem27.Size = new System.Drawing.Size(259, 61);
             this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
             // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(903, 93);
-            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.lbMxGuid.Location = new System.Drawing.Point(1290, 146);
+            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(51, 14);
+            this.lbMxGuid.Size = new System.Drawing.Size(73, 22);
             this.lbMxGuid.StyleController = this.layout99;
             this.lbMxGuid.TabIndex = 229;
             this.lbMxGuid.Text = "lbMxGuid";
@@ -2774,16 +2812,16 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1100, 48);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1576, 74);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = "rpt_daa";
-            this.ucBtnPrint1.Size = new System.Drawing.Size(363, 39);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(520, 65);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1102, 10);
+            this.radOut.Location = new System.Drawing.Point(1579, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2792,18 +2830,18 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(362, 38);
+            this.radOut.Size = new System.Drawing.Size(518, 64);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(822, 50);
-            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(1175, 76);
+            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
             this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(275, 20);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(398, 28);
             this.txt_psnQty_1.StyleController = this.layout99;
             this.txt_psnQty_1.TabIndex = 263;
             this.txt_psnQty_1.Tag = "ReadOnly";
@@ -2811,69 +2849,69 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(96, 12);
-            this.txtWlid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txtWlid.Location = new System.Drawing.Point(132, 12);
+            this.txtWlid.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(275, 20);
+            this.txtWlid.Size = new System.Drawing.Size(397, 28);
             this.txtWlid.StyleController = this.layout99;
             this.txtWlid.TabIndex = 214;
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(96, 50);
-            this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txtWlmc.Location = new System.Drawing.Point(132, 76);
+            this.txtWlmc.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(275, 20);
+            this.txtWlmc.Size = new System.Drawing.Size(397, 28);
             this.txtWlmc.StyleController = this.layout99;
             this.txtWlmc.TabIndex = 216;
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(96, 89);
-            this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txtWlgg.Location = new System.Drawing.Point(132, 141);
+            this.txtWlgg.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(638, 20);
+            this.txtWlgg.Size = new System.Drawing.Size(919, 28);
             this.txtWlgg.StyleController = this.layout99;
             this.txtWlgg.TabIndex = 218;
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(822, 12);
-            this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_kQty.Location = new System.Drawing.Point(1175, 12);
+            this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(275, 20);
+            this.txt_kQty.Size = new System.Drawing.Size(398, 28);
             this.txt_kQty.StyleController = this.layout99;
             this.txt_kQty.TabIndex = 224;
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(459, 12);
-            this.txtQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txtQuantity.Location = new System.Drawing.Point(653, 12);
+            this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txtQuantity.Name = "txtQuantity";
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(275, 20);
+            this.txtQuantity.Size = new System.Drawing.Size(398, 28);
             this.txtQuantity.StyleController = this.layout99;
             this.txtQuantity.TabIndex = 220;
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(459, 50);
-            this.txt_yQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_yQty.Location = new System.Drawing.Point(653, 76);
+            this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(275, 20);
+            this.txt_yQty.Size = new System.Drawing.Size(398, 28);
             this.txt_yQty.StyleController = this.layout99;
             this.txt_yQty.TabIndex = 222;
             // 
@@ -2906,30 +2944,30 @@
             this.layoutControlItem25});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition13.Width = 100D;
-            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition14.Width = 100D;
-            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition15.Width = 100D;
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
+            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition23.Width = 100D;
+            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition24.Width = 100D;
+            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition25.Width = 100D;
+            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition26.Width = 100D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition13,
-            columnDefinition14,
-            columnDefinition15,
-            columnDefinition16});
-            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;
+            columnDefinition23,
+            columnDefinition24,
+            columnDefinition25,
+            columnDefinition26});
+            rowDefinition18.Height = 100D;
+            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition19.Height = 100D;
+            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition20.Height = 100D;
+            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1474, 136);
+            rowDefinition18,
+            rowDefinition19,
+            rowDefinition20});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(2107, 214);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem15
@@ -2937,81 +2975,81 @@
             this.layoutControlItem15.Control = this.txtWlid;
             this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Size = new System.Drawing.Size(363, 38);
+            this.layoutControlItem15.Size = new System.Drawing.Size(521, 64);
             this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txtWlmc;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 38);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem16.Size = new System.Drawing.Size(363, 39);
+            this.layoutControlItem16.Size = new System.Drawing.Size(521, 65);
             this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txtWlgg;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 77);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 129);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(726, 39);
+            this.layoutControlItem17.Size = new System.Drawing.Size(1043, 65);
             this.layoutControlItem17.Text = "鐗╂枡瑙勬牸123";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txtQuantity;
-            this.layoutControlItem18.Location = new System.Drawing.Point(363, 0);
+            this.layoutControlItem18.Location = new System.Drawing.Point(521, 0);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.Size = new System.Drawing.Size(363, 38);
+            this.layoutControlItem18.Size = new System.Drawing.Size(522, 64);
             this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_yQty;
-            this.layoutControlItem19.Location = new System.Drawing.Point(363, 38);
+            this.layoutControlItem19.Location = new System.Drawing.Point(521, 64);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(363, 39);
+            this.layoutControlItem19.Size = new System.Drawing.Size(522, 65);
             this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_kQty;
-            this.layoutControlItem20.Location = new System.Drawing.Point(726, 0);
+            this.layoutControlItem20.Location = new System.Drawing.Point(1043, 0);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(363, 38);
+            this.layoutControlItem20.Size = new System.Drawing.Size(522, 64);
             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_psnQty_1;
-            this.layoutControlItem21.Location = new System.Drawing.Point(726, 38);
+            this.layoutControlItem21.Location = new System.Drawing.Point(1043, 64);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(363, 39);
+            this.layoutControlItem21.Size = new System.Drawing.Size(522, 65);
             this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.radOut;
-            this.layoutControlItem22.Location = new System.Drawing.Point(1089, 0);
+            this.layoutControlItem22.Location = new System.Drawing.Point(1565, 0);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
-            this.layoutControlItem22.Size = new System.Drawing.Size(365, 38);
+            this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 0, 0, 0);
+            this.layoutControlItem22.Size = new System.Drawing.Size(522, 64);
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -3019,12 +3057,12 @@
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.ucBtnPrint1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(1089, 38);
+            this.layoutControlItem23.Location = new System.Drawing.Point(1565, 64);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
-            this.layoutControlItem23.Size = new System.Drawing.Size(365, 39);
+            this.layoutControlItem23.Size = new System.Drawing.Size(522, 65);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -3032,11 +3070,11 @@
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.layoutControl1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(726, 77);
+            this.layoutControlItem25.Location = new System.Drawing.Point(1043, 129);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem25.Size = new System.Drawing.Size(363, 39);
+            this.layoutControlItem25.Size = new System.Drawing.Size(522, 65);
             this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
@@ -3044,16 +3082,16 @@
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemButtonEdit2,
             this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1474, 378);
+            this.gcMx1.Size = new System.Drawing.Size(2107, 602);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -3083,8 +3121,9 @@
             this.gridColumn28,
             this.gridColumn29,
             this.gridColumn30,
-            this.gridColumn31});
-            this.gvMx1.DetailHeight = 272;
+            this.gridColumn31,
+            this.gridColumn107});
+            this.gvMx1.DetailHeight = 427;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -3101,99 +3140,99 @@
             // 
             this.gvAbtGuid.Caption = "abtGuid涓嶈兘鍒犻櫎";
             this.gvAbtGuid.FieldName = "aboutGuid";
-            this.gvAbtGuid.MinWidth = 44;
+            this.gvAbtGuid.MinWidth = 63;
             this.gvAbtGuid.Name = "gvAbtGuid";
             this.gvAbtGuid.OptionsColumn.ReadOnly = true;
-            this.gvAbtGuid.Width = 82;
+            this.gvAbtGuid.Width = 117;
             // 
             // gvMx1guid
             // 
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
             this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 61;
+            this.gvMx1guid.MinWidth = 87;
             this.gvMx1guid.Name = "gvMx1guid";
             this.gvMx1guid.OptionsColumn.ReadOnly = true;
             this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 87;
+            this.gvMx1guid.Width = 124;
             // 
             // gvMx1urgentFlag
             // 
             this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gvMx1urgentFlag.FieldName = "urgentFlag";
-            this.gvMx1urgentFlag.MinWidth = 10;
+            this.gvMx1urgentFlag.MinWidth = 14;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
             this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
             this.gvMx1urgentFlag.Visible = true;
             this.gvMx1urgentFlag.VisibleIndex = 0;
-            this.gvMx1urgentFlag.Width = 42;
+            this.gvMx1urgentFlag.Width = 60;
             // 
             // gvMx1ebeln
             // 
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "ebeln";
-            this.gvMx1ebeln.MinWidth = 44;
+            this.gvMx1ebeln.MinWidth = 63;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
             this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
             this.gvMx1ebeln.VisibleIndex = 1;
-            this.gvMx1ebeln.Width = 76;
+            this.gvMx1ebeln.Width = 109;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鐗╂枡缂栧彿";
             this.gridColumn4.FieldName = "itemNo";
-            this.gridColumn4.MinWidth = 44;
+            this.gridColumn4.MinWidth = 63;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 2;
-            this.gridColumn4.Width = 63;
+            this.gridColumn4.Width = 90;
             // 
             // gvMx1boardStyle
             // 
             this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
             this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1boardStyle.FieldName = "itemName";
-            this.gvMx1boardStyle.MinWidth = 44;
+            this.gvMx1boardStyle.MinWidth = 63;
             this.gvMx1boardStyle.Name = "gvMx1boardStyle";
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
             this.gvMx1boardStyle.VisibleIndex = 3;
-            this.gvMx1boardStyle.Width = 115;
+            this.gvMx1boardStyle.Width = 164;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 44;
+            this.gridColumn6.MinWidth = 63;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 79;
+            this.gridColumn6.Width = 113;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鏈鏀惰揣鏁伴噺";
             this.gridColumn8.FieldName = "quantity";
-            this.gridColumn8.MinWidth = 44;
+            this.gridColumn8.MinWidth = 63;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 5;
-            this.gridColumn8.Width = 60;
+            this.gridColumn8.Width = 86;
             // 
             // gvMx1okRkqty
             // 
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
             this.gvMx1okRkqty.FieldName = "okRkqty";
-            this.gvMx1okRkqty.MinWidth = 44;
+            this.gvMx1okRkqty.MinWidth = 63;
             this.gvMx1okRkqty.Name = "gvMx1okRkqty";
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
@@ -3201,20 +3240,20 @@
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
             this.gvMx1okRkqty.VisibleIndex = 6;
-            this.gvMx1okRkqty.Width = 63;
+            this.gvMx1okRkqty.Width = 90;
             // 
             // gvMx1ebelnQty
             // 
             this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
             this.gvMx1ebelnQty.FieldName = "yQty";
-            this.gvMx1ebelnQty.MinWidth = 44;
+            this.gvMx1ebelnQty.MinWidth = 63;
             this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
             this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
             this.gvMx1ebelnQty.VisibleIndex = 7;
-            this.gvMx1ebelnQty.Width = 63;
+            this.gvMx1ebelnQty.Width = 90;
             // 
             // gridColumn10
             // 
@@ -3224,78 +3263,78 @@
             this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
             this.gridColumn10.FieldName = "kQty";
-            this.gridColumn10.MinWidth = 44;
+            this.gridColumn10.MinWidth = 63;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 8;
-            this.gridColumn10.Width = 60;
+            this.gridColumn10.Width = 86;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍗曚綅";
             this.gridColumn5.FieldName = "wnDw";
-            this.gridColumn5.MinWidth = 44;
+            this.gridColumn5.MinWidth = 63;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
-            this.gridColumn5.Width = 139;
+            this.gridColumn5.Width = 199;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "閲囪喘鍗曚綅";
             this.gridColumn9.FieldName = "cgUnit";
-            this.gridColumn9.MinWidth = 44;
+            this.gridColumn9.MinWidth = 63;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 9;
-            this.gridColumn9.Width = 60;
+            this.gridColumn9.Width = 86;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
             this.gridColumn7.FieldName = "kcUnit";
-            this.gridColumn7.MinWidth = 44;
+            this.gridColumn7.MinWidth = 63;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.Width = 73;
+            this.gridColumn7.Width = 104;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "妫�楠岀姸鎬�";
             this.gridColumn15.FieldName = "jyzt";
-            this.gridColumn15.MinWidth = 44;
+            this.gridColumn15.MinWidth = 63;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 10;
-            this.gridColumn15.Width = 60;
+            this.gridColumn15.Width = 86;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "妫�楠岀粨鏋�";
             this.gridColumn19.FieldName = "jyjg";
-            this.gridColumn19.MinWidth = 44;
+            this.gridColumn19.MinWidth = 63;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 11;
-            this.gridColumn19.Width = 66;
+            this.gridColumn19.Width = 94;
             // 
             // gridColumn12
             // 
             this.gridColumn12.Caption = "澶勭悊鎰忚";
             this.gridColumn12.FieldName = "clyj";
-            this.gridColumn12.MinWidth = 22;
+            this.gridColumn12.MinWidth = 31;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 12;
-            this.gridColumn12.Width = 68;
+            this.gridColumn12.Width = 97;
             // 
             // gridColumn27
             // 
             this.gridColumn27.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
             this.gridColumn27.FieldName = "mrtmsl";
-            this.gridColumn27.MinWidth = 22;
+            this.gridColumn27.MinWidth = 31;
             this.gridColumn27.Name = "gridColumn27";
-            this.gridColumn27.Width = 82;
+            this.gridColumn27.Width = 117;
             // 
             // gridColumn28
             // 
@@ -3303,11 +3342,12 @@
             this.gridColumn28.ColumnEdit = this.repositoryItemComboBox1;
             this.gridColumn28.FieldName = "rkType";
             this.gridColumn28.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            this.gridColumn28.MinWidth = 29;
             this.gridColumn28.Name = "gridColumn28";
             this.gridColumn28.OptionsColumn.ReadOnly = true;
             this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 16;
-            this.gridColumn28.Width = 66;
+            this.gridColumn28.VisibleIndex = 17;
+            this.gridColumn28.Width = 94;
             // 
             // repositoryItemComboBox1
             // 
@@ -3320,28 +3360,31 @@
             // 
             this.gridColumn29.Caption = "浠撳簱缂栫爜";
             this.gridColumn29.FieldName = "depotCode";
+            this.gridColumn29.MinWidth = 29;
             this.gridColumn29.Name = "gridColumn29";
             this.gridColumn29.Visible = true;
             this.gridColumn29.VisibleIndex = 13;
-            this.gridColumn29.Width = 62;
+            this.gridColumn29.Width = 89;
             // 
             // gridColumn30
             // 
             this.gridColumn30.Caption = "浠撳簱鍚嶇О";
             this.gridColumn30.FieldName = "depotName";
+            this.gridColumn30.MinWidth = 29;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
             this.gridColumn30.VisibleIndex = 14;
-            this.gridColumn30.Width = 62;
+            this.gridColumn30.Width = 89;
             // 
             // gridColumn31
             // 
             this.gridColumn31.Caption = "浠撶鍛�";
             this.gridColumn31.FieldName = "staffName";
+            this.gridColumn31.MinWidth = 29;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 15;
-            this.gridColumn31.Width = 82;
+            this.gridColumn31.Width = 117;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -3360,20 +3403,20 @@
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1474, 524);
+            this.tabMxPage2.Size = new System.Drawing.Size(2107, 831);
             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.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             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.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1474, 524);
+            this.gcMx2.Size = new System.Drawing.Size(2107, 831);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -3383,7 +3426,7 @@
             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.ColumnPanelRowHeight = 61;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
             this.gridColumn16,
@@ -3400,7 +3443,7 @@
             this.gridColumn24,
             this.gridColumn32,
             this.gv_hbdy});
-            this.gvMx2.DetailHeight = 272;
+            this.gvMx2.DetailHeight = 427;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3412,162 +3455,176 @@
             this.gvMx2guid.AppearanceCell.Options.UseFont = true;
             this.gvMx2guid.Caption = "guid ";
             this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 44;
+            this.gvMx2guid.MinWidth = 63;
             this.gvMx2guid.Name = "gvMx2guid";
             this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 82;
+            this.gvMx2guid.Width = 117;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "鏄惁鍏ュ簱";
             this.gridColumn16.FieldName = "isRk";
-            this.gridColumn16.MaxWidth = 44;
-            this.gridColumn16.MinWidth = 44;
+            this.gridColumn16.MaxWidth = 63;
+            this.gridColumn16.MinWidth = 63;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 0;
-            this.gridColumn16.Width = 44;
+            this.gridColumn16.Width = 63;
             // 
             // gvMx2itemBarcode
             // 
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 44;
+            this.gvMx2itemBarcode.MinWidth = 63;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
             this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 262;
+            this.gvMx2itemBarcode.Width = 374;
             // 
             // gvMx2itemNo
             // 
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
             this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 44;
+            this.gvMx2itemNo.MinWidth = 63;
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx2itemNo.Visible = true;
             this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 87;
+            this.gvMx2itemNo.Width = 124;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 44;
+            this.gridColumn18.MinWidth = 63;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 3;
-            this.gridColumn18.Width = 131;
+            this.gridColumn18.Width = 187;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 44;
+            this.gridColumn14.MinWidth = 63;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 131;
+            this.gridColumn14.Width = 187;
             // 
             // gvMx2oldqty
             // 
             this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
             this.gvMx2oldqty.Caption = "鏁伴噺";
             this.gvMx2oldqty.FieldName = "quantity";
-            this.gvMx2oldqty.MinWidth = 44;
+            this.gvMx2oldqty.MinWidth = 63;
             this.gvMx2oldqty.Name = "gvMx2oldqty";
             this.gvMx2oldqty.Tag = "query_a.OLDQTY";
             this.gvMx2oldqty.Visible = true;
             this.gvMx2oldqty.VisibleIndex = 5;
-            this.gvMx2oldqty.Width = 82;
+            this.gvMx2oldqty.Width = 117;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "鍗曚綅";
             this.gridColumn21.FieldName = "dwName";
-            this.gridColumn21.MinWidth = 22;
+            this.gridColumn21.MinWidth = 31;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 6;
-            this.gridColumn21.Width = 82;
+            this.gridColumn21.Width = 117;
             // 
             // gridColumn20
             // 
             this.gridColumn20.Caption = "鎵撶爜浜�";
             this.gridColumn20.FieldName = "createBy";
-            this.gridColumn20.MinWidth = 22;
+            this.gridColumn20.MinWidth = 31;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
             this.gridColumn20.VisibleIndex = 7;
-            this.gridColumn20.Width = 82;
+            this.gridColumn20.Width = 117;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
             this.gridColumn17.FieldName = "createDate";
-            this.gridColumn17.MinWidth = 10;
+            this.gridColumn17.MinWidth = 14;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 8;
-            this.gridColumn17.Width = 157;
+            this.gridColumn17.Width = 224;
             // 
             // gridColumn22
             // 
             this.gridColumn22.Caption = "鍏ュ簱浜�";
             this.gridColumn22.FieldName = "rkUser";
-            this.gridColumn22.MinWidth = 22;
+            this.gridColumn22.MinWidth = 31;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
             this.gridColumn22.VisibleIndex = 9;
-            this.gridColumn22.Width = 82;
+            this.gridColumn22.Width = 117;
             // 
             // gridColumn23
             // 
             this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
             this.gridColumn23.FieldName = "rkDate";
-            this.gridColumn23.MinWidth = 22;
+            this.gridColumn23.MinWidth = 31;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
             this.gridColumn23.VisibleIndex = 10;
-            this.gridColumn23.Width = 82;
+            this.gridColumn23.Width = 117;
             // 
             // gridColumn24
             // 
             this.gridColumn24.Caption = "鍏ュ簱浣�";
             this.gridColumn24.FieldName = "rkPositon";
-            this.gridColumn24.MinWidth = 22;
+            this.gridColumn24.MinWidth = 31;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
             this.gridColumn24.VisibleIndex = 11;
-            this.gridColumn24.Width = 82;
+            this.gridColumn24.Width = 117;
             // 
             // gridColumn32
             // 
             this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
             this.gridColumn32.FieldName = "cgrkType";
+            this.gridColumn32.MinWidth = 29;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
             this.gridColumn32.VisibleIndex = 12;
+            this.gridColumn32.Width = 107;
             // 
             // gv_hbdy
             // 
             this.gv_hbdy.Caption = "鏄惁鍚堝苟鎵撳嵃";
             this.gv_hbdy.FieldName = "hbdy2";
+            this.gv_hbdy.MinWidth = 29;
             this.gv_hbdy.Name = "gv_hbdy";
             this.gv_hbdy.Visible = true;
             this.gv_hbdy.VisibleIndex = 13;
+            this.gv_hbdy.Width = 107;
+            // 
+            // gridColumn107
+            // 
+            this.gridColumn107.Caption = "闇�姹傝窡韪彿";
+            this.gridColumn107.FieldName = "xqgz";
+            this.gridColumn107.MinWidth = 30;
+            this.gridColumn107.Name = "gridColumn107";
+            this.gridColumn107.Visible = true;
+            this.gridColumn107.VisibleIndex = 16;
+            this.gridColumn107.Width = 112;
             // 
             // Frm_ArrivalBarcode
             // 
-            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(1478, 757);
+            this.ClientSize = new System.Drawing.Size(2111, 1190);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "Frm_ArrivalBarcode";
             this.Text = "鍒拌揣鏉$爜鎵撳嵃";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -3987,5 +4044,6 @@
         private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
        // private UserControl.UcBtnPrintOne ucBtnPrintOne1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn107;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d0345de..97bf6bb 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -209,6 +209,12 @@
     <Compile Include="DevFrm\BasicData\Frm_Department.Designer.cs">
       <DependentUpon>Frm_Department.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\BasicData\Frm_MesDepotMin.Designer.cs">
+      <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\BasicData\Frm_MesItems.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -895,6 +901,12 @@
     </Compile>
     <Compile Include="DevFrm\Rpt\YS_jhdcl.Designer.cs">
       <DependentUpon>YS_jhdcl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Rpt\YS_mjczjlMax .cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Rpt\YS_mjczjlMax .Designer.cs">
+      <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\Rpt\YS_mjczjl.cs">
       <SubType>Form</SubType>
@@ -1746,6 +1758,9 @@
     <EmbeddedResource Include="DevFrm\BasicData\Frm_Department.resx">
       <DependentUpon>Frm_Department.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDepotMin.resx">
+      <DependentUpon>Frm_MesDepotMin.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
       <DependentUpon>Frm_MesItems.cs</DependentUpon>
     </EmbeddedResource>
@@ -2062,6 +2077,9 @@
     <EmbeddedResource Include="DevFrm\Rpt\YS_jhdcl.resx">
       <DependentUpon>YS_jhdcl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Rpt\YS_mjczjlMax .resx">
+      <DependentUpon>YS_mjczjlMax .cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Rpt\YS_mjczjl.resx">
       <DependentUpon>YS_mjczjl.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3