From 2d67aa96bf5e9e74c6033ced23b9ce38dc042637 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 06 十一月 2025 16:49:29 +0800
Subject: [PATCH] ID转姓名:返工列表、采购到货单(收料明细)、到货条码打印、采购入库单、其他入库申请、其他入库单

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index bc17dc5..75d74ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -73,13 +73,14 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
@@ -96,6 +97,7 @@
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -167,8 +169,6 @@
             this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
             this.ucRptCgdhdPrint1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhdPrint();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -193,7 +193,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
@@ -210,6 +210,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -254,7 +255,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.xtraTabPageReport.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -266,7 +266,7 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
             this.toolBarMenu1.Size = new System.Drawing.Size(1682, 98);
@@ -278,7 +278,7 @@
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
-            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
             this.xtraTabControl1.Size = new System.Drawing.Size(1682, 736);
@@ -291,7 +291,7 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPage1.Name = "xtraTabPage1";
             this.xtraTabPage1.Size = new System.Drawing.Size(1680, 698);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
@@ -302,7 +302,7 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
-            this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -322,10 +322,10 @@
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
-            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMain1.Name = "gcMain1";
             this.gcMain1.Size = new System.Drawing.Size(1680, 635);
             this.gcMain1.TabIndex = 2;
@@ -443,7 +443,7 @@
             // 
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.FieldName = "createByName";
             this.gv_createBy.MinWidth = 62;
             this.gv_createBy.Name = "gv_createBy";
             this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -514,7 +514,7 @@
             // gridColumn11
             // 
             this.gridColumn11.Caption = "瀹℃牳浜�";
-            this.gridColumn11.FieldName = "checkUser";
+            this.gridColumn11.FieldName = "checkUserName";
             this.gridColumn11.MinWidth = 31;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
@@ -567,7 +567,7 @@
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPage2.Name = "xtraTabPage2";
             this.xtraTabPage2.Size = new System.Drawing.Size(1680, 698);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
@@ -577,7 +577,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -603,7 +603,7 @@
             this.layoutMx1.Controls.Add(this.txt_paperBillNo);
             this.layoutMx1.Controls.Add(this.txt_billNo);
             this.layoutMx1.Controls.Add(this.txt_gysName);
-            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_createByName);
             this.layoutMx1.Controls.Add(this.txt_remark);
             this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_fType);
@@ -612,13 +612,23 @@
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem14});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(638, 441, 812, 500);
             this.layoutMx1.Root = this.Root;
             this.layoutMx1.Size = new System.Drawing.Size(1680, 126);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // ucBtnPrintAll1
+            // 
+            this.ucBtnPrintAll1.Location = new System.Drawing.Point(1236, 84);
+            this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ucBtnPrintAll1.mxList = null;
+            this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+            this.ucBtnPrintAll1.rptType = null;
+            this.ucBtnPrintAll1.Size = new System.Drawing.Size(406, 32);
+            this.ucBtnPrintAll1.TabIndex = 472;
             // 
             // lbGuid
             // 
@@ -631,101 +641,101 @@
             // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(137, 50);
-            this.txt_gysNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_gysNo.Location = new System.Drawing.Point(132, 48);
+            this.txt_gysNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_gysNo.Name = "txt_gysNo";
             this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysNo.Size = new System.Drawing.Size(280, 28);
+            this.txt_gysNo.Size = new System.Drawing.Size(284, 28);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
             // 
             // txt_barcodeProgress
             // 
-            this.txt_barcodeProgress.Location = new System.Drawing.Point(951, 86);
-            this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(948, 84);
+            this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(4);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
-            this.txt_barcodeProgress.Size = new System.Drawing.Size(280, 28);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(284, 28);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(544, 14);
-            this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(540, 12);
+            this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(280, 28);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(284, 28);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(137, 14);
-            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_billNo.Location = new System.Drawing.Point(132, 12);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(280, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(284, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(544, 50);
-            this.txt_gysName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_gysName.Location = new System.Drawing.Point(540, 48);
+            this.txt_gysName.Margin = new System.Windows.Forms.Padding(4);
             this.txt_gysName.Name = "txt_gysName";
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysName.Size = new System.Drawing.Size(280, 28);
+            this.txt_gysName.Size = new System.Drawing.Size(284, 28);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
-            // txt_createBy
+            // txt_createByName
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(951, 14);
-            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(280, 28);
-            this.txt_createBy.StyleController = this.layoutMx1;
-            this.txt_createBy.TabIndex = 217;
+            this.txt_createByName.Location = new System.Drawing.Point(948, 12);
+            this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createByName.Name = "txt_createByName";
+            this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+            this.txt_createByName.Size = new System.Drawing.Size(284, 28);
+            this.txt_createByName.StyleController = this.layoutMx1;
+            this.txt_createByName.TabIndex = 217;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(137, 86);
-            this.txt_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_remark.Location = new System.Drawing.Point(132, 84);
+            this.txt_remark.Margin = new System.Windows.Forms.Padding(4);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(687, 28);
+            this.txt_remark.Size = new System.Drawing.Size(692, 28);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(951, 50);
-            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_createDate.Location = new System.Drawing.Point(948, 48);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(280, 28);
+            this.txt_createDate.Size = new System.Drawing.Size(284, 28);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(1235, 14);
-            this.txt_fType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_fType.Location = new System.Drawing.Point(1236, 12);
+            this.txt_fType.Margin = new System.Windows.Forms.Padding(4);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(405, 27);
+            this.txt_fType.Size = new System.Drawing.Size(406, 27);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 469;
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(1235, 50);
-            this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(1236, 48);
+            this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(4);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
-            this.txt_urgentFlag.Size = new System.Drawing.Size(405, 27);
+            this.txt_urgentFlag.Size = new System.Drawing.Size(406, 27);
             this.txt_urgentFlag.StyleController = this.layoutMx1;
             this.txt_urgentFlag.TabIndex = 470;
             // 
@@ -782,7 +792,7 @@
             rowDefinition1,
             rowDefinition2,
             rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1654, 132);
+            this.Root.Size = new System.Drawing.Size(1654, 128);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -790,7 +800,7 @@
             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(407, 36);
+            this.layoutControlItem1.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
             // 
@@ -798,20 +808,20 @@
             // 
             this.layoutControlItem4.Control = this.txt_paperBillNo;
             this.layoutControlItem4.CustomizationFormText = "Srm閫佽揣鍗曞彿";
-            this.layoutControlItem4.Location = new System.Drawing.Point(407, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(408, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(407, 36);
+            this.layoutControlItem4.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem4.Text = "Srm閫佽揣鍗曞彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem7
             // 
-            this.layoutControlItem7.Control = this.txt_createBy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(814, 0);
+            this.layoutControlItem7.Control = this.txt_createByName;
+            this.layoutControlItem7.Location = new System.Drawing.Point(816, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(407, 36);
+            this.layoutControlItem7.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
             // 
@@ -819,21 +829,21 @@
             // 
             this.layoutControlItem8.Control = this.txt_createDate;
             this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.Location = new System.Drawing.Point(814, 36);
+            this.layoutControlItem8.Location = new System.Drawing.Point(816, 36);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(407, 36);
+            this.layoutControlItem8.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1221, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1224, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(409, 36);
+            this.layoutControlItem10.Size = new System.Drawing.Size(410, 36);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -841,11 +851,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(1221, 36);
+            this.layoutControlItem11.Location = new System.Drawing.Point(1224, 36);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(409, 36);
+            this.layoutControlItem11.Size = new System.Drawing.Size(410, 36);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -853,22 +863,22 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(814, 72);
+            this.layoutControlItem13.Location = new System.Drawing.Point(816, 72);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(407, 36);
+            this.layoutControlItem13.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_gysName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(407, 36);
+            this.layoutControlItem2.Location = new System.Drawing.Point(408, 36);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(407, 36);
+            this.layoutControlItem2.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
             // 
@@ -878,7 +888,7 @@
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 36);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(407, 36);
+            this.layoutControlItem3.Size = new System.Drawing.Size(408, 36);
             this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
             // 
@@ -889,15 +899,26 @@
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(814, 36);
+            this.layoutControlItem12.Size = new System.Drawing.Size(816, 36);
             this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.ucBtnPrintAll1;
+            this.layoutControlItem5.Location = new System.Drawing.Point(1224, 72);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(410, 36);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem5.TextVisible = false;
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
-            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
             this.tabMx.Size = new System.Drawing.Size(1680, 557);
@@ -909,7 +930,7 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.split99);
-            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
             this.tabMxPage1.Name = "tabMxPage1";
             this.tabMxPage1.Size = new System.Drawing.Size(1678, 519);
             this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
@@ -919,7 +940,7 @@
             this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.split99.Horizontal = false;
             this.split99.Location = new System.Drawing.Point(0, 0);
-            this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.split99.Margin = new System.Windows.Forms.Padding(4);
             this.split99.Name = "split99";
             // 
             // split99.Panel1
@@ -953,7 +974,7 @@
             this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem24});
             this.layout99.Location = new System.Drawing.Point(0, 0);
-            this.layout99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.layout99.Margin = new System.Windows.Forms.Padding(4);
             this.layout99.Name = "layout99";
             this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
             this.layout99.Root = this.layoutControlGroup1;
@@ -965,23 +986,23 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(840, 108);
-            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.layoutControl1.Location = new System.Drawing.Point(840, 109);
+            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup2;
-            this.layoutControl1.Size = new System.Drawing.Size(409, 44);
+            this.layoutControl1.Size = new System.Drawing.Size(410, 45);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(125, 2);
-            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_iCount_1.Location = new System.Drawing.Point(122, 2);
+            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
             this.txt_iCount_1.Properties.ReadOnly = true;
             this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(77, 28);
+            this.txt_iCount_1.Size = new System.Drawing.Size(81, 28);
             this.txt_iCount_1.StyleController = this.layoutControl1;
             this.txt_iCount_1.TabIndex = 264;
             this.txt_iCount_1.Tag = "ReadOnly";
@@ -989,11 +1010,11 @@
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(329, 2);
-            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(327, 2);
+            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4);
             this.txt_yuliang_1.Name = "txt_yuliang_1";
             this.txt_yuliang_1.Properties.ReadOnly = true;
-            this.txt_yuliang_1.Size = new System.Drawing.Size(78, 28);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(81, 28);
             this.txt_yuliang_1.StyleController = this.layoutControl1;
             this.txt_yuliang_1.TabIndex = 265;
             // 
@@ -1018,7 +1039,7 @@
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition4});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(409, 44);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(410, 45);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem26
@@ -1026,24 +1047,24 @@
             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(204, 44);
+            this.layoutControlItem26.Size = new System.Drawing.Size(205, 45);
             this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_yuliang_1;
-            this.layoutControlItem27.Location = new System.Drawing.Point(204, 0);
+            this.layoutControlItem27.Location = new System.Drawing.Point(205, 0);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem27.Size = new System.Drawing.Size(205, 44);
+            this.layoutControlItem27.Size = new System.Drawing.Size(205, 45);
             this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
             // 
             // lbMxGuid
             // 
             this.lbMxGuid.Location = new System.Drawing.Point(1290, 145);
-            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4);
             this.lbMxGuid.Name = "lbMxGuid";
             this.lbMxGuid.Size = new System.Drawing.Size(72, 22);
             this.lbMxGuid.StyleController = this.layout99;
@@ -1055,16 +1076,16 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1251, 59);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1252, 58);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = "rpt_daa";
-            this.ucBtnPrint1.Size = new System.Drawing.Size(415, 47);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(416, 49);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1251, 12);
+            this.radOut.Location = new System.Drawing.Point(1252, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1073,18 +1094,18 @@
             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(415, 47);
+            this.radOut.Size = new System.Drawing.Size(416, 48);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(963, 61);
-            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(960, 60);
+            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
             this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(286, 28);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(290, 28);
             this.txt_psnQty_1.StyleController = this.layout99;
             this.txt_psnQty_1.TabIndex = 263;
             this.txt_psnQty_1.Tag = "ReadOnly";
@@ -1092,69 +1113,69 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(137, 14);
-            this.txtWlid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtWlid.Location = new System.Drawing.Point(132, 12);
+            this.txtWlid.Margin = new System.Windows.Forms.Padding(4);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(286, 28);
+            this.txtWlid.Size = new System.Drawing.Size(290, 28);
             this.txtWlid.StyleController = this.layout99;
             this.txtWlid.TabIndex = 214;
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(137, 61);
-            this.txtWlmc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtWlmc.Location = new System.Drawing.Point(132, 60);
+            this.txtWlmc.Margin = new System.Windows.Forms.Padding(4);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(286, 28);
+            this.txtWlmc.Size = new System.Drawing.Size(290, 28);
             this.txtWlmc.StyleController = this.layout99;
             this.txtWlmc.TabIndex = 216;
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(137, 108);
-            this.txtWlgg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtWlgg.Location = new System.Drawing.Point(132, 109);
+            this.txtWlgg.Margin = new System.Windows.Forms.Padding(4);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(699, 28);
+            this.txtWlgg.Size = new System.Drawing.Size(704, 28);
             this.txtWlgg.StyleController = this.layout99;
             this.txtWlgg.TabIndex = 218;
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(963, 14);
-            this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_kQty.Location = new System.Drawing.Point(960, 12);
+            this.txt_kQty.Margin = new System.Windows.Forms.Padding(4);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(286, 28);
+            this.txt_kQty.Size = new System.Drawing.Size(290, 28);
             this.txt_kQty.StyleController = this.layout99;
             this.txt_kQty.TabIndex = 224;
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(550, 14);
-            this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtQuantity.Location = new System.Drawing.Point(546, 12);
+            this.txtQuantity.Margin = new System.Windows.Forms.Padding(4);
             this.txtQuantity.Name = "txtQuantity";
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(286, 28);
+            this.txtQuantity.Size = new System.Drawing.Size(290, 28);
             this.txtQuantity.StyleController = this.layout99;
             this.txtQuantity.TabIndex = 220;
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(550, 61);
-            this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_yQty.Location = new System.Drawing.Point(546, 60);
+            this.txt_yQty.Margin = new System.Windows.Forms.Padding(4);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(286, 28);
+            this.txt_yQty.Size = new System.Drawing.Size(290, 28);
             this.txt_yQty.StyleController = this.layout99;
             this.txt_yQty.TabIndex = 222;
             // 
@@ -1218,81 +1239,81 @@
             this.layoutControlItem15.Control = this.txtWlid;
             this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Size = new System.Drawing.Size(413, 47);
+            this.layoutControlItem15.Size = new System.Drawing.Size(414, 48);
             this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txtWlmc;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 47);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem16.Size = new System.Drawing.Size(413, 47);
+            this.layoutControlItem16.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txtWlgg;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 94);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 97);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(826, 48);
+            this.layoutControlItem17.Size = new System.Drawing.Size(828, 49);
             this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txtQuantity;
-            this.layoutControlItem18.Location = new System.Drawing.Point(413, 0);
+            this.layoutControlItem18.Location = new System.Drawing.Point(414, 0);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.Size = new System.Drawing.Size(413, 47);
+            this.layoutControlItem18.Size = new System.Drawing.Size(414, 48);
             this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_yQty;
-            this.layoutControlItem19.Location = new System.Drawing.Point(413, 47);
+            this.layoutControlItem19.Location = new System.Drawing.Point(414, 48);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(413, 47);
+            this.layoutControlItem19.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_kQty;
-            this.layoutControlItem20.Location = new System.Drawing.Point(826, 0);
+            this.layoutControlItem20.Location = new System.Drawing.Point(828, 0);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(413, 47);
+            this.layoutControlItem20.Size = new System.Drawing.Size(414, 48);
             this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_psnQty_1;
-            this.layoutControlItem21.Location = new System.Drawing.Point(826, 47);
+            this.layoutControlItem21.Location = new System.Drawing.Point(828, 48);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(413, 47);
+            this.layoutControlItem21.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.radOut;
-            this.layoutControlItem22.Location = new System.Drawing.Point(1239, 0);
+            this.layoutControlItem22.Location = new System.Drawing.Point(1242, 0);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem22.Size = new System.Drawing.Size(415, 47);
+            this.layoutControlItem22.Size = new System.Drawing.Size(416, 48);
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -1300,12 +1321,12 @@
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.ucBtnPrint1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(1239, 47);
+            this.layoutControlItem23.Location = new System.Drawing.Point(1242, 48);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem23.Size = new System.Drawing.Size(415, 47);
+            this.layoutControlItem23.Size = new System.Drawing.Size(416, 49);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -1313,11 +1334,11 @@
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.layoutControl1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(826, 94);
+            this.layoutControlItem25.Location = new System.Drawing.Point(828, 97);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem25.Size = new System.Drawing.Size(413, 48);
+            this.layoutControlItem25.Size = new System.Drawing.Size(414, 49);
             this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
@@ -1325,10 +1346,10 @@
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.Size = new System.Drawing.Size(1678, 338);
             this.gcMx1.TabIndex = 1;
@@ -1574,20 +1595,20 @@
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1678, 514);
+            this.tabMxPage2.Size = new System.Drawing.Size(1678, 519);
             this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1678, 514);
+            this.gcMx2.Size = new System.Drawing.Size(1678, 519);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1763,7 +1784,7 @@
             // 
             this.xtraTabPageReport.Controls.Add(this.ucRptCgdhdPrint1);
             this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
-            this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageReport.Name = "xtraTabPageReport";
             this.xtraTabPageReport.Size = new System.Drawing.Size(1680, 698);
             this.xtraTabPageReport.Text = "鎶ヨ〃";
@@ -1772,31 +1793,10 @@
             // 
             this.ucRptCgdhdPrint1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.ucRptCgdhdPrint1.Location = new System.Drawing.Point(0, 0);
-            this.ucRptCgdhdPrint1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ucRptCgdhdPrint1.Margin = new System.Windows.Forms.Padding(5);
             this.ucRptCgdhdPrint1.Name = "ucRptCgdhdPrint1";
             this.ucRptCgdhdPrint1.Size = new System.Drawing.Size(1680, 698);
             this.ucRptCgdhdPrint1.TabIndex = 0;
-            // 
-            // ucBtnPrintAll1
-            // 
-            this.ucBtnPrintAll1.Location = new System.Drawing.Point(1235, 86);
-            this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.ucBtnPrintAll1.mxList = null;
-            this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
-            this.ucBtnPrintAll1.rptType = null;
-            this.ucBtnPrintAll1.Size = new System.Drawing.Size(405, 32);
-            this.ucBtnPrintAll1.TabIndex = 472;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.ucBtnPrintAll1;
-            this.layoutControlItem5.Location = new System.Drawing.Point(1221, 72);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(409, 36);
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem5.TextVisible = false;
             // 
             // Frm_ArrivalBarcode
             // 
@@ -1805,7 +1805,7 @@
             this.ClientSize = new System.Drawing.Size(1682, 834);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Frm_ArrivalBarcode";
             this.Text = "鍒拌揣鏉$爜鎵撳嵃";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1832,7 +1832,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
@@ -1849,6 +1849,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1893,7 +1894,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             this.xtraTabPageReport.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1926,7 +1926,7 @@
         private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraEditors.TextEdit txt_remark;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_createByName;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;

--
Gitblit v1.9.3