dev前台代码
上一版本: 734ba49e | 补丁 | 提交 | 忽略空白
lu
4 天以前 5e1e90b3eb2866d555813beffc2d9001ee09365c 
Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

# Conflicts:
#	DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
已修改1个文件
142 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs


@@ -95,6 +95,7 @@


            this.txt_guid = new DevExpress.XtraEditors.TextEdit();


            this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();


            this.txt_isSrm = new DevExpress.XtraEditors.CheckEdit();


            this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();


            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();


            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();


@@ -111,6 +112,8 @@


            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();


            this.tabMx = new DevExpress.XtraTab.XtraTabControl();


            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();


            this.gcMx1 = new DevExpress.XtraGrid.GridControl();


@@ -159,9 +162,20 @@


            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.picCheckBox = new System.Windows.Forms.PictureBox();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


<<<<<<< Updated upstream


            this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();


            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();


<<<<<<< HEAD


=======


>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1


=======


            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();


>>>>>>> Stashed changes


>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -193,6 +207,7 @@


            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();


@@ -209,6 +224,8 @@


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();


            this.tabMx.SuspendLayout();


            this.tabMxPage1.SuspendLayout();


@@ -219,9 +236,6 @@


            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();


            this.xtraTabPageReport.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();


            this.SuspendLayout();


            // 


            // toolBarMenu1


@@ -321,7 +335,11 @@


            this.gridColumn4,


            this.gridColumn11,


            this.gridColumn7,


            this.gridColumn22});


            this.gridColumn22,


            this.gridColumn23,


            this.gridColumn24,


            this.gridColumn25,


            this.gridColumn26});


            this.gridView1.DetailHeight = 428;


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 62;


@@ -771,6 +789,16 @@


            this.txt_isSrm.TabIndex = 468;


            this.txt_isSrm.Tag = "readOnly";


            // 


            // txt_mxStatue


            // 


            this.txt_mxStatue.Location = new System.Drawing.Point(600, 132);


            this.txt_mxStatue.Margin = new System.Windows.Forms.Padding(4);


            this.txt_mxStatue.Name = "txt_mxStatue";


            this.txt_mxStatue.Properties.Appearance.Options.UseFont = true;


            this.txt_mxStatue.Size = new System.Drawing.Size(381, 28);


            this.txt_mxStatue.StyleController = this.layoutMx1;


            this.txt_mxStatue.TabIndex = 240;


            // 


            // layoutControlItem18


            // 


            this.layoutControlItem18.Control = this.lbGuid;


@@ -987,6 +1015,28 @@


            this.layoutControlItem6.Size = new System.Drawing.Size(487, 42);


            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem6.TextVisible = false;


            // 


            // layoutControlItem10


            // 


            this.layoutControlItem10.Control = this.txt_mxStatue;


            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;


            this.layoutControlItem10.CustomizationFormText = "入库状态";


            this.layoutControlItem10.Location = new System.Drawing.Point(486, 120);


            this.layoutControlItem10.Name = "layoutControlItem10";


            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem10.Size = new System.Drawing.Size(487, 42);


            this.layoutControlItem10.Text = "入库状态";


            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);


            // 


            // layoutControlItem2


            // 


            this.layoutControlItem2.Control = this.txt_billNo;


            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);


            this.layoutControlItem2.Name = "layoutControlItem2";


            this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);


            this.layoutControlItem2.Text = "到货单号";


            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);


            // 


            // tabMx


            // 


@@ -1515,7 +1565,12 @@


            this.picCheckBox.TabStop = false;


            this.picCheckBox.Visible = false;


            // 


<<<<<<< HEAD


 


=======


<<<<<<< Updated upstream


<<<<<<< HEAD


>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096


            // ucRptCgdhd1


            // 


            this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;


@@ -1525,37 +1580,61 @@


            this.ucRptCgdhd1.TabIndex = 0;


 


            // txt_mxStatue


=======


            // gridColumn23


>>>>>>> Stashed changes


            // 


            this.txt_mxStatue.Location = new System.Drawing.Point(600, 132);


            this.txt_mxStatue.Margin = new System.Windows.Forms.Padding(4);


            this.txt_mxStatue.Name = "txt_mxStatue";


            this.txt_mxStatue.Properties.Appearance.Options.UseFont = true;


            this.txt_mxStatue.Size = new System.Drawing.Size(381, 28);


            this.txt_mxStatue.StyleController = this.layoutMx1;


            this.txt_mxStatue.TabIndex = 240;


            this.gridColumn23.Caption = "到货数量";


            this.gridColumn23.FieldName = "到货数量";


            this.gridColumn23.MinWidth = 30;


            this.gridColumn23.Name = "gridColumn23";


            this.gridColumn23.Visible = true;


            this.gridColumn23.VisibleIndex = 15;


            this.gridColumn23.Width = 112;


            // 


            // layoutControlItem10


            // gridColumn24


            // 


            this.layoutControlItem10.Control = this.txt_mxStatue;


            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;


            this.layoutControlItem10.CustomizationFormText = "入库状态";


            this.layoutControlItem10.Location = new System.Drawing.Point(486, 120);


            this.layoutControlItem10.Name = "layoutControlItem10";


            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem10.Size = new System.Drawing.Size(487, 42);


            this.layoutControlItem10.Text = "入库状态";


            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);


            this.gridColumn24.Caption = "检验数量";


            this.gridColumn24.FieldName = "检验数量";


            this.gridColumn24.MinWidth = 30;


            this.gridColumn24.Name = "gridColumn24";


            this.gridColumn24.Visible = true;


            this.gridColumn24.VisibleIndex = 16;


            this.gridColumn24.Width = 112;


            // 


            // layoutControlItem2


            // gridColumn25


            // 


<<<<<<< Updated upstream


            this.layoutControlItem2.Control = this.txt_billNo;


            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);


            this.layoutControlItem2.Name = "layoutControlItem2";


            this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);


            this.layoutControlItem2.Text = "到货单号";


            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);


<<<<<<< HEAD


 


=======


>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1


=======


            this.gridColumn25.Caption = "入库数量";


            this.gridColumn25.FieldName = "入库数量";


            this.gridColumn25.MinWidth = 30;


            this.gridColumn25.Name = "gridColumn25";


            this.gridColumn25.Visible = true;


            this.gridColumn25.VisibleIndex = 17;


            this.gridColumn25.Width = 112;


            // 


            // gridColumn26


            // 


            this.gridColumn26.Caption = "打印数量";


            this.gridColumn26.FieldName = "打印数量";


            this.gridColumn26.MinWidth = 30;


            this.gridColumn26.Name = "gridColumn26";


            this.gridColumn26.Visible = true;


            this.gridColumn26.VisibleIndex = 18;


            this.gridColumn26.Width = 112;


>>>>>>> Stashed changes


>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096


            // 


            // Frm_MesInvItemArn


            // 


@@ -1599,6 +1678,7 @@


            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();


@@ -1615,6 +1695,8 @@


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();


            this.tabMx.ResumeLayout(false);


            this.tabMxPage1.ResumeLayout(false);


@@ -1625,9 +1707,6 @@


            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();


            this.xtraTabPageReport.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();


            this.ResumeLayout(false);




        }


@@ -1741,6 +1820,17 @@


        private DevExpress.XtraEditors.TextEdit txt_mxStatue;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;


<<<<<<< HEAD


 


=======


<<<<<<< Updated upstream


>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1


=======


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;


>>>>>>> Stashed changes


>>>>>>> 82572cfe57091972a99dff319e5df5ee516ee096


    }


}