From fbe33a615f1c4e798a0f8e58163e68c3ce789614 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 10:17:49 +0800
Subject: [PATCH] 初始化标准版

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs |  890 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 448 insertions(+), 442 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index d6899bd..75d74ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -37,22 +37,16 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -69,25 +63,24 @@
             this.gridColumn26 = 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.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = 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.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
             this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
             this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
@@ -95,17 +88,16 @@
             this.layoutControlItem14 = 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.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -157,6 +149,7 @@
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = 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();
@@ -173,10 +166,9 @@
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
+            this.ucRptCgdhdPrint1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhdPrint();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -196,14 +188,12 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
@@ -211,17 +201,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -265,7 +254,7 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
+            this.xtraTabPageReport.SuspendLayout();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -277,9 +266,10 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1682, 98);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -287,20 +277,23 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1346, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1682, 736);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
-            this.xtraTabPage2});
+            this.xtraTabPage2,
+            this.xtraTabPageReport});
             // 
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1680, 698);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -309,6 +302,7 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -321,17 +315,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1344, 570);
+            this.split1.Size = new System.Drawing.Size(1680, 698);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1344, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1680, 635);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -343,7 +339,7 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
             this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.ColumnPanelRowHeight = 61;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn13,
             this.gv_urgentFlag,
@@ -355,14 +351,15 @@
             this.gridColumn26,
             this.gv_suppNo,
             this.gridColumn2,
-            this.gv_depotsCode,
-            this.gridColumn3,
             this.gv_remark,
             this.gv_fstatus,
             this.gridColumn11,
-            this.gv_checkDate});
+            this.gv_checkDate,
+            this.gridColumn3,
+            this.gridColumn28});
+            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;
@@ -372,212 +369,207 @@
             // 
             this.gridColumn13.Caption = "鏀舵枡缁勭粐";
             this.gridColumn13.FieldName = "receivingOrg";
-            this.gridColumn13.MinWidth = 50;
+            this.gridColumn13.MinWidth = 62;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "org.fnamber";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 250;
+            this.gridColumn13.Width = 312;
             // 
             // gv_urgentFlag
             // 
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡";
-            this.gv_urgentFlag.FieldName = "urgentFlag";
-            this.gv_urgentFlag.MaxWidth = 50;
-            this.gv_urgentFlag.MinWidth = 50;
+            this.gv_urgentFlag.FieldName = "urgentFlagTxt";
+            this.gv_urgentFlag.MaxWidth = 62;
+            this.gv_urgentFlag.MinWidth = 62;
             this.gv_urgentFlag.Name = "gv_urgentFlag";
             this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
             this.gv_urgentFlag.Tag = "query_a.urgent_flag";
             this.gv_urgentFlag.Visible = true;
             this.gv_urgentFlag.VisibleIndex = 1;
-            this.gv_urgentFlag.Width = 50;
+            this.gv_urgentFlag.Width = 62;
             // 
             // gridColumn25
             // 
             this.gridColumn25.Caption = "濮斿";
             this.gridColumn25.FieldName = "fType";
-            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.MinWidth = 31;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
             this.gridColumn25.VisibleIndex = 2;
-            this.gridColumn25.Width = 94;
+            this.gridColumn25.Width = 117;
             // 
             // gv_status
             // 
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "鍏ュ簱";
             this.gv_status.FieldName = "statusChk";
-            this.gv_status.MaxWidth = 50;
-            this.gv_status.MinWidth = 50;
+            this.gv_status.MaxWidth = 62;
+            this.gv_status.MinWidth = 62;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.status";
             this.gv_status.Visible = true;
             this.gv_status.VisibleIndex = 3;
-            this.gv_status.Width = 50;
+            this.gv_status.Width = 62;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 50;
+            this.gv_billNo.MinWidth = 62;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 4;
-            this.gv_billNo.Width = 120;
+            this.gv_billNo.Width = 150;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鏉$爜鎵撳嵃姣旂巼";
-            this.gridColumn1.FieldName = "barRatio";
-            this.gridColumn1.MaxWidth = 80;
-            this.gridColumn1.MinWidth = 80;
+            this.gridColumn1.FieldName = "barRatioTxtColor";
+            this.gridColumn1.MaxWidth = 100;
+            this.gridColumn1.MinWidth = 100;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 5;
-            this.gridColumn1.Width = 80;
+            this.gridColumn1.Width = 100;
             // 
             // gv_createBy
             // 
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
+            this.gv_createBy.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 = 6;
-            this.gv_createBy.Width = 94;
+            this.gv_createBy.Width = 117;
             // 
             // gridColumn26
             // 
             this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
             this.gridColumn26.FieldName = "createDate";
-            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.MinWidth = 31;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
             this.gridColumn26.VisibleIndex = 7;
-            this.gridColumn26.Width = 94;
+            this.gridColumn26.Width = 117;
             // 
             // gv_suppNo
             // 
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
             this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
             this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 50;
+            this.gv_suppNo.MinWidth = 62;
             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 = 8;
-            this.gv_suppNo.Width = 94;
+            this.gv_suppNo.Width = 117;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
             this.gridColumn2.FieldName = "suppName";
-            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.MinWidth = 62;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 9;
-            this.gridColumn2.Width = 200;
-            // 
-            // gv_depotsCode
-            // 
-            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 = 10;
-            this.gv_depotsCode.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "鏀惰揣浠撳簱鍚嶇О";
-            this.gridColumn3.FieldName = "depotName";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.OptionsColumn.AllowEdit = false;
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 11;
-            this.gridColumn3.Width = 94;
+            this.gridColumn2.Width = 250;
             // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞";
             this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 50;
+            this.gv_remark.MinWidth = 62;
             this.gv_remark.Name = "gv_remark";
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 12;
-            this.gv_remark.Width = 94;
+            this.gv_remark.VisibleIndex = 10;
+            this.gv_remark.Width = 117;
             // 
             // gv_fstatus
             // 
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
             this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
             this.gv_fstatus.FieldName = "fstatus";
-            this.gv_fstatus.MaxWidth = 50;
-            this.gv_fstatus.MinWidth = 50;
+            this.gv_fstatus.MaxWidth = 62;
+            this.gv_fstatus.MinWidth = 62;
             this.gv_fstatus.Name = "gv_fstatus";
             this.gv_fstatus.OptionsColumn.AllowEdit = false;
             this.gv_fstatus.Tag = "query_a.fstatus";
-            this.gv_fstatus.Width = 50;
+            this.gv_fstatus.Width = 62;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "瀹℃牳浜�";
-            this.gridColumn11.FieldName = "checkUser";
-            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.FieldName = "checkUserName";
+            this.gridColumn11.MinWidth = 31;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 13;
-            this.gridColumn11.Width = 94;
+            this.gridColumn11.VisibleIndex = 11;
+            this.gridColumn11.Width = 117;
             // 
             // gv_checkDate
             // 
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 50;
+            this.gv_checkDate.MinWidth = 62;
             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 = 180;
+            this.gv_checkDate.VisibleIndex = 12;
+            this.gv_checkDate.Width = 225;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鍒拌揣鍗旼uid";
+            this.gridColumn3.FieldName = "guid";
+            this.gridColumn3.MinWidth = 31;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Width = 117;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "Srm鍒拌揣鍗曞彿";
+            this.gridColumn28.FieldName = "paperBillNo";
+            this.gridColumn28.MinWidth = 31;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 13;
+            this.gridColumn28.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(1344, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1680, 48);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1680, 698);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -585,6 +577,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -597,21 +590,20 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1344, 570);
-            this.splitMx1.SplitterPosition = 140;
+            this.splitMx1.Size = new System.Drawing.Size(1680, 698);
+            this.splitMx1.SplitterPosition = 126;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
             this.layoutMx1.Controls.Add(this.lbGuid);
-            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_createByName);
             this.layoutMx1.Controls.Add(this.txt_remark);
             this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_fType);
@@ -620,126 +612,130 @@
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem14});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(638, 441, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1344, 140);
+            this.layoutMx1.Size = new System.Drawing.Size(1680, 126);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
+            // ucBtnPrintAll1
+            // 
+            this.ucBtnPrintAll1.Location = new System.Drawing.Point(1236, 84);
+            this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ucBtnPrintAll1.mxList = null;
+            this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+            this.ucBtnPrintAll1.rptType = null;
+            this.ucBtnPrintAll1.Size = new System.Drawing.Size(406, 32);
+            this.ucBtnPrintAll1.TabIndex = 472;
+            // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(989, 108);
+            this.lbGuid.Location = new System.Drawing.Point(1236, 132);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(322, 28);
+            this.lbGuid.Size = new System.Drawing.Size(402, 34);
             this.lbGuid.TabIndex = 471;
             this.lbGuid.Text = "lbGuid";
             // 
-            // txt_dptName
-            // 
-            this.txt_dptName.Location = new System.Drawing.Point(445, 42);
-            this.txt_dptName.Name = "txt_dptName";
-            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(225, 24);
-            this.txt_dptName.StyleController = this.layoutMx1;
-            this.txt_dptName.TabIndex = 468;
-            // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(114, 72);
+            this.txt_gysNo.Location = new System.Drawing.Point(132, 48);
+            this.txt_gysNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_gysNo.Name = "txt_gysNo";
             this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
+            this.txt_gysNo.Size = new System.Drawing.Size(284, 28);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
             // 
-            // txt_depotsCode
-            // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(445, 72);
-            this.txt_depotsCode.Name = "txt_depotsCode";
-            this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotsCode.Size = new System.Drawing.Size(225, 24);
-            this.txt_depotsCode.StyleController = this.layoutMx1;
-            this.txt_depotsCode.TabIndex = 462;
-            // 
             // txt_barcodeProgress
             // 
-            this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 72);
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(948, 84);
+            this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(4);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
-            this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(284, 28);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(540, 12);
+            this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(284, 28);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(132, 12);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(225, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(284, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(114, 42);
+            this.txt_gysName.Location = new System.Drawing.Point(540, 48);
+            this.txt_gysName.Margin = new System.Windows.Forms.Padding(4);
             this.txt_gysName.Name = "txt_gysName";
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysName.Size = new System.Drawing.Size(225, 24);
+            this.txt_gysName.Size = new System.Drawing.Size(284, 28);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
-            // txt_createBy
+            // txt_createByName
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(776, 12);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(225, 24);
-            this.txt_createBy.StyleController = this.layoutMx1;
-            this.txt_createBy.TabIndex = 217;
+            this.txt_createByName.Location = new System.Drawing.Point(948, 12);
+            this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createByName.Name = "txt_createByName";
+            this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+            this.txt_createByName.Size = new System.Drawing.Size(284, 28);
+            this.txt_createByName.StyleController = this.layoutMx1;
+            this.txt_createByName.TabIndex = 217;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(114, 102);
+            this.txt_remark.Location = new System.Drawing.Point(132, 84);
+            this.txt_remark.Margin = new System.Windows.Forms.Padding(4);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(556, 24);
+            this.txt_remark.Size = new System.Drawing.Size(692, 28);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(776, 42);
+            this.txt_createDate.Location = new System.Drawing.Point(948, 48);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(225, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(284, 28);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(1005, 12);
+            this.txt_fType.Location = new System.Drawing.Point(1236, 12);
+            this.txt_fType.Margin = new System.Windows.Forms.Padding(4);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(327, 24);
+            this.txt_fType.Size = new System.Drawing.Size(406, 27);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 469;
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 42);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(1236, 48);
+            this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(4);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
-            this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
+            this.txt_urgentFlag.Size = new System.Drawing.Size(406, 27);
             this.txt_urgentFlag.StyleController = this.layoutMx1;
             this.txt_urgentFlag.TabIndex = 470;
             // 
@@ -761,17 +757,16 @@
             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.layoutControlItem12,
             this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem13});
+            this.layoutControlItem13,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem12,
+            this.layoutControlItem5});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -793,14 +788,11 @@
             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, 140);
+            rowDefinition3});
+            this.Root.Size = new System.Drawing.Size(1654, 128);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -808,102 +800,50 @@
             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, 30);
+            this.layoutControlItem1.Size = new System.Drawing.Size(408, 36);
             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, 30);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(331, 30);
-            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, 60);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(331, 30);
-            this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_paperBillNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
+            this.layoutControlItem4.CustomizationFormText = "Srm閫佽揣鍗曞彿";
+            this.layoutControlItem4.Location = new System.Drawing.Point(408, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(331, 30);
-            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, 30);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(331, 30);
-            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, 60);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(331, 30);
-            this.layoutControlItem6.Text = "浠撳簱缂栧彿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem4.Size = new System.Drawing.Size(408, 36);
+            this.layoutControlItem4.Text = "Srm閫佽揣鍗曞彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem7
             // 
-            this.layoutControlItem7.Control = this.txt_createBy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
+            this.layoutControlItem7.Control = this.txt_createByName;
+            this.layoutControlItem7.Location = new System.Drawing.Point(816, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem7.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_createDate;
             this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.Location = new System.Drawing.Point(662, 30);
+            this.layoutControlItem8.Location = new System.Drawing.Point(816, 36);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem8.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_remark;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 90);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(662, 30);
-            this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1224, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem10.Size = new System.Drawing.Size(410, 36);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -911,11 +851,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(993, 30);
+            this.layoutControlItem11.Location = new System.Drawing.Point(1224, 36);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem11.Size = new System.Drawing.Size(410, 36);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -923,21 +863,65 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
+            this.layoutControlItem13.Location = new System.Drawing.Point(816, 72);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem13.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_gysName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(408, 36);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(408, 36);
+            this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_gysNo;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 36);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(408, 36);
+            this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_remark;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(816, 36);
+            this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.ucBtnPrintAll1;
+            this.layoutControlItem5.Location = new System.Drawing.Point(1224, 72);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(410, 36);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem5.TextVisible = false;
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1344, 418);
+            this.tabMx.Size = new System.Drawing.Size(1680, 557);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -946,8 +930,9 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.split99);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1342, 386);
+            this.tabMxPage1.Size = new System.Drawing.Size(1678, 519);
             this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
             // 
             // split99
@@ -955,6 +940,7 @@
             this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.split99.Horizontal = false;
             this.split99.Location = new System.Drawing.Point(0, 0);
+            this.split99.Margin = new System.Windows.Forms.Padding(4);
             this.split99.Name = "split99";
             // 
             // split99.Panel1
@@ -967,8 +953,8 @@
             this.split99.Panel2.Controls.Add(this.gcMx1);
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1342, 386);
-            this.split99.SplitterPosition = 116;
+            this.split99.Size = new System.Drawing.Size(1678, 519);
+            this.split99.SplitterPosition = 166;
             this.split99.TabIndex = 2;
             // 
             // layout99
@@ -988,10 +974,11 @@
             this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem24});
             this.layout99.Location = new System.Drawing.Point(0, 0);
+            this.layout99.Margin = new System.Windows.Forms.Padding(4);
             this.layout99.Name = "layout99";
             this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
             this.layout99.Root = this.layoutControlGroup1;
-            this.layout99.Size = new System.Drawing.Size(1342, 116);
+            this.layout99.Size = new System.Drawing.Size(1678, 166);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -999,21 +986,23 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(692, 55);
+            this.layoutControl1.Location = new System.Drawing.Point(840, 109);
+            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup2;
-            this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+            this.layoutControl1.Size = new System.Drawing.Size(410, 45);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+            this.txt_iCount_1.Location = new System.Drawing.Point(122, 2);
+            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
             this.txt_iCount_1.Properties.ReadOnly = true;
             this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(81, 28);
             this.txt_iCount_1.StyleController = this.layoutControl1;
             this.txt_iCount_1.TabIndex = 264;
             this.txt_iCount_1.Tag = "ReadOnly";
@@ -1021,10 +1010,11 @@
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(327, 2);
+            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4);
             this.txt_yuliang_1.Name = "txt_yuliang_1";
             this.txt_yuliang_1.Properties.ReadOnly = true;
-            this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(81, 28);
             this.txt_yuliang_1.StyleController = this.layoutControl1;
             this.txt_yuliang_1.TabIndex = 265;
             // 
@@ -1044,12 +1034,12 @@
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition5,
             columnDefinition6});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5});
+            rowDefinition4});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(410, 45);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem26
@@ -1057,25 +1047,26 @@
             this.layoutControlItem26.Control = this.txt_iCount_1;
             this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
+            this.layoutControlItem26.Size = new System.Drawing.Size(205, 45);
             this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_yuliang_1;
-            this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
+            this.layoutControlItem27.Location = new System.Drawing.Point(205, 0);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
+            this.layoutControlItem27.Size = new System.Drawing.Size(205, 45);
             this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
             // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(1032, 119);
+            this.lbMxGuid.Location = new System.Drawing.Point(1290, 145);
+            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4);
             this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+            this.lbMxGuid.Size = new System.Drawing.Size(72, 22);
             this.lbMxGuid.StyleController = this.layout99;
             this.lbMxGuid.TabIndex = 229;
             this.lbMxGuid.Text = "lbMxGuid";
@@ -1083,17 +1074,18 @@
             // 
             // ucBtnPrint1
             // 
+            this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 21);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1252, 58);
             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(338, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(416, 49);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1033, -11);
+            this.radOut.Location = new System.Drawing.Point(1252, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1101,17 +1093,19 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
-            this.radOut.Size = new System.Drawing.Size(227, 28);
+            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.radOut.Size = new System.Drawing.Size(416, 48);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 23);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(960, 60);
+            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
             this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(290, 28);
             this.txt_psnQty_1.StyleController = this.layout99;
             this.txt_psnQty_1.TabIndex = 263;
             this.txt_psnQty_1.Tag = "ReadOnly";
@@ -1119,63 +1113,69 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(114, -9);
+            this.txtWlid.Location = new System.Drawing.Point(132, 12);
+            this.txtWlid.Margin = new System.Windows.Forms.Padding(4);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(234, 24);
+            this.txtWlid.Size = new System.Drawing.Size(290, 28);
             this.txtWlid.StyleController = this.layout99;
             this.txtWlid.TabIndex = 214;
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(114, 23);
+            this.txtWlmc.Location = new System.Drawing.Point(132, 60);
+            this.txtWlmc.Margin = new System.Windows.Forms.Padding(4);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+            this.txtWlmc.Size = new System.Drawing.Size(290, 28);
             this.txtWlmc.StyleController = this.layout99;
             this.txtWlmc.TabIndex = 216;
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(114, 55);
+            this.txtWlgg.Location = new System.Drawing.Point(132, 109);
+            this.txtWlgg.Margin = new System.Windows.Forms.Padding(4);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+            this.txtWlgg.Size = new System.Drawing.Size(704, 28);
             this.txtWlgg.StyleController = this.layout99;
             this.txtWlgg.TabIndex = 218;
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(794, -9);
+            this.txt_kQty.Location = new System.Drawing.Point(960, 12);
+            this.txt_kQty.Margin = new System.Windows.Forms.Padding(4);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(290, 28);
             this.txt_kQty.StyleController = this.layout99;
             this.txt_kQty.TabIndex = 224;
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(454, -9);
+            this.txtQuantity.Location = new System.Drawing.Point(546, 12);
+            this.txtQuantity.Margin = new System.Windows.Forms.Padding(4);
             this.txtQuantity.Name = "txtQuantity";
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+            this.txtQuantity.Size = new System.Drawing.Size(290, 28);
             this.txtQuantity.StyleController = this.layout99;
             this.txtQuantity.TabIndex = 220;
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(454, 23);
+            this.txt_yQty.Location = new System.Drawing.Point(546, 60);
+            this.txt_yQty.Margin = new System.Windows.Forms.Padding(4);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(290, 28);
             this.txt_yQty.StyleController = this.layout99;
             this.txt_yQty.TabIndex = 222;
             // 
@@ -1221,17 +1221,17 @@
             columnDefinition8,
             columnDefinition9,
             columnDefinition10});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition6.Height = 100D;
             rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition7.Height = 100D;
             rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition5,
             rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+            rowDefinition7});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1678, 166);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem15
@@ -1239,84 +1239,81 @@
             this.layoutControlItem15.Control = this.txtWlid;
             this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(414, 48);
             this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txtWlmc;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txtWlgg;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 97);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
+            this.layoutControlItem17.Size = new System.Drawing.Size(828, 49);
             this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txtQuantity;
-            this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
+            this.layoutControlItem18.Location = new System.Drawing.Point(414, 0);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem18.Size = new System.Drawing.Size(414, 48);
             this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_yQty;
-            this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
+            this.layoutControlItem19.Location = new System.Drawing.Point(414, 48);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem19.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_kQty;
-            this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
+            this.layoutControlItem20.Location = new System.Drawing.Point(828, 0);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem20.Size = new System.Drawing.Size(414, 48);
             this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_psnQty_1;
-            this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
+            this.layoutControlItem21.Location = new System.Drawing.Point(828, 48);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem21.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.radOut;
-            this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0);
-            this.layoutControlItem22.MaxSize = new System.Drawing.Size(230, 28);
-            this.layoutControlItem22.MinSize = new System.Drawing.Size(230, 28);
+            this.layoutControlItem22.Location = new System.Drawing.Point(1242, 0);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
-            this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlItem22.Size = new System.Drawing.Size(416, 48);
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -1324,12 +1321,12 @@
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.ucBtnPrint1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32);
+            this.layoutControlItem23.Location = new System.Drawing.Point(1242, 48);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
-            this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlItem23.Size = new System.Drawing.Size(416, 49);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -1337,11 +1334,11 @@
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.layoutControl1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
+            this.layoutControlItem25.Location = new System.Drawing.Point(828, 97);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem25.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
@@ -1349,10 +1346,12 @@
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1342, 258);
+            this.gcMx1.Size = new System.Drawing.Size(1678, 338);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1379,128 +1378,132 @@
             this.gridColumn19,
             this.gridColumn12,
             this.gridColumn27});
+            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1.OptionsFilter.AllowFilterEditor = false;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsView.ShowFooter = true;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
             // gvAbtGuid
             // 
             this.gvAbtGuid.Caption = "abtGuid涓嶈兘鍒犻櫎";
             this.gvAbtGuid.FieldName = "aboutGuid";
-            this.gvAbtGuid.MinWidth = 50;
+            this.gvAbtGuid.MinWidth = 62;
             this.gvAbtGuid.Name = "gvAbtGuid";
             this.gvAbtGuid.OptionsColumn.ReadOnly = true;
-            this.gvAbtGuid.Width = 94;
+            this.gvAbtGuid.Width = 117;
             // 
             // gvMx1guid
             // 
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
             this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 70;
+            this.gvMx1guid.MinWidth = 87;
             this.gvMx1guid.Name = "gvMx1guid";
             this.gvMx1guid.OptionsColumn.ReadOnly = true;
             this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 100;
+            this.gvMx1guid.Width = 125;
             // 
             // gvMx1urgentFlag
             // 
             this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
-            this.gvMx1urgentFlag.FieldName = "urgentFlag";
-            this.gvMx1urgentFlag.MinWidth = 10;
+            this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
+            this.gvMx1urgentFlag.MinWidth = 12;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
             this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
             this.gvMx1urgentFlag.Visible = true;
             this.gvMx1urgentFlag.VisibleIndex = 0;
-            this.gvMx1urgentFlag.Width = 10;
+            this.gvMx1urgentFlag.Width = 12;
             // 
             // gvMx1ebeln
             // 
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "ebeln";
-            this.gvMx1ebeln.MinWidth = 50;
+            this.gvMx1ebeln.MinWidth = 62;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
             this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
             this.gvMx1ebeln.VisibleIndex = 1;
-            this.gvMx1ebeln.Width = 105;
+            this.gvMx1ebeln.Width = 131;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鐗╂枡缂栧彿";
             this.gridColumn4.FieldName = "itemNo";
-            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.MinWidth = 62;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 2;
-            this.gridColumn4.Width = 88;
+            this.gridColumn4.Width = 110;
             // 
             // gvMx1boardStyle
             // 
             this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
             this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1boardStyle.FieldName = "itemName";
-            this.gvMx1boardStyle.MinWidth = 50;
+            this.gvMx1boardStyle.MinWidth = 62;
             this.gvMx1boardStyle.Name = "gvMx1boardStyle";
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
             this.gvMx1boardStyle.VisibleIndex = 3;
-            this.gvMx1boardStyle.Width = 159;
+            this.gvMx1boardStyle.Width = 199;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 50;
+            this.gridColumn6.MinWidth = 62;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 109;
+            this.gridColumn6.Width = 136;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鏈鏀惰揣鏁伴噺";
             this.gridColumn8.FieldName = "quantity";
-            this.gridColumn8.MinWidth = 50;
+            this.gridColumn8.MinWidth = 62;
             this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 5;
-            this.gridColumn8.Width = 83;
+            this.gridColumn8.Width = 104;
             // 
             // gvMx1okRkqty
             // 
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
             this.gvMx1okRkqty.FieldName = "okRkqty";
-            this.gvMx1okRkqty.MinWidth = 50;
+            this.gvMx1okRkqty.MinWidth = 62;
             this.gvMx1okRkqty.Name = "gvMx1okRkqty";
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
             this.gvMx1okRkqty.VisibleIndex = 6;
-            this.gvMx1okRkqty.Width = 88;
+            this.gvMx1okRkqty.Width = 110;
             // 
             // gvMx1ebelnQty
             // 
             this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
             this.gvMx1ebelnQty.FieldName = "yQty";
-            this.gvMx1ebelnQty.MinWidth = 50;
+            this.gvMx1ebelnQty.MinWidth = 62;
             this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
             this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
             this.gvMx1ebelnQty.VisibleIndex = 7;
-            this.gvMx1ebelnQty.Width = 88;
+            this.gvMx1ebelnQty.Width = 110;
             // 
             // gridColumn10
             // 
@@ -1510,87 +1513,102 @@
             this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
             this.gridColumn10.FieldName = "kQty";
-            this.gridColumn10.MinWidth = 50;
+            this.gridColumn10.MinWidth = 62;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 8;
-            this.gridColumn10.Width = 83;
+            this.gridColumn10.Width = 104;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍗曚綅";
             this.gridColumn5.FieldName = "wnDw";
-            this.gridColumn5.MinWidth = 50;
+            this.gridColumn5.MinWidth = 62;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
-            this.gridColumn5.Width = 159;
+            this.gridColumn5.Width = 199;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "閲囪喘鍗曚綅";
             this.gridColumn9.FieldName = "cgUnit";
-            this.gridColumn9.MinWidth = 50;
+            this.gridColumn9.MinWidth = 62;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 9;
-            this.gridColumn9.Width = 83;
+            this.gridColumn9.VisibleIndex = 10;
+            this.gridColumn9.Width = 104;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
             this.gridColumn7.FieldName = "kcUnit";
-            this.gridColumn7.MinWidth = 50;
+            this.gridColumn7.MinWidth = 62;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.Width = 83;
+            this.gridColumn7.Width = 104;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "妫�楠岀姸鎬�";
             this.gridColumn15.FieldName = "jyzt";
-            this.gridColumn15.MinWidth = 50;
+            this.gridColumn15.MinWidth = 62;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 10;
-            this.gridColumn15.Width = 83;
+            this.gridColumn15.VisibleIndex = 11;
+            this.gridColumn15.Width = 104;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "妫�楠岀粨鏋�";
             this.gridColumn19.FieldName = "jyjg";
-            this.gridColumn19.MinWidth = 50;
+            this.gridColumn19.MinWidth = 62;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 11;
-            this.gridColumn19.Width = 91;
+            this.gridColumn19.VisibleIndex = 12;
+            this.gridColumn19.Width = 114;
             // 
             // gridColumn12
             // 
             this.gridColumn12.Caption = "澶勭悊鎰忚";
             this.gridColumn12.FieldName = "clyj";
-            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.MinWidth = 31;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 12;
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.VisibleIndex = 13;
+            this.gridColumn12.Width = 117;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn27.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn27.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn27.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn27.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
+            this.gridColumn27.FieldName = "mrtmsl";
+            this.gridColumn27.MinWidth = 31;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 9;
+            this.gridColumn27.Width = 117;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1342, 386);
+            this.tabMxPage2.Size = new System.Drawing.Size(1678, 519);
             this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptChongDa});
-            this.gcMx2.Size = new System.Drawing.Size(1342, 386);
+            this.gcMx2.Size = new System.Drawing.Size(1678, 519);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1600,7 +1618,7 @@
             this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMx2.Appearance.Row.Options.UseFont = true;
-            this.gvMx2.ColumnPanelRowHeight = 50;
+            this.gvMx2.ColumnPanelRowHeight = 61;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
             this.gridColumn16,
@@ -1614,12 +1632,13 @@
             this.gridColumn17,
             this.gridColumn22,
             this.gridColumn23,
-            this.gridColumn24,
-            this.gvBtnAlawys});
+            this.gridColumn24});
+            this.gvMx2.DetailHeight = 428;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowFooter = true;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
             // gvMx2guid
@@ -1627,174 +1646,166 @@
             this.gvMx2guid.AppearanceCell.Options.UseFont = true;
             this.gvMx2guid.Caption = "guid ";
             this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
+            this.gvMx2guid.MinWidth = 62;
             this.gvMx2guid.Name = "gvMx2guid";
             this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 94;
+            this.gvMx2guid.Width = 117;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "鏄惁鍏ュ簱";
             this.gridColumn16.FieldName = "isRk";
-            this.gridColumn16.MaxWidth = 50;
-            this.gridColumn16.MinWidth = 50;
+            this.gridColumn16.MaxWidth = 62;
+            this.gridColumn16.MinWidth = 62;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 0;
-            this.gridColumn16.Width = 50;
+            this.gridColumn16.Width = 62;
             // 
             // gvMx2itemBarcode
             // 
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
+            this.gvMx2itemBarcode.MinWidth = 62;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
             this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 300;
+            this.gvMx2itemBarcode.Width = 375;
             // 
             // gvMx2itemNo
             // 
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
             this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 50;
+            this.gvMx2itemNo.MinWidth = 62;
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx2itemNo.Visible = true;
             this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 100;
+            this.gvMx2itemNo.Width = 125;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 50;
+            this.gridColumn18.MinWidth = 62;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 3;
-            this.gridColumn18.Width = 150;
+            this.gridColumn18.Width = 187;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 50;
+            this.gridColumn14.MinWidth = 62;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 150;
+            this.gridColumn14.Width = 187;
             // 
             // gvMx2oldqty
             // 
             this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
             this.gvMx2oldqty.Caption = "鏁伴噺";
             this.gvMx2oldqty.FieldName = "quantity";
-            this.gvMx2oldqty.MinWidth = 50;
+            this.gvMx2oldqty.MinWidth = 62;
             this.gvMx2oldqty.Name = "gvMx2oldqty";
+            this.gvMx2oldqty.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
             this.gvMx2oldqty.Tag = "query_a.OLDQTY";
             this.gvMx2oldqty.Visible = true;
             this.gvMx2oldqty.VisibleIndex = 5;
-            this.gvMx2oldqty.Width = 94;
+            this.gvMx2oldqty.Width = 117;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "鍗曚綅";
             this.gridColumn21.FieldName = "dwName";
-            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.MinWidth = 31;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 6;
-            this.gridColumn21.Width = 94;
+            this.gridColumn21.Width = 117;
             // 
             // gridColumn20
             // 
             this.gridColumn20.Caption = "鎵撶爜浜�";
             this.gridColumn20.FieldName = "createBy";
-            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.MinWidth = 31;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
             this.gridColumn20.VisibleIndex = 7;
-            this.gridColumn20.Width = 94;
+            this.gridColumn20.Width = 117;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
             this.gridColumn17.FieldName = "createDate";
-            this.gridColumn17.MinWidth = 10;
+            this.gridColumn17.MinWidth = 12;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 8;
-            this.gridColumn17.Width = 180;
+            this.gridColumn17.Width = 225;
             // 
             // gridColumn22
             // 
             this.gridColumn22.Caption = "鍏ュ簱浜�";
             this.gridColumn22.FieldName = "rkUser";
-            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.MinWidth = 31;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
             this.gridColumn22.VisibleIndex = 9;
-            this.gridColumn22.Width = 94;
+            this.gridColumn22.Width = 117;
             // 
             // gridColumn23
             // 
             this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
             this.gridColumn23.FieldName = "rkDate";
-            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.MinWidth = 31;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
             this.gridColumn23.VisibleIndex = 10;
-            this.gridColumn23.Width = 94;
+            this.gridColumn23.Width = 117;
             // 
             // gridColumn24
             // 
             this.gridColumn24.Caption = "鍏ュ簱浣�";
             this.gridColumn24.FieldName = "rkPositon";
-            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.MinWidth = 31;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
             this.gridColumn24.VisibleIndex = 11;
-            this.gridColumn24.Width = 94;
+            this.gridColumn24.Width = 117;
             // 
-            // gvBtnAlawys
+            // xtraTabPageReport
             // 
-            this.gvBtnAlawys.Caption = "閲嶆墦";
-            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
-            this.gvBtnAlawys.MinWidth = 25;
-            this.gvBtnAlawys.Name = "gvBtnAlawys";
-            this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 12;
-            this.gvBtnAlawys.Width = 94;
+            this.xtraTabPageReport.Controls.Add(this.ucRptCgdhdPrint1);
+            this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+            this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPageReport.Name = "xtraTabPageReport";
+            this.xtraTabPageReport.Size = new System.Drawing.Size(1680, 698);
+            this.xtraTabPageReport.Text = "鎶ヨ〃";
             // 
-            // rptChongDa
+            // ucRptCgdhdPrint1
             // 
-            this.rptChongDa.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.rptChongDa.Name = "rptChongDa";
-            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // gridColumn27
-            // 
-            this.gridColumn27.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
-            this.gridColumn27.FieldName = "mrtmsl";
-            this.gridColumn27.MinWidth = 25;
-            this.gridColumn27.Name = "gridColumn27";
-            this.gridColumn27.Width = 94;
+            this.ucRptCgdhdPrint1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucRptCgdhdPrint1.Location = new System.Drawing.Point(0, 0);
+            this.ucRptCgdhdPrint1.Margin = new System.Windows.Forms.Padding(5);
+            this.ucRptCgdhdPrint1.Name = "ucRptCgdhdPrint1";
+            this.ucRptCgdhdPrint1.Size = new System.Drawing.Size(1680, 698);
+            this.ucRptCgdhdPrint1.TabIndex = 0;
             // 
             // Frm_ArrivalBarcode
             // 
-            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(1346, 682);
+            this.ClientSize = new System.Drawing.Size(1682, 834);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Frm_ArrivalBarcode";
             this.Text = "鍒拌揣鏉$爜鎵撳嵃";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1816,14 +1827,12 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
@@ -1831,17 +1840,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1885,7 +1893,7 @@
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
+            this.xtraTabPageReport.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1906,35 +1914,26 @@
         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 gv_remark;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         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_createDate;
         private DevExpress.XtraEditors.TextEdit txt_remark;
-        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 layoutControlItem6;
         private DevExpress.XtraEditors.CheckEdit txt_fType;
         private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1981,8 +1980,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
-        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
@@ -2014,5 +2011,14 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
+        private Rpt.UcRptCgdhdPrint ucRptCgdhdPrint1;
+        private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3