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

lu

8 天以前 bb59b3c2baa039889b74aef492a90883d69c4855

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs

@@ -294,7 +294,7 @@
            // gv_ischeck
            // 
            this.gv_ischeck.AppearanceCell.Options.UseFont = true;
            this.gv_ischeck.Caption = "审核标识";
            this.gv_ischeck.Caption = "审核";
            this.gv_ischeck.FieldName = "checkStatus";
            this.gv_ischeck.Name = "gv_ischeck";
            this.gv_ischeck.OptionsColumn.AllowEdit = false;
@@ -305,7 +305,7 @@
            // 
            // gridColumn9
            // 
            this.gridColumn9.Caption = "委外标识";
            this.gridColumn9.Caption = "委外";
            this.gridColumn9.FieldName = "isWw";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
@@ -998,7 +998,7 @@
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料编号";
            this.gridColumn2.FieldName = "itemNo";
            this.gridColumn2.FieldName = "itemNo2";
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 0;
@@ -1180,8 +1180,6 @@
            this.gvMx1urgentFlag.MinWidth = 50;
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
            this.gvMx1urgentFlag.Tag = "query_a.URGENT_FLAG";
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 0;
            this.gvMx1urgentFlag.Width = 94;
            // 
            // gvMx1itemBarcode
@@ -1192,7 +1190,7 @@
            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx1itemBarcode.Visible = true;
            this.gvMx1itemBarcode.VisibleIndex = 1;
            this.gvMx1itemBarcode.VisibleIndex = 0;
            this.gvMx1itemBarcode.Width = 250;
            // 
            // gvMx1workNo
@@ -1203,7 +1201,7 @@
            this.gvMx1workNo.Name = "gvMx1workNo";
            this.gvMx1workNo.Tag = "query_a.WORK_NO";
            this.gvMx1workNo.Visible = true;
            this.gvMx1workNo.VisibleIndex = 2;
            this.gvMx1workNo.VisibleIndex = 1;
            this.gvMx1workNo.Width = 100;
            // 
            // gvMx1cItemCode
@@ -1214,7 +1212,7 @@
            this.gvMx1cItemCode.Name = "gvMx1cItemCode";
            this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
            this.gvMx1cItemCode.Visible = true;
            this.gvMx1cItemCode.VisibleIndex = 3;
            this.gvMx1cItemCode.VisibleIndex = 2;
            this.gvMx1cItemCode.Width = 100;
            // 
            // gvMx1itemSname
@@ -1225,7 +1223,7 @@
            this.gvMx1itemSname.Name = "gvMx1itemSname";
            this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
            this.gvMx1itemSname.Visible = true;
            this.gvMx1itemSname.VisibleIndex = 4;
            this.gvMx1itemSname.VisibleIndex = 3;
            this.gvMx1itemSname.Width = 250;
            // 
            // gvMx1itemNo
@@ -1236,7 +1234,7 @@
            this.gvMx1itemNo.Name = "gvMx1itemNo";
            this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
            this.gvMx1itemNo.Visible = true;
            this.gvMx1itemNo.VisibleIndex = 5;
            this.gvMx1itemNo.VisibleIndex = 4;
            this.gvMx1itemNo.Width = 250;
            // 
            // gvMx1quantity
@@ -1247,7 +1245,7 @@
            this.gvMx1quantity.Name = "gvMx1quantity";
            this.gvMx1quantity.Tag = "query_a.QUANTITY";
            this.gvMx1quantity.Visible = true;
            this.gvMx1quantity.VisibleIndex = 6;
            this.gvMx1quantity.VisibleIndex = 5;
            this.gvMx1quantity.Width = 94;
            // 
            // gvMx1unit
@@ -1258,7 +1256,7 @@
            this.gvMx1unit.Name = "gvMx1unit";
            this.gvMx1unit.Tag = "query_a.UNIT";
            this.gvMx1unit.Visible = true;
            this.gvMx1unit.VisibleIndex = 7;
            this.gvMx1unit.VisibleIndex = 6;
            this.gvMx1unit.Width = 94;
            // 
            // gvMx1rbillNo
@@ -1269,7 +1267,7 @@
            this.gvMx1rbillNo.Name = "gvMx1rbillNo";
            this.gvMx1rbillNo.Tag = "query_a.RBILL_NO";
            this.gvMx1rbillNo.Visible = true;
            this.gvMx1rbillNo.VisibleIndex = 8;
            this.gvMx1rbillNo.VisibleIndex = 7;
            this.gvMx1rbillNo.Width = 94;
            // 
            // gvMx1depotSectionCode
@@ -1280,7 +1278,7 @@
            this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
            this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
            this.gvMx1depotSectionCode.Visible = true;
            this.gvMx1depotSectionCode.VisibleIndex = 9;
            this.gvMx1depotSectionCode.VisibleIndex = 8;
            this.gvMx1depotSectionCode.Width = 94;
            // 
            // gvMx1depotCode
@@ -1291,7 +1289,7 @@
            this.gvMx1depotCode.Name = "gvMx1depotCode";
            this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
            this.gvMx1depotCode.Visible = true;
            this.gvMx1depotCode.VisibleIndex = 10;
            this.gvMx1depotCode.VisibleIndex = 9;
            this.gvMx1depotCode.Width = 94;
            // 
            // gvMx1ebelnK3id
@@ -1319,7 +1317,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 11;
            this.gridColumn7.VisibleIndex = 10;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn8
@@ -1329,7 +1327,7 @@
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 12;
            this.gridColumn8.VisibleIndex = 11;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn12