From 904d0e4939c15b0e2866b386f2f78ba7eb4937ca Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 19 九月 2025 16:18:07 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs |  508 ++++++++++++++++++++++++++------------------------------
 1 files changed, 234 insertions(+), 274 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 2eeb425..09518e5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,24 +30,23 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -64,20 +63,18 @@
             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.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();
@@ -90,17 +87,15 @@
             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.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -170,6 +165,8 @@
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
+            this.ucRptCgdhdPrint1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhdPrint();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -189,9 +186,7 @@
             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();
@@ -204,17 +199,15 @@
             ((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.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -258,6 +251,7 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            this.xtraTabPageReport.SuspendLayout();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -286,7 +280,8 @@
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
-            this.xtraTabPage2});
+            this.xtraTabPage2,
+            this.xtraTabPageReport});
             // 
             // xtraTabPage1
             // 
@@ -347,12 +342,12 @@
             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.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -375,7 +370,7 @@
             // 
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡";
-            this.gv_urgentFlag.FieldName = "urgentFlag";
+            this.gv_urgentFlag.FieldName = "urgentFlagTxt";
             this.gv_urgentFlag.MaxWidth = 50;
             this.gv_urgentFlag.MinWidth = 50;
             this.gv_urgentFlag.Name = "gv_urgentFlag";
@@ -425,7 +420,7 @@
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鏉$爜鎵撳嵃姣旂巼";
-            this.gridColumn1.FieldName = "barRatio";
+            this.gridColumn1.FieldName = "barRatioTxtColor";
             this.gridColumn1.MaxWidth = 80;
             this.gridColumn1.MinWidth = 80;
             this.gridColumn1.Name = "gridColumn1";
@@ -481,30 +476,6 @@
             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;
-            // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
@@ -515,7 +486,7 @@
             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.VisibleIndex = 10;
             this.gv_remark.Width = 94;
             // 
             // gv_fstatus
@@ -537,7 +508,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 13;
+            this.gridColumn11.VisibleIndex = 11;
             this.gridColumn11.Width = 94;
             // 
             // gv_checkDate
@@ -550,8 +521,26 @@
             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.VisibleIndex = 12;
             this.gv_checkDate.Width = 180;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鍒拌揣鍗旼uid";
+            this.gridColumn3.FieldName = "guid";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "Srm鍒拌揣鍗曞彿";
+            this.gridColumn28.FieldName = "paperBillNo";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 13;
+            this.gridColumn28.Width = 94;
             // 
             // pageBar1
             // 
@@ -590,15 +579,13 @@
             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.SplitterPosition = 103;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             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);
@@ -615,7 +602,7 @@
             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(1344, 103);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -627,36 +614,18 @@
             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(114, 40);
             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.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(776, 68);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
             this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
@@ -683,7 +652,7 @@
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(114, 42);
+            this.txt_gysName.Location = new System.Drawing.Point(445, 40);
             this.txt_gysName.Name = "txt_gysName";
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
             this.txt_gysName.Size = new System.Drawing.Size(225, 24);
@@ -701,7 +670,7 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(114, 102);
+            this.txt_remark.Location = new System.Drawing.Point(114, 68);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
             this.txt_remark.Size = new System.Drawing.Size(556, 24);
@@ -710,7 +679,7 @@
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(776, 42);
+            this.txt_createDate.Location = new System.Drawing.Point(776, 40);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
             this.txt_createDate.Size = new System.Drawing.Size(225, 24);
@@ -728,7 +697,7 @@
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 42);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 40);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
             this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
@@ -753,46 +722,41 @@
             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.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
+            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13.Width = 100D;
+            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition14.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11,
+            columnDefinition12,
+            columnDefinition13,
+            columnDefinition14});
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1344, 140);
+            rowDefinition8,
+            rowDefinition9,
+            rowDefinition10});
+            this.Root.Size = new System.Drawing.Size(1344, 104);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -800,29 +764,9 @@
             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(331, 28);
             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);
             // 
             // layoutControlItem4
             // 
@@ -830,31 +774,9 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem4.Size = new System.Drawing.Size(331, 28);
             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);
             // 
             // layoutControlItem7
             // 
@@ -862,7 +784,7 @@
             this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem7.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -870,24 +792,13 @@
             // 
             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(662, 28);
             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(331, 28);
             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);
             // 
             // layoutControlItem10
             // 
@@ -895,7 +806,7 @@
             this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem10.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -903,11 +814,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(993, 30);
+            this.layoutControlItem11.Location = new System.Drawing.Point(993, 28);
             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(331, 28);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -915,13 +826,45 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
+            this.layoutControlItem13.Location = new System.Drawing.Point(662, 56);
             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(331, 28);
             this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_gysName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(331, 28);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(331, 28);
+            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, 28);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(331, 28);
+            this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_remark;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(662, 28);
+            this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -929,7 +872,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1344, 418);
+            this.tabMx.Size = new System.Drawing.Size(1344, 455);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -939,7 +882,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.split99);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1342, 386);
+            this.tabMxPage1.Size = new System.Drawing.Size(1342, 423);
             this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
             // 
             // split99
@@ -959,7 +902,7 @@
             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.Size = new System.Drawing.Size(1342, 423);
             this.split99.SplitterPosition = 136;
             this.split99.TabIndex = 2;
             // 
@@ -991,10 +934,10 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(633, 76);
+            this.layoutControl1.Location = new System.Drawing.Point(692, 89);
             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(336, 35);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -1029,19 +972,19 @@
             this.layoutControlItem27});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "layoutControlGroup2";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
+            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition16.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15,
+            columnDefinition16});
+            rowDefinition11.Height = 100D;
+            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5});
+            rowDefinition11});
             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(336, 35);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem26
@@ -1049,7 +992,7 @@
             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(168, 35);
             this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1059,7 +1002,7 @@
             this.layoutControlItem27.Location = new System.Drawing.Point(168, 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(168, 35);
             this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1077,16 +1020,16 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(971, 42);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 48);
             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(340, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(340, 39);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(971, 10);
+            this.radOut.Location = new System.Drawing.Point(1030, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1095,13 +1038,13 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(340, 32);
+            this.radOut.Size = new System.Drawing.Size(340, 38);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(735, 44);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 50);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
             this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1113,7 +1056,7 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(55, 12);
+            this.txtWlid.Location = new System.Drawing.Point(114, 12);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
@@ -1123,7 +1066,7 @@
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(55, 44);
+            this.txtWlmc.Location = new System.Drawing.Point(114, 50);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
@@ -1133,7 +1076,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(55, 76);
+            this.txtWlgg.Location = new System.Drawing.Point(114, 89);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
@@ -1143,7 +1086,7 @@
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(735, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(794, 12);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
@@ -1155,7 +1098,7 @@
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(395, 12);
+            this.txtQuantity.Location = new System.Drawing.Point(454, 12);
             this.txtQuantity.Name = "txtQuantity";
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
@@ -1165,7 +1108,7 @@
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(395, 44);
+            this.txt_yQty.Location = new System.Drawing.Point(454, 50);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
@@ -1202,30 +1145,30 @@
             this.layoutControlItem25});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
-            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition9.Width = 100D;
-            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition10.Width = 100D;
+            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17.Width = 100D;
+            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition18.Width = 100D;
+            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition19.Width = 100D;
+            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition20.Width = 100D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition7,
-            columnDefinition8,
-            columnDefinition9,
-            columnDefinition10});
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17,
+            columnDefinition18,
+            columnDefinition19,
+            columnDefinition20});
+            rowDefinition12.Height = 100D;
+            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition13.Height = 100D;
+            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition14.Height = 100D;
+            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 136);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem15
@@ -1233,28 +1176,28 @@
             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(340, 38);
             this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txtWlmc;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 38);
             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(340, 39);
             this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txtWlgg;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 77);
             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(680, 39);
             this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1264,18 +1207,18 @@
             this.layoutControlItem18.Location = new System.Drawing.Point(340, 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(340, 38);
             this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_yQty;
-            this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
+            this.layoutControlItem19.Location = new System.Drawing.Point(340, 38);
             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(340, 39);
             this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1285,18 +1228,18 @@
             this.layoutControlItem20.Location = new System.Drawing.Point(680, 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(340, 38);
             this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_psnQty_1;
-            this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
+            this.layoutControlItem21.Location = new System.Drawing.Point(680, 38);
             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(340, 39);
             this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1307,7 +1250,7 @@
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem22.Size = new System.Drawing.Size(340, 38);
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -1315,12 +1258,12 @@
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.ucBtnPrint1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32);
+            this.layoutControlItem23.Location = new System.Drawing.Point(1020, 38);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+            this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -1328,11 +1271,11 @@
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.layoutControl1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
+            this.layoutControlItem25.Location = new System.Drawing.Point(680, 77);
             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(340, 39);
             this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
@@ -1343,7 +1286,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1342, 238);
+            this.gcMx1.Size = new System.Drawing.Size(1342, 275);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1376,6 +1319,7 @@
             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
@@ -1402,7 +1346,7 @@
             // 
             this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
-            this.gvMx1urgentFlag.FieldName = "urgentFlag";
+            this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
             this.gvMx1urgentFlag.MinWidth = 10;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
             this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
@@ -1463,6 +1407,8 @@
             this.gridColumn8.FieldName = "quantity";
             this.gridColumn8.MinWidth = 50;
             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;
@@ -1578,7 +1524,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1342, 386);
+            this.tabMxPage2.Size = new System.Drawing.Size(1342, 423);
             this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
             // 
             // gcMx2
@@ -1587,7 +1533,7 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1342, 386);
+            this.gcMx2.Size = new System.Drawing.Size(1342, 423);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1616,6 +1562,7 @@
             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
@@ -1690,6 +1637,8 @@
             this.gvMx2oldqty.FieldName = "quantity";
             this.gvMx2oldqty.MinWidth = 50;
             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;
@@ -1755,6 +1704,22 @@
             this.gridColumn24.VisibleIndex = 11;
             this.gridColumn24.Width = 94;
             // 
+            // xtraTabPageReport
+            // 
+            this.xtraTabPageReport.Controls.Add(this.ucRptCgdhdPrint1);
+            this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+            this.xtraTabPageReport.Name = "xtraTabPageReport";
+            this.xtraTabPageReport.Size = new System.Drawing.Size(1344, 570);
+            this.xtraTabPageReport.Text = "鎶ヨ〃";
+            // 
+            // ucRptCgdhdPrint1
+            // 
+            this.ucRptCgdhdPrint1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucRptCgdhdPrint1.Location = new System.Drawing.Point(0, 0);
+            this.ucRptCgdhdPrint1.Name = "ucRptCgdhdPrint1";
+            this.ucRptCgdhdPrint1.Size = new System.Drawing.Size(1344, 570);
+            this.ucRptCgdhdPrint1.TabIndex = 0;
+            // 
             // Frm_ArrivalBarcode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1783,9 +1748,7 @@
             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();
@@ -1798,17 +1761,15 @@
             ((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.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1852,6 +1813,7 @@
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            this.xtraTabPageReport.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -1872,18 +1834,14 @@
         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;
@@ -1891,16 +1849,11 @@
         private DevExpress.XtraEditors.TextEdit txt_createBy;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraEditors.CheckEdit txt_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;
@@ -1978,5 +1931,12 @@
         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;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3