From 84e590f3897e2070ff4075544a1f06e577c47eff Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 04 十二月 2024 14:46:38 +0800
Subject: [PATCH] 界面核对

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs |  135 +++++---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs      |  652 +++++++++++++++++++++---------------------
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs             |   10 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs          |    6 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs               |   74 ++--
 5 files changed, 454 insertions(+), 423 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index fb21fc4..b9623da 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -22,8 +22,6 @@
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            gridView1.CustomDrawRowIndicator +=
-                GridView1_CustomDrawRowIndicator;
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
             Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
@@ -36,13 +34,7 @@
             getPageList(1);
         }
 
-        private void GridView1_CustomDrawRowIndicator(object sender,
-            RowIndicatorCustomDrawEventArgs e)
-        {
-            if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                e.Info.DisplayText = (e.RowHandle + 1).ToString();
-        }
-
+      
         /// <summary>
         ///     鍙屽嚮浜嬩欢
         /// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index 59cdf02..29304b7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -111,11 +111,13 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.ucLookOrg1 = new Gs.DevApp.UserControl.UcLookOrg();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.btnTui = new DevExpress.XtraEditors.SimpleButton();
-            this.txtDepotsId = new DevExpress.XtraEditors.TextEdit();
+            this.txtDepotsCode = new DevExpress.XtraEditors.TextEdit();
             this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
             this.label1 = new System.Windows.Forms.Label();
-            this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
+            this.txtSupplierCode = new DevExpress.XtraEditors.TextEdit();
             this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
             this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
             this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
@@ -144,8 +146,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
@@ -537,7 +539,7 @@
             // 
             this.lb_fType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fType.Appearance.Options.UseFont = true;
-            this.lb_fType.Location = new System.Drawing.Point(677, 58);
+            this.lb_fType.Location = new System.Drawing.Point(651, 54);
             this.lb_fType.Name = "lb_fType";
             this.lb_fType.Size = new System.Drawing.Size(68, 21);
             this.lb_fType.TabIndex = 378;
@@ -547,7 +549,7 @@
             // 
             this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_urgentFlag.Appearance.Options.UseFont = true;
-            this.lb_urgentFlag.Location = new System.Drawing.Point(677, 21);
+            this.lb_urgentFlag.Location = new System.Drawing.Point(651, 16);
             this.lb_urgentFlag.Name = "lb_urgentFlag";
             this.lb_urgentFlag.Size = new System.Drawing.Size(68, 21);
             this.lb_urgentFlag.TabIndex = 343;
@@ -557,7 +559,7 @@
             // 
             this.lb_ischeck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ischeck.Appearance.Options.UseFont = true;
-            this.lb_ischeck.Location = new System.Drawing.Point(677, 94);
+            this.lb_ischeck.Location = new System.Drawing.Point(778, 54);
             this.lb_ischeck.Name = "lb_ischeck";
             this.lb_ischeck.Size = new System.Drawing.Size(102, 21);
             this.lb_ischeck.TabIndex = 319;
@@ -567,7 +569,7 @@
             // 
             this.lb_paperBillNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_paperBillNo.Appearance.Options.UseFont = true;
-            this.lb_paperBillNo.Location = new System.Drawing.Point(341, 18);
+            this.lb_paperBillNo.Location = new System.Drawing.Point(651, 91);
             this.lb_paperBillNo.Name = "lb_paperBillNo";
             this.lb_paperBillNo.Size = new System.Drawing.Size(68, 21);
             this.lb_paperBillNo.TabIndex = 243;
@@ -575,7 +577,7 @@
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(421, 14);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(728, 87);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
@@ -586,7 +588,7 @@
             // 
             this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(20, 18);
+            this.lb_billNo.Location = new System.Drawing.Point(346, 17);
             this.lb_billNo.Name = "lb_billNo";
             this.lb_billNo.Size = new System.Drawing.Size(68, 21);
             this.lb_billNo.TabIndex = 213;
@@ -595,7 +597,7 @@
             // txt_billNo
             // 
             this.txt_billNo.Enabled = false;
-            this.txt_billNo.Location = new System.Drawing.Point(98, 14);
+            this.txt_billNo.Location = new System.Drawing.Point(420, 13);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
@@ -1063,11 +1065,13 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.ucLookOrg1);
+            this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.btnTui);
-            this.panel1.Controls.Add(this.txtDepotsId);
+            this.panel1.Controls.Add(this.txtDepotsCode);
             this.panel1.Controls.Add(this.labelControl4);
             this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.txtSupplierId);
+            this.panel1.Controls.Add(this.txtSupplierCode);
             this.panel1.Controls.Add(this.txt_fType);
             this.panel1.Controls.Add(this.txt_urgentFlag);
             this.panel1.Controls.Add(this.txt_fstatus);
@@ -1094,57 +1098,75 @@
             this.panel1.Size = new System.Drawing.Size(1231, 162);
             this.panel1.TabIndex = 1;
             // 
+            // ucLookOrg1
+            // 
+            this.ucLookOrg1.IsReadly = false;
+            this.ucLookOrg1.Location = new System.Drawing.Point(107, 16);
+            this.ucLookOrg1.Name = "ucLookOrg1";
+            this.ucLookOrg1.Size = new System.Drawing.Size(215, 28);
+            this.ucLookOrg1.TabIndex = 457;
+            // 
+            // labelControl2
+            // 
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(11, 16);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(68, 21);
+            this.labelControl2.TabIndex = 456;
+            this.labelControl2.Text = "鏀舵枡缁勭粐";
+            // 
             // btnTui
             // 
             this.btnTui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
-            this.btnTui.Location = new System.Drawing.Point(197, 126);
+            this.btnTui.Location = new System.Drawing.Point(206, 126);
             this.btnTui.Name = "btnTui";
             this.btnTui.Size = new System.Drawing.Size(116, 29);
             this.btnTui.TabIndex = 455;
-            this.btnTui.Text = "鍘婚��鍏ュ簱鏄庣粏";
+            this.btnTui.Text = "纭閫�璐�";
             // 
-            // txtDepotsId
+            // txtDepotsCode
             // 
-            this.txtDepotsId.Enabled = false;
-            this.txtDepotsId.Location = new System.Drawing.Point(421, 89);
-            this.txtDepotsId.Name = "txtDepotsId";
-            this.txtDepotsId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtDepotsId.Properties.Appearance.Options.UseFont = true;
-            this.txtDepotsId.Size = new System.Drawing.Size(215, 28);
-            this.txtDepotsId.TabIndex = 454;
+            this.txtDepotsCode.Enabled = false;
+            this.txtDepotsCode.Location = new System.Drawing.Point(421, 87);
+            this.txtDepotsCode.Name = "txtDepotsCode";
+            this.txtDepotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
+            this.txtDepotsCode.Size = new System.Drawing.Size(215, 28);
+            this.txtDepotsCode.TabIndex = 454;
             // 
             // labelControl4
             // 
             this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(357, 93);
+            this.labelControl4.Location = new System.Drawing.Point(344, 91);
             this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(52, 21);
+            this.labelControl4.Size = new System.Drawing.Size(68, 21);
             this.labelControl4.TabIndex = 453;
-            this.labelControl4.Text = "浠撳簱ID";
+            this.labelControl4.Text = "浠撳簱缂栫爜";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(26, 91);
+            this.label1.Location = new System.Drawing.Point(6, 91);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(62, 21);
+            this.label1.Size = new System.Drawing.Size(95, 21);
             this.label1.TabIndex = 452;
-            this.label1.Text = "渚涘簲ID";
+            this.label1.Text = "渚涘簲鍟嗙紪鐮�";
             // 
-            // txtSupplierId
+            // txtSupplierCode
             // 
-            this.txtSupplierId.Enabled = false;
-            this.txtSupplierId.Location = new System.Drawing.Point(98, 87);
-            this.txtSupplierId.Name = "txtSupplierId";
-            this.txtSupplierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtSupplierId.Properties.Appearance.Options.UseFont = true;
-            this.txtSupplierId.Size = new System.Drawing.Size(215, 28);
-            this.txtSupplierId.TabIndex = 451;
+            this.txtSupplierCode.Enabled = false;
+            this.txtSupplierCode.Location = new System.Drawing.Point(107, 87);
+            this.txtSupplierCode.Name = "txtSupplierCode";
+            this.txtSupplierCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
+            this.txtSupplierCode.Size = new System.Drawing.Size(215, 28);
+            this.txtSupplierCode.TabIndex = 451;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(785, 56);
+            this.txt_fType.Location = new System.Drawing.Point(728, 52);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "";
             this.txt_fType.Size = new System.Drawing.Size(35, 24);
@@ -1152,7 +1174,8 @@
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(785, 19);
+            this.txt_urgentFlag.Enabled = false;
+            this.txt_urgentFlag.Location = new System.Drawing.Point(728, 14);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "";
             this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
@@ -1161,7 +1184,7 @@
             // txt_fstatus
             // 
             this.txt_fstatus.Enabled = false;
-            this.txt_fstatus.Location = new System.Drawing.Point(785, 92);
+            this.txt_fstatus.Location = new System.Drawing.Point(886, 52);
             this.txt_fstatus.Name = "txt_fstatus";
             this.txt_fstatus.Properties.Caption = "";
             this.txt_fstatus.Size = new System.Drawing.Size(47, 24);
@@ -1180,7 +1203,7 @@
             // 
             this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(341, 57);
+            this.labelControl3.Location = new System.Drawing.Point(344, 57);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(68, 21);
             this.labelControl3.TabIndex = 444;
@@ -1193,12 +1216,12 @@
             this.btnSelect.Name = "btnSelect";
             this.btnSelect.Size = new System.Drawing.Size(128, 29);
             this.btnSelect.TabIndex = 443;
-            this.btnSelect.Text = "鍘婚�夋嫨鏉ユ枡鏄庣粏";
+            this.btnSelect.Text = "閫夊緟鍏ヤ粨鐗╂枡 ";
             // 
             // txt_suppId
             // 
             this.txt_suppId.IsReadly = true;
-            this.txt_suppId.Location = new System.Drawing.Point(98, 50);
+            this.txt_suppId.Location = new System.Drawing.Point(107, 50);
             this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_suppId.Name = "txt_suppId";
             this.txt_suppId.Size = new System.Drawing.Size(215, 28);
@@ -1208,15 +1231,15 @@
             // 
             this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(3, 55);
+            this.labelControl1.Location = new System.Drawing.Point(16, 55);
             this.labelControl1.Name = "labelControl1";
             this.labelControl1.Size = new System.Drawing.Size(85, 21);
             this.labelControl1.TabIndex = 439;
-            this.labelControl1.Text = "閫夋嫨渚涘簲鍟�";
+            this.labelControl1.Text = "渚涘簲鍟嗗悕绉�";
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(870, 22);
+            this.labelControl11.Location = new System.Drawing.Point(876, 18);
             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);
@@ -1227,7 +1250,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(877, 99);
+            this.lbGuid.Location = new System.Drawing.Point(933, 20);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -1237,11 +1260,11 @@
             // 
             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(377, 130);
+            this.lb_remark.Location = new System.Drawing.Point(344, 130);
             this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(34, 21);
+            this.lb_remark.Size = new System.Drawing.Size(68, 21);
             this.lb_remark.TabIndex = 240;
-            this.lb_remark.Text = "澶囨敞";
+            this.lb_remark.Text = "澶囨敞淇℃伅";
             // 
             // txt_remark
             // 
@@ -1249,7 +1272,7 @@
             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(388, 28);
+            this.txt_remark.Size = new System.Drawing.Size(522, 28);
             this.txt_remark.TabIndex = 240;
             // 
             // Frm_MesInvItemArn
@@ -1277,8 +1300,8 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
@@ -1344,10 +1367,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraEditors.CheckEdit txt_fType;
         private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
-        private DevExpress.XtraEditors.TextEdit txtSupplierId;
+        private DevExpress.XtraEditors.TextEdit txtSupplierCode;
         private DevExpress.XtraEditors.LabelControl labelControl4;
         private System.Windows.Forms.Label label1;
-        private DevExpress.XtraEditors.TextEdit txtDepotsId;
+        private DevExpress.XtraEditors.TextEdit txtDepotsCode;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView gridView1;
         private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fType;
@@ -1388,5 +1411,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
         private DevExpress.XtraEditors.SimpleButton btnTui;
+        private UserControl.UcLookOrg ucLookOrg1;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
     }
 }
\ 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 e191a1a..ce94a01 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -55,12 +55,12 @@
             //璁剧疆浠撳簱閫夋嫨
             this.txt_depotsId.EditChanged += (s, e) =>
             {
-                txtDepotsId.Text = this.txt_depotsId.GetId();
+                txtDepotsCode.Text = this.txt_depotsId.GetCode();
             };
             //璁剧疆渚涘簲鍟嗛�夋嫨
             this.txt_suppId.EditChanged += (s, e) =>
             {
-                txtSupplierId.Text = this.txt_suppId.GetId();
+                txtSupplierCode.Text = this.txt_suppId.GetCode();
             };
             //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
             btnSelect.Click += (s, e) =>
@@ -614,5 +614,7 @@
                 }
             }
         }
+
+    
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index ed75800..5c38254 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -74,6 +74,7 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+            this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_fSubsidiary = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -82,29 +83,57 @@
             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.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_factory = 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();
             this.gv_documentStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_documentType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_businessType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_purchaseDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            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.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.gv_createDate = 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();
@@ -114,35 +143,6 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.lbGuid = new DevExpress.XtraEditors.LabelControl();
             this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
-            this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -796,6 +796,22 @@
             this.gridView1.OptionsView.ShowColumnHeaders = false;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
+            // gridBand29
+            // 
+            this.gridBand29.Caption = "鏀舵枡缁勭粐";
+            this.gridBand29.Columns.Add(this.gv_fSubsidiary);
+            this.gridBand29.Columns.Add(this.gv_paymentParty);
+            this.gridBand29.Columns.Add(this.gv_transportMethod);
+            this.gridBand29.Columns.Add(this.gv_lastupdateDate);
+            this.gridBand29.Columns.Add(this.gv_lastupdateBy);
+            this.gridBand29.Columns.Add(this.gv_checkDate);
+            this.gridBand29.Columns.Add(this.gv_checkBy);
+            this.gridBand29.Columns.Add(this.gv_checkFalg);
+            this.gridBand29.MinWidth = 250;
+            this.gridBand29.Name = "gridBand29";
+            this.gridBand29.VisibleIndex = 0;
+            this.gridBand29.Width = 250;
+            // 
             // gv_fSubsidiary
             // 
             this.gv_fSubsidiary.Caption = "鏀舵枡缁勭粐";
@@ -803,6 +819,7 @@
             this.gv_fSubsidiary.MinWidth = 25;
             this.gv_fSubsidiary.Name = "gv_fSubsidiary";
             this.gv_fSubsidiary.OptionsColumn.AllowEdit = false;
+            this.gv_fSubsidiary.Tag = "org.fnamber";
             this.gv_fSubsidiary.Visible = true;
             this.gv_fSubsidiary.Width = 250;
             // 
@@ -890,6 +907,15 @@
             this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
             this.gv_checkFalg.Width = 100;
             // 
+            // gridBand1
+            // 
+            this.gridBand1.Caption = "ERPID鍙�";
+            this.gridBand1.Columns.Add(this.gv_factory);
+            this.gridBand1.MinWidth = 80;
+            this.gridBand1.Name = "gridBand1";
+            this.gridBand1.VisibleIndex = 1;
+            this.gridBand1.Width = 80;
+            // 
             // gv_factory
             // 
             this.gv_factory.Caption = "ERPID鍙�";
@@ -897,8 +923,18 @@
             this.gv_factory.MinWidth = 25;
             this.gv_factory.Name = "gv_factory";
             this.gv_factory.OptionsColumn.AllowEdit = false;
+            this.gv_factory.Tag = "query_a.ebelnK3id";
             this.gv_factory.Visible = true;
             this.gv_factory.Width = 80;
+            // 
+            // gridBand2
+            // 
+            this.gridBand2.Caption = "閲囪喘鍗曞彿";
+            this.gridBand2.Columns.Add(this.gv_billNo);
+            this.gridBand2.MinWidth = 120;
+            this.gridBand2.Name = "gridBand2";
+            this.gridBand2.VisibleIndex = 2;
+            this.gridBand2.Width = 120;
             // 
             // gv_billNo
             // 
@@ -913,6 +949,18 @@
             this.gv_billNo.Visible = true;
             this.gv_billNo.Width = 120;
             // 
+            // gridBand3
+            // 
+            this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
+            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 = 130;
+            this.gridBand3.Name = "gridBand3";
+            this.gridBand3.RowCount = 2;
+            this.gridBand3.VisibleIndex = 3;
+            this.gridBand3.Width = 130;
+            // 
             // gv_documentStatus
             // 
             this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -925,6 +973,17 @@
             this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
             this.gv_documentStatus.Visible = true;
             this.gv_documentStatus.Width = 130;
+            // 
+            // gridBand4
+            // 
+            this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
+            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.VisibleIndex = 4;
+            this.gridBand4.Width = 80;
             // 
             // gv_documentType
             // 
@@ -939,6 +998,15 @@
             this.gv_documentType.Visible = true;
             this.gv_documentType.Width = 80;
             // 
+            // gridBand5
+            // 
+            this.gridBand5.Caption = "涓氬姟绫诲瀷";
+            this.gridBand5.Columns.Add(this.gv_businessType);
+            this.gridBand5.MinWidth = 80;
+            this.gridBand5.Name = "gridBand5";
+            this.gridBand5.VisibleIndex = 5;
+            this.gridBand5.Width = 80;
+            // 
             // gv_businessType
             // 
             this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -951,6 +1019,15 @@
             this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
             this.gv_businessType.Visible = true;
             this.gv_businessType.Width = 80;
+            // 
+            // gridBand8
+            // 
+            this.gridBand8.Caption = "閲囪喘鏃ユ湡";
+            this.gridBand8.Columns.Add(this.gv_purchaseDate);
+            this.gridBand8.MinWidth = 170;
+            this.gridBand8.Name = "gridBand8";
+            this.gridBand8.VisibleIndex = 6;
+            this.gridBand8.Width = 170;
             // 
             // gv_purchaseDate
             // 
@@ -965,6 +1042,27 @@
             this.gv_purchaseDate.Visible = true;
             this.gv_purchaseDate.Width = 170;
             // 
+            // 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.gridBand11,
+            this.gridBand7});
+            this.gridBand6.MinWidth = 200;
+            this.gridBand6.Name = "gridBand6";
+            this.gridBand6.VisibleIndex = 7;
+            this.gridBand6.Width = 200;
+            // 
+            // gridBand11
+            // 
+            this.gridBand11.Caption = "ID";
+            this.gridBand11.Columns.Add(this.gv_supplier);
+            this.gridBand11.Name = "gridBand11";
+            this.gridBand11.VisibleIndex = 0;
+            this.gridBand11.Width = 66;
+            // 
             // gv_supplier
             // 
             this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -978,6 +1076,15 @@
             this.gv_supplier.Visible = true;
             this.gv_supplier.Width = 66;
             // 
+            // 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 = 134;
+            // 
             // bandedGridColumn1
             // 
             this.bandedGridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
@@ -985,8 +1092,20 @@
             this.bandedGridColumn1.MinWidth = 25;
             this.bandedGridColumn1.Name = "bandedGridColumn1";
             this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
+            this.bandedGridColumn1.Tag = "query_a.suppName";
             this.bandedGridColumn1.Visible = true;
             this.bandedGridColumn1.Width = 134;
+            // 
+            // gridBand9
+            // 
+            this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+            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.VisibleIndex = 8;
+            this.gridBand9.Width = 80;
             // 
             // gv_closeStatus
             // 
@@ -1001,6 +1120,28 @@
             this.gv_closeStatus.Visible = true;
             this.gv_closeStatus.Width = 80;
             // 
+            // gridBand10
+            // 
+            this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
+            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 = 9;
+            this.gridBand10.Width = 130;
+            // 
+            // 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 = 50;
+            // 
             // gv_purchaseDept
             // 
             this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1014,6 +1155,15 @@
             this.gv_purchaseDept.Visible = true;
             this.gv_purchaseDept.Width = 50;
             // 
+            // 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 = 80;
+            // 
             // bandedGridColumn2
             // 
             this.bandedGridColumn2.Caption = "閲囪喘閮ㄩ棬鍚嶇О";
@@ -1021,8 +1171,20 @@
             this.bandedGridColumn2.MinWidth = 25;
             this.bandedGridColumn2.Name = "bandedGridColumn2";
             this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
+            this.bandedGridColumn2.Tag = "query_a.departmentname";
             this.bandedGridColumn2.Visible = true;
             this.bandedGridColumn2.Width = 80;
+            // 
+            // 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 = 10;
+            this.gridBand14.Width = 50;
             // 
             // gv_qtyAcceptance
             // 
@@ -1037,6 +1199,15 @@
             this.gv_qtyAcceptance.Visible = true;
             this.gv_qtyAcceptance.Width = 50;
             // 
+            // gridBand15
+            // 
+            this.gridBand15.Caption = "閲囪喘鍛�";
+            this.gridBand15.Columns.Add(this.gv_purchaser);
+            this.gridBand15.MinWidth = 60;
+            this.gridBand15.Name = "gridBand15";
+            this.gridBand15.VisibleIndex = 11;
+            this.gridBand15.Width = 60;
+            // 
             // gv_purchaser
             // 
             this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1049,6 +1220,15 @@
             this.gv_purchaser.Tag = "query_a.PURCHASER";
             this.gv_purchaser.Visible = true;
             this.gv_purchaser.Width = 60;
+            // 
+            // gridBand16
+            // 
+            this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
+            this.gridBand16.Columns.Add(this.gv_qualityReq);
+            this.gridBand16.MinWidth = 80;
+            this.gridBand16.Name = "gridBand16";
+            this.gridBand16.VisibleIndex = 12;
+            this.gridBand16.Width = 80;
             // 
             // gv_qualityReq
             // 
@@ -1063,6 +1243,28 @@
             this.gv_qualityReq.Visible = true;
             this.gv_qualityReq.Width = 80;
             // 
+            // 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 = 13;
+            this.gridBand17.Width = 300;
+            // 
+            // 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);
@@ -1075,6 +1277,15 @@
             this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
             this.gv_cancellationStatus.Visible = true;
             this.gv_cancellationStatus.Width = 60;
+            // 
+            // 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 = 60;
             // 
             // gv_cancellationPerson
             // 
@@ -1089,6 +1300,15 @@
             this.gv_cancellationPerson.Visible = true;
             this.gv_cancellationPerson.Width = 60;
             // 
+            // 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 = 180;
+            // 
             // gv_cancellationDate
             // 
             this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1101,6 +1321,27 @@
             this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
             this.gv_cancellationDate.Visible = true;
             this.gv_cancellationDate.Width = 180;
+            // 
+            // 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.gridBand25,
+            this.gridBand22});
+            this.gridBand21.Name = "gridBand21";
+            this.gridBand21.VisibleIndex = 14;
+            this.gridBand21.Width = 260;
+            // 
+            // gridBand25
+            // 
+            this.gridBand25.Caption = "鍒涘缓浜�";
+            this.gridBand25.Columns.Add(this.gv_createBy);
+            this.gridBand25.MinWidth = 80;
+            this.gridBand25.Name = "gridBand25";
+            this.gridBand25.VisibleIndex = 0;
+            this.gridBand25.Width = 80;
             // 
             // gv_createBy
             // 
@@ -1115,6 +1356,15 @@
             this.gv_createBy.Visible = true;
             this.gv_createBy.Width = 80;
             // 
+            // gridBand22
+            // 
+            this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
+            this.gridBand22.Columns.Add(this.gv_createDate);
+            this.gridBand22.MinWidth = 180;
+            this.gridBand22.Name = "gridBand22";
+            this.gridBand22.VisibleIndex = 1;
+            this.gridBand22.Width = 180;
+            // 
             // gv_createDate
             // 
             this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1127,6 +1377,15 @@
             this.gv_createDate.Tag = "query_a.CREATE_DATE";
             this.gv_createDate.Visible = true;
             this.gv_createDate.Width = 180;
+            // 
+            // gridBand23
+            // 
+            this.gridBand23.Caption = "澶囨敞";
+            this.gridBand23.Columns.Add(this.gv_remarks);
+            this.gridBand23.MinWidth = 100;
+            this.gridBand23.Name = "gridBand23";
+            this.gridBand23.VisibleIndex = 15;
+            this.gridBand23.Width = 100;
             // 
             // gv_remarks
             // 
@@ -1141,6 +1400,15 @@
             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 = 16;
+            this.gridBand24.Width = 100;
+            // 
             // gv_changereason
             // 
             this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1153,6 +1421,28 @@
             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 = 17;
+            this.gridBand28.Width = 260;
+            // 
+            // 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 = 80;
             // 
             // gv_settlementParty
             // 
@@ -1178,6 +1468,15 @@
             this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
             this.gv_erpCheckBy.Visible = true;
             this.gv_erpCheckBy.Width = 80;
+            // 
+            // 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 = 180;
             // 
             // gv_erpCheckDate
             // 
@@ -1279,301 +1578,6 @@
             this.txt_supplier.Name = "txt_supplier";
             this.txt_supplier.Size = new System.Drawing.Size(305, 30);
             this.txt_supplier.TabIndex = 227;
-            // 
-            // gridBand29
-            // 
-            this.gridBand29.Caption = "鏀舵枡缁勭粐";
-            this.gridBand29.Columns.Add(this.gv_fSubsidiary);
-            this.gridBand29.Columns.Add(this.gv_paymentParty);
-            this.gridBand29.Columns.Add(this.gv_transportMethod);
-            this.gridBand29.Columns.Add(this.gv_lastupdateDate);
-            this.gridBand29.Columns.Add(this.gv_lastupdateBy);
-            this.gridBand29.Columns.Add(this.gv_checkDate);
-            this.gridBand29.Columns.Add(this.gv_checkBy);
-            this.gridBand29.Columns.Add(this.gv_checkFalg);
-            this.gridBand29.MinWidth = 250;
-            this.gridBand29.Name = "gridBand29";
-            this.gridBand29.VisibleIndex = 0;
-            this.gridBand29.Width = 250;
-            // 
-            // gridBand1
-            // 
-            this.gridBand1.Caption = "ERPID鍙�";
-            this.gridBand1.Columns.Add(this.gv_factory);
-            this.gridBand1.MinWidth = 80;
-            this.gridBand1.Name = "gridBand1";
-            this.gridBand1.VisibleIndex = 1;
-            this.gridBand1.Width = 80;
-            // 
-            // gridBand2
-            // 
-            this.gridBand2.Caption = "閲囪喘鍗曞彿";
-            this.gridBand2.Columns.Add(this.gv_billNo);
-            this.gridBand2.MinWidth = 120;
-            this.gridBand2.Name = "gridBand2";
-            this.gridBand2.VisibleIndex = 2;
-            this.gridBand2.Width = 120;
-            // 
-            // gridBand3
-            // 
-            this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
-            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 = 130;
-            this.gridBand3.Name = "gridBand3";
-            this.gridBand3.RowCount = 2;
-            this.gridBand3.VisibleIndex = 3;
-            this.gridBand3.Width = 130;
-            // 
-            // gridBand4
-            // 
-            this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
-            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.VisibleIndex = 4;
-            this.gridBand4.Width = 80;
-            // 
-            // gridBand5
-            // 
-            this.gridBand5.Caption = "涓氬姟绫诲瀷";
-            this.gridBand5.Columns.Add(this.gv_businessType);
-            this.gridBand5.MinWidth = 80;
-            this.gridBand5.Name = "gridBand5";
-            this.gridBand5.VisibleIndex = 5;
-            this.gridBand5.Width = 80;
-            // 
-            // gridBand8
-            // 
-            this.gridBand8.Caption = "閲囪喘鏃ユ湡";
-            this.gridBand8.Columns.Add(this.gv_purchaseDate);
-            this.gridBand8.MinWidth = 170;
-            this.gridBand8.Name = "gridBand8";
-            this.gridBand8.VisibleIndex = 6;
-            this.gridBand8.Width = 170;
-            // 
-            // 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.gridBand11,
-            this.gridBand7});
-            this.gridBand6.MinWidth = 200;
-            this.gridBand6.Name = "gridBand6";
-            this.gridBand6.VisibleIndex = 7;
-            this.gridBand6.Width = 200;
-            // 
-            // gridBand11
-            // 
-            this.gridBand11.Caption = "ID";
-            this.gridBand11.Columns.Add(this.gv_supplier);
-            this.gridBand11.Name = "gridBand11";
-            this.gridBand11.VisibleIndex = 0;
-            this.gridBand11.Width = 66;
-            // 
-            // 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 = 134;
-            // 
-            // gridBand9
-            // 
-            this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
-            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.VisibleIndex = 8;
-            this.gridBand9.Width = 80;
-            // 
-            // gridBand10
-            // 
-            this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
-            this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
-            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 = 9;
-            this.gridBand10.Width = 130;
-            // 
-            // 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 = 50;
-            // 
-            // 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 = 80;
-            // 
-            // 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 = 10;
-            this.gridBand14.Width = 50;
-            // 
-            // gridBand15
-            // 
-            this.gridBand15.Caption = "閲囪喘鍛�";
-            this.gridBand15.Columns.Add(this.gv_purchaser);
-            this.gridBand15.MinWidth = 60;
-            this.gridBand15.Name = "gridBand15";
-            this.gridBand15.VisibleIndex = 11;
-            this.gridBand15.Width = 60;
-            // 
-            // gridBand16
-            // 
-            this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
-            this.gridBand16.Columns.Add(this.gv_qualityReq);
-            this.gridBand16.MinWidth = 80;
-            this.gridBand16.Name = "gridBand16";
-            this.gridBand16.VisibleIndex = 12;
-            this.gridBand16.Width = 80;
-            // 
-            // 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 = 13;
-            this.gridBand17.Width = 300;
-            // 
-            // 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;
-            // 
-            // 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 = 60;
-            // 
-            // 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 = 180;
-            // 
-            // 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.gridBand25,
-            this.gridBand22});
-            this.gridBand21.Name = "gridBand21";
-            this.gridBand21.VisibleIndex = 14;
-            this.gridBand21.Width = 260;
-            // 
-            // gridBand25
-            // 
-            this.gridBand25.Caption = "鍒涘缓浜�";
-            this.gridBand25.Columns.Add(this.gv_createBy);
-            this.gridBand25.MinWidth = 80;
-            this.gridBand25.Name = "gridBand25";
-            this.gridBand25.VisibleIndex = 0;
-            this.gridBand25.Width = 80;
-            // 
-            // gridBand22
-            // 
-            this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
-            this.gridBand22.Columns.Add(this.gv_createDate);
-            this.gridBand22.MinWidth = 180;
-            this.gridBand22.Name = "gridBand22";
-            this.gridBand22.VisibleIndex = 1;
-            this.gridBand22.Width = 180;
-            // 
-            // gridBand23
-            // 
-            this.gridBand23.Caption = "澶囨敞";
-            this.gridBand23.Columns.Add(this.gv_remarks);
-            this.gridBand23.MinWidth = 100;
-            this.gridBand23.Name = "gridBand23";
-            this.gridBand23.VisibleIndex = 15;
-            this.gridBand23.Width = 100;
-            // 
-            // gridBand24
-            // 
-            this.gridBand24.Caption = "鍙樻洿鍘熷洜";
-            this.gridBand24.Columns.Add(this.gv_changereason);
-            this.gridBand24.MinWidth = 100;
-            this.gridBand24.Name = "gridBand24";
-            this.gridBand24.VisibleIndex = 16;
-            this.gridBand24.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 = 17;
-            this.gridBand28.Width = 260;
-            // 
-            // 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 = 80;
-            // 
-            // 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 = 180;
             // 
             // Frm_MesRohIn
             // 
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 02a3a08..2d0a67e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -3,6 +3,7 @@
 using System.Data;
 using System.Drawing;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using DevExpress.XtraEditors;
 using DevExpress.XtraGrid.Views.BandedGrid;
@@ -25,23 +26,16 @@
             toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            getPageList(1, UtilityHelper.GetPageSize());
+            getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            gridView1.CustomDrawRowIndicator += (s, e) =>
-            {
-                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
-            };
-            gridView1.CustomDrawEmptyForeground += (s, e) =>
-            {
-                var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                var f = new Font("寰蒋闆呴粦", 16);
-                var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
-                    e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
-                e.Graphics.DrawString(str, f, Brushes.Gray, r);
-            };
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
         }
-
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+            await Task.Delay(100);
+            getPageList(1);
+        }
         /// <summary>
         ///     鍙屽嚮浜嬩欢
         /// </summary>
@@ -62,7 +56,7 @@
         /// <param name="pageSize"></param>
         private void PageBar1_PagerEvent(int curPage, int pageSize)
         {
-            getPageList(curPage, pageSize);
+            getPageList(curPage);
         }
 
         /// <summary>
@@ -72,6 +66,9 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
         {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
             var frm = new ShowFilter(gridView1.Columns, _filterList);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
@@ -85,7 +82,7 @@
         private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
         {
             _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
+            getPageList(1);
         }
 
         /// <summary>
@@ -98,21 +95,27 @@
             if (xtraTabControl1.SelectedTabPageIndex == 1)
                 getModel(lbGuid.Text.Trim(), false, 999);
             else
-                getPageList(1, UtilityHelper.GetPageSize());
+            {
+                _filterList.Clear();
+                if (gridView1.ActiveFilter.Count > 0)
+                {
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    gridView1.ActiveFilter.Clear();
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                }
+                getPageList(1);
+            }
         }
 
         /// <summary>
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private async void getPageList(int curPage, int pageSize)
+        private async void getPageList(int curPage)
         {
             UcLoading _loading = new UcLoading();
-            var _sbSqlWhere = new StringBuilder();
-            foreach (var itm in _filterList)
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
-                                   itm.fileValue + "'");
-            var pgq = new PageQueryModel(curPage, pageSize, "create_date",
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
                 "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -120,15 +123,20 @@
                 var strReturn = await UtilityHelper.HttpPostAsync("",
                     _webServiceName + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = dd.rtnData.list;
+                DataTable dt = dd.rtnData.list;
                 gcMain.BindingContext = new BindingContext();
-                gcMain.DataSource = dt;
-                gcMain.ForceInitialize();
-                var dddd = dd.rtnData.pages; //鎬婚〉
-                pageBar1.TotalPages = dddd;
-                pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
-                pageBar1.CurrentPage = curPage; //褰撳墠椤�
-                pageBar1.setTxt();
+                gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                if (dt.Rows.Count > 0)
+                {
+                    gcMain.DataSource = dt;
+                    gcMain.ForceInitialize();
+                }
+                else
+                    UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
             }
             catch (Exception ex)
             {
@@ -155,7 +163,7 @@
                 var strJson = await UtilityHelper.HttpPostAsync("",
                     _webServiceName + "GetModel",
                     JsonConvert.SerializeObject(_obj));
-                var _rtn =  UtilityHelper.ReturnToDynamic(strJson);
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
                     var dy = _rtn.rtnData;

--
Gitblit v1.9.3