dev前台代码
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
bug
lu
昨天 da7a62b106c8192140427e243e1d41fca1625838 
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs


@@ -29,18 +29,18 @@


        private void InitializeComponent()


        {


            this.components = new System.ComponentModel.Container();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();


            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();


            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();


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


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


@@ -49,17 +49,12 @@


            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


            this.pageBar1 = new UserControls.Data.UcPageBar();


@@ -85,31 +80,11 @@


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


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


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


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


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


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


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


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


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


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


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


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


            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();


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


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


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


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


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


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


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


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


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


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


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


            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();


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


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


            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();


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


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


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


@@ -121,14 +96,30 @@


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


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


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


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


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


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


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


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


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


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


            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();


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


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


            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -164,11 +155,6 @@


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


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


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


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


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


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


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


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


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


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


            this.tabMx.SuspendLayout();


@@ -180,6 +166,11 @@


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


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


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


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


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


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


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


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


            this.SuspendLayout();


            // 


            // toolBarMenu1


@@ -259,17 +250,12 @@


            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gridColumn1,


            this.gv_status,


            this.gv_isFinish,


            this.gv_isOut,


            this.gv_billNo,


            this.gv_lastUpdateUser,


            this.gv_lastUpdateTime,


            this.gv_checkUser,


            this.gv_checkDate,


            this.gv_returnMethod,


            this.gv_returnType,


            this.gv_depotId,


            this.gv_suppId,


            this.gv_remark,


            this.gridColumn7});


            this.gridView1.GridControl = this.gcMain1;


@@ -281,53 +267,27 @@


            // 


            // gridColumn1


            // 


            this.gridColumn1.Caption = "退货组织";


            this.gridColumn1.FieldName = "receivingOrg";


            this.gridColumn1.Caption = "申请组织";


            this.gridColumn1.FieldName = "kcOrg";


            this.gridColumn1.Name = "gridColumn1";


            this.gridColumn1.Tag = "org.fnamber";


            this.gridColumn1.Visible = true;


            this.gridColumn1.VisibleIndex = 0;


            this.gridColumn1.VisibleIndex = 1;


            this.gridColumn1.Width = 250;


            // 


            // gv_status


            // 


            this.gv_status.AppearanceCell.Options.UseFont = true;


            this.gv_status.Caption = "审核状态";


            this.gv_status.FieldName = "status";


            this.gv_status.FieldName = "checkStatus";


            this.gv_status.MaxWidth = 50;


            this.gv_status.MinWidth = 50;


            this.gv_status.Name = "gv_status";


            this.gv_status.OptionsColumn.AllowEdit = false;


            this.gv_status.Tag = "query_a.STATUS";


            this.gv_status.Visible = true;


            this.gv_status.VisibleIndex = 1;


            this.gv_status.VisibleIndex = 0;


            this.gv_status.Width = 50;


            // 


            // gv_isFinish


            // 


            this.gv_isFinish.AppearanceCell.Options.UseFont = true;


            this.gv_isFinish.Caption = "是否完成";


            this.gv_isFinish.FieldName = "isFinish";


            this.gv_isFinish.MaxWidth = 50;


            this.gv_isFinish.MinWidth = 50;


            this.gv_isFinish.Name = "gv_isFinish";


            this.gv_isFinish.OptionsColumn.AllowEdit = false;


            this.gv_isFinish.Tag = "query_a.IS_FINISH";


            this.gv_isFinish.Width = 50;


            // 


            // gv_isOut


            // 


            this.gv_isOut.AppearanceCell.Options.UseFont = true;


            this.gv_isOut.Caption = "委外标识";


            this.gv_isOut.FieldName = "isOut";


            this.gv_isOut.MaxWidth = 50;


            this.gv_isOut.MinWidth = 50;


            this.gv_isOut.Name = "gv_isOut";


            this.gv_isOut.OptionsColumn.AllowEdit = false;


            this.gv_isOut.Tag = "query_a.IS_OUT";


            this.gv_isOut.Visible = true;


            this.gv_isOut.VisibleIndex = 2;


            this.gv_isOut.Width = 50;


            // 


            // gv_billNo


            // 


@@ -338,43 +298,43 @@


            this.gv_billNo.OptionsColumn.AllowEdit = false;


            this.gv_billNo.Tag = "query_a.BILL_NO";


            this.gv_billNo.Visible = true;


            this.gv_billNo.VisibleIndex = 3;


            this.gv_billNo.VisibleIndex = 2;


            this.gv_billNo.Width = 120;


            // 


            // gv_lastUpdateUser


            // 


            this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;


            this.gv_lastUpdateUser.Caption = "最后跟新人 ";


            this.gv_lastUpdateUser.FieldName = "lastUpdateUser";


            this.gv_lastUpdateUser.FieldName = "lastUpdateBy";


            this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";


            this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;


            this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";


            this.gv_lastUpdateUser.Visible = true;


            this.gv_lastUpdateUser.VisibleIndex = 4;


            this.gv_lastUpdateUser.VisibleIndex = 3;


            this.gv_lastUpdateUser.Width = 94;


            // 


            // gv_lastUpdateTime


            // 


            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;


            this.gv_lastUpdateTime.Caption = "最后修改时间 ";


            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";


            this.gv_lastUpdateTime.FieldName = "lastUpdateDate";


            this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";


            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;


            this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";


            this.gv_lastUpdateTime.Visible = true;


            this.gv_lastUpdateTime.VisibleIndex = 5;


            this.gv_lastUpdateTime.VisibleIndex = 4;


            this.gv_lastUpdateTime.Width = 180;


            // 


            // gv_checkUser


            // 


            this.gv_checkUser.AppearanceCell.Options.UseFont = true;


            this.gv_checkUser.Caption = "审核人 ";


            this.gv_checkUser.FieldName = "checkUser";


            this.gv_checkUser.FieldName = "checkBy";


            this.gv_checkUser.Name = "gv_checkUser";


            this.gv_checkUser.OptionsColumn.AllowEdit = false;


            this.gv_checkUser.Tag = "query_a.CHECK_USER";


            this.gv_checkUser.Visible = true;


            this.gv_checkUser.VisibleIndex = 6;


            this.gv_checkUser.VisibleIndex = 5;


            this.gv_checkUser.Width = 94;


            // 


            // gv_checkDate


@@ -386,56 +346,20 @@


            this.gv_checkDate.OptionsColumn.AllowEdit = false;


            this.gv_checkDate.Tag = "query_a.CHECK_DATE";


            this.gv_checkDate.Visible = true;


            this.gv_checkDate.VisibleIndex = 7;


            this.gv_checkDate.VisibleIndex = 6;


            this.gv_checkDate.Width = 94;


            // 


            // gv_returnMethod


            // 


            this.gv_returnMethod.AppearanceCell.Options.UseFont = true;


            this.gv_returnMethod.Caption = "退料方式 ";


            this.gv_returnMethod.FieldName = "returnMethod";


            this.gv_returnMethod.Caption = "申请类型";


            this.gv_returnMethod.FieldName = "billType";


            this.gv_returnMethod.Name = "gv_returnMethod";


            this.gv_returnMethod.OptionsColumn.AllowEdit = false;


            this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";


            this.gv_returnMethod.Visible = true;


            this.gv_returnMethod.VisibleIndex = 8;


            this.gv_returnMethod.VisibleIndex = 7;


            this.gv_returnMethod.Width = 94;


            // 


            // gv_returnType


            // 


            this.gv_returnType.AppearanceCell.Options.UseFont = true;


            this.gv_returnType.Caption = "退料类型 ";


            this.gv_returnType.FieldName = "returnType";


            this.gv_returnType.Name = "gv_returnType";


            this.gv_returnType.OptionsColumn.AllowEdit = false;


            this.gv_returnType.Tag = "query_a.RETURN_TYPE";


            this.gv_returnType.Visible = true;


            this.gv_returnType.VisibleIndex = 9;


            this.gv_returnType.Width = 94;


            // 


            // gv_depotId


            // 


            this.gv_depotId.AppearanceCell.Options.UseFont = true;


            this.gv_depotId.Caption = "仓库";


            this.gv_depotId.FieldName = "dptName";


            this.gv_depotId.Name = "gv_depotId";


            this.gv_depotId.OptionsColumn.AllowEdit = false;


            this.gv_depotId.Tag = "query_a.DEPOT_ID";


            this.gv_depotId.Visible = true;


            this.gv_depotId.VisibleIndex = 10;


            this.gv_depotId.Width = 94;


            // 


            // gv_suppId


            // 


            this.gv_suppId.AppearanceCell.Options.UseFont = true;


            this.gv_suppId.Caption = "供应商";


            this.gv_suppId.FieldName = "supName";


            this.gv_suppId.Name = "gv_suppId";


            this.gv_suppId.OptionsColumn.AllowEdit = false;


            this.gv_suppId.Tag = "query_a.SUPP_ID";


            this.gv_suppId.Visible = true;


            this.gv_suppId.VisibleIndex = 11;


            this.gv_suppId.Width = 94;


            // 


            // gv_remark


            // 


@@ -446,7 +370,7 @@


            this.gv_remark.OptionsColumn.AllowEdit = false;


            this.gv_remark.Tag = "query_a.REMARK";


            this.gv_remark.Visible = true;


            this.gv_remark.VisibleIndex = 12;


            this.gv_remark.VisibleIndex = 8;


            this.gv_remark.Width = 94;


            // 


            // gridColumn7


@@ -592,10 +516,10 @@


            // 


            // txt_remark


            // 


            this.txt_remark.Location = new System.Drawing.Point(385, 69);


            this.txt_remark.Location = new System.Drawing.Point(385, 38);


            this.txt_remark.Name = "txt_remark";


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


            this.txt_remark.Size = new System.Drawing.Size(436, 24);


            this.txt_remark.Size = new System.Drawing.Size(165, 24);


            this.txt_remark.StyleController = this.layoutMx1;


            this.txt_remark.TabIndex = 252;


            // 


@@ -677,37 +601,37 @@


            this.layoutControlItem2,


            this.layoutControlItem9,


            this.layoutControlItem10,


            this.layoutControlItem14,


            this.layoutControlItem15,


            this.layoutControlItem16,


            this.layoutControlItem11,


            this.layoutControlItem15,


            this.layoutControlItem14,


            this.layoutControlItem5,


            this.layoutControlItem7,


            this.layoutControlItem16});


            this.layoutControlItem7});


            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;


            this.Root.Name = "Root";


            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition5.Width = 100D;


            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition6.Width = 100D;


            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition7.Width = 100D;


            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition8.Width = 100D;


            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition1.Width = 100D;


            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition2.Width = 100D;


            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition3.Width = 100D;


            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition4.Width = 100D;


            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {


            columnDefinition5,


            columnDefinition6,


            columnDefinition7,


            columnDefinition8});


            rowDefinition4.Height = 100D;


            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition5.Height = 100D;


            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition6.Height = 100D;


            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition1,


            columnDefinition2,


            columnDefinition3,


            columnDefinition4});


            rowDefinition1.Height = 100D;


            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition2.Height = 100D;


            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition3.Height = 100D;


            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;


            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {


            rowDefinition4,


            rowDefinition5,


            rowDefinition6});


            rowDefinition1,


            rowDefinition2,


            rowDefinition3});


            this.Root.Size = new System.Drawing.Size(1105, 113);


            this.Root.TextVisible = false;


            // 


@@ -752,61 +676,6 @@


            this.layoutControlItem10.Text = "审核时间";


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


            // 


            // layoutControlItem14


            // 


            this.layoutControlItem14.Control = this.lastUpdateUser;


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


            this.layoutControlItem14.Name = "layoutControlItem14";


            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);


            this.layoutControlItem14.Text = "最后更新人";


            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem15


            // 


            this.layoutControlItem15.Control = this.lastUpdateTime;


            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);


            this.layoutControlItem15.Name = "layoutControlItem15";


            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);


            this.layoutControlItem15.Text = "最后更新时间";


            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem11


            // 


            this.layoutControlItem11.Control = this.txt_status;


            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);


            this.layoutControlItem11.Name = "layoutControlItem11";


            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);


            this.layoutControlItem11.Text = "审核标识";


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


            this.layoutControlItem11.TextVisible = false;


            // 


            // layoutControlItem5


            // 


            this.layoutControlItem5.Control = this.txt_billType;


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


            this.layoutControlItem5.Name = "layoutControlItem5";


            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);


            this.layoutControlItem5.Text = "申请类型";


            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_remark;


            this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);


            this.layoutControlItem7.Text = "申请备注";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem16


            // 


            this.layoutControlItem16.Control = this.btnSelect;


@@ -838,7 +707,7 @@


            this.tabMxPage1.Controls.Add(this.gcMx1);


            this.tabMxPage1.Name = "tabMxPage1";


            this.tabMxPage1.Size = new System.Drawing.Size(1124, 418);


            this.tabMxPage1.Text = "申请明细";


            this.tabMxPage1.Text = "条码明细";


            // 


            // gcMx1


            // 


@@ -849,13 +718,211 @@


            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {


            this.repositoryItemButtonEdit1});


            this.gcMx1.Size = new System.Drawing.Size(1124, 418);


            this.gcMx1.TabIndex = 0;


            this.gcMx1.TabIndex = 1;


            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gvMx1});


            // 


            // gvMx1


            // 


            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gridColumn6,


            this.gridColumn8,


            this.gridColumn9,


            this.gridColumn10,


            this.gridColumn11,


            this.gridColumn12,


            this.gridColumn13,


            this.gridColumn14,


            this.gridColumn15,


            this.gridColumn16,


            this.gridColumn17,


            this.gridColumn20,


            this.gridColumn21,


            this.gvMxDel});


            this.gvMx1.GridControl = this.gcMx1;


            this.gvMx1.Name = "gvMx1";


            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;


            this.gvMx1.OptionsView.ShowGroupPanel = false;


            // 


            // gridColumn6


            // 


            this.gridColumn6.Caption = "明细GUID";


            this.gridColumn6.FieldName = "guid";


            this.gridColumn6.MinWidth = 25;


            this.gridColumn6.Name = "gridColumn6";


            this.gridColumn6.Width = 94;


            // 


            // gridColumn8


            // 


            this.gridColumn8.AppearanceCell.Options.UseFont = true;


            this.gridColumn8.Caption = "主表GUID";


            this.gridColumn8.FieldName = "pGuid";


            this.gridColumn8.MinWidth = 50;


            this.gridColumn8.Name = "gridColumn8";


            this.gridColumn8.Tag = "query_a.MID";


            this.gridColumn8.Width = 94;


            // 


            // gridColumn9


            // 


            this.gridColumn9.AppearanceCell.Options.UseFont = true;


            this.gridColumn9.Caption = "物料ID";


            this.gridColumn9.FieldName = "itemId";


            this.gridColumn9.MinWidth = 50;


            this.gridColumn9.Name = "gridColumn9";


            this.gridColumn9.Tag = "query_a.ITEM_ID";


            this.gridColumn9.Visible = true;


            this.gridColumn9.VisibleIndex = 0;


            this.gridColumn9.Width = 94;


            // 


            // gridColumn10


            // 


            this.gridColumn10.Caption = "物料编码";


            this.gridColumn10.FieldName = "itemNo";


            this.gridColumn10.MinWidth = 25;


            this.gridColumn10.Name = "gridColumn10";


            this.gridColumn10.Visible = true;


            this.gridColumn10.VisibleIndex = 2;


            this.gridColumn10.Width = 94;


            // 


            // gridColumn11


            // 


            this.gridColumn11.Caption = "物料名称";


            this.gridColumn11.FieldName = "itemName";


            this.gridColumn11.MinWidth = 25;


            this.gridColumn11.Name = "gridColumn11";


            this.gridColumn11.Visible = true;


            this.gridColumn11.VisibleIndex = 3;


            this.gridColumn11.Width = 94;


            // 


            // gridColumn12


            // 


            this.gridColumn12.Caption = "物料规格";


            this.gridColumn12.FieldName = "itemModel";


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Visible = true;


            this.gridColumn12.VisibleIndex = 4;


            this.gridColumn12.Width = 94;


            // 


            // gridColumn13


            // 


            this.gridColumn13.AppearanceCell.Options.UseFont = true;


            this.gridColumn13.Caption = "数量";


            this.gridColumn13.FieldName = "itemBarCodeSl";


            this.gridColumn13.MinWidth = 50;


            this.gridColumn13.Name = "gridColumn13";


            this.gridColumn13.Tag = "yz_quantity_0_edit";


            this.gridColumn13.Visible = true;


            this.gridColumn13.VisibleIndex = 5;


            this.gridColumn13.Width = 94;


            // 


            // gridColumn14


            // 


            this.gridColumn14.AppearanceCell.Options.UseFont = true;


            this.gridColumn14.Caption = "有效期至";


            this.gridColumn14.FieldName = "yxqDate";


            this.gridColumn14.MinWidth = 50;


            this.gridColumn14.Name = "gridColumn14";


            this.gridColumn14.Tag = "yz_quantity_0_edit";


            this.gridColumn14.Visible = true;


            this.gridColumn14.VisibleIndex = 6;


            this.gridColumn14.Width = 94;


            // 


            // gridColumn15


            // 


            this.gridColumn15.Caption = "重检次数";


            this.gridColumn15.FieldName = "cjcs";


            this.gridColumn15.MinWidth = 25;


            this.gridColumn15.Name = "gridColumn15";


            this.gridColumn15.Visible = true;


            this.gridColumn15.VisibleIndex = 8;


            this.gridColumn15.Width = 94;


            // 


            // gridColumn16


            // 


            this.gridColumn16.AppearanceCell.Options.UseFont = true;


            this.gridColumn16.Caption = "剩余天数";


            this.gridColumn16.FieldName = "syts";


            this.gridColumn16.MinWidth = 50;


            this.gridColumn16.Name = "gridColumn16";


            this.gridColumn16.Tag = "edit";


            this.gridColumn16.Visible = true;


            this.gridColumn16.VisibleIndex = 7;


            this.gridColumn16.Width = 94;


            // 


            // gridColumn17


            // 


            this.gridColumn17.Caption = "物料条码";


            this.gridColumn17.FieldName = "itemBarCode";


            this.gridColumn17.MinWidth = 25;


            this.gridColumn17.Name = "gridColumn17";


            this.gridColumn17.Visible = true;


            this.gridColumn17.VisibleIndex = 1;


            this.gridColumn17.Width = 94;


            // 


            // gridColumn20


            // 


            this.gridColumn20.Caption = "当前库位";


            this.gridColumn20.FieldName = "qckw";


            this.gridColumn20.MinWidth = 25;


            this.gridColumn20.Name = "gridColumn20";


            this.gridColumn20.Visible = true;


            this.gridColumn20.VisibleIndex = 9;


            this.gridColumn20.Width = 94;


            // 


            // gridColumn21


            // 


            this.gridColumn21.Caption = "复检结果";


            this.gridColumn21.FieldNameSortGroup = "fjjg";


            this.gridColumn21.MinWidth = 25;


            this.gridColumn21.Name = "gridColumn21";


            this.gridColumn21.Visible = true;


            this.gridColumn21.VisibleIndex = 10;


            this.gridColumn21.Width = 94;


            // 


            // gvMxDel


            // 


            this.gvMxDel.Caption = "移出";


            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;


            this.gvMxDel.MinWidth = 25;


            this.gvMxDel.Name = "gvMxDel";


            this.gvMxDel.Visible = true;


            this.gvMxDel.VisibleIndex = 11;


            this.gvMxDel.Width = 94;


            // 


            // repositoryItemButtonEdit1


            // 


            this.repositoryItemButtonEdit1.AutoHeight = false;


            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;


            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;


            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});


            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";


            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;


            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);


            // 


            // tabMxPage2


            // 


            this.tabMxPage2.Controls.Add(this.gcMx2);


            this.tabMxPage2.Name = "tabMxPage2";


            this.tabMxPage2.Size = new System.Drawing.Size(1124, 418);


            this.tabMxPage2.Text = "物料明细";


            // 


            // gcMx2


            // 


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


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


            this.gcMx2.MainView = this.gvMx2;


            this.gcMx2.Name = "gcMx2";


            this.gcMx2.Size = new System.Drawing.Size(1124, 418);


            this.gcMx2.TabIndex = 1;


            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gvMx2});


            // 


            // gvMx2


            // 


            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.mxGuid,


            this.pGuid,


            this.gvMx1itemId,


@@ -865,13 +932,12 @@


            this.gvMx1sqNum,


            this.gvMx1ysNum,


            this.gridColumn4,


            this.gvMx1remark,


            this.gvMxDel});


            this.gvMx1.GridControl = this.gcMx1;


            this.gvMx1.Name = "gvMx1";


            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;


            this.gvMx1.OptionsView.ShowGroupPanel = false;


            this.gvMx1remark});


            this.gvMx2.GridControl = this.gcMx2;


            this.gvMx2.Name = "gvMx2";


            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;


            this.gvMx2.OptionsView.ShowGroupPanel = false;


            // 


            // mxGuid


            // 


@@ -985,238 +1051,6 @@


            this.gvMx1remark.VisibleIndex = 5;


            this.gvMx1remark.Width = 94;


            // 


            // gvMxDel


            // 


            this.gvMxDel.Caption = "移出";


            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;


            this.gvMxDel.MinWidth = 25;


            this.gvMxDel.Name = "gvMxDel";


            this.gvMxDel.Visible = true;


            this.gvMxDel.VisibleIndex = 7;


            this.gvMxDel.Width = 94;


            // 


            // repositoryItemButtonEdit1


            // 


            this.repositoryItemButtonEdit1.AutoHeight = false;


            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;


            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;


            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});


            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";


            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;


            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);


            // 


            // tabMxPage2


            // 


            this.tabMxPage2.Controls.Add(this.gcMx2);


            this.tabMxPage2.Name = "tabMxPage2";


            this.tabMxPage2.Size = new System.Drawing.Size(1124, 418);


            this.tabMxPage2.Text = "条码明细";


            // 


            // gcMx2


            // 


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


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


            this.gcMx2.MainView = this.gvMx2;


            this.gcMx2.Name = "gcMx2";


            this.gcMx2.Size = new System.Drawing.Size(1124, 418);


            this.gcMx2.TabIndex = 1;


            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gvMx2});


            // 


            // gvMx2


            // 


            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gridColumn6,


            this.gridColumn8,


            this.gridColumn9,


            this.gridColumn10,


            this.gridColumn11,


            this.gridColumn12,


            this.gridColumn13,


            this.gridColumn14,


            this.gridColumn15,


            this.gridColumn16,


            this.gridColumn17,


            this.gridColumn18,


            this.gridColumn19,


            this.gridColumn20,


            this.gridColumn21,


            this.gridColumn22,


            this.gridColumn23});


            this.gvMx2.GridControl = this.gcMx2;


            this.gvMx2.Name = "gvMx2";


            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;


            this.gvMx2.OptionsView.ShowGroupPanel = false;


            // 


            // gridColumn6


            // 


            this.gridColumn6.Caption = "明细GUID";


            this.gridColumn6.FieldName = "guid";


            this.gridColumn6.MinWidth = 25;


            this.gridColumn6.Name = "gridColumn6";


            this.gridColumn6.Width = 94;


            // 


            // gridColumn8


            // 


            this.gridColumn8.AppearanceCell.Options.UseFont = true;


            this.gridColumn8.Caption = "主表GUID";


            this.gridColumn8.FieldName = "pGuid";


            this.gridColumn8.MinWidth = 50;


            this.gridColumn8.Name = "gridColumn8";


            this.gridColumn8.Tag = "query_a.MID";


            this.gridColumn8.Width = 94;


            // 


            // gridColumn9


            // 


            this.gridColumn9.AppearanceCell.Options.UseFont = true;


            this.gridColumn9.Caption = "物料ID";


            this.gridColumn9.FieldName = "itemId";


            this.gridColumn9.MinWidth = 50;


            this.gridColumn9.Name = "gridColumn9";


            this.gridColumn9.Tag = "query_a.ITEM_ID";


            this.gridColumn9.Width = 94;


            // 


            // gridColumn10


            // 


            this.gridColumn10.Caption = "物料编码";


            this.gridColumn10.FieldName = "itemNo";


            this.gridColumn10.MinWidth = 25;


            this.gridColumn10.Name = "gridColumn10";


            this.gridColumn10.Visible = true;


            this.gridColumn10.VisibleIndex = 1;


            this.gridColumn10.Width = 94;


            // 


            // gridColumn11


            // 


            this.gridColumn11.Caption = "物料名称";


            this.gridColumn11.FieldName = "itemName";


            this.gridColumn11.MinWidth = 25;


            this.gridColumn11.Name = "gridColumn11";


            this.gridColumn11.Visible = true;


            this.gridColumn11.VisibleIndex = 2;


            this.gridColumn11.Width = 94;


            // 


            // gridColumn12


            // 


            this.gridColumn12.Caption = "物料规格";


            this.gridColumn12.FieldName = "itemModel";


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Visible = true;


            this.gridColumn12.VisibleIndex = 3;


            this.gridColumn12.Width = 94;


            // 


            // gridColumn13


            // 


            this.gridColumn13.AppearanceCell.Options.UseFont = true;


            this.gridColumn13.Caption = "数量";


            this.gridColumn13.FieldName = "gqsl";


            this.gridColumn13.MinWidth = 50;


            this.gridColumn13.Name = "gridColumn13";


            this.gridColumn13.Tag = "yz_quantity_0_edit";


            this.gridColumn13.Visible = true;


            this.gridColumn13.VisibleIndex = 4;


            this.gridColumn13.Width = 94;


            // 


            // gridColumn14


            // 


            this.gridColumn14.AppearanceCell.Options.UseFont = true;


            this.gridColumn14.Caption = "有效期至(复检前)";


            this.gridColumn14.FieldName = "sqsl";


            this.gridColumn14.MinWidth = 50;


            this.gridColumn14.Name = "gridColumn14";


            this.gridColumn14.Tag = "yz_quantity_0_edit";


            this.gridColumn14.Visible = true;


            this.gridColumn14.VisibleIndex = 5;


            this.gridColumn14.Width = 94;


            // 


            // gridColumn15


            // 


            this.gridColumn15.Caption = "重检次数";


            this.gridColumn15.FieldName = "wcsl";


            this.gridColumn15.MinWidth = 25;


            this.gridColumn15.Name = "gridColumn15";


            this.gridColumn15.Visible = true;


            this.gridColumn15.VisibleIndex = 7;


            this.gridColumn15.Width = 94;


            // 


            // gridColumn16


            // 


            this.gridColumn16.AppearanceCell.Options.UseFont = true;


            this.gridColumn16.Caption = "剩余超期天数";


            this.gridColumn16.FieldName = "remark";


            this.gridColumn16.MinWidth = 50;


            this.gridColumn16.Name = "gridColumn16";


            this.gridColumn16.Tag = "edit";


            this.gridColumn16.Visible = true;


            this.gridColumn16.VisibleIndex = 6;


            this.gridColumn16.Width = 94;


            // 


            // gridColumn17


            // 


            this.gridColumn17.Caption = "物料条码";


            this.gridColumn17.MinWidth = 25;


            this.gridColumn17.Name = "gridColumn17";


            this.gridColumn17.Visible = true;


            this.gridColumn17.VisibleIndex = 0;


            this.gridColumn17.Width = 94;


            // 


            // gridColumn18


            // 


            this.gridColumn18.Caption = "送检人";


            this.gridColumn18.MinWidth = 25;


            this.gridColumn18.Name = "gridColumn18";


            this.gridColumn18.Visible = true;


            this.gridColumn18.VisibleIndex = 8;


            this.gridColumn18.Width = 94;


            // 


            // gridColumn19


            // 


            this.gridColumn19.Caption = "送检时间";


            this.gridColumn19.MinWidth = 25;


            this.gridColumn19.Name = "gridColumn19";


            this.gridColumn19.Visible = true;


            this.gridColumn19.VisibleIndex = 9;


            this.gridColumn19.Width = 94;


            // 


            // gridColumn20


            // 


            this.gridColumn20.Caption = "取出库位";


            this.gridColumn20.MinWidth = 25;


            this.gridColumn20.Name = "gridColumn20";


            this.gridColumn20.Visible = true;


            this.gridColumn20.VisibleIndex = 10;


            this.gridColumn20.Width = 94;


            // 


            // gridColumn21


            // 


            this.gridColumn21.Caption = "复检结果";


            this.gridColumn21.MinWidth = 25;


            this.gridColumn21.Name = "gridColumn21";


            this.gridColumn21.Visible = true;


            this.gridColumn21.VisibleIndex = 11;


            this.gridColumn21.Width = 94;


            // 


            // gridColumn22


            // 


            this.gridColumn22.Caption = "有效期至(复检后)";


            this.gridColumn22.MinWidth = 25;


            this.gridColumn22.Name = "gridColumn22";


            this.gridColumn22.Visible = true;


            this.gridColumn22.VisibleIndex = 12;


            this.gridColumn22.Width = 94;


            // 


            // gridColumn23


            // 


            this.gridColumn23.Caption = "gridColumn23";


            this.gridColumn23.MinWidth = 25;


            this.gridColumn23.Name = "gridColumn23";


            this.gridColumn23.Visible = true;


            this.gridColumn23.VisibleIndex = 13;


            this.gridColumn23.Width = 94;


            // 


            // picCheckBox


            // 


            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;


@@ -1227,6 +1061,60 @@


            this.picCheckBox.TabIndex = 8;


            this.picCheckBox.TabStop = false;


            this.picCheckBox.Visible = false;


            // 


            // layoutControlItem11


            // 


            this.layoutControlItem11.Control = this.txt_status;


            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);


            this.layoutControlItem11.Name = "layoutControlItem11";


            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);


            this.layoutControlItem11.Text = "审核标识";


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


            this.layoutControlItem11.TextVisible = false;


            // 


            // layoutControlItem15


            // 


            this.layoutControlItem15.Control = this.lastUpdateTime;


            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);


            this.layoutControlItem15.Name = "layoutControlItem15";


            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);


            this.layoutControlItem15.Text = "最后更新时间";


            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem14


            // 


            this.layoutControlItem14.Control = this.lastUpdateUser;


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


            this.layoutControlItem14.Name = "layoutControlItem14";


            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);


            this.layoutControlItem14.Text = "最后更新人";


            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem5


            // 


            this.layoutControlItem5.Control = this.txt_billType;


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


            this.layoutControlItem5.Name = "layoutControlItem5";


            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);


            this.layoutControlItem5.Text = "申请类型";


            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_remark;


            this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);


            this.layoutControlItem7.Text = "申请备注";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);


            // 


            // Frm_Cqsq


            // 


@@ -1273,11 +1161,6 @@


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


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


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


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


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


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


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


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


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


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


            this.tabMx.ResumeLayout(false);


@@ -1289,6 +1172,11 @@


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


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


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


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


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


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


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


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


            this.ResumeLayout(false);




        }


@@ -1302,17 +1190,12 @@


        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;


        private DevExpress.XtraGrid.Columns.GridColumn gv_status;


        private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;


        private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;


        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;


        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;


        private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;


        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;


        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;


        private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;


        private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;


        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;


        private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;


        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;


        private UserControls.Data.UcPageBar pageBar1;


        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;


@@ -1335,35 +1218,15 @@


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;


        private DevExpress.XtraEditors.TextEdit lastUpdateUser;


        private DevExpress.XtraEditors.TextEdit lastUpdateTime;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;


        private DevExpress.XtraTab.XtraTabControl tabMx;


        private DevExpress.XtraTab.XtraTabPage tabMxPage1;


        private DevExpress.XtraGrid.GridControl gcMx1;


        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;


        private DevExpress.XtraGrid.Columns.GridColumn mxGuid;


        private DevExpress.XtraGrid.Columns.GridColumn pGuid;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;


        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;


        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;


        private DevExpress.XtraEditors.TextEdit txt_guid;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;


        private DevExpress.Utils.ToolTipController tips;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;


        private DevExpress.XtraTab.XtraTabPage tabMxPage2;


        private DevExpress.XtraGrid.GridControl gcMx2;


        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;


        private DevExpress.XtraTab.XtraTabPage tabMxPage1;


        private DevExpress.XtraGrid.GridControl gcMx1;


        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;


@@ -1375,11 +1238,27 @@


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;


        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;


        private DevExpress.XtraTab.XtraTabPage tabMxPage2;


        private DevExpress.XtraGrid.GridControl gcMx2;


        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;


        private DevExpress.XtraGrid.Columns.GridColumn mxGuid;


        private DevExpress.XtraGrid.Columns.GridColumn pGuid;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;


        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;


        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;


    }


}