From 3cf7cd4d37f38a60a65f2a066f6403db9d24e6e0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 24 十二月 2024 08:50:41 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs             |    2 
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs    |  136 +++++++++++----------
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs          |    2 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs |   10 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  132 ++++++++++-----------
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs          |   61 +++++++--
 6 files changed, 188 insertions(+), 155 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index a290c56..f501229 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -196,13 +196,13 @@
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -1318,8 +1318,6 @@
             this.gvMx2guid.MinWidth = 50;
             this.gvMx2guid.Name = "gvMx2guid";
             this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Visible = true;
-            this.gvMx2guid.VisibleIndex = 0;
             this.gvMx2guid.Width = 94;
             // 
             // tabMxPage2
@@ -1441,7 +1439,7 @@
             this.gvMx1hbNo.Name = "gvMx1hbNo";
             this.gvMx1hbNo.Tag = "query_a.hb_no";
             this.gvMx1hbNo.Visible = true;
-            this.gvMx1hbNo.VisibleIndex = 2;
+            this.gvMx1hbNo.VisibleIndex = 1;
             this.gvMx1hbNo.Width = 94;
             // 
             // gvMx1hbFlag
@@ -1454,7 +1452,7 @@
             this.gvMx1hbFlag.Name = "gvMx1hbFlag";
             this.gvMx1hbFlag.Tag = "query_a.hb_flag";
             this.gvMx1hbFlag.Visible = true;
-            this.gvMx1hbFlag.VisibleIndex = 1;
+            this.gvMx1hbFlag.VisibleIndex = 0;
             this.gvMx1hbFlag.Width = 94;
             // 
             // gvMx1zyBl
@@ -1467,7 +1465,7 @@
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
             this.gvMx1zyBl.Visible = true;
-            this.gvMx1zyBl.VisibleIndex = 27;
+            this.gvMx1zyBl.VisibleIndex = 26;
             this.gvMx1zyBl.Width = 94;
             // 
             // gvMx1llBl
@@ -1480,7 +1478,7 @@
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
             this.gvMx1llBl.Visible = true;
-            this.gvMx1llBl.VisibleIndex = 12;
+            this.gvMx1llBl.VisibleIndex = 11;
             this.gvMx1llBl.Width = 94;
             // 
             // gvMx1lpTl
@@ -1493,7 +1491,7 @@
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
             this.gvMx1lpTl.Visible = true;
-            this.gvMx1lpTl.VisibleIndex = 13;
+            this.gvMx1lpTl.VisibleIndex = 12;
             this.gvMx1lpTl.Width = 94;
             // 
             // gvMx1dab023
@@ -1506,7 +1504,7 @@
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
             this.gvMx1dab023.Visible = true;
-            this.gvMx1dab023.VisibleIndex = 26;
+            this.gvMx1dab023.VisibleIndex = 25;
             this.gvMx1dab023.Width = 94;
             // 
             // gvMx1dab022
@@ -1519,7 +1517,7 @@
             this.gvMx1dab022.Name = "gvMx1dab022";
             this.gvMx1dab022.Tag = "query_a.dab022";
             this.gvMx1dab022.Visible = true;
-            this.gvMx1dab022.VisibleIndex = 25;
+            this.gvMx1dab022.VisibleIndex = 24;
             this.gvMx1dab022.Width = 94;
             // 
             // gvMx1dab021
@@ -1532,7 +1530,7 @@
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
             this.gvMx1dab021.Visible = true;
-            this.gvMx1dab021.VisibleIndex = 14;
+            this.gvMx1dab021.VisibleIndex = 13;
             this.gvMx1dab021.Width = 94;
             // 
             // gvMx1dab020
@@ -1545,7 +1543,7 @@
             this.gvMx1dab020.Name = "gvMx1dab020";
             this.gvMx1dab020.Tag = "query_a.dab020";
             this.gvMx1dab020.Visible = true;
-            this.gvMx1dab020.VisibleIndex = 24;
+            this.gvMx1dab020.VisibleIndex = 23;
             this.gvMx1dab020.Width = 94;
             // 
             // gvMx1scraprate
@@ -1558,7 +1556,7 @@
             this.gvMx1scraprate.Name = "gvMx1scraprate";
             this.gvMx1scraprate.Tag = "query_a.scraprate";
             this.gvMx1scraprate.Visible = true;
-            this.gvMx1scraprate.VisibleIndex = 11;
+            this.gvMx1scraprate.VisibleIndex = 10;
             this.gvMx1scraprate.Width = 94;
             // 
             // gvMx1scrapqty
@@ -1571,7 +1569,7 @@
             this.gvMx1scrapqty.Name = "gvMx1scrapqty";
             this.gvMx1scrapqty.Tag = "query_a.scrapqty";
             this.gvMx1scrapqty.Visible = true;
-            this.gvMx1scrapqty.VisibleIndex = 10;
+            this.gvMx1scrapqty.VisibleIndex = 9;
             this.gvMx1scrapqty.Width = 94;
             // 
             // gvMx1dab019
@@ -1584,7 +1582,7 @@
             this.gvMx1dab019.Name = "gvMx1dab019";
             this.gvMx1dab019.Tag = "query_a.dab019";
             this.gvMx1dab019.Visible = true;
-            this.gvMx1dab019.VisibleIndex = 23;
+            this.gvMx1dab019.VisibleIndex = 22;
             this.gvMx1dab019.Width = 94;
             // 
             // gvMx1dab018
@@ -1597,7 +1595,7 @@
             this.gvMx1dab018.Name = "gvMx1dab018";
             this.gvMx1dab018.Tag = "query_a.dab018";
             this.gvMx1dab018.Visible = true;
-            this.gvMx1dab018.VisibleIndex = 22;
+            this.gvMx1dab018.VisibleIndex = 21;
             this.gvMx1dab018.Width = 94;
             // 
             // gvMx1dab017
@@ -1610,7 +1608,7 @@
             this.gvMx1dab017.Name = "gvMx1dab017";
             this.gvMx1dab017.Tag = "query_a.dab017";
             this.gvMx1dab017.Visible = true;
-            this.gvMx1dab017.VisibleIndex = 21;
+            this.gvMx1dab017.VisibleIndex = 20;
             this.gvMx1dab017.Width = 94;
             // 
             // gvMx1dab015
@@ -1623,7 +1621,7 @@
             this.gvMx1dab015.Name = "gvMx1dab015";
             this.gvMx1dab015.Tag = "query_a.dab015";
             this.gvMx1dab015.Visible = true;
-            this.gvMx1dab015.VisibleIndex = 18;
+            this.gvMx1dab015.VisibleIndex = 17;
             this.gvMx1dab015.Width = 94;
             // 
             // gvMx1dab014
@@ -1636,7 +1634,7 @@
             this.gvMx1dab014.Name = "gvMx1dab014";
             this.gvMx1dab014.Tag = "query_a.dab014";
             this.gvMx1dab014.Visible = true;
-            this.gvMx1dab014.VisibleIndex = 20;
+            this.gvMx1dab014.VisibleIndex = 19;
             this.gvMx1dab014.Width = 94;
             // 
             // gvMx1dab013
@@ -1649,7 +1647,7 @@
             this.gvMx1dab013.Name = "gvMx1dab013";
             this.gvMx1dab013.Tag = "query_a.dab013";
             this.gvMx1dab013.Visible = true;
-            this.gvMx1dab013.VisibleIndex = 17;
+            this.gvMx1dab013.VisibleIndex = 16;
             this.gvMx1dab013.Width = 94;
             // 
             // gvMx1dab012
@@ -1662,7 +1660,7 @@
             this.gvMx1dab012.Name = "gvMx1dab012";
             this.gvMx1dab012.Tag = "query_a.dab012";
             this.gvMx1dab012.Visible = true;
-            this.gvMx1dab012.VisibleIndex = 19;
+            this.gvMx1dab012.VisibleIndex = 18;
             this.gvMx1dab012.Width = 94;
             // 
             // gvMx1dab011
@@ -1675,7 +1673,7 @@
             this.gvMx1dab011.Name = "gvMx1dab011";
             this.gvMx1dab011.Tag = "query_a.dab011";
             this.gvMx1dab011.Visible = true;
-            this.gvMx1dab011.VisibleIndex = 16;
+            this.gvMx1dab011.VisibleIndex = 15;
             this.gvMx1dab011.Width = 94;
             // 
             // gvMx1dab010
@@ -1688,7 +1686,7 @@
             this.gvMx1dab010.Name = "gvMx1dab010";
             this.gvMx1dab010.Tag = "query_a.dab010";
             this.gvMx1dab010.Visible = true;
-            this.gvMx1dab010.VisibleIndex = 15;
+            this.gvMx1dab010.VisibleIndex = 14;
             this.gvMx1dab010.Width = 94;
             // 
             // gvMx1dab009
@@ -1701,7 +1699,7 @@
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
-            this.gvMx1dab009.VisibleIndex = 7;
+            this.gvMx1dab009.VisibleIndex = 6;
             this.gvMx1dab009.Width = 94;
             // 
             // gvMx1dab007
@@ -1714,7 +1712,7 @@
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
             this.gvMx1dab007.Visible = true;
-            this.gvMx1dab007.VisibleIndex = 9;
+            this.gvMx1dab007.VisibleIndex = 8;
             this.gvMx1dab007.Width = 94;
             // 
             // gvMx1dab006
@@ -1727,7 +1725,7 @@
             this.gvMx1dab006.Name = "gvMx1dab006";
             this.gvMx1dab006.Tag = "query_a.dab006";
             this.gvMx1dab006.Visible = true;
-            this.gvMx1dab006.VisibleIndex = 8;
+            this.gvMx1dab006.VisibleIndex = 7;
             this.gvMx1dab006.Width = 94;
             // 
             // gvMx1dab005
@@ -1740,7 +1738,7 @@
             this.gvMx1dab005.Name = "gvMx1dab005";
             this.gvMx1dab005.Tag = "query_a.dab005";
             this.gvMx1dab005.Visible = true;
-            this.gvMx1dab005.VisibleIndex = 6;
+            this.gvMx1dab005.VisibleIndex = 5;
             this.gvMx1dab005.Width = 94;
             // 
             // gvMx1dab004
@@ -1753,7 +1751,7 @@
             this.gvMx1dab004.Name = "gvMx1dab004";
             this.gvMx1dab004.Tag = "query_a.dab004";
             this.gvMx1dab004.Visible = true;
-            this.gvMx1dab004.VisibleIndex = 5;
+            this.gvMx1dab004.VisibleIndex = 4;
             this.gvMx1dab004.Width = 94;
             // 
             // gvMx1dab003
@@ -1766,7 +1764,7 @@
             this.gvMx1dab003.Name = "gvMx1dab003";
             this.gvMx1dab003.Tag = "query_a.dab003";
             this.gvMx1dab003.Visible = true;
-            this.gvMx1dab003.VisibleIndex = 4;
+            this.gvMx1dab003.VisibleIndex = 3;
             this.gvMx1dab003.Width = 94;
             // 
             // gvMx1dab001
@@ -1779,7 +1777,7 @@
             this.gvMx1dab001.Name = "gvMx1dab001";
             this.gvMx1dab001.Tag = "query_a.dab001";
             this.gvMx1dab001.Visible = true;
-            this.gvMx1dab001.VisibleIndex = 3;
+            this.gvMx1dab001.VisibleIndex = 2;
             this.gvMx1dab001.Width = 94;
             // 
             // tabMxPage1
@@ -1847,8 +1845,6 @@
             this.gvMx1Guid.FieldName = "guid";
             this.gvMx1Guid.MinWidth = 25;
             this.gvMx1Guid.Name = "gvMx1Guid";
-            this.gvMx1Guid.Visible = true;
-            this.gvMx1Guid.VisibleIndex = 0;
             this.gvMx1Guid.Width = 94;
             // 
             // gv_cust
@@ -1862,7 +1858,7 @@
             this.gv_cust.OptionsColumn.AllowEdit = false;
             this.gv_cust.Tag = "query_a.cust";
             this.gv_cust.Visible = true;
-            this.gv_cust.VisibleIndex = 29;
+            this.gv_cust.VisibleIndex = 28;
             this.gv_cust.Width = 100;
             // 
             // gv_prepareTime
@@ -1876,7 +1872,7 @@
             this.gv_prepareTime.OptionsColumn.AllowEdit = false;
             this.gv_prepareTime.Tag = "query_a.prepare_time";
             this.gv_prepareTime.Visible = true;
-            this.gv_prepareTime.VisibleIndex = 11;
+            this.gv_prepareTime.VisibleIndex = 10;
             this.gv_prepareTime.Width = 180;
             // 
             // gv_mesEndProd
@@ -1890,7 +1886,7 @@
             this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
             this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
             this.gv_mesEndProd.Visible = true;
-            this.gv_mesEndProd.VisibleIndex = 30;
+            this.gv_mesEndProd.VisibleIndex = 29;
             this.gv_mesEndProd.Width = 180;
             // 
             // gv_mesStartProd
@@ -1904,7 +1900,7 @@
             this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
             this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
             this.gv_mesStartProd.Visible = true;
-            this.gv_mesStartProd.VisibleIndex = 29;
+            this.gv_mesStartProd.VisibleIndex = 27;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_daa028
@@ -1918,7 +1914,7 @@
             this.gv_daa028.OptionsColumn.AllowEdit = false;
             this.gv_daa028.Tag = "query_a.daa028";
             this.gv_daa028.Visible = true;
-            this.gv_daa028.VisibleIndex = 12;
+            this.gv_daa028.VisibleIndex = 11;
             this.gv_daa028.Width = 180;
             // 
             // gv_daa027
@@ -1968,7 +1964,7 @@
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
-            this.gv_daa021.VisibleIndex = 18;
+            this.gv_daa021.VisibleIndex = 16;
             this.gv_daa021.Width = 100;
             // 
             // gv_daa020
@@ -1982,7 +1978,7 @@
             this.gv_daa020.OptionsColumn.AllowEdit = false;
             this.gv_daa020.Tag = "query_a.daa020";
             this.gv_daa020.Visible = true;
-            this.gv_daa020.VisibleIndex = 16;
+            this.gv_daa020.VisibleIndex = 14;
             this.gv_daa020.Width = 94;
             // 
             // gv_daa018
@@ -2029,7 +2025,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 27;
+            this.gv_daa017.VisibleIndex = 25;
             this.gv_daa017.Width = 180;
             // 
             // lb_daa016
@@ -2062,7 +2058,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 26;
+            this.gv_daa016.VisibleIndex = 24;
             this.gv_daa016.Width = 180;
             // 
             // lb_daa015
@@ -2095,7 +2091,7 @@
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 15;
+            this.gv_daa015.VisibleIndex = 13;
             this.gv_daa015.Width = 94;
             // 
             // lb_daa013
@@ -2147,7 +2143,7 @@
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
             this.gv_daa011.Visible = true;
-            this.gv_daa011.VisibleIndex = 24;
+            this.gv_daa011.VisibleIndex = 22;
             this.gv_daa011.Width = 94;
             // 
             // lb_daa010
@@ -2180,7 +2176,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 25;
+            this.gv_daa010.VisibleIndex = 23;
             this.gv_daa010.Width = 94;
             // 
             // lb_daa009
@@ -2213,7 +2209,7 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 28;
+            this.gv_daa009.VisibleIndex = 26;
             this.gv_daa009.Width = 94;
             // 
             // lb_daa008
@@ -2246,7 +2242,7 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 22;
+            this.gv_daa008.VisibleIndex = 20;
             this.gv_daa008.Width = 94;
             // 
             // lb_daa005
@@ -2279,7 +2275,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 23;
+            this.gv_daa005.VisibleIndex = 21;
             this.gv_daa005.Width = 94;
             // 
             // lb_daa004
@@ -2312,7 +2308,7 @@
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 20;
+            this.gv_daa004.VisibleIndex = 18;
             this.gv_daa004.Width = 150;
             // 
             // lb_daa003
@@ -2345,7 +2341,7 @@
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 19;
+            this.gv_daa003.VisibleIndex = 17;
             this.gv_daa003.Width = 150;
             // 
             // lb_daa002
@@ -2397,7 +2393,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 17;
+            this.gv_daa001.VisibleIndex = 15;
             this.gv_daa001.Width = 120;
             // 
             // toolBarMenu1
@@ -2483,17 +2479,6 @@
             this.gridColumn5.VisibleIndex = 0;
             this.gridColumn5.Width = 50;
             // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "閫氱煡澶囨枡";
-            this.gridColumn6.FieldName = "tzbs";
-            this.gridColumn6.MaxWidth = 50;
-            this.gridColumn6.MinWidth = 50;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 10;
-            this.gridColumn6.Width = 50;
-            // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "鏄惁榻愬";
@@ -2502,7 +2487,7 @@
             this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 4;
+            this.gridColumn7.VisibleIndex = 3;
             this.gridColumn7.Width = 50;
             // 
             // gridColumn8
@@ -2513,7 +2498,7 @@
             this.gridColumn8.MinWidth = 50;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 5;
+            this.gridColumn8.VisibleIndex = 4;
             this.gridColumn8.Width = 50;
             // 
             // gridColumn9
@@ -2524,7 +2509,7 @@
             this.gridColumn9.MinWidth = 50;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 6;
+            this.gridColumn9.VisibleIndex = 5;
             this.gridColumn9.Width = 50;
             // 
             // gridColumn10
@@ -2535,7 +2520,7 @@
             this.gridColumn10.MinWidth = 50;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 7;
+            this.gridColumn10.VisibleIndex = 6;
             this.gridColumn10.Width = 50;
             // 
             // gridColumn11
@@ -2546,7 +2531,7 @@
             this.gridColumn11.MinWidth = 50;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 8;
+            this.gridColumn11.VisibleIndex = 7;
             this.gridColumn11.Width = 50;
             // 
             // gridColumn12
@@ -2557,8 +2542,19 @@
             this.gridColumn12.MinWidth = 50;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 9;
+            this.gridColumn12.VisibleIndex = 8;
             this.gridColumn12.Width = 50;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "閫氱煡澶囨枡";
+            this.gridColumn6.FieldName = "tzbs";
+            this.gridColumn6.MaxWidth = 50;
+            this.gridColumn6.MinWidth = 50;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 9;
+            this.gridColumn6.Width = 50;
             // 
             // gridColumn1
             // 
@@ -2577,7 +2573,7 @@
             this.gridColumn2.MinWidth = 50;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 21;
+            this.gridColumn2.VisibleIndex = 19;
             this.gridColumn2.Width = 94;
             // 
             // xtraTabControl1
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 6132777..5f5fd59 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -174,7 +174,7 @@
             this.gvMx1reporttime.FieldName = "daa009";
             this.gvMx1reporttime.MinWidth = 100;
             this.gvMx1reporttime.Name = "gvMx1reporttime";
-            this.gvMx1reporttime.Tag = "query_a.reporttime";
+            this.gvMx1reporttime.Tag = "edit";
             this.gvMx1reporttime.Visible = true;
             this.gvMx1reporttime.VisibleIndex = 15;
             this.gvMx1reporttime.Width = 100;
@@ -345,7 +345,7 @@
             this.gvMx1daa018.FieldName = "mesEndProd";
             this.gvMx1daa018.MinWidth = 180;
             this.gvMx1daa018.Name = "gvMx1daa018";
-            this.gvMx1daa018.Tag = "query_a.daa018";
+            this.gvMx1daa018.Tag = "edit";
             this.gvMx1daa018.Visible = true;
             this.gvMx1daa018.VisibleIndex = 2;
             this.gvMx1daa018.Width = 180;
@@ -387,7 +387,7 @@
             this.gvMx1daa016.FieldName = "mesStartProd";
             this.gvMx1daa016.MinWidth = 180;
             this.gvMx1daa016.Name = "gvMx1daa016";
-            this.gvMx1daa016.Tag = "query_a.daa016";
+            this.gvMx1daa016.Tag = "edit";
             this.gvMx1daa016.Visible = true;
             this.gvMx1daa016.VisibleIndex = 1;
             this.gvMx1daa016.Width = 180;
@@ -428,7 +428,7 @@
             this.gvMx1daa012.FieldName = "daa015LineName";
             this.gvMx1daa012.MinWidth = 150;
             this.gvMx1daa012.Name = "gvMx1daa012";
-            this.gvMx1daa012.Tag = "query_a.daa012";
+            this.gvMx1daa012.Tag = "edit";
             this.gvMx1daa012.Visible = true;
             this.gvMx1daa012.VisibleIndex = 13;
             this.gvMx1daa012.Width = 150;
@@ -453,7 +453,7 @@
             this.gvMx1daa011.FieldName = "daa008";
             this.gvMx1daa011.MinWidth = 60;
             this.gvMx1daa011.Name = "gvMx1daa011";
-            this.gvMx1daa011.Tag = "yz_quantity_0";
+            this.gvMx1daa011.Tag = "yz_quantity_0_edit";
             this.gvMx1daa011.Visible = true;
             this.gvMx1daa011.VisibleIndex = 12;
             this.gvMx1daa011.Width = 60;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index aa11f7d..6da5873 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -241,7 +241,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
             List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             gvList.Add(gvMx1);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
         }
         /// <summary>
         /// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
index 34f9e45..55c14c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -45,7 +45,6 @@
             this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1unit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1eid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1erpid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -53,10 +52,12 @@
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxRemark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gv_departId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_wwDd = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_shState = new DevExpress.XtraEditors.LabelControl();
             this.gv_shState = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -113,7 +114,7 @@
             // 
             this.gvMx1rwdGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1rwdGuid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1rwdGuid.Caption = "浠诲姟鍗曠殑guid ";
+            this.gvMx1rwdGuid.Caption = "浠诲姟鍗曠殑guid";
             this.gvMx1rwdGuid.FieldName = "rwdGuid";
             this.gvMx1rwdGuid.MinWidth = 50;
             this.gvMx1rwdGuid.Name = "gvMx1rwdGuid";
@@ -125,7 +126,7 @@
             // 
             this.gvMx1pcGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1pcGuid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pcGuid.Caption = "鎺掍骇guid ";
+            this.gvMx1pcGuid.Caption = "鎺掍骇guid";
             this.gvMx1pcGuid.FieldName = "pcGuid";
             this.gvMx1pcGuid.MinWidth = 50;
             this.gvMx1pcGuid.Name = "gvMx1pcGuid";
@@ -141,14 +142,14 @@
             this.gvMx1mesEndProd.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1mesEndProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1mesEndProd.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1mesEndProd.Caption = "棰勮瀹屽伐鏃堕棿 ";
+            this.gvMx1mesEndProd.Caption = "棰勮瀹屽伐鏃堕棿";
             this.gvMx1mesEndProd.ColumnEdit = this.repositoryItemDateEdit2;
             this.gvMx1mesEndProd.FieldName = "mesEndProd";
             this.gvMx1mesEndProd.MinWidth = 180;
             this.gvMx1mesEndProd.Name = "gvMx1mesEndProd";
-            this.gvMx1mesEndProd.Tag = "query_a.mes_end_prod";
+            this.gvMx1mesEndProd.Tag = "edit";
             this.gvMx1mesEndProd.Visible = true;
-            this.gvMx1mesEndProd.VisibleIndex = 7;
+            this.gvMx1mesEndProd.VisibleIndex = 9;
             this.gvMx1mesEndProd.Width = 180;
             // 
             // repositoryItemDateEdit2
@@ -168,14 +169,14 @@
             this.gvMx1mesStartProd.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1mesStartProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1mesStartProd.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1mesStartProd.Caption = "棰勮寮�宸ユ椂闂� ";
+            this.gvMx1mesStartProd.Caption = "棰勮寮�宸ユ椂闂�";
             this.gvMx1mesStartProd.ColumnEdit = this.repositoryItemDateEdit1;
             this.gvMx1mesStartProd.FieldName = "mesStartProd";
             this.gvMx1mesStartProd.MinWidth = 180;
             this.gvMx1mesStartProd.Name = "gvMx1mesStartProd";
-            this.gvMx1mesStartProd.Tag = "query_a.mes_start_prod";
+            this.gvMx1mesStartProd.Tag = "edit";
             this.gvMx1mesStartProd.Visible = true;
-            this.gvMx1mesStartProd.VisibleIndex = 6;
+            this.gvMx1mesStartProd.VisibleIndex = 8;
             this.gvMx1mesStartProd.Width = 180;
             // 
             // repositoryItemDateEdit1
@@ -199,86 +200,72 @@
             this.gvMx1daa008.FieldName = "daa008";
             this.gvMx1daa008.MinWidth = 50;
             this.gvMx1daa008.Name = "gvMx1daa008";
-            this.gvMx1daa008.Tag = "yz_quantity_0";
+            this.gvMx1daa008.Tag = "yz_quantity_0_edit";
             this.gvMx1daa008.Visible = true;
-            this.gvMx1daa008.VisibleIndex = 5;
+            this.gvMx1daa008.VisibleIndex = 7;
             this.gvMx1daa008.Width = 94;
             // 
             // gvMx1daa014
             // 
             this.gvMx1daa014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa014.Caption = "濮斿璁㈠崟鍙� ";
+            this.gvMx1daa014.Caption = "濮斿璁㈠崟鍙�";
             this.gvMx1daa014.FieldName = "daa014";
-            this.gvMx1daa014.MinWidth = 50;
+            this.gvMx1daa014.MinWidth = 100;
             this.gvMx1daa014.Name = "gvMx1daa014";
             this.gvMx1daa014.OptionsColumn.AllowEdit = false;
             this.gvMx1daa014.Tag = "query_a.daa014";
             this.gvMx1daa014.Visible = true;
-            this.gvMx1daa014.VisibleIndex = 4;
-            this.gvMx1daa014.Width = 94;
+            this.gvMx1daa014.VisibleIndex = 1;
+            this.gvMx1daa014.Width = 100;
             // 
             // gvMx1unit
             // 
             this.gvMx1unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1unit.AppearanceCell.Options.UseFont = true;
-            this.gvMx1unit.Caption = "鍗曚綅id ";
-            this.gvMx1unit.FieldName = "unit";
+            this.gvMx1unit.Caption = "鍗曚綅";
+            this.gvMx1unit.FieldName = "dwName";
             this.gvMx1unit.MinWidth = 50;
             this.gvMx1unit.Name = "gvMx1unit";
             this.gvMx1unit.OptionsColumn.AllowEdit = false;
             this.gvMx1unit.Tag = "query_a.unit";
             this.gvMx1unit.Visible = true;
-            this.gvMx1unit.VisibleIndex = 3;
+            this.gvMx1unit.VisibleIndex = 6;
             this.gvMx1unit.Width = 94;
             // 
             // gvMx1daa011
             // 
             this.gvMx1daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1daa011.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa011.Caption = "宸ュ崟鏁伴噺 ";
+            this.gvMx1daa011.Caption = "宸ュ崟鏁伴噺";
             this.gvMx1daa011.FieldName = "daa011";
             this.gvMx1daa011.MinWidth = 50;
             this.gvMx1daa011.Name = "gvMx1daa011";
             this.gvMx1daa011.OptionsColumn.AllowEdit = false;
             this.gvMx1daa011.Tag = "query_a.daa008";
             this.gvMx1daa011.Visible = true;
-            this.gvMx1daa011.VisibleIndex = 2;
+            this.gvMx1daa011.VisibleIndex = 5;
             this.gvMx1daa011.Width = 94;
-            // 
-            // gvMx1daa003
-            // 
-            this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa003.Caption = "鐗╂枡id ";
-            this.gvMx1daa003.FieldName = "daa003";
-            this.gvMx1daa003.MinWidth = 50;
-            this.gvMx1daa003.Name = "gvMx1daa003";
-            this.gvMx1daa003.OptionsColumn.AllowEdit = false;
-            this.gvMx1daa003.Tag = "query_a.daa003";
-            this.gvMx1daa003.Visible = true;
-            this.gvMx1daa003.VisibleIndex = 1;
-            this.gvMx1daa003.Width = 94;
             // 
             // gvMx1daa001
             // 
             this.gvMx1daa001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1daa001.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa001.Caption = "宸ュ崟鍙� ";
+            this.gvMx1daa001.Caption = "宸ュ崟鍙�";
             this.gvMx1daa001.FieldName = "daa001";
-            this.gvMx1daa001.MinWidth = 50;
+            this.gvMx1daa001.MinWidth = 100;
             this.gvMx1daa001.Name = "gvMx1daa001";
             this.gvMx1daa001.OptionsColumn.AllowEdit = false;
             this.gvMx1daa001.Tag = "query_a.daa001";
             this.gvMx1daa001.Visible = true;
             this.gvMx1daa001.VisibleIndex = 0;
-            this.gvMx1daa001.Width = 94;
+            this.gvMx1daa001.Width = 100;
             // 
             // gvMx1eid
             // 
             this.gvMx1eid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1eid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1eid.Caption = "eid ";
+            this.gvMx1eid.Caption = "eid";
             this.gvMx1eid.FieldName = "eid";
             this.gvMx1eid.MinWidth = 50;
             this.gvMx1eid.Name = "gvMx1eid";
@@ -290,7 +277,7 @@
             // 
             this.gvMx1erpid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1erpid.Caption = "erpid ";
+            this.gvMx1erpid.Caption = "erpid";
             this.gvMx1erpid.FieldName = "erpid";
             this.gvMx1erpid.MinWidth = 50;
             this.gvMx1erpid.Name = "gvMx1erpid";
@@ -302,7 +289,7 @@
             // 
             this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1id.Caption = "id ";
+            this.gvMx1id.Caption = "id";
             this.gvMx1id.FieldName = "id";
             this.gvMx1id.MinWidth = 50;
             this.gvMx1id.Name = "gvMx1id";
@@ -342,10 +329,12 @@
             this.gvMx1erpid,
             this.gvMx1eid,
             this.gvMx1daa001,
-            this.gvMx1daa003,
+            this.gvMx1daa014,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn1,
             this.gvMx1daa011,
             this.gvMx1unit,
-            this.gvMx1daa014,
             this.gvMx1daa008,
             this.gvMx1mesStartProd,
             this.gvMx1mesEndProd,
@@ -359,6 +348,36 @@
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn2.FieldName = "wlbm";
+            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 2;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn3.FieldName = "wlmc";
+            this.gridColumn3.MinWidth = 100;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 3;
+            this.gridColumn3.Width = 100;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn1.FieldName = "wlgg";
+            this.gridColumn1.MinWidth = 100;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 4;
+            this.gridColumn1.Width = 100;
+            // 
             // gvMxRemark
             // 
             this.gvMxRemark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -369,8 +388,9 @@
             this.gvMxRemark.FieldName = "remark";
             this.gvMxRemark.MinWidth = 100;
             this.gvMxRemark.Name = "gvMxRemark";
+            this.gvMxRemark.Tag = "edit";
             this.gvMxRemark.Visible = true;
-            this.gvMxRemark.VisibleIndex = 8;
+            this.gvMxRemark.VisibleIndex = 10;
             this.gvMxRemark.Width = 100;
             // 
             // gvMxDel
@@ -380,7 +400,7 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 9;
+            this.gvMxDel.VisibleIndex = 11;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
@@ -393,20 +413,6 @@
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // gv_departId
-            // 
-            this.gv_departId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_departId.AppearanceCell.Options.UseFont = true;
-            this.gv_departId.Caption = "棰嗘枡閮ㄩ棬id ";
-            this.gv_departId.FieldName = "departId";
-            this.gv_departId.MinWidth = 50;
-            this.gv_departId.Name = "gv_departId";
-            this.gv_departId.OptionsColumn.AllowEdit = false;
-            this.gv_departId.Tag = "query_a.depart_id";
-            this.gv_departId.Visible = true;
-            this.gv_departId.VisibleIndex = 7;
-            this.gv_departId.Width = 94;
             // 
             // gv_wwDd
             // 
@@ -569,13 +575,13 @@
             this.gv_hNo.AppearanceCell.Options.UseFont = true;
             this.gv_hNo.Caption = "鎺掍骇缂栧彿 ";
             this.gv_hNo.FieldName = "hNo";
-            this.gv_hNo.MinWidth = 100;
+            this.gv_hNo.MinWidth = 130;
             this.gv_hNo.Name = "gv_hNo";
             this.gv_hNo.OptionsColumn.AllowEdit = false;
             this.gv_hNo.Tag = "query_a.hNo";
             this.gv_hNo.Visible = true;
             this.gv_hNo.VisibleIndex = 1;
-            this.gv_hNo.Width = 100;
+            this.gv_hNo.Width = 130;
             // 
             // toolBarMenu1
             // 
@@ -618,8 +624,7 @@
             this.gv_createBy,
             this.gv_shBy,
             this.gv_shTime,
-            this.gv_wwDd,
-            this.gv_departId});
+            this.gv_wwDd});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -805,7 +810,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1unit;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa001;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1eid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1erpid;
@@ -813,7 +817,6 @@
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_departId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_wwDd;
 
         private DevExpress.XtraEditors.LabelControl lb_shState;
@@ -840,5 +843,8 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 150e04b..e1a7df7 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -229,7 +229,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
             List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             gvList.Add(gvMx1);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
         }
         /// <summary>
         /// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 2953a88..2657a09 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -269,21 +269,30 @@
         {
             isEdt = !isEdt;
             if (gridViews != null)
+            {
                 foreach (var gv in gridViews)
                 {
                     foreach (GridColumn colmn in gv.Columns)
                     {
+                        colmn.OptionsColumn.AllowEdit = true;
                         if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
                         {
-                            //  colmn.Visible = !isEdt;
-                            //  break;
-                            colmn.OptionsColumn.AllowEdit = true;
+                            colmn.Visible = !isEdt;
                         }
                         else
-                            colmn.OptionsColumn.AllowEdit = !isEdt;
+                        {
+                            if (isEdt == false) {
+                                if (colmn.Tag != null && colmn.Tag.ToString().EndsWith("edit"))
+                                    colmn.OptionsColumn.ReadOnly = isEdt;
+                                else
+                                    colmn.OptionsColumn.ReadOnly = !isEdt;
+                            }
+                            else
+                                colmn.OptionsColumn.ReadOnly = isEdt;
+                        }
                     }
-                    //gv.OptionsBehavior.Editable = !isEdt;
                 }
+            }
             var _btnAry = controls.Find("btnSelect", false);
             if (_btnAry.Length > 0)
             {
@@ -640,21 +649,31 @@
         {
             isEdt = !isEdt;
             if (gridViews != null)
+            {
                 foreach (var gv in gridViews)
                 {
                     foreach (GridColumn colmn in gv.Columns)
                     {
+                        colmn.OptionsColumn.AllowEdit = true;
                         if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
                         {
-                            //  colmn.Visible = !isEdt;
-                            //  break;
-                            colmn.OptionsColumn.AllowEdit = true;
+                            colmn.Visible = !isEdt;
                         }
                         else
-                            colmn.OptionsColumn.AllowEdit = !isEdt;
+                        {
+                            if (isEdt == false)
+                            {
+                                if (colmn.Tag != null && colmn.Tag.ToString().EndsWith("edit"))
+                                    colmn.OptionsColumn.ReadOnly = isEdt;
+                                else
+                                    colmn.OptionsColumn.ReadOnly = !isEdt;
+                            }
+                            else
+                                colmn.OptionsColumn.ReadOnly = isEdt;
+                        }
                     }
-                    //gv.OptionsBehavior.Editable = !isEdt;
                 }
+            }
             foreach (Control ctrl in controls)
             {
                 //澶氳鏂囨湰
@@ -863,21 +882,26 @@
         {
             isEdt = !isEdt;
             if (gridViews != null)
+            {
                 foreach (var gv in gridViews)
                 {
                     foreach (GridColumn colmn in gv.Columns)
                     {
+                        colmn.OptionsColumn.AllowEdit = true;
                         if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
                         {
-                            //  colmn.Visible = !isEdt;
-                            //  break;
-                            colmn.OptionsColumn.AllowEdit = true;
+                            colmn.Visible = !isEdt;
                         }
                         else
-                            colmn.OptionsColumn.AllowEdit = !isEdt;
+                        {
+                            if (colmn.Tag!=null && colmn.Tag.ToString().EndsWith("edit"))
+                                colmn.OptionsColumn.ReadOnly = isEdt;
+                            else
+                                colmn.OptionsColumn.ReadOnly = !isEdt;
+                        }
                     }
-                    //gv.OptionsBehavior.Editable = !isEdt;
                 }
+            }
             foreach (Control ctrl in controls)
             {
                 //鏂囨湰
@@ -1069,6 +1093,13 @@
                         txt.Enabled = false;
                     continue;
                 }
+
+                if (ctrl is SimpleButton)
+                {
+                    var txt = ctrl as SimpleButton;
+                    txt.Enabled = !isEdt;
+                    continue;
+                }
             }
         }
 

--
Gitblit v1.9.3