From e6832d69f0257567e962edf3a91addd88260e956 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 07 十一月 2024 19:18:54 +0800
Subject: [PATCH] iqc

---
 DevApp/Gs.DevApp/Properties/Resources.Designer.cs               |   10 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs            |    1 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 1056 +++++++++++---------
 DevApp/Gs.DevApp/Gs.DevApp.csproj                               |    1 
 DevApp/Gs.DevApp/Properties/Resources.resx                      |  273 ++--
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs   |    2 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs      | 1573 ++++++++----------------------
 DevApp/Gs.DevApp/Program.cs                                     |    2 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs          |   76 +
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs               |    3 
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs                       |   18 
 11 files changed, 1,247 insertions(+), 1,768 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index ef384fb..830e74a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -540,8 +540,6 @@
             this.gridColumn4.FieldName = "guid";
             this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 3;
             this.gridColumn4.Width = 94;
             // 
             // gridColumn3
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 1c92812..40440c9 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -110,6 +110,7 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        getList12(dt.Rows[0]["guid"].ToString());
                     }
                     else
                     {
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index 86881b0..3a2b8d7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,22 +29,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            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.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1dha001 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1isdepsIn = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1workLine = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1okQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ischeck = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1checkStates = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1checkRes = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -52,7 +46,6 @@
             this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1subQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1ebelnLine = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -61,49 +54,70 @@
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_thstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fType = new DevExpress.XtraEditors.LabelControl();
-            this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
-            this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_insby = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_ischeck = new DevExpress.XtraEditors.LabelControl();
-            this.gv_ischeck = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkRes = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_paperBillNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_paperBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_billNo = 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.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_fType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_fstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_remark = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             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.btnTui = new DevExpress.XtraEditors.SimpleButton();
             this.txtDepotsId = new DevExpress.XtraEditors.TextEdit();
             this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
             this.label1 = new System.Windows.Forms.Label();
             this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
             this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
             this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
             this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
@@ -114,10 +128,10 @@
             this.lbGuid = new System.Windows.Forms.Label();
             this.lb_remark = new DevExpress.XtraEditors.LabelControl();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
@@ -149,7 +163,7 @@
             this.gvMx1states.OptionsColumn.ReadOnly = true;
             this.gvMx1states.Tag = "query_a.states";
             this.gvMx1states.Visible = true;
-            this.gvMx1states.VisibleIndex = 22;
+            this.gvMx1states.VisibleIndex = 14;
             this.gvMx1states.Width = 100;
             // 
             // gvMx1returnFlag
@@ -158,27 +172,14 @@
             this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1returnFlag.Caption = "閫�璐ф爣璇�";
             this.gvMx1returnFlag.FieldName = "returnFlag";
-            this.gvMx1returnFlag.MinWidth = 100;
+            this.gvMx1returnFlag.MinWidth = 60;
             this.gvMx1returnFlag.Name = "gvMx1returnFlag";
             this.gvMx1returnFlag.OptionsColumn.ReadOnly = true;
             this.gvMx1returnFlag.Tag = "query_a.return_flag";
+            this.gvMx1returnFlag.UnboundDataType = typeof(bool);
             this.gvMx1returnFlag.Visible = true;
             this.gvMx1returnFlag.VisibleIndex = 4;
             this.gvMx1returnFlag.Width = 100;
-            // 
-            // gvMx1cgRkqty
-            // 
-            this.gvMx1cgRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1cgRkqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1cgRkqty.Caption = "閲囪喘鍏ュ簱鏁伴噺";
-            this.gvMx1cgRkqty.FieldName = "cgRkqty";
-            this.gvMx1cgRkqty.MinWidth = 100;
-            this.gvMx1cgRkqty.Name = "gvMx1cgRkqty";
-            this.gvMx1cgRkqty.OptionsColumn.ReadOnly = true;
-            this.gvMx1cgRkqty.Tag = "query_a.cg_rkqty";
-            this.gvMx1cgRkqty.Visible = true;
-            this.gvMx1cgRkqty.VisibleIndex = 20;
-            this.gvMx1cgRkqty.Width = 100;
             // 
             // gvMx1okRkqty
             // 
@@ -186,111 +187,41 @@
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
             this.gvMx1okRkqty.FieldName = "okRkqty";
-            this.gvMx1okRkqty.MinWidth = 100;
+            this.gvMx1okRkqty.MinWidth = 90;
             this.gvMx1okRkqty.Name = "gvMx1okRkqty";
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
-            this.gvMx1okRkqty.VisibleIndex = 10;
+            this.gvMx1okRkqty.VisibleIndex = 13;
             this.gvMx1okRkqty.Width = 100;
-            // 
-            // gvMx1dha001
-            // 
-            this.gvMx1dha001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1dha001.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dha001.Caption = "鍒拌揣鍗曞彿";
-            this.gvMx1dha001.FieldName = "dha001";
-            this.gvMx1dha001.MinWidth = 100;
-            this.gvMx1dha001.Name = "gvMx1dha001";
-            this.gvMx1dha001.OptionsColumn.ReadOnly = true;
-            this.gvMx1dha001.Tag = "query_a.dha001";
-            this.gvMx1dha001.Visible = true;
-            this.gvMx1dha001.VisibleIndex = 19;
-            this.gvMx1dha001.Width = 100;
             // 
             // gvMx1isdepsIn
             // 
             this.gvMx1isdepsIn.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
-            this.gvMx1isdepsIn.Caption = "鏄惁鍏ュ簱";
+            this.gvMx1isdepsIn.Caption = "鍏ュ簱鏍囪瘑";
             this.gvMx1isdepsIn.FieldName = "isdepsIn";
-            this.gvMx1isdepsIn.MinWidth = 100;
+            this.gvMx1isdepsIn.MinWidth = 60;
             this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
             this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
             this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
             this.gvMx1isdepsIn.Visible = true;
-            this.gvMx1isdepsIn.VisibleIndex = 18;
+            this.gvMx1isdepsIn.VisibleIndex = 6;
             this.gvMx1isdepsIn.Width = 100;
-            // 
-            // gvMx1fType
-            // 
-            this.gvMx1fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fType.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fType.Caption = "0銆侀噰璐崟锛�1銆佸澶栧崟";
-            this.gvMx1fType.FieldName = "fType";
-            this.gvMx1fType.MinWidth = 100;
-            this.gvMx1fType.Name = "gvMx1fType";
-            this.gvMx1fType.OptionsColumn.ReadOnly = true;
-            this.gvMx1fType.Tag = "query_a.f_type";
-            this.gvMx1fType.Visible = true;
-            this.gvMx1fType.VisibleIndex = 17;
-            this.gvMx1fType.Width = 100;
-            // 
-            // gvMx1workLine
-            // 
-            this.gvMx1workLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1workLine.AppearanceCell.Options.UseFont = true;
-            this.gvMx1workLine.Caption = "浠诲姟鍗曡鍙�";
-            this.gvMx1workLine.FieldName = "workLine";
-            this.gvMx1workLine.MinWidth = 100;
-            this.gvMx1workLine.Name = "gvMx1workLine";
-            this.gvMx1workLine.OptionsColumn.ReadOnly = true;
-            this.gvMx1workLine.Tag = "query_a.work_line";
-            this.gvMx1workLine.Visible = true;
-            this.gvMx1workLine.VisibleIndex = 16;
-            this.gvMx1workLine.Width = 100;
             // 
             // gvMx1boardStyle
             // 
             this.gvMx1boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
-            this.gvMx1boardStyle.Caption = "浜у搧鍨嬪彿";
-            this.gvMx1boardStyle.FieldName = "boardStyle";
-            this.gvMx1boardStyle.MinWidth = 100;
+            this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx1boardStyle.FieldName = "itemName";
+            this.gvMx1boardStyle.MinWidth = 180;
             this.gvMx1boardStyle.Name = "gvMx1boardStyle";
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
-            this.gvMx1boardStyle.VisibleIndex = 5;
-            this.gvMx1boardStyle.Width = 100;
-            // 
-            // gvMx1okQty
-            // 
-            this.gvMx1okQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1okQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1okQty.Caption = "宸叉敹鏁伴噺";
-            this.gvMx1okQty.FieldName = "okQty";
-            this.gvMx1okQty.MinWidth = 100;
-            this.gvMx1okQty.Name = "gvMx1okQty";
-            this.gvMx1okQty.OptionsColumn.ReadOnly = true;
-            this.gvMx1okQty.Tag = "query_a.ok_qty";
-            this.gvMx1okQty.Visible = true;
-            this.gvMx1okQty.VisibleIndex = 9;
-            this.gvMx1okQty.Width = 100;
-            // 
-            // gvMx1ischeck
-            // 
-            this.gvMx1ischeck.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1ischeck.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ischeck.Caption = "鏄惁妫�楠�";
-            this.gvMx1ischeck.FieldName = "ischeck";
-            this.gvMx1ischeck.MinWidth = 100;
-            this.gvMx1ischeck.Name = "gvMx1ischeck";
-            this.gvMx1ischeck.OptionsColumn.ReadOnly = true;
-            this.gvMx1ischeck.Tag = "query_a.ischeck";
-            this.gvMx1ischeck.Visible = true;
-            this.gvMx1ischeck.VisibleIndex = 12;
-            this.gvMx1ischeck.Width = 100;
+            this.gvMx1boardStyle.VisibleIndex = 8;
+            this.gvMx1boardStyle.Width = 180;
             // 
             // gvMx1checkDate
             // 
@@ -298,13 +229,13 @@
             this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1checkDate.Caption = "妫�楠屾棩鏈�";
             this.gvMx1checkDate.FieldName = "checkDate";
-            this.gvMx1checkDate.MinWidth = 100;
+            this.gvMx1checkDate.MinWidth = 180;
             this.gvMx1checkDate.Name = "gvMx1checkDate";
             this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
             this.gvMx1checkDate.Tag = "query_a.check_date";
             this.gvMx1checkDate.Visible = true;
-            this.gvMx1checkDate.VisibleIndex = 15;
-            this.gvMx1checkDate.Width = 100;
+            this.gvMx1checkDate.VisibleIndex = 17;
+            this.gvMx1checkDate.Width = 180;
             // 
             // gvMx1checkStates
             // 
@@ -317,7 +248,7 @@
             this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
             this.gvMx1checkStates.Tag = "query_a.check_states";
             this.gvMx1checkStates.Visible = true;
-            this.gvMx1checkStates.VisibleIndex = 14;
+            this.gvMx1checkStates.VisibleIndex = 16;
             this.gvMx1checkStates.Width = 100;
             // 
             // gvMx1checkRes
@@ -331,7 +262,7 @@
             this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
             this.gvMx1checkRes.Tag = "query_a.check_res";
             this.gvMx1checkRes.Visible = true;
-            this.gvMx1checkRes.VisibleIndex = 13;
+            this.gvMx1checkRes.VisibleIndex = 15;
             this.gvMx1checkRes.Width = 100;
             // 
             // gvMx1memo
@@ -340,12 +271,13 @@
             this.gvMx1memo.AppearanceCell.Options.UseFont = true;
             this.gvMx1memo.Caption = "澶囨敞";
             this.gvMx1memo.FieldName = "memo";
-            this.gvMx1memo.MinWidth = 100;
+            this.gvMx1memo.MinWidth = 180;
             this.gvMx1memo.Name = "gvMx1memo";
+            this.gvMx1memo.OptionsColumn.ReadOnly = true;
             this.gvMx1memo.Tag = "query_a.memo";
             this.gvMx1memo.Visible = true;
-            this.gvMx1memo.VisibleIndex = 11;
-            this.gvMx1memo.Width = 100;
+            this.gvMx1memo.VisibleIndex = 21;
+            this.gvMx1memo.Width = 180;
             // 
             // gvMx1urgentFlag
             // 
@@ -353,10 +285,12 @@
             this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gvMx1urgentFlag.FieldName = "urgentFlag";
-            this.gvMx1urgentFlag.MinWidth = 100;
+            this.gvMx1urgentFlag.MinWidth = 60;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
             this.gvMx1urgentFlag.OptionsColumn.ReadOnly = true;
             this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
+            this.gvMx1urgentFlag.Visible = true;
+            this.gvMx1urgentFlag.VisibleIndex = 5;
             this.gvMx1urgentFlag.Width = 100;
             // 
             // gvMx1subQty
@@ -365,12 +299,12 @@
             this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1subQty.Caption = "鏈搴旀敹鏁伴噺";
             this.gvMx1subQty.FieldName = "subQty";
-            this.gvMx1subQty.MinWidth = 100;
+            this.gvMx1subQty.MinWidth = 90;
             this.gvMx1subQty.Name = "gvMx1subQty";
             this.gvMx1subQty.OptionsColumn.ReadOnly = true;
             this.gvMx1subQty.Tag = "query_a.sub_qty";
             this.gvMx1subQty.Visible = true;
-            this.gvMx1subQty.VisibleIndex = 8;
+            this.gvMx1subQty.VisibleIndex = 10;
             this.gvMx1subQty.Width = 100;
             // 
             // gvMx1quantity
@@ -381,28 +315,14 @@
             this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺";
+            this.gvMx1quantity.Caption = "鏈瀹炴敹鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 100;
+            this.gvMx1quantity.MinWidth = 90;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "query_a.quantity";
             this.gvMx1quantity.Visible = true;
-            this.gvMx1quantity.VisibleIndex = 7;
+            this.gvMx1quantity.VisibleIndex = 11;
             this.gvMx1quantity.Width = 100;
-            // 
-            // gvMx1itemNo
-            // 
-            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 = 100;
-            this.gvMx1itemNo.Name = "gvMx1itemNo";
-            this.gvMx1itemNo.OptionsColumn.ReadOnly = true;
-            this.gvMx1itemNo.Tag = "query_a.item_no";
-            this.gvMx1itemNo.Visible = true;
-            this.gvMx1itemNo.VisibleIndex = 4;
-            this.gvMx1itemNo.Width = 100;
             // 
             // gvMx1ebelnQty
             // 
@@ -410,12 +330,12 @@
             this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnQty.Caption = "閲囪喘璁㈠崟鏁伴噺";
             this.gvMx1ebelnQty.FieldName = "ebelnQty";
-            this.gvMx1ebelnQty.MinWidth = 100;
+            this.gvMx1ebelnQty.MinWidth = 90;
             this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
             this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
-            this.gvMx1ebelnQty.VisibleIndex = 6;
+            this.gvMx1ebelnQty.VisibleIndex = 12;
             this.gvMx1ebelnQty.Width = 100;
             // 
             // gvMx1ebelnLine
@@ -424,12 +344,12 @@
             this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnLine.Caption = "ERP琛孖D";
             this.gvMx1ebelnLine.FieldName = "ebelnK3id";
-            this.gvMx1ebelnLine.MinWidth = 100;
+            this.gvMx1ebelnLine.MinWidth = 90;
             this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
             this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
             this.gvMx1ebelnLine.Visible = true;
-            this.gvMx1ebelnLine.VisibleIndex = 2;
+            this.gvMx1ebelnLine.VisibleIndex = 3;
             this.gvMx1ebelnLine.Width = 100;
             // 
             // gvMx1ebeln
@@ -443,7 +363,7 @@
             this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
-            this.gvMx1ebeln.VisibleIndex = 1;
+            this.gvMx1ebeln.VisibleIndex = 2;
             this.gvMx1ebeln.Width = 120;
             // 
             // gvMx1guid
@@ -462,7 +382,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1229, 370);
+            this.tabMxPage1.Size = new System.Drawing.Size(1229, 376);
             this.tabMxPage1.Text = "鏄庣粏1";
             // 
             // gcMx1
@@ -472,8 +392,9 @@
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1229, 370);
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemCheckEdit1});
+            this.gcMx1.Size = new System.Drawing.Size(1229, 376);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -483,35 +404,33 @@
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvAbtGuid,
             this.gvMx1guid,
+            this.gridColumn8,
             this.gvMxDel,
             this.gvMx1ebeln,
             this.gvMx1ebelnLine,
-            this.gridColumn3,
             this.gvMx1returnFlag,
             this.gvMx1urgentFlag,
             this.gvMx1isdepsIn,
             this.gridColumn1,
-            this.gvMx1itemNo,
             this.gvMx1boardStyle,
-            this.gvMx1ebelnQty,
-            this.gvMx1quantity,
+            this.gridColumn6,
             this.gvMx1subQty,
-            this.gvMx1okQty,
+            this.gvMx1quantity,
+            this.gvMx1ebelnQty,
             this.gvMx1okRkqty,
-            this.gvMx1memo,
-            this.gvMx1ischeck,
+            this.gvMx1states,
             this.gvMx1checkRes,
             this.gvMx1checkStates,
             this.gvMx1checkDate,
-            this.gvMx1workLine,
-            this.gvMx1fType,
-            this.gvMx1dha001,
-            this.gvMx1cgRkqty,
-            this.gvMx1states});
+            this.gridColumn3,
+            this.gridColumn9,
+            this.gridColumn7,
+            this.gvMx1memo});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
             // gvAbtGuid
@@ -523,6 +442,22 @@
             this.gvAbtGuid.OptionsColumn.ReadOnly = true;
             this.gvAbtGuid.Width = 94;
             // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "閫夋嫨";
+            this.gridColumn8.ColumnEdit = this.repositoryItemCheckEdit1;
+            this.gridColumn8.FieldName = "gvChk";
+            this.gridColumn8.MinWidth = 50;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 0;
+            this.gridColumn8.Width = 94;
+            // 
+            // repositoryItemCheckEdit1
+            // 
+            this.repositoryItemCheckEdit1.AutoHeight = false;
+            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+            // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
@@ -530,43 +465,74 @@
             this.gvMxDel.MinWidth = 80;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 0;
+            this.gvMxDel.VisibleIndex = 1;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鐗╂枡ID";
+            this.gridColumn1.FieldName = "itemId";
+            this.gridColumn1.MinWidth = 100;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.ReadOnly = true;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 7;
+            this.gridColumn1.Width = 100;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn6.FieldName = "itemModel";
+            this.gridColumn6.MinWidth = 180;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.ReadOnly = true;
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 9;
+            this.gridColumn6.Width = 180;
+            // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "閲囪喘鏃堕棿";
-            this.gridColumn3.MinWidth = 100;
+            this.gridColumn3.FieldName = "purchaseDate";
+            this.gridColumn3.MinWidth = 180;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.ReadOnly = true;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 3;
-            this.gridColumn3.Width = 100;
+            this.gridColumn3.VisibleIndex = 18;
+            this.gridColumn3.Width = 180;
             // 
-            // gv_thstatus
+            // gridColumn9
             // 
-            this.gv_thstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_thstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_thstatus.Caption = "閫�璐ф爣蹇�";
-            this.gv_thstatus.FieldName = "thstatus";
-            this.gv_thstatus.MinWidth = 50;
-            this.gv_thstatus.Name = "gv_thstatus";
-            this.gv_thstatus.OptionsColumn.AllowEdit = false;
-            this.gv_thstatus.Tag = "query_a.thstatus";
-            this.gv_thstatus.Visible = true;
-            this.gv_thstatus.VisibleIndex = 16;
-            this.gv_thstatus.Width = 106;
+            this.gridColumn9.Caption = "閲囪喘鍗曚綅";
+            this.gridColumn9.FieldName = "cgUnit";
+            this.gridColumn9.MinWidth = 60;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 19;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn7.FieldName = "kcUnit";
+            this.gridColumn7.MinWidth = 60;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.ReadOnly = true;
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 20;
+            this.gridColumn7.Width = 94;
             // 
             // lb_fType
             // 
@@ -578,23 +544,6 @@
             this.lb_fType.TabIndex = 378;
             this.lb_fType.Text = "濮斿鏍囧織";
             // 
-            // gv_fType
-            // 
-            this.gv_fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fType.AppearanceCell.Options.UseFont = true;
-            this.gv_fType.AppearanceHeader.Options.UseTextOptions = true;
-            this.gv_fType.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gv_fType.Caption = "鏄惁濮斿";
-            this.gv_fType.FieldName = "fType";
-            this.gv_fType.MinWidth = 50;
-            this.gv_fType.Name = "gv_fType";
-            this.gv_fType.OptionsColumn.AllowEdit = false;
-            this.gv_fType.Tag = "query_a.f_type";
-            this.gv_fType.UnboundDataType = typeof(bool);
-            this.gv_fType.Visible = true;
-            this.gv_fType.VisibleIndex = 0;
-            this.gv_fType.Width = 50;
-            // 
             // lb_urgentFlag
             // 
             this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -605,34 +554,6 @@
             this.lb_urgentFlag.TabIndex = 343;
             this.lb_urgentFlag.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.FieldName = "urgentFlag";
-            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 = 1;
-            this.gv_urgentFlag.Width = 50;
-            // 
-            // gv_insby
-            // 
-            this.gv_insby.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_insby.AppearanceCell.Options.UseFont = true;
-            this.gv_insby.Caption = "瀹℃牳鍏ュ簱浜�";
-            this.gv_insby.FieldName = "insby";
-            this.gv_insby.MinWidth = 50;
-            this.gv_insby.Name = "gv_insby";
-            this.gv_insby.OptionsColumn.AllowEdit = false;
-            this.gv_insby.Tag = "query_a.insby";
-            this.gv_insby.Visible = true;
-            this.gv_insby.VisibleIndex = 15;
-            this.gv_insby.Width = 71;
-            // 
             // lb_ischeck
             // 
             this.lb_ischeck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -642,118 +563,6 @@
             this.lb_ischeck.Size = new System.Drawing.Size(102, 21);
             this.lb_ischeck.TabIndex = 319;
             this.lb_ischeck.Text = "鏄惁鎻愪氦妫�楠�";
-            // 
-            // gv_ischeck
-            // 
-            this.gv_ischeck.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_ischeck.AppearanceCell.Options.UseFont = true;
-            this.gv_ischeck.Caption = "鏄惁妫�楠�";
-            this.gv_ischeck.FieldName = "ischeck";
-            this.gv_ischeck.MinWidth = 50;
-            this.gv_ischeck.Name = "gv_ischeck";
-            this.gv_ischeck.OptionsColumn.AllowEdit = false;
-            this.gv_ischeck.Tag = "query_a.ischeck";
-            this.gv_ischeck.Visible = true;
-            this.gv_ischeck.VisibleIndex = 14;
-            this.gv_ischeck.Width = 71;
-            // 
-            // gv_fstatus
-            // 
-            this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_fstatus.Caption = "鎻愪氦妫�楠�";
-            this.gv_fstatus.FieldName = "fstatus";
-            this.gv_fstatus.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 = 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.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 = 9;
-            this.gv_suppNo.Width = 71;
-            // 
-            // gv_depotsCode
-            // 
-            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotsCode.Caption = "鏀惰揣浠撳簱";
-            this.gv_depotsCode.FieldName = "depotsCode";
-            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 = 8;
-            this.gv_depotsCode.Width = 71;
-            // 
-            // gv_checkQty
-            // 
-            this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkQty.AppearanceCell.Options.UseFont = true;
-            this.gv_checkQty.Caption = "宸叉崱鏁伴噺";
-            this.gv_checkQty.FieldName = "checkQty";
-            this.gv_checkQty.MinWidth = 50;
-            this.gv_checkQty.Name = "gv_checkQty";
-            this.gv_checkQty.OptionsColumn.AllowEdit = false;
-            this.gv_checkQty.Tag = "query_a.check_qty";
-            this.gv_checkQty.Visible = true;
-            this.gv_checkQty.VisibleIndex = 13;
-            this.gv_checkQty.Width = 71;
-            // 
-            // gv_checkRes
-            // 
-            this.gv_checkRes.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkRes.AppearanceCell.Options.UseFont = true;
-            this.gv_checkRes.Caption = "妫�楠岀粨鏋�";
-            this.gv_checkRes.FieldName = "checkRes";
-            this.gv_checkRes.MinWidth = 50;
-            this.gv_checkRes.Name = "gv_checkRes";
-            this.gv_checkRes.OptionsColumn.AllowEdit = false;
-            this.gv_checkRes.Tag = "query_a.check_res";
-            this.gv_checkRes.Visible = true;
-            this.gv_checkRes.VisibleIndex = 12;
-            this.gv_checkRes.Width = 71;
-            // 
-            // 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.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 200;
-            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 = 200;
-            // 
-            // gv_checkUser
-            // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
-            this.gv_checkUser.Caption = "鎻愪氦浜�";
-            this.gv_checkUser.FieldName = "checkUser";
-            this.gv_checkUser.MinWidth = 50;
-            this.gv_checkUser.Name = "gv_checkUser";
-            this.gv_checkUser.OptionsColumn.AllowEdit = false;
-            this.gv_checkUser.Tag = "query_a.check_user";
-            this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 6;
-            this.gv_checkUser.Width = 71;
             // 
             // lb_paperBillNo
             // 
@@ -773,62 +582,6 @@
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
             this.txt_paperBillNo.Size = new System.Drawing.Size(215, 28);
             this.txt_paperBillNo.TabIndex = 243;
-            // 
-            // gv_paperBillNo
-            // 
-            this.gv_paperBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
-            this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿";
-            this.gv_paperBillNo.FieldName = "paperBillNo";
-            this.gv_paperBillNo.MinWidth = 50;
-            this.gv_paperBillNo.Name = "gv_paperBillNo";
-            this.gv_paperBillNo.OptionsColumn.AllowEdit = false;
-            this.gv_paperBillNo.Tag = "query_a.paper_bill_no";
-            this.gv_paperBillNo.Visible = true;
-            this.gv_paperBillNo.VisibleIndex = 11;
-            this.gv_paperBillNo.Width = 71;
-            // 
-            // gv_remark
-            // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_remark.AppearanceCell.Options.UseFont = true;
-            this.gv_remark.Caption = "澶囨敞";
-            this.gv_remark.FieldName = "remark";
-            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 = 10;
-            this.gv_remark.Width = 71;
-            // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 200;
-            this.gv_createDate.Name = "gv_createDate";
-            this.gv_createDate.OptionsColumn.AllowEdit = false;
-            this.gv_createDate.Tag = "query_a.create_date";
-            this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 5;
-            this.gv_createDate.Width = 200;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Tag = "query_a.create_by";
-            this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 4;
-            this.gv_createBy.Width = 71;
             // 
             // lb_billNo
             // 
@@ -850,23 +603,9 @@
             this.txt_billNo.Size = new System.Drawing.Size(215, 28);
             this.txt_billNo.TabIndex = 213;
             // 
-            // gv_billNo
-            // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_billNo.AppearanceCell.Options.UseFont = true;
-            this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
-            this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 130;
-            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 = 130;
-            // 
             // toolBarMenu1
             // 
-            this.toolBarMenu1.chkParameter = "0,0,0,0,000chk_iqc_arn_submit";
+            this.toolBarMenu1.chkParameter = "0,0,0,0,000prc_cgdhd_submit";
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -896,32 +635,376 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.AppearancePrint.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.AppearancePrint.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand1,
+            this.gridBand2,
+            this.gridBand3,
+            this.gridBand4,
+            this.gridBand5,
+            this.gridBand6,
+            this.gridBand9,
+            this.gridBand13,
+            this.gridBand16,
+            this.gridBand18});
             this.gridView1.ColumnPanelRowHeight = 34;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
             this.gv_fType,
             this.gv_urgentFlag,
             this.gv_fstatus,
+            this.gridColumn2,
             this.gv_billNo,
             this.gv_createBy,
             this.gv_createDate,
             this.gv_checkUser,
             this.gv_checkDate,
             this.gv_depotsCode,
+            this.gridColumn4,
             this.gv_suppNo,
-            this.gv_remark,
-            this.gv_paperBillNo,
-            this.gv_checkRes,
-            this.gv_checkQty,
-            this.gv_ischeck,
-            this.gv_insby,
-            this.gv_thstatus});
+            this.gridColumn5,
+            this.gv_remark});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowColumnHeaders = false;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridBand1
+            // 
+            this.gridBand1.Caption = "濮斿";
+            this.gridBand1.Columns.Add(this.gv_fType);
+            this.gridBand1.MinWidth = 50;
+            this.gridBand1.Name = "gridBand1";
+            this.gridBand1.VisibleIndex = 0;
+            this.gridBand1.Width = 50;
+            // 
+            // gv_fType
+            // 
+            this.gv_fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_fType.AppearanceCell.Options.UseFont = true;
+            this.gv_fType.AppearanceHeader.Options.UseTextOptions = true;
+            this.gv_fType.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gv_fType.Caption = "鏄惁濮斿";
+            this.gv_fType.FieldName = "fType";
+            this.gv_fType.Name = "gv_fType";
+            this.gv_fType.OptionsColumn.AllowEdit = false;
+            this.gv_fType.Tag = "query_a.f_type";
+            this.gv_fType.UnboundDataType = typeof(bool);
+            this.gv_fType.Visible = true;
+            this.gv_fType.Width = 50;
+            // 
+            // gridBand2
+            // 
+            this.gridBand2.Caption = "鎬ユ枡";
+            this.gridBand2.Columns.Add(this.gv_urgentFlag);
+            this.gridBand2.MinWidth = 50;
+            this.gridBand2.Name = "gridBand2";
+            this.gridBand2.VisibleIndex = 1;
+            this.gridBand2.Width = 50;
+            // 
+            // gv_urgentFlag
+            // 
+            this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
+            this.gv_urgentFlag.Caption = "鏄惁鎬ユ枡";
+            this.gv_urgentFlag.FieldName = "urgentFlag";
+            this.gv_urgentFlag.Name = "gv_urgentFlag";
+            this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
+            this.gv_urgentFlag.Tag = "query_a.urgent_flag";
+            this.gv_urgentFlag.UnboundDataType = typeof(bool);
+            this.gv_urgentFlag.Visible = true;
+            this.gv_urgentFlag.Width = 50;
+            // 
+            // gridBand3
+            // 
+            this.gridBand3.Caption = "妫�楠�";
+            this.gridBand3.Columns.Add(this.gv_fstatus);
+            this.gridBand3.MinWidth = 50;
+            this.gridBand3.Name = "gridBand3";
+            this.gridBand3.VisibleIndex = 2;
+            this.gridBand3.Width = 50;
+            // 
+            // gv_fstatus
+            // 
+            this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
+            this.gv_fstatus.Caption = "鎻愪氦妫�楠�";
+            this.gv_fstatus.FieldName = "fstatus";
+            this.gv_fstatus.Name = "gv_fstatus";
+            this.gv_fstatus.OptionsColumn.AllowEdit = false;
+            this.gv_fstatus.Tag = "query_a.fstatus";
+            this.gv_fstatus.UnboundDataType = typeof(bool);
+            this.gv_fstatus.Visible = true;
+            this.gv_fstatus.Width = 50;
+            // 
+            // gridBand4
+            // 
+            this.gridBand4.Caption = "鍏ュ簱";
+            this.gridBand4.Columns.Add(this.gridColumn2);
+            this.gridBand4.MinWidth = 50;
+            this.gridBand4.Name = "gridBand4";
+            this.gridBand4.VisibleIndex = 3;
+            this.gridBand4.Width = 50;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鍏ュ簱";
+            this.gridColumn2.FieldName = "status";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.Width = 50;
+            // 
+            // gridBand5
+            // 
+            this.gridBand5.Caption = "鍒拌揣鍗曞彿";
+            this.gridBand5.Columns.Add(this.gv_billNo);
+            this.gridBand5.MinWidth = 150;
+            this.gridBand5.Name = "gridBand5";
+            this.gridBand5.VisibleIndex = 4;
+            this.gridBand5.Width = 150;
+            // 
+            // gv_billNo
+            // 
+            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_billNo.AppearanceCell.Options.UseFont = true;
+            this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
+            this.gv_billNo.FieldName = "billNo";
+            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.Width = 20;
+            // 
+            // gridBand6
+            // 
+            this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand6.Caption = "鍒涘缓淇℃伅";
+            this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand7,
+            this.gridBand8});
+            this.gridBand6.Name = "gridBand6";
+            this.gridBand6.VisibleIndex = 5;
+            this.gridBand6.Width = 451;
+            // 
+            // gridBand7
+            // 
+            this.gridBand7.Caption = "鍒涘缓浜哄憳";
+            this.gridBand7.Columns.Add(this.gv_createBy);
+            this.gridBand7.MinWidth = 60;
+            this.gridBand7.Name = "gridBand7";
+            this.gridBand7.VisibleIndex = 0;
+            this.gridBand7.Width = 85;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "鍒涘缓浜�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.create_by";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.Width = 85;
+            // 
+            // gridBand8
+            // 
+            this.gridBand8.Caption = "鍒涘缓鏃ユ湡";
+            this.gridBand8.Columns.Add(this.gv_createDate);
+            this.gridBand8.MinWidth = 180;
+            this.gridBand8.Name = "gridBand8";
+            this.gridBand8.VisibleIndex = 1;
+            this.gridBand8.Width = 366;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.create_date";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.Width = 366;
+            // 
+            // gridBand9
+            // 
+            this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand9.Caption = "鏀惰揣淇℃伅";
+            this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand10,
+            this.gridBand11});
+            this.gridBand9.Name = "gridBand9";
+            this.gridBand9.VisibleIndex = 6;
+            this.gridBand9.Width = 233;
+            // 
+            // gridBand10
+            // 
+            this.gridBand10.Caption = "浠撳簱ID";
+            this.gridBand10.Columns.Add(this.gv_depotsCode);
+            this.gridBand10.MinWidth = 80;
+            this.gridBand10.Name = "gridBand10";
+            this.gridBand10.VisibleIndex = 0;
+            this.gridBand10.Width = 83;
+            // 
+            // gv_depotsCode
+            // 
+            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
+            this.gv_depotsCode.Caption = "鏀惰揣浠撳簱ID";
+            this.gv_depotsCode.FieldName = "depotsId";
+            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.Width = 83;
+            // 
+            // gridBand11
+            // 
+            this.gridBand11.Caption = "浠撳簱鍚嶇О";
+            this.gridBand11.Columns.Add(this.gridColumn4);
+            this.gridBand11.MinWidth = 150;
+            this.gridBand11.Name = "gridBand11";
+            this.gridBand11.VisibleIndex = 1;
+            this.gridBand11.Width = 150;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "鏀惰揣浠撳簱鍚嶇О";
+            this.gridColumn4.FieldName = "depotName";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.Width = 119;
+            // 
+            // gridBand13
+            // 
+            this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand13.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand13.Caption = "渚涘簲鍟嗕俊鎭�";
+            this.gridBand13.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand12,
+            this.gridBand14});
+            this.gridBand13.Name = "gridBand13";
+            this.gridBand13.VisibleIndex = 7;
+            this.gridBand13.Width = 281;
+            // 
+            // gridBand12
+            // 
+            this.gridBand12.Caption = "渚涘簲鍟咺D";
+            this.gridBand12.Columns.Add(this.gv_suppNo);
+            this.gridBand12.MinWidth = 80;
+            this.gridBand12.Name = "gridBand12";
+            this.gridBand12.VisibleIndex = 0;
+            this.gridBand12.Width = 81;
+            // 
+            // gv_suppNo
+            // 
+            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
+            this.gv_suppNo.Caption = "渚涘簲鍟咺D";
+            this.gv_suppNo.FieldName = "suppId";
+            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.Width = 81;
+            // 
+            // gridBand14
+            // 
+            this.gridBand14.Caption = "渚涘簲鍟嗗悕绉�";
+            this.gridBand14.Columns.Add(this.gridColumn5);
+            this.gridBand14.MinWidth = 200;
+            this.gridBand14.Name = "gridBand14";
+            this.gridBand14.VisibleIndex = 1;
+            this.gridBand14.Width = 200;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "渚涘簲鍟嗗悕绉�";
+            this.gridColumn5.FieldName = "suppName";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.Width = 49;
+            // 
+            // gridBand16
+            // 
+            this.gridBand16.Caption = "澶囨敞";
+            this.gridBand16.Columns.Add(this.gv_remark);
+            this.gridBand16.MinWidth = 180;
+            this.gridBand16.Name = "gridBand16";
+            this.gridBand16.VisibleIndex = 8;
+            this.gridBand16.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.FieldName = "remark";
+            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.Width = 85;
+            // 
+            // gridBand18
+            // 
+            this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand18.Caption = "妫�楠屼俊鎭�";
+            this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand15,
+            this.gridBand17});
+            this.gridBand18.Name = "gridBand18";
+            this.gridBand18.VisibleIndex = 9;
+            this.gridBand18.Width = 479;
+            // 
+            // gridBand15
+            // 
+            this.gridBand15.Caption = "鎻愪氦浜�";
+            this.gridBand15.Columns.Add(this.gv_checkUser);
+            this.gridBand15.MinWidth = 60;
+            this.gridBand15.Name = "gridBand15";
+            this.gridBand15.VisibleIndex = 0;
+            this.gridBand15.Width = 106;
+            // 
+            // gv_checkUser
+            // 
+            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+            this.gv_checkUser.Caption = "鎻愪氦浜�";
+            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.Name = "gv_checkUser";
+            this.gv_checkUser.OptionsColumn.AllowEdit = false;
+            this.gv_checkUser.Tag = "query_a.check_user";
+            this.gv_checkUser.Visible = true;
+            this.gv_checkUser.Width = 106;
+            // 
+            // gridBand17
+            // 
+            this.gridBand17.Caption = "鎻愪氦鏃ユ湡";
+            this.gridBand17.Columns.Add(this.gv_checkDate);
+            this.gridBand17.MinWidth = 180;
+            this.gridBand17.Name = "gridBand17";
+            this.gridBand17.VisibleIndex = 1;
+            this.gridBand17.Width = 373;
+            // 
+            // 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.FieldName = "checkDate";
+            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.Width = 373;
             // 
             // xtraTabControl1
             // 
@@ -968,10 +1051,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 168);
+            this.tabMx.Location = new System.Drawing.Point(0, 162);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1231, 402);
+            this.tabMx.Size = new System.Drawing.Size(1231, 408);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -979,13 +1062,13 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.btnTui);
             this.panel1.Controls.Add(this.txtDepotsId);
             this.panel1.Controls.Add(this.labelControl4);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.txtSupplierId);
             this.panel1.Controls.Add(this.txt_fType);
             this.panel1.Controls.Add(this.txt_urgentFlag);
-            this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.txt_ischeck);
             this.panel1.Controls.Add(this.txt_depotsId);
             this.panel1.Controls.Add(this.labelControl3);
@@ -1007,8 +1090,17 @@
             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(1231, 168);
+            this.panel1.Size = new System.Drawing.Size(1231, 162);
             this.panel1.TabIndex = 1;
+            // 
+            // btnTui
+            // 
+            this.btnTui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
+            this.btnTui.Location = new System.Drawing.Point(207, 126);
+            this.btnTui.Name = "btnTui";
+            this.btnTui.Size = new System.Drawing.Size(124, 29);
+            this.btnTui.TabIndex = 455;
+            this.btnTui.Text = "鍘婚��鍏ュ簱鏄庣粏";
             // 
             // txtDepotsId
             // 
@@ -1065,14 +1157,6 @@
             this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
             this.txt_urgentFlag.TabIndex = 449;
             // 
-            // labelControl2
-            // 
-            this.labelControl2.Location = new System.Drawing.Point(349, 133);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(60, 18);
-            this.labelControl2.TabIndex = 448;
-            this.labelControl2.Text = "鏉ユ枡鏄庣粏";
-            // 
             // txt_ischeck
             // 
             this.txt_ischeck.Enabled = false;
@@ -1104,11 +1188,11 @@
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(421, 128);
+            this.btnSelect.Location = new System.Drawing.Point(30, 126);
             this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(74, 29);
+            this.btnSelect.Size = new System.Drawing.Size(133, 29);
             this.btnSelect.TabIndex = 443;
-            this.btnSelect.Text = "鍘婚�夋嫨";
+            this.btnSelect.Text = "鍘婚�夋嫨鏉ユ枡鏄庣粏";
             // 
             // txt_suppId
             // 
@@ -1152,7 +1236,7 @@
             // 
             this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_remark.Appearance.Options.UseFont = true;
-            this.lb_remark.Location = new System.Drawing.Point(54, 132);
+            this.lb_remark.Location = new System.Drawing.Point(843, 18);
             this.lb_remark.Name = "lb_remark";
             this.lb_remark.Size = new System.Drawing.Size(34, 21);
             this.lb_remark.TabIndex = 240;
@@ -1160,22 +1244,12 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(98, 128);
+            this.txt_remark.Location = new System.Drawing.Point(887, 14);
             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(215, 28);
             this.txt_remark.TabIndex = 240;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "鐗╂枡ID";
-            this.gridColumn1.FieldName = "itemId";
-            this.gridColumn1.MinWidth = 60;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 5;
-            this.gridColumn1.Width = 94;
             // 
             // Frm_MesInvItemArn
             // 
@@ -1188,6 +1262,7 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
@@ -1213,7 +1288,6 @@
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
         private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1226,15 +1300,9 @@
         //BQCreateConrolObejct
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1cgRkqty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1dha001;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fType;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1workLine;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1okQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ischeck;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkStates;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
@@ -1242,7 +1310,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
@@ -1250,35 +1317,18 @@
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
 
         private DevExpress.XtraEditors.LabelControl lb_fType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
 
         private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
 
         private DevExpress.XtraEditors.LabelControl lb_ischeck;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkRes;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
 
         private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
         private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
 
         private DevExpress.XtraEditors.LabelControl lb_billNo;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private UserControl.UcLookSupplier txt_suppId;
         private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1288,7 +1338,6 @@
         private DevExpress.XtraEditors.LabelControl lb_remark;
         private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraEditors.CheckEdit txt_ischeck;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1299,5 +1348,44 @@
         private System.Windows.Forms.Label label1;
         private DevExpress.XtraEditors.TextEdit txtDepotsId;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView gridView1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fType;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_urgentFlag;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fstatus;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn2;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_billNo;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createBy;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createDate;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkUser;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkDate;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotsCode;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn4;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppNo;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn5;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_remark;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+        private DevExpress.XtraEditors.SimpleButton btnTui;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 672528b..3c206e0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -77,28 +77,66 @@
                 //璧嬪�肩粰鏄庣粏琛�
                 frm.UpdateParent += (ss, ee) =>
                 {
-                    var lst = new List<string>();
-                    lst = ee.StringList;
-                    var _obj = lst;
-                    var strReturn = UtilityHelper.HttpPost("",
-                        "MesInvItemArnDetailManager/GetListPageByCgmxGuid",
-                        JsonConvert.SerializeObject(_obj));
-                    var dt = UtilityHelper.ReturnToList(strReturn);
-                    DataTable _newTable = dt.rtnData;
-                    DataTable _oldTable = (DataTable)gcMx1.DataSource;
-                    DataRow[] sourceRows = _newTable.Select();
-                    for (int i = 0; i < sourceRows.Length; i++)
+                    try
                     {
-                        _oldTable.ImportRow(sourceRows[i]);
+                        var lst = new List<string>();
+                        lst = ee.StringList;
+                        var _obj = lst;
+                        var strReturn = UtilityHelper.HttpPost("",
+                            "MesInvItemArnDetailManager/GetListPageByCgmxGuid",
+                            JsonConvert.SerializeObject(_obj));
+                        var dt = UtilityHelper.ReturnToList(strReturn);
+                        DataTable _newTable = dt.rtnData;
+                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
+                        DataRow[] sourceRows = _newTable.Select();
+                        for (int i = 0; i < sourceRows.Length; i++)
+                        {
+                            _oldTable.ImportRow(sourceRows[i]);
+                        }
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = _oldTable;
+                        gcMx1.ForceInitialize();
                     }
-                    gcMx1.BindingContext = new BindingContext();
-                    gcMx1.DataSource = _oldTable;
-                    gcMx1.ForceInitialize();
+                    catch (Exception ex)
+                    {
+
+                        MessageBox.Show(ex.Message);
+                    }
+
                 };
                 frm.ShowDialog();
             };
-        }
 
+            btnTui.Click += (s, e) =>
+            {
+                var lst = new List<string>();
+                for (var i = 0; i < gvMx1.DataRowCount; i++)
+                {
+                    var row = gvMx1.GetDataRow(i);
+                    if (row != null && row["gvChk"].ToString().ToUpper() == "true".ToUpper())
+                        lst.Add(row["guid"].ToString());
+                }
+               // MessageBox.Show(lst.Count.ToString());
+                var _obj = lst;
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("",
+                        _webServiceName + "DeleteModel",
+                        JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        UtilityHelper.JumpToTab(xtraTabControl1, 0);
+                        getPageList(1, UtilityHelper.GetPageSize());
+                    }
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            };
+        }
 
         /// <summary>
         ///     鍙屽嚮浜嬩欢
@@ -342,8 +380,7 @@
                     {
                         Guid = _guid,
                         AboutGuid = Guid.Parse(row["aboutGuid"].ToString()),
-                        ItemNo = row["itemNo"].ToString(),
-                        //ItemId= int.Parse( row["itemId"].ToString()),
+                        ItemId = int.Parse(row["itemId"].ToString()),
                         Quantity = decimal.Parse(row["quantity"].ToString())
                     });
                 }
@@ -433,7 +470,7 @@
                         gvList);
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
-                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
+                    foreach (var a in _job["rtnData"]["listDya"]) array.Add(a);
                     var dt =
                         JsonConvert.DeserializeObject<DataTable>(
                             array.ToString());
@@ -442,6 +479,7 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+
                     }
                     else
                     {
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index b61f5a8..123c671 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -31,11 +31,8 @@
         {
             this.gvMx1demandDocumentLineId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1demandSource = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1changeFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1planTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1demandTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1sourceDocumentType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -51,8 +48,6 @@
             this.gvMx1freezer = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1businessFreeze = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1businessClose = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1batchNumber = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1outsourcingOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1remarks = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1isGift = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1latestDeliveryDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -65,70 +60,15 @@
             this.gvMx1purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_changereason = new DevExpress.XtraEditors.LabelControl();
-            this.txt_changereason = new DevExpress.XtraEditors.TextEdit();
-            this.lb_checkFalg = new DevExpress.XtraEditors.LabelControl();
-            this.lb_ebelnK3id = new DevExpress.XtraEditors.LabelControl();
-            this.txt_ebelnK3id = new DevExpress.XtraEditors.TextEdit();
-            this.lb_erpCheckDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_erpCheckDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_erpCheckBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
-            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
-            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_lastupdateDate = 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_cancellationDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancellationDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_cancellationPerson = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancellationPerson = new DevExpress.XtraEditors.TextEdit();
-            this.lb_cancellationStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_cancellationStatus = new DevExpress.XtraEditors.TextEdit();
-            this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
-            this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
-            this.lb_transportMethod = new DevExpress.XtraEditors.LabelControl();
-            this.txt_transportMethod = new DevExpress.XtraEditors.TextEdit();
-            this.lb_email = new DevExpress.XtraEditors.LabelControl();
-            this.txt_email = new DevExpress.XtraEditors.TextEdit();
-            this.lb_paymentParty = new DevExpress.XtraEditors.LabelControl();
-            this.txt_paymentParty = new DevExpress.XtraEditors.TextEdit();
-            this.lb_settlementParty = new DevExpress.XtraEditors.LabelControl();
-            this.txt_settlementParty = new DevExpress.XtraEditors.TextEdit();
-            this.lb_qualityReq = new DevExpress.XtraEditors.LabelControl();
-            this.txt_qualityReq = new DevExpress.XtraEditors.TextEdit();
-            this.lb_purchaser = new DevExpress.XtraEditors.LabelControl();
-            this.txt_purchaser = new DevExpress.XtraEditors.TextEdit();
-            this.lb_qtyAcceptance = new DevExpress.XtraEditors.LabelControl();
-            this.txt_qtyAcceptance = new DevExpress.XtraEditors.TextEdit();
-            this.lb_purchaseGroup = new DevExpress.XtraEditors.LabelControl();
-            this.txt_purchaseGroup = new DevExpress.XtraEditors.TextEdit();
-            this.lb_purchaseDept = new DevExpress.XtraEditors.LabelControl();
-            this.txt_purchaseDept = new DevExpress.XtraEditors.TextEdit();
-            this.lb_purchaseOrg = new DevExpress.XtraEditors.LabelControl();
-            this.txt_purchaseOrg = new DevExpress.XtraEditors.TextEdit();
-            this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
             this.lb_supplier = new DevExpress.XtraEditors.LabelControl();
-            this.txt_supplier = new DevExpress.XtraEditors.TextEdit();
             this.lb_purchaseDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_purchaseDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_businessType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_businessType = new DevExpress.XtraEditors.TextEdit();
-            this.lb_documentType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_documentType = new DevExpress.XtraEditors.TextEdit();
             this.lb_documentStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_documentStatus = new DevExpress.XtraEditors.TextEdit();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
@@ -136,24 +76,13 @@
             this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
             this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_qtyAcceptance = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_settlementParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_cancellationStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_cancellationPerson = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_cancellationDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_erpCheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_erpCheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_checkBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_checkFalg = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_changereason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -168,57 +97,53 @@
             this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_supplier = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_closeStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_purchaseDept = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_qtyAcceptance = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_purchaser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_qualityReq = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_cancellationStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_cancellationPerson = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_cancellationDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_changereason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_settlementParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gv_erpCheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gv_erpCheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.txt_checkFalg = new DevExpress.XtraEditors.CheckEdit();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
+            this.lbGuid = new DevExpress.XtraEditors.LabelControl();
+            this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationPerson.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_transportMethod.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_paymentParty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_settlementParty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qualityReq.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qtyAcceptance.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseGroup.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseDept.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseOrg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_supplier.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -229,7 +154,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1demandDocumentLineId
@@ -242,7 +166,7 @@
             this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
             this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
             this.gvMx1demandDocumentLineId.Visible = true;
-            this.gvMx1demandDocumentLineId.VisibleIndex = 38;
+            this.gvMx1demandDocumentLineId.VisibleIndex = 33;
             this.gvMx1demandDocumentLineId.Width = 100;
             // 
             // gvMx1demandDocumentId
@@ -255,21 +179,8 @@
             this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId";
             this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
             this.gvMx1demandDocumentId.Visible = true;
-            this.gvMx1demandDocumentId.VisibleIndex = 37;
+            this.gvMx1demandDocumentId.VisibleIndex = 15;
             this.gvMx1demandDocumentId.Width = 100;
-            // 
-            // gvMx1demandSource
-            // 
-            this.gvMx1demandSource.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1demandSource.AppearanceCell.Options.UseFont = true;
-            this.gvMx1demandSource.Caption = "闇�姹傛潵婧�";
-            this.gvMx1demandSource.FieldName = "demandSource";
-            this.gvMx1demandSource.MinWidth = 100;
-            this.gvMx1demandSource.Name = "gvMx1demandSource";
-            this.gvMx1demandSource.Tag = "query_a.DEMAND_SOURCE";
-            this.gvMx1demandSource.Visible = true;
-            this.gvMx1demandSource.VisibleIndex = 36;
-            this.gvMx1demandSource.Width = 100;
             // 
             // gvMx1changeFlag
             // 
@@ -281,7 +192,7 @@
             this.gvMx1changeFlag.Name = "gvMx1changeFlag";
             this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG";
             this.gvMx1changeFlag.Visible = true;
-            this.gvMx1changeFlag.VisibleIndex = 35;
+            this.gvMx1changeFlag.VisibleIndex = 32;
             this.gvMx1changeFlag.Width = 100;
             // 
             // gvMx1planTrackingId
@@ -294,34 +205,8 @@
             this.gvMx1planTrackingId.Name = "gvMx1planTrackingId";
             this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
             this.gvMx1planTrackingId.Visible = true;
-            this.gvMx1planTrackingId.VisibleIndex = 34;
+            this.gvMx1planTrackingId.VisibleIndex = 31;
             this.gvMx1planTrackingId.Width = 100;
-            // 
-            // gvMx1demandTrackingId
-            // 
-            this.gvMx1demandTrackingId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1demandTrackingId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1demandTrackingId.Caption = "闇�姹傝窡韪彿";
-            this.gvMx1demandTrackingId.FieldName = "demandTrackingId";
-            this.gvMx1demandTrackingId.MinWidth = 100;
-            this.gvMx1demandTrackingId.Name = "gvMx1demandTrackingId";
-            this.gvMx1demandTrackingId.Tag = "query_a.DEMAND_TRACKING_ID";
-            this.gvMx1demandTrackingId.Visible = true;
-            this.gvMx1demandTrackingId.VisibleIndex = 33;
-            this.gvMx1demandTrackingId.Width = 100;
-            // 
-            // gvMx1sourceDocumentId
-            // 
-            this.gvMx1sourceDocumentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1sourceDocumentId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sourceDocumentId.Caption = "鏉ユ簮鍗曟嵁鍙�";
-            this.gvMx1sourceDocumentId.FieldName = "sourceDocumentId";
-            this.gvMx1sourceDocumentId.MinWidth = 100;
-            this.gvMx1sourceDocumentId.Name = "gvMx1sourceDocumentId";
-            this.gvMx1sourceDocumentId.Tag = "query_a.SOURCE_DOCUMENT_ID";
-            this.gvMx1sourceDocumentId.Visible = true;
-            this.gvMx1sourceDocumentId.VisibleIndex = 32;
-            this.gvMx1sourceDocumentId.Width = 100;
             // 
             // gvMx1sourceDocumentType
             // 
@@ -333,7 +218,7 @@
             this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
             this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
             this.gvMx1sourceDocumentType.Visible = true;
-            this.gvMx1sourceDocumentType.VisibleIndex = 31;
+            this.gvMx1sourceDocumentType.VisibleIndex = 30;
             this.gvMx1sourceDocumentType.Width = 100;
             // 
             // gvMx1returnableStoredQty
@@ -346,7 +231,7 @@
             this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
             this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
             this.gvMx1returnableStoredQty.Visible = true;
-            this.gvMx1returnableStoredQty.VisibleIndex = 30;
+            this.gvMx1returnableStoredQty.VisibleIndex = 29;
             this.gvMx1returnableStoredQty.Width = 100;
             // 
             // gvMx1returnableReceivedQty
@@ -359,7 +244,7 @@
             this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
             this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
             this.gvMx1returnableReceivedQty.Visible = true;
-            this.gvMx1returnableReceivedQty.VisibleIndex = 29;
+            this.gvMx1returnableReceivedQty.VisibleIndex = 28;
             this.gvMx1returnableReceivedQty.Width = 100;
             // 
             // gvMx1totalReturnedQty
@@ -372,7 +257,7 @@
             this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
             this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
             this.gvMx1totalReturnedQty.Visible = true;
-            this.gvMx1totalReturnedQty.VisibleIndex = 28;
+            this.gvMx1totalReturnedQty.VisibleIndex = 27;
             this.gvMx1totalReturnedQty.Width = 100;
             // 
             // gvMx1remainingStoredQty
@@ -385,7 +270,7 @@
             this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
             this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
             this.gvMx1remainingStoredQty.Visible = true;
-            this.gvMx1remainingStoredQty.VisibleIndex = 27;
+            this.gvMx1remainingStoredQty.VisibleIndex = 26;
             this.gvMx1remainingStoredQty.Width = 100;
             // 
             // gvMx1totalStoredQty
@@ -398,7 +283,7 @@
             this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
             this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
             this.gvMx1totalStoredQty.Visible = true;
-            this.gvMx1totalStoredQty.VisibleIndex = 26;
+            this.gvMx1totalStoredQty.VisibleIndex = 25;
             this.gvMx1totalStoredQty.Width = 100;
             // 
             // gvMx1remainingReceivedQty
@@ -411,7 +296,7 @@
             this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty";
             this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY";
             this.gvMx1remainingReceivedQty.Visible = true;
-            this.gvMx1remainingReceivedQty.VisibleIndex = 24;
+            this.gvMx1remainingReceivedQty.VisibleIndex = 13;
             this.gvMx1remainingReceivedQty.Width = 100;
             // 
             // gvMx1totalReceivedQty
@@ -424,7 +309,7 @@
             this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
             this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
             this.gvMx1totalReceivedQty.Visible = true;
-            this.gvMx1totalReceivedQty.VisibleIndex = 23;
+            this.gvMx1totalReceivedQty.VisibleIndex = 24;
             this.gvMx1totalReceivedQty.Width = 100;
             // 
             // gvMx1terminateTime
@@ -437,7 +322,7 @@
             this.gvMx1terminateTime.Name = "gvMx1terminateTime";
             this.gvMx1terminateTime.Tag = "query_a.TERMINATE_TIME";
             this.gvMx1terminateTime.Visible = true;
-            this.gvMx1terminateTime.VisibleIndex = 22;
+            this.gvMx1terminateTime.VisibleIndex = 23;
             this.gvMx1terminateTime.Width = 100;
             // 
             // gvMx1terminator
@@ -450,20 +335,20 @@
             this.gvMx1terminator.Name = "gvMx1terminator";
             this.gvMx1terminator.Tag = "query_a.TERMINATOR";
             this.gvMx1terminator.Visible = true;
-            this.gvMx1terminator.VisibleIndex = 20;
+            this.gvMx1terminator.VisibleIndex = 22;
             this.gvMx1terminator.Width = 100;
             // 
             // gvMx1businessTerminate
             // 
             this.gvMx1businessTerminate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1businessTerminate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1businessTerminate.Caption = "涓氬姟缁堟鏍囪瘑";
+            this.gvMx1businessTerminate.Caption = "涓氬姟缁堟  A:姝e父锛孊:涓氬姟缁堟";
             this.gvMx1businessTerminate.FieldName = "businessTerminate";
             this.gvMx1businessTerminate.MinWidth = 50;
             this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
             this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
             this.gvMx1businessTerminate.Visible = true;
-            this.gvMx1businessTerminate.VisibleIndex = 25;
+            this.gvMx1businessTerminate.VisibleIndex = 5;
             this.gvMx1businessTerminate.Width = 94;
             // 
             // gvMx1freezeTime
@@ -476,7 +361,7 @@
             this.gvMx1freezeTime.Name = "gvMx1freezeTime";
             this.gvMx1freezeTime.Tag = "query_a.FREEZE_TIME";
             this.gvMx1freezeTime.Visible = true;
-            this.gvMx1freezeTime.VisibleIndex = 18;
+            this.gvMx1freezeTime.VisibleIndex = 21;
             this.gvMx1freezeTime.Width = 100;
             // 
             // gvMx1freezer
@@ -489,7 +374,7 @@
             this.gvMx1freezer.Name = "gvMx1freezer";
             this.gvMx1freezer.Tag = "query_a.FREEZER";
             this.gvMx1freezer.Visible = true;
-            this.gvMx1freezer.VisibleIndex = 17;
+            this.gvMx1freezer.VisibleIndex = 20;
             this.gvMx1freezer.Width = 100;
             // 
             // gvMx1businessFreeze
@@ -502,7 +387,7 @@
             this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
             this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
             this.gvMx1businessFreeze.Visible = true;
-            this.gvMx1businessFreeze.VisibleIndex = 21;
+            this.gvMx1businessFreeze.VisibleIndex = 19;
             this.gvMx1businessFreeze.Width = 94;
             // 
             // gvMx1businessClose
@@ -515,34 +400,8 @@
             this.gvMx1businessClose.Name = "gvMx1businessClose";
             this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
             this.gvMx1businessClose.Visible = true;
-            this.gvMx1businessClose.VisibleIndex = 16;
+            this.gvMx1businessClose.VisibleIndex = 18;
             this.gvMx1businessClose.Width = 100;
-            // 
-            // gvMx1batchNumber
-            // 
-            this.gvMx1batchNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1batchNumber.AppearanceCell.Options.UseFont = true;
-            this.gvMx1batchNumber.Caption = "鎵规鍙�";
-            this.gvMx1batchNumber.FieldName = "batchNumber";
-            this.gvMx1batchNumber.MinWidth = 50;
-            this.gvMx1batchNumber.Name = "gvMx1batchNumber";
-            this.gvMx1batchNumber.Tag = "query_a.BATCH_NUMBER";
-            this.gvMx1batchNumber.Visible = true;
-            this.gvMx1batchNumber.VisibleIndex = 19;
-            this.gvMx1batchNumber.Width = 94;
-            // 
-            // gvMx1outsourcingOrderId
-            // 
-            this.gvMx1outsourcingOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1outsourcingOrderId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1outsourcingOrderId.Caption = "濮斿璁㈠崟鍙�";
-            this.gvMx1outsourcingOrderId.FieldName = "outsourcingOrderId";
-            this.gvMx1outsourcingOrderId.MinWidth = 100;
-            this.gvMx1outsourcingOrderId.Name = "gvMx1outsourcingOrderId";
-            this.gvMx1outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID";
-            this.gvMx1outsourcingOrderId.Visible = true;
-            this.gvMx1outsourcingOrderId.VisibleIndex = 15;
-            this.gvMx1outsourcingOrderId.Width = 100;
             // 
             // gvMx1remarks
             // 
@@ -554,7 +413,7 @@
             this.gvMx1remarks.Name = "gvMx1remarks";
             this.gvMx1remarks.Tag = "query_a.REMARKS";
             this.gvMx1remarks.Visible = true;
-            this.gvMx1remarks.VisibleIndex = 14;
+            this.gvMx1remarks.VisibleIndex = 17;
             this.gvMx1remarks.Width = 100;
             // 
             // gvMx1isGift
@@ -567,7 +426,7 @@
             this.gvMx1isGift.Name = "gvMx1isGift";
             this.gvMx1isGift.Tag = "query_a.IS_GIFT";
             this.gvMx1isGift.Visible = true;
-            this.gvMx1isGift.VisibleIndex = 13;
+            this.gvMx1isGift.VisibleIndex = 16;
             this.gvMx1isGift.Width = 100;
             // 
             // gvMx1latestDeliveryDate
@@ -580,7 +439,7 @@
             this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
             this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
             this.gvMx1latestDeliveryDate.Visible = true;
-            this.gvMx1latestDeliveryDate.VisibleIndex = 12;
+            this.gvMx1latestDeliveryDate.VisibleIndex = 10;
             this.gvMx1latestDeliveryDate.Width = 200;
             // 
             // gvMx1earliestDeliveryDate
@@ -593,7 +452,7 @@
             this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
             this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
             this.gvMx1earliestDeliveryDate.Visible = true;
-            this.gvMx1earliestDeliveryDate.VisibleIndex = 11;
+            this.gvMx1earliestDeliveryDate.VisibleIndex = 9;
             this.gvMx1earliestDeliveryDate.Width = 200;
             // 
             // gvMx1deliveryDate
@@ -606,7 +465,7 @@
             this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
             this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
             this.gvMx1deliveryDate.Visible = true;
-            this.gvMx1deliveryDate.VisibleIndex = 10;
+            this.gvMx1deliveryDate.VisibleIndex = 8;
             this.gvMx1deliveryDate.Width = 200;
             // 
             // gvMx1pricingQty
@@ -619,7 +478,7 @@
             this.gvMx1pricingQty.Name = "gvMx1pricingQty";
             this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
             this.gvMx1pricingQty.Visible = true;
-            this.gvMx1pricingQty.VisibleIndex = 9;
+            this.gvMx1pricingQty.VisibleIndex = 6;
             this.gvMx1pricingQty.Width = 100;
             // 
             // gvMx1pricingUnit
@@ -632,7 +491,7 @@
             this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
             this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
             this.gvMx1pricingUnit.Visible = true;
-            this.gvMx1pricingUnit.VisibleIndex = 8;
+            this.gvMx1pricingUnit.VisibleIndex = 7;
             this.gvMx1pricingUnit.Width = 100;
             // 
             // gvMx1inventoryUnit
@@ -645,7 +504,7 @@
             this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
             this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
             this.gvMx1inventoryUnit.Visible = true;
-            this.gvMx1inventoryUnit.VisibleIndex = 7;
+            this.gvMx1inventoryUnit.VisibleIndex = 14;
             this.gvMx1inventoryUnit.Width = 100;
             // 
             // gvMx1purchaseQty
@@ -658,7 +517,7 @@
             this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
             this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
             this.gvMx1purchaseQty.Visible = true;
-            this.gvMx1purchaseQty.VisibleIndex = 6;
+            this.gvMx1purchaseQty.VisibleIndex = 11;
             this.gvMx1purchaseQty.Width = 100;
             // 
             // gvMx1purchaseUnit
@@ -666,12 +525,12 @@
             this.gvMx1purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1purchaseUnit.AppearanceCell.Options.UseFont = true;
             this.gvMx1purchaseUnit.Caption = "閲囪喘鍗曚綅";
-            this.gvMx1purchaseUnit.FieldName = "purchaseUnit";
+            this.gvMx1purchaseUnit.FieldName = "cgFname";
             this.gvMx1purchaseUnit.MinWidth = 100;
             this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
             this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
             this.gvMx1purchaseUnit.Visible = true;
-            this.gvMx1purchaseUnit.VisibleIndex = 5;
+            this.gvMx1purchaseUnit.VisibleIndex = 12;
             this.gvMx1purchaseUnit.Width = 100;
             // 
             // gvMx1itemId
@@ -700,22 +559,11 @@
             this.gvMx1salesOrderId.VisibleIndex = 1;
             this.gvMx1salesOrderId.Width = 150;
             // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
-            // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1361, 317);
+            this.tabMxPage1.Size = new System.Drawing.Size(1361, 482);
             this.tabMxPage1.Text = "閲囪喘鍗曟槑缁�";
             // 
             // gcMx1
@@ -724,7 +572,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1361, 317);
+            this.gcMx1.Size = new System.Drawing.Size(1361, 482);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -733,44 +581,38 @@
             // 
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_erpid,
-            this.gvMx1guid,
             this.gvMx1salesOrderId,
             this.gvMx1itemId,
             this.gridColumn2,
             this.gridColumn1,
-            this.gvMx1purchaseQty,
-            this.gvMx1purchaseUnit,
-            this.gvMx1inventoryUnit,
-            this.gvMx1pricingUnit,
+            this.gvMx1businessTerminate,
             this.gvMx1pricingQty,
+            this.gvMx1pricingUnit,
             this.gvMx1deliveryDate,
             this.gvMx1earliestDeliveryDate,
             this.gvMx1latestDeliveryDate,
+            this.gvMx1purchaseQty,
+            this.gvMx1purchaseUnit,
+            this.gvMx1remainingReceivedQty,
+            this.gvMx1inventoryUnit,
+            this.gvMx1demandDocumentId,
             this.gvMx1isGift,
             this.gvMx1remarks,
-            this.gvMx1outsourcingOrderId,
-            this.gvMx1batchNumber,
             this.gvMx1businessClose,
             this.gvMx1businessFreeze,
             this.gvMx1freezer,
             this.gvMx1freezeTime,
-            this.gvMx1businessTerminate,
             this.gvMx1terminator,
             this.gvMx1terminateTime,
             this.gvMx1totalReceivedQty,
-            this.gvMx1remainingReceivedQty,
             this.gvMx1totalStoredQty,
             this.gvMx1remainingStoredQty,
             this.gvMx1totalReturnedQty,
             this.gvMx1returnableReceivedQty,
             this.gvMx1returnableStoredQty,
             this.gvMx1sourceDocumentType,
-            this.gvMx1sourceDocumentId,
-            this.gvMx1demandTrackingId,
             this.gvMx1planTrackingId,
             this.gvMx1changeFlag,
-            this.gvMx1demandSource,
-            this.gvMx1demandDocumentId,
             this.gvMx1demandDocumentLineId});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -792,6 +634,7 @@
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn2.FieldName = "itemNo";
             this.gridColumn2.MinWidth = 100;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
@@ -801,477 +644,22 @@
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn1.FieldName = "itemName";
             this.gridColumn1.MinWidth = 100;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 4;
             this.gridColumn1.Width = 100;
             // 
-            // lb_changereason
-            // 
-            this.lb_changereason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_changereason.Appearance.Options.UseFont = true;
-            this.lb_changereason.Location = new System.Drawing.Point(532, 183);
-            this.lb_changereason.Name = "lb_changereason";
-            this.lb_changereason.Size = new System.Drawing.Size(73, 21);
-            this.lb_changereason.TabIndex = 450;
-            this.lb_changereason.Text = "鍙樻洿鍘熷洜 ";
-            // 
-            // txt_changereason
-            // 
-            this.txt_changereason.Location = new System.Drawing.Point(614, 179);
-            this.txt_changereason.Name = "txt_changereason";
-            this.txt_changereason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_changereason.Properties.Appearance.Options.UseFont = true;
-            this.txt_changereason.Size = new System.Drawing.Size(150, 28);
-            this.txt_changereason.TabIndex = 450;
-            // 
-            // lb_checkFalg
-            // 
-            this.lb_checkFalg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_checkFalg.Appearance.Options.UseFont = true;
-            this.lb_checkFalg.Location = new System.Drawing.Point(789, 183);
-            this.lb_checkFalg.Name = "lb_checkFalg";
-            this.lb_checkFalg.Size = new System.Drawing.Size(73, 21);
-            this.lb_checkFalg.TabIndex = 387;
-            this.lb_checkFalg.Text = "瀹℃牳鏍囪瘑 ";
-            // 
-            // lb_ebelnK3id
-            // 
-            this.lb_ebelnK3id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_ebelnK3id.Appearance.Options.UseFont = true;
-            this.lb_ebelnK3id.Location = new System.Drawing.Point(775, 148);
-            this.lb_ebelnK3id.Name = "lb_ebelnK3id";
-            this.lb_ebelnK3id.Size = new System.Drawing.Size(87, 21);
-            this.lb_ebelnK3id.TabIndex = 360;
-            this.lb_ebelnK3id.Text = "ERP鐨処D鍙� ";
-            // 
-            // txt_ebelnK3id
-            // 
-            this.txt_ebelnK3id.Location = new System.Drawing.Point(871, 144);
-            this.txt_ebelnK3id.Name = "txt_ebelnK3id";
-            this.txt_ebelnK3id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_ebelnK3id.Properties.Appearance.Options.UseFont = true;
-            this.txt_ebelnK3id.Size = new System.Drawing.Size(150, 28);
-            this.txt_ebelnK3id.TabIndex = 360;
-            // 
-            // lb_erpCheckDate
-            // 
-            this.lb_erpCheckDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_erpCheckDate.Appearance.Options.UseFont = true;
-            this.lb_erpCheckDate.Location = new System.Drawing.Point(1029, 182);
-            this.lb_erpCheckDate.Name = "lb_erpCheckDate";
-            this.lb_erpCheckDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_erpCheckDate.TabIndex = 351;
-            this.lb_erpCheckDate.Text = "瀹℃牳鏃堕棿 ";
-            // 
-            // txt_erpCheckDate
-            // 
-            this.txt_erpCheckDate.Location = new System.Drawing.Point(1109, 178);
-            this.txt_erpCheckDate.Name = "txt_erpCheckDate";
-            this.txt_erpCheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_erpCheckDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpCheckDate.Size = new System.Drawing.Size(174, 28);
-            this.txt_erpCheckDate.TabIndex = 351;
-            // 
-            // lb_erpCheckBy
-            // 
-            this.lb_erpCheckBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_erpCheckBy.Appearance.Options.UseFont = true;
-            this.lb_erpCheckBy.Location = new System.Drawing.Point(1046, 148);
-            this.lb_erpCheckBy.Name = "lb_erpCheckBy";
-            this.lb_erpCheckBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_erpCheckBy.TabIndex = 343;
-            this.lb_erpCheckBy.Text = "瀹℃牳浜� ";
-            // 
-            // txt_erpCheckBy
-            // 
-            this.txt_erpCheckBy.Location = new System.Drawing.Point(1109, 144);
-            this.txt_erpCheckBy.Name = "txt_erpCheckBy";
-            this.txt_erpCheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_erpCheckBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpCheckBy.Size = new System.Drawing.Size(174, 28);
-            this.txt_erpCheckBy.TabIndex = 343;
-            // 
-            // lb_lastupdateBy
-            // 
-            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
-            this.lb_lastupdateBy.Location = new System.Drawing.Point(1046, 116);
-            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
-            this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_lastupdateBy.TabIndex = 336;
-            this.lb_lastupdateBy.Text = "淇敼浜� ";
-            // 
-            // txt_lastupdateBy
-            // 
-            this.txt_lastupdateBy.Location = new System.Drawing.Point(1109, 112);
-            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
-            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateBy.Size = new System.Drawing.Size(174, 28);
-            this.txt_lastupdateBy.TabIndex = 336;
-            // 
-            // lb_lastupdateDate
-            // 
-            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
-            this.lb_lastupdateDate.Location = new System.Drawing.Point(1029, 84);
-            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
-            this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_lastupdateDate.TabIndex = 327;
-            this.lb_lastupdateDate.Text = "淇敼鏃堕棿 ";
-            // 
-            // txt_lastupdateDate
-            // 
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(1109, 80);
-            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
-            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateDate.Size = new System.Drawing.Size(174, 28);
-            this.txt_lastupdateDate.TabIndex = 327;
-            // 
-            // 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(1029, 52);
-            this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_createDate.TabIndex = 319;
-            this.lb_createDate.Text = "鍒涘缓鏃ユ湡 ";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(1109, 48);
-            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(174, 28);
-            this.txt_createDate.TabIndex = 319;
-            // 
-            // 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(1046, 18);
-            this.lb_createBy.Name = "lb_createBy";
-            this.lb_createBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_createBy.TabIndex = 312;
-            this.lb_createBy.Text = "鍒涘缓浜� ";
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Location = new System.Drawing.Point(1109, 14);
-            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(174, 28);
-            this.txt_createBy.TabIndex = 312;
-            // 
-            // lb_cancellationDate
-            // 
-            this.lb_cancellationDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancellationDate.Appearance.Options.UseFont = true;
-            this.lb_cancellationDate.Location = new System.Drawing.Point(536, 148);
-            this.lb_cancellationDate.Name = "lb_cancellationDate";
-            this.lb_cancellationDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_cancellationDate.TabIndex = 306;
-            this.lb_cancellationDate.Text = "浣滃簾鏃ユ湡 ";
-            // 
-            // txt_cancellationDate
-            // 
-            this.txt_cancellationDate.Location = new System.Drawing.Point(614, 144);
-            this.txt_cancellationDate.Name = "txt_cancellationDate";
-            this.txt_cancellationDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancellationDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancellationDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancellationDate.TabIndex = 306;
-            // 
-            // lb_cancellationPerson
-            // 
-            this.lb_cancellationPerson.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancellationPerson.Appearance.Options.UseFont = true;
-            this.lb_cancellationPerson.Location = new System.Drawing.Point(287, 182);
-            this.lb_cancellationPerson.Name = "lb_cancellationPerson";
-            this.lb_cancellationPerson.Size = new System.Drawing.Size(56, 21);
-            this.lb_cancellationPerson.TabIndex = 298;
-            this.lb_cancellationPerson.Text = "浣滃簾浜� ";
-            // 
-            // txt_cancellationPerson
-            // 
-            this.txt_cancellationPerson.Location = new System.Drawing.Point(349, 178);
-            this.txt_cancellationPerson.Name = "txt_cancellationPerson";
-            this.txt_cancellationPerson.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancellationPerson.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancellationPerson.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancellationPerson.TabIndex = 298;
-            // 
-            // lb_cancellationStatus
-            // 
-            this.lb_cancellationStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_cancellationStatus.Appearance.Options.UseFont = true;
-            this.lb_cancellationStatus.Location = new System.Drawing.Point(20, 182);
-            this.lb_cancellationStatus.Name = "lb_cancellationStatus";
-            this.lb_cancellationStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_cancellationStatus.TabIndex = 291;
-            this.lb_cancellationStatus.Text = "浣滃簾鐘舵�� ";
-            // 
-            // txt_cancellationStatus
-            // 
-            this.txt_cancellationStatus.Location = new System.Drawing.Point(97, 178);
-            this.txt_cancellationStatus.Name = "txt_cancellationStatus";
-            this.txt_cancellationStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_cancellationStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancellationStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_cancellationStatus.TabIndex = 291;
-            // 
-            // lb_remarks
-            // 
-            this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_remarks.Appearance.Options.UseFont = true;
-            this.lb_remarks.Location = new System.Drawing.Point(823, 116);
-            this.lb_remarks.Name = "lb_remarks";
-            this.lb_remarks.Size = new System.Drawing.Size(39, 21);
-            this.lb_remarks.TabIndex = 280;
-            this.lb_remarks.Text = "澶囨敞 ";
-            // 
-            // txt_remarks
-            // 
-            this.txt_remarks.Location = new System.Drawing.Point(871, 112);
-            this.txt_remarks.Name = "txt_remarks";
-            this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(150, 28);
-            this.txt_remarks.TabIndex = 280;
-            // 
-            // lb_transportMethod
-            // 
-            this.lb_transportMethod.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_transportMethod.Appearance.Options.UseFont = true;
-            this.lb_transportMethod.Location = new System.Drawing.Point(536, 116);
-            this.lb_transportMethod.Name = "lb_transportMethod";
-            this.lb_transportMethod.Size = new System.Drawing.Size(73, 21);
-            this.lb_transportMethod.TabIndex = 273;
-            this.lb_transportMethod.Text = "杩愯緭鏂瑰紡 ";
-            // 
-            // txt_transportMethod
-            // 
-            this.txt_transportMethod.Location = new System.Drawing.Point(614, 112);
-            this.txt_transportMethod.Name = "txt_transportMethod";
-            this.txt_transportMethod.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_transportMethod.Properties.Appearance.Options.UseFont = true;
-            this.txt_transportMethod.Size = new System.Drawing.Size(150, 28);
-            this.txt_transportMethod.TabIndex = 273;
-            // 
-            // lb_email
-            // 
-            this.lb_email.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_email.Appearance.Options.UseFont = true;
-            this.lb_email.Location = new System.Drawing.Point(304, 148);
-            this.lb_email.Name = "lb_email";
-            this.lb_email.Size = new System.Drawing.Size(39, 21);
-            this.lb_email.TabIndex = 267;
-            this.lb_email.Text = "閭 ";
-            // 
-            // txt_email
-            // 
-            this.txt_email.Location = new System.Drawing.Point(349, 144);
-            this.txt_email.Name = "txt_email";
-            this.txt_email.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_email.Properties.Appearance.Options.UseFont = true;
-            this.txt_email.Size = new System.Drawing.Size(150, 28);
-            this.txt_email.TabIndex = 267;
-            // 
-            // lb_paymentParty
-            // 
-            this.lb_paymentParty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_paymentParty.Appearance.Options.UseFont = true;
-            this.lb_paymentParty.Location = new System.Drawing.Point(37, 148);
-            this.lb_paymentParty.Name = "lb_paymentParty";
-            this.lb_paymentParty.Size = new System.Drawing.Size(56, 21);
-            this.lb_paymentParty.TabIndex = 262;
-            this.lb_paymentParty.Text = "鏀舵鏂� ";
-            // 
-            // txt_paymentParty
-            // 
-            this.txt_paymentParty.Location = new System.Drawing.Point(97, 144);
-            this.txt_paymentParty.Name = "txt_paymentParty";
-            this.txt_paymentParty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_paymentParty.Properties.Appearance.Options.UseFont = true;
-            this.txt_paymentParty.Size = new System.Drawing.Size(150, 28);
-            this.txt_paymentParty.TabIndex = 262;
-            // 
-            // lb_settlementParty
-            // 
-            this.lb_settlementParty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_settlementParty.Appearance.Options.UseFont = true;
-            this.lb_settlementParty.Location = new System.Drawing.Point(806, 84);
-            this.lb_settlementParty.Name = "lb_settlementParty";
-            this.lb_settlementParty.Size = new System.Drawing.Size(56, 21);
-            this.lb_settlementParty.TabIndex = 258;
-            this.lb_settlementParty.Text = "缁撶畻鏂� ";
-            // 
-            // txt_settlementParty
-            // 
-            this.txt_settlementParty.Location = new System.Drawing.Point(871, 80);
-            this.txt_settlementParty.Name = "txt_settlementParty";
-            this.txt_settlementParty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_settlementParty.Properties.Appearance.Options.UseFont = true;
-            this.txt_settlementParty.Size = new System.Drawing.Size(150, 28);
-            this.txt_settlementParty.TabIndex = 258;
-            // 
-            // lb_qualityReq
-            // 
-            this.lb_qualityReq.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_qualityReq.Appearance.Options.UseFont = true;
-            this.lb_qualityReq.Location = new System.Drawing.Point(536, 84);
-            this.lb_qualityReq.Name = "lb_qualityReq";
-            this.lb_qualityReq.Size = new System.Drawing.Size(73, 21);
-            this.lb_qualityReq.TabIndex = 252;
-            this.lb_qualityReq.Text = "璐ㄩ噺瑕佹眰 ";
-            // 
-            // txt_qualityReq
-            // 
-            this.txt_qualityReq.Location = new System.Drawing.Point(614, 80);
-            this.txt_qualityReq.Name = "txt_qualityReq";
-            this.txt_qualityReq.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_qualityReq.Properties.Appearance.Options.UseFont = true;
-            this.txt_qualityReq.Size = new System.Drawing.Size(150, 28);
-            this.txt_qualityReq.TabIndex = 252;
-            // 
-            // lb_purchaser
-            // 
-            this.lb_purchaser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_purchaser.Appearance.Options.UseFont = true;
-            this.lb_purchaser.Location = new System.Drawing.Point(287, 116);
-            this.lb_purchaser.Name = "lb_purchaser";
-            this.lb_purchaser.Size = new System.Drawing.Size(56, 21);
-            this.lb_purchaser.TabIndex = 247;
-            this.lb_purchaser.Text = "閲囪喘鍛� ";
-            // 
-            // txt_purchaser
-            // 
-            this.txt_purchaser.Location = new System.Drawing.Point(349, 112);
-            this.txt_purchaser.Name = "txt_purchaser";
-            this.txt_purchaser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_purchaser.Properties.Appearance.Options.UseFont = true;
-            this.txt_purchaser.Size = new System.Drawing.Size(150, 28);
-            this.txt_purchaser.TabIndex = 247;
-            // 
-            // lb_qtyAcceptance
-            // 
-            this.lb_qtyAcceptance.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_qtyAcceptance.Appearance.Options.UseFont = true;
-            this.lb_qtyAcceptance.Location = new System.Drawing.Point(20, 116);
-            this.lb_qtyAcceptance.Name = "lb_qtyAcceptance";
-            this.lb_qtyAcceptance.Size = new System.Drawing.Size(73, 21);
-            this.lb_qtyAcceptance.TabIndex = 243;
-            this.lb_qtyAcceptance.Text = "鏁伴噺楠屾敹 ";
-            // 
-            // txt_qtyAcceptance
-            // 
-            this.txt_qtyAcceptance.Location = new System.Drawing.Point(97, 112);
-            this.txt_qtyAcceptance.Name = "txt_qtyAcceptance";
-            this.txt_qtyAcceptance.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_qtyAcceptance.Properties.Appearance.Options.UseFont = true;
-            this.txt_qtyAcceptance.Size = new System.Drawing.Size(150, 28);
-            this.txt_qtyAcceptance.TabIndex = 243;
-            // 
-            // lb_purchaseGroup
-            // 
-            this.lb_purchaseGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_purchaseGroup.Appearance.Options.UseFont = true;
-            this.lb_purchaseGroup.Location = new System.Drawing.Point(806, 52);
-            this.lb_purchaseGroup.Name = "lb_purchaseGroup";
-            this.lb_purchaseGroup.Size = new System.Drawing.Size(56, 21);
-            this.lb_purchaseGroup.TabIndex = 240;
-            this.lb_purchaseGroup.Text = "閲囪喘缁� ";
-            // 
-            // txt_purchaseGroup
-            // 
-            this.txt_purchaseGroup.Location = new System.Drawing.Point(871, 48);
-            this.txt_purchaseGroup.Name = "txt_purchaseGroup";
-            this.txt_purchaseGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_purchaseGroup.Properties.Appearance.Options.UseFont = true;
-            this.txt_purchaseGroup.Size = new System.Drawing.Size(150, 28);
-            this.txt_purchaseGroup.TabIndex = 240;
-            // 
-            // lb_purchaseDept
-            // 
-            this.lb_purchaseDept.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_purchaseDept.Appearance.Options.UseFont = true;
-            this.lb_purchaseDept.Location = new System.Drawing.Point(536, 52);
-            this.lb_purchaseDept.Name = "lb_purchaseDept";
-            this.lb_purchaseDept.Size = new System.Drawing.Size(73, 21);
-            this.lb_purchaseDept.TabIndex = 235;
-            this.lb_purchaseDept.Text = "閲囪喘閮ㄩ棬 ";
-            // 
-            // txt_purchaseDept
-            // 
-            this.txt_purchaseDept.Location = new System.Drawing.Point(614, 48);
-            this.txt_purchaseDept.Name = "txt_purchaseDept";
-            this.txt_purchaseDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_purchaseDept.Properties.Appearance.Options.UseFont = true;
-            this.txt_purchaseDept.Size = new System.Drawing.Size(150, 28);
-            this.txt_purchaseDept.TabIndex = 235;
-            // 
-            // lb_purchaseOrg
-            // 
-            this.lb_purchaseOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_purchaseOrg.Appearance.Options.UseFont = true;
-            this.lb_purchaseOrg.Location = new System.Drawing.Point(270, 84);
-            this.lb_purchaseOrg.Name = "lb_purchaseOrg";
-            this.lb_purchaseOrg.Size = new System.Drawing.Size(73, 21);
-            this.lb_purchaseOrg.TabIndex = 231;
-            this.lb_purchaseOrg.Text = "閲囪喘缁勭粐 ";
-            // 
-            // txt_purchaseOrg
-            // 
-            this.txt_purchaseOrg.Location = new System.Drawing.Point(349, 80);
-            this.txt_purchaseOrg.Name = "txt_purchaseOrg";
-            this.txt_purchaseOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_purchaseOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_purchaseOrg.Size = new System.Drawing.Size(150, 28);
-            this.txt_purchaseOrg.TabIndex = 231;
-            // 
-            // lb_closeStatus
-            // 
-            this.lb_closeStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeStatus.Appearance.Options.UseFont = true;
-            this.lb_closeStatus.Location = new System.Drawing.Point(20, 84);
-            this.lb_closeStatus.Name = "lb_closeStatus";
-            this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeStatus.TabIndex = 228;
-            this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
-            // 
-            // txt_closeStatus
-            // 
-            this.txt_closeStatus.Location = new System.Drawing.Point(97, 80);
-            this.txt_closeStatus.Name = "txt_closeStatus";
-            this.txt_closeStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeStatus.TabIndex = 228;
-            // 
             // lb_supplier
             // 
             this.lb_supplier.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_supplier.Appearance.Options.UseFont = true;
-            this.lb_supplier.Location = new System.Drawing.Point(806, 18);
+            this.lb_supplier.Location = new System.Drawing.Point(291, 18);
             this.lb_supplier.Name = "lb_supplier";
-            this.lb_supplier.Size = new System.Drawing.Size(56, 21);
+            this.lb_supplier.Size = new System.Drawing.Size(85, 21);
             this.lb_supplier.TabIndex = 226;
-            this.lb_supplier.Text = "渚涘簲鍟� ";
-            // 
-            // txt_supplier
-            // 
-            this.txt_supplier.Location = new System.Drawing.Point(871, 14);
-            this.txt_supplier.Name = "txt_supplier";
-            this.txt_supplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_supplier.Properties.Appearance.Options.UseFont = true;
-            this.txt_supplier.Size = new System.Drawing.Size(150, 28);
-            this.txt_supplier.TabIndex = 226;
+            this.lb_supplier.Text = "渚涘簲鍟嗗悕绉�";
             // 
             // lb_purchaseDate
             // 
@@ -1279,56 +667,8 @@
             this.lb_purchaseDate.Appearance.Options.UseFont = true;
             this.lb_purchaseDate.Location = new System.Drawing.Point(536, 18);
             this.lb_purchaseDate.Name = "lb_purchaseDate";
-            this.lb_purchaseDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_purchaseDate.Size = new System.Drawing.Size(0, 21);
             this.lb_purchaseDate.TabIndex = 222;
-            this.lb_purchaseDate.Text = "閲囪喘鏃ユ湡 ";
-            // 
-            // txt_purchaseDate
-            // 
-            this.txt_purchaseDate.Location = new System.Drawing.Point(614, 14);
-            this.txt_purchaseDate.Name = "txt_purchaseDate";
-            this.txt_purchaseDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_purchaseDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_purchaseDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_purchaseDate.TabIndex = 222;
-            // 
-            // lb_businessType
-            // 
-            this.lb_businessType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_businessType.Appearance.Options.UseFont = true;
-            this.lb_businessType.Location = new System.Drawing.Point(270, 52);
-            this.lb_businessType.Name = "lb_businessType";
-            this.lb_businessType.Size = new System.Drawing.Size(73, 21);
-            this.lb_businessType.TabIndex = 219;
-            this.lb_businessType.Text = "涓氬姟绫诲瀷 ";
-            // 
-            // txt_businessType
-            // 
-            this.txt_businessType.Location = new System.Drawing.Point(349, 48);
-            this.txt_businessType.Name = "txt_businessType";
-            this.txt_businessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_businessType.Properties.Appearance.Options.UseFont = true;
-            this.txt_businessType.Size = new System.Drawing.Size(150, 28);
-            this.txt_businessType.TabIndex = 219;
-            // 
-            // lb_documentType
-            // 
-            this.lb_documentType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_documentType.Appearance.Options.UseFont = true;
-            this.lb_documentType.Location = new System.Drawing.Point(20, 52);
-            this.lb_documentType.Name = "lb_documentType";
-            this.lb_documentType.Size = new System.Drawing.Size(73, 21);
-            this.lb_documentType.TabIndex = 217;
-            this.lb_documentType.Text = "鍗曟嵁绫诲瀷 ";
-            // 
-            // txt_documentType
-            // 
-            this.txt_documentType.Location = new System.Drawing.Point(97, 48);
-            this.txt_documentType.Name = "txt_documentType";
-            this.txt_documentType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_documentType.Properties.Appearance.Options.UseFont = true;
-            this.txt_documentType.Size = new System.Drawing.Size(150, 28);
-            this.txt_documentType.TabIndex = 217;
             // 
             // lb_documentStatus
             // 
@@ -1336,18 +676,8 @@
             this.lb_documentStatus.Appearance.Options.UseFont = true;
             this.lb_documentStatus.Location = new System.Drawing.Point(270, 18);
             this.lb_documentStatus.Name = "lb_documentStatus";
-            this.lb_documentStatus.Size = new System.Drawing.Size(73, 21);
+            this.lb_documentStatus.Size = new System.Drawing.Size(0, 21);
             this.lb_documentStatus.TabIndex = 216;
-            this.lb_documentStatus.Text = "鍗曟嵁鐘舵�� ";
-            // 
-            // txt_documentStatus
-            // 
-            this.txt_documentStatus.Location = new System.Drawing.Point(349, 14);
-            this.txt_documentStatus.Name = "txt_documentStatus";
-            this.txt_documentStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_documentStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_documentStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_documentStatus.TabIndex = 216;
             // 
             // lb_billNo
             // 
@@ -1412,9 +742,15 @@
             this.gridBand10,
             this.gridBand14,
             this.gridBand15,
-            this.gridBand16});
-            this.gridView1.ColumnPanelRowHeight = 90;
+            this.gridBand16,
+            this.gridBand17,
+            this.gridBand21,
+            this.gridBand23,
+            this.gridBand24,
+            this.gridBand28});
+            this.gridView1.ColumnPanelRowHeight = 30;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
+            this.bandedGridColumn1,
             this.gv_factory,
             this.gv_billNo,
             this.gv_documentStatus,
@@ -1423,6 +759,7 @@
             this.gv_purchaseDate,
             this.gv_supplier,
             this.gv_closeStatus,
+            this.bandedGridColumn2,
             this.gv_purchaseDept,
             this.gv_qtyAcceptance,
             this.gv_purchaser,
@@ -1456,60 +793,27 @@
             // 
             this.gridBand1.Caption = "ERPID鍙�";
             this.gridBand1.Columns.Add(this.gv_factory);
-            this.gridBand1.Columns.Add(this.gv_qtyAcceptance);
-            this.gridBand1.Columns.Add(this.gv_settlementParty);
             this.gridBand1.Columns.Add(this.gv_paymentParty);
             this.gridBand1.Columns.Add(this.gv_transportMethod);
-            this.gridBand1.Columns.Add(this.gv_remarks);
-            this.gridBand1.Columns.Add(this.gv_cancellationStatus);
-            this.gridBand1.Columns.Add(this.gv_cancellationPerson);
-            this.gridBand1.Columns.Add(this.gv_cancellationDate);
-            this.gridBand1.Columns.Add(this.gv_createBy);
-            this.gridBand1.Columns.Add(this.gv_createDate);
             this.gridBand1.Columns.Add(this.gv_lastupdateDate);
             this.gridBand1.Columns.Add(this.gv_lastupdateBy);
-            this.gridBand1.Columns.Add(this.gv_erpCheckBy);
-            this.gridBand1.Columns.Add(this.gv_erpCheckDate);
             this.gridBand1.Columns.Add(this.gv_checkDate);
             this.gridBand1.Columns.Add(this.gv_checkBy);
             this.gridBand1.Columns.Add(this.gv_checkFalg);
-            this.gridBand1.Columns.Add(this.gv_changereason);
+            this.gridBand1.MinWidth = 80;
             this.gridBand1.Name = "gridBand1";
             this.gridBand1.VisibleIndex = 0;
-            this.gridBand1.Width = 75;
+            this.gridBand1.Width = 80;
             // 
             // gv_factory
             // 
             this.gv_factory.Caption = "ERPID鍙�";
             this.gv_factory.FieldName = "ebelnK3id";
-            this.gv_factory.MinWidth = 70;
+            this.gv_factory.MinWidth = 25;
             this.gv_factory.Name = "gv_factory";
             this.gv_factory.OptionsColumn.AllowEdit = false;
             this.gv_factory.Visible = true;
-            // 
-            // gv_qtyAcceptance
-            // 
-            this.gv_qtyAcceptance.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true;
-            this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹";
-            this.gv_qtyAcceptance.FieldName = "qtyAcceptance";
-            this.gv_qtyAcceptance.MinWidth = 100;
-            this.gv_qtyAcceptance.Name = "gv_qtyAcceptance";
-            this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
-            this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
-            this.gv_qtyAcceptance.Width = 100;
-            // 
-            // gv_settlementParty
-            // 
-            this.gv_settlementParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_settlementParty.AppearanceCell.Options.UseFont = true;
-            this.gv_settlementParty.Caption = "缁撶畻鏂�";
-            this.gv_settlementParty.FieldName = "settlementParty";
-            this.gv_settlementParty.MinWidth = 100;
-            this.gv_settlementParty.Name = "gv_settlementParty";
-            this.gv_settlementParty.OptionsColumn.AllowEdit = false;
-            this.gv_settlementParty.Tag = "query_a.SETTLEMENT_PARTY";
-            this.gv_settlementParty.Width = 100;
+            this.gv_factory.Width = 70;
             // 
             // gv_paymentParty
             // 
@@ -1517,7 +821,7 @@
             this.gv_paymentParty.AppearanceCell.Options.UseFont = true;
             this.gv_paymentParty.Caption = "鏀舵鏂�";
             this.gv_paymentParty.FieldName = "paymentParty";
-            this.gv_paymentParty.MinWidth = 100;
+            this.gv_paymentParty.MinWidth = 25;
             this.gv_paymentParty.Name = "gv_paymentParty";
             this.gv_paymentParty.OptionsColumn.AllowEdit = false;
             this.gv_paymentParty.Tag = "query_a.PAYMENT_PARTY";
@@ -1529,83 +833,11 @@
             this.gv_transportMethod.AppearanceCell.Options.UseFont = true;
             this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡";
             this.gv_transportMethod.FieldName = "transportMethod";
-            this.gv_transportMethod.MinWidth = 100;
+            this.gv_transportMethod.MinWidth = 25;
             this.gv_transportMethod.Name = "gv_transportMethod";
             this.gv_transportMethod.OptionsColumn.AllowEdit = false;
             this.gv_transportMethod.Tag = "query_a.TRANSPORT_METHOD";
             this.gv_transportMethod.Width = 100;
-            // 
-            // gv_remarks
-            // 
-            this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_remarks.AppearanceCell.Options.UseFont = true;
-            this.gv_remarks.Caption = "澶囨敞";
-            this.gv_remarks.FieldName = "remarks";
-            this.gv_remarks.MinWidth = 100;
-            this.gv_remarks.Name = "gv_remarks";
-            this.gv_remarks.OptionsColumn.AllowEdit = false;
-            this.gv_remarks.Tag = "query_a.REMARKS";
-            this.gv_remarks.Width = 100;
-            // 
-            // gv_cancellationStatus
-            // 
-            this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cancellationStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_cancellationStatus.Caption = "浣滃簾鐘舵��";
-            this.gv_cancellationStatus.FieldName = "cancellationStatus";
-            this.gv_cancellationStatus.MinWidth = 50;
-            this.gv_cancellationStatus.Name = "gv_cancellationStatus";
-            this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
-            this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
-            this.gv_cancellationStatus.Width = 50;
-            // 
-            // gv_cancellationPerson
-            // 
-            this.gv_cancellationPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cancellationPerson.AppearanceCell.Options.UseFont = true;
-            this.gv_cancellationPerson.Caption = "浣滃簾浜�";
-            this.gv_cancellationPerson.FieldName = "cancellationPerson";
-            this.gv_cancellationPerson.MinWidth = 100;
-            this.gv_cancellationPerson.Name = "gv_cancellationPerson";
-            this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
-            this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
-            this.gv_cancellationPerson.Width = 100;
-            // 
-            // gv_cancellationDate
-            // 
-            this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cancellationDate.AppearanceCell.Options.UseFont = true;
-            this.gv_cancellationDate.Caption = "浣滃簾鏃ユ湡";
-            this.gv_cancellationDate.FieldName = "cancellationDate";
-            this.gv_cancellationDate.MinWidth = 200;
-            this.gv_cancellationDate.Name = "gv_cancellationDate";
-            this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
-            this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
-            this.gv_cancellationDate.Width = 200;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 100;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Tag = "query_a.CREATE_BY";
-            this.gv_createBy.Width = 100;
-            // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 200;
-            this.gv_createDate.Name = "gv_createDate";
-            this.gv_createDate.OptionsColumn.AllowEdit = false;
-            this.gv_createDate.Tag = "query_a.CREATE_DATE";
-            this.gv_createDate.Width = 200;
             // 
             // gv_lastupdateDate
             // 
@@ -1613,7 +845,7 @@
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏈�鍚庝慨鏀规椂闂�";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 200;
+            this.gv_lastupdateDate.MinWidth = 25;
             this.gv_lastupdateDate.Name = "gv_lastupdateDate";
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
@@ -1625,35 +857,11 @@
             this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateBy.Caption = "鏈�鍚庝慨鏀逛汉";
             this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            this.gv_lastupdateBy.MinWidth = 100;
+            this.gv_lastupdateBy.MinWidth = 25;
             this.gv_lastupdateBy.Name = "gv_lastupdateBy";
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
             this.gv_lastupdateBy.Width = 100;
-            // 
-            // gv_erpCheckBy
-            // 
-            this.gv_erpCheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_erpCheckBy.AppearanceCell.Options.UseFont = true;
-            this.gv_erpCheckBy.Caption = "瀹℃牳浜�";
-            this.gv_erpCheckBy.FieldName = "erpCheckBy";
-            this.gv_erpCheckBy.MinWidth = 100;
-            this.gv_erpCheckBy.Name = "gv_erpCheckBy";
-            this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
-            this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
-            this.gv_erpCheckBy.Width = 100;
-            // 
-            // gv_erpCheckDate
-            // 
-            this.gv_erpCheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_erpCheckDate.AppearanceCell.Options.UseFont = true;
-            this.gv_erpCheckDate.Caption = "瀹℃牳鏃堕棿";
-            this.gv_erpCheckDate.FieldName = "erpCheckDate";
-            this.gv_erpCheckDate.MinWidth = 200;
-            this.gv_erpCheckDate.Name = "gv_erpCheckDate";
-            this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
-            this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
-            this.gv_erpCheckDate.Width = 200;
             // 
             // gv_checkDate
             // 
@@ -1661,7 +869,7 @@
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 120;
+            this.gv_checkDate.MinWidth = 25;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
@@ -1673,7 +881,7 @@
             this.gv_checkBy.AppearanceCell.Options.UseFont = true;
             this.gv_checkBy.Caption = "瀹℃牳浜�";
             this.gv_checkBy.FieldName = "checkBy";
-            this.gv_checkBy.MinWidth = 100;
+            this.gv_checkBy.MinWidth = 25;
             this.gv_checkBy.Name = "gv_checkBy";
             this.gv_checkBy.OptionsColumn.AllowEdit = false;
             this.gv_checkBy.Tag = "query_a.CHECK_BY";
@@ -1685,28 +893,17 @@
             this.gv_checkFalg.AppearanceCell.Options.UseFont = true;
             this.gv_checkFalg.Caption = "瀹℃牳鏍囪瘑";
             this.gv_checkFalg.FieldName = "checkFalg";
-            this.gv_checkFalg.MinWidth = 80;
+            this.gv_checkFalg.MinWidth = 25;
             this.gv_checkFalg.Name = "gv_checkFalg";
             this.gv_checkFalg.OptionsColumn.AllowEdit = false;
             this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
             this.gv_checkFalg.Width = 100;
             // 
-            // gv_changereason
-            // 
-            this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_changereason.AppearanceCell.Options.UseFont = true;
-            this.gv_changereason.Caption = "鍙樻洿鍘熷洜";
-            this.gv_changereason.FieldName = "changereason";
-            this.gv_changereason.MinWidth = 100;
-            this.gv_changereason.Name = "gv_changereason";
-            this.gv_changereason.OptionsColumn.AllowEdit = false;
-            this.gv_changereason.Tag = "query_a.CHANGEREASON";
-            this.gv_changereason.Width = 100;
-            // 
             // gridBand2
             // 
             this.gridBand2.Caption = "閲囪喘鍗曞彿";
             this.gridBand2.Columns.Add(this.gv_billNo);
+            this.gridBand2.MinWidth = 120;
             this.gridBand2.Name = "gridBand2";
             this.gridBand2.VisibleIndex = 1;
             this.gridBand2.Width = 120;
@@ -1717,7 +914,7 @@
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "閲囪喘鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 120;
+            this.gv_billNo.MinWidth = 25;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
@@ -1730,8 +927,8 @@
             this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
             this.gridBand3.Columns.Add(this.gv_documentStatus);
+            this.gridBand3.MinWidth = 100;
             this.gridBand3.Name = "gridBand3";
-            this.gridBand3.RowCount = 2;
             this.gridBand3.VisibleIndex = 2;
             this.gridBand3.Width = 100;
             // 
@@ -1741,7 +938,7 @@
             this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
             this.gv_documentStatus.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
             this.gv_documentStatus.FieldName = "documentStatus";
-            this.gv_documentStatus.MinWidth = 100;
+            this.gv_documentStatus.MinWidth = 25;
             this.gv_documentStatus.Name = "gv_documentStatus";
             this.gv_documentStatus.OptionsColumn.AllowEdit = false;
             this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
@@ -1754,9 +951,10 @@
             this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridBand4.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
             this.gridBand4.Columns.Add(this.gv_documentType);
+            this.gridBand4.MinWidth = 80;
             this.gridBand4.Name = "gridBand4";
-            this.gridBand4.RowCount = 2;
             this.gridBand4.VisibleIndex = 3;
+            this.gridBand4.Width = 80;
             // 
             // gv_documentType
             // 
@@ -1764,7 +962,7 @@
             this.gv_documentType.AppearanceCell.Options.UseFont = true;
             this.gv_documentType.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
             this.gv_documentType.FieldName = "documentType";
-            this.gv_documentType.MinWidth = 70;
+            this.gv_documentType.MinWidth = 25;
             this.gv_documentType.Name = "gv_documentType";
             this.gv_documentType.OptionsColumn.AllowEdit = false;
             this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
@@ -1775,6 +973,7 @@
             // 
             this.gridBand5.Caption = "涓氬姟绫诲瀷";
             this.gridBand5.Columns.Add(this.gv_businessType);
+            this.gridBand5.MinWidth = 80;
             this.gridBand5.Name = "gridBand5";
             this.gridBand5.VisibleIndex = 4;
             this.gridBand5.Width = 100;
@@ -1785,7 +984,7 @@
             this.gv_businessType.AppearanceCell.Options.UseFont = true;
             this.gv_businessType.Caption = "涓氬姟绫诲瀷";
             this.gv_businessType.FieldName = "businessType";
-            this.gv_businessType.MinWidth = 100;
+            this.gv_businessType.MinWidth = 25;
             this.gv_businessType.Name = "gv_businessType";
             this.gv_businessType.OptionsColumn.AllowEdit = false;
             this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
@@ -1796,9 +995,10 @@
             // 
             this.gridBand8.Caption = "閲囪喘鏃ユ湡";
             this.gridBand8.Columns.Add(this.gv_purchaseDate);
+            this.gridBand8.MinWidth = 170;
             this.gridBand8.Name = "gridBand8";
             this.gridBand8.VisibleIndex = 5;
-            this.gridBand8.Width = 100;
+            this.gridBand8.Width = 170;
             // 
             // gv_purchaseDate
             // 
@@ -1806,7 +1006,7 @@
             this.gv_purchaseDate.AppearanceCell.Options.UseFont = true;
             this.gv_purchaseDate.Caption = "閲囪喘鏃ユ湡";
             this.gv_purchaseDate.FieldName = "purchaseDate";
-            this.gv_purchaseDate.MinWidth = 100;
+            this.gv_purchaseDate.MinWidth = 25;
             this.gv_purchaseDate.Name = "gv_purchaseDate";
             this.gv_purchaseDate.OptionsColumn.AllowEdit = false;
             this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE";
@@ -1821,9 +1021,10 @@
             this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
             this.gridBand11,
             this.gridBand7});
+            this.gridBand6.MinWidth = 200;
             this.gridBand6.Name = "gridBand6";
             this.gridBand6.VisibleIndex = 6;
-            this.gridBand6.Width = 150;
+            this.gridBand6.Width = 200;
             // 
             // gridBand11
             // 
@@ -1831,7 +1032,7 @@
             this.gridBand11.Columns.Add(this.gv_supplier);
             this.gridBand11.Name = "gridBand11";
             this.gridBand11.VisibleIndex = 0;
-            this.gridBand11.Width = 60;
+            this.gridBand11.Width = 50;
             // 
             // gv_supplier
             // 
@@ -1839,19 +1040,31 @@
             this.gv_supplier.AppearanceCell.Options.UseFont = true;
             this.gv_supplier.Caption = "渚涘簲鍟�";
             this.gv_supplier.FieldName = "supplier";
-            this.gv_supplier.MinWidth = 50;
+            this.gv_supplier.MinWidth = 25;
             this.gv_supplier.Name = "gv_supplier";
             this.gv_supplier.OptionsColumn.AllowEdit = false;
             this.gv_supplier.Tag = "query_a.SUPPLIER";
             this.gv_supplier.Visible = true;
-            this.gv_supplier.Width = 60;
+            this.gv_supplier.Width = 50;
             // 
             // gridBand7
             // 
             this.gridBand7.Caption = "鍚嶇О";
+            this.gridBand7.Columns.Add(this.bandedGridColumn1);
+            this.gridBand7.MinWidth = 100;
             this.gridBand7.Name = "gridBand7";
             this.gridBand7.VisibleIndex = 1;
-            this.gridBand7.Width = 90;
+            this.gridBand7.Width = 100;
+            // 
+            // bandedGridColumn1
+            // 
+            this.bandedGridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
+            this.bandedGridColumn1.FieldName = "suppName";
+            this.bandedGridColumn1.MinWidth = 25;
+            this.bandedGridColumn1.Name = "bandedGridColumn1";
+            this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
+            this.bandedGridColumn1.Visible = true;
+            this.bandedGridColumn1.Width = 25;
             // 
             // gridBand9
             // 
@@ -1859,10 +1072,10 @@
             this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�";
             this.gridBand9.Columns.Add(this.gv_closeStatus);
+            this.gridBand9.MinWidth = 80;
             this.gridBand9.Name = "gridBand9";
-            this.gridBand9.RowCount = 3;
             this.gridBand9.VisibleIndex = 7;
-            this.gridBand9.Width = 50;
+            this.gridBand9.Width = 80;
             // 
             // gv_closeStatus
             // 
@@ -1870,7 +1083,7 @@
             this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
             this.gv_closeStatus.Caption = "鍏抽棴鐘舵��";
             this.gv_closeStatus.FieldName = "closeStatus";
-            this.gv_closeStatus.MinWidth = 50;
+            this.gv_closeStatus.MinWidth = 25;
             this.gv_closeStatus.Name = "gv_closeStatus";
             this.gv_closeStatus.OptionsColumn.AllowEdit = false;
             this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS";
@@ -1885,17 +1098,19 @@
             this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
             this.gridBand12,
             this.gridBand13});
+            this.gridBand10.MinWidth = 100;
             this.gridBand10.Name = "gridBand10";
             this.gridBand10.VisibleIndex = 8;
-            this.gridBand10.Width = 234;
+            this.gridBand10.Width = 140;
             // 
             // gridBand12
             // 
             this.gridBand12.Caption = "缂栧彿";
             this.gridBand12.Columns.Add(this.gv_purchaseDept);
+            this.gridBand12.MinWidth = 50;
             this.gridBand12.Name = "gridBand12";
             this.gridBand12.VisibleIndex = 0;
-            this.gridBand12.Width = 82;
+            this.gridBand12.Width = 60;
             // 
             // gv_purchaseDept
             // 
@@ -1903,33 +1118,61 @@
             this.gv_purchaseDept.AppearanceCell.Options.UseFont = true;
             this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬";
             this.gv_purchaseDept.FieldName = "purchaseDept";
-            this.gv_purchaseDept.MinWidth = 60;
+            this.gv_purchaseDept.MinWidth = 25;
             this.gv_purchaseDept.Name = "gv_purchaseDept";
             this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
             this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
             this.gv_purchaseDept.Visible = true;
-            this.gv_purchaseDept.Width = 82;
+            this.gv_purchaseDept.Width = 60;
             // 
             // gridBand13
             // 
             this.gridBand13.Caption = "鍚嶇О";
+            this.gridBand13.Columns.Add(this.bandedGridColumn2);
+            this.gridBand13.MinWidth = 80;
             this.gridBand13.Name = "gridBand13";
             this.gridBand13.VisibleIndex = 1;
-            this.gridBand13.Width = 152;
+            this.gridBand13.Width = 80;
+            // 
+            // bandedGridColumn2
+            // 
+            this.bandedGridColumn2.Caption = "閲囪喘閮ㄩ棬鍚嶇О";
+            this.bandedGridColumn2.FieldName = "departmentname";
+            this.bandedGridColumn2.MinWidth = 25;
+            this.bandedGridColumn2.Name = "bandedGridColumn2";
+            this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
+            this.bandedGridColumn2.Visible = true;
+            this.bandedGridColumn2.Width = 25;
             // 
             // gridBand14
             // 
             this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
             this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridBand14.Caption = "鏁伴噺楠屾敹";
+            this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
+            this.gridBand14.MinWidth = 50;
             this.gridBand14.Name = "gridBand14";
             this.gridBand14.VisibleIndex = 9;
-            this.gridBand14.Width = 11;
+            this.gridBand14.Width = 50;
+            // 
+            // gv_qtyAcceptance
+            // 
+            this.gv_qtyAcceptance.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true;
+            this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹";
+            this.gv_qtyAcceptance.FieldName = "qtyAcceptance";
+            this.gv_qtyAcceptance.MinWidth = 25;
+            this.gv_qtyAcceptance.Name = "gv_qtyAcceptance";
+            this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
+            this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
+            this.gv_qtyAcceptance.Visible = true;
+            this.gv_qtyAcceptance.Width = 30;
             // 
             // gridBand15
             // 
             this.gridBand15.Caption = "閲囪喘鍛�";
             this.gridBand15.Columns.Add(this.gv_purchaser);
+            this.gridBand15.MinWidth = 60;
             this.gridBand15.Name = "gridBand15";
             this.gridBand15.VisibleIndex = 10;
             this.gridBand15.Width = 100;
@@ -1940,7 +1183,7 @@
             this.gv_purchaser.AppearanceCell.Options.UseFont = true;
             this.gv_purchaser.Caption = "閲囪喘鍛�";
             this.gv_purchaser.FieldName = "purchaser";
-            this.gv_purchaser.MinWidth = 100;
+            this.gv_purchaser.MinWidth = 25;
             this.gv_purchaser.Name = "gv_purchaser";
             this.gv_purchaser.OptionsColumn.AllowEdit = false;
             this.gv_purchaser.Tag = "query_a.PURCHASER";
@@ -1951,6 +1194,7 @@
             // 
             this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
             this.gridBand16.Columns.Add(this.gv_qualityReq);
+            this.gridBand16.MinWidth = 80;
             this.gridBand16.Name = "gridBand16";
             this.gridBand16.VisibleIndex = 11;
             this.gridBand16.Width = 100;
@@ -1961,12 +1205,260 @@
             this.gv_qualityReq.AppearanceCell.Options.UseFont = true;
             this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰";
             this.gv_qualityReq.FieldName = "qualityReq";
-            this.gv_qualityReq.MinWidth = 100;
+            this.gv_qualityReq.MinWidth = 25;
             this.gv_qualityReq.Name = "gv_qualityReq";
             this.gv_qualityReq.OptionsColumn.AllowEdit = false;
             this.gv_qualityReq.Tag = "query_a.QUALITY_REQ";
             this.gv_qualityReq.Visible = true;
             this.gv_qualityReq.Width = 100;
+            // 
+            // gridBand17
+            // 
+            this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand17.Caption = "浣滃簾鐘舵��";
+            this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand19,
+            this.gridBand18,
+            this.gridBand20});
+            this.gridBand17.Name = "gridBand17";
+            this.gridBand17.VisibleIndex = 12;
+            this.gridBand17.Width = 360;
+            // 
+            // gridBand19
+            // 
+            this.gridBand19.Caption = "浣滃簾鐘舵��";
+            this.gridBand19.Columns.Add(this.gv_cancellationStatus);
+            this.gridBand19.MinWidth = 60;
+            this.gridBand19.Name = "gridBand19";
+            this.gridBand19.VisibleIndex = 0;
+            this.gridBand19.Width = 60;
+            // 
+            // gv_cancellationStatus
+            // 
+            this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_cancellationStatus.AppearanceCell.Options.UseFont = true;
+            this.gv_cancellationStatus.Caption = "浣滃簾鐘舵��";
+            this.gv_cancellationStatus.FieldName = "cancellationStatus";
+            this.gv_cancellationStatus.MinWidth = 25;
+            this.gv_cancellationStatus.Name = "gv_cancellationStatus";
+            this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
+            this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
+            this.gv_cancellationStatus.Visible = true;
+            this.gv_cancellationStatus.Width = 50;
+            // 
+            // gridBand18
+            // 
+            this.gridBand18.Caption = "浣滃簾浜�";
+            this.gridBand18.Columns.Add(this.gv_cancellationPerson);
+            this.gridBand18.MinWidth = 60;
+            this.gridBand18.Name = "gridBand18";
+            this.gridBand18.VisibleIndex = 1;
+            this.gridBand18.Width = 100;
+            // 
+            // gv_cancellationPerson
+            // 
+            this.gv_cancellationPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_cancellationPerson.AppearanceCell.Options.UseFont = true;
+            this.gv_cancellationPerson.Caption = "浣滃簾浜�";
+            this.gv_cancellationPerson.FieldName = "cancellationPerson";
+            this.gv_cancellationPerson.MinWidth = 25;
+            this.gv_cancellationPerson.Name = "gv_cancellationPerson";
+            this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
+            this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
+            this.gv_cancellationPerson.Visible = true;
+            this.gv_cancellationPerson.Width = 100;
+            // 
+            // gridBand20
+            // 
+            this.gridBand20.Caption = "浣滃簾鏃ユ湡";
+            this.gridBand20.Columns.Add(this.gv_cancellationDate);
+            this.gridBand20.MinWidth = 180;
+            this.gridBand20.Name = "gridBand20";
+            this.gridBand20.VisibleIndex = 2;
+            this.gridBand20.Width = 200;
+            // 
+            // gv_cancellationDate
+            // 
+            this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_cancellationDate.AppearanceCell.Options.UseFont = true;
+            this.gv_cancellationDate.Caption = "浣滃簾鏃ユ湡";
+            this.gv_cancellationDate.FieldName = "cancellationDate";
+            this.gv_cancellationDate.MinWidth = 25;
+            this.gv_cancellationDate.Name = "gv_cancellationDate";
+            this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
+            this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
+            this.gv_cancellationDate.Visible = true;
+            this.gv_cancellationDate.Width = 200;
+            // 
+            // gridBand21
+            // 
+            this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand21.Caption = "鍒涘缓淇℃伅";
+            this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand22,
+            this.gridBand25});
+            this.gridBand21.Name = "gridBand21";
+            this.gridBand21.VisibleIndex = 13;
+            this.gridBand21.Width = 300;
+            // 
+            // gridBand22
+            // 
+            this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
+            this.gridBand22.Columns.Add(this.gv_createDate);
+            this.gridBand22.MinWidth = 180;
+            this.gridBand22.Name = "gridBand22";
+            this.gridBand22.VisibleIndex = 0;
+            this.gridBand22.Width = 200;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 25;
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.CREATE_DATE";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.Width = 200;
+            // 
+            // gridBand25
+            // 
+            this.gridBand25.Caption = "鍒涘缓浜�";
+            this.gridBand25.Columns.Add(this.gv_createBy);
+            this.gridBand25.MinWidth = 80;
+            this.gridBand25.Name = "gridBand25";
+            this.gridBand25.VisibleIndex = 1;
+            this.gridBand25.Width = 100;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "鍒涘缓浜�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 25;
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.CREATE_BY";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.Width = 100;
+            // 
+            // gridBand23
+            // 
+            this.gridBand23.Caption = "澶囨敞";
+            this.gridBand23.Columns.Add(this.gv_remarks);
+            this.gridBand23.MinWidth = 100;
+            this.gridBand23.Name = "gridBand23";
+            this.gridBand23.VisibleIndex = 14;
+            this.gridBand23.Width = 100;
+            // 
+            // gv_remarks
+            // 
+            this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remarks.AppearanceCell.Options.UseFont = true;
+            this.gv_remarks.Caption = "澶囨敞";
+            this.gv_remarks.FieldName = "remarks";
+            this.gv_remarks.MinWidth = 25;
+            this.gv_remarks.Name = "gv_remarks";
+            this.gv_remarks.OptionsColumn.AllowEdit = false;
+            this.gv_remarks.Tag = "query_a.REMARKS";
+            this.gv_remarks.Visible = true;
+            this.gv_remarks.Width = 100;
+            // 
+            // gridBand24
+            // 
+            this.gridBand24.Caption = "鍙樻洿鍘熷洜";
+            this.gridBand24.Columns.Add(this.gv_changereason);
+            this.gridBand24.MinWidth = 100;
+            this.gridBand24.Name = "gridBand24";
+            this.gridBand24.VisibleIndex = 15;
+            this.gridBand24.Width = 100;
+            // 
+            // gv_changereason
+            // 
+            this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_changereason.AppearanceCell.Options.UseFont = true;
+            this.gv_changereason.Caption = "鍙樻洿鍘熷洜";
+            this.gv_changereason.FieldName = "changereason";
+            this.gv_changereason.MinWidth = 25;
+            this.gv_changereason.Name = "gv_changereason";
+            this.gv_changereason.OptionsColumn.AllowEdit = false;
+            this.gv_changereason.Tag = "query_a.CHANGEREASON";
+            this.gv_changereason.Visible = true;
+            this.gv_changereason.Width = 100;
+            // 
+            // gridBand28
+            // 
+            this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
+            this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand27,
+            this.gridBand26});
+            this.gridBand28.Name = "gridBand28";
+            this.gridBand28.VisibleIndex = 16;
+            this.gridBand28.Width = 300;
+            // 
+            // gridBand27
+            // 
+            this.gridBand27.Caption = "瀹℃牳浜�";
+            this.gridBand27.Columns.Add(this.gv_settlementParty);
+            this.gridBand27.Columns.Add(this.gv_erpCheckBy);
+            this.gridBand27.MinWidth = 80;
+            this.gridBand27.Name = "gridBand27";
+            this.gridBand27.VisibleIndex = 0;
+            this.gridBand27.Width = 100;
+            // 
+            // gv_settlementParty
+            // 
+            this.gv_settlementParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_settlementParty.AppearanceCell.Options.UseFont = true;
+            this.gv_settlementParty.Caption = "缁撶畻鏂�";
+            this.gv_settlementParty.FieldName = "settlementParty";
+            this.gv_settlementParty.MinWidth = 25;
+            this.gv_settlementParty.Name = "gv_settlementParty";
+            this.gv_settlementParty.OptionsColumn.AllowEdit = false;
+            this.gv_settlementParty.Tag = "query_a.SETTLEMENT_PARTY";
+            this.gv_settlementParty.Width = 100;
+            // 
+            // gv_erpCheckBy
+            // 
+            this.gv_erpCheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_erpCheckBy.AppearanceCell.Options.UseFont = true;
+            this.gv_erpCheckBy.Caption = "erp瀹℃牳浜�";
+            this.gv_erpCheckBy.FieldName = "erpCheckBy";
+            this.gv_erpCheckBy.MinWidth = 25;
+            this.gv_erpCheckBy.Name = "gv_erpCheckBy";
+            this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
+            this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
+            this.gv_erpCheckBy.Visible = true;
+            this.gv_erpCheckBy.Width = 100;
+            // 
+            // gridBand26
+            // 
+            this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
+            this.gridBand26.Columns.Add(this.gv_erpCheckDate);
+            this.gridBand26.MinWidth = 180;
+            this.gridBand26.Name = "gridBand26";
+            this.gridBand26.VisibleIndex = 1;
+            this.gridBand26.Width = 200;
+            // 
+            // gv_erpCheckDate
+            // 
+            this.gv_erpCheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_erpCheckDate.AppearanceCell.Options.UseFont = true;
+            this.gv_erpCheckDate.Caption = "erp瀹℃牳鏃堕棿";
+            this.gv_erpCheckDate.FieldName = "erpCheckDate";
+            this.gv_erpCheckDate.MinWidth = 25;
+            this.gv_erpCheckDate.Name = "gv_erpCheckDate";
+            this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
+            this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
+            this.gv_erpCheckDate.Visible = true;
+            this.gv_erpCheckDate.Width = 200;
             // 
             // xtraTabControl1
             // 
@@ -2013,10 +1505,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 221);
+            this.tabMx.Location = new System.Drawing.Point(0, 56);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1363, 349);
+            this.tabMx.Size = new System.Drawing.Size(1363, 514);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -2024,101 +1516,38 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_checkFalg);
-            this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_changereason);
-            this.panel1.Controls.Add(this.txt_changereason);
-            this.panel1.Controls.Add(this.lb_checkFalg);
-            this.panel1.Controls.Add(this.lb_ebelnK3id);
-            this.panel1.Controls.Add(this.txt_ebelnK3id);
-            this.panel1.Controls.Add(this.lb_erpCheckDate);
-            this.panel1.Controls.Add(this.txt_erpCheckDate);
-            this.panel1.Controls.Add(this.lb_erpCheckBy);
-            this.panel1.Controls.Add(this.txt_erpCheckBy);
-            this.panel1.Controls.Add(this.lb_lastupdateBy);
-            this.panel1.Controls.Add(this.txt_lastupdateBy);
-            this.panel1.Controls.Add(this.lb_lastupdateDate);
-            this.panel1.Controls.Add(this.txt_lastupdateDate);
-            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_cancellationDate);
-            this.panel1.Controls.Add(this.txt_cancellationDate);
-            this.panel1.Controls.Add(this.lb_cancellationPerson);
-            this.panel1.Controls.Add(this.txt_cancellationPerson);
-            this.panel1.Controls.Add(this.lb_cancellationStatus);
-            this.panel1.Controls.Add(this.txt_cancellationStatus);
-            this.panel1.Controls.Add(this.lb_remarks);
-            this.panel1.Controls.Add(this.txt_remarks);
-            this.panel1.Controls.Add(this.lb_transportMethod);
-            this.panel1.Controls.Add(this.txt_transportMethod);
-            this.panel1.Controls.Add(this.lb_email);
-            this.panel1.Controls.Add(this.txt_email);
-            this.panel1.Controls.Add(this.lb_paymentParty);
-            this.panel1.Controls.Add(this.txt_paymentParty);
-            this.panel1.Controls.Add(this.lb_settlementParty);
-            this.panel1.Controls.Add(this.txt_settlementParty);
-            this.panel1.Controls.Add(this.lb_qualityReq);
-            this.panel1.Controls.Add(this.txt_qualityReq);
-            this.panel1.Controls.Add(this.lb_purchaser);
-            this.panel1.Controls.Add(this.txt_purchaser);
-            this.panel1.Controls.Add(this.lb_qtyAcceptance);
-            this.panel1.Controls.Add(this.txt_qtyAcceptance);
-            this.panel1.Controls.Add(this.lb_purchaseGroup);
-            this.panel1.Controls.Add(this.txt_purchaseGroup);
-            this.panel1.Controls.Add(this.lb_purchaseDept);
-            this.panel1.Controls.Add(this.txt_purchaseDept);
-            this.panel1.Controls.Add(this.lb_purchaseOrg);
-            this.panel1.Controls.Add(this.txt_purchaseOrg);
-            this.panel1.Controls.Add(this.lb_closeStatus);
-            this.panel1.Controls.Add(this.txt_closeStatus);
-            this.panel1.Controls.Add(this.lb_supplier);
             this.panel1.Controls.Add(this.txt_supplier);
+            this.panel1.Controls.Add(this.lb_supplier);
             this.panel1.Controls.Add(this.lb_purchaseDate);
-            this.panel1.Controls.Add(this.txt_purchaseDate);
-            this.panel1.Controls.Add(this.lb_businessType);
-            this.panel1.Controls.Add(this.txt_businessType);
-            this.panel1.Controls.Add(this.lb_documentType);
-            this.panel1.Controls.Add(this.txt_documentType);
             this.panel1.Controls.Add(this.lb_documentStatus);
-            this.panel1.Controls.Add(this.txt_documentStatus);
             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(1363, 221);
+            this.panel1.Size = new System.Drawing.Size(1363, 56);
             this.panel1.TabIndex = 1;
-            // 
-            // txt_checkFalg
-            // 
-            this.txt_checkFalg.Location = new System.Drawing.Point(871, 182);
-            this.txt_checkFalg.Name = "txt_checkFalg";
-            this.txt_checkFalg.Properties.Caption = "";
-            this.txt_checkFalg.Size = new System.Drawing.Size(94, 24);
-            this.txt_checkFalg.TabIndex = 451;
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(920, 185);
-            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.labelControl11.Name = "labelControl11";
-            this.labelControl11.Size = new System.Drawing.Size(45, 18);
-            this.labelControl11.TabIndex = 130;
-            this.labelControl11.Text = "涓婚敭锛�";
-            this.labelControl11.Visible = false;
             // 
             // lbGuid
             // 
-            this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(971, 185);
+            this.lbGuid.AccessibleName = "";
+            this.lbGuid.Location = new System.Drawing.Point(748, 18);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Size = new System.Drawing.Size(81, 18);
+            this.lbGuid.TabIndex = 228;
+            this.lbGuid.Text = "labelControl1";
             this.lbGuid.Visible = false;
+            // 
+            // txt_supplier
+            // 
+            this.txt_supplier.KeyFile = "";
+            this.txt_supplier.Location = new System.Drawing.Point(385, 13);
+            this.txt_supplier.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_supplier.Name = "txt_supplier";
+            this.txt_supplier.Size = new System.Drawing.Size(305, 30);
+            this.txt_supplier.TabIndex = 227;
             // 
             // Frm_MesRohIn
             // 
@@ -2131,34 +1560,6 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationPerson.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_transportMethod.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_paymentParty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_settlementParty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qualityReq.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qtyAcceptance.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseGroup.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseDept.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseOrg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_supplier.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -2170,7 +1571,6 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2182,16 +1582,11 @@
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private UserControls.Data.UcPageBar pageBar1;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentLineId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandSource;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1changeFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1planTrackingId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandTrackingId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceDocumentId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1sourceDocumentType;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnableStoredQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnableReceivedQty;
@@ -2207,8 +1602,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1freezer;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessFreeze;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1businessClose;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1batchNumber;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1outsourcingOrderId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1remarks;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1isGift;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1latestDeliveryDate;
@@ -2221,100 +1614,18 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseUnit;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId;
-        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.XtraEditors.LabelControl lb_changereason;
-        private DevExpress.XtraEditors.TextEdit txt_changereason;
-
-        private DevExpress.XtraEditors.LabelControl lb_checkFalg;
-
-        private DevExpress.XtraEditors.LabelControl lb_ebelnK3id;
-        private DevExpress.XtraEditors.TextEdit txt_ebelnK3id;
-
-        private DevExpress.XtraEditors.LabelControl lb_erpCheckDate;
-        private DevExpress.XtraEditors.TextEdit txt_erpCheckDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_erpCheckBy;
-        private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
-        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
-        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
-        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_cancellationDate;
-        private DevExpress.XtraEditors.TextEdit txt_cancellationDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancellationPerson;
-        private DevExpress.XtraEditors.TextEdit txt_cancellationPerson;
-
-        private DevExpress.XtraEditors.LabelControl lb_cancellationStatus;
-        private DevExpress.XtraEditors.TextEdit txt_cancellationStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_remarks;
-        private DevExpress.XtraEditors.TextEdit txt_remarks;
-
-        private DevExpress.XtraEditors.LabelControl lb_transportMethod;
-        private DevExpress.XtraEditors.TextEdit txt_transportMethod;
-
-        private DevExpress.XtraEditors.LabelControl lb_email;
-        private DevExpress.XtraEditors.TextEdit txt_email;
-
-        private DevExpress.XtraEditors.LabelControl lb_paymentParty;
-        private DevExpress.XtraEditors.TextEdit txt_paymentParty;
-
-        private DevExpress.XtraEditors.LabelControl lb_settlementParty;
-        private DevExpress.XtraEditors.TextEdit txt_settlementParty;
-
-        private DevExpress.XtraEditors.LabelControl lb_qualityReq;
-        private DevExpress.XtraEditors.TextEdit txt_qualityReq;
-
-        private DevExpress.XtraEditors.LabelControl lb_purchaser;
-        private DevExpress.XtraEditors.TextEdit txt_purchaser;
-
-        private DevExpress.XtraEditors.LabelControl lb_qtyAcceptance;
-        private DevExpress.XtraEditors.TextEdit txt_qtyAcceptance;
-
-        private DevExpress.XtraEditors.LabelControl lb_purchaseGroup;
-        private DevExpress.XtraEditors.TextEdit txt_purchaseGroup;
-
-        private DevExpress.XtraEditors.LabelControl lb_purchaseDept;
-        private DevExpress.XtraEditors.TextEdit txt_purchaseDept;
-
-        private DevExpress.XtraEditors.LabelControl lb_purchaseOrg;
-        private DevExpress.XtraEditors.TextEdit txt_purchaseOrg;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeStatus;
-        private DevExpress.XtraEditors.TextEdit txt_closeStatus;
-
         private DevExpress.XtraEditors.LabelControl lb_supplier;
-        private DevExpress.XtraEditors.TextEdit txt_supplier;
 
         private DevExpress.XtraEditors.LabelControl lb_purchaseDate;
-        private DevExpress.XtraEditors.TextEdit txt_purchaseDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_businessType;
-        private DevExpress.XtraEditors.TextEdit txt_businessType;
-
-        private DevExpress.XtraEditors.LabelControl lb_documentType;
-        private DevExpress.XtraEditors.TextEdit txt_documentType;
 
         private DevExpress.XtraEditors.LabelControl lb_documentStatus;
-        private DevExpress.XtraEditors.TextEdit txt_documentStatus;
 
         private DevExpress.XtraEditors.LabelControl lb_billNo;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
-        private DevExpress.XtraEditors.CheckEdit txt_checkFalg;
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpid;
         private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView gridView1;
         private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_factory;
@@ -2346,6 +1657,10 @@
         private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkBy;
         private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkFalg;
         private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_changereason;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
         private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
         private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
         private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
@@ -2362,7 +1677,19 @@
         private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
         private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
         private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand19;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand20;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand21;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand22;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand25;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand23;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand24;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand28;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand27;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand26;
+        private UserControl.UcLookSupplier txt_supplier;
+        private DevExpress.XtraEditors.LabelControl lbGuid;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 098430a..9f0e1d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -41,7 +41,8 @@
                     e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                 e.Graphics.DrawString(str, f, Brushes.Gray, r);
             };
-           
+            //璁剧疆渚涘簲鍟嗛�夋嫨
+            this.txt_supplier.KeyFile = "id";
         }
 
         /// <summary>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 9711223..3f551cb 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -830,6 +830,7 @@
     <None Include="Resources\trackingchanges_previous_16x16.png" />
     <None Include="Resources\updatetableofcontents_32x32.png" />
     <None Include="Resources\updatetableofcontents_16x16.png" />
+    <None Include="Resources\close_16x16.png" />
     <Content Include="Resources\user_16x16.png" />
   </ItemGroup>
   <ItemGroup />
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index e411b96..f12f19f 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -36,7 +36,7 @@
         /// </summary>
         private static void _startLogin()
         {
-            //Application.Run(new TestForm.XtraForm2());
+            //Application.Run(new TestForm.XtraForm3());
             //return;
 
             var fmLogin = new FrmLogin();
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 2d3e4ca..b548229 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -393,6 +393,16 @@
         /// <summary>
         ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
         /// </summary>
+        internal static System.Drawing.Bitmap close_16x16 {
+            get {
+                object obj = ResourceManager.GetObject("close_16x16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+        /// </summary>
         internal static System.Drawing.Bitmap convert_16x16 {
             get {
                 object obj = ResourceManager.GetObject("convert_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 57a3ec1..b608870 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -118,6 +118,11 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="exportfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exportfile_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -131,15 +136,16 @@
   <data name="sendxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sendxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap,
@@ -174,11 +180,6 @@
   <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -192,10 +193,8 @@
   <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\last_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="trackingchanges_showmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_showmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -203,8 +202,8 @@
   <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap,
@@ -213,11 +212,6 @@
   </data>
   <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_16x161.png;System.Drawing.Bitmap,
@@ -236,6 +230,11 @@
   </data>
   <data name="zoom100_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\zoom100_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -267,8 +266,13 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
+  <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\last_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -282,16 +286,29 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_16x16.png;System.Drawing.Bitmap,
+  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="checkbox2_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
@@ -301,18 +318,13 @@
   <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+  <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -351,12 +363,6 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -369,28 +375,22 @@
   <data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="updatetableofcontents_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\updatetableofcontents_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
-            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -402,6 +402,11 @@
   </data>
   <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -420,26 +425,36 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap,
+  <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
@@ -451,18 +466,16 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\download_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
+  <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -471,8 +484,8 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap,
+  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -496,11 +509,6 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -509,8 +517,8 @@
   <data name="forcetesting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\forcetesting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap,
+  <data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\convert_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -519,20 +527,13 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -550,10 +551,8 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="removegroupfooter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\removegroupfooter_16x16.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
@@ -565,18 +564,13 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
+  <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="converttorange_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\converttorange_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -630,18 +624,17 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
+  <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap,
-            System.Drawing, Version=4.0.0.0, Culture=neutral,
-            PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
+            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
@@ -656,13 +649,13 @@
   <data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
+  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
@@ -672,26 +665,28 @@
   <data name="forcetesting_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\forcetesting_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="lookup&amp;reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lookup&amp;reference_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
+  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="3dcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap,
+  <data name="trackingchanges_allmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_allmarkup_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -711,17 +706,25 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="bouser_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bouser_16x161.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="download_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\download_32x32.png;System.Drawing.Bitmap,
+            System.Drawing, Version=4.0.0.0, Culture=neutral,
+            PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -731,12 +734,12 @@
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
+  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
             System.Drawing, Version=4.0.0.0, Culture=neutral,
             PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="updatetableofcontents_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\updatetableofcontents_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 3a46885..6f3ead3 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -283,15 +283,27 @@
         {
             isEdt = !isEdt;
             if (gridViews != null)
-                foreach (var gv in gridViews)
+                foreach (var gv in gridViews) {
+                    foreach (GridColumn colmn in gv.Columns) {
+                        if (colmn.Name == "gvMxDel")
+                        {
+                            colmn.Visible = !isEdt;
+                            break;
+                        }
+                    }
                     gv.OptionsBehavior.Editable = !isEdt;
-
+                }
            var _btnAry=  controls.Find("btnSelect", false);
             if (_btnAry.Length > 0) {
                 var _btnType = _btnAry[0];
                 _btnType.Enabled = !isEdt;
             }
-
+            var _btnAry2 = controls.Find("btnTui", false);
+            if (_btnAry2.Length > 0)
+            {
+                var _btnType = _btnAry2[0];
+                _btnType.Enabled = !isEdt;
+            }
             foreach (JProperty property in dynamicObject.Properties())
             {
                 var strName = property.Name;

--
Gitblit v1.9.3