From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面

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

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 832d8d1..0ecce60 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,6 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
+            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.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -39,26 +44,52 @@
             this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1parentGuid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.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.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = 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.gvMx1okRkqty = 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.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
+            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.labelControl13 = new DevExpress.XtraEditors.LabelControl();
+            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
+            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
+            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
             this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,54 +100,65 @@
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
             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.gridColumn3 = 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.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_percentage = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+            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.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+            this.label1 = new System.Windows.Forms.Label();
+            this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
             this.lbGuid = new System.Windows.Forms.Label();
             this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
-            this.txt_urgentFlag = new DevExpress.XtraEditors.TextEdit();
             this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fstatus = new DevExpress.XtraEditors.TextEdit();
-            this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_suppNo = new DevExpress.XtraEditors.TextEdit();
-            this.lb_depotsCode = new DevExpress.XtraEditors.LabelControl();
-            this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
             this.lb_insDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_insDate = new DevExpress.XtraEditors.TextEdit();
             this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
             this.lb_remark = new DevExpress.XtraEditors.LabelControl();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
             this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.lb_status = new DevExpress.XtraEditors.LabelControl();
-            this.txt_status = new DevExpress.XtraEditors.TextEdit();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             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.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.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();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -126,19 +168,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
+            ((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_suppNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             this.SuspendLayout();
             // 
@@ -146,8 +187,8 @@
             // 
             this.gvMx2oldqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2oldqty.Caption = "鍘熷鏁伴噺 ";
-            this.gvMx2oldqty.FieldName = "oldqty";
+            this.gvMx2oldqty.Caption = "鏁伴噺";
+            this.gvMx2oldqty.FieldName = "quantity";
             this.gvMx2oldqty.MinWidth = 50;
             this.gvMx2oldqty.Name = "gvMx2oldqty";
             this.gvMx2oldqty.Tag = "query_a.OLDQTY";
@@ -166,20 +207,20 @@
             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.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
             // 
@@ -196,7 +237,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 315);
+            this.tabMxPage2.Size = new System.Drawing.Size(1342, 395);
             this.tabMxPage2.Text = "宸叉墦鏉$爜淇℃伅";
             // 
             // gcMx2
@@ -205,13 +246,18 @@
             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(1124, 315);
+            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMx2.Size = new System.Drawing.Size(1342, 395);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
             // 
             // gvMx2
             // 
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.ColumnPanelRowHeight = 50;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
             this.gridColumn16,
@@ -220,282 +266,574 @@
             this.gridColumn18,
             this.gridColumn14,
             this.gvMx2oldqty,
+            this.gridColumn21,
+            this.gridColumn20,
             this.gridColumn17,
-            this.gridColumn15});
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            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
             // 
             this.gridColumn16.Caption = "鏄惁鍏ュ簱";
-            this.gridColumn16.FieldName = "icount";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.FieldName = "isRk";
+            this.gridColumn16.MaxWidth = 50;
+            this.gridColumn16.MinWidth = 50;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 0;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.Width = 50;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 50;
             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 = 50;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 150;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "鍗曚綅";
+            this.gridColumn21.FieldName = "dwName";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 6;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鎵撶爜浜�";
+            this.gridColumn20.FieldName = "createBy";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 7;
+            this.gridColumn20.Width = 94;
             // 
             // gridColumn17
             // 
-            this.gridColumn17.Caption = "鎵撳嵃鏃ユ湡";
-            this.gridColumn17.FieldName = "lotDate";
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
+            this.gridColumn17.FieldName = "createDate";
+            this.gridColumn17.MinWidth = 10;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 6;
-            this.gridColumn17.Width = 94;
+            this.gridColumn17.VisibleIndex = 8;
+            this.gridColumn17.Width = 180;
             // 
-            // gridColumn15
+            // gridColumn22
             // 
-            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.gridColumn22.Caption = "鍏ュ簱浜�";
+            this.gridColumn22.FieldName = "rkUser";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 9;
+            this.gridColumn22.Width = 94;
             // 
-            // gvMx1urgentFlag
+            // gridColumn23
             // 
-            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 = 50;
-            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
-            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
-            this.gvMx1urgentFlag.Visible = true;
-            this.gvMx1urgentFlag.VisibleIndex = 0;
-            this.gvMx1urgentFlag.Width = 94;
+            this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn23.FieldName = "rkDate";
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 10;
+            this.gridColumn23.Width = 94;
             // 
-            // gvMx1itemNo
+            // gridColumn24
             // 
-            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜 ";
-            this.gvMx1itemNo.FieldName = "itemNo";
-            this.gvMx1itemNo.MinWidth = 50;
-            this.gvMx1itemNo.Name = "gvMx1itemNo";
-            this.gvMx1itemNo.Tag = "query_a.item_no";
-            this.gvMx1itemNo.Visible = true;
-            this.gvMx1itemNo.VisibleIndex = 5;
-            this.gvMx1itemNo.Width = 94;
+            this.gridColumn24.Caption = "鍏ュ簱浣�";
+            this.gridColumn24.FieldName = "rkPositon";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 11;
+            this.gridColumn24.Width = 94;
             // 
-            // gvMx1ebeln
+            // gvBtnAlawys
             // 
-            this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿 ";
-            this.gvMx1ebeln.FieldName = "ebeln";
-            this.gvMx1ebeln.MinWidth = 50;
-            this.gvMx1ebeln.Name = "gvMx1ebeln";
-            this.gvMx1ebeln.Tag = "query_a.ebeln";
-            this.gvMx1ebeln.Visible = true;
-            this.gvMx1ebeln.VisibleIndex = 10;
-            this.gvMx1ebeln.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 = 12;
+            this.gvBtnAlawys.Width = 94;
             // 
-            // gvMx1parentGuid
+            // repositoryItemButtonEdit1
             // 
-            this.gvMx1parentGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1parentGuid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1parentGuid.Caption = "parent_Guid ";
-            this.gvMx1parentGuid.FieldName = "parentGuid";
-            this.gvMx1parentGuid.MinWidth = 50;
-            this.gvMx1parentGuid.Name = "gvMx1parentGuid";
-            this.gvMx1parentGuid.Tag = "query_a.parent_Guid";
-            this.gvMx1parentGuid.Width = 94;
-            // 
-            // 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";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            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, 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);
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 315);
+            this.tabMxPage1.Size = new System.Drawing.Size(1342, 395);
             this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.Location = new System.Drawing.Point(0, 98);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 315);
-            this.gcMx1.TabIndex = 0;
+            this.gcMx1.Size = new System.Drawing.Size(1342, 297);
+            this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
             // 
             // gvMx1
             // 
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvAbtGuid,
             this.gvMx1guid,
-            this.gvMx1parentGuid,
             this.gvMx1urgentFlag,
-            this.gridColumn4,
-            this.gvMx1itemNo,
-            this.gridColumn5,
-            this.gridColumn7,
-            this.gridColumn13,
-            this.gridColumn8,
-            this.gridColumn10,
-            this.gridColumn6,
-            this.gridColumn9,
             this.gvMx1ebeln,
-            this.gridColumn11,
-            this.gridColumn12});
+            this.gridColumn4,
+            this.gvMx1boardStyle,
+            this.gridColumn6,
+            this.gridColumn8,
+            this.gvMx1okRkqty,
+            this.gvMx1ebelnQty,
+            this.gridColumn10,
+            this.gridColumn5,
+            this.gridColumn9,
+            this.gridColumn7,
+            this.gridColumn15,
+            this.gridColumn19});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx1.OptionsFilter.AllowFilterEditor = false;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+            this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvAbtGuid
+            // 
+            this.gvAbtGuid.Caption = "abtGuid涓嶈兘鍒犻櫎";
+            this.gvAbtGuid.FieldName = "aboutGuid";
+            this.gvAbtGuid.MinWidth = 50;
+            this.gvAbtGuid.Name = "gvAbtGuid";
+            this.gvAbtGuid.OptionsColumn.ReadOnly = true;
+            this.gvAbtGuid.Width = 94;
+            // 
+            // 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";
+            this.gvMx1guid.MinWidth = 70;
+            this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.OptionsColumn.ReadOnly = true;
+            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);
+            this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
+            this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
+            this.gvMx1ebeln.FieldName = "ebeln";
+            this.gvMx1ebeln.MinWidth = 50;
+            this.gvMx1ebeln.Name = "gvMx1ebeln";
+            this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
+            this.gvMx1ebeln.Tag = "query_a.ebeln";
+            this.gvMx1ebeln.Visible = true;
+            this.gvMx1ebeln.VisibleIndex = 1;
+            this.gvMx1ebeln.Width = 120;
             // 
             // gridColumn4
             // 
-            this.gridColumn4.Caption = "搴忓彿";
-            this.gridColumn4.FieldName = "workLine";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn4.FieldName = "itemNo";
+            this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 1;
-            this.gridColumn4.Width = 94;
+            this.gridColumn4.VisibleIndex = 2;
+            this.gridColumn4.Width = 100;
             // 
-            // gridColumn5
+            // gvMx1boardStyle
             // 
-            this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn5.FieldName = "itemName";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 2;
-            this.gridColumn5.Width = 94;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn7.FieldName = "itemModel";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 3;
-            this.gridColumn7.Width = 94;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.Caption = "鏈鏀惰揣鏁伴噺";
-            this.gridColumn13.FieldName = "quantity";
-            this.gridColumn13.MinWidth = 25;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 4;
-            this.gridColumn13.Width = 94;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "宸叉墦鍗版�绘暟閲�";
-            this.gridColumn8.FieldName = "prnQty";
-            this.gridColumn8.MinWidth = 25;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 6;
-            this.gridColumn8.Width = 94;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "宸插叆搴撴暟閲�";
-            this.gridColumn10.FieldName = "okRkqty";
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 7;
-            this.gridColumn10.Width = 94;
+            this.gvMx1boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
+            this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx1boardStyle.FieldName = "itemName";
+            this.gvMx1boardStyle.MinWidth = 50;
+            this.gvMx1boardStyle.Name = "gvMx1boardStyle";
+            this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
+            this.gvMx1boardStyle.Tag = "query_a.board_style";
+            this.gvMx1boardStyle.Visible = true;
+            this.gvMx1boardStyle.VisibleIndex = 3;
+            this.gvMx1boardStyle.Width = 180;
             // 
             // gridColumn6
             // 
-            this.gridColumn6.Caption = "鎵撳嵃鏉$爜寮犳暟";
-            this.gridColumn6.FieldName = "icount";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn6.FieldName = "itemModel";
+            this.gridColumn6.MinWidth = 50;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 8;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 125;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鏈鏀惰揣鏁伴噺";
+            this.gridColumn8.FieldName = "quantity";
+            this.gridColumn8.MinWidth = 50;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 5;
+            this.gridColumn8.Width = 94;
+            // 
+            // gvMx1okRkqty
+            // 
+            this.gvMx1okRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
+            this.gvMx1okRkqty.FieldName = "okRkqty";
+            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 = 6;
+            this.gvMx1okRkqty.Width = 100;
+            // 
+            // gvMx1ebelnQty
+            // 
+            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 = 50;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.ReadOnly = true;
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 9;
+            this.gridColumn5.Width = 180;
             // 
             // gridColumn9
             // 
-            this.gridColumn9.Caption = "鐗╂枡鍗曚綅";
-            this.gridColumn9.FieldName = "fname";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Caption = "閲囪喘鍗曚綅";
+            this.gridColumn9.FieldName = "cgUnit";
+            this.gridColumn9.MinWidth = 50;
             this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 9;
+            this.gridColumn9.VisibleIndex = 10;
             this.gridColumn9.Width = 94;
             // 
-            // gridColumn11
+            // gridColumn7
             // 
-            this.gridColumn11.Caption = "搴撳瓨鍗曚綅";
-            this.gridColumn11.FieldName = "kcUnit";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 11;
-            this.gridColumn11.Width = 94;
+            this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn7.FieldName = "kcUnit";
+            this.gridColumn7.MinWidth = 50;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.ReadOnly = true;
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 11;
+            this.gridColumn7.Width = 94;
             // 
-            // gridColumn12
+            // gridColumn15
             // 
-            this.gridColumn12.Caption = "閲囪喘鍗曚綅";
-            this.gridColumn12.FieldName = "cgUnit";
-            this.gridColumn12.MinWidth = 25;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 12;
-            this.gridColumn12.Width = 94;
+            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;
+            // 
+            // gridColumn19
+            // 
+            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.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.labelControl13);
+            this.panelMx1.Controls.Add(this.txtYdy);
+            this.panelMx1.Controls.Add(this.labelControl11);
+            this.panelMx1.Controls.Add(this.txtQuantity);
+            this.panelMx1.Controls.Add(this.labelControl10);
+            this.panelMx1.Controls.Add(this.txtWlgg);
+            this.panelMx1.Controls.Add(this.labelControl9);
+            this.panelMx1.Controls.Add(this.txtWlmc);
+            this.panelMx1.Controls.Add(this.labelControl8);
+            this.panelMx1.Controls.Add(this.txtWlid);
+            this.panelMx1.Controls.Add(this.labelControl7);
+            this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panelMx1.Location = new System.Drawing.Point(0, 0);
+            this.panelMx1.Name = "panelMx1";
+            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.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.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, 61);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = "rpt_daa";
+            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
+            this.ucBtnPrint1.TabIndex = 232;
+            // 
+            // lbMxGuid
+            // 
+            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";
+            this.lbMxGuid.Visible = false;
+            // 
+            // labelControl14
+            // 
+            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 = "鎵撳嵃鏉$爜寮犳暟锛�";
+            // 
+            // labelControl12
+            // 
+            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 = "姣忓紶鏉$爜鏁伴噺锛�";
+            // 
+            // txtKdy
+            // 
+            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;
+            // 
+            // labelControl13
+            // 
+            this.labelControl13.Location = new System.Drawing.Point(332, 70);
+            this.labelControl13.Name = "labelControl13";
+            this.labelControl13.Size = new System.Drawing.Size(90, 18);
+            this.labelControl13.TabIndex = 223;
+            this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
+            // 
+            // txtYdy
+            // 
+            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
+            // 
+            this.labelControl11.Location = new System.Drawing.Point(332, 39);
+            this.labelControl11.Name = "labelControl11";
+            this.labelControl11.Size = new System.Drawing.Size(90, 18);
+            this.labelControl11.TabIndex = 221;
+            this.labelControl11.Text = "宸叉墦鍗版�婚噺锛�";
+            // 
+            // txtQuantity
+            // 
+            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
+            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.TabIndex = 220;
+            // 
+            // labelControl10
+            // 
+            this.labelControl10.Location = new System.Drawing.Point(317, 9);
+            this.labelControl10.Name = "labelControl10";
+            this.labelControl10.Size = new System.Drawing.Size(105, 18);
+            this.labelControl10.TabIndex = 219;
+            this.labelControl10.Text = "鏈鏀惰揣鎬婚噺锛�";
+            // 
+            // txtWlgg
+            // 
+            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;
+            this.txtWlgg.Properties.ReadOnly = true;
+            this.txtWlgg.Size = new System.Drawing.Size(215, 28);
+            this.txtWlgg.TabIndex = 218;
+            // 
+            // labelControl9
+            // 
+            this.labelControl9.Location = new System.Drawing.Point(11, 70);
+            this.labelControl9.Name = "labelControl9";
+            this.labelControl9.Size = new System.Drawing.Size(75, 18);
+            this.labelControl9.TabIndex = 217;
+            this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
+            // 
+            // txtWlmc
+            // 
+            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;
+            this.txtWlmc.Properties.ReadOnly = true;
+            this.txtWlmc.Size = new System.Drawing.Size(215, 28);
+            this.txtWlmc.TabIndex = 216;
+            // 
+            // labelControl8
+            // 
+            this.labelControl8.Location = new System.Drawing.Point(11, 39);
+            this.labelControl8.Name = "labelControl8";
+            this.labelControl8.Size = new System.Drawing.Size(75, 18);
+            this.labelControl8.TabIndex = 215;
+            this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
+            // 
+            // txtWlid
+            // 
+            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;
+            this.txtWlid.Properties.ReadOnly = true;
+            this.txtWlid.Size = new System.Drawing.Size(215, 28);
+            this.txtWlid.TabIndex = 214;
+            // 
+            // labelControl7
+            // 
+            this.labelControl7.Location = new System.Drawing.Point(11, 9);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(75, 18);
+            this.labelControl7.TabIndex = 213;
+            this.labelControl7.Text = "鐗╂枡缂栧彿锛�";
             // 
             // 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.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
             // 
@@ -503,40 +841,41 @@
             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
             // 
             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.Caption = "渚涘簲鍟嗙紪鐮�";
             this.gv_suppNo.FieldName = "suppNo";
             this.gv_suppNo.MinWidth = 50;
             this.gv_suppNo.Name = "gv_suppNo";
             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
             // 
             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.Caption = "鏀惰揣浠撳簱缂栫爜";
             this.gv_depotsCode.FieldName = "depotsCode";
             this.gv_depotsCode.MinWidth = 50;
             this.gv_depotsCode.Name = "gv_depotsCode";
             this.gv_depotsCode.OptionsColumn.AllowEdit = false;
             this.gv_depotsCode.Tag = "query_a.depots_code";
             this.gv_depotsCode.Visible = true;
-            this.gv_depotsCode.VisibleIndex = 10;
+            this.gv_depotsCode.VisibleIndex = 11;
             this.gv_depotsCode.Width = 94;
             // 
             // gv_insDate
@@ -550,35 +889,35 @@
             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
             // 
             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.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 = 7;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.VisibleIndex = 8;
+            this.gv_checkDate.Width = 180;
             // 
             // 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.Caption = "澶囨敞";
             this.gv_remark.FieldName = "remark";
             this.gv_remark.MinWidth = 50;
             this.gv_remark.Name = "gv_remark";
             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
@@ -592,7 +931,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
@@ -600,51 +939,41 @@
             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
             // 
             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.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
             this.gv_billNo.MinWidth = 50;
             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;
-            // 
-            // gv_guid
-            // 
-            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_guid.AppearanceCell.Options.UseFont = true;
-            this.gv_guid.Caption = "涓婚敭 ";
-            this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 50;
-            this.gv_guid.Name = "gv_guid";
-            this.gv_guid.OptionsColumn.AllowEdit = false;
-            this.gv_guid.Tag = "query_a.guid";
-            this.gv_guid.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;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -656,17 +985,22 @@
             this.gcMain.Location = new System.Drawing.Point(0, 0);
             this.gcMain.MainView = this.gridView1;
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1126, 531);
+            this.gcMain.Size = new System.Drawing.Size(1344, 531);
             this.gcMain.TabIndex = 1;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
             // 
             // 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.gv_guid,
+            this.gridColumn13,
             this.gv_urgentFlag,
             this.gv_fstatus,
             this.gv_status,
@@ -679,6 +1013,8 @@
             this.gridColumn2,
             this.gv_depotsCode,
             this.gridColumn3,
+            this.gridColumn12,
+            this.gridColumn11,
             this.gv_remark});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
@@ -687,15 +1023,39 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "鏀舵枡缁勭粐";
+            this.gridColumn13.FieldName = "receivingOrg";
+            this.gridColumn13.MinWidth = 50;
+            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 = 50;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 10;
+            this.gridColumn2.Width = 200;
             // 
             // gridColumn3
             // 
@@ -703,19 +1063,28 @@
             this.gridColumn3.FieldName = "depotName";
             this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 11;
+            this.gridColumn3.VisibleIndex = 12;
             this.gridColumn3.Width = 94;
             // 
-            // gridColumn2
+            // gridColumn12
             // 
-            this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
-            this.gridColumn2.FieldName = "suppName";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 9;
-            this.gridColumn2.Width = 94;
+            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
             // 
@@ -723,7 +1092,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1346, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -734,8 +1103,8 @@
             this.xtraTabPage1.Controls.Add(this.gcMain);
             this.xtraTabPage1.Controls.Add(this.pageBar1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // pageBar1
             // 
@@ -745,8 +1114,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.RowsCount = 50;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1344, 39);
             this.pageBar1.TabIndex = 3;
             this.pageBar1.TotalPages = 0;
             // 
@@ -755,17 +1123,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(1126, 570);
-            this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+            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, 223);
+            this.tabMx.Location = new System.Drawing.Point(0, 143);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 347);
+            this.tabMx.Size = new System.Drawing.Size(1344, 427);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -774,98 +1141,168 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txt_percentage);
-            this.panel1.Controls.Add(this.labelControl2);
-            this.panel1.Controls.Add(this.txt_depotName);
+            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.txt_depotsCode);
+            this.panel1.Controls.Add(this.labelControl4);
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.txt_gysName);
             this.panel1.Controls.Add(this.labelControl1);
-            this.panel1.Controls.Add(this.txt_suppName);
+            this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Controls.Add(this.labelControl3);
+            this.panel1.Controls.Add(this.txt_barcodeProgress);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_urgentFlag);
-            this.panel1.Controls.Add(this.txt_urgentFlag);
             this.panel1.Controls.Add(this.lb_fstatus);
-            this.panel1.Controls.Add(this.txt_fstatus);
-            this.panel1.Controls.Add(this.lb_suppNo);
-            this.panel1.Controls.Add(this.txt_suppNo);
-            this.panel1.Controls.Add(this.lb_depotsCode);
-            this.panel1.Controls.Add(this.txt_depotsCode);
             this.panel1.Controls.Add(this.lb_insDate);
             this.panel1.Controls.Add(this.txt_insDate);
             this.panel1.Controls.Add(this.lb_checkDate);
             this.panel1.Controls.Add(this.txt_checkDate);
             this.panel1.Controls.Add(this.lb_remark);
             this.panel1.Controls.Add(this.txt_remark);
-            this.panel1.Controls.Add(this.lb_createDate);
-            this.panel1.Controls.Add(this.txt_createDate);
             this.panel1.Controls.Add(this.lb_createBy);
             this.panel1.Controls.Add(this.txt_createBy);
-            this.panel1.Controls.Add(this.lb_status);
-            this.panel1.Controls.Add(this.txt_status);
             this.panel1.Controls.Add(this.lb_billNo);
             this.panel1.Controls.Add(this.txt_billNo);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             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(1126, 223);
+            this.panel1.Size = new System.Drawing.Size(1344, 143);
             this.panel1.TabIndex = 1;
             // 
-            // labelControl3
+            // txt_dptName
             // 
-            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(354, 182);
-            this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(102, 21);
-            this.labelControl3.TabIndex = 341;
-            this.labelControl3.Text = "鏉$爜鎵撳嵃姣旂巼";
+            this.txt_dptName.Location = new System.Drawing.Point(419, 47);
+            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(228, 28);
+            this.txt_dptName.TabIndex = 468;
             // 
-            // txt_percentage
+            // txt_gysNo
             // 
-            this.txt_percentage.Location = new System.Drawing.Point(525, 179);
-            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;
-            this.txt_percentage.Size = new System.Drawing.Size(150, 28);
-            this.txt_percentage.TabIndex = 342;
+            this.txt_gysNo.Location = new System.Drawing.Point(107, 79);
+            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(234, 28);
+            this.txt_gysNo.TabIndex = 467;
             // 
-            // labelControl2
+            // txt_fstatus
             // 
-            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(20, 182);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(68, 21);
-            this.labelControl2.TabIndex = 339;
-            this.labelControl2.Text = "浠撳簱鍚嶇О";
+            this.txt_fstatus.Location = new System.Drawing.Point(993, 17);
+            this.txt_fstatus.Name = "txt_fstatus";
+            this.txt_fstatus.Properties.Caption = "";
+            this.txt_fstatus.Size = new System.Drawing.Size(94, 24);
+            this.txt_fstatus.TabIndex = 466;
             // 
-            // txt_depotName
+            // txt_urgentFlag
             // 
-            this.txt_depotName.Location = new System.Drawing.Point(111, 179);
-            this.txt_depotName.Name = "txt_depotName";
-            this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotName.Size = new System.Drawing.Size(150, 28);
-            this.txt_depotName.TabIndex = 340;
+            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);
+            this.txt_urgentFlag.TabIndex = 465;
+            // 
+            // labelControl5
+            // 
+            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl5.Appearance.Options.UseFont = true;
+            this.labelControl5.Location = new System.Drawing.Point(347, 19);
+            this.labelControl5.Name = "labelControl5";
+            this.labelControl5.Size = new System.Drawing.Size(68, 21);
+            this.labelControl5.TabIndex = 464;
+            this.labelControl5.Text = "閫佽揣鍗曞彿";
+            // 
+            // txt_paperBillNo
+            // 
+            this.txt_paperBillNo.Location = new System.Drawing.Point(419, 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(228, 28);
+            this.txt_paperBillNo.TabIndex = 463;
+            // 
+            // txt_depotsCode
+            // 
+            this.txt_depotsCode.Location = new System.Drawing.Point(419, 79);
+            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(228, 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(347, 83);
+            this.labelControl4.Name = "labelControl4";
+            this.labelControl4.Size = new System.Drawing.Size(68, 21);
+            this.labelControl4.TabIndex = 461;
+            this.labelControl4.Text = "浠撳簱缂栧彿";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(7, 83);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(95, 21);
+            this.label1.TabIndex = 460;
+            this.label1.Text = "渚涘簲鍟嗙紪鍙�";
+            // 
+            // txt_gysName
+            // 
+            this.txt_gysName.Location = new System.Drawing.Point(107, 47);
+            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(234, 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(15, 95);
+            this.labelControl1.Location = new System.Drawing.Point(347, 51);
             this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(85, 21);
-            this.labelControl1.TabIndex = 337;
-            this.labelControl1.Text = "渚涘簲鍟嗗悕绉�";
+            this.labelControl1.Size = new System.Drawing.Size(68, 21);
+            this.labelControl1.TabIndex = 457;
+            this.labelControl1.Text = "浠撳簱鍚嶇О";
             // 
-            // txt_suppName
+            // labelControl2
             // 
-            this.txt_suppName.Location = new System.Drawing.Point(111, 92);
-            this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
-            this.txt_suppName.Size = new System.Drawing.Size(150, 28);
-            this.txt_suppName.TabIndex = 338;
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(17, 51);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(85, 21);
+            this.labelControl2.TabIndex = 455;
+            this.labelControl2.Text = "渚涘簲鍟嗗悕绉�";
+            // 
+            // labelControl3
+            // 
+            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl3.Appearance.Options.UseFont = true;
+            this.labelControl3.Location = new System.Drawing.Point(653, 116);
+            this.labelControl3.Name = "labelControl3";
+            this.labelControl3.Size = new System.Drawing.Size(102, 21);
+            this.labelControl3.TabIndex = 341;
+            this.labelControl3.Text = "鏉$爜鎵撳嵃姣旂巼";
+            // 
+            // txt_barcodeProgress
+            // 
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(761, 112);
+            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(143, 28);
+            this.txt_barcodeProgress.TabIndex = 342;
             // 
             // lbGuid
             // 
@@ -879,159 +1316,84 @@
             // 
             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(354, 139);
+            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 = "鎬ユ枡鏍囪瘑 ";
-            // 
-            // txt_urgentFlag
-            // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(525, 136);
-            this.txt_urgentFlag.Name = "txt_urgentFlag";
-            this.txt_urgentFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_urgentFlag.Properties.Appearance.Options.UseFont = true;
-            this.txt_urgentFlag.Size = new System.Drawing.Size(150, 28);
-            this.txt_urgentFlag.TabIndex = 336;
+            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(354, 95);
+            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 = "鎻愪氦鐘舵�� ";
-            // 
-            // txt_fstatus
-            // 
-            this.txt_fstatus.Location = new System.Drawing.Point(525, 92);
-            this.txt_fstatus.Name = "txt_fstatus";
-            this.txt_fstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fstatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_fstatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_fstatus.TabIndex = 291;
-            // 
-            // lb_suppNo
-            // 
-            this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_suppNo.Appearance.Options.UseFont = true;
-            this.lb_suppNo.Location = new System.Drawing.Point(15, 60);
-            this.lb_suppNo.Name = "lb_suppNo";
-            this.lb_suppNo.Size = new System.Drawing.Size(90, 21);
-            this.lb_suppNo.TabIndex = 285;
-            this.lb_suppNo.Text = "渚涘簲鍟嗙紪鐮� ";
-            // 
-            // txt_suppNo
-            // 
-            this.txt_suppNo.Location = new System.Drawing.Point(111, 57);
-            this.txt_suppNo.Name = "txt_suppNo";
-            this.txt_suppNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_suppNo.Size = new System.Drawing.Size(150, 28);
-            this.txt_suppNo.TabIndex = 285;
-            // 
-            // lb_depotsCode
-            // 
-            this.lb_depotsCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_depotsCode.Appearance.Options.UseFont = true;
-            this.lb_depotsCode.Location = new System.Drawing.Point(20, 139);
-            this.lb_depotsCode.Name = "lb_depotsCode";
-            this.lb_depotsCode.Size = new System.Drawing.Size(73, 21);
-            this.lb_depotsCode.TabIndex = 273;
-            this.lb_depotsCode.Text = "浠撳簱缂栫爜 ";
-            // 
-            // txt_depotsCode
-            // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(111, 136);
-            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(150, 28);
-            this.txt_depotsCode.TabIndex = 273;
+            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(717, 23);
+            this.lb_insDate.Location = new System.Drawing.Point(653, 83);
             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(796, 20);
+            this.txt_insDate.Location = new System.Drawing.Point(724, 79);
             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;
-            this.txt_insDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_insDate.Size = new System.Drawing.Size(180, 28);
             this.txt_insDate.TabIndex = 258;
             // 
             // lb_checkDate
             // 
             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(719, 139);
+            this.lb_checkDate.Location = new System.Drawing.Point(653, 51);
             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(796, 136);
+            this.txt_checkDate.Location = new System.Drawing.Point(724, 47);
             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;
-            this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(180, 28);
             this.txt_checkDate.TabIndex = 252;
             // 
             // lb_remark
             // 
             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(729, 95);
+            this.lb_remark.Location = new System.Drawing.Point(68, 116);
             this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(39, 21);
+            this.lb_remark.Size = new System.Drawing.Size(34, 21);
             this.lb_remark.TabIndex = 235;
-            this.lb_remark.Text = "澶囨敞 ";
+            this.lb_remark.Text = "澶囨敞";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(796, 92);
+            this.txt_remark.Location = new System.Drawing.Point(107, 112);
             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(150, 28);
+            this.txt_remark.Size = new System.Drawing.Size(540, 28);
             this.txt_remark.TabIndex = 235;
-            // 
-            // lb_createDate
-            // 
-            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(354, 60);
-            this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_createDate.TabIndex = 219;
-            this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(525, 57);
-            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(150, 28);
-            this.txt_createDate.TabIndex = 219;
             // 
             // lb_createBy
             // 
             this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createBy.Appearance.Options.UseFont = true;
-            this.lb_createBy.Location = new System.Drawing.Point(717, 57);
+            this.lb_createBy.Location = new System.Drawing.Point(653, 19);
             this.lb_createBy.Name = "lb_createBy";
             this.lb_createBy.Size = new System.Drawing.Size(68, 21);
             this.lb_createBy.TabIndex = 217;
@@ -1039,65 +1401,59 @@
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(796, 54);
+            this.txt_createBy.Location = new System.Drawing.Point(724, 15);
             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(150, 28);
+            this.txt_createBy.Size = new System.Drawing.Size(180, 28);
             this.txt_createBy.TabIndex = 217;
-            // 
-            // lb_status
-            // 
-            this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_status.Appearance.Options.UseFont = true;
-            this.lb_status.Location = new System.Drawing.Point(285, 23);
-            this.lb_status.Name = "lb_status";
-            this.lb_status.Size = new System.Drawing.Size(234, 21);
-            this.lb_status.TabIndex = 213;
-            this.lb_status.Text = "鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱 缁撴 ";
-            // 
-            // txt_status
-            // 
-            this.txt_status.Location = new System.Drawing.Point(525, 20);
-            this.txt_status.Name = "txt_status";
-            this.txt_status.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_status.Properties.Appearance.Options.UseFont = true;
-            this.txt_status.Size = new System.Drawing.Size(150, 28);
-            this.txt_status.TabIndex = 213;
             // 
             // lb_billNo
             // 
             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(20, 23);
+            this.lb_billNo.Location = new System.Drawing.Point(34, 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
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(111, 20);
+            this.txt_billNo.Location = new System.Drawing.Point(107, 15);
             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(150, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(234, 28);
             this.txt_billNo.TabIndex = 211;
             // 
             // Frm_ArrivalBarcode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1346, 682);
             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.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.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();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1108,19 +1464,18 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
+            ((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_suppNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             this.ResumeLayout(false);
 
@@ -1141,14 +1496,7 @@
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1parentGuid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
@@ -1159,54 +1507,87 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_status;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private System.Windows.Forms.Panel panel1;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
-        private DevExpress.XtraEditors.TextEdit txt_depotName;
-        private DevExpress.XtraEditors.LabelControl labelControl1;
-        private DevExpress.XtraEditors.TextEdit txt_suppName;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
-        private DevExpress.XtraEditors.TextEdit txt_urgentFlag;
         private DevExpress.XtraEditors.LabelControl lb_fstatus;
-        private DevExpress.XtraEditors.TextEdit txt_fstatus;
-        private DevExpress.XtraEditors.LabelControl lb_suppNo;
-        private DevExpress.XtraEditors.TextEdit txt_suppNo;
-        private DevExpress.XtraEditors.LabelControl lb_depotsCode;
-        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
         private DevExpress.XtraEditors.LabelControl lb_insDate;
         private DevExpress.XtraEditors.TextEdit txt_insDate;
         private DevExpress.XtraEditors.LabelControl lb_checkDate;
         private DevExpress.XtraEditors.TextEdit txt_checkDate;
         private DevExpress.XtraEditors.LabelControl lb_remark;
         private DevExpress.XtraEditors.TextEdit txt_remark;
-        private DevExpress.XtraEditors.LabelControl lb_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraEditors.LabelControl lb_createBy;
         private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraEditors.LabelControl lb_status;
-        private DevExpress.XtraEditors.TextEdit txt_status;
         private DevExpress.XtraEditors.LabelControl lb_billNo;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit txt_percentage;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
+        private DevExpress.XtraEditors.LabelControl labelControl4;
+        private System.Windows.Forms.Label label1;
+        private DevExpress.XtraEditors.TextEdit txt_gysName;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraEditors.LabelControl labelControl5;
+        private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+        private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
+        private DevExpress.XtraEditors.CheckEdit txt_fstatus;
+        private DevExpress.XtraEditors.PanelControl panelMx1;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
+        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 gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraEditors.TextEdit txtWlmc;
+        private DevExpress.XtraEditors.LabelControl labelControl8;
+        private DevExpress.XtraEditors.TextEdit txtWlid;
+        private DevExpress.XtraEditors.LabelControl labelControl7;
+        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.LabelControl labelControl14;
+        private DevExpress.XtraEditors.LabelControl labelControl12;
+        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;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3