bug
lu
16 小时以前 da7a62b106c8192140427e243e1d41fca1625838
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -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,12 +80,7 @@
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -106,12 +96,10 @@
            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();
@@ -127,7 +115,11 @@
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            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();
@@ -163,22 +155,22 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).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
@@ -258,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;
@@ -280,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
            // 
@@ -337,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
@@ -385,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
            // 
@@ -445,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
@@ -525,7 +450,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 74);
            this.btnSelect.Location = new System.Drawing.Point(12, 69);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -544,14 +469,14 @@
            // txt_kcOrgId
            // 
            this.txt_kcOrgId.IsReadly = false;
            this.txt_kcOrgId.Location = new System.Drawing.Point(114, 43);
            this.txt_kcOrgId.Location = new System.Drawing.Point(114, 38);
            this.txt_kcOrgId.Name = "txt_kcOrgId";
            this.txt_kcOrgId.Size = new System.Drawing.Size(165, 24);
            this.txt_kcOrgId.TabIndex = 526;
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Location = new System.Drawing.Point(114, 7);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(165, 24);
@@ -562,7 +487,7 @@
            // txt_billType
            // 
            this.txt_billType.EditValue = "-请选择-";
            this.txt_billType.Location = new System.Drawing.Point(385, 43);
            this.txt_billType.Location = new System.Drawing.Point(385, 7);
            this.txt_billType.Name = "txt_billType";
            this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -581,7 +506,7 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
            this.txt_checkDate.Location = new System.Drawing.Point(927, 38);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
@@ -591,16 +516,16 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(385, 74);
            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;
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(927, 7);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
@@ -610,17 +535,17 @@
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(554, 43);
            this.txt_status.Location = new System.Drawing.Point(825, 69);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(267, 24);
            this.txt_status.Size = new System.Drawing.Size(268, 24);
            this.txt_status.StyleController = this.layoutMx1;
            this.txt_status.TabIndex = 528;
            this.txt_status.Tag = "readonly";
            // 
            // lastUpdateUser
            // 
            this.lastUpdateUser.Location = new System.Drawing.Point(385, 12);
            this.lastUpdateUser.Location = new System.Drawing.Point(656, 7);
            this.lastUpdateUser.Name = "lastUpdateUser";
            this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateUser.StyleController = this.layoutMx1;
@@ -629,7 +554,7 @@
            // 
            // lastUpdateTime
            // 
            this.lastUpdateTime.Location = new System.Drawing.Point(656, 12);
            this.lastUpdateTime.Location = new System.Drawing.Point(656, 38);
            this.lastUpdateTime.Name = "lastUpdateTime";
            this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateTime.StyleController = this.layoutMx1;
@@ -676,12 +601,12 @@
            this.layoutControlItem2,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem7,
            this.layoutControlItem16,
            this.layoutControlItem5,
            this.layoutControlItem14,
            this.layoutControlItem11,
            this.layoutControlItem15,
            this.layoutControlItem11});
            this.layoutControlItem14,
            this.layoutControlItem5,
            this.layoutControlItem7});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -751,18 +676,6 @@
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.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;
@@ -776,49 +689,6 @@
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_billType;
            this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Text = "申请类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            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, 0);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            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(542, 31);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // tabMx
            // 
@@ -866,12 +736,9 @@
            this.gridColumn15,
            this.gridColumn16,
            this.gridColumn17,
            this.gridColumn18,
            this.gridColumn19,
            this.gridColumn20,
            this.gridColumn21,
            this.gridColumn22,
            this.gridColumn23});
            this.gvMxDel});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -904,6 +771,8 @@
            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
@@ -913,7 +782,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 1;
            this.gridColumn10.VisibleIndex = 2;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn11
@@ -923,7 +792,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 2;
            this.gridColumn11.VisibleIndex = 3;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn12
@@ -933,53 +802,53 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 3;
            this.gridColumn12.VisibleIndex = 4;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
            // 
            this.gridColumn13.AppearanceCell.Options.UseFont = true;
            this.gridColumn13.Caption = "数量";
            this.gridColumn13.FieldName = "gqsl";
            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 = 4;
            this.gridColumn13.VisibleIndex = 5;
            this.gridColumn13.Width = 94;
            // 
            // gridColumn14
            // 
            this.gridColumn14.AppearanceCell.Options.UseFont = true;
            this.gridColumn14.Caption = "有效期至(复检前)";
            this.gridColumn14.FieldName = "sqsl";
            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 = 5;
            this.gridColumn14.VisibleIndex = 6;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
            // 
            this.gridColumn15.Caption = "重检次数";
            this.gridColumn15.FieldName = "wcsl";
            this.gridColumn15.FieldName = "cjcs";
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 7;
            this.gridColumn15.VisibleIndex = 8;
            this.gridColumn15.Width = 94;
            // 
            // gridColumn16
            // 
            this.gridColumn16.AppearanceCell.Options.UseFont = true;
            this.gridColumn16.Caption = "剩余超期天数";
            this.gridColumn16.FieldName = "remark";
            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 = 6;
            this.gridColumn16.VisibleIndex = 7;
            this.gridColumn16.Width = 94;
            // 
            // gridColumn17
@@ -989,63 +858,49 @@
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 0;
            this.gridColumn17.VisibleIndex = 1;
            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.Caption = "当前库位";
            this.gridColumn20.FieldName = "qckw";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 10;
            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 = 11;
            this.gridColumn21.VisibleIndex = 10;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
            // gvMxDel
            // 
            this.gridColumn22.Caption = "有效期至(复检后)";
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 12;
            this.gridColumn22.Width = 94;
            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;
            // 
            // gridColumn23
            // repositoryItemButtonEdit1
            // 
            this.gridColumn23.Caption = "移出";
            this.gridColumn23.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 13;
            this.gridColumn23.Width = 94;
            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
            // 
@@ -1207,16 +1062,59 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // repositoryItemButtonEdit1
            // layoutControlItem11
            // 
            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);
            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
            // 
@@ -1263,22 +1161,22 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).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);
        }
@@ -1292,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;
@@ -1330,7 +1223,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1346,16 +1238,9 @@
        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.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1370,5 +1255,10 @@
        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;
    }
}