From 39ff39b240e2751b608d8264381104c2093b6fb9 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 21 八月 2025 08:29:07 +0800
Subject: [PATCH] 条码交易明细 -- 黄昱昕

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 82fb154..2c9d410 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -37,22 +37,16 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -69,8 +63,6 @@
             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();
@@ -80,9 +72,7 @@
             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();
@@ -95,14 +85,9 @@
             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();
@@ -157,6 +142,7 @@
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -173,9 +159,10 @@
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -195,9 +182,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();
@@ -210,14 +195,9 @@
             ((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();
@@ -264,7 +244,9 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -354,8 +336,6 @@
             this.gridColumn26,
             this.gv_suppNo,
             this.gridColumn2,
-            this.gv_depotsCode,
-            this.gridColumn3,
             this.gv_remark,
             this.gv_fstatus,
             this.gridColumn11,
@@ -381,7 +361,7 @@
             // gv_urgentFlag
             // 
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
-            this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
+            this.gv_urgentFlag.Caption = "鎬ユ枡";
             this.gv_urgentFlag.FieldName = "urgentFlag";
             this.gv_urgentFlag.MaxWidth = 50;
             this.gv_urgentFlag.MinWidth = 50;
@@ -394,7 +374,7 @@
             // 
             // gridColumn25
             // 
-            this.gridColumn25.Caption = "濮斿鏍囪瘑";
+            this.gridColumn25.Caption = "濮斿";
             this.gridColumn25.FieldName = "fType";
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
@@ -488,30 +468,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;
@@ -522,7 +478,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
@@ -544,7 +500,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
@@ -557,7 +513,7 @@
             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;
             // 
             // pageBar1
@@ -597,15 +553,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);
@@ -622,7 +576,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";
             // 
@@ -634,48 +588,30 @@
             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.Size = new System.Drawing.Size(219, 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(765, 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);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(220, 24);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(439, 12);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(220, 24);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
@@ -684,61 +620,61 @@
             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(225, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(219, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(114, 42);
+            this.txt_gysName.Location = new System.Drawing.Point(439, 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);
+            this.txt_gysName.Size = new System.Drawing.Size(220, 24);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(776, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(765, 12);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(225, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(220, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 217;
             // 
             // 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);
+            this.txt_remark.Size = new System.Drawing.Size(545, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(776, 42);
+            this.txt_createDate.Location = new System.Drawing.Point(765, 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);
+            this.txt_createDate.Size = new System.Drawing.Size(220, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(1005, 12);
+            this.txt_fType.Location = new System.Drawing.Point(989, 12);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(327, 24);
+            this.txt_fType.Size = new System.Drawing.Size(322, 24);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 469;
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 42);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(989, 40);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
-            this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
+            this.txt_urgentFlag.Size = new System.Drawing.Size(322, 24);
             this.txt_urgentFlag.StyleController = this.layoutMx1;
             this.txt_urgentFlag.TabIndex = 470;
             // 
@@ -760,17 +696,15 @@
             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;
@@ -792,14 +726,11 @@
             rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition3.Height = 100D;
             rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
-            rowDefinition3,
-            rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1344, 140);
+            rowDefinition3});
+            this.Root.Size = new System.Drawing.Size(1323, 104);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -807,69 +738,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(331, 30);
+            this.layoutControlItem1.Size = new System.Drawing.Size(325, 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
             // 
             this.layoutControlItem4.Control = this.txt_paperBillNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(325, 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(326, 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
             // 
             this.layoutControlItem7.Control = this.txt_createBy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
+            this.layoutControlItem7.Location = new System.Drawing.Point(651, 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(326, 28);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -877,32 +766,21 @@
             // 
             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(651, 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(326, 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
             // 
             this.layoutControlItem10.Control = this.txt_fType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(977, 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(326, 28);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -910,11 +788,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(993, 30);
+            this.layoutControlItem11.Location = new System.Drawing.Point(977, 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(326, 28);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -922,11 +800,11 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
+            this.layoutControlItem13.Location = new System.Drawing.Point(651, 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(326, 28);
             this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -936,7 +814,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,
@@ -946,8 +824,8 @@
             // 
             this.tabMxPage1.Controls.Add(this.split99);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1342, 386);
-            this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏";
+            this.tabMxPage1.Size = new System.Drawing.Size(1342, 423);
+            this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
             // 
             // split99
             // 
@@ -966,8 +844,8 @@
             this.split99.Panel2.Controls.Add(this.gcMx1);
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1342, 386);
-            this.split99.SplitterPosition = 116;
+            this.split99.Size = new System.Drawing.Size(1342, 423);
+            this.split99.SplitterPosition = 136;
             this.split99.TabIndex = 2;
             // 
             // layout99
@@ -990,7 +868,7 @@
             this.layout99.Name = "layout99";
             this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
             this.layout99.Root = this.layoutControlGroup1;
-            this.layout99.Size = new System.Drawing.Size(1342, 116);
+            this.layout99.Size = new System.Drawing.Size(1342, 136);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -998,7 +876,7 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(692, 55);
+            this.layoutControl1.Location = new System.Drawing.Point(692, 76);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup2;
             this.layoutControl1.Size = new System.Drawing.Size(336, 28);
@@ -1043,10 +921,10 @@
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition5,
             columnDefinition6});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5});
+            rowDefinition4});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
             this.layoutControlGroup2.TextVisible = false;
@@ -1082,17 +960,18 @@
             // 
             // ucBtnPrint1
             // 
+            this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 21);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 42);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = "rpt_daa";
-            this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(340, 32);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1033, -11);
+            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;
@@ -1100,13 +979,14 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
-            this.radOut.Size = new System.Drawing.Size(227, 28);
+            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.radOut.Size = new System.Drawing.Size(340, 32);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 23);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
             this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1118,7 +998,7 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(114, -9);
+            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;
@@ -1128,7 +1008,7 @@
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(114, 23);
+            this.txtWlmc.Location = new System.Drawing.Point(114, 44);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
@@ -1138,7 +1018,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(114, 55);
+            this.txtWlgg.Location = new System.Drawing.Point(114, 76);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
@@ -1148,7 +1028,7 @@
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(794, -9);
+            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;
@@ -1160,7 +1040,7 @@
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(454, -9);
+            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;
@@ -1170,7 +1050,7 @@
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(454, 23);
+            this.txt_yQty.Location = new System.Drawing.Point(454, 44);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
@@ -1220,16 +1100,16 @@
             columnDefinition8,
             columnDefinition9,
             columnDefinition10});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition6.Height = 100D;
             rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition7.Height = 100D;
             rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition5,
             rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
+            rowDefinition7});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
             this.layoutControlGroup1.TextVisible = false;
             // 
@@ -1309,13 +1189,10 @@
             // 
             this.layoutControlItem22.Control = this.radOut;
             this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0);
-            this.layoutControlItem22.MaxSize = new System.Drawing.Size(230, 28);
-            this.layoutControlItem22.MinSize = new System.Drawing.Size(230, 28);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+            this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
-            this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -1327,7 +1204,7 @@
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+            this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
@@ -1351,7 +1228,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, 258);
+            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,13 +1253,15 @@
             this.gridColumn7,
             this.gridColumn15,
             this.gridColumn19,
-            this.gridColumn12});
+            this.gridColumn12,
+            this.gridColumn27});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1.OptionsFilter.AllowFilterEditor = false;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsView.ShowFooter = true;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
             // gvAbtGuid
@@ -1470,6 +1349,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;
@@ -1521,8 +1402,6 @@
             this.gridColumn5.MinWidth = 50;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 9;
             this.gridColumn5.Width = 159;
             // 
             // gridColumn9
@@ -1533,7 +1412,7 @@
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 10;
+            this.gridColumn9.VisibleIndex = 9;
             this.gridColumn9.Width = 83;
             // 
             // gridColumn7
@@ -1543,8 +1422,6 @@
             this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 11;
             this.gridColumn7.Width = 83;
             // 
             // gridColumn15
@@ -1554,7 +1431,7 @@
             this.gridColumn15.MinWidth = 50;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 12;
+            this.gridColumn15.VisibleIndex = 10;
             this.gridColumn15.Width = 83;
             // 
             // gridColumn19
@@ -1564,7 +1441,7 @@
             this.gridColumn19.MinWidth = 50;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 13;
+            this.gridColumn19.VisibleIndex = 11;
             this.gridColumn19.Width = 91;
             // 
             // gridColumn12
@@ -1574,15 +1451,23 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 14;
+            this.gridColumn12.VisibleIndex = 12;
             this.gridColumn12.Width = 94;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
+            this.gridColumn27.FieldName = "mrtmsl";
+            this.gridColumn27.MinWidth = 25;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Width = 94;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
             this.tabMxPage2.Size = new System.Drawing.Size(1342, 386);
-            this.tabMxPage2.Text = "宸叉墦鏉$爜淇℃伅";
+            this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
             // 
             // gcMx2
             // 
@@ -1590,8 +1475,6 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptChongDa});
             this.gcMx2.Size = new System.Drawing.Size(1342, 386);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1616,8 +1499,7 @@
             this.gridColumn17,
             this.gridColumn22,
             this.gridColumn23,
-            this.gridColumn24,
-            this.gvBtnAlawys});
+            this.gridColumn24});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1761,26 +1643,37 @@
             this.gridColumn24.VisibleIndex = 11;
             this.gridColumn24.Width = 94;
             // 
-            // gvBtnAlawys
+            // layoutControlItem2
             // 
-            this.gvBtnAlawys.Caption = "閲嶆墦";
-            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
-            this.gvBtnAlawys.MinWidth = 25;
-            this.gvBtnAlawys.Name = "gvBtnAlawys";
-            this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 12;
-            this.gvBtnAlawys.Width = 94;
+            this.layoutControlItem2.Control = this.txt_gysName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(325, 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.Text = "渚涘簲鍟嗗悕绉�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // rptChongDa
+            // layoutControlItem3
             // 
-            this.rptChongDa.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.rptChongDa.Name = "rptChongDa";
-            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            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(325, 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(651, 28);
+            this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // Frm_ArrivalBarcode
             // 
@@ -1810,9 +1703,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();
@@ -1825,14 +1716,9 @@
             ((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();
@@ -1879,7 +1765,9 @@
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1900,18 +1788,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;
@@ -1919,16 +1803,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;
@@ -1975,8 +1854,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
-        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
@@ -2007,5 +1884,9 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
         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;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3