lu
2025-03-21 65dad8dd6bd3074dc3267332c813deace2e59c36
异常报告
已修改6个文件
771 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs 232 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs 504 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/licenses.licx 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -62,6 +62,13 @@
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -70,12 +77,12 @@
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_fcheckStatus = new DevExpress.XtraEditors.CheckEdit();
            this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
            this.txt_fType = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.txt_itenModel = new DevExpress.XtraEditors.TextEdit();
            this.txt_dhdh = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
            this.txt_dhdNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
            this.txt_qty = new DevExpress.XtraEditors.TextEdit();
@@ -135,13 +142,6 @@
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -164,12 +164,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckStatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itenModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdh.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qty.Properties)).BeginInit();
@@ -332,7 +332,7 @@
            this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
            this.gv_fstatus.Caption = "审核标识";
            this.gv_fstatus.FieldName = "checkStatus";
            this.gv_fstatus.FieldName = "chkStatus";
            this.gv_fstatus.MaxWidth = 50;
            this.gv_fstatus.MinWidth = 50;
            this.gv_fstatus.Name = "gv_fstatus";
@@ -473,6 +473,76 @@
            this.gridColumn7.VisibleIndex = 10;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn8
            //
            this.gridColumn8.Caption = "物料编码";
            this.gridColumn8.FieldName = "itemNo";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 11;
            this.gridColumn8.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "物料名称";
            this.gridColumn9.FieldName = "itemName";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 12;
            this.gridColumn9.Width = 94;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "物料规格";
            this.gridColumn10.FieldName = "itemModel";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 13;
            this.gridColumn10.Width = 94;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "供应商";
            this.gridColumn11.FieldName = "gysName";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 14;
            this.gridColumn11.Width = 94;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "到货日期";
            this.gridColumn12.FieldName = "dhdDate";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 15;
            this.gridColumn12.Width = 94;
            //
            // gridColumn13
            //
            this.gridColumn13.Caption = "到货单号";
            this.gridColumn13.FieldName = "dhdNo";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 16;
            this.gridColumn13.Width = 94;
            //
            // gridColumn14
            //
            this.gridColumn14.Caption = "检验单号";
            this.gridColumn14.FieldName = "jydNo";
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 17;
            this.gridColumn14.Width = 94;
            //
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -518,12 +588,12 @@
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_checkUser);
            this.layoutMx1.Controls.Add(this.txt_checkDate);
            this.layoutMx1.Controls.Add(this.txt_fcheckStatus);
            this.layoutMx1.Controls.Add(this.txt_chkStatus);
            this.layoutMx1.Controls.Add(this.txt_fType);
            this.layoutMx1.Controls.Add(this.txt_itemNo);
            this.layoutMx1.Controls.Add(this.txt_itemName);
            this.layoutMx1.Controls.Add(this.txt_itenModel);
            this.layoutMx1.Controls.Add(this.txt_dhdh);
            this.layoutMx1.Controls.Add(this.txt_itemModel);
            this.layoutMx1.Controls.Add(this.txt_dhdNo);
            this.layoutMx1.Controls.Add(this.txt_gysNo);
            this.layoutMx1.Controls.Add(this.txt_gysName);
            this.layoutMx1.Controls.Add(this.txt_qty);
@@ -590,14 +660,14 @@
            this.txt_checkDate.TabIndex = 267;
            this.txt_checkDate.Tag = "readonly";
            // 
            // txt_fcheckStatus
            // txt_chkStatus
            // 
            this.txt_fcheckStatus.Location = new System.Drawing.Point(825, 76);
            this.txt_fcheckStatus.Name = "txt_fcheckStatus";
            this.txt_fcheckStatus.Properties.Caption = "审核状态";
            this.txt_fcheckStatus.Size = new System.Drawing.Size(268, 24);
            this.txt_fcheckStatus.StyleController = this.layoutMx1;
            this.txt_fcheckStatus.TabIndex = 461;
            this.txt_chkStatus.Location = new System.Drawing.Point(825, 76);
            this.txt_chkStatus.Name = "txt_chkStatus";
            this.txt_chkStatus.Properties.Caption = "审核状态";
            this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
            this.txt_chkStatus.StyleController = this.layoutMx1;
            this.txt_chkStatus.TabIndex = 461;
            // 
            // txt_fType
            // 
@@ -623,21 +693,21 @@
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 465;
            // 
            // txt_itenModel
            // txt_itemModel
            // 
            this.txt_itenModel.Location = new System.Drawing.Point(656, 44);
            this.txt_itenModel.Name = "txt_itenModel";
            this.txt_itenModel.Size = new System.Drawing.Size(165, 24);
            this.txt_itenModel.StyleController = this.layoutMx1;
            this.txt_itenModel.TabIndex = 466;
            this.txt_itemModel.Location = new System.Drawing.Point(656, 44);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Size = new System.Drawing.Size(165, 24);
            this.txt_itemModel.StyleController = this.layoutMx1;
            this.txt_itemModel.TabIndex = 466;
            // 
            // txt_dhdh
            // txt_dhdNo
            // 
            this.txt_dhdh.Location = new System.Drawing.Point(656, 12);
            this.txt_dhdh.Name = "txt_dhdh";
            this.txt_dhdh.Size = new System.Drawing.Size(165, 24);
            this.txt_dhdh.StyleController = this.layoutMx1;
            this.txt_dhdh.TabIndex = 467;
            this.txt_dhdNo.Location = new System.Drawing.Point(656, 12);
            this.txt_dhdNo.Name = "txt_dhdNo";
            this.txt_dhdNo.Size = new System.Drawing.Size(165, 24);
            this.txt_dhdNo.StyleController = this.layoutMx1;
            this.txt_dhdNo.TabIndex = 467;
            // 
            // txt_gysNo
            // 
@@ -884,7 +954,7 @@
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_itenModel;
            this.layoutControlItem13.Control = this.txt_itemModel;
            this.layoutControlItem13.Location = new System.Drawing.Point(542, 32);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -970,7 +1040,7 @@
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_fcheckStatus;
            this.layoutControlItem6.Control = this.txt_chkStatus;
            this.layoutControlItem6.Location = new System.Drawing.Point(813, 64);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -993,7 +1063,7 @@
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_dhdh;
            this.layoutControlItem14.Control = this.txt_dhdNo;
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1236,7 +1306,7 @@
            this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1reporttime.Caption = "备注";
            this.gvMx1reporttime.FieldName = "daa009";
            this.gvMx1reporttime.FieldName = "remark";
            this.gvMx1reporttime.MinWidth = 50;
            this.gvMx1reporttime.Name = "gvMx1reporttime";
            this.gvMx1reporttime.Tag = "edit";
@@ -1325,76 +1395,6 @@
            this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
            // 
            // gridColumn8
            //
            this.gridColumn8.Caption = "物料编码";
            this.gridColumn8.FieldName = "itemNo";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 11;
            this.gridColumn8.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "物料名称";
            this.gridColumn9.FieldName = "itemName";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 12;
            this.gridColumn9.Width = 94;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "物料规格";
            this.gridColumn10.FieldName = "itemModel";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 13;
            this.gridColumn10.Width = 94;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "供应商";
            this.gridColumn11.FieldName = "gysName";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 14;
            this.gridColumn11.Width = 94;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "到货日期";
            this.gridColumn12.FieldName = "dhdDate";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 15;
            this.gridColumn12.Width = 94;
            //
            // gridColumn13
            //
            this.gridColumn13.Caption = "到货单号";
            this.gridColumn13.FieldName = "dhdNo";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 16;
            this.gridColumn13.Width = 94;
            //
            // gridColumn14
            //
            this.gridColumn14.Caption = "检验单号";
            this.gridColumn14.FieldName = "jydNo";
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 17;
            this.gridColumn14.Width = 94;
            //
            // MesQcExceptional
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1427,12 +1427,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckStatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itenModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdh.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qty.Properties)).EndInit();
@@ -1515,7 +1515,7 @@
        private DevExpress.XtraEditors.TextEdit txt_checkUser;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.CheckEdit txt_fcheckStatus;
        private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraTab.XtraTabControl tabMx;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1544,11 +1544,11 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraEditors.TextEdit txt_itenModel;
        private DevExpress.XtraEditors.TextEdit txt_itemModel;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraEditors.TextEdit txt_dhdh;
        private DevExpress.XtraEditors.TextEdit txt_dhdNo;
        private DevExpress.XtraEditors.TextEdit txt_gysNo;
        private DevExpress.XtraEditors.TextEdit txt_gysName;
        private DevExpress.XtraEditors.TextEdit txt_qty;
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -29,23 +29,8 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagIncludeDocCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagSpilitNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_resetZero = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_noLength = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ruleFormat = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_docCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_resetZero = new DevExpress.XtraEditors.CheckEdit();
@@ -73,12 +58,25 @@
            this.txt_docCode = new DevExpress.XtraEditors.LookUpEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_docCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ruleFormat = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_noLength = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagSpilitNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_resetZero = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_flagIncludeDocCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_resetZero.Properties)).BeginInit();
@@ -94,125 +92,22 @@
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).BeginInit();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
            this.split1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
            this.split1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            //
            // gv_createdBy
            //
            this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createdBy.AppearanceCell.Options.UseFont = true;
            this.gv_createdBy.Caption = "建立者";
            this.gv_createdBy.FieldName = "createBy";
            this.gv_createdBy.MinWidth = 10;
            this.gv_createdBy.Name = "gv_createdBy";
            this.gv_createdBy.OptionsColumn.AllowEdit = false;
            this.gv_createdBy.Tag = "query_check_by";
            this.gv_createdBy.Visible = true;
            this.gv_createdBy.VisibleIndex = 7;
            this.gv_createdBy.Width = 94;
            //
            // gv_createDate
            //
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "建立日期";
            this.gv_createDate.FieldName = "createTime";
            this.gv_createDate.MinWidth = 10;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_check_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 8;
            this.gv_createDate.Width = 180;
            //
            // gv_flagIncludeDocCode
            //
            this.gv_flagIncludeDocCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagIncludeDocCode.AppearanceCell.Options.UseFont = true;
            this.gv_flagIncludeDocCode.Caption = "包含单据类型";
            this.gv_flagIncludeDocCode.FieldName = "isIncludeDoc";
            this.gv_flagIncludeDocCode.MinWidth = 10;
            this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
            this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
            this.gv_flagIncludeDocCode.Tag = "query_IS_INCLUDE_DOC";
            this.gv_flagIncludeDocCode.Visible = true;
            this.gv_flagIncludeDocCode.VisibleIndex = 6;
            this.gv_flagIncludeDocCode.Width = 94;
            //
            // gv_flagSpilitNo
            //
            this.gv_flagSpilitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagSpilitNo.AppearanceCell.Options.UseFont = true;
            this.gv_flagSpilitNo.Caption = "序号前分隔符";
            this.gv_flagSpilitNo.FieldName = "isSpilit";
            this.gv_flagSpilitNo.MinWidth = 10;
            this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
            this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
            this.gv_flagSpilitNo.Tag = "query_IS_SPILIT";
            this.gv_flagSpilitNo.Visible = true;
            this.gv_flagSpilitNo.VisibleIndex = 4;
            this.gv_flagSpilitNo.Width = 94;
            //
            // gv_resetZero
            //
            this.gv_resetZero.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_resetZero.AppearanceCell.Options.UseFont = true;
            this.gv_resetZero.Caption = "每天归零";
            this.gv_resetZero.FieldName = "resetZero";
            this.gv_resetZero.MinWidth = 10;
            this.gv_resetZero.Name = "gv_resetZero";
            this.gv_resetZero.OptionsColumn.AllowEdit = false;
            this.gv_resetZero.Tag = "query_RESET_ZERO";
            this.gv_resetZero.Visible = true;
            this.gv_resetZero.VisibleIndex = 5;
            this.gv_resetZero.Width = 94;
            //
            // gv_noLength
            //
            this.gv_noLength.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_noLength.AppearanceCell.Options.UseFont = true;
            this.gv_noLength.Caption = "序号长度";
            this.gv_noLength.FieldName = "noLength";
            this.gv_noLength.MinWidth = 10;
            this.gv_noLength.Name = "gv_noLength";
            this.gv_noLength.OptionsColumn.AllowEdit = false;
            this.gv_noLength.Tag = "query_NO_LENGTH";
            this.gv_noLength.Visible = true;
            this.gv_noLength.VisibleIndex = 3;
            this.gv_noLength.Width = 94;
            //
            // gv_ruleFormat
            //
            this.gv_ruleFormat.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
            this.gv_ruleFormat.Caption = "编码规则";
            this.gv_ruleFormat.FieldName = "docFormat";
            this.gv_ruleFormat.MinWidth = 10;
            this.gv_ruleFormat.Name = "gv_ruleFormat";
            this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
            this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
            this.gv_ruleFormat.Visible = true;
            this.gv_ruleFormat.VisibleIndex = 2;
            this.gv_ruleFormat.Width = 300;
            //
            // gv_docCode
            //
            this.gv_docCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_docCode.AppearanceCell.Options.UseFont = true;
            this.gv_docCode.Caption = "单据类型";
            this.gv_docCode.FieldName = "docCode";
            this.gv_docCode.MinWidth = 10;
            this.gv_docCode.Name = "gv_docCode";
            this.gv_docCode.OptionsColumn.AllowEdit = false;
            this.gv_docCode.Tag = "query_DOC_CODE";
            this.gv_docCode.Visible = true;
            this.gv_docCode.VisibleIndex = 1;
            this.gv_docCode.Width = 150;
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "SYS_DOC_RULE,check_date,check_status,check_by";
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -223,76 +118,6 @@
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1072, 510);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_checkStatus,
            this.gv_docCode,
            this.gv_ruleFormat,
            this.gv_noLength,
            this.gv_flagSpilitNo,
            this.gv_resetZero,
            this.gv_flagIncludeDocCode,
            this.gv_createdBy,
            this.gv_createDate,
            this.gridColumn1,
            this.gridColumn2});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_checkStatus
            //
            this.gv_checkStatus.Caption = "审核";
            this.gv_checkStatus.FieldName = "checkStatus";
            this.gv_checkStatus.MaxWidth = 50;
            this.gv_checkStatus.MinWidth = 50;
            this.gv_checkStatus.Name = "gv_checkStatus";
            this.gv_checkStatus.OptionsColumn.AllowEdit = false;
            this.gv_checkStatus.Tag = "query_check_status";
            this.gv_checkStatus.Visible = true;
            this.gv_checkStatus.VisibleIndex = 0;
            this.gv_checkStatus.Width = 50;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "审核者";
            this.gridColumn1.FieldName = "checkBy";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "审核日期";
            this.gridColumn2.FieldName = "checkDate";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -305,26 +130,6 @@
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1072, 548);
            this.xtraTabPage1.Text = "数据列表";
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 510);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1072, 38);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
            // xtraTabPage2
            // 
@@ -694,6 +499,227 @@
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1072, 548);
            this.xtraTabPage1.Text = "数据列表";
            //
            // split1
            //
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
            //
            // split1.Panel1
            //
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            //
            // split1.Panel2
            //
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1072, 548);
            this.split1.SplitterPosition = 536;
            this.split1.TabIndex = 4;
            //
            // gcMain1
            //
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1072, 498);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_checkStatus,
            this.gv_docCode,
            this.gv_ruleFormat,
            this.gv_noLength,
            this.gv_flagSpilitNo,
            this.gv_resetZero,
            this.gv_flagIncludeDocCode,
            this.gv_createdBy,
            this.gv_createDate,
            this.gridColumn1,
            this.gridColumn2});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_checkStatus
            //
            this.gv_checkStatus.Caption = "审核";
            this.gv_checkStatus.FieldName = "checkStatus";
            this.gv_checkStatus.MaxWidth = 50;
            this.gv_checkStatus.MinWidth = 50;
            this.gv_checkStatus.Name = "gv_checkStatus";
            this.gv_checkStatus.OptionsColumn.AllowEdit = false;
            this.gv_checkStatus.Tag = "query_check_status";
            this.gv_checkStatus.Visible = true;
            this.gv_checkStatus.VisibleIndex = 0;
            this.gv_checkStatus.Width = 50;
            //
            // gv_docCode
            //
            this.gv_docCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_docCode.AppearanceCell.Options.UseFont = true;
            this.gv_docCode.Caption = "单据类型";
            this.gv_docCode.FieldName = "docCode";
            this.gv_docCode.MinWidth = 10;
            this.gv_docCode.Name = "gv_docCode";
            this.gv_docCode.OptionsColumn.AllowEdit = false;
            this.gv_docCode.Tag = "query_DOC_CODE";
            this.gv_docCode.Visible = true;
            this.gv_docCode.VisibleIndex = 1;
            this.gv_docCode.Width = 150;
            //
            // gv_ruleFormat
            //
            this.gv_ruleFormat.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
            this.gv_ruleFormat.Caption = "编码规则";
            this.gv_ruleFormat.FieldName = "docFormat";
            this.gv_ruleFormat.MinWidth = 10;
            this.gv_ruleFormat.Name = "gv_ruleFormat";
            this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
            this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
            this.gv_ruleFormat.Visible = true;
            this.gv_ruleFormat.VisibleIndex = 2;
            this.gv_ruleFormat.Width = 300;
            //
            // gv_noLength
            //
            this.gv_noLength.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_noLength.AppearanceCell.Options.UseFont = true;
            this.gv_noLength.Caption = "序号长度";
            this.gv_noLength.FieldName = "noLength";
            this.gv_noLength.MinWidth = 10;
            this.gv_noLength.Name = "gv_noLength";
            this.gv_noLength.OptionsColumn.AllowEdit = false;
            this.gv_noLength.Tag = "query_NO_LENGTH";
            this.gv_noLength.Visible = true;
            this.gv_noLength.VisibleIndex = 3;
            this.gv_noLength.Width = 94;
            //
            // gv_flagSpilitNo
            //
            this.gv_flagSpilitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagSpilitNo.AppearanceCell.Options.UseFont = true;
            this.gv_flagSpilitNo.Caption = "序号前分隔符";
            this.gv_flagSpilitNo.FieldName = "isSpilit";
            this.gv_flagSpilitNo.MinWidth = 10;
            this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
            this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
            this.gv_flagSpilitNo.Tag = "query_IS_SPILIT";
            this.gv_flagSpilitNo.Visible = true;
            this.gv_flagSpilitNo.VisibleIndex = 4;
            this.gv_flagSpilitNo.Width = 94;
            //
            // gv_resetZero
            //
            this.gv_resetZero.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_resetZero.AppearanceCell.Options.UseFont = true;
            this.gv_resetZero.Caption = "每天归零";
            this.gv_resetZero.FieldName = "resetZero";
            this.gv_resetZero.MinWidth = 10;
            this.gv_resetZero.Name = "gv_resetZero";
            this.gv_resetZero.OptionsColumn.AllowEdit = false;
            this.gv_resetZero.Tag = "query_RESET_ZERO";
            this.gv_resetZero.Visible = true;
            this.gv_resetZero.VisibleIndex = 5;
            this.gv_resetZero.Width = 94;
            //
            // gv_flagIncludeDocCode
            //
            this.gv_flagIncludeDocCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_flagIncludeDocCode.AppearanceCell.Options.UseFont = true;
            this.gv_flagIncludeDocCode.Caption = "包含单据类型";
            this.gv_flagIncludeDocCode.FieldName = "isIncludeDoc";
            this.gv_flagIncludeDocCode.MinWidth = 10;
            this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
            this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
            this.gv_flagIncludeDocCode.Tag = "query_IS_INCLUDE_DOC";
            this.gv_flagIncludeDocCode.Visible = true;
            this.gv_flagIncludeDocCode.VisibleIndex = 6;
            this.gv_flagIncludeDocCode.Width = 94;
            //
            // gv_createdBy
            //
            this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createdBy.AppearanceCell.Options.UseFont = true;
            this.gv_createdBy.Caption = "建立者";
            this.gv_createdBy.FieldName = "createBy";
            this.gv_createdBy.MinWidth = 10;
            this.gv_createdBy.Name = "gv_createdBy";
            this.gv_createdBy.OptionsColumn.AllowEdit = false;
            this.gv_createdBy.Tag = "query_check_by";
            this.gv_createdBy.Visible = true;
            this.gv_createdBy.VisibleIndex = 7;
            this.gv_createdBy.Width = 94;
            //
            // gv_createDate
            //
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "建立日期";
            this.gv_createDate.FieldName = "createTime";
            this.gv_createDate.MinWidth = 10;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_check_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 8;
            this.gv_createDate.Width = 180;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "审核者";
            this.gridColumn1.FieldName = "checkBy";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "审核日期";
            this.gridColumn2.FieldName = "checkDate";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 94;
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 498);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1072, 38);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            //
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -715,11 +741,8 @@
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "DocNoRule";
            this.Text = "编码规则";
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            this.xtraTabPage2.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
@@ -737,29 +760,25 @@
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).EndInit();
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
            this.split1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
            this.split1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private UserControls.Data.UcPageBar pageBar1;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_flagIncludeDocCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_flagSpilitNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_resetZero;
        private DevExpress.XtraGrid.Columns.GridColumn gv_noLength;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ruleFormat;
        private DevExpress.XtraGrid.Columns.GridColumn gv_docCode;
        private DevExpress.XtraEditors.LabelControl labelControl7;
        private DevExpress.XtraEditors.CheckEdit txt_isIncludeDoc;
        private DevExpress.XtraEditors.CheckEdit txt_isSpilit;
@@ -781,11 +800,24 @@
        private DevExpress.XtraEditors.LabelControl labelControl8;
        private System.Windows.Forms.NumericUpDown txt_noLength;
        private DevExpress.XtraEditors.CheckEdit txt_resetZero;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraEditors.LabelControl labelControl9;
        private DevExpress.XtraEditors.ComboBoxEdit txxtItem5;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;
        private DevExpress.XtraGrid.Columns.GridColumn gv_docCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ruleFormat;
        private DevExpress.XtraGrid.Columns.GridColumn gv_noLength;
        private DevExpress.XtraGrid.Columns.GridColumn gv_flagSpilitNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_resetZero;
        private DevExpress.XtraGrid.Columns.GridColumn gv_flagIncludeDocCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private UserControls.Data.UcPageBar pageBar1;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -288,9 +288,9 @@
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gcMain.DataSource = dt;
                    gcMain.ForceInitialize();
                    gcMain1.BindingContext = new BindingContext();
                    gcMain1.DataSource = dt;
                    gcMain1.ForceInitialize();
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -147,7 +147,7 @@
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1235, 629);
            this.split1.SplitterPosition = 616;
            this.split1.SplitterPosition = 617;
            this.split1.TabIndex = 0;
            // 
            // gcMain1
@@ -159,7 +159,7 @@
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMain1.Size = new System.Drawing.Size(1235, 576);
            this.gcMain1.Size = new System.Drawing.Size(1235, 577);
            this.gcMain1.TabIndex = 6;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -266,7 +266,7 @@
            // 
            this.pageBar1.CurrentPage = 0;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 576);
            this.pageBar1.Location = new System.Drawing.Point(0, 577);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -189,7 +189,7 @@
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
            //txt_password.Visible = lbPwd.Visible = true;
            txt_password.Enabled =true;
            txt_account.Enabled = txt_password.Enabled = true;
        }
@@ -324,9 +324,7 @@
                    var dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
                    //txt_account.Enabled = txt_password.Enabled =
                    //    //txt_password.Visible =
                        //    lbPwd.Visible = tipPwd.Visible = false;
                    txt_account.Enabled = txt_password.Enabled = txt_password.Enabled = false;
                }
                else
                {
DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,13 +1,14 @@
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a