From be94e54dc7cd0eb2e66f25d7def9a873c563564c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 10 一月 2025 09:53:30 +0800
Subject: [PATCH] 细节

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 256654e..7dfe72f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -45,36 +45,37 @@
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ebelnLine = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
-            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
             this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
             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.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
+            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
             this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit6 = new DevExpress.XtraEditors.TextEdit();
+            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
             this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -97,26 +98,29 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
             this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
-            this.txtDepotsId = new DevExpress.XtraEditors.TextEdit();
+            this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
             this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
             this.label1 = new System.Windows.Forms.Label();
-            this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
-            this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
+            this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
             this.txt_percentage = new DevExpress.XtraEditors.TextEdit();
@@ -133,21 +137,19 @@
             this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
             this.panelMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
@@ -161,11 +163,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
@@ -193,25 +197,25 @@
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
             this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 50;
+            this.gvMx2itemNo.MinWidth = 100;
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx2itemNo.Visible = true;
             this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 94;
+            this.gvMx2itemNo.Width = 100;
             // 
             // gvMx2itemBarcode
             // 
             this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 ";
+            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
+            this.gvMx2itemBarcode.MinWidth = 300;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
             this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 94;
+            this.gvMx2itemBarcode.Width = 300;
             // 
             // gvMx2guid
             // 
@@ -228,7 +232,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1342, 377);
+            this.tabMxPage2.Size = new System.Drawing.Size(1342, 383);
             this.tabMxPage2.Text = "宸叉墦鏉$爜淇℃伅";
             // 
             // gcMx2
@@ -237,7 +241,9 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1342, 377);
+            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMx2.Size = new System.Drawing.Size(1342, 383);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -253,12 +259,11 @@
             this.gridColumn14,
             this.gvMx2oldqty,
             this.gridColumn17,
-            this.gridColumn15});
+            this.gvBtnAlawys});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
             // gridColumn16
@@ -275,48 +280,59 @@
             // 
             this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 150;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 3;
-            this.gridColumn18.Width = 94;
+            this.gridColumn18.Width = 150;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.MinWidth = 150;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 150;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "鎵撳嵃鏃ユ湡";
-            this.gridColumn17.FieldName = "lotDate";
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.FieldName = "createDate";
+            this.gridColumn17.MinWidth = 180;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 6;
-            this.gridColumn17.Width = 94;
+            this.gridColumn17.Width = 180;
             // 
-            // gridColumn15
+            // gvBtnAlawys
             // 
-            this.gridColumn15.Caption = "鏉$爜鏉ユ簮鏍囪瘑 1-閲囪喘鍏ュ簱";
-            this.gridColumn15.FieldName = "comeFlg";
-            this.gridColumn15.MinWidth = 25;
-            this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 7;
-            this.gridColumn15.Width = 94;
+            this.gvBtnAlawys.Caption = "绉诲嚭";
+            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvBtnAlawys.MinWidth = 25;
+            this.gvBtnAlawys.Name = "gvBtnAlawys";
+            this.gvBtnAlawys.Visible = true;
+            this.gvBtnAlawys.VisibleIndex = 7;
+            this.gvBtnAlawys.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1342, 377);
+            this.tabMxPage1.Size = new System.Drawing.Size(1342, 383);
             this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏";
             // 
             // gcMx1
@@ -325,10 +341,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 98);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemCheckEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1342, 279);
+            this.gcMx1.Size = new System.Drawing.Size(1342, 285);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -338,23 +351,24 @@
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvAbtGuid,
             this.gvMx1guid,
-            this.gvMx1ebeln,
-            this.gvMx1ebelnLine,
             this.gvMx1urgentFlag,
+            this.gvMx1ebeln,
             this.gridColumn4,
             this.gvMx1boardStyle,
             this.gridColumn6,
             this.gridColumn8,
-            this.gvMx1ebelnQty,
             this.gvMx1okRkqty,
-            this.gvMx1states,
+            this.gvMx1ebelnQty,
+            this.gridColumn10,
             this.gridColumn5,
             this.gridColumn9,
             this.gridColumn7,
-            this.gridColumn10});
+            this.gridColumn15,
+            this.gridColumn19});
             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.ShowGroupPanel = false;
@@ -380,6 +394,20 @@
             this.gvMx1guid.Tag = "query_a.guid";
             this.gvMx1guid.Width = 100;
             // 
+            // 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.Name = "gvMx1urgentFlag";
+            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
+            this.gvMx1urgentFlag.Visible = true;
+            this.gvMx1urgentFlag.VisibleIndex = 0;
+            this.gvMx1urgentFlag.Width = 50;
+            // 
             // gvMx1ebeln
             // 
             this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -391,45 +419,18 @@
             this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
-            this.gvMx1ebeln.VisibleIndex = 0;
+            this.gvMx1ebeln.VisibleIndex = 1;
             this.gvMx1ebeln.Width = 120;
-            // 
-            // gvMx1ebelnLine
-            // 
-            this.gvMx1ebelnLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebelnLine.Caption = "ERP琛孖D";
-            this.gvMx1ebelnLine.FieldName = "ebelnK3id";
-            this.gvMx1ebelnLine.MinWidth = 90;
-            this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
-            this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
-            this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
-            this.gvMx1ebelnLine.Visible = true;
-            this.gvMx1ebelnLine.VisibleIndex = 1;
-            this.gvMx1ebelnLine.Width = 100;
-            // 
-            // 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.MinWidth = 60;
-            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
-            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
-            this.gvMx1urgentFlag.Visible = true;
-            this.gvMx1urgentFlag.VisibleIndex = 2;
-            this.gvMx1urgentFlag.Width = 100;
             // 
             // gridColumn4
             // 
-            this.gridColumn4.Caption = "鐗╂枡ID";
-            this.gridColumn4.FieldName = "itemId";
+            this.gridColumn4.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn4.FieldName = "itemNo";
             this.gridColumn4.MinWidth = 100;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 3;
+            this.gridColumn4.VisibleIndex = 2;
             this.gridColumn4.Width = 100;
             // 
             // gvMx1boardStyle
@@ -443,7 +444,7 @@
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
-            this.gvMx1boardStyle.VisibleIndex = 4;
+            this.gvMx1boardStyle.VisibleIndex = 3;
             this.gvMx1boardStyle.Width = 180;
             // 
             // gridColumn6
@@ -453,32 +454,18 @@
             this.gridColumn6.MinWidth = 125;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 5;
+            this.gridColumn6.VisibleIndex = 4;
             this.gridColumn6.Width = 125;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鏈鏀惰揣鏁伴噺";
             this.gridColumn8.FieldName = "quantity";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 50;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 6;
+            this.gridColumn8.VisibleIndex = 5;
             this.gridColumn8.Width = 94;
-            // 
-            // gvMx1ebelnQty
-            // 
-            this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
-            this.gvMx1ebelnQty.FieldName = "prnQty";
-            this.gvMx1ebelnQty.MinWidth = 90;
-            this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
-            this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
-            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
-            this.gvMx1ebelnQty.Visible = true;
-            this.gvMx1ebelnQty.VisibleIndex = 7;
-            this.gvMx1ebelnQty.Width = 100;
             // 
             // gvMx1okRkqty
             // 
@@ -486,86 +473,106 @@
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
             this.gvMx1okRkqty.FieldName = "okRkqty";
-            this.gvMx1okRkqty.MinWidth = 90;
+            this.gvMx1okRkqty.MinWidth = 50;
             this.gvMx1okRkqty.Name = "gvMx1okRkqty";
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
-            this.gvMx1okRkqty.VisibleIndex = 8;
+            this.gvMx1okRkqty.VisibleIndex = 6;
             this.gvMx1okRkqty.Width = 100;
             // 
-            // gvMx1states
+            // gvMx1ebelnQty
             // 
-            this.gvMx1states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1states.AppearanceCell.Options.UseFont = true;
-            this.gvMx1states.Caption = "鎵撳嵃鏉$爜寮犳暟";
-            this.gvMx1states.FieldName = "icount";
-            this.gvMx1states.MinWidth = 90;
-            this.gvMx1states.Name = "gvMx1states";
-            this.gvMx1states.OptionsColumn.ReadOnly = true;
-            this.gvMx1states.Tag = "query_a.states";
-            this.gvMx1states.Visible = true;
-            this.gvMx1states.VisibleIndex = 9;
-            this.gvMx1states.Width = 100;
+            this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
+            this.gvMx1ebelnQty.FieldName = "yQty";
+            this.gvMx1ebelnQty.MinWidth = 50;
+            this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
+            this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
+            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
+            this.gvMx1ebelnQty.Visible = true;
+            this.gvMx1ebelnQty.VisibleIndex = 7;
+            this.gvMx1ebelnQty.Width = 100;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
+            this.gridColumn10.FieldName = "kQty";
+            this.gridColumn10.MinWidth = 50;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 8;
+            this.gridColumn10.Width = 94;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍗曚綅";
             this.gridColumn5.FieldName = "wnDw";
-            this.gridColumn5.MinWidth = 60;
+            this.gridColumn5.MinWidth = 50;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 10;
+            this.gridColumn5.VisibleIndex = 9;
             this.gridColumn5.Width = 180;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "閲囪喘鍗曚綅";
             this.gridColumn9.FieldName = "cgUnit";
-            this.gridColumn9.MinWidth = 60;
+            this.gridColumn9.MinWidth = 50;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 11;
+            this.gridColumn9.VisibleIndex = 10;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
             this.gridColumn7.FieldName = "kcUnit";
-            this.gridColumn7.MinWidth = 60;
+            this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 12;
+            this.gridColumn7.VisibleIndex = 11;
             this.gridColumn7.Width = 94;
             // 
-            // repositoryItemButtonEdit1
+            // gridColumn15
             // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.gridColumn15.Caption = "妫�楠岀姸鎬�";
+            this.gridColumn15.FieldName = "checkStates";
+            this.gridColumn15.MinWidth = 50;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 12;
+            this.gridColumn15.Width = 94;
             // 
-            // repositoryItemCheckEdit1
+            // gridColumn19
             // 
-            this.repositoryItemCheckEdit1.AutoHeight = false;
-            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+            this.gridColumn19.Caption = "妫�楠岀粨鏋�";
+            this.gridColumn19.FieldName = "checkRes";
+            this.gridColumn19.MinWidth = 50;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 13;
+            this.gridColumn19.Width = 94;
             // 
             // panelMx1
             // 
-            this.panelMx1.Controls.Add(this.lbMxGuid);
             this.panelMx1.Controls.Add(this.txt_iCount_1);
-            this.panelMx1.Controls.Add(this.labelControl14);
             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.kyPrtQty);
+            this.panelMx1.Controls.Add(this.txtKdy);
             this.panelMx1.Controls.Add(this.labelControl13);
-            this.panelMx1.Controls.Add(this.textEdit6);
+            this.panelMx1.Controls.Add(this.txtYdy);
             this.panelMx1.Controls.Add(this.labelControl11);
             this.panelMx1.Controls.Add(this.txtQuantity);
             this.panelMx1.Controls.Add(this.labelControl10);
@@ -581,57 +588,77 @@
             this.panelMx1.Size = new System.Drawing.Size(1342, 98);
             this.panelMx1.TabIndex = 0;
             // 
+            // txt_iCount_1
+            // 
+            this.txt_iCount_1.Location = new System.Drawing.Point(656, 4);
+            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.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+            this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
+            this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
+            this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
+            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.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.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+            this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
+            this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
+            this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
+            this.txt_psnQty_1.TabIndex = 263;
+            this.txt_psnQty_1.Tag = "ReadOnly";
+            this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
+            // 
+            // ucBtnPrint1
+            // 
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(541, 59);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
+            this.ucBtnPrint1.TabIndex = 232;
+            // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(552, 75);
+            this.lbMxGuid.Location = new System.Drawing.Point(845, 7);
             this.lbMxGuid.Name = "lbMxGuid";
             this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
             this.lbMxGuid.TabIndex = 229;
             this.lbMxGuid.Text = "lbMxGuid";
-            // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
-            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.Size = new System.Drawing.Size(96, 28);
-            this.txt_iCount_1.TabIndex = 228;
+            this.lbMxGuid.Visible = false;
             // 
             // labelControl14
             // 
-            this.labelControl14.Location = new System.Drawing.Point(543, 39);
+            this.labelControl14.Location = new System.Drawing.Point(545, 9);
             this.labelControl14.Name = "labelControl14";
             this.labelControl14.Size = new System.Drawing.Size(105, 18);
             this.labelControl14.TabIndex = 227;
             this.labelControl14.Text = "鎵撳嵃鏉$爜寮犳暟锛�";
             // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
-            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.Size = new System.Drawing.Size(96, 28);
-            this.txt_psnQty_1.TabIndex = 226;
-            // 
             // labelControl12
             // 
-            this.labelControl12.Location = new System.Drawing.Point(543, 9);
+            this.labelControl12.Location = new System.Drawing.Point(545, 39);
             this.labelControl12.Name = "labelControl12";
             this.labelControl12.Size = new System.Drawing.Size(105, 18);
             this.labelControl12.TabIndex = 225;
             this.labelControl12.Text = "姣忓紶鏉$爜鏁伴噺锛�";
             // 
-            // kyPrtQty
+            // txtKdy
             // 
-            this.kyPrtQty.Location = new System.Drawing.Point(430, 65);
-            this.kyPrtQty.Name = "kyPrtQty";
-            this.kyPrtQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.kyPrtQty.Properties.Appearance.Options.UseFont = true;
-            this.kyPrtQty.Properties.ReadOnly = true;
-            this.kyPrtQty.Size = new System.Drawing.Size(96, 28);
-            this.kyPrtQty.TabIndex = 224;
+            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.Options.UseFont = true;
+            this.txtKdy.Properties.ReadOnly = true;
+            this.txtKdy.Size = new System.Drawing.Size(96, 28);
+            this.txtKdy.TabIndex = 224;
             // 
             // labelControl13
             // 
@@ -641,15 +668,15 @@
             this.labelControl13.TabIndex = 223;
             this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
             // 
-            // textEdit6
+            // txtYdy
             // 
-            this.textEdit6.Location = new System.Drawing.Point(430, 34);
-            this.textEdit6.Name = "textEdit6";
-            this.textEdit6.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit6.Properties.Appearance.Options.UseFont = true;
-            this.textEdit6.Properties.ReadOnly = true;
-            this.textEdit6.Size = new System.Drawing.Size(96, 28);
-            this.textEdit6.TabIndex = 222;
+            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;
             // 
             // labelControl11
             // 
@@ -679,7 +706,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(77, 65);
+            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
@@ -691,13 +718,13 @@
             // 
             this.labelControl9.Location = new System.Drawing.Point(11, 70);
             this.labelControl9.Name = "labelControl9";
-            this.labelControl9.Size = new System.Drawing.Size(60, 18);
+            this.labelControl9.Size = new System.Drawing.Size(75, 18);
             this.labelControl9.TabIndex = 217;
-            this.labelControl9.Text = "鐗╂枡瑙勬牸";
+            this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(77, 34);
+            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
@@ -709,13 +736,13 @@
             // 
             this.labelControl8.Location = new System.Drawing.Point(11, 39);
             this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(60, 18);
+            this.labelControl8.Size = new System.Drawing.Size(75, 18);
             this.labelControl8.TabIndex = 215;
-            this.labelControl8.Text = "鐗╂枡鍚嶇О";
+            this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(77, 4);
+            this.txtWlid.Location = new System.Drawing.Point(90, 4);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
@@ -725,11 +752,11 @@
             // 
             // labelControl7
             // 
-            this.labelControl7.Location = new System.Drawing.Point(25, 9);
+            this.labelControl7.Location = new System.Drawing.Point(11, 9);
             this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(46, 18);
+            this.labelControl7.Size = new System.Drawing.Size(75, 18);
             this.labelControl7.TabIndex = 213;
-            this.labelControl7.Text = "鐗╂枡ID";
+            this.labelControl7.Text = "鐗╂枡缂栧彿锛�";
             // 
             // gv_urgentFlag
             // 
@@ -737,13 +764,14 @@
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gv_urgentFlag.FieldName = "urgentFlag";
+            this.gv_urgentFlag.MaxWidth = 50;
             this.gv_urgentFlag.MinWidth = 50;
             this.gv_urgentFlag.Name = "gv_urgentFlag";
             this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
             this.gv_urgentFlag.Tag = "query_a.urgent_flag";
             this.gv_urgentFlag.Visible = true;
-            this.gv_urgentFlag.VisibleIndex = 0;
-            this.gv_urgentFlag.Width = 94;
+            this.gv_urgentFlag.VisibleIndex = 1;
+            this.gv_urgentFlag.Width = 50;
             // 
             // gv_fstatus
             // 
@@ -751,13 +779,14 @@
             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.Visible = true;
-            this.gv_fstatus.VisibleIndex = 1;
-            this.gv_fstatus.Width = 94;
+            this.gv_fstatus.VisibleIndex = 2;
+            this.gv_fstatus.Width = 50;
             // 
             // gv_suppNo
             // 
@@ -770,7 +799,7 @@
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 8;
+            this.gv_suppNo.VisibleIndex = 9;
             this.gv_suppNo.Width = 94;
             // 
             // gv_depotsCode
@@ -784,7 +813,7 @@
             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.VisibleIndex = 11;
             this.gv_depotsCode.Width = 94;
             // 
             // gv_insDate
@@ -793,13 +822,13 @@
             this.gv_insDate.AppearanceCell.Options.UseFont = true;
             this.gv_insDate.Caption = "鏉ユ枡鏃ユ湡";
             this.gv_insDate.FieldName = "insDate";
-            this.gv_insDate.MinWidth = 50;
+            this.gv_insDate.MinWidth = 180;
             this.gv_insDate.Name = "gv_insDate";
             this.gv_insDate.OptionsColumn.AllowEdit = false;
             this.gv_insDate.Tag = "query_a.ins_date";
             this.gv_insDate.Visible = true;
-            this.gv_insDate.VisibleIndex = 6;
-            this.gv_insDate.Width = 94;
+            this.gv_insDate.VisibleIndex = 7;
+            this.gv_insDate.Width = 180;
             // 
             // gv_checkDate
             // 
@@ -807,13 +836,13 @@
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "鎻愪氦鏃ユ湡";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 50;
+            this.gv_checkDate.MinWidth = 180;
             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 = 7;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.VisibleIndex = 8;
+            this.gv_checkDate.Width = 180;
             // 
             // gv_remark
             // 
@@ -826,7 +855,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 = 15;
             this.gv_remark.Width = 94;
             // 
             // gv_createBy
@@ -840,7 +869,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 5;
+            this.gv_createBy.VisibleIndex = 6;
             this.gv_createBy.Width = 94;
             // 
             // gv_status
@@ -848,14 +877,15 @@
             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 = "status";
+            this.gv_status.FieldName = "statusChk";
+            this.gv_status.MaxWidth = 50;
             this.gv_status.MinWidth = 50;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.status";
             this.gv_status.Visible = true;
-            this.gv_status.VisibleIndex = 2;
-            this.gv_status.Width = 94;
+            this.gv_status.VisibleIndex = 3;
+            this.gv_status.Width = 50;
             // 
             // gv_billNo
             // 
@@ -863,17 +893,18 @@
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 50;
+            this.gv_billNo.MinWidth = 120;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 3;
-            this.gv_billNo.Width = 94;
+            this.gv_billNo.VisibleIndex = 4;
+            this.gv_billNo.Width = 120;
             // 
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -899,9 +930,15 @@
             // 
             // gridView1
             // 
+            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;
+            this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn13,
             this.gv_urgentFlag,
             this.gv_fstatus,
             this.gv_status,
@@ -914,6 +951,8 @@
             this.gridColumn2,
             this.gv_depotsCode,
             this.gridColumn3,
+            this.gridColumn12,
+            this.gridColumn11,
             this.gv_remark});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
@@ -922,27 +961,39 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "鏀舵枡缁勭粐";
+            this.gridColumn13.FieldName = "receivingOrg";
+            this.gridColumn13.MinWidth = 250;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Tag = "org.fnamber";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 0;
+            this.gridColumn13.Width = 250;
+            // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鏉$爜鎵撳嵃姣旂巼";
-            this.gridColumn1.FieldName = "percentage";
-            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.FieldName = "barRatio";
+            this.gridColumn1.MaxWidth = 80;
+            this.gridColumn1.MinWidth = 80;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 4;
-            this.gridColumn1.Width = 94;
+            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.Width = 80;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
             this.gridColumn2.FieldName = "suppName";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 200;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 9;
-            this.gridColumn2.Width = 94;
+            this.gridColumn2.VisibleIndex = 10;
+            this.gridColumn2.Width = 200;
             // 
             // gridColumn3
             // 
@@ -952,8 +1003,26 @@
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 11;
+            this.gridColumn3.VisibleIndex = 12;
             this.gridColumn3.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 13;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "妫�楠屾椂闂�";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 14;
+            this.gridColumn11.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -992,17 +1061,16 @@
             this.xtraTabPage2.Controls.Add(this.tabMx);
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.PageEnabled = false;
             this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 161);
+            this.tabMx.Location = new System.Drawing.Point(0, 155);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1344, 409);
+            this.tabMx.Size = new System.Drawing.Size(1344, 415);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1011,17 +1079,17 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_dptName);
+            this.panel1.Controls.Add(this.txt_gysNo);
             this.panel1.Controls.Add(this.txt_fstatus);
             this.panel1.Controls.Add(this.txt_urgentFlag);
             this.panel1.Controls.Add(this.labelControl5);
             this.panel1.Controls.Add(this.txt_paperBillNo);
-            this.panel1.Controls.Add(this.txtDepotsId);
+            this.panel1.Controls.Add(this.txt_depotsCode);
             this.panel1.Controls.Add(this.labelControl4);
             this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.txtSupplierId);
-            this.panel1.Controls.Add(this.txt_depotsId);
+            this.panel1.Controls.Add(this.txt_gysName);
             this.panel1.Controls.Add(this.labelControl1);
-            this.panel1.Controls.Add(this.txt_suppId);
             this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.labelControl3);
             this.panel1.Controls.Add(this.txt_percentage);
@@ -1042,8 +1110,26 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1344, 161);
+            this.panel1.Size = new System.Drawing.Size(1344, 155);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_dptName
+            // 
+            this.txt_dptName.Location = new System.Drawing.Point(413, 48);
+            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(215, 28);
+            this.txt_dptName.TabIndex = 468;
+            // 
+            // txt_gysNo
+            // 
+            this.txt_gysNo.Location = new System.Drawing.Point(111, 83);
+            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(215, 28);
+            this.txt_gysNo.TabIndex = 467;
             // 
             // txt_fstatus
             // 
@@ -1055,7 +1141,7 @@
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(993, 53);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(993, 50);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "";
             this.txt_urgentFlag.Size = new System.Drawing.Size(94, 24);
@@ -1065,7 +1151,7 @@
             // 
             this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl5.Appearance.Options.UseFont = true;
-            this.labelControl5.Location = new System.Drawing.Point(335, 19);
+            this.labelControl5.Location = new System.Drawing.Point(337, 19);
             this.labelControl5.Name = "labelControl5";
             this.labelControl5.Size = new System.Drawing.Size(68, 21);
             this.labelControl5.TabIndex = 464;
@@ -1073,85 +1159,65 @@
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(415, 15);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(413, 15);
             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(215, 28);
             this.txt_paperBillNo.TabIndex = 463;
             // 
-            // txtDepotsId
+            // txt_depotsCode
             // 
-            this.txtDepotsId.Enabled = false;
-            this.txtDepotsId.Location = new System.Drawing.Point(413, 90);
-            this.txtDepotsId.Name = "txtDepotsId";
-            this.txtDepotsId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtDepotsId.Properties.Appearance.Options.UseFont = true;
-            this.txtDepotsId.Size = new System.Drawing.Size(215, 28);
-            this.txtDepotsId.TabIndex = 462;
+            this.txt_depotsCode.Location = new System.Drawing.Point(413, 83);
+            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(215, 28);
+            this.txt_depotsCode.TabIndex = 462;
             // 
             // labelControl4
             // 
             this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(351, 94);
+            this.labelControl4.Location = new System.Drawing.Point(337, 87);
             this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(52, 21);
+            this.labelControl4.Size = new System.Drawing.Size(68, 21);
             this.labelControl4.TabIndex = 461;
-            this.labelControl4.Text = "浠撳簱ID";
+            this.labelControl4.Text = "浠撳簱缂栧彿";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(22, 94);
+            this.label1.Location = new System.Drawing.Point(8, 87);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(79, 21);
+            this.label1.Size = new System.Drawing.Size(95, 21);
             this.label1.TabIndex = 460;
-            this.label1.Text = "渚涘簲鍟咺D";
+            this.label1.Text = "渚涘簲鍟嗙紪鍙�";
             // 
-            // txtSupplierId
+            // txt_gysName
             // 
-            this.txtSupplierId.Enabled = false;
-            this.txtSupplierId.Location = new System.Drawing.Point(111, 90);
-            this.txtSupplierId.Name = "txtSupplierId";
-            this.txtSupplierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtSupplierId.Properties.Appearance.Options.UseFont = true;
-            this.txtSupplierId.Size = new System.Drawing.Size(215, 28);
-            this.txtSupplierId.TabIndex = 459;
-            // 
-            // txt_depotsId
-            // 
-            this.txt_depotsId.IsReadly = true;
-            this.txt_depotsId.Location = new System.Drawing.Point(413, 51);
-            this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_depotsId.Name = "txt_depotsId";
-            this.txt_depotsId.Size = new System.Drawing.Size(215, 28);
-            this.txt_depotsId.TabIndex = 458;
+            this.txt_gysName.Location = new System.Drawing.Point(111, 48);
+            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(215, 28);
+            this.txt_gysName.TabIndex = 459;
             // 
             // labelControl1
             // 
             this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(335, 55);
+            this.labelControl1.Location = new System.Drawing.Point(337, 52);
             this.labelControl1.Name = "labelControl1";
             this.labelControl1.Size = new System.Drawing.Size(68, 21);
             this.labelControl1.TabIndex = 457;
             this.labelControl1.Text = "浠撳簱鍚嶇О";
             // 
-            // txt_suppId
-            // 
-            this.txt_suppId.IsReadly = true;
-            this.txt_suppId.Location = new System.Drawing.Point(111, 51);
-            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(215, 28);
-            this.txt_suppId.TabIndex = 456;
-            // 
             // labelControl2
             // 
             this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(16, 55);
+            this.labelControl2.Location = new System.Drawing.Point(16, 52);
             this.labelControl2.Name = "labelControl2";
             this.labelControl2.Size = new System.Drawing.Size(85, 21);
             this.labelControl2.TabIndex = 455;
@@ -1161,7 +1227,7 @@
             // 
             this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(884, 94);
+            this.labelControl3.Location = new System.Drawing.Point(884, 87);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(102, 21);
             this.labelControl3.TabIndex = 341;
@@ -1169,7 +1235,7 @@
             // 
             // txt_percentage
             // 
-            this.txt_percentage.Location = new System.Drawing.Point(993, 90);
+            this.txt_percentage.Location = new System.Drawing.Point(993, 83);
             this.txt_percentage.Name = "txt_percentage";
             this.txt_percentage.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_percentage.Properties.Appearance.Options.UseFont = true;
@@ -1188,35 +1254,35 @@
             // 
             this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_urgentFlag.Appearance.Options.UseFont = true;
-            this.lb_urgentFlag.Location = new System.Drawing.Point(913, 55);
+            this.lb_urgentFlag.Location = new System.Drawing.Point(918, 52);
             this.lb_urgentFlag.Name = "lb_urgentFlag";
-            this.lb_urgentFlag.Size = new System.Drawing.Size(73, 21);
+            this.lb_urgentFlag.Size = new System.Drawing.Size(68, 21);
             this.lb_urgentFlag.TabIndex = 336;
-            this.lb_urgentFlag.Text = "鎬ユ枡鏍囪瘑 ";
+            this.lb_urgentFlag.Text = "鎬ユ枡鏍囪瘑";
             // 
             // lb_fstatus
             // 
             this.lb_fstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fstatus.Appearance.Options.UseFont = true;
-            this.lb_fstatus.Location = new System.Drawing.Point(913, 19);
+            this.lb_fstatus.Location = new System.Drawing.Point(918, 19);
             this.lb_fstatus.Name = "lb_fstatus";
-            this.lb_fstatus.Size = new System.Drawing.Size(73, 21);
+            this.lb_fstatus.Size = new System.Drawing.Size(68, 21);
             this.lb_fstatus.TabIndex = 291;
-            this.lb_fstatus.Text = "鎻愪氦鐘舵�� ";
+            this.lb_fstatus.Text = "鎻愪氦鐘舵��";
             // 
             // lb_insDate
             // 
             this.lb_insDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_insDate.Appearance.Options.UseFont = true;
-            this.lb_insDate.Location = new System.Drawing.Point(639, 94);
+            this.lb_insDate.Location = new System.Drawing.Point(644, 87);
             this.lb_insDate.Name = "lb_insDate";
-            this.lb_insDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_insDate.Size = new System.Drawing.Size(68, 21);
             this.lb_insDate.TabIndex = 258;
-            this.lb_insDate.Text = "鍏ュ簱鏃ユ湡 ";
+            this.lb_insDate.Text = "鍏ュ簱鏃ユ湡";
             // 
             // txt_insDate
             // 
-            this.txt_insDate.Location = new System.Drawing.Point(724, 90);
+            this.txt_insDate.Location = new System.Drawing.Point(724, 83);
             this.txt_insDate.Name = "txt_insDate";
             this.txt_insDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_insDate.Properties.Appearance.Options.UseFont = true;
@@ -1227,15 +1293,15 @@
             // 
             this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_checkDate.Appearance.Options.UseFont = true;
-            this.lb_checkDate.Location = new System.Drawing.Point(639, 55);
+            this.lb_checkDate.Location = new System.Drawing.Point(644, 52);
             this.lb_checkDate.Name = "lb_checkDate";
-            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
             this.lb_checkDate.TabIndex = 252;
-            this.lb_checkDate.Text = "鎻愪氦鏃ユ湡 ";
+            this.lb_checkDate.Text = "鎻愪氦鏃ユ湡";
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(724, 51);
+            this.txt_checkDate.Location = new System.Drawing.Point(724, 48);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -1246,7 +1312,7 @@
             // 
             this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_remark.Appearance.Options.UseFont = true;
-            this.lb_remark.Location = new System.Drawing.Point(62, 128);
+            this.lb_remark.Location = new System.Drawing.Point(62, 120);
             this.lb_remark.Name = "lb_remark";
             this.lb_remark.Size = new System.Drawing.Size(39, 21);
             this.lb_remark.TabIndex = 235;
@@ -1254,7 +1320,7 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(111, 124);
+            this.txt_remark.Location = new System.Drawing.Point(111, 116);
             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;
@@ -1284,11 +1350,11 @@
             // 
             this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(28, 19);
+            this.lb_billNo.Location = new System.Drawing.Point(33, 19);
             this.lb_billNo.Name = "lb_billNo";
-            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
+            this.lb_billNo.Size = new System.Drawing.Size(68, 21);
             this.lb_billNo.TabIndex = 211;
-            this.lb_billNo.Text = "鍒拌揣鍗曞彿 ";
+            this.lb_billNo.Text = "鍒拌揣鍗曞彿";
             // 
             // txt_billNo
             // 
@@ -1299,16 +1365,6 @@
             this.txt_billNo.Size = new System.Drawing.Size(215, 28);
             this.txt_billNo.TabIndex = 211;
             // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
-            this.gridColumn10.FieldName = "kyPrtQty";
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 13;
-            this.gridColumn10.Width = 94;
-            // 
             // Frm_ArrivalBarcode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1317,21 +1373,21 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_ArrivalBarcode";
+            this.Text = "鍒拌揣鏉$爜鎵撳嵃";
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
             this.panelMx1.ResumeLayout(false);
             this.panelMx1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
@@ -1346,11 +1402,13 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
@@ -1410,14 +1468,11 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
-        private DevExpress.XtraEditors.TextEdit txtDepotsId;
+        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
         private DevExpress.XtraEditors.LabelControl labelControl4;
         private System.Windows.Forms.Label label1;
-        private DevExpress.XtraEditors.TextEdit txtSupplierId;
-        private UserControl.UcLookCk txt_depotsId;
+        private DevExpress.XtraEditors.TextEdit txt_gysName;
         private DevExpress.XtraEditors.LabelControl labelControl1;
-        private UserControl.UcLookSupplier txt_suppId;
         private DevExpress.XtraEditors.LabelControl labelControl2;
         private DevExpress.XtraEditors.LabelControl labelControl5;
         private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
@@ -1428,16 +1483,12 @@
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
@@ -1445,21 +1496,31 @@
         private DevExpress.XtraEditors.LabelControl labelControl8;
         private DevExpress.XtraEditors.TextEdit txtWlid;
         private DevExpress.XtraEditors.LabelControl labelControl7;
-        private DevExpress.XtraEditors.TextEdit textEdit6;
+        private DevExpress.XtraEditors.TextEdit txtYdy;
         private DevExpress.XtraEditors.LabelControl labelControl11;
         private DevExpress.XtraEditors.TextEdit txtQuantity;
         private DevExpress.XtraEditors.LabelControl labelControl10;
         private DevExpress.XtraEditors.TextEdit txtWlgg;
         private DevExpress.XtraEditors.LabelControl labelControl9;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
         private DevExpress.XtraEditors.LabelControl labelControl14;
-        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
         private DevExpress.XtraEditors.LabelControl labelControl12;
-        private DevExpress.XtraEditors.TextEdit kyPrtQty;
+        private DevExpress.XtraEditors.TextEdit txtKdy;
         private DevExpress.XtraEditors.LabelControl labelControl13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraEditors.LabelControl lbMxGuid;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private UserControl.UcBtnPrint ucBtnPrint1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraEditors.TextEdit txt_gysNo;
+        private DevExpress.XtraEditors.TextEdit txt_dptName;
+        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3