Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

4 天以前 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs

@@ -681,7 +681,7 @@
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 15;
            this.gridColumn27.VisibleIndex = 17;
            this.gridColumn27.Width = 94;
            // 
            // gv_daa018
@@ -705,7 +705,7 @@
            this.gridColoun100.Name = "gridColoun100";
            this.gridColoun100.Tag = "org.fnamber";
            this.gridColoun100.Visible = true;
            this.gridColoun100.VisibleIndex = 26;
            this.gridColoun100.VisibleIndex = 25;
            this.gridColoun100.Width = 250;
            // 
            // gv_daa001
@@ -731,7 +731,7 @@
            this.gv_daa021.OptionsColumn.AllowEdit = false;
            this.gv_daa021.Tag = "query_a.daa021";
            this.gv_daa021.Visible = true;
            this.gv_daa021.VisibleIndex = 17;
            this.gv_daa021.VisibleIndex = 19;
            this.gv_daa021.Width = 100;
            // 
            // gridColumn3
@@ -767,7 +767,7 @@
            this.gv_daa004.OptionsColumn.AllowEdit = false;
            this.gv_daa004.Tag = "query_a.daa004";
            this.gv_daa004.Visible = true;
            this.gv_daa004.VisibleIndex = 12;
            this.gv_daa004.VisibleIndex = 14;
            this.gv_daa004.Width = 150;
            // 
            // gv_daa008
@@ -824,7 +824,7 @@
            this.gv_daa005.OptionsColumn.AllowEdit = false;
            this.gv_daa005.Tag = "query_a.daa005";
            this.gv_daa005.Visible = true;
            this.gv_daa005.VisibleIndex = 14;
            this.gv_daa005.VisibleIndex = 16;
            this.gv_daa005.Width = 50;
            // 
            // gv_cust
@@ -845,7 +845,7 @@
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 16;
            this.gridColumn1.VisibleIndex = 18;
            this.gridColumn1.Width = 94;
            // 
            // gv_daa015
@@ -871,7 +871,7 @@
            this.gv_daa009.OptionsColumn.AllowEdit = false;
            this.gv_daa009.Tag = "query_a.daa009";
            this.gv_daa009.Visible = true;
            this.gv_daa009.VisibleIndex = 13;
            this.gv_daa009.VisibleIndex = 15;
            this.gv_daa009.Width = 94;
            // 
            // gv_daa016
@@ -884,7 +884,7 @@
            this.gv_daa016.OptionsColumn.AllowEdit = false;
            this.gv_daa016.Tag = "query_a.daa016";
            this.gv_daa016.Visible = true;
            this.gv_daa016.VisibleIndex = 19;
            this.gv_daa016.VisibleIndex = 21;
            this.gv_daa016.Width = 180;
            // 
            // gv_daa017
@@ -896,8 +896,6 @@
            this.gv_daa017.Name = "gv_daa017";
            this.gv_daa017.OptionsColumn.AllowEdit = false;
            this.gv_daa017.Tag = "query_a.daa017";
            this.gv_daa017.Visible = true;
            this.gv_daa017.VisibleIndex = 20;
            this.gv_daa017.Width = 180;
            // 
            // gv_mesStartProd
@@ -910,7 +908,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 = 21;
            this.gv_mesStartProd.VisibleIndex = 12;
            this.gv_mesStartProd.Width = 180;
            // 
            // gv_mesEndProd
@@ -923,7 +921,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 = 22;
            this.gv_mesEndProd.VisibleIndex = 13;
            this.gv_mesEndProd.Width = 180;
            // 
            // gridColumn21
@@ -933,7 +931,7 @@
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 23;
            this.gridColumn21.VisibleIndex = 22;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
@@ -943,7 +941,7 @@
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 24;
            this.gridColumn22.VisibleIndex = 23;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
@@ -961,7 +959,7 @@
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 25;
            this.gridColumn24.VisibleIndex = 24;
            this.gridColumn24.Width = 94;
            // 
            // gridColumn25
@@ -971,7 +969,7 @@
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 18;
            this.gridColumn25.VisibleIndex = 20;
            this.gridColumn25.Width = 94;
            // 
            // gridColumn52