From 4d403cd78fb7cc2e581ca7cb68ebb184567c3a3a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 24 三月 2025 11:11:07 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1150 ++++++++++++++++++++++++++++++++------------------------
 DevApp/Gs.DevApp/App.config                                      |    4 
 2 files changed, 656 insertions(+), 498 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index c371e91..dfcd2d5 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
 		</assemblyBinding>
 	</runtime>
     <appSettings>
-		 <add key="WebApiUrl" value="http://localhost:5263/" />
-		<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
+		 <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+		<add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
         <add key="LogPath" value="logs" />
         <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
         <add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 0ecce60..8eb0d8b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -34,6 +34,14 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -90,58 +98,61 @@
             this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
             this.txtWlid = new DevExpress.XtraEditors.TextEdit();
             this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
-            this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_insDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_insDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            this.panel1 = new System.Windows.Forms.Panel();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
             this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
-            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
-            this.label1 = new System.Windows.Forms.Label();
             this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
             this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
-            this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
-            this.lb_insDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_insDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
             this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+            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.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -159,19 +170,30 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
-            this.panel1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
@@ -181,6 +203,21 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).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.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx2oldqty
@@ -396,7 +433,7 @@
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1342, 395);
+            this.tabMxPage1.Size = new System.Drawing.Size(1342, 538);
             this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏";
             // 
             // gcMx1
@@ -405,7 +442,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 98);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1342, 297);
+            this.gcMx1.Size = new System.Drawing.Size(1342, 440);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -680,6 +717,7 @@
             // 
             this.ucBtnPrint1.guidKey = null;
             this.ucBtnPrint1.Location = new System.Drawing.Point(541, 61);
+            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = "rpt_daa";
             this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
@@ -820,6 +858,137 @@
             this.labelControl7.TabIndex = 213;
             this.labelControl7.Text = "鐗╂枡缂栧彿锛�";
             // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage2;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1346, 602);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2,
+            this.xtraTabPage3});
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.tabMx);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // tabMx
+            // 
+            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Name = "tabMx";
+            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.Size = new System.Drawing.Size(1344, 570);
+            this.tabMx.TabIndex = 2;
+            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabMxPage1,
+            this.tabMxPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Name = "split1";
+            // 
+            // split1.split1_Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.split1_Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.Size = new System.Drawing.Size(1344, 570);
+            this.split1.SplitterPosition = 558;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1344, 519);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
+            this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn13,
+            this.gv_urgentFlag,
+            this.gv_fstatus,
+            this.gv_status,
+            this.gv_billNo,
+            this.gridColumn1,
+            this.gv_createBy,
+            this.gv_insDate,
+            this.gv_checkDate,
+            this.gv_suppNo,
+            this.gridColumn2,
+            this.gv_depotsCode,
+            this.gridColumn3,
+            this.gridColumn12,
+            this.gridColumn11,
+            this.gv_remark});
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "鏀舵枡缁勭粐";
+            this.gridColumn13.FieldName = "receivingOrg";
+            this.gridColumn13.MinWidth = 50;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Tag = "org.fnamber";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 0;
+            this.gridColumn13.Width = 250;
+            // 
             // gv_urgentFlag
             // 
             this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -850,90 +1019,6 @@
             this.gv_fstatus.VisibleIndex = 2;
             this.gv_fstatus.Width = 50;
             // 
-            // gv_suppNo
-            // 
-            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
-            this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
-            this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 50;
-            this.gv_suppNo.Name = "gv_suppNo";
-            this.gv_suppNo.OptionsColumn.AllowEdit = false;
-            this.gv_suppNo.Tag = "query_a.supp_no";
-            this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 9;
-            this.gv_suppNo.Width = 94;
-            // 
-            // gv_depotsCode
-            // 
-            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜";
-            this.gv_depotsCode.FieldName = "depotsCode";
-            this.gv_depotsCode.MinWidth = 50;
-            this.gv_depotsCode.Name = "gv_depotsCode";
-            this.gv_depotsCode.OptionsColumn.AllowEdit = false;
-            this.gv_depotsCode.Tag = "query_a.depots_code";
-            this.gv_depotsCode.Visible = true;
-            this.gv_depotsCode.VisibleIndex = 11;
-            this.gv_depotsCode.Width = 94;
-            // 
-            // gv_insDate
-            // 
-            this.gv_insDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_insDate.AppearanceCell.Options.UseFont = true;
-            this.gv_insDate.Caption = "鏉ユ枡鏃ユ湡";
-            this.gv_insDate.FieldName = "insDate";
-            this.gv_insDate.MinWidth = 50;
-            this.gv_insDate.Name = "gv_insDate";
-            this.gv_insDate.OptionsColumn.AllowEdit = false;
-            this.gv_insDate.Tag = "query_a.ins_date";
-            this.gv_insDate.Visible = true;
-            this.gv_insDate.VisibleIndex = 7;
-            this.gv_insDate.Width = 180;
-            // 
-            // 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 = 50;
-            this.gv_checkDate.Name = "gv_checkDate";
-            this.gv_checkDate.OptionsColumn.AllowEdit = false;
-            this.gv_checkDate.Tag = "query_a.check_date";
-            this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 8;
-            this.gv_checkDate.Width = 180;
-            // 
-            // 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 = 15;
-            this.gv_remark.Width = 94;
-            // 
-            // 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.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 = 6;
-            this.gv_createBy.Width = 94;
-            // 
             // gv_status
             // 
             this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -963,77 +1048,6 @@
             this.gv_billNo.VisibleIndex = 4;
             this.gv_billNo.Width = 120;
             // 
-            // toolBarMenu1
-            // 
-            this.toolBarMenu1.chkParameter = null;
-            this.toolBarMenu1.currentAction = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1344, 531);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
-            this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.ColumnPanelRowHeight = 50;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn13,
-            this.gv_urgentFlag,
-            this.gv_fstatus,
-            this.gv_status,
-            this.gv_billNo,
-            this.gridColumn1,
-            this.gv_createBy,
-            this.gv_insDate,
-            this.gv_checkDate,
-            this.gv_suppNo,
-            this.gridColumn2,
-            this.gv_depotsCode,
-            this.gridColumn3,
-            this.gridColumn12,
-            this.gridColumn11,
-            this.gv_remark});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.Caption = "鏀舵枡缁勭粐";
-            this.gridColumn13.FieldName = "receivingOrg";
-            this.gridColumn13.MinWidth = 50;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Tag = "org.fnamber";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 250;
-            // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鏉$爜鎵撳嵃姣旂巼";
@@ -1046,6 +1060,62 @@
             this.gridColumn1.VisibleIndex = 5;
             this.gridColumn1.Width = 80;
             // 
+            // 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.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 = 6;
+            this.gv_createBy.Width = 94;
+            // 
+            // gv_insDate
+            // 
+            this.gv_insDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_insDate.AppearanceCell.Options.UseFont = true;
+            this.gv_insDate.Caption = "鏉ユ枡鏃ユ湡";
+            this.gv_insDate.FieldName = "insDate";
+            this.gv_insDate.MinWidth = 50;
+            this.gv_insDate.Name = "gv_insDate";
+            this.gv_insDate.OptionsColumn.AllowEdit = false;
+            this.gv_insDate.Tag = "query_a.ins_date";
+            this.gv_insDate.Visible = true;
+            this.gv_insDate.VisibleIndex = 7;
+            this.gv_insDate.Width = 180;
+            // 
+            // 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 = 50;
+            this.gv_checkDate.Name = "gv_checkDate";
+            this.gv_checkDate.OptionsColumn.AllowEdit = false;
+            this.gv_checkDate.Tag = "query_a.check_date";
+            this.gv_checkDate.Visible = true;
+            this.gv_checkDate.VisibleIndex = 8;
+            this.gv_checkDate.Width = 180;
+            // 
+            // gv_suppNo
+            // 
+            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
+            this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
+            this.gv_suppNo.FieldName = "suppNo";
+            this.gv_suppNo.MinWidth = 50;
+            this.gv_suppNo.Name = "gv_suppNo";
+            this.gv_suppNo.OptionsColumn.AllowEdit = false;
+            this.gv_suppNo.Tag = "query_a.supp_no";
+            this.gv_suppNo.Visible = true;
+            this.gv_suppNo.VisibleIndex = 9;
+            this.gv_suppNo.Width = 94;
+            // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
@@ -1056,6 +1126,20 @@
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 10;
             this.gridColumn2.Width = 200;
+            // 
+            // gv_depotsCode
+            // 
+            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
+            this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜";
+            this.gv_depotsCode.FieldName = "depotsCode";
+            this.gv_depotsCode.MinWidth = 50;
+            this.gv_depotsCode.Name = "gv_depotsCode";
+            this.gv_depotsCode.OptionsColumn.AllowEdit = false;
+            this.gv_depotsCode.Tag = "query_a.depots_code";
+            this.gv_depotsCode.Visible = true;
+            this.gv_depotsCode.VisibleIndex = 11;
+            this.gv_depotsCode.Width = 94;
             // 
             // gridColumn3
             // 
@@ -1086,346 +1170,392 @@
             this.gridColumn11.VisibleIndex = 14;
             this.gridColumn11.Width = 94;
             // 
-            // xtraTabControl1
+            // gv_remark
             // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1346, 602);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            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 = 15;
+            this.gv_remark.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 531);
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
             this.pageBar1.Size = new System.Drawing.Size(1344, 39);
-            this.pageBar1.TabIndex = 3;
+            this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
-            // xtraTabPage2
+            // xtraTabPage3
             // 
-            this.xtraTabPage2.Controls.Add(this.tabMx);
-            this.xtraTabPage2.Controls.Add(this.panel1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
-            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            this.xtraTabPage3.Controls.Add(this.splitMx1);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1344, 570);
+            this.xtraTabPage3.Text = "xtraTabPage3";
             // 
-            // tabMx
+            // splitMx1
             // 
-            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 143);
-            this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1344, 427);
-            this.tabMx.TabIndex = 2;
-            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1,
-            this.tabMxPage2});
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Name = "splitMx1";
             // 
-            // panel1
+            // splitMx1.splitMx1_Panel1
             // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_dptName);
-            this.panel1.Controls.Add(this.txt_gysNo);
-            this.panel1.Controls.Add(this.txt_fstatus);
-            this.panel1.Controls.Add(this.txt_urgentFlag);
-            this.panel1.Controls.Add(this.labelControl5);
-            this.panel1.Controls.Add(this.txt_paperBillNo);
-            this.panel1.Controls.Add(this.txt_depotsCode);
-            this.panel1.Controls.Add(this.labelControl4);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.txt_gysName);
-            this.panel1.Controls.Add(this.labelControl1);
-            this.panel1.Controls.Add(this.labelControl2);
-            this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txt_barcodeProgress);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_urgentFlag);
-            this.panel1.Controls.Add(this.lb_fstatus);
-            this.panel1.Controls.Add(this.lb_insDate);
-            this.panel1.Controls.Add(this.txt_insDate);
-            this.panel1.Controls.Add(this.lb_checkDate);
-            this.panel1.Controls.Add(this.txt_checkDate);
-            this.panel1.Controls.Add(this.lb_remark);
-            this.panel1.Controls.Add(this.txt_remark);
-            this.panel1.Controls.Add(this.lb_createBy);
-            this.panel1.Controls.Add(this.txt_createBy);
-            this.panel1.Controls.Add(this.lb_billNo);
-            this.panel1.Controls.Add(this.txt_billNo);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1344, 143);
-            this.panel1.TabIndex = 1;
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.splitMx1_Panel2
+            // 
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.Size = new System.Drawing.Size(1344, 570);
+            this.splitMx1.SplitterPosition = 163;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.txt_dptName);
+            this.layoutMx1.Controls.Add(this.txt_gysNo);
+            this.layoutMx1.Controls.Add(this.txt_depotsCode);
+            this.layoutMx1.Controls.Add(this.txt_barcodeProgress);
+            this.layoutMx1.Controls.Add(this.txt_paperBillNo);
+            this.layoutMx1.Controls.Add(this.txt_billNo);
+            this.layoutMx1.Controls.Add(this.txt_gysName);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_remark);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_insDate);
+            this.layoutMx1.Controls.Add(this.txt_fstatus);
+            this.layoutMx1.Controls.Add(this.txt_urgentFlag);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1344, 163);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem9,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem12,
+            this.layoutControlItem13});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1344, 163);
+            this.Root.TextVisible = false;
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(419, 47);
+            this.txt_dptName.Location = new System.Drawing.Point(445, 47);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(228, 28);
+            this.txt_dptName.Size = new System.Drawing.Size(225, 28);
+            this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 468;
             // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(107, 79);
+            this.txt_gysNo.Location = new System.Drawing.Point(114, 83);
             this.txt_gysNo.Name = "txt_gysNo";
             this.txt_gysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysNo.Size = new System.Drawing.Size(234, 28);
+            this.txt_gysNo.Size = new System.Drawing.Size(225, 28);
+            this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
-            // 
-            // txt_fstatus
-            // 
-            this.txt_fstatus.Location = new System.Drawing.Point(993, 17);
-            this.txt_fstatus.Name = "txt_fstatus";
-            this.txt_fstatus.Properties.Caption = "";
-            this.txt_fstatus.Size = new System.Drawing.Size(94, 24);
-            this.txt_fstatus.TabIndex = 466;
-            // 
-            // txt_urgentFlag
-            // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(993, 50);
-            this.txt_urgentFlag.Name = "txt_urgentFlag";
-            this.txt_urgentFlag.Properties.Caption = "";
-            this.txt_urgentFlag.Size = new System.Drawing.Size(94, 24);
-            this.txt_urgentFlag.TabIndex = 465;
-            // 
-            // labelControl5
-            // 
-            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl5.Appearance.Options.UseFont = true;
-            this.labelControl5.Location = new System.Drawing.Point(347, 19);
-            this.labelControl5.Name = "labelControl5";
-            this.labelControl5.Size = new System.Drawing.Size(68, 21);
-            this.labelControl5.TabIndex = 464;
-            this.labelControl5.Text = "閫佽揣鍗曞彿";
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(419, 15);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(228, 28);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(225, 28);
+            this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
             // txt_depotsCode
             // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(419, 79);
+            this.txt_depotsCode.Location = new System.Drawing.Point(445, 83);
             this.txt_depotsCode.Name = "txt_depotsCode";
             this.txt_depotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotsCode.Size = new System.Drawing.Size(228, 28);
+            this.txt_depotsCode.Size = new System.Drawing.Size(225, 28);
+            this.txt_depotsCode.StyleController = this.layoutMx1;
             this.txt_depotsCode.TabIndex = 462;
-            // 
-            // labelControl4
-            // 
-            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(347, 83);
-            this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(68, 21);
-            this.labelControl4.TabIndex = 461;
-            this.labelControl4.Text = "浠撳簱缂栧彿";
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(7, 83);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(95, 21);
-            this.label1.TabIndex = 460;
-            this.label1.Text = "渚涘簲鍟嗙紪鍙�";
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(107, 47);
+            this.txt_gysName.Location = new System.Drawing.Point(114, 47);
             this.txt_gysName.Name = "txt_gysName";
             this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysName.Size = new System.Drawing.Size(234, 28);
+            this.txt_gysName.Size = new System.Drawing.Size(225, 28);
+            this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
-            // 
-            // labelControl1
-            // 
-            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(347, 51);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(68, 21);
-            this.labelControl1.TabIndex = 457;
-            this.labelControl1.Text = "浠撳簱鍚嶇О";
-            // 
-            // labelControl2
-            // 
-            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(17, 51);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(85, 21);
-            this.labelControl2.TabIndex = 455;
-            this.labelControl2.Text = "渚涘簲鍟嗗悕绉�";
-            // 
-            // labelControl3
-            // 
-            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(653, 116);
-            this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(102, 21);
-            this.labelControl3.TabIndex = 341;
-            this.labelControl3.Text = "鏉$爜鎵撳嵃姣旂巼";
             // 
             // txt_barcodeProgress
             // 
-            this.txt_barcodeProgress.Location = new System.Drawing.Point(761, 112);
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 119);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
             this.txt_barcodeProgress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
-            this.txt_barcodeProgress.Size = new System.Drawing.Size(143, 28);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 28);
+            this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(209, 388);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
-            // 
-            // lb_urgentFlag
-            // 
-            this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_urgentFlag.Appearance.Options.UseFont = true;
-            this.lb_urgentFlag.Location = new System.Drawing.Point(918, 52);
-            this.lb_urgentFlag.Name = "lb_urgentFlag";
-            this.lb_urgentFlag.Size = new System.Drawing.Size(68, 21);
-            this.lb_urgentFlag.TabIndex = 336;
-            this.lb_urgentFlag.Text = "鎬ユ枡鏍囪瘑";
-            // 
-            // lb_fstatus
-            // 
-            this.lb_fstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_fstatus.Appearance.Options.UseFont = true;
-            this.lb_fstatus.Location = new System.Drawing.Point(918, 19);
-            this.lb_fstatus.Name = "lb_fstatus";
-            this.lb_fstatus.Size = new System.Drawing.Size(68, 21);
-            this.lb_fstatus.TabIndex = 291;
-            this.lb_fstatus.Text = "鎻愪氦鐘舵��";
-            // 
-            // lb_insDate
-            // 
-            this.lb_insDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_insDate.Appearance.Options.UseFont = true;
-            this.lb_insDate.Location = new System.Drawing.Point(653, 83);
-            this.lb_insDate.Name = "lb_insDate";
-            this.lb_insDate.Size = new System.Drawing.Size(68, 21);
-            this.lb_insDate.TabIndex = 258;
-            this.lb_insDate.Text = "鍏ュ簱鏃ユ湡";
             // 
             // txt_insDate
             // 
-            this.txt_insDate.Location = new System.Drawing.Point(724, 79);
+            this.txt_insDate.Location = new System.Drawing.Point(776, 83);
             this.txt_insDate.Name = "txt_insDate";
             this.txt_insDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_insDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_insDate.Size = new System.Drawing.Size(180, 28);
+            this.txt_insDate.Size = new System.Drawing.Size(225, 28);
+            this.txt_insDate.StyleController = this.layoutMx1;
             this.txt_insDate.TabIndex = 258;
-            // 
-            // lb_checkDate
-            // 
-            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_checkDate.Appearance.Options.UseFont = true;
-            this.lb_checkDate.Location = new System.Drawing.Point(653, 51);
-            this.lb_checkDate.Name = "lb_checkDate";
-            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
-            this.lb_checkDate.TabIndex = 252;
-            this.lb_checkDate.Text = "鎻愪氦鏃ユ湡";
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(724, 47);
+            this.txt_checkDate.Location = new System.Drawing.Point(776, 47);
             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(180, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(225, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 252;
-            // 
-            // lb_remark
-            // 
-            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_remark.Appearance.Options.UseFont = true;
-            this.lb_remark.Location = new System.Drawing.Point(68, 116);
-            this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(34, 21);
-            this.lb_remark.TabIndex = 235;
-            this.lb_remark.Text = "澶囨敞";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(107, 112);
+            this.txt_remark.Location = new System.Drawing.Point(114, 119);
             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(540, 28);
+            this.txt_remark.Size = new System.Drawing.Size(225, 28);
+            this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
-            // 
-            // lb_createBy
-            // 
-            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createBy.Appearance.Options.UseFont = true;
-            this.lb_createBy.Location = new System.Drawing.Point(653, 19);
-            this.lb_createBy.Name = "lb_createBy";
-            this.lb_createBy.Size = new System.Drawing.Size(68, 21);
-            this.lb_createBy.TabIndex = 217;
-            this.lb_createBy.Text = "褰曞叆浜哄憳";
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(724, 15);
+            this.txt_createBy.Location = new System.Drawing.Point(776, 12);
             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(180, 28);
+            this.txt_createBy.Size = new System.Drawing.Size(225, 28);
+            this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 217;
-            // 
-            // lb_billNo
-            // 
-            this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(34, 19);
-            this.lb_billNo.Name = "lb_billNo";
-            this.lb_billNo.Size = new System.Drawing.Size(68, 21);
-            this.lb_billNo.TabIndex = 211;
-            this.lb_billNo.Text = "鍒拌揣鍗曞彿";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(107, 15);
+            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             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(234, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(225, 28);
+            this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_billNo;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(331, 35);
+            this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_gysName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 35);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_gysNo;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 71);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_paperBillNo;
+            this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(331, 35);
+            this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_dptName;
+            this.layoutControlItem5.Location = new System.Drawing.Point(331, 35);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_depotsCode;
+            this.layoutControlItem6.Location = new System.Drawing.Point(331, 71);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem6.Text = "浠撳簱缂栧彿";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_createBy;
+            this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(331, 35);
+            this.layoutControlItem7.Text = "褰曞叆浜哄憳";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_checkDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(662, 35);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem8.Text = "鎻愪氦鏃ユ湡";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_insDate;
+            this.layoutControlItem9.Location = new System.Drawing.Point(662, 71);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem9.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem9.Text = "鍏ュ簱鏃ユ湡";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // txt_fstatus
+            // 
+            this.txt_fstatus.Location = new System.Drawing.Point(1005, 12);
+            this.txt_fstatus.Name = "txt_fstatus";
+            this.txt_fstatus.Properties.Caption = "鎻愪氦鐘舵��";
+            this.txt_fstatus.Size = new System.Drawing.Size(327, 24);
+            this.txt_fstatus.StyleController = this.layoutMx1;
+            this.txt_fstatus.TabIndex = 469;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_fstatus;
+            this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(331, 35);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // txt_urgentFlag
+            // 
+            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 47);
+            this.txt_urgentFlag.Name = "txt_urgentFlag";
+            this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
+            this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
+            this.txt_urgentFlag.StyleController = this.layoutMx1;
+            this.txt_urgentFlag.TabIndex = 470;
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_urgentFlag;
+            this.layoutControlItem11.Location = new System.Drawing.Point(993, 35);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem11.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem11.TextVisible = false;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_remark;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 107);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem12.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem12.Text = "澶囨敞";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_barcodeProgress;
+            this.layoutControlItem13.Location = new System.Drawing.Point(662, 107);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(331, 36);
+            this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
             // Frm_ArrivalBarcode
             // 
@@ -1454,20 +1584,30 @@
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
@@ -1477,17 +1617,28 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).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.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2oldqty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
@@ -1497,49 +1648,10 @@
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_insDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
-        private DevExpress.XtraEditors.LabelControl lb_fstatus;
-        private DevExpress.XtraEditors.LabelControl lb_insDate;
-        private DevExpress.XtraEditors.TextEdit txt_insDate;
-        private DevExpress.XtraEditors.LabelControl lb_checkDate;
-        private DevExpress.XtraEditors.TextEdit txt_checkDate;
-        private DevExpress.XtraEditors.LabelControl lb_remark;
-        private DevExpress.XtraEditors.TextEdit txt_remark;
-        private DevExpress.XtraEditors.LabelControl lb_createBy;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraEditors.LabelControl lb_billNo;
-        private DevExpress.XtraEditors.TextEdit txt_billNo;
-        private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
-        private DevExpress.XtraEditors.LabelControl labelControl4;
-        private System.Windows.Forms.Label label1;
-        private DevExpress.XtraEditors.TextEdit txt_gysName;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-        private DevExpress.XtraEditors.LabelControl labelControl5;
-        private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
-        private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
-        private DevExpress.XtraEditors.CheckEdit txt_fstatus;
         private DevExpress.XtraEditors.PanelControl panelMx1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
@@ -1573,11 +1685,6 @@
         private DevExpress.XtraEditors.LabelControl lbMxGuid;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
         private UserControl.UcBtnPrint ucBtnPrint1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private DevExpress.XtraEditors.TextEdit txt_gysNo;
-        private DevExpress.XtraEditors.TextEdit txt_dptName;
         private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
@@ -1589,5 +1696,56 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_insDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraEditors.TextEdit txt_dptName;
+        private DevExpress.XtraEditors.TextEdit txt_gysNo;
+        private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
+        private DevExpress.XtraEditors.TextEdit txt_gysName;
+        private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
+        private DevExpress.XtraEditors.TextEdit txt_insDate;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        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 layoutControlItem6;
+        private DevExpress.XtraEditors.CheckEdit txt_fstatus;
+        private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3