到货单版本冲突

lu

5 天以前 c2e1de823e648ca7e62bc868d8aaf9ad5c65a287

 DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs

@@ -102,8 +102,6 @@
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Tag = "itemId";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 94;
            // 
            // gv_supplierItemCode
@@ -117,7 +115,7 @@
            this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
            this.gv_supplierItemCode.Visible = true;
            this.gv_supplierItemCode.VisibleIndex = 5;
            this.gv_supplierItemCode.VisibleIndex = 4;
            this.gv_supplierItemCode.Width = 100;
            // 
            // gv_supplierItemName
@@ -131,7 +129,7 @@
            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
            this.gv_supplierItemName.Visible = true;
            this.gv_supplierItemName.VisibleIndex = 6;
            this.gv_supplierItemName.VisibleIndex = 5;
            this.gv_supplierItemName.Width = 120;
            // 
            // gridColumn5
@@ -143,7 +141,7 @@
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Tag = "dab005";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 7;
            this.gridColumn5.VisibleIndex = 6;
            this.gridColumn5.Width = 250;
            // 
            // gridColumn2
@@ -197,7 +195,7 @@
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 8;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.Width = 94;
            // 
            // panelControl1