From b084bd77d01a94c8f0a2d20c86a1f45ba7c8a23c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 19 四月 2025 14:08:05 +0800
Subject: [PATCH] 页面跳转

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 44ec6c9..13e3062 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,19 +29,20 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.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();
@@ -50,17 +51,20 @@
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -114,16 +118,18 @@
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
+            this.radOut = new DevExpress.XtraEditors.RadioGroup();
             this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
             this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
             this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
             this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
-            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
             this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
-            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
             this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -151,9 +157,7 @@
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -208,10 +212,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
             this.panelMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
@@ -272,15 +277,17 @@
             // 
             // split1.Panel2
             // 
-            this.split1.Panel2.Text = "Panel2";
+           this.split1.Panel2.Text = "Panel2";
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1344, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
+
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
@@ -293,7 +300,6 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
             this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
@@ -335,7 +341,6 @@
             // 
             // gv_urgentFlag
             // 
-            this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gv_urgentFlag.FieldName = "urgentFlag";
@@ -348,22 +353,18 @@
             this.gv_urgentFlag.VisibleIndex = 1;
             this.gv_urgentFlag.Width = 50;
             // 
-            // gv_fstatus
+            // gridColumn25
             // 
-            this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
-            this.gv_fstatus.FieldName = "fstatus";
-            this.gv_fstatus.MaxWidth = 50;
-            this.gv_fstatus.MinWidth = 50;
-            this.gv_fstatus.Name = "gv_fstatus";
-            this.gv_fstatus.OptionsColumn.AllowEdit = false;
-            this.gv_fstatus.Tag = "query_a.fstatus";
-            this.gv_fstatus.Width = 50;
+            this.gridColumn25.Caption = "濮斿鏍囪瘑";
+            this.gridColumn25.FieldName = "fType";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 2;
+            this.gridColumn25.Width = 94;
             // 
             // gv_status
             // 
-            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "鍏ュ簱";
             this.gv_status.FieldName = "statusChk";
@@ -378,7 +379,6 @@
             // 
             // gv_billNo
             // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
@@ -404,7 +404,6 @@
             // 
             // gv_createBy
             // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
             this.gv_createBy.FieldName = "createBy";
@@ -416,23 +415,18 @@
             this.gv_createBy.VisibleIndex = 6;
             this.gv_createBy.Width = 94;
             // 
-            // gv_checkDate
+            // gridColumn26
             // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
-            this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
-            this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 50;
-            this.gv_checkDate.Name = "gv_checkDate";
-            this.gv_checkDate.OptionsColumn.AllowEdit = false;
-            this.gv_checkDate.Tag = "query_a.check_date";
-            this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 15;
-            this.gv_checkDate.Width = 180;
+            this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
+            this.gridColumn26.FieldName = "createDate";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 7;
+            this.gridColumn26.Width = 94;
             // 
             // gv_suppNo
             // 
-            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
             this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
             this.gv_suppNo.FieldName = "suppNo";
@@ -441,7 +435,7 @@
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 9;
+            this.gv_suppNo.VisibleIndex = 8;
             this.gv_suppNo.Width = 94;
             // 
             // gridColumn2
@@ -452,12 +446,11 @@
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 10;
+            this.gridColumn2.VisibleIndex = 9;
             this.gridColumn2.Width = 200;
             // 
             // gv_depotsCode
             // 
-            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
             this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜";
             this.gv_depotsCode.FieldName = "depotsCode";
@@ -466,7 +459,7 @@
             this.gv_depotsCode.OptionsColumn.AllowEdit = false;
             this.gv_depotsCode.Tag = "query_a.depots_code";
             this.gv_depotsCode.Visible = true;
-            this.gv_depotsCode.VisibleIndex = 11;
+            this.gv_depotsCode.VisibleIndex = 10;
             this.gv_depotsCode.Width = 94;
             // 
             // gridColumn3
@@ -477,12 +470,11 @@
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 12;
+            this.gridColumn3.VisibleIndex = 11;
             this.gridColumn3.Width = 94;
             // 
             // gv_remark
             // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞";
             this.gv_remark.FieldName = "remark";
@@ -491,8 +483,43 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 13;
+            this.gv_remark.VisibleIndex = 12;
             this.gv_remark.Width = 94;
+            // 
+            // gv_fstatus
+            // 
+            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
+            this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_fstatus.FieldName = "fstatus";
+            this.gv_fstatus.MaxWidth = 50;
+            this.gv_fstatus.MinWidth = 50;
+            this.gv_fstatus.Name = "gv_fstatus";
+            this.gv_fstatus.OptionsColumn.AllowEdit = false;
+            this.gv_fstatus.Tag = "query_a.fstatus";
+            this.gv_fstatus.Width = 50;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "瀹℃牳浜�";
+            this.gridColumn11.FieldName = "checkUser";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 13;
+            this.gridColumn11.Width = 94;
+            // 
+            // gv_checkDate
+            // 
+            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+            this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
+            this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.MinWidth = 50;
+            this.gv_checkDate.Name = "gv_checkDate";
+            this.gv_checkDate.OptionsColumn.AllowEdit = false;
+            this.gv_checkDate.Tag = "query_a.check_date";
+            this.gv_checkDate.Visible = true;
+            this.gv_checkDate.VisibleIndex = 14;
+            this.gv_checkDate.Width = 180;
             // 
             // pageBar1
             // 
@@ -518,7 +545,9 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Name = "splitMx1";
+              this.splitMx1.Name = "splitMx1";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+           
             // 
             // splitMx1.Panel1
             // 
@@ -570,41 +599,37 @@
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(445, 44);
+            this.txt_dptName.Location = new System.Drawing.Point(445, 42);
             this.txt_dptName.Name = "txt_dptName";
-            this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(225, 28);
+            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, 76);
+            this.txt_gysNo.Location = new System.Drawing.Point(114, 72);
             this.txt_gysNo.Name = "txt_gysNo";
-            this.txt_gysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysNo.Size = new System.Drawing.Size(225, 28);
+            this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
             // 
             // txt_depotsCode
             // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(445, 76);
+            this.txt_depotsCode.Location = new System.Drawing.Point(445, 72);
             this.txt_depotsCode.Name = "txt_depotsCode";
-            this.txt_depotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotsCode.Size = new System.Drawing.Size(225, 28);
+            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, 108);
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 102);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
-            this.txt_barcodeProgress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
-            this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 28);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
@@ -612,9 +637,8 @@
             // 
             this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
-            this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(225, 28);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
@@ -622,19 +646,17 @@
             // 
             this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
-            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(225, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(225, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(114, 44);
+            this.txt_gysName.Location = new System.Drawing.Point(114, 42);
             this.txt_gysName.Name = "txt_gysName";
-            this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysName.Size = new System.Drawing.Size(225, 28);
+            this.txt_gysName.Size = new System.Drawing.Size(225, 24);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
@@ -642,29 +664,26 @@
             // 
             this.txt_createBy.Location = new System.Drawing.Point(776, 12);
             this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(225, 28);
+            this.txt_createBy.Size = new System.Drawing.Size(225, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 217;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(114, 108);
+            this.txt_remark.Location = new System.Drawing.Point(114, 102);
             this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(556, 28);
+            this.txt_remark.Size = new System.Drawing.Size(556, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(776, 44);
+            this.txt_createDate.Location = new System.Drawing.Point(776, 42);
             this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(225, 28);
+            this.txt_createDate.Size = new System.Drawing.Size(225, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
@@ -679,7 +698,7 @@
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 44);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 42);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
             this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
@@ -688,7 +707,7 @@
             // 
             // txt_insDate
             // 
-            this.txt_insDate.Location = new System.Drawing.Point(776, 76);
+            this.txt_insDate.Location = new System.Drawing.Point(776, 72);
             this.txt_insDate.Name = "txt_insDate";
             this.txt_insDate.Size = new System.Drawing.Size(225, 24);
             this.txt_insDate.StyleController = this.layoutMx1;
@@ -726,33 +745,33 @@
             this.layoutControlItem11});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
-            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition18.Width = 100D;
-            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition19.Width = 100D;
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19,
-            columnDefinition20});
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition19.Height = 100D;
-            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition20.Height = 100D;
-            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition17,
-            rowDefinition18,
-            rowDefinition19,
-            rowDefinition20});
-            this.Root.Size = new System.Drawing.Size(1344, 148);
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1344, 140);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -760,27 +779,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, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(331, 30);
             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, 32);
+            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, 32);
+            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, 64);
+            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, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -790,29 +809,29 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(331, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_dptName;
-            this.layoutControlItem5.Location = new System.Drawing.Point(331, 32);
+            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, 32);
+            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, 64);
+            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, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem6.Text = "浠撳簱缂栧彿";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -822,7 +841,7 @@
             this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(331, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -830,44 +849,44 @@
             // 
             this.layoutControlItem8.Control = this.txt_createDate;
             this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.Location = new System.Drawing.Point(662, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(662, 30);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(331, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(331, 30);
             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, 96);
+            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, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(662, 30);
             this.layoutControlItem12.Text = "澶囨敞";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(662, 96);
+            this.layoutControlItem13.Location = new System.Drawing.Point(662, 90);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(331, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_insDate;
-            this.layoutControlItem9.Location = new System.Drawing.Point(662, 64);
+            this.layoutControlItem9.Location = new System.Drawing.Point(662, 60);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(331, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem9.Text = "鍒拌揣鏃ユ湡";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -877,7 +896,7 @@
             this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(331, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -885,11 +904,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(993, 32);
+            this.layoutControlItem11.Location = new System.Drawing.Point(993, 30);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(331, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(331, 30);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -927,7 +946,6 @@
             // 
             // gvMx1
             // 
-            this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1.Appearance.Row.Options.UseFont = true;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvAbtGuid,
@@ -945,7 +963,8 @@
             this.gridColumn9,
             this.gridColumn7,
             this.gridColumn15,
-            this.gridColumn19});
+            this.gridColumn19,
+            this.gridColumn12});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -965,7 +984,6 @@
             // 
             // gvMx1guid
             // 
-            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
             this.gvMx1guid.FieldName = "guid";
@@ -977,21 +995,18 @@
             // 
             // gvMx1urgentFlag
             // 
-            this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gvMx1urgentFlag.FieldName = "urgentFlag";
-            this.gvMx1urgentFlag.MaxWidth = 50;
-            this.gvMx1urgentFlag.MinWidth = 50;
+            this.gvMx1urgentFlag.MinWidth = 10;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
             this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
             this.gvMx1urgentFlag.Visible = true;
             this.gvMx1urgentFlag.VisibleIndex = 0;
-            this.gvMx1urgentFlag.Width = 50;
+            this.gvMx1urgentFlag.Width = 10;
             // 
             // gvMx1ebeln
             // 
-            this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "ebeln";
@@ -1001,7 +1016,7 @@
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
             this.gvMx1ebeln.VisibleIndex = 1;
-            this.gvMx1ebeln.Width = 120;
+            this.gvMx1ebeln.Width = 105;
             // 
             // gridColumn4
             // 
@@ -1012,11 +1027,10 @@
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 2;
-            this.gridColumn4.Width = 100;
+            this.gridColumn4.Width = 88;
             // 
             // gvMx1boardStyle
             // 
-            this.gvMx1boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
             this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1boardStyle.FieldName = "itemName";
@@ -1026,7 +1040,7 @@
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
             this.gvMx1boardStyle.VisibleIndex = 3;
-            this.gvMx1boardStyle.Width = 180;
+            this.gvMx1boardStyle.Width = 159;
             // 
             // gridColumn6
             // 
@@ -1036,7 +1050,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 125;
+            this.gridColumn6.Width = 109;
             // 
             // gridColumn8
             // 
@@ -1046,11 +1060,10 @@
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 5;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.Width = 83;
             // 
             // gvMx1okRkqty
             // 
-            this.gvMx1okRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
             this.gvMx1okRkqty.FieldName = "okRkqty";
@@ -1060,11 +1073,10 @@
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
             this.gvMx1okRkqty.VisibleIndex = 6;
-            this.gvMx1okRkqty.Width = 100;
+            this.gvMx1okRkqty.Width = 88;
             // 
             // gvMx1ebelnQty
             // 
-            this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
             this.gvMx1ebelnQty.FieldName = "yQty";
@@ -1074,7 +1086,7 @@
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
             this.gvMx1ebelnQty.VisibleIndex = 7;
-            this.gvMx1ebelnQty.Width = 100;
+            this.gvMx1ebelnQty.Width = 88;
             // 
             // gridColumn10
             // 
@@ -1088,7 +1100,7 @@
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 8;
-            this.gridColumn10.Width = 94;
+            this.gridColumn10.Width = 83;
             // 
             // gridColumn5
             // 
@@ -1099,7 +1111,7 @@
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 9;
-            this.gridColumn5.Width = 180;
+            this.gridColumn5.Width = 159;
             // 
             // gridColumn9
             // 
@@ -1110,7 +1122,7 @@
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 10;
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 83;
             // 
             // gridColumn7
             // 
@@ -1121,39 +1133,50 @@
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 11;
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 83;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "妫�楠岀姸鎬�";
-            this.gridColumn15.FieldName = "checkStates";
+            this.gridColumn15.FieldName = "jyzt";
             this.gridColumn15.MinWidth = 50;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 12;
-            this.gridColumn15.Width = 94;
+            this.gridColumn15.Width = 83;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "妫�楠岀粨鏋�";
-            this.gridColumn19.FieldName = "checkRes";
+            this.gridColumn19.FieldName = "jyjg";
             this.gridColumn19.MinWidth = 50;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 13;
-            this.gridColumn19.Width = 94;
+            this.gridColumn19.Width = 91;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鍒ゅ畾缁撴灉";
+            this.gridColumn12.FieldName = "pdjg";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 14;
+            this.gridColumn12.Width = 94;
             // 
             // panelMx1
             // 
+            this.panelMx1.Controls.Add(this.radOut);
             this.panelMx1.Controls.Add(this.txt_iCount_1);
             this.panelMx1.Controls.Add(this.txt_psnQty_1);
             this.panelMx1.Controls.Add(this.ucBtnPrint1);
             this.panelMx1.Controls.Add(this.lbMxGuid);
             this.panelMx1.Controls.Add(this.labelControl14);
             this.panelMx1.Controls.Add(this.labelControl12);
-            this.panelMx1.Controls.Add(this.txtKdy);
+            this.panelMx1.Controls.Add(this.txt_kQty);
             this.panelMx1.Controls.Add(this.labelControl13);
-            this.panelMx1.Controls.Add(this.txtYdy);
+            this.panelMx1.Controls.Add(this.txt_yQty);
             this.panelMx1.Controls.Add(this.labelControl11);
             this.panelMx1.Controls.Add(this.txtQuantity);
             this.panelMx1.Controls.Add(this.labelControl10);
@@ -1169,26 +1192,38 @@
             this.panelMx1.Size = new System.Drawing.Size(1342, 98);
             this.panelMx1.TabIndex = 0;
             // 
+            // radOut
+            // 
+            this.radOut.Location = new System.Drawing.Point(775, 26);
+            this.radOut.Margin = new System.Windows.Forms.Padding(0);
+            this.radOut.Name = "radOut";
+            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+            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(248, 31);
+            this.radOut.TabIndex = 476;
+            // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(656, 4);
+            this.txt_iCount_1.Location = new System.Drawing.Point(656, 67);
             this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             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(94, 28);
+            this.txt_iCount_1.Size = new System.Drawing.Size(94, 24);
             this.txt_iCount_1.TabIndex = 264;
             this.txt_iCount_1.Tag = "ReadOnly";
             this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(656, 34);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(656, 36);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             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(94, 28);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(94, 24);
             this.txt_psnQty_1.TabIndex = 263;
             this.txt_psnQty_1.Tag = "ReadOnly";
             this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
@@ -1196,16 +1231,16 @@
             // ucBtnPrint1
             // 
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(547, 65);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(774, 63);
             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(203, 30);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(203, 32);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(845, 7);
+            this.lbMxGuid.Location = new System.Drawing.Point(1036, 10);
             this.lbMxGuid.Name = "lbMxGuid";
             this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
             this.lbMxGuid.TabIndex = 229;
@@ -1214,7 +1249,7 @@
             // 
             // labelControl14
             // 
-            this.labelControl14.Location = new System.Drawing.Point(545, 9);
+            this.labelControl14.Location = new System.Drawing.Point(545, 70);
             this.labelControl14.Name = "labelControl14";
             this.labelControl14.Size = new System.Drawing.Size(105, 18);
             this.labelControl14.TabIndex = 227;
@@ -1228,35 +1263,33 @@
             this.labelControl12.TabIndex = 225;
             this.labelControl12.Text = "姣忓紶鏉$爜鏁伴噺锛�";
             // 
-            // txtKdy
+            // txt_kQty
             // 
-            this.txtKdy.Location = new System.Drawing.Point(430, 65);
-            this.txtKdy.Name = "txtKdy";
-            this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txtKdy.Properties.Appearance.Options.UseFont = true;
-            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
-            this.txtKdy.Properties.ReadOnly = true;
-            this.txtKdy.Size = new System.Drawing.Size(96, 28);
-            this.txtKdy.TabIndex = 224;
+            this.txt_kQty.Location = new System.Drawing.Point(656, 6);
+            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(96, 24);
+            this.txt_kQty.TabIndex = 224;
             // 
             // labelControl13
             // 
-            this.labelControl13.Location = new System.Drawing.Point(332, 70);
+            this.labelControl13.Location = new System.Drawing.Point(560, 9);
             this.labelControl13.Name = "labelControl13";
             this.labelControl13.Size = new System.Drawing.Size(90, 18);
             this.labelControl13.TabIndex = 223;
             this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
             // 
-            // txtYdy
+            // txt_yQty
             // 
-            this.txtYdy.Location = new System.Drawing.Point(430, 34);
-            this.txtYdy.Name = "txtYdy";
-            this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtYdy.Properties.Appearance.Options.UseFont = true;
-            this.txtYdy.Properties.ReadOnly = true;
-            this.txtYdy.Size = new System.Drawing.Size(96, 28);
-            this.txtYdy.TabIndex = 222;
+            this.txt_yQty.Location = new System.Drawing.Point(430, 36);
+            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(96, 24);
+            this.txt_yQty.TabIndex = 222;
             // 
             // labelControl11
             // 
@@ -1268,12 +1301,11 @@
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
+            this.txtQuantity.Location = new System.Drawing.Point(430, 6);
             this.txtQuantity.Name = "txtQuantity";
-            this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(96, 28);
+            this.txtQuantity.Size = new System.Drawing.Size(96, 24);
             this.txtQuantity.TabIndex = 220;
             // 
             // labelControl10
@@ -1286,12 +1318,11 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
+            this.txtWlgg.Location = new System.Drawing.Point(90, 67);
             this.txtWlgg.Name = "txtWlgg";
-            this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(215, 28);
+            this.txtWlgg.Size = new System.Drawing.Size(436, 24);
             this.txtWlgg.TabIndex = 218;
             // 
             // labelControl9
@@ -1304,12 +1335,11 @@
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
+            this.txtWlmc.Location = new System.Drawing.Point(90, 36);
             this.txtWlmc.Name = "txtWlmc";
-            this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(215, 28);
+            this.txtWlmc.Size = new System.Drawing.Size(215, 24);
             this.txtWlmc.TabIndex = 216;
             // 
             // labelControl8
@@ -1322,12 +1352,11 @@
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(90, 4);
+            this.txtWlid.Location = new System.Drawing.Point(90, 6);
             this.txtWlid.Name = "txtWlid";
-            this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(215, 28);
+            this.txtWlid.Size = new System.Drawing.Size(215, 24);
             this.txtWlid.TabIndex = 214;
             // 
             // labelControl7
@@ -1362,7 +1391,6 @@
             // 
             this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2.Appearance.Row.Options.UseFont = true;
             this.gvMx2.ColumnPanelRowHeight = 50;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -1388,7 +1416,6 @@
             // 
             // gvMx2guid
             // 
-            this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2guid.AppearanceCell.Options.UseFont = true;
             this.gvMx2guid.Caption = "guid ";
             this.gvMx2guid.FieldName = "guid";
@@ -1410,7 +1437,6 @@
             // 
             // gvMx2itemBarcode
             // 
-            this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
@@ -1423,7 +1449,6 @@
             // 
             // gvMx2itemNo
             // 
-            this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
             this.gvMx2itemNo.FieldName = "itemNo";
@@ -1456,7 +1481,6 @@
             // 
             // gvMx2oldqty
             // 
-            this.gvMx2oldqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
             this.gvMx2oldqty.Caption = "鏁伴噺";
             this.gvMx2oldqty.FieldName = "quantity";
@@ -1540,43 +1564,13 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // gridColumn25
-            // 
-            this.gridColumn25.Caption = "濮斿鏍囪瘑";
-            this.gridColumn25.FieldName = "fType";
-            this.gridColumn25.MinWidth = 25;
-            this.gridColumn25.Name = "gridColumn25";
-            this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 2;
-            this.gridColumn25.Width = 94;
-            // 
-            // gridColumn26
-            // 
-            this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
-            this.gridColumn26.FieldName = "createDate";
-            this.gridColumn26.MinWidth = 25;
-            this.gridColumn26.Name = "gridColumn26";
-            this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 7;
-            this.gridColumn26.Width = 94;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "瀹℃牳浜�";
-            this.gridColumn11.FieldName = "checkUser";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 15;
-            this.gridColumn11.Width = 94;
             // 
             // Frm_ArrivalBarcode
             // 
@@ -1642,10 +1636,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
             this.panelMx1.ResumeLayout(false);
             this.panelMx1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
@@ -1731,9 +1726,9 @@
         private DevExpress.XtraEditors.LabelControl lbMxGuid;
         private DevExpress.XtraEditors.LabelControl labelControl14;
         private DevExpress.XtraEditors.LabelControl labelControl12;
-        private DevExpress.XtraEditors.TextEdit txtKdy;
+        private DevExpress.XtraEditors.TextEdit txt_kQty;
         private DevExpress.XtraEditors.LabelControl labelControl13;
-        private DevExpress.XtraEditors.TextEdit txtYdy;
+        private DevExpress.XtraEditors.TextEdit txt_yQty;
         private DevExpress.XtraEditors.LabelControl labelControl11;
         private DevExpress.XtraEditors.TextEdit txtQuantity;
         private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -1770,5 +1765,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraEditors.RadioGroup radOut;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3