到货单版本冲突

lu

6 天以前 c2e1de823e648ca7e62bc868d8aaf9ad5c65a287

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs

@@ -82,6 +82,7 @@
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptButtonUrl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            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();
@@ -406,7 +407,8 @@
            this.gridColumn13,
            this.gridColumn17,
            this.gridColumn5,
            this.gridColumn6});
            this.gridColumn6,
            this.gridColumn7});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -438,7 +440,7 @@
            this.gv_releaseNo.OptionsColumn.AllowEdit = false;
            this.gv_releaseNo.Tag = "query_a.release_no";
            this.gv_releaseNo.Visible = true;
            this.gv_releaseNo.VisibleIndex = 1;
            this.gv_releaseNo.VisibleIndex = 2;
            this.gv_releaseNo.Width = 100;
            // 
            // gv_lotNo
@@ -451,7 +453,7 @@
            this.gv_lotNo.OptionsColumn.AllowEdit = false;
            this.gv_lotNo.Tag = "query_a.lot_no";
            this.gv_lotNo.Visible = true;
            this.gv_lotNo.VisibleIndex = 2;
            this.gv_lotNo.VisibleIndex = 3;
            this.gv_lotNo.Width = 120;
            // 
            // gridColumn23
@@ -461,7 +463,7 @@
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 3;
            this.gridColumn23.VisibleIndex = 4;
            this.gridColumn23.Width = 94;
            // 
            // gv_itemId
@@ -543,7 +545,11 @@
            // 
            // gv_fcheckResu
            // 
            this.gv_fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.CornflowerBlue;
            this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
            this.gv_fcheckResu.AppearanceCell.Options.UseForeColor = true;
            this.gv_fcheckResu.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
            this.gv_fcheckResu.AppearanceHeader.Options.UseForeColor = true;
            this.gv_fcheckResu.Caption = "检验结果";
            this.gv_fcheckResu.FieldName = "fcheckResu";
            this.gv_fcheckResu.MinWidth = 30;
@@ -694,8 +700,6 @@
            this.gridColumn5.FieldName = "checkStates";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn6
@@ -705,7 +709,7 @@
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 22;
            this.gridColumn6.VisibleIndex = 1;
            this.gridColumn6.Width = 94;
            // 
            // rptButtonUrl
@@ -718,6 +722,16 @@
            this.rptButtonUrl.Name = "rptButtonUrl";
            this.rptButtonUrl.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptButtonUrl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptButtonUrl_ButtonClick);
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "生产组织";
            this.gridColumn7.FieldName = "fSubsidiary";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 22;
            this.gridColumn7.Width = 94;
            // 
            // pageBar1
            // 
@@ -735,6 +749,7 @@
            // 
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.PageVisible = false;
            this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
            this.xtraTabPage2.Text = "数据详细";
            // 
@@ -2218,5 +2233,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptButtonUrl;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
    }
}