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

cdk

6 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs

@@ -55,6 +55,7 @@
            this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -115,7 +116,6 @@
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -276,7 +276,7 @@
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Tag = "org.fnamber";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 2;
            this.gridColumn13.VisibleIndex = 6;
            this.gridColumn13.Width = 250;
            // 
            // gv_status
@@ -316,7 +316,7 @@
            this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
            this.gv_itemOutNo.Tag = "query_a.item_out_no";
            this.gv_itemOutNo.Visible = true;
            this.gv_itemOutNo.VisibleIndex = 4;
            this.gv_itemOutNo.VisibleIndex = 2;
            this.gv_itemOutNo.Width = 100;
            // 
            // gv_suppNo
@@ -328,7 +328,7 @@
            this.gv_suppNo.OptionsColumn.AllowEdit = false;
            this.gv_suppNo.Tag = "query_a.supp_no";
            this.gv_suppNo.Visible = true;
            this.gv_suppNo.VisibleIndex = 5;
            this.gv_suppNo.VisibleIndex = 4;
            this.gv_suppNo.Width = 94;
            // 
            // gridColumn1
@@ -337,7 +337,7 @@
            this.gridColumn1.FieldName = "suppName";
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 6;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn3
@@ -413,6 +413,16 @@
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Width = 94;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "到货单号";
            this.gridColumn7.FieldName = "taskNo";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 94;
            // 
            // pageBar1
            // 
@@ -1096,16 +1106,6 @@
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "到货单号";
            this.gridColumn7.FieldName = "taskNo";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 94;
            // 
            // Frm_MesYanTui
            //