From 4ef4bb19a581d32e413e8d1465a18930d85cd431 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 08 十一月 2025 16:47:53 +0800
Subject: [PATCH] ID转姓名:仓库验退、生产退料申请、生产退料单、受托入库申请、受托入库单、委外加工单、委外加工出库申请

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs | 1054 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 507 insertions(+), 547 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
index e4f1057..f1f2650 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.Designer.cs
@@ -29,6 +29,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -54,7 +55,6 @@
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.bandedGridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -62,37 +62,54 @@
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = 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_ckName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_khName = new DevExpress.XtraEditors.TextEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_inType = new DevExpress.XtraEditors.TextEdit();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
             this.txt_rkOrg = new DevExpress.XtraEditors.TextEdit();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_status = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_lastupdateByName = new DevExpress.XtraEditors.TextEdit();
             this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_reason = new DevExpress.XtraEditors.TextEdit();
+            this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = 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.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -105,25 +122,8 @@
             this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -144,59 +144,59 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_khName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_inType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = "";
             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, 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;
@@ -204,10 +204,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,
@@ -216,15 +217,18 @@
             // 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
             // 
             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, 4, 4, 4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -236,25 +240,26 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
-            this.split1.Size = new System.Drawing.Size(1346, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1683, 698);
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+            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});
             // 
             // gridView1
             // 
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_status,
@@ -268,16 +273,17 @@
             this.gv_createDate,
             this.gv_lastupdateBy,
             this.gv_lastupdateDate,
-            this.gv_remark,
             this.bandedGridColumn4,
             this.gv_checkUser,
             this.gv_checkDate,
             this.bandedGridColumn3,
             this.gridColumn7,
             this.gridColumn8,
-            this.gv_guid});
+            this.gv_guid,
+            this.gridColumn9});
+            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;
@@ -285,265 +291,245 @@
             // 
             // gv_status
             // 
-            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "瀹℃牳鏍囪瘑";
             this.gv_status.FieldName = "checkStatus";
-            this.gv_status.MinWidth = 25;
+            this.gv_status.MinWidth = 31;
             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 = 0;
-            this.gv_status.Width = 50;
+            this.gv_status.Width = 62;
             // 
             // gv_billNo
             // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 25;
+            this.gv_billNo.MinWidth = 31;
             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 = 1;
-            this.gv_billNo.Width = 114;
+            this.gv_billNo.Width = 142;
             // 
             // gv_taskNo
             // 
-            this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_taskNo.AppearanceCell.Options.UseFont = true;
             this.gv_taskNo.Caption = "鐢宠鍗曞彿";
             this.gv_taskNo.FieldName = "taskNo";
-            this.gv_taskNo.MinWidth = 25;
+            this.gv_taskNo.MinWidth = 31;
             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 = 2;
-            this.gv_taskNo.Width = 94;
+            this.gv_taskNo.Width = 117;
             // 
             // gv_depotsCode
             // 
-            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
             this.gv_depotsCode.Caption = "浠撳簱ID";
             this.gv_depotsCode.FieldName = "ckId";
-            this.gv_depotsCode.MinWidth = 25;
+            this.gv_depotsCode.MinWidth = 31;
             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 = 3;
-            this.gv_depotsCode.Width = 94;
+            this.gv_depotsCode.Width = 117;
             // 
             // gv_depotsId
             // 
-            this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotsId.AppearanceCell.Options.UseFont = true;
             this.gv_depotsId.Caption = "浠撳簱缂栧彿";
             this.gv_depotsId.FieldName = "ckNo";
-            this.gv_depotsId.MinWidth = 25;
+            this.gv_depotsId.MinWidth = 31;
             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 = 4;
-            this.gv_depotsId.Width = 89;
+            this.gv_depotsId.VisibleIndex = 3;
+            this.gv_depotsId.Width = 111;
             // 
             // bandedGridColumn1
             // 
             this.bandedGridColumn1.Caption = "浠撳簱鍚嶇О";
             this.bandedGridColumn1.FieldName = "ckName";
-            this.bandedGridColumn1.MinWidth = 25;
+            this.bandedGridColumn1.MinWidth = 31;
             this.bandedGridColumn1.Name = "bandedGridColumn1";
             this.bandedGridColumn1.Visible = true;
-            this.bandedGridColumn1.VisibleIndex = 5;
-            this.bandedGridColumn1.Width = 94;
+            this.bandedGridColumn1.VisibleIndex = 4;
+            this.bandedGridColumn1.Width = 117;
             // 
             // gv_reason
             // 
-            this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_reason.AppearanceCell.Options.UseFont = true;
             this.gv_reason.Caption = "鍘熷洜 ";
-            this.gv_reason.FieldName = "reason";
-            this.gv_reason.MinWidth = 25;
+            this.gv_reason.FieldName = "sqRemark";
+            this.gv_reason.MinWidth = 31;
             this.gv_reason.Name = "gv_reason";
             this.gv_reason.OptionsColumn.AllowEdit = false;
             this.gv_reason.Tag = "query_a.REASON";
             this.gv_reason.Visible = true;
-            this.gv_reason.VisibleIndex = 6;
-            this.gv_reason.Width = 94;
+            this.gv_reason.VisibleIndex = 5;
+            this.gv_reason.Width = 117;
             // 
             // gv_createBy
             // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜� ";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
+            this.gv_createBy.FieldName = "createByName";
+            this.gv_createBy.MinWidth = 62;
             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 = 66;
+            this.gv_createBy.VisibleIndex = 6;
+            this.gv_createBy.Width = 82;
             // 
             // gv_createDate
             // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 25;
+            this.gv_createDate.MinWidth = 31;
             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 = 8;
-            this.gv_createDate.Width = 146;
+            this.gv_createDate.VisibleIndex = 7;
+            this.gv_createDate.Width = 182;
             // 
             // gv_lastupdateBy
             // 
-            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
-            this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            this.gv_lastupdateBy.MinWidth = 25;
+            this.gv_lastupdateBy.FieldName = "lastupdateByName";
+            this.gv_lastupdateBy.MinWidth = 31;
             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 = 9;
-            this.gv_lastupdateBy.Width = 94;
+            this.gv_lastupdateBy.VisibleIndex = 8;
+            this.gv_lastupdateBy.Width = 117;
             // 
             // gv_lastupdateDate
             // 
-            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 25;
+            this.gv_lastupdateDate.MinWidth = 31;
             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 = 10;
-            this.gv_lastupdateDate.Width = 94;
-            // 
-            // gv_remark
-            // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_remark.AppearanceCell.Options.UseFont = true;
-            this.gv_remark.Caption = "澶囨敞 ";
-            this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 50;
-            this.gv_remark.Name = "gv_remark";
-            this.gv_remark.OptionsColumn.AllowEdit = false;
-            this.gv_remark.Tag = "query_a.REMARK";
-            this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 11;
-            this.gv_remark.Width = 119;
+            this.gv_lastupdateDate.VisibleIndex = 9;
+            this.gv_lastupdateDate.Width = 117;
             // 
             // bandedGridColumn4
             // 
             this.bandedGridColumn4.Caption = "鍗曟嵁绫诲瀷";
             this.bandedGridColumn4.FieldName = "inType";
-            this.bandedGridColumn4.MinWidth = 25;
+            this.bandedGridColumn4.MinWidth = 31;
             this.bandedGridColumn4.Name = "bandedGridColumn4";
             this.bandedGridColumn4.Visible = true;
-            this.bandedGridColumn4.VisibleIndex = 12;
-            this.bandedGridColumn4.Width = 94;
+            this.bandedGridColumn4.VisibleIndex = 10;
+            this.bandedGridColumn4.Width = 117;
             // 
             // gv_checkUser
             // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
-            this.gv_checkUser.FieldName = "checkUser";
-            this.gv_checkUser.MinWidth = 25;
+            this.gv_checkUser.FieldName = "checkUserName";
+            this.gv_checkUser.MinWidth = 31;
             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 = 13;
-            this.gv_checkUser.Width = 94;
+            this.gv_checkUser.VisibleIndex = 11;
+            this.gv_checkUser.Width = 117;
             // 
             // gv_checkDate
             // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 25;
+            this.gv_checkDate.MinWidth = 31;
             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 = 14;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.VisibleIndex = 12;
+            this.gv_checkDate.Width = 117;
             // 
             // bandedGridColumn3
             // 
             this.bandedGridColumn3.Caption = "搴撳瓨缁勭粐";
             this.bandedGridColumn3.FieldName = "rkOrg";
-            this.bandedGridColumn3.MinWidth = 25;
+            this.bandedGridColumn3.MinWidth = 31;
             this.bandedGridColumn3.Name = "bandedGridColumn3";
             this.bandedGridColumn3.Visible = true;
-            this.bandedGridColumn3.VisibleIndex = 15;
-            this.bandedGridColumn3.Width = 94;
+            this.bandedGridColumn3.VisibleIndex = 13;
+            this.bandedGridColumn3.Width = 117;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "瀹㈡埛ID";
             this.gridColumn7.FieldName = "khId";
-            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.MinWidth = 31;
             this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 16;
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 117;
             // 
             // gridColumn8
             // 
-            this.gridColumn8.Caption = "瀹㈡埛鍚嶇О";
+            this.gridColumn8.Caption = "瀹㈡埛缂栧彿";
             this.gridColumn8.FieldName = "khNo";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 31;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 17;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.VisibleIndex = 14;
+            this.gridColumn8.Width = 117;
             // 
             // gv_guid
             // 
-            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_guid.AppearanceCell.Options.UseFont = true;
             this.gv_guid.Caption = "涓婚敭GUID";
             this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 25;
+            this.gv_guid.MinWidth = 31;
             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;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "瀹㈡埛鍚嶇О";
+            this.gridColumn9.FieldName = "khName";
+            this.gridColumn9.MinWidth = 31;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 15;
+            this.gridColumn9.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
@@ -551,6 +537,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
@@ -562,196 +549,200 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.Size = new System.Drawing.Size(1346, 570);
-            this.splitMx1.SplitterPosition = 142;
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1683, 698);
+            this.splitMx1.SplitterPosition = 174;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_ckName);
-            this.layoutMx1.Controls.Add(this.txt_remark);
-            this.layoutMx1.Controls.Add(this.txt_checkUser);
+            this.layoutMx1.Controls.Add(this.txt_checkUserName);
             this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_khName);
             this.layoutMx1.Controls.Add(this.txt_billNo);
             this.layoutMx1.Controls.Add(this.txt_taskNo);
             this.layoutMx1.Controls.Add(this.txt_inType);
-            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_createByName);
             this.layoutMx1.Controls.Add(this.txt_rkOrg);
             this.layoutMx1.Controls.Add(this.txt_checkDate);
             this.layoutMx1.Controls.Add(this.txt_status);
-            this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
+            this.layoutMx1.Controls.Add(this.txt_lastupdateByName);
             this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
-            this.layoutMx1.Controls.Add(this.txt_reason);
+            this.layoutMx1.Controls.Add(this.txt_sqRemark);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem19});
             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(425, 342, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1346, 142);
+            this.layoutMx1.Size = new System.Drawing.Size(1683, 174);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // lbGuid
             // 
-            this.lbGuid.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lbGuid.Location = new System.Drawing.Point(990, 108);
+            this.lbGuid.Location = new System.Drawing.Point(1238, 132);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(323, 28);
+            this.lbGuid.Size = new System.Drawing.Size(404, 34);
             this.lbGuid.TabIndex = 612;
             this.lbGuid.Text = "lbGuid";
             // 
             // txt_ckName
             // 
-            this.txt_ckName.Location = new System.Drawing.Point(440, 76);
+            this.txt_ckName.Location = new System.Drawing.Point(137, 88);
+            this.txt_ckName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_ckName.Name = "txt_ckName";
-            this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_ckName.Properties.Appearance.Options.UseFont = true;
-            this.txt_ckName.Size = new System.Drawing.Size(220, 28);
+            this.txt_ckName.Size = new System.Drawing.Size(287, 28);
             this.txt_ckName.StyleController = this.layoutMx1;
             this.txt_ckName.TabIndex = 609;
             // 
-            // txt_remark
+            // txt_checkUserName
             // 
-            this.txt_remark.Location = new System.Drawing.Point(114, 76);
-            this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(220, 28);
-            this.txt_remark.StyleController = this.layoutMx1;
-            this.txt_remark.TabIndex = 240;
-            // 
-            // txt_checkUser
-            // 
-            this.txt_checkUser.Location = new System.Drawing.Point(1092, 12);
-            this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(221, 28);
-            this.txt_checkUser.StyleController = this.layoutMx1;
-            this.txt_checkUser.TabIndex = 608;
+            this.txt_checkUserName.Location = new System.Drawing.Point(1381, 14);
+            this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_checkUserName.Name = "txt_checkUserName";
+            this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkUserName.Size = new System.Drawing.Size(288, 28);
+            this.txt_checkUserName.StyleController = this.layoutMx1;
+            this.txt_checkUserName.TabIndex = 608;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(766, 76);
+            this.txt_createDate.Location = new System.Drawing.Point(966, 51);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(220, 28);
+            this.txt_createDate.Size = new System.Drawing.Size(288, 28);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 222;
             // 
             // txt_khName
             // 
-            this.txt_khName.Location = new System.Drawing.Point(440, 44);
+            this.txt_khName.Location = new System.Drawing.Point(551, 88);
+            this.txt_khName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_khName.Name = "txt_khName";
-            this.txt_khName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_khName.Properties.Appearance.Options.UseFont = true;
-            this.txt_khName.Size = new System.Drawing.Size(220, 28);
+            this.txt_khName.Size = new System.Drawing.Size(288, 28);
             this.txt_khName.StyleController = this.layoutMx1;
             this.txt_khName.TabIndex = 595;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(137, 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.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(220, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(287, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_taskNo
             // 
-            this.txt_taskNo.Location = new System.Drawing.Point(440, 12);
+            this.txt_taskNo.Location = new System.Drawing.Point(551, 14);
+            this.txt_taskNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_taskNo.Name = "txt_taskNo";
-            this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_taskNo.Size = new System.Drawing.Size(220, 28);
+            this.txt_taskNo.Size = new System.Drawing.Size(288, 28);
             this.txt_taskNo.StyleController = this.layoutMx1;
             this.txt_taskNo.TabIndex = 507;
             // 
             // txt_inType
             // 
-            this.txt_inType.Location = new System.Drawing.Point(766, 12);
+            this.txt_inType.Location = new System.Drawing.Point(551, 51);
+            this.txt_inType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_inType.Name = "txt_inType";
-            this.txt_inType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_inType.Properties.Appearance.Options.UseFont = true;
-            this.txt_inType.Size = new System.Drawing.Size(220, 28);
+            this.txt_inType.Size = new System.Drawing.Size(288, 28);
             this.txt_inType.StyleController = this.layoutMx1;
             this.txt_inType.TabIndex = 598;
             // 
-            // txt_createBy
+            // txt_createByName
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(766, 44);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(220, 28);
-            this.txt_createBy.StyleController = this.layoutMx1;
-            this.txt_createBy.TabIndex = 219;
+            this.txt_createByName.Location = new System.Drawing.Point(966, 14);
+            this.txt_createByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_createByName.Name = "txt_createByName";
+            this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+            this.txt_createByName.Size = new System.Drawing.Size(288, 28);
+            this.txt_createByName.StyleController = this.layoutMx1;
+            this.txt_createByName.TabIndex = 219;
             // 
             // txt_rkOrg
             // 
-            this.txt_rkOrg.Location = new System.Drawing.Point(114, 44);
+            this.txt_rkOrg.Location = new System.Drawing.Point(137, 51);
+            this.txt_rkOrg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_rkOrg.Name = "txt_rkOrg";
-            this.txt_rkOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_rkOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_rkOrg.Size = new System.Drawing.Size(220, 28);
+            this.txt_rkOrg.Size = new System.Drawing.Size(287, 28);
             this.txt_rkOrg.StyleController = this.layoutMx1;
             this.txt_rkOrg.TabIndex = 593;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(1092, 44);
+            this.txt_checkDate.Location = new System.Drawing.Point(1381, 51);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(221, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(288, 28);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 587;
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(990, 76);
+            this.txt_status.Location = new System.Drawing.Point(1258, 88);
+            this.txt_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_status.Size = new System.Drawing.Size(323, 24);
+            this.txt_status.Size = new System.Drawing.Size(411, 27);
             this.txt_status.StyleController = this.layoutMx1;
             this.txt_status.TabIndex = 609;
             // 
-            // txt_lastupdateBy
+            // txt_lastupdateByName
             // 
-            this.txt_lastupdateBy.Location = new System.Drawing.Point(766, 108);
-            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
-            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateBy.Size = new System.Drawing.Size(220, 28);
-            this.txt_lastupdateBy.StyleController = this.layoutMx1;
-            this.txt_lastupdateBy.TabIndex = 610;
+            this.txt_lastupdateByName.Location = new System.Drawing.Point(966, 88);
+            this.txt_lastupdateByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_lastupdateByName.Name = "txt_lastupdateByName";
+            this.txt_lastupdateByName.Properties.Appearance.Options.UseFont = true;
+            this.txt_lastupdateByName.Size = new System.Drawing.Size(288, 28);
+            this.txt_lastupdateByName.StyleController = this.layoutMx1;
+            this.txt_lastupdateByName.TabIndex = 610;
             // 
             // txt_lastupdateDate
             // 
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(1092, 108);
+            this.txt_lastupdateDate.Location = new System.Drawing.Point(966, 125);
+            this.txt_lastupdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_lastupdateDate.Name = "txt_lastupdateDate";
-            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateDate.Size = new System.Drawing.Size(221, 28);
+            this.txt_lastupdateDate.Size = new System.Drawing.Size(288, 28);
             this.txt_lastupdateDate.StyleController = this.layoutMx1;
             this.txt_lastupdateDate.TabIndex = 611;
             // 
-            // txt_reason
+            // txt_sqRemark
             // 
-            this.txt_reason.Location = new System.Drawing.Point(114, 108);
-            this.txt_reason.Name = "txt_reason";
-            this.txt_reason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_reason.Properties.Appearance.Options.UseFont = true;
-            this.txt_reason.Size = new System.Drawing.Size(546, 28);
-            this.txt_reason.StyleController = this.layoutMx1;
-            this.txt_reason.TabIndex = 613;
+            this.txt_sqRemark.Location = new System.Drawing.Point(137, 125);
+            this.txt_sqRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_sqRemark.Name = "txt_sqRemark";
+            this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
+            this.txt_sqRemark.Size = new System.Drawing.Size(702, 28);
+            this.txt_sqRemark.StyleController = this.layoutMx1;
+            this.txt_sqRemark.TabIndex = 613;
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.lbGuid;
+            this.layoutControlItem19.Location = new System.Drawing.Point(978, 96);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem19.Size = new System.Drawing.Size(327, 32);
+            this.layoutControlItem19.Text = "lbGuid";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem19.TextVisible = false;
             // 
             // Root
             // 
@@ -760,19 +751,18 @@
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
             this.layoutControlItem2,
-            this.layoutControlItem3,
             this.layoutControlItem4,
             this.layoutControlItem5,
             this.layoutControlItem8,
             this.layoutControlItem12,
-            this.layoutControlItem10,
+            this.layoutControlItem20,
             this.layoutControlItem14,
+            this.layoutControlItem10,
+            this.layoutControlItem3,
             this.layoutControlItem11,
             this.layoutControlItem15,
-            this.layoutControlItem16,
-            this.layoutControlItem20,
-            this.layoutControlItem18,
-            this.layoutControlItem17});
+            this.layoutControlItem17,
+            this.layoutControlItem18});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -801,7 +791,7 @@
             rowDefinition6,
             rowDefinition7,
             rowDefinition8});
-            this.Root.Size = new System.Drawing.Size(1325, 148);
+            this.Root.Size = new System.Drawing.Size(1683, 174);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -809,111 +799,295 @@
             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(326, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(414, 37);
             this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_taskNo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(326, 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(326, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(415, 37);
             this.layoutControlItem2.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_inType;
-            this.layoutControlItem3.Location = new System.Drawing.Point(652, 0);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem4
             // 
-            this.layoutControlItem4.Control = this.txt_checkUser;
-            this.layoutControlItem4.Location = new System.Drawing.Point(978, 0);
+            this.layoutControlItem4.Control = this.txt_checkUserName;
+            this.layoutControlItem4.Location = new System.Drawing.Point(1244, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(327, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(415, 37);
             this.layoutControlItem4.Text = "瀹℃牳浜�";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_rkOrg;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 37);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(414, 37);
             this.layoutControlItem5.Text = "搴撳瓨缁勭粐";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_checkDate;
-            this.layoutControlItem8.Location = new System.Drawing.Point(978, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1244, 37);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(327, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(415, 37);
             this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_status;
-            this.layoutControlItem12.Location = new System.Drawing.Point(978, 64);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1244, 74);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(327, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(415, 37);
             this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
             // 
-            // layoutControlItem19
+            // layoutControlItem20
             // 
-            this.layoutControlItem19.Control = this.lbGuid;
-            this.layoutControlItem19.Location = new System.Drawing.Point(978, 96);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(327, 32);
-            this.layoutControlItem19.Text = "lbGuid";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem19.TextVisible = false;
+            this.layoutControlItem20.Control = this.txt_sqRemark;
+            this.layoutControlItem20.Location = new System.Drawing.Point(0, 111);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem20.Size = new System.Drawing.Size(829, 39);
+            this.layoutControlItem20.Text = "鍘熷洜";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_ckName;
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 74);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.Size = new System.Drawing.Size(414, 37);
+            this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_khName;
+            this.layoutControlItem10.Location = new System.Drawing.Point(414, 74);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(415, 37);
+            this.layoutControlItem10.Text = "瀹㈡埛鍚嶇О";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_inType;
+            this.layoutControlItem3.Location = new System.Drawing.Point(414, 37);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(415, 37);
+            this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_createByName;
+            this.layoutControlItem11.Location = new System.Drawing.Point(829, 0);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(415, 37);
+            this.layoutControlItem11.Text = "鍒涘缓浜�";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_createDate;
+            this.layoutControlItem15.Location = new System.Drawing.Point(829, 37);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem15.Size = new System.Drawing.Size(415, 37);
+            this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_lastupdateByName;
+            this.layoutControlItem17.Location = new System.Drawing.Point(829, 74);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem17.Size = new System.Drawing.Size(415, 37);
+            this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_lastupdateDate;
+            this.layoutControlItem18.Location = new System.Drawing.Point(829, 111);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem18.Size = new System.Drawing.Size(415, 39);
+            this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1346, 416);
+            this.tabMx.Size = new System.Drawing.Size(1683, 509);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage2,
-            this.tabMxPage1});
+            this.tabMxPage1,
+            this.tabMxPage2});
             // 
             // tabMxPage1
             // 
-            this.tabMxPage1.Controls.Add(this.gcMx2);
+            this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1344, 384);
-            this.tabMxPage1.Text = "鍏ュ簱鏉$爜";
+            this.tabMxPage1.Size = new System.Drawing.Size(1681, 471);
+            this.tabMxPage1.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(1681, 471);
+            this.gcMx1.TabIndex = 0;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gvMx2itemSname,
+            this.gvMx2quantity,
+            this.gvMx2unit,
+            this.gridColumn5,
+            this.gridColumn6});
+            this.gvMx1.DetailHeight = 428;
+            this.gvMx1.GridControl = this.gcMx1;
+            this.gvMx1.Name = "gvMx1";
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn3.FieldName = "itemNo";
+            this.gridColumn3.MinWidth = 31;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 0;
+            this.gridColumn3.Width = 117;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn4.FieldName = "itemModel";
+            this.gridColumn4.MinWidth = 31;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 1;
+            this.gridColumn4.Width = 117;
+            // 
+            // gvMx2itemSname
+            // 
+            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx2itemSname.FieldName = "itemName";
+            this.gvMx2itemSname.MinWidth = 62;
+            this.gvMx2itemSname.Name = "gvMx2itemSname";
+            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
+            this.gvMx2itemSname.Visible = true;
+            this.gvMx2itemSname.VisibleIndex = 2;
+            this.gvMx2itemSname.Width = 117;
+            // 
+            // gvMx2quantity
+            // 
+            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx2quantity.Caption = "鏁伴噺";
+            this.gvMx2quantity.FieldName = "quantity";
+            this.gvMx2quantity.MinWidth = 62;
+            this.gvMx2quantity.Name = "gvMx2quantity";
+            this.gvMx2quantity.Tag = "query_a.QUANTITY";
+            this.gvMx2quantity.Visible = true;
+            this.gvMx2quantity.VisibleIndex = 3;
+            this.gvMx2quantity.Width = 117;
+            // 
+            // gvMx2unit
+            // 
+            this.gvMx2unit.AppearanceCell.Options.UseFont = true;
+            this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
+            this.gvMx2unit.FieldName = "kcUnit";
+            this.gvMx2unit.MinWidth = 62;
+            this.gvMx2unit.Name = "gvMx2unit";
+            this.gvMx2unit.Tag = "query_a.UNIT";
+            this.gvMx2unit.Visible = true;
+            this.gvMx2unit.VisibleIndex = 4;
+            this.gvMx2unit.Width = 117;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.AppearanceCell.Options.UseFont = true;
+            this.gridColumn5.Caption = "寤虹珛鑰�";
+            this.gridColumn5.FieldName = "createByName";
+            this.gridColumn5.MinWidth = 31;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 5;
+            this.gridColumn5.Width = 117;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.AppearanceCell.Options.UseFont = true;
+            this.gridColumn6.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn6.FieldName = "createDate";
+            this.gridColumn6.MinWidth = 31;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 6;
+            this.gridColumn6.Width = 117;
+            // 
+            // tabMxPage2
+            // 
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1681, 471);
+            this.tabMxPage2.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, 384);
+            this.gcMx2.Size = new System.Drawing.Size(1681, 471);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -931,6 +1105,7 @@
             this.gvMx1depotSectionCode,
             this.gridColumn1,
             this.gridColumn2});
+            this.gvMx2.DetailHeight = 428;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -939,355 +1114,143 @@
             // 
             // gvMx1itemBarcode
             // 
-            this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
-            this.gvMx1itemBarcode.MinWidth = 50;
+            this.gvMx1itemBarcode.MinWidth = 62;
             this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
             this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx1itemBarcode.Visible = true;
             this.gvMx1itemBarcode.VisibleIndex = 0;
-            this.gvMx1itemBarcode.Width = 94;
+            this.gvMx1itemBarcode.Width = 117;
             // 
             // gvMx1cItemCode
             // 
-            this.gvMx1cItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
             this.gvMx1cItemCode.FieldName = "itemNo";
-            this.gvMx1cItemCode.MinWidth = 50;
+            this.gvMx1cItemCode.MinWidth = 62;
             this.gvMx1cItemCode.Name = "gvMx1cItemCode";
             this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
             this.gvMx1cItemCode.Visible = true;
             this.gvMx1cItemCode.VisibleIndex = 1;
-            this.gvMx1cItemCode.Width = 94;
+            this.gvMx1cItemCode.Width = 117;
             // 
             // gvMx1itemSname
             // 
-            this.gvMx1itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1itemSname.FieldName = "itemName";
-            this.gvMx1itemSname.MinWidth = 50;
+            this.gvMx1itemSname.MinWidth = 62;
             this.gvMx1itemSname.Name = "gvMx1itemSname";
             this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx1itemSname.Visible = true;
             this.gvMx1itemSname.VisibleIndex = 2;
-            this.gvMx1itemSname.Width = 94;
+            this.gvMx1itemSname.Width = 117;
             // 
             // gvMx1itemNo
             // 
-            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
             this.gvMx1itemNo.FieldName = "itemModel";
-            this.gvMx1itemNo.MinWidth = 50;
+            this.gvMx1itemNo.MinWidth = 62;
             this.gvMx1itemNo.Name = "gvMx1itemNo";
             this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx1itemNo.Visible = true;
             this.gvMx1itemNo.VisibleIndex = 3;
-            this.gvMx1itemNo.Width = 94;
+            this.gvMx1itemNo.Width = 117;
             // 
             // gvMx1quantity
             // 
-            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.MinWidth = 62;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "query_a.QUANTITY";
             this.gvMx1quantity.Visible = true;
             this.gvMx1quantity.VisibleIndex = 4;
-            this.gvMx1quantity.Width = 94;
+            this.gvMx1quantity.Width = 117;
             // 
             // gvMx1unit
             // 
-            this.gvMx1unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1unit.AppearanceCell.Options.UseFont = true;
             this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx1unit.FieldName = "kcUnit";
-            this.gvMx1unit.MinWidth = 50;
+            this.gvMx1unit.MinWidth = 62;
             this.gvMx1unit.Name = "gvMx1unit";
             this.gvMx1unit.Tag = "query_a.UNIT";
             this.gvMx1unit.Visible = true;
             this.gvMx1unit.VisibleIndex = 5;
-            this.gvMx1unit.Width = 94;
+            this.gvMx1unit.Width = 117;
             // 
             // gvMx1depotCode
             // 
-            this.gvMx1depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
             this.gvMx1depotCode.FieldName = "depotCode";
-            this.gvMx1depotCode.MinWidth = 50;
+            this.gvMx1depotCode.MinWidth = 62;
             this.gvMx1depotCode.Name = "gvMx1depotCode";
             this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
             this.gvMx1depotCode.Visible = true;
             this.gvMx1depotCode.VisibleIndex = 6;
-            this.gvMx1depotCode.Width = 94;
+            this.gvMx1depotCode.Width = 117;
             // 
             // gvMx1depotSectionCode
             // 
-            this.gvMx1depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
             this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
-            this.gvMx1depotSectionCode.MinWidth = 50;
+            this.gvMx1depotSectionCode.MinWidth = 62;
             this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
             this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
             this.gvMx1depotSectionCode.Visible = true;
             this.gvMx1depotSectionCode.VisibleIndex = 7;
-            this.gvMx1depotSectionCode.Width = 94;
+            this.gvMx1depotSectionCode.Width = 117;
             // 
             // gridColumn1
             // 
-            this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridColumn1.AppearanceCell.Options.UseFont = true;
             this.gridColumn1.Caption = "寤虹珛鑰�";
-            this.gridColumn1.FieldName = "createBy";
-            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.FieldName = "createByName";
+            this.gridColumn1.MinWidth = 31;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 8;
-            this.gridColumn1.Width = 94;
+            this.gridColumn1.Width = 117;
             // 
             // gridColumn2
             // 
-            this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridColumn2.AppearanceCell.Options.UseFont = true;
             this.gridColumn2.Caption = "寤虹珛鏃堕棿";
             this.gridColumn2.FieldName = "createDate";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 31;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 9;
-            this.gridColumn2.Width = 94;
-            // 
-            // tabMxPage2
-            // 
-            this.tabMxPage2.Controls.Add(this.gcMx1);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1344, 384);
-            this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1344, 384);
-            this.gcMx1.TabIndex = 0;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn3,
-            this.gridColumn4,
-            this.gvMx2itemSname,
-            this.gvMx2quantity,
-            this.gvMx2unit,
-            this.gridColumn5,
-            this.gridColumn6});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "鐗╂枡缂栫爜";
-            this.gridColumn3.FieldName = "itemNo";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 0;
-            this.gridColumn3.Width = 94;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn4.FieldName = "itemModel";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 1;
-            this.gridColumn4.Width = 94;
-            // 
-            // gvMx2itemSname
-            // 
-            this.gvMx2itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
-            this.gvMx2itemSname.FieldName = "itemName";
-            this.gvMx2itemSname.MinWidth = 50;
-            this.gvMx2itemSname.Name = "gvMx2itemSname";
-            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
-            this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 2;
-            this.gvMx2itemSname.Width = 94;
-            // 
-            // gvMx2quantity
-            // 
-            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "鏁伴噺";
-            this.gvMx2quantity.FieldName = "quantity";
-            this.gvMx2quantity.MinWidth = 50;
-            this.gvMx2quantity.Name = "gvMx2quantity";
-            this.gvMx2quantity.Tag = "query_a.QUANTITY";
-            this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 3;
-            this.gvMx2quantity.Width = 94;
-            // 
-            // gvMx2unit
-            // 
-            this.gvMx2unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2unit.AppearanceCell.Options.UseFont = true;
-            this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
-            this.gvMx2unit.FieldName = "kcUnit";
-            this.gvMx2unit.MinWidth = 50;
-            this.gvMx2unit.Name = "gvMx2unit";
-            this.gvMx2unit.Tag = "query_a.UNIT";
-            this.gvMx2unit.Visible = true;
-            this.gvMx2unit.VisibleIndex = 4;
-            this.gvMx2unit.Width = 94;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridColumn5.AppearanceCell.Options.UseFont = true;
-            this.gridColumn5.Caption = "寤虹珛鑰�";
-            this.gridColumn5.FieldName = "createBy";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 5;
-            this.gridColumn5.Width = 94;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridColumn6.AppearanceCell.Options.UseFont = true;
-            this.gridColumn6.Caption = "寤虹珛鏃堕棿";
-            this.gridColumn6.FieldName = "createDate";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 6;
-            this.gridColumn6.Width = 94;
+            this.gridColumn2.Width = 117;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(909, 55);
+            this.picCheckBox.Location = new System.Drawing.Point(1136, 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;
             // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_khName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(326, 32);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem10.Text = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_ckName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(326, 64);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_createBy;
-            this.layoutControlItem11.Location = new System.Drawing.Point(652, 32);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem11.Text = "鍒涘缓浜�";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_createDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(652, 64);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_remark;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem16.Text = "澶囨敞";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_reason;
-            this.layoutControlItem20.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem20.Size = new System.Drawing.Size(652, 32);
-            this.layoutControlItem20.Text = "鍘熷洜";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_lastupdateDate;
-            this.layoutControlItem18.Location = new System.Drawing.Point(978, 96);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(327, 32);
-            this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_lastupdateBy;
-            this.layoutControlItem17.Location = new System.Drawing.Point(652, 96);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(326, 32);
-            this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
-            // 
             // Frm_MesShouTuoDj
             // 
-            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_MesShouTuoDj";
             this.Text = "鍙楁墭鍏ュ簱鍗�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1310,46 +1273,44 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_khName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_inType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_rkOrg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1372,7 +1333,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
         private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
@@ -1384,30 +1344,28 @@
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private DevExpress.XtraEditors.TextEdit txt_ckName;
-        private DevExpress.XtraEditors.TextEdit txt_checkUser;
+        private DevExpress.XtraEditors.TextEdit txt_checkUserName;
         private DevExpress.XtraEditors.TextEdit txt_inType;
         private DevExpress.XtraEditors.TextEdit txt_khName;
         private DevExpress.XtraEditors.TextEdit txt_rkOrg;
         private DevExpress.XtraEditors.TextEdit txt_checkDate;
         private DevExpress.XtraEditors.TextEdit txt_taskNo;
-        private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_createByName;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraEditors.CheckEdit txt_status;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
+        private DevExpress.XtraEditors.TextEdit txt_lastupdateByName;
         private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
@@ -1420,7 +1378,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1430,16 +1388,18 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraEditors.TextEdit txt_reason;
+        private DevExpress.XtraEditors.TextEdit txt_sqRemark;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.Utils.ToolTipController tips;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3