From edeca77b86b4dac6ab00dced2420a5fd92c1d604 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 05 三月 2025 08:53:43 +0800
Subject: [PATCH] 委外退料

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs          |    8 
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs   |  142 +++----
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs |  864 ++++++++++++++------------------------------------
 3 files changed, 319 insertions(+), 695 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 7c40d8c..0c4556a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -55,7 +55,6 @@
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gv_tbl013 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_tbl020 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_tbl003 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_tbl002 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -301,7 +300,6 @@
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_tbl013,
             this.gv_tbl020,
-            this.gridColumn5,
             this.gv_billNo,
             this.gv_tbl003,
             this.gv_tbl002,
@@ -351,17 +349,6 @@
             this.gv_tbl020.VisibleIndex = 1;
             this.gv_tbl020.Width = 50;
             // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "閫�鏂欑粍缁�";
-            this.gridColumn5.FieldName = "tlOrg";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Tag = "org.fnamber";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 2;
-            this.gridColumn5.Width = 94;
-            // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -373,7 +360,7 @@
             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.VisibleIndex = 2;
             this.gv_billNo.Width = 94;
             // 
             // gv_tbl003
@@ -387,7 +374,7 @@
             this.gv_tbl003.OptionsColumn.AllowEdit = false;
             this.gv_tbl003.Tag = "query_a.tbl003";
             this.gv_tbl003.Visible = true;
-            this.gv_tbl003.VisibleIndex = 4;
+            this.gv_tbl003.VisibleIndex = 3;
             this.gv_tbl003.Width = 94;
             // 
             // gv_tbl002
@@ -401,7 +388,7 @@
             this.gv_tbl002.OptionsColumn.AllowEdit = false;
             this.gv_tbl002.Tag = "query_a.tbl002";
             this.gv_tbl002.Visible = true;
-            this.gv_tbl002.VisibleIndex = 5;
+            this.gv_tbl002.VisibleIndex = 4;
             this.gv_tbl002.Width = 94;
             // 
             // gridColumn6
@@ -411,7 +398,7 @@
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 6;
+            this.gridColumn6.VisibleIndex = 5;
             this.gridColumn6.Width = 94;
             // 
             // gridColumn10
@@ -421,7 +408,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 7;
+            this.gridColumn10.VisibleIndex = 6;
             this.gridColumn10.Width = 94;
             // 
             // gv_tbl004
@@ -435,7 +422,7 @@
             this.gv_tbl004.OptionsColumn.AllowEdit = false;
             this.gv_tbl004.Tag = "query_a.tbl004";
             this.gv_tbl004.Visible = true;
-            this.gv_tbl004.VisibleIndex = 8;
+            this.gv_tbl004.VisibleIndex = 7;
             this.gv_tbl004.Width = 94;
             // 
             // gv_tbl005
@@ -449,7 +436,7 @@
             this.gv_tbl005.OptionsColumn.AllowEdit = false;
             this.gv_tbl005.Tag = "query_a.tbl005";
             this.gv_tbl005.Visible = true;
-            this.gv_tbl005.VisibleIndex = 9;
+            this.gv_tbl005.VisibleIndex = 8;
             this.gv_tbl005.Width = 94;
             // 
             // gv_tbl009
@@ -463,7 +450,7 @@
             this.gv_tbl009.OptionsColumn.AllowEdit = false;
             this.gv_tbl009.Tag = "query_a.tbl009";
             this.gv_tbl009.Visible = true;
-            this.gv_tbl009.VisibleIndex = 10;
+            this.gv_tbl009.VisibleIndex = 9;
             this.gv_tbl009.Width = 94;
             // 
             // gv_tbl010
@@ -477,7 +464,7 @@
             this.gv_tbl010.OptionsColumn.AllowEdit = false;
             this.gv_tbl010.Tag = "query_a.tbl010";
             this.gv_tbl010.Visible = true;
-            this.gv_tbl010.VisibleIndex = 11;
+            this.gv_tbl010.VisibleIndex = 10;
             this.gv_tbl010.Width = 94;
             // 
             // gv_tbl011
@@ -491,7 +478,7 @@
             this.gv_tbl011.OptionsColumn.AllowEdit = false;
             this.gv_tbl011.Tag = "query_a.tbl011";
             this.gv_tbl011.Visible = true;
-            this.gv_tbl011.VisibleIndex = 12;
+            this.gv_tbl011.VisibleIndex = 11;
             this.gv_tbl011.Width = 94;
             // 
             // gv_tbl012
@@ -505,7 +492,7 @@
             this.gv_tbl012.OptionsColumn.AllowEdit = false;
             this.gv_tbl012.Tag = "query_a.tbl012";
             this.gv_tbl012.Visible = true;
-            this.gv_tbl012.VisibleIndex = 13;
+            this.gv_tbl012.VisibleIndex = 12;
             this.gv_tbl012.Width = 94;
             // 
             // gridColumn11
@@ -515,7 +502,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 14;
+            this.gridColumn11.VisibleIndex = 13;
             this.gridColumn11.Width = 94;
             // 
             // pageBar1
@@ -585,9 +572,9 @@
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 108);
+            this.lbGuid.Location = new System.Drawing.Point(840, 108);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.Size = new System.Drawing.Size(274, 28);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
@@ -604,11 +591,11 @@
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(626, 44);
+            this.txt_itemName.Location = new System.Drawing.Point(636, 44);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(195, 28);
+            this.txt_itemName.Size = new System.Drawing.Size(200, 28);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 464;
             this.txt_itemName.Tag = "readonly";
@@ -626,7 +613,7 @@
             "鏉ユ枡涓嶈壇閫�鏂�",
             "浣滀笟涓嶈壇閫�鏂�"});
             this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_tbl005.Size = new System.Drawing.Size(195, 24);
+            this.txt_tbl005.Size = new System.Drawing.Size(200, 24);
             this.txt_tbl005.StyleController = this.layoutMx1;
             this.txt_tbl005.TabIndex = 459;
             // 
@@ -635,7 +622,7 @@
             this.txt_tbl002.IsReadly = false;
             this.txt_tbl002.Location = new System.Drawing.Point(84, 44);
             this.txt_tbl002.Name = "txt_tbl002";
-            this.txt_tbl002.Size = new System.Drawing.Size(195, 28);
+            this.txt_tbl002.Size = new System.Drawing.Size(200, 28);
             this.txt_tbl002.TabIndex = 462;
             // 
             // txt_billNo
@@ -644,101 +631,101 @@
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(195, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(200, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
             // 
             // txt_tbl012
             // 
-            this.txt_tbl012.Location = new System.Drawing.Point(897, 44);
+            this.txt_tbl012.Location = new System.Drawing.Point(912, 44);
             this.txt_tbl012.Name = "txt_tbl012";
             this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl012.Size = new System.Drawing.Size(196, 28);
+            this.txt_tbl012.Size = new System.Drawing.Size(202, 28);
             this.txt_tbl012.StyleController = this.layoutMx1;
             this.txt_tbl012.TabIndex = 247;
             this.txt_tbl012.Tag = "readonly";
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(355, 12);
+            this.txt_daa014.Location = new System.Drawing.Point(360, 12);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(195, 28);
+            this.txt_daa014.Size = new System.Drawing.Size(200, 28);
             this.txt_daa014.StyleController = this.layoutMx1;
             this.txt_daa014.TabIndex = 217;
             this.txt_daa014.Tag = "readonly";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(626, 12);
+            this.txt_itemNo.Location = new System.Drawing.Point(636, 12);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(195, 28);
+            this.txt_itemNo.Size = new System.Drawing.Size(200, 28);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 298;
             this.txt_itemNo.Tag = "readonly";
             // 
             // txt_tbl011
             // 
-            this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
+            this.txt_tbl011.Location = new System.Drawing.Point(912, 12);
             this.txt_tbl011.Name = "txt_tbl011";
             this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl011.Size = new System.Drawing.Size(196, 28);
+            this.txt_tbl011.Size = new System.Drawing.Size(202, 28);
             this.txt_tbl011.StyleController = this.layoutMx1;
             this.txt_tbl011.TabIndex = 243;
             this.txt_tbl011.Tag = "readonly";
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(626, 76);
+            this.txt_itemModel.Location = new System.Drawing.Point(636, 76);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemModel.Size = new System.Drawing.Size(195, 28);
+            this.txt_itemModel.Size = new System.Drawing.Size(200, 28);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 219;
             this.txt_itemModel.Tag = "readonly";
             // 
             // txt_tbl006
             // 
-            this.txt_tbl006.Location = new System.Drawing.Point(355, 76);
+            this.txt_tbl006.Location = new System.Drawing.Point(360, 76);
             this.txt_tbl006.Name = "txt_tbl006";
             this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl006.Size = new System.Drawing.Size(195, 28);
+            this.txt_tbl006.Size = new System.Drawing.Size(200, 28);
             this.txt_tbl006.StyleController = this.layoutMx1;
             this.txt_tbl006.TabIndex = 226;
             // 
             // txt_tbl013
             // 
-            this.txt_tbl013.Location = new System.Drawing.Point(825, 76);
+            this.txt_tbl013.Location = new System.Drawing.Point(840, 76);
             this.txt_tbl013.Name = "txt_tbl013";
             this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
+            this.txt_tbl013.Size = new System.Drawing.Size(274, 24);
             this.txt_tbl013.StyleController = this.layoutMx1;
             this.txt_tbl013.TabIndex = 465;
             this.txt_tbl013.Tag = "readonly";
             // 
             // txt_tbl020
             // 
-            this.txt_tbl020.Location = new System.Drawing.Point(554, 108);
+            this.txt_tbl020.Location = new System.Drawing.Point(564, 108);
             this.txt_tbl020.Name = "txt_tbl020";
             this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑 ";
-            this.txt_tbl020.Size = new System.Drawing.Size(267, 24);
+            this.txt_tbl020.Size = new System.Drawing.Size(272, 24);
             this.txt_tbl020.StyleController = this.layoutMx1;
             this.txt_tbl020.TabIndex = 466;
             this.txt_tbl020.Tag = "readonly";
             // 
             // txt_erpProductionOrderNo
             // 
-            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 44);
+            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(360, 44);
             this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
-            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(195, 24);
+            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(200, 24);
             this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
             this.txt_erpProductionOrderNo.TabIndex = 467;
             this.txt_erpProductionOrderNo.Tag = "readonly";
@@ -791,7 +778,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1105, 148);
+            this.Root.Size = new System.Drawing.Size(1126, 148);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -799,27 +786,27 @@
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem1.Text = "鐢宠鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_daa014;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem2.Text = "鎶曟枡鍗曞彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_itemNo;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem3.Text = "浜у搧缂栫爜";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -829,29 +816,29 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem4.Text = "濮斿宸ュ崟";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_itemName;
-            this.layoutControlItem5.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem5.Location = new System.Drawing.Point(552, 32);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem5.Text = "浜у搧鍚嶇О";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.Location = new System.Drawing.Point(542, 64);
+            this.layoutControlItem6.Location = new System.Drawing.Point(552, 64);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem6.Text = "浜у搧鍨嬪彿";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -861,39 +848,39 @@
             this.layoutControlItem7.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem7.Text = "閫�鏂欑被鍨�";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_tbl011;
-            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem9.Text = "瀹℃牳浜�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_tbl012;
-            this.layoutControlItem10.Location = new System.Drawing.Point(813, 32);
+            this.layoutControlItem10.Location = new System.Drawing.Point(828, 32);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_tbl013;
-            this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
+            this.layoutControlItem11.Location = new System.Drawing.Point(828, 64);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -901,22 +888,22 @@
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_erpProductionOrderNo;
-            this.layoutControlItem15.Location = new System.Drawing.Point(271, 32);
+            this.layoutControlItem15.Location = new System.Drawing.Point(276, 32);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem15.Text = "浠诲姟鍗曞彿";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_tbl006;
-            this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
+            this.layoutControlItem8.Location = new System.Drawing.Point(276, 64);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem8.Text = "澶囨敞";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -928,7 +915,7 @@
             this.layoutControlItem13.MinSize = new System.Drawing.Size(90, 31);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem13.Text = "閫夋嫨鎸夐挳";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
@@ -937,11 +924,11 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_tbl020;
-            this.layoutControlItem12.Location = new System.Drawing.Point(542, 96);
+            this.layoutControlItem12.Location = new System.Drawing.Point(552, 96);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -949,11 +936,11 @@
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.lbGuid;
-            this.layoutControlItem14.Location = new System.Drawing.Point(813, 96);
+            this.layoutControlItem14.Location = new System.Drawing.Point(828, 96);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem14.Text = "lbGuid";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem14.TextVisible = false;
@@ -1635,7 +1622,6 @@
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl013;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl020;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl003;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl002;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
index 5f8b7f6..559b39e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
@@ -76,65 +76,38 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
-            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_status = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_reason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_checkRes = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_ebeln = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_lineNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_taskLino = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_fbillno = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_fbillLino = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_custNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_custName = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_pickIns = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_fcheckUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_rbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.bandedGridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_cbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gv_depotsId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.bandedGridColumn1 = 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_remark = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.bandedGridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.bandedGridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotsId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.bandedGridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fbillno = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_cbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.bandedGridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             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.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
             this.txt_status = new DevExpress.XtraEditors.CheckEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -153,16 +126,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // tabMxPage2
@@ -669,47 +642,37 @@
             // 
             // xtraTabPage1
             // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
+            this.xtraTabPage1.Controls.Add(this.gcMain1);
             this.xtraTabPage1.Controls.Add(this.pageBar1);
             this.xtraTabPage1.Name = "xtraTabPage1";
             this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
-            // gcMain
+            // gcMain1
             // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1126, 531);
-            this.gcMain.TabIndex = 4;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1126, 531);
+            this.gcMain1.TabIndex = 4;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
             // 
             // gridView1
             // 
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
-            this.gridBand1,
-            this.gridBand2,
-            this.gridBand15,
-            this.gridBand3,
-            this.gridBand5,
-            this.gridBand4,
-            this.gridBand11,
-            this.gridBand6,
-            this.gridBand7,
-            this.gridBand13,
-            this.gridBand14,
-            this.gridBand8});
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
-            this.bandedGridColumn1,
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_guid,
-            this.gv_billNo,
             this.gv_status,
+            this.gv_billNo,
+            this.bandedGridColumn3,
+            this.gridColumn1,
             this.gv_depotsId,
+            this.gv_depotsCode,
+            this.bandedGridColumn1,
             this.gv_reason,
             this.gv_createBy,
             this.gv_createDate,
@@ -718,313 +681,44 @@
             this.gv_remark,
             this.gv_checkUser,
             this.gv_checkDate,
-            this.gv_checkRes,
-            this.gv_checkQty,
-            this.gv_ebeln,
-            this.gv_depotsCode,
-            this.gv_suppNo,
-            this.gv_urgentFlag,
-            this.gv_lineNo,
-            this.gv_taskLino,
             this.gv_fbillno,
-            this.gv_fbillLino,
-            this.gv_custNo,
-            this.gv_custName,
             this.gv_cbillNo,
-            this.gv_pickIns,
-            this.gv_fcheckUser,
-            this.gv_fcheckDate,
-            this.gv_rbillNo,
-            this.bandedGridColumn3,
-            this.bandedGridColumn4,
-            this.bandedGridColumn2});
-            this.gridView1.GridControl = this.gcMain;
+            this.bandedGridColumn2,
+            this.bandedGridColumn4});
+            this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowColumnHeaders = false;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
-            // gridBand1
+            // gv_guid
             // 
-            this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
-            this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridBand1.Caption = "瀹℃牳鏍囪瘑";
-            this.gridBand1.Columns.Add(this.gv_status);
-            this.gridBand1.Columns.Add(this.gv_guid);
-            this.gridBand1.Columns.Add(this.gv_reason);
-            this.gridBand1.Columns.Add(this.gv_lastupdateBy);
-            this.gridBand1.Columns.Add(this.gv_lastupdateDate);
-            this.gridBand1.Columns.Add(this.gv_checkRes);
-            this.gridBand1.Columns.Add(this.gv_checkQty);
-            this.gridBand1.Columns.Add(this.gv_ebeln);
-            this.gridBand1.Columns.Add(this.gv_depotsCode);
-            this.gridBand1.Columns.Add(this.gv_suppNo);
-            this.gridBand1.Columns.Add(this.gv_urgentFlag);
-            this.gridBand1.Columns.Add(this.gv_lineNo);
-            this.gridBand1.Columns.Add(this.gv_taskLino);
-            this.gridBand1.Columns.Add(this.gv_fbillno);
-            this.gridBand1.Columns.Add(this.gv_fbillLino);
-            this.gridBand1.Columns.Add(this.gv_custNo);
-            this.gridBand1.Columns.Add(this.gv_custName);
-            this.gridBand1.Columns.Add(this.gv_pickIns);
-            this.gridBand1.Columns.Add(this.gv_fcheckUser);
-            this.gridBand1.Columns.Add(this.gv_rbillNo);
-            this.gridBand1.MinWidth = 50;
-            this.gridBand1.Name = "gridBand1";
-            this.gridBand1.VisibleIndex = 0;
-            this.gridBand1.Width = 50;
+            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_guid.AppearanceCell.Options.UseFont = true;
+            this.gv_guid.Caption = "涓婚敭GUID";
+            this.gv_guid.FieldName = "guid";
+            this.gv_guid.MinWidth = 25;
+            this.gv_guid.Name = "gv_guid";
+            this.gv_guid.OptionsColumn.AllowEdit = false;
+            this.gv_guid.Tag = "query_a.GUID";
+            this.gv_guid.Visible = true;
+            this.gv_guid.VisibleIndex = 0;
+            this.gv_guid.Width = 94;
             // 
             // gv_status
             // 
             this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_status.AppearanceCell.Options.UseFont = true;
-            this.gv_status.Caption = "鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴 ";
+            this.gv_status.Caption = "瀹℃牳鏍囪瘑";
             this.gv_status.FieldName = "checkStatus";
             this.gv_status.MinWidth = 25;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.STATUS";
             this.gv_status.Visible = true;
+            this.gv_status.VisibleIndex = 1;
             this.gv_status.Width = 50;
-            // 
-            // gv_guid
-            // 
-            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_guid.AppearanceCell.Options.UseFont = true;
-            this.gv_guid.Caption = "ID(SEQ_INV_ID) ";
-            this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 25;
-            this.gv_guid.Name = "gv_guid";
-            this.gv_guid.OptionsColumn.AllowEdit = false;
-            this.gv_guid.Tag = "query_a.GUID";
-            this.gv_guid.Width = 94;
-            // 
-            // gv_reason
-            // 
-            this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_reason.AppearanceCell.Options.UseFont = true;
-            this.gv_reason.Caption = "鍘熷洜 ";
-            this.gv_reason.FieldName = "reason";
-            this.gv_reason.MinWidth = 25;
-            this.gv_reason.Name = "gv_reason";
-            this.gv_reason.OptionsColumn.AllowEdit = false;
-            this.gv_reason.Tag = "query_a.REASON";
-            this.gv_reason.Width = 94;
-            // 
-            // gv_lastupdateBy
-            // 
-            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
-            this.gv_lastupdateBy.FieldName = "lastupdateBy";
-            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 = 94;
-            // 
-            // gv_lastupdateDate
-            // 
-            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
-            this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            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";
-            this.gv_lastupdateDate.Width = 94;
-            // 
-            // gv_checkRes
-            // 
-            this.gv_checkRes.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkRes.AppearanceCell.Options.UseFont = true;
-            this.gv_checkRes.Caption = "CHECK_RES ";
-            this.gv_checkRes.FieldName = "checkRes";
-            this.gv_checkRes.MinWidth = 25;
-            this.gv_checkRes.Name = "gv_checkRes";
-            this.gv_checkRes.OptionsColumn.AllowEdit = false;
-            this.gv_checkRes.Tag = "query_a.CHECK_RES";
-            this.gv_checkRes.Width = 94;
-            // 
-            // gv_checkQty
-            // 
-            this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkQty.AppearanceCell.Options.UseFont = true;
-            this.gv_checkQty.Caption = "CHECK_QTY ";
-            this.gv_checkQty.FieldName = "checkQty";
-            this.gv_checkQty.MinWidth = 25;
-            this.gv_checkQty.Name = "gv_checkQty";
-            this.gv_checkQty.OptionsColumn.AllowEdit = false;
-            this.gv_checkQty.Tag = "query_a.CHECK_QTY";
-            this.gv_checkQty.Width = 94;
-            // 
-            // gv_ebeln
-            // 
-            this.gv_ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_ebeln.AppearanceCell.Options.UseFont = true;
-            this.gv_ebeln.Caption = "EBELN ";
-            this.gv_ebeln.FieldName = "ebeln";
-            this.gv_ebeln.MinWidth = 25;
-            this.gv_ebeln.Name = "gv_ebeln";
-            this.gv_ebeln.OptionsColumn.AllowEdit = false;
-            this.gv_ebeln.Tag = "query_a.EBELN";
-            this.gv_ebeln.Width = 64;
-            // 
-            // gv_depotsCode
-            // 
-            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotsCode.Caption = "DEPOTS_CODE ";
-            this.gv_depotsCode.FieldName = "depotsCode";
-            this.gv_depotsCode.MinWidth = 25;
-            this.gv_depotsCode.Name = "gv_depotsCode";
-            this.gv_depotsCode.OptionsColumn.AllowEdit = false;
-            this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
-            this.gv_depotsCode.Width = 94;
-            // 
-            // gv_suppNo
-            // 
-            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
-            this.gv_suppNo.Caption = "SUPP_NO ";
-            this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 25;
-            this.gv_suppNo.Name = "gv_suppNo";
-            this.gv_suppNo.OptionsColumn.AllowEdit = false;
-            this.gv_suppNo.Tag = "query_a.SUPP_NO";
-            this.gv_suppNo.Width = 64;
-            // 
-            // gv_urgentFlag
-            // 
-            this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
-            this.gv_urgentFlag.Caption = "URGENT_FLAG ";
-            this.gv_urgentFlag.FieldName = "urgentFlag";
-            this.gv_urgentFlag.MinWidth = 25;
-            this.gv_urgentFlag.Name = "gv_urgentFlag";
-            this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
-            this.gv_urgentFlag.Tag = "query_a.URGENT_FLAG";
-            this.gv_urgentFlag.Width = 50;
-            // 
-            // gv_lineNo
-            // 
-            this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_lineNo.AppearanceCell.Options.UseFont = true;
-            this.gv_lineNo.Caption = "LINE_NO ";
-            this.gv_lineNo.FieldName = "lineNo";
-            this.gv_lineNo.MinWidth = 25;
-            this.gv_lineNo.Name = "gv_lineNo";
-            this.gv_lineNo.OptionsColumn.AllowEdit = false;
-            this.gv_lineNo.Tag = "query_a.LINE_NO";
-            this.gv_lineNo.Width = 64;
-            // 
-            // gv_taskLino
-            // 
-            this.gv_taskLino.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_taskLino.AppearanceCell.Options.UseFont = true;
-            this.gv_taskLino.Caption = "宸ュ崟琛屽彿 ";
-            this.gv_taskLino.FieldName = "taskLino";
-            this.gv_taskLino.MinWidth = 25;
-            this.gv_taskLino.Name = "gv_taskLino";
-            this.gv_taskLino.OptionsColumn.AllowEdit = false;
-            this.gv_taskLino.Tag = "query_a.TASK_LINO";
-            this.gv_taskLino.Width = 64;
-            // 
-            // gv_fbillno
-            // 
-            this.gv_fbillno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fbillno.AppearanceCell.Options.UseFont = true;
-            this.gv_fbillno.Caption = "鎶曟枡閫氱煡鍗曞崟鍙� ";
-            this.gv_fbillno.FieldName = "fbillno";
-            this.gv_fbillno.MinWidth = 25;
-            this.gv_fbillno.Name = "gv_fbillno";
-            this.gv_fbillno.OptionsColumn.AllowEdit = false;
-            this.gv_fbillno.Tag = "query_a.FBILLNO";
-            this.gv_fbillno.Width = 64;
-            // 
-            // gv_fbillLino
-            // 
-            this.gv_fbillLino.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fbillLino.AppearanceCell.Options.UseFont = true;
-            this.gv_fbillLino.Caption = "鎶曟枡鍗曡鍙� ";
-            this.gv_fbillLino.FieldName = "fbillLino";
-            this.gv_fbillLino.MinWidth = 25;
-            this.gv_fbillLino.Name = "gv_fbillLino";
-            this.gv_fbillLino.OptionsColumn.AllowEdit = false;
-            this.gv_fbillLino.Tag = "query_a.FBILL_LINO";
-            this.gv_fbillLino.Width = 64;
-            // 
-            // gv_custNo
-            // 
-            this.gv_custNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_custNo.AppearanceCell.Options.UseFont = true;
-            this.gv_custNo.Caption = "瀹㈡埛缂栧彿 ";
-            this.gv_custNo.FieldName = "custNo";
-            this.gv_custNo.MinWidth = 25;
-            this.gv_custNo.Name = "gv_custNo";
-            this.gv_custNo.OptionsColumn.AllowEdit = false;
-            this.gv_custNo.Tag = "query_a.CUST_NO";
-            this.gv_custNo.Width = 64;
-            // 
-            // gv_custName
-            // 
-            this.gv_custName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_custName.AppearanceCell.Options.UseFont = true;
-            this.gv_custName.Caption = "瀹㈡埛鍚嶇О ";
-            this.gv_custName.FieldName = "custName";
-            this.gv_custName.MinWidth = 25;
-            this.gv_custName.Name = "gv_custName";
-            this.gv_custName.OptionsColumn.AllowEdit = false;
-            this.gv_custName.Tag = "query_a.CUST_NAME";
-            this.gv_custName.Width = 64;
-            // 
-            // gv_pickIns
-            // 
-            this.gv_pickIns.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_pickIns.AppearanceCell.Options.UseFont = true;
-            this.gv_pickIns.Caption = "0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇� ";
-            this.gv_pickIns.FieldName = "pickIns";
-            this.gv_pickIns.MinWidth = 25;
-            this.gv_pickIns.Name = "gv_pickIns";
-            this.gv_pickIns.OptionsColumn.AllowEdit = false;
-            this.gv_pickIns.Tag = "query_a.PICK_INS";
-            this.gv_pickIns.Width = 64;
-            // 
-            // gv_fcheckUser
-            // 
-            this.gv_fcheckUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fcheckUser.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckUser.Caption = "鍏ュ簱瀹℃牳浜� ";
-            this.gv_fcheckUser.FieldName = "fcheckUser";
-            this.gv_fcheckUser.MinWidth = 25;
-            this.gv_fcheckUser.Name = "gv_fcheckUser";
-            this.gv_fcheckUser.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckUser.Tag = "query_a.FCHECK_USER";
-            this.gv_fcheckUser.Width = 64;
-            // 
-            // gv_rbillNo
-            // 
-            this.gv_rbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_rbillNo.AppearanceCell.Options.UseFont = true;
-            this.gv_rbillNo.Caption = "浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱銆侀��鏂欙級 ";
-            this.gv_rbillNo.FieldName = "rbillNo";
-            this.gv_rbillNo.MinWidth = 25;
-            this.gv_rbillNo.Name = "gv_rbillNo";
-            this.gv_rbillNo.OptionsColumn.AllowEdit = false;
-            this.gv_rbillNo.Tag = "query_a.RBILL_NO";
-            this.gv_rbillNo.Width = 64;
-            // 
-            // gridBand2
-            // 
-            this.gridBand2.Caption = "鍏ュ簱鍗曞彿";
-            this.gridBand2.Columns.Add(this.gv_billNo);
-            this.gridBand2.MinWidth = 25;
-            this.gridBand2.Name = "gridBand2";
-            this.gridBand2.VisibleIndex = 1;
-            this.gridBand2.Width = 114;
             // 
             // gv_billNo
             // 
@@ -1037,15 +731,8 @@
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
+            this.gv_billNo.VisibleIndex = 2;
             this.gv_billNo.Width = 114;
-            // 
-            // gridBand15
-            // 
-            this.gridBand15.Caption = "鐢宠鍗曞彿";
-            this.gridBand15.Columns.Add(this.bandedGridColumn3);
-            this.gridBand15.Name = "gridBand15";
-            this.gridBand15.VisibleIndex = 2;
-            this.gridBand15.Width = 94;
             // 
             // bandedGridColumn3
             // 
@@ -1054,38 +741,60 @@
             this.bandedGridColumn3.MinWidth = 25;
             this.bandedGridColumn3.Name = "bandedGridColumn3";
             this.bandedGridColumn3.Visible = true;
+            this.bandedGridColumn3.VisibleIndex = 3;
             this.bandedGridColumn3.Width = 94;
             // 
-            // gridBand3
+            // gv_depotsId
             // 
-            this.gridBand3.Caption = "宸ュ崟鍗曞彿";
-            this.gridBand3.Columns.Add(this.gv_cbillNo);
-            this.gridBand3.MinWidth = 25;
-            this.gridBand3.Name = "gridBand3";
-            this.gridBand3.VisibleIndex = 3;
-            this.gridBand3.Width = 114;
+            this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_depotsId.AppearanceCell.Options.UseFont = true;
+            this.gv_depotsId.Caption = "浠撳簱ID";
+            this.gv_depotsId.FieldName = "depotsId";
+            this.gv_depotsId.MinWidth = 25;
+            this.gv_depotsId.Name = "gv_depotsId";
+            this.gv_depotsId.OptionsColumn.AllowEdit = false;
+            this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
+            this.gv_depotsId.Visible = true;
+            this.gv_depotsId.VisibleIndex = 5;
+            this.gv_depotsId.Width = 89;
             // 
-            // gv_cbillNo
+            // gv_depotsCode
             // 
-            this.gv_cbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_cbillNo.AppearanceCell.Options.UseFont = true;
-            this.gv_cbillNo.Caption = "鍒拌揣鍗曞彿/鍏跺畠鍏ュ簱鍗曞彿 ";
-            this.gv_cbillNo.FieldName = "cbillNo";
-            this.gv_cbillNo.MinWidth = 25;
-            this.gv_cbillNo.Name = "gv_cbillNo";
-            this.gv_cbillNo.OptionsColumn.AllowEdit = false;
-            this.gv_cbillNo.Tag = "query_a.CBILL_NO";
-            this.gv_cbillNo.Visible = true;
-            this.gv_cbillNo.Width = 114;
+            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 = 25;
+            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 = 6;
+            this.gv_depotsCode.Width = 94;
             // 
-            // gridBand5
+            // bandedGridColumn1
             // 
-            this.gridBand5.Caption = "鍒涘缓浜�";
-            this.gridBand5.Columns.Add(this.gv_createBy);
-            this.gridBand5.MinWidth = 25;
-            this.gridBand5.Name = "gridBand5";
-            this.gridBand5.VisibleIndex = 4;
-            this.gridBand5.Width = 66;
+            this.bandedGridColumn1.Caption = "浠撳簱鍚嶇О";
+            this.bandedGridColumn1.FieldName = "depotName";
+            this.bandedGridColumn1.MinWidth = 25;
+            this.bandedGridColumn1.Name = "bandedGridColumn1";
+            this.bandedGridColumn1.Visible = true;
+            this.bandedGridColumn1.VisibleIndex = 7;
+            this.bandedGridColumn1.Width = 94;
+            // 
+            // gv_reason
+            // 
+            this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_reason.AppearanceCell.Options.UseFont = true;
+            this.gv_reason.Caption = "閫�鏂欑被鍨�";
+            this.gv_reason.FieldName = "reason";
+            this.gv_reason.MinWidth = 25;
+            this.gv_reason.Name = "gv_reason";
+            this.gv_reason.OptionsColumn.AllowEdit = false;
+            this.gv_reason.Tag = "query_a.REASON";
+            this.gv_reason.Visible = true;
+            this.gv_reason.VisibleIndex = 8;
+            this.gv_reason.Width = 94;
             // 
             // gv_createBy
             // 
@@ -1098,16 +807,8 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.CREATE_BY";
             this.gv_createBy.Visible = true;
+            this.gv_createBy.VisibleIndex = 9;
             this.gv_createBy.Width = 66;
-            // 
-            // gridBand4
-            // 
-            this.gridBand4.Caption = "鍒涘缓鏃堕棿";
-            this.gridBand4.Columns.Add(this.gv_createDate);
-            this.gridBand4.MinWidth = 25;
-            this.gridBand4.Name = "gridBand4";
-            this.gridBand4.VisibleIndex = 5;
-            this.gridBand4.Width = 146;
             // 
             // gv_createDate
             // 
@@ -1120,142 +821,36 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.CREATE_DATE";
             this.gv_createDate.Visible = true;
+            this.gv_createDate.VisibleIndex = 10;
             this.gv_createDate.Width = 146;
             // 
-            // gridBand11
+            // gv_lastupdateBy
             // 
-            this.gridBand11.Caption = "瀹℃牳浜�";
-            this.gridBand11.Columns.Add(this.gv_checkUser);
-            this.gridBand11.Name = "gridBand11";
-            this.gridBand11.VisibleIndex = 6;
-            this.gridBand11.Width = 94;
+            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+            this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
+            this.gv_lastupdateBy.FieldName = "lastupdateBy";
+            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.Visible = true;
+            this.gv_lastupdateBy.VisibleIndex = 11;
+            this.gv_lastupdateBy.Width = 94;
             // 
-            // gv_checkUser
+            // gv_lastupdateDate
             // 
-            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 = 25;
-            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 = 94;
-            // 
-            // gridBand6
-            // 
-            this.gridBand6.Caption = "瀹℃牳鏃ユ湡";
-            this.gridBand6.Columns.Add(this.gv_checkDate);
-            this.gridBand6.Columns.Add(this.gv_fcheckDate);
-            this.gridBand6.MinWidth = 25;
-            this.gridBand6.Name = "gridBand6";
-            this.gridBand6.VisibleIndex = 7;
-            this.gridBand6.Width = 94;
-            // 
-            // gv_checkDate
-            // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
-            this.gv_checkDate.Caption = "CHECK_DATE ";
-            this.gv_checkDate.FieldName = "checkDate";
-            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";
-            this.gv_checkDate.Visible = true;
-            this.gv_checkDate.Width = 94;
-            // 
-            // gv_fcheckDate
-            // 
-            this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
-            this.gv_fcheckDate.Caption = "鍏ュ簱瀹℃牳鏃ユ湡 ";
-            this.gv_fcheckDate.FieldName = "fcheckDate";
-            this.gv_fcheckDate.MinWidth = 25;
-            this.gv_fcheckDate.Name = "gv_fcheckDate";
-            this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
-            this.gv_fcheckDate.Tag = "query_a.FCHECK_DATE";
-            this.gv_fcheckDate.Width = 138;
-            // 
-            // gridBand7
-            // 
-            this.gridBand7.AppearanceHeader.Options.UseTextOptions = true;
-            this.gridBand7.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridBand7.Caption = "鏀惰揣浠�";
-            this.gridBand7.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
-            this.gridBand10,
-            this.gridBand9});
-            this.gridBand7.Name = "gridBand7";
-            this.gridBand7.VisibleIndex = 8;
-            this.gridBand7.Width = 183;
-            // 
-            // gridBand10
-            // 
-            this.gridBand10.Caption = "浠撳簱ID";
-            this.gridBand10.Columns.Add(this.gv_depotsId);
-            this.gridBand10.MinWidth = 50;
-            this.gridBand10.Name = "gridBand10";
-            this.gridBand10.VisibleIndex = 0;
-            this.gridBand10.Width = 89;
-            // 
-            // gv_depotsId
-            // 
-            this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotsId.AppearanceCell.Options.UseFont = true;
-            this.gv_depotsId.Caption = "浠撳簱 ";
-            this.gv_depotsId.FieldName = "dptCode";
-            this.gv_depotsId.MinWidth = 25;
-            this.gv_depotsId.Name = "gv_depotsId";
-            this.gv_depotsId.OptionsColumn.AllowEdit = false;
-            this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
-            this.gv_depotsId.Visible = true;
-            this.gv_depotsId.Width = 89;
-            // 
-            // gridBand9
-            // 
-            this.gridBand9.Caption = "浠撳簱鍚嶇О";
-            this.gridBand9.Columns.Add(this.bandedGridColumn1);
-            this.gridBand9.MinWidth = 80;
-            this.gridBand9.Name = "gridBand9";
-            this.gridBand9.VisibleIndex = 1;
-            this.gridBand9.Width = 94;
-            // 
-            // bandedGridColumn1
-            // 
-            this.bandedGridColumn1.Caption = "浠撳簱鍚嶇О";
-            this.bandedGridColumn1.FieldName = "depotName";
-            this.bandedGridColumn1.MinWidth = 25;
-            this.bandedGridColumn1.Name = "bandedGridColumn1";
-            this.bandedGridColumn1.Visible = true;
-            this.bandedGridColumn1.Width = 94;
-            // 
-            // gridBand13
-            // 
-            this.gridBand13.Caption = "浠诲姟鍗曞彿";
-            this.gridBand13.Columns.Add(this.bandedGridColumn2);
-            this.gridBand13.MinWidth = 25;
-            this.gridBand13.Name = "gridBand13";
-            this.gridBand13.VisibleIndex = 9;
-            this.gridBand13.Width = 94;
-            // 
-            // bandedGridColumn2
-            // 
-            this.bandedGridColumn2.Caption = "浠诲姟鍗曞彿";
-            this.bandedGridColumn2.FieldName = "workNo";
-            this.bandedGridColumn2.MinWidth = 25;
-            this.bandedGridColumn2.Name = "bandedGridColumn2";
-            this.bandedGridColumn2.Visible = true;
-            this.bandedGridColumn2.Width = 94;
-            // 
-            // gridBand14
-            // 
-            this.gridBand14.Caption = "澶囨敞淇℃伅";
-            this.gridBand14.Columns.Add(this.gv_remark);
-            this.gridBand14.MinWidth = 25;
-            this.gridBand14.Name = "gridBand14";
-            this.gridBand14.VisibleIndex = 10;
-            this.gridBand14.Width = 119;
+            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+            this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
+            this.gv_lastupdateDate.FieldName = "lastupdateDate";
+            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";
+            this.gv_lastupdateDate.Visible = true;
+            this.gv_lastupdateDate.VisibleIndex = 12;
+            this.gv_lastupdateDate.Width = 94;
             // 
             // gv_remark
             // 
@@ -1268,15 +863,74 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.REMARK";
             this.gv_remark.Visible = true;
+            this.gv_remark.VisibleIndex = 13;
             this.gv_remark.Width = 119;
             // 
-            // gridBand8
+            // gv_checkUser
             // 
-            this.gridBand8.Caption = "鍏ュ簱缁勭粐";
-            this.gridBand8.Columns.Add(this.bandedGridColumn4);
-            this.gridBand8.Name = "gridBand8";
-            this.gridBand8.VisibleIndex = 11;
-            this.gridBand8.Width = 94;
+            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 = 25;
+            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 = 14;
+            this.gv_checkUser.Width = 94;
+            // 
+            // 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 = 25;
+            this.gv_checkDate.Name = "gv_checkDate";
+            this.gv_checkDate.OptionsColumn.AllowEdit = false;
+            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
+            this.gv_checkDate.Visible = true;
+            this.gv_checkDate.VisibleIndex = 15;
+            this.gv_checkDate.Width = 94;
+            // 
+            // gv_fbillno
+            // 
+            this.gv_fbillno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_fbillno.AppearanceCell.Options.UseFont = true;
+            this.gv_fbillno.Caption = "鎶曟枡鍗曞彿 ";
+            this.gv_fbillno.FieldName = "daa014";
+            this.gv_fbillno.MinWidth = 25;
+            this.gv_fbillno.Name = "gv_fbillno";
+            this.gv_fbillno.OptionsColumn.AllowEdit = false;
+            this.gv_fbillno.Tag = "query_a.FBILLNO";
+            this.gv_fbillno.Visible = true;
+            this.gv_fbillno.VisibleIndex = 16;
+            this.gv_fbillno.Width = 64;
+            // 
+            // gv_cbillNo
+            // 
+            this.gv_cbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_cbillNo.AppearanceCell.Options.UseFont = true;
+            this.gv_cbillNo.Caption = "濮斿宸ュ崟鍙�";
+            this.gv_cbillNo.FieldName = "cbillNo";
+            this.gv_cbillNo.MinWidth = 25;
+            this.gv_cbillNo.Name = "gv_cbillNo";
+            this.gv_cbillNo.OptionsColumn.AllowEdit = false;
+            this.gv_cbillNo.Tag = "query_a.CBILL_NO";
+            this.gv_cbillNo.Visible = true;
+            this.gv_cbillNo.VisibleIndex = 17;
+            this.gv_cbillNo.Width = 114;
+            // 
+            // bandedGridColumn2
+            // 
+            this.bandedGridColumn2.Caption = "浠诲姟鍗曞彿";
+            this.bandedGridColumn2.FieldName = "workNo";
+            this.bandedGridColumn2.MinWidth = 25;
+            this.bandedGridColumn2.Name = "bandedGridColumn2";
+            this.bandedGridColumn2.Visible = true;
+            this.bandedGridColumn2.VisibleIndex = 18;
+            this.bandedGridColumn2.Width = 94;
             // 
             // bandedGridColumn4
             // 
@@ -1285,6 +939,7 @@
             this.bandedGridColumn4.MinWidth = 25;
             this.bandedGridColumn4.Name = "bandedGridColumn4";
             this.bandedGridColumn4.Visible = true;
+            this.bandedGridColumn4.VisibleIndex = 19;
             this.bandedGridColumn4.Width = 94;
             // 
             // pageBar1
@@ -1355,6 +1010,24 @@
             this.panel1.Size = new System.Drawing.Size(1126, 121);
             this.panel1.TabIndex = 1;
             // 
+            // textEdit2
+            // 
+            this.textEdit2.Location = new System.Drawing.Point(342, 17);
+            this.textEdit2.Name = "textEdit2";
+            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit2.Properties.Appearance.Options.UseFont = true;
+            this.textEdit2.Size = new System.Drawing.Size(174, 28);
+            this.textEdit2.TabIndex = 574;
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(342, 51);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit1.Properties.Appearance.Options.UseFont = true;
+            this.textEdit1.Size = new System.Drawing.Size(174, 28);
+            this.textEdit1.TabIndex = 573;
+            // 
             // txt_status
             // 
             this.txt_status.Location = new System.Drawing.Point(850, 84);
@@ -1393,23 +1066,15 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // textEdit1
+            // gridColumn1
             // 
-            this.textEdit1.Location = new System.Drawing.Point(342, 51);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(174, 28);
-            this.textEdit1.TabIndex = 573;
-            // 
-            // textEdit2
-            // 
-            this.textEdit2.Location = new System.Drawing.Point(342, 17);
-            this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit2.Properties.Appearance.Options.UseFont = true;
-            this.textEdit2.Size = new System.Drawing.Size(174, 28);
-            this.textEdit2.TabIndex = 574;
+            this.gridColumn1.Caption = "鍏ュ簱绫诲瀷";
+            this.gridColumn1.FieldName = "inType";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 4;
+            this.gridColumn1.Width = 94;
             // 
             // Frm_WwTblDj
             // 
@@ -1439,17 +1104,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1520,56 +1185,29 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gridView1;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_status;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_guid;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_reason;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateBy;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateDate;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkRes;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkQty;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ebeln;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotsCode;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppNo;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_urgentFlag;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lineNo;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_taskLino;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fbillno;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fbillLino;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_custNo;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_custName;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_pickIns;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckUser;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_rbillNo;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_billNo;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn3;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cbillNo;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createBy;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createDate;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkUser;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkDate;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckDate;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotsId;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_remark;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn4;
+        private DevExpress.XtraGrid.GridControl gcMain1;
         private DevExpress.XtraEditors.TextEdit textEdit2;
         private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotsId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fbillno;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_cbillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
index bfdf3c2..f2c78ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
@@ -165,16 +165,16 @@
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
+                    gcMain1.BindingContext = new BindingContext();
                     gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                     if (dt.Rows.Count > 0)
                     {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
                         gridView1.BestFitColumns();
                     }
                     else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                     gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                     pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�

--
Gitblit v1.9.3