From 4e5a7feccdb468ba7a8dbfbe2eed08c00797f435 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 19 九月 2025 13:06:47 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs |  179 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 109 insertions(+), 70 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index aa6470b..09518e5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -68,6 +68,7 @@
             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();
@@ -164,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();
@@ -248,6 +251,7 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            this.xtraTabPageReport.SuspendLayout();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -276,7 +280,8 @@
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
-            this.xtraTabPage2});
+            this.xtraTabPage2,
+            this.xtraTabPageReport});
             // 
             // xtraTabPage1
             // 
@@ -341,7 +346,8 @@
             this.gv_fstatus,
             this.gridColumn11,
             this.gv_checkDate,
-            this.gridColumn3});
+            this.gridColumn3,
+            this.gridColumn28});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -526,6 +532,16 @@
             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
             // 
             this.pageBar1.CurrentPage = 1;
@@ -603,25 +619,25 @@
             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(219, 24);
+            this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
             // 
             // txt_barcodeProgress
             // 
-            this.txt_barcodeProgress.Location = new System.Drawing.Point(765, 68);
+            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(220, 24);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(439, 12);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(220, 24);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
@@ -630,25 +646,25 @@
             this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(219, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(225, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(439, 40);
+            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(220, 24);
+            this.txt_gysName.Size = new System.Drawing.Size(225, 24);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(765, 12);
+            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(220, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(225, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 217;
             // 
@@ -657,34 +673,34 @@
             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(545, 24);
+            this.txt_remark.Size = new System.Drawing.Size(556, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(765, 40);
+            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(220, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(225, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(989, 12);
+            this.txt_fType.Location = new System.Drawing.Point(1005, 12);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(322, 24);
+            this.txt_fType.Size = new System.Drawing.Size(327, 24);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 469;
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(989, 40);
+            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(322, 24);
+            this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
             this.txt_urgentFlag.StyleController = this.layoutMx1;
             this.txt_urgentFlag.TabIndex = 470;
             // 
@@ -740,7 +756,7 @@
             rowDefinition8,
             rowDefinition9,
             rowDefinition10});
-            this.Root.Size = new System.Drawing.Size(1323, 104);
+            this.Root.Size = new System.Drawing.Size(1344, 104);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -748,27 +764,27 @@
             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(325, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_paperBillNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(325, 0);
+            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(326, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_createBy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(651, 0);
+            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(326, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -776,21 +792,21 @@
             // 
             this.layoutControlItem8.Control = this.txt_createDate;
             this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.Location = new System.Drawing.Point(651, 28);
+            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(326, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(977, 0);
+            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(326, 28);
+            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;
@@ -798,11 +814,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(977, 28);
+            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(326, 28);
+            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;
@@ -810,22 +826,22 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(651, 56);
+            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(326, 28);
+            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(325, 28);
+            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(326, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -835,7 +851,7 @@
             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(325, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(331, 28);
             this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -846,7 +862,7 @@
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(651, 28);
+            this.layoutControlItem12.Size = new System.Drawing.Size(662, 28);
             this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -918,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(692, 75);
+            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";
             // 
@@ -968,7 +984,7 @@
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             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
@@ -976,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);
             // 
@@ -986,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);
             // 
@@ -1004,16 +1020,16 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 41);
+            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(1030, 9);
+            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;
@@ -1022,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(794, 43);
+            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;
@@ -1040,7 +1056,7 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(114, 11);
+            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;
@@ -1050,7 +1066,7 @@
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(114, 43);
+            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;
@@ -1060,7 +1076,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(114, 75);
+            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;
@@ -1070,7 +1086,7 @@
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(794, 11);
+            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;
@@ -1082,7 +1098,7 @@
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(454, 11);
+            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;
@@ -1092,7 +1108,7 @@
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(454, 43);
+            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;
@@ -1152,7 +1168,7 @@
             rowDefinition12,
             rowDefinition13,
             rowDefinition14});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 136);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem15
@@ -1160,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);
             // 
@@ -1191,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);
             // 
@@ -1212,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);
             // 
@@ -1234,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;
@@ -1242,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;
@@ -1255,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;
@@ -1546,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
@@ -1620,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;
@@ -1684,6 +1703,22 @@
             this.gridColumn24.Visible = true;
             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
             // 
@@ -1778,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);
 
         }
@@ -1899,5 +1935,8 @@
         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