From 430e096780219b81e19043829b637fcda4e61ca1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 20 八月 2025 17:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs |   66 +++++++++++++++-----------------
 1 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index cfa6663..493f7d2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -428,7 +428,7 @@
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Tag = "org.fnamber";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 20;
+            this.gridColumn8.VisibleIndex = 19;
             this.gridColumn8.Width = 200;
             // 
             // gv_caa001
@@ -441,7 +441,7 @@
             this.gv_caa001.OptionsColumn.AllowEdit = false;
             this.gv_caa001.Tag = "query_a.CAA001";
             this.gv_caa001.Visible = true;
-            this.gv_caa001.VisibleIndex = 1;
+            this.gv_caa001.VisibleIndex = 2;
             this.gv_caa001.Width = 100;
             // 
             // gridColumn1
@@ -452,7 +452,7 @@
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 2;
+            this.gridColumn1.VisibleIndex = 3;
             this.gridColumn1.Width = 80;
             // 
             // gridColumn9
@@ -463,7 +463,7 @@
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 3;
+            this.gridColumn9.VisibleIndex = 4;
             this.gridColumn9.Width = 60;
             // 
             // gv_caa020
@@ -476,7 +476,7 @@
             this.gv_caa020.OptionsColumn.AllowEdit = false;
             this.gv_caa020.Tag = "query_a.CAA020";
             this.gv_caa020.Visible = true;
-            this.gv_caa020.VisibleIndex = 4;
+            this.gv_caa020.VisibleIndex = 1;
             this.gv_caa020.Width = 100;
             // 
             // gv_caa006
@@ -612,8 +612,6 @@
             this.gridColumn2.MinWidth = 50;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 15;
             this.gridColumn2.Width = 110;
             // 
             // gv_caa016
@@ -626,7 +624,7 @@
             this.gv_caa016.OptionsColumn.AllowEdit = false;
             this.gv_caa016.Tag = "query_a.CAA016";
             this.gv_caa016.Visible = true;
-            this.gv_caa016.VisibleIndex = 16;
+            this.gv_caa016.VisibleIndex = 15;
             this.gv_caa016.Width = 100;
             // 
             // gridColumn7
@@ -686,7 +684,7 @@
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 17;
+            this.gridColumn23.VisibleIndex = 16;
             this.gridColumn23.Width = 94;
             // 
             // gridColumn24
@@ -736,7 +734,7 @@
             this.gridColumn31.MinWidth = 25;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 18;
+            this.gridColumn31.VisibleIndex = 17;
             this.gridColumn31.Width = 94;
             // 
             // gridColumn32
@@ -786,7 +784,7 @@
             this.gridColumn38.MinWidth = 25;
             this.gridColumn38.Name = "gridColumn38";
             this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 19;
+            this.gridColumn38.VisibleIndex = 18;
             this.gridColumn38.Width = 94;
             // 
             // gridColumn39
@@ -804,7 +802,7 @@
             this.gridColumn30.MinWidth = 25;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 21;
+            this.gridColumn30.VisibleIndex = 20;
             this.gridColumn30.Width = 94;
             // 
             // gridColumn34
@@ -1765,7 +1763,7 @@
             this.gvMx1cab003.Name = "gvMx1cab003";
             this.gvMx1cab003.Tag = "query_a.CAB003";
             this.gvMx1cab003.Visible = true;
-            this.gvMx1cab003.VisibleIndex = 3;
+            this.gvMx1cab003.VisibleIndex = 2;
             this.gvMx1cab003.Width = 94;
             // 
             // gridColumn14
@@ -1775,7 +1773,7 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 4;
+            this.gridColumn14.VisibleIndex = 3;
             this.gridColumn14.Width = 94;
             // 
             // gridColumn10
@@ -1785,7 +1783,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 5;
+            this.gridColumn10.VisibleIndex = 4;
             this.gridColumn10.Width = 94;
             // 
             // gvMx1cab012
@@ -1797,7 +1795,7 @@
             this.gvMx1cab012.Name = "gvMx1cab012";
             this.gvMx1cab012.Tag = "query_a.CAB012";
             this.gvMx1cab012.Visible = true;
-            this.gvMx1cab012.VisibleIndex = 6;
+            this.gvMx1cab012.VisibleIndex = 5;
             this.gvMx1cab012.Width = 94;
             // 
             // gvMx1cab006
@@ -1809,7 +1807,7 @@
             this.gvMx1cab006.Name = "gvMx1cab006";
             this.gvMx1cab006.Tag = "query_a.CAB006";
             this.gvMx1cab006.Visible = true;
-            this.gvMx1cab006.VisibleIndex = 7;
+            this.gvMx1cab006.VisibleIndex = 6;
             this.gvMx1cab006.Width = 94;
             // 
             // gvMx1cab009
@@ -1821,7 +1819,7 @@
             this.gvMx1cab009.Name = "gvMx1cab009";
             this.gvMx1cab009.Tag = "query_a.CAB009";
             this.gvMx1cab009.Visible = true;
-            this.gvMx1cab009.VisibleIndex = 8;
+            this.gvMx1cab009.VisibleIndex = 7;
             this.gvMx1cab009.Width = 94;
             // 
             // gvMx1cab007
@@ -1833,7 +1831,7 @@
             this.gvMx1cab007.Name = "gvMx1cab007";
             this.gvMx1cab007.Tag = "query_a.CAB007";
             this.gvMx1cab007.Visible = true;
-            this.gvMx1cab007.VisibleIndex = 9;
+            this.gvMx1cab007.VisibleIndex = 8;
             this.gvMx1cab007.Width = 94;
             // 
             // gvMx1cab014
@@ -1845,7 +1843,7 @@
             this.gvMx1cab014.Name = "gvMx1cab014";
             this.gvMx1cab014.Tag = "query_a.CAB014";
             this.gvMx1cab014.Visible = true;
-            this.gvMx1cab014.VisibleIndex = 10;
+            this.gvMx1cab014.VisibleIndex = 9;
             this.gvMx1cab014.Width = 94;
             // 
             // gridColumn11
@@ -1855,7 +1853,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 20;
+            this.gridColumn11.VisibleIndex = 19;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -1865,7 +1863,7 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 21;
+            this.gridColumn12.VisibleIndex = 20;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
@@ -1875,7 +1873,7 @@
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 22;
+            this.gridColumn13.VisibleIndex = 21;
             this.gridColumn13.Width = 94;
             // 
             // gvMx1mtono
@@ -1897,7 +1895,7 @@
             this.gvMx1numerator.Name = "gvMx1numerator";
             this.gvMx1numerator.Tag = "query_a.NUMERATOR";
             this.gvMx1numerator.Visible = true;
-            this.gvMx1numerator.VisibleIndex = 11;
+            this.gvMx1numerator.VisibleIndex = 10;
             this.gvMx1numerator.Width = 94;
             // 
             // gvMx1denominator
@@ -1909,7 +1907,7 @@
             this.gvMx1denominator.Name = "gvMx1denominator";
             this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
             this.gvMx1denominator.Visible = true;
-            this.gvMx1denominator.VisibleIndex = 12;
+            this.gvMx1denominator.VisibleIndex = 11;
             this.gvMx1denominator.Width = 94;
             // 
             // gvMx1depotCode
@@ -1921,7 +1919,7 @@
             this.gvMx1depotCode.Name = "gvMx1depotCode";
             this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
             this.gvMx1depotCode.Visible = true;
-            this.gvMx1depotCode.VisibleIndex = 13;
+            this.gvMx1depotCode.VisibleIndex = 12;
             this.gvMx1depotCode.Width = 94;
             // 
             // gridColumn15
@@ -1931,7 +1929,7 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 14;
+            this.gridColumn15.VisibleIndex = 13;
             this.gridColumn15.Width = 94;
             // 
             // gvMx1issueType
@@ -1943,7 +1941,7 @@
             this.gvMx1issueType.Name = "gvMx1issueType";
             this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE";
             this.gvMx1issueType.Visible = true;
-            this.gvMx1issueType.VisibleIndex = 15;
+            this.gvMx1issueType.VisibleIndex = 14;
             this.gvMx1issueType.Width = 94;
             // 
             // gridColumn16
@@ -1953,7 +1951,7 @@
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 16;
+            this.gridColumn16.VisibleIndex = 15;
             this.gridColumn16.Width = 94;
             // 
             // gvMx1scraprate
@@ -1965,7 +1963,7 @@
             this.gvMx1scraprate.Name = "gvMx1scraprate";
             this.gvMx1scraprate.Tag = "query_a.SCRAPRATE";
             this.gvMx1scraprate.Visible = true;
-            this.gvMx1scraprate.VisibleIndex = 17;
+            this.gvMx1scraprate.VisibleIndex = 16;
             this.gvMx1scraprate.Width = 94;
             // 
             // gvMx1scrapqty
@@ -1977,7 +1975,7 @@
             this.gvMx1scrapqty.Name = "gvMx1scrapqty";
             this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY";
             this.gvMx1scrapqty.Visible = true;
-            this.gvMx1scrapqty.VisibleIndex = 18;
+            this.gvMx1scrapqty.VisibleIndex = 17;
             this.gvMx1scrapqty.Width = 94;
             // 
             // gridColumn17
@@ -1987,7 +1985,7 @@
             this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 19;
+            this.gridColumn17.VisibleIndex = 18;
             this.gridColumn17.Width = 94;
             // 
             // gridColumn29
@@ -1997,7 +1995,7 @@
             this.gridColumn29.MinWidth = 25;
             this.gridColumn29.Name = "gridColumn29";
             this.gridColumn29.Visible = true;
-            this.gridColumn29.VisibleIndex = 23;
+            this.gridColumn29.VisibleIndex = 22;
             this.gridColumn29.Width = 94;
             // 
             // gridColumn18
@@ -2006,8 +2004,6 @@
             this.gridColumn18.FieldName = "itemId";
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 2;
             this.gridColumn18.Width = 94;
             // 
             // Frm_Womcaa

--
Gitblit v1.9.3