改了组织表

lu

2024-10-31 9c2dd09bc32849ed4adaf6763ddec140b16bc5a3

改了组织表

 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs

@@ -32,7 +32,7 @@
        /// </summary>
        private void getTree()
        {
            var pgq = new PageQueryModel(1, 999999, "factory", "asc", "",
            var pgq = new PageQueryModel(1, 999999, "FID", "asc", "",
                " and IS_STATUS=1");
            var json = JsonConvert.SerializeObject(pgq);
            try
@@ -114,8 +114,7 @@
                        _login["loginOrgGuid"].ToString();
                    LoginInfoModel.CurrentUser.LoginTime =
                        DateTime.Now.ToString("yyyy-MM-dd hh:mm");
                    LoginInfoModel.CurrentUser.LoginFactory =
                        _login["loginFactory"].ToString();
                  
                    DialogResult = DialogResult.OK;
                }
                else

 DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs

@@ -51,7 +51,6 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -60,6 +59,9 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -236,7 +238,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.chkParameter = "MES_SYS_LOOKUP_TYPES,check_date,check_status,check_by";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -267,6 +269,8 @@
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_lookupTypeCode,
            this.gv_lookupTypeName,
            this.gridColumn5,
            this.gridColumn4,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
@@ -274,14 +278,6 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "gridColumn1";
            this.gridColumn1.FieldName = "guid";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -369,6 +365,36 @@
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "审核时间";
            this.gridColumn1.FieldName = "checkDate";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "审核人";
            this.gridColumn4.FieldName = "checkBy";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "审核状态";
            this.gridColumn5.FieldName = "checkSatus";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 94;
            // 
            // Frm_IQCLookups
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -422,8 +448,10 @@
        private DevExpress.XtraEditors.TextEdit txt_lookupTypeCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeCode;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs

@@ -10,7 +10,6 @@
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

@@ -28,9 +27,9 @@
            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            getPageList(1, UtilityHelper.GetPageSize());
            pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -73,32 +72,35 @@
        {
            getPageList(curPage, pageSize);
        }

      
        /// <summary>
        ///     查询事件
        ///     反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            var frm =
                new ShowFilter(gridView1.Columns,
                    _filterList);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_lookupTypeCode, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }

        /// <summary>
        ///     查询回调
        ///     审核事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_lookupTypeCode, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }

        /// <summary>
        ///     取消事件
        /// </summary>
@@ -108,49 +110,7 @@
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }

        /// <summary>
        ///     删除事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_lookupTypeCode, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }

            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                return;
            var lst = new List<dynamic>();
            lst.Add(rowGuid);
            var _obj = lst;
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "DeleteModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn =
                    UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }

                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }

 
        /// <summary>
        ///     刷新事件
        /// </summary>
@@ -177,7 +137,6 @@
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }

            getModel(rowGuid, true, 1);
        }

@@ -215,7 +174,6 @@

            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();

            var lst = new List<MesSysLookups>();
            for (var i = 0; i < gvMx1.DataRowCount; i++)
            {
@@ -250,8 +208,7 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(panel1.Controls,
                        false);
                    getModel(lbGuid.Text, false, 1);
                }
            }
            catch (Exception ex)

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs

@@ -157,7 +157,6 @@
            this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = 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();
@@ -819,7 +818,7 @@
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.Tag = "query_a.remarks";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 63;
            this.gv_remarks.VisibleIndex = 62;
            this.gv_remarks.Width = 94;
            // 
            // gv_itemId
@@ -833,7 +832,7 @@
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.item_id";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 62;
            this.gv_itemId.VisibleIndex = 61;
            this.gv_itemId.Width = 94;
            // 
            // gv_qualityAudit
@@ -847,7 +846,7 @@
            this.gv_qualityAudit.OptionsColumn.AllowEdit = false;
            this.gv_qualityAudit.Tag = "query_a.quality_audit";
            this.gv_qualityAudit.Visible = true;
            this.gv_qualityAudit.VisibleIndex = 61;
            this.gv_qualityAudit.VisibleIndex = 60;
            this.gv_qualityAudit.Width = 94;
            // 
            // gv_lineK3id
@@ -861,7 +860,7 @@
            this.gv_lineK3id.OptionsColumn.AllowEdit = false;
            this.gv_lineK3id.Tag = "query_a.line_k3id";
            this.gv_lineK3id.Visible = true;
            this.gv_lineK3id.VisibleIndex = 60;
            this.gv_lineK3id.VisibleIndex = 59;
            this.gv_lineK3id.Width = 94;
            // 
            // gv_ebelnK3id
@@ -875,7 +874,7 @@
            this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
            this.gv_ebelnK3id.Tag = "query_a.ebeln_k3id";
            this.gv_ebelnK3id.Visible = true;
            this.gv_ebelnK3id.VisibleIndex = 59;
            this.gv_ebelnK3id.VisibleIndex = 58;
            this.gv_ebelnK3id.Width = 94;
            // 
            // gv_iqcDate
@@ -889,7 +888,7 @@
            this.gv_iqcDate.OptionsColumn.AllowEdit = false;
            this.gv_iqcDate.Tag = "query_a.iqc_date";
            this.gv_iqcDate.Visible = true;
            this.gv_iqcDate.VisibleIndex = 58;
            this.gv_iqcDate.VisibleIndex = 57;
            this.gv_iqcDate.Width = 94;
            // 
            // gv_states
@@ -903,7 +902,7 @@
            this.gv_states.OptionsColumn.AllowEdit = false;
            this.gv_states.Tag = "query_a.states";
            this.gv_states.Visible = true;
            this.gv_states.VisibleIndex = 57;
            this.gv_states.VisibleIndex = 56;
            this.gv_states.Width = 94;
            // 
            // gv_msg
@@ -917,7 +916,7 @@
            this.gv_msg.OptionsColumn.AllowEdit = false;
            this.gv_msg.Tag = "query_a.msg";
            this.gv_msg.Visible = true;
            this.gv_msg.VisibleIndex = 56;
            this.gv_msg.VisibleIndex = 55;
            this.gv_msg.Width = 94;
            // 
            // gv_fmrmode
@@ -931,7 +930,7 @@
            this.gv_fmrmode.OptionsColumn.AllowEdit = false;
            this.gv_fmrmode.Tag = "query_a.fmrmode";
            this.gv_fmrmode.Visible = true;
            this.gv_fmrmode.VisibleIndex = 55;
            this.gv_fmrmode.VisibleIndex = 54;
            this.gv_fmrmode.Width = 94;
            // 
            // lb_lifnr
@@ -964,7 +963,7 @@
            this.gv_lifnr.OptionsColumn.AllowEdit = false;
            this.gv_lifnr.Tag = "query_a.lifnr";
            this.gv_lifnr.Visible = true;
            this.gv_lifnr.VisibleIndex = 54;
            this.gv_lifnr.VisibleIndex = 53;
            this.gv_lifnr.Width = 94;
            // 
            // gv_dhb001
@@ -978,7 +977,7 @@
            this.gv_dhb001.OptionsColumn.AllowEdit = false;
            this.gv_dhb001.Tag = "query_a.dhb001";
            this.gv_dhb001.Visible = true;
            this.gv_dhb001.VisibleIndex = 53;
            this.gv_dhb001.VisibleIndex = 52;
            this.gv_dhb001.Width = 94;
            // 
            // gv_dhb002
@@ -992,7 +991,7 @@
            this.gv_dhb002.OptionsColumn.AllowEdit = false;
            this.gv_dhb002.Tag = "query_a.dhb002";
            this.gv_dhb002.Visible = true;
            this.gv_dhb002.VisibleIndex = 52;
            this.gv_dhb002.VisibleIndex = 51;
            this.gv_dhb002.Width = 94;
            // 
            // gv_dha018
@@ -1006,7 +1005,7 @@
            this.gv_dha018.OptionsColumn.AllowEdit = false;
            this.gv_dha018.Tag = "query_a.dha018";
            this.gv_dha018.Visible = true;
            this.gv_dha018.VisibleIndex = 51;
            this.gv_dha018.VisibleIndex = 50;
            this.gv_dha018.Width = 94;
            // 
            // gv_workNo
@@ -1020,7 +1019,7 @@
            this.gv_workNo.OptionsColumn.AllowEdit = false;
            this.gv_workNo.Tag = "query_a.work_no";
            this.gv_workNo.Visible = true;
            this.gv_workNo.VisibleIndex = 50;
            this.gv_workNo.VisibleIndex = 49;
            this.gv_workNo.Width = 94;
            // 
            // gv_boardStyle
@@ -1034,7 +1033,7 @@
            this.gv_boardStyle.OptionsColumn.AllowEdit = false;
            this.gv_boardStyle.Tag = "query_a.board_style";
            this.gv_boardStyle.Visible = true;
            this.gv_boardStyle.VisibleIndex = 49;
            this.gv_boardStyle.VisibleIndex = 48;
            this.gv_boardStyle.Width = 94;
            // 
            // gv_lotNo2
@@ -1048,7 +1047,7 @@
            this.gv_lotNo2.OptionsColumn.AllowEdit = false;
            this.gv_lotNo2.Tag = "query_a.lot_no2";
            this.gv_lotNo2.Visible = true;
            this.gv_lotNo2.VisibleIndex = 48;
            this.gv_lotNo2.VisibleIndex = 47;
            this.gv_lotNo2.Width = 94;
            // 
            // lb_lotNo1
@@ -1081,7 +1080,7 @@
            this.gv_lotNo1.OptionsColumn.AllowEdit = false;
            this.gv_lotNo1.Tag = "query_a.lot_no1";
            this.gv_lotNo1.Visible = true;
            this.gv_lotNo1.VisibleIndex = 47;
            this.gv_lotNo1.VisibleIndex = 46;
            this.gv_lotNo1.Width = 94;
            // 
            // gv_modify1Date1
@@ -1095,7 +1094,7 @@
            this.gv_modify1Date1.OptionsColumn.AllowEdit = false;
            this.gv_modify1Date1.Tag = "query_a.modify1_date1";
            this.gv_modify1Date1.Visible = true;
            this.gv_modify1Date1.VisibleIndex = 46;
            this.gv_modify1Date1.VisibleIndex = 45;
            this.gv_modify1Date1.Width = 94;
            // 
            // gv_modify1By1
@@ -1109,7 +1108,7 @@
            this.gv_modify1By1.OptionsColumn.AllowEdit = false;
            this.gv_modify1By1.Tag = "query_a.modify1_by1";
            this.gv_modify1By1.Visible = true;
            this.gv_modify1By1.VisibleIndex = 45;
            this.gv_modify1By1.VisibleIndex = 44;
            this.gv_modify1By1.Width = 94;
            // 
            // gv_modify1Flag1
@@ -1123,7 +1122,7 @@
            this.gv_modify1Flag1.OptionsColumn.AllowEdit = false;
            this.gv_modify1Flag1.Tag = "query_a.modify1_flag1";
            this.gv_modify1Flag1.Visible = true;
            this.gv_modify1Flag1.VisibleIndex = 44;
            this.gv_modify1Flag1.VisibleIndex = 43;
            this.gv_modify1Flag1.Width = 94;
            // 
            // gv_maxCheckQty
@@ -1137,7 +1136,7 @@
            this.gv_maxCheckQty.OptionsColumn.AllowEdit = false;
            this.gv_maxCheckQty.Tag = "query_a.max_check_qty";
            this.gv_maxCheckQty.Visible = true;
            this.gv_maxCheckQty.VisibleIndex = 43;
            this.gv_maxCheckQty.VisibleIndex = 42;
            this.gv_maxCheckQty.Width = 94;
            // 
            // gv_fsecondResu
@@ -1151,7 +1150,7 @@
            this.gv_fsecondResu.OptionsColumn.AllowEdit = false;
            this.gv_fsecondResu.Tag = "query_a.fsecond_resu";
            this.gv_fsecondResu.Visible = true;
            this.gv_fsecondResu.VisibleIndex = 42;
            this.gv_fsecondResu.VisibleIndex = 41;
            this.gv_fsecondResu.Width = 94;
            // 
            // gv_company
@@ -1165,7 +1164,7 @@
            this.gv_company.OptionsColumn.AllowEdit = false;
            this.gv_company.Tag = "query_a.company";
            this.gv_company.Visible = true;
            this.gv_company.VisibleIndex = 41;
            this.gv_company.VisibleIndex = 40;
            this.gv_company.Width = 94;
            // 
            // gv_fversion
@@ -1179,7 +1178,7 @@
            this.gv_fversion.OptionsColumn.AllowEdit = false;
            this.gv_fversion.Tag = "query_a.fversion";
            this.gv_fversion.Visible = true;
            this.gv_fversion.VisibleIndex = 40;
            this.gv_fversion.VisibleIndex = 39;
            this.gv_fversion.Width = 94;
            // 
            // gv_fcovertQty
@@ -1193,7 +1192,7 @@
            this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
            this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
            this.gv_fcovertQty.Visible = true;
            this.gv_fcovertQty.VisibleIndex = 39;
            this.gv_fcovertQty.VisibleIndex = 38;
            this.gv_fcovertQty.Width = 94;
            // 
            // gv_fmanageNo
@@ -1207,7 +1206,7 @@
            this.gv_fmanageNo.OptionsColumn.AllowEdit = false;
            this.gv_fmanageNo.Tag = "query_a.fmanage_no";
            this.gv_fmanageNo.Visible = true;
            this.gv_fmanageNo.VisibleIndex = 38;
            this.gv_fmanageNo.VisibleIndex = 37;
            this.gv_fmanageNo.Width = 94;
            // 
            // lb_fngHandle
@@ -1240,7 +1239,7 @@
            this.gv_fngHandle.OptionsColumn.AllowEdit = false;
            this.gv_fngHandle.Tag = "query_a.fng_handle";
            this.gv_fngHandle.Visible = true;
            this.gv_fngHandle.VisibleIndex = 37;
            this.gv_fngHandle.VisibleIndex = 36;
            this.gv_fngHandle.Width = 94;
            // 
            // gv_fgearStand
@@ -1254,7 +1253,7 @@
            this.gv_fgearStand.OptionsColumn.AllowEdit = false;
            this.gv_fgearStand.Tag = "query_a.fgear_stand";
            this.gv_fgearStand.Visible = true;
            this.gv_fgearStand.VisibleIndex = 36;
            this.gv_fgearStand.VisibleIndex = 35;
            this.gv_fgearStand.Width = 94;
            // 
            // gv_fexemption
@@ -1268,7 +1267,7 @@
            this.gv_fexemption.OptionsColumn.AllowEdit = false;
            this.gv_fexemption.Tag = "query_a.fexemption";
            this.gv_fexemption.Visible = true;
            this.gv_fexemption.VisibleIndex = 35;
            this.gv_fexemption.VisibleIndex = 34;
            this.gv_fexemption.Width = 94;
            // 
            // gv_outDate
@@ -1282,7 +1281,7 @@
            this.gv_outDate.OptionsColumn.AllowEdit = false;
            this.gv_outDate.Tag = "query_a.out_date";
            this.gv_outDate.Visible = true;
            this.gv_outDate.VisibleIndex = 34;
            this.gv_outDate.VisibleIndex = 33;
            this.gv_outDate.Width = 94;
            // 
            // gv_itemUnit
@@ -1296,7 +1295,7 @@
            this.gv_itemUnit.OptionsColumn.AllowEdit = false;
            this.gv_itemUnit.Tag = "query_a.item_unit";
            this.gv_itemUnit.Visible = true;
            this.gv_itemUnit.VisibleIndex = 33;
            this.gv_itemUnit.VisibleIndex = 32;
            this.gv_itemUnit.Width = 94;
            // 
            // gv_ftype
@@ -1310,7 +1309,7 @@
            this.gv_ftype.OptionsColumn.AllowEdit = false;
            this.gv_ftype.Tag = "query_a.ftype";
            this.gv_ftype.Visible = true;
            this.gv_ftype.VisibleIndex = 32;
            this.gv_ftype.VisibleIndex = 31;
            this.gv_ftype.Width = 94;
            // 
            // gv_fcheckAccord
@@ -1324,7 +1323,7 @@
            this.gv_fcheckAccord.OptionsColumn.AllowEdit = false;
            this.gv_fcheckAccord.Tag = "query_a.fcheck_accord";
            this.gv_fcheckAccord.Visible = true;
            this.gv_fcheckAccord.VisibleIndex = 31;
            this.gv_fcheckAccord.VisibleIndex = 30;
            this.gv_fcheckAccord.Width = 94;
            // 
            // gv_fsubmit
@@ -1338,7 +1337,7 @@
            this.gv_fsubmit.OptionsColumn.AllowEdit = false;
            this.gv_fsubmit.Tag = "query_a.fsubmit";
            this.gv_fsubmit.Visible = true;
            this.gv_fsubmit.VisibleIndex = 30;
            this.gv_fsubmit.VisibleIndex = 29;
            this.gv_fsubmit.Width = 94;
            // 
            // gv_fcancel
@@ -1352,7 +1351,7 @@
            this.gv_fcancel.OptionsColumn.AllowEdit = false;
            this.gv_fcancel.Tag = "query_a.fcancel";
            this.gv_fcancel.Visible = true;
            this.gv_fcancel.VisibleIndex = 29;
            this.gv_fcancel.VisibleIndex = 28;
            this.gv_fcancel.Width = 94;
            // 
            // gv_fthirdRep
@@ -1366,7 +1365,7 @@
            this.gv_fthirdRep.OptionsColumn.AllowEdit = false;
            this.gv_fthirdRep.Tag = "query_a.fthird_rep";
            this.gv_fthirdRep.Visible = true;
            this.gv_fthirdRep.VisibleIndex = 28;
            this.gv_fthirdRep.VisibleIndex = 27;
            this.gv_fthirdRep.Width = 94;
            // 
            // gv_fcheckRepno
@@ -1380,7 +1379,7 @@
            this.gv_fcheckRepno.OptionsColumn.AllowEdit = false;
            this.gv_fcheckRepno.Tag = "query_a.fcheck_repno";
            this.gv_fcheckRepno.Visible = true;
            this.gv_fcheckRepno.VisibleIndex = 27;
            this.gv_fcheckRepno.VisibleIndex = 26;
            this.gv_fcheckRepno.Width = 94;
            // 
            // gv_factory
@@ -1394,7 +1393,7 @@
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Tag = "query_a.factory";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 26;
            this.gv_factory.VisibleIndex = 25;
            this.gv_factory.Width = 94;
            // 
            // gv_modify1Date
@@ -1408,7 +1407,7 @@
            this.gv_modify1Date.OptionsColumn.AllowEdit = false;
            this.gv_modify1Date.Tag = "query_a.modify1_date";
            this.gv_modify1Date.Visible = true;
            this.gv_modify1Date.VisibleIndex = 25;
            this.gv_modify1Date.VisibleIndex = 24;
            this.gv_modify1Date.Width = 94;
            // 
            // gv_modify1By
@@ -1422,7 +1421,7 @@
            this.gv_modify1By.OptionsColumn.AllowEdit = false;
            this.gv_modify1By.Tag = "query_a.modify1_by";
            this.gv_modify1By.Visible = true;
            this.gv_modify1By.VisibleIndex = 24;
            this.gv_modify1By.VisibleIndex = 23;
            this.gv_modify1By.Width = 94;
            // 
            // gv_modify1Flag
@@ -1436,7 +1435,7 @@
            this.gv_modify1Flag.OptionsColumn.AllowEdit = false;
            this.gv_modify1Flag.Tag = "query_a.modify1_flag";
            this.gv_modify1Flag.Visible = true;
            this.gv_modify1Flag.VisibleIndex = 23;
            this.gv_modify1Flag.VisibleIndex = 22;
            this.gv_modify1Flag.Width = 94;
            // 
            // gv_lastupdateDate
@@ -1450,7 +1449,7 @@
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 22;
            this.gv_lastupdateDate.VisibleIndex = 21;
            this.gv_lastupdateDate.Width = 94;
            // 
            // gv_lastupdateBy
@@ -1464,7 +1463,7 @@
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 21;
            this.gv_lastupdateBy.VisibleIndex = 20;
            this.gv_lastupdateBy.Width = 94;
            // 
            // gv_createDate
@@ -1478,7 +1477,7 @@
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 20;
            this.gv_createDate.VisibleIndex = 19;
            this.gv_createDate.Width = 94;
            // 
            // gv_createBy
@@ -1492,7 +1491,7 @@
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 19;
            this.gv_createBy.VisibleIndex = 18;
            this.gv_createBy.Width = 94;
            // 
            // gv_fhandle
@@ -1506,7 +1505,7 @@
            this.gv_fhandle.OptionsColumn.AllowEdit = false;
            this.gv_fhandle.Tag = "query_a.fhandle";
            this.gv_fhandle.Visible = true;
            this.gv_fhandle.VisibleIndex = 18;
            this.gv_fhandle.VisibleIndex = 17;
            this.gv_fhandle.Width = 94;
            // 
            // gv_fmove
@@ -1520,7 +1519,7 @@
            this.gv_fmove.OptionsColumn.AllowEdit = false;
            this.gv_fmove.Tag = "query_a.fmove";
            this.gv_fmove.Visible = true;
            this.gv_fmove.VisibleIndex = 17;
            this.gv_fmove.VisibleIndex = 16;
            this.gv_fmove.Width = 94;
            // 
            // gv_lotNo
@@ -1534,7 +1533,7 @@
            this.gv_lotNo.OptionsColumn.AllowEdit = false;
            this.gv_lotNo.Tag = "query_a.lot_no";
            this.gv_lotNo.Visible = true;
            this.gv_lotNo.VisibleIndex = 16;
            this.gv_lotNo.VisibleIndex = 15;
            this.gv_lotNo.Width = 94;
            // 
            // lb_checkQty
@@ -1567,7 +1566,7 @@
            this.gv_checkQty.OptionsColumn.AllowEdit = false;
            this.gv_checkQty.Tag = "query_a.check_qty";
            this.gv_checkQty.Visible = true;
            this.gv_checkQty.VisibleIndex = 15;
            this.gv_checkQty.VisibleIndex = 14;
            this.gv_checkQty.Width = 94;
            // 
            // gv_facLevel
@@ -1581,7 +1580,7 @@
            this.gv_facLevel.OptionsColumn.AllowEdit = false;
            this.gv_facLevel.Tag = "query_a.fac_level";
            this.gv_facLevel.Visible = true;
            this.gv_facLevel.VisibleIndex = 14;
            this.gv_facLevel.VisibleIndex = 13;
            this.gv_facLevel.Width = 94;
            // 
            // gv_fcheckLevel
@@ -1595,7 +1594,7 @@
            this.gv_fcheckLevel.OptionsColumn.AllowEdit = false;
            this.gv_fcheckLevel.Tag = "query_a.fcheck_level";
            this.gv_fcheckLevel.Visible = true;
            this.gv_fcheckLevel.VisibleIndex = 13;
            this.gv_fcheckLevel.VisibleIndex = 12;
            this.gv_fcheckLevel.Width = 94;
            // 
            // gv_sampleSizeNo
@@ -1609,7 +1608,7 @@
            this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false;
            this.gv_sampleSizeNo.Tag = "query_a.sample_size_no";
            this.gv_sampleSizeNo.Visible = true;
            this.gv_sampleSizeNo.VisibleIndex = 12;
            this.gv_sampleSizeNo.VisibleIndex = 11;
            this.gv_sampleSizeNo.Width = 94;
            // 
            // gv_freview
@@ -1623,7 +1622,7 @@
            this.gv_freview.OptionsColumn.AllowEdit = false;
            this.gv_freview.Tag = "query_a.freview";
            this.gv_freview.Visible = true;
            this.gv_freview.VisibleIndex = 11;
            this.gv_freview.VisibleIndex = 10;
            this.gv_freview.Width = 94;
            // 
            // lb_fcheckResu
@@ -1656,7 +1655,7 @@
            this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
            this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
            this.gv_fcheckResu.Visible = true;
            this.gv_fcheckResu.VisibleIndex = 10;
            this.gv_fcheckResu.VisibleIndex = 9;
            this.gv_fcheckResu.Width = 94;
            // 
            // gv_fngDesc
@@ -1670,7 +1669,7 @@
            this.gv_fngDesc.OptionsColumn.AllowEdit = false;
            this.gv_fngDesc.Tag = "query_a.fng_desc";
            this.gv_fngDesc.Visible = true;
            this.gv_fngDesc.VisibleIndex = 9;
            this.gv_fngDesc.VisibleIndex = 8;
            this.gv_fngDesc.Width = 94;
            // 
            // gv_suppNo
@@ -1684,7 +1683,7 @@
            this.gv_suppNo.OptionsColumn.AllowEdit = false;
            this.gv_suppNo.Tag = "query_a.supp_no";
            this.gv_suppNo.Visible = true;
            this.gv_suppNo.VisibleIndex = 8;
            this.gv_suppNo.VisibleIndex = 7;
            this.gv_suppNo.Width = 94;
            // 
            // lb_freceQty
@@ -1717,7 +1716,7 @@
            this.gv_freceQty.OptionsColumn.AllowEdit = false;
            this.gv_freceQty.Tag = "query_a.frece_qty";
            this.gv_freceQty.Visible = true;
            this.gv_freceQty.VisibleIndex = 7;
            this.gv_freceQty.VisibleIndex = 6;
            this.gv_freceQty.Width = 94;
            // 
            // lb_fbatchQty
@@ -1750,7 +1749,7 @@
            this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
            this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
            this.gv_fbatchQty.Visible = true;
            this.gv_fbatchQty.VisibleIndex = 6;
            this.gv_fbatchQty.VisibleIndex = 5;
            this.gv_fbatchQty.Width = 94;
            // 
            // gv_itemNo
@@ -1764,7 +1763,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_a.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 5;
            this.gv_itemNo.VisibleIndex = 4;
            this.gv_itemNo.Width = 94;
            // 
            // lb_fcheckBy
@@ -1797,7 +1796,7 @@
            this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
            this.gv_fcheckBy.Tag = "query_a.fcheck_by";
            this.gv_fcheckBy.Visible = true;
            this.gv_fcheckBy.VisibleIndex = 4;
            this.gv_fcheckBy.VisibleIndex = 3;
            this.gv_fcheckBy.Width = 94;
            // 
            // lb_fcheckDate
@@ -1830,7 +1829,7 @@
            this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
            this.gv_fcheckDate.Tag = "query_a.fcheck_date";
            this.gv_fcheckDate.Visible = true;
            this.gv_fcheckDate.VisibleIndex = 3;
            this.gv_fcheckDate.VisibleIndex = 2;
            this.gv_fcheckDate.Width = 94;
            // 
            // lb_releaseNo
@@ -1863,36 +1862,22 @@
            this.gv_releaseNo.OptionsColumn.AllowEdit = false;
            this.gv_releaseNo.Tag = "query_a.release_no";
            this.gv_releaseNo.Visible = true;
            this.gv_releaseNo.VisibleIndex = 2;
            this.gv_releaseNo.VisibleIndex = 1;
            this.gv_releaseNo.Width = 94;
            // 
            // gv_id
            // 
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "id ";
            this.gv_id.Caption = "id";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 1;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "guid ";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Visible = true;
            this.gv_guid.VisibleIndex = 0;
            this.gv_guid.Width = 94;
            // 
            // toolBarMenu1
            // 
@@ -1925,7 +1910,6 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
            this.gv_id,
            this.gv_releaseNo,
            this.gv_fcheckDate,
@@ -2447,7 +2431,6 @@
        private DevExpress.XtraEditors.TextEdit txt_releaseNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.SimpleButton btnUp;

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs

@@ -51,7 +51,6 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -60,6 +59,9 @@
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -236,7 +238,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.chkParameter = "MES_SYS_LOOKUP_TYPES,check_date,check_status,check_by";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -267,6 +269,8 @@
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_lookupTypeCode,
            this.gv_lookupTypeName,
            this.gridColumn5,
            this.gridColumn4,
            this.gridColumn1});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
@@ -274,14 +278,6 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "gridColumn1";
            this.gridColumn1.FieldName = "guid";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -369,6 +365,36 @@
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "审核时间";
            this.gridColumn1.FieldName = "checkDate";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "审核人";
            this.gridColumn4.FieldName = "checkBy";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "审核状态";
            this.gridColumn5.FieldName = "checkSatus";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 94;
            // 
            // Frm_MesSysLookups
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -422,8 +448,10 @@
private DevExpress.XtraEditors.TextEdit txt_lookupTypeCode;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lookupTypeCode;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs

@@ -6,6 +6,7 @@
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
@@ -27,6 +28,8 @@
            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            getPageList(1, UtilityHelper.GetPageSize());
            pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -69,7 +72,34 @@
        {
            getPageList(curPage, pageSize);
        }
        /// <summary>
        ///     反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_lookupTypeCode, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }

        /// <summary>
        ///     审核事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_lookupTypeCode, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        ///     取消事件
        /// </summary>
@@ -124,7 +154,6 @@
                txt_lookupTypeCode.Focus();
                return;
            }

            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            var lst = new List<MesSysLookups>();
@@ -159,8 +188,7 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(panel1.Controls,
                        false);
                    getModel(lbGuid.Text, false, 1);
                }
            }
            catch (Exception ex)

 DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs

@@ -41,7 +41,7 @@
            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
@@ -60,7 +60,7 @@
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -217,15 +217,16 @@
            this.labelControl13.TabIndex = 139;
            this.labelControl13.Text = "审核人：";
            // 
            // labelControl10
            // txt_isStatus
            // 
            this.labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl10.Appearance.Options.UseFont = true;
            this.labelControl10.Location = new System.Drawing.Point(362, 80);
            this.labelControl10.Name = "labelControl10";
            this.labelControl10.Size = new System.Drawing.Size(172, 21);
            this.labelControl10.TabIndex = 137;
            this.labelControl10.Text = "（根组织建立为1000）";
            this.txt_isStatus.AutoSize = true;
            this.txt_isStatus.Checked = true;
            this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
            this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
            this.txt_isStatus.TabIndex = 138;
            this.txt_isStatus.UseVisualStyleBackColor = true;
            // 
            // txt_factory
            // 
@@ -404,16 +405,15 @@
            this.labelControl2.TabIndex = 2;
            this.labelControl2.Text = "组织名称：";
            // 
            // txt_isStatus
            // labelControl10
            // 
            this.txt_isStatus.AutoSize = true;
            this.txt_isStatus.Checked = true;
            this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
            this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
            this.txt_isStatus.TabIndex = 138;
            this.txt_isStatus.UseVisualStyleBackColor = true;
            this.labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl10.Appearance.Options.UseFont = true;
            this.labelControl10.Location = new System.Drawing.Point(362, 80);
            this.labelControl10.Name = "labelControl10";
            this.labelControl10.Size = new System.Drawing.Size(145, 21);
            this.labelControl10.TabIndex = 137;
            this.labelControl10.Text = "（根组织建立为0）";
            // 
            // Organization
            // 
@@ -465,7 +465,6 @@
        private System.Windows.Forms.Label label1;
        private DevExpress.XtraEditors.TextEdit txt_factory;
        private DevExpress.XtraEditors.LabelControl labelControl9;
        private DevExpress.XtraEditors.LabelControl labelControl10;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_checkBy;
        private DevExpress.XtraEditors.LabelControl labelControl14;
@@ -473,5 +472,6 @@
        private DevExpress.XtraEditors.LabelControl labelControl15;
        private System.Windows.Forms.Label txt_checkStatus;
        private System.Windows.Forms.CheckBox txt_isStatus;
        private DevExpress.XtraEditors.LabelControl labelControl10;
    }
}

 DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs

@@ -15,12 +15,12 @@
        public Organization()
        {
            InitializeComponent();
            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            //toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            //toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            //toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            //toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            //toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            //toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            tlMenu.DoubleClick += TlMenu_DoubleClick;
@@ -30,6 +30,7 @@
        private void TlMenu_DoubleClick(object sender, EventArgs e)
        {
            var clickedNode = tlMenu.SelectedNode;
            if (clickedNode == null) return;
            if (clickedNode.FirstNode == null)
            {
                var rowGuid = clickedNode.Name;
@@ -234,7 +235,7 @@
            imageList.Images.Add("icon1", Resources.publicfix_32x32);
            imageList.Images.Add("icon2", Resources.user_16x16);
            tlMenu.ImageList = imageList;
            var pgq = new PageQueryModel(1, 999999, "factory");
            var pgq = new PageQueryModel(1, 999999, "FID");
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -242,7 +243,7 @@
                    "Organization/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                var drGrp = dt.Select("upGuid='' or upguid is null");
                var drGrp = dt.Select("FParentlD='0' or isnull(FParentlD,'') =''");
                var dtComList = new DataTable();
                dtComList.Columns.Add("guid", typeof(string));
                dtComList.Columns.Add("name", typeof(string));
@@ -252,15 +253,15 @@
                        _dy["name"].ToString());
                    var node = new TreeNode(); //定义结点
                    node.Text =
                        "(" + _dy["factory"] + ")" + _dy["name"]; //为结点赋值
                        "(" + _dy["FNumber"] + ")" + _dy["name"]; //为结点赋值
                    node.Name = _dy["guid"].ToString();
                    node.ImageIndex = 0;
                    var drItem = dt.Select("upGuid='" + _dy["guid"] + "'");
                    var drItem = dt.Select("FParentlD='" + _dy["FID"] + "'");
                    foreach (var _dy2 in drItem)
                    {
                        var node22 = new TreeNode(); //定义结点
                        node22.Text =
                            "(" + _dy2["factory"] + ")" + _dy2["name"]; //为结点赋值
                            "(" + _dy2["FNumber"] + ")" + _dy2["name"]; //为结点赋值
                        node22.Name = _dy2["guid"].ToString();
                        node22.ImageIndex = 1;
                        node.Nodes.Add(node22);

 DevApp/Gs.DevApp/Entity/LoginInfoModel.cs

@@ -19,9 +19,7 @@
        public string LoginOrgGuid { get; set; } = "";

        public string LoginTime { get; set; }

        public string LoginFactory { get; set; }

 
        //应用单件模式，保存用户登录状态
        public static LoginInfoModel CurrentUser
        {

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -647,6 +647,10 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="logo_ico.ico" />
    <None Include="Resources\wraptext2_16x16.png" />
    <None Include="Resources\wraptext2_32x32.png" />
    <None Include="Resources\viewmergeddata_16x16.png" />
    <None Include="Resources\viewmergeddata_32x32.png" />
    <None Include="Resources\zoom100_16x16.png" />
    <None Include="Resources\zoom100_32x32.png" />
    <None Include="Resources\user_16x161.png" />
@@ -747,6 +751,20 @@
    <None Include="Resources\trackingchanges_showmarkup_16x16.png" />
    <None Include="Resources\insertdatafield_32x32.png" />
    <None Include="Resources\insertdatafield_16x16.png" />
    <None Include="Resources\sortbyorderdate_32x32.png" />
    <None Include="Resources\sortbyorderdate_16x16.png" />
    <None Include="Resources\sortbyinvoice_32x32.png" />
    <None Include="Resources\sortbyinvoice_16x16.png" />
    <None Include="Resources\checkbuttons_32x321.png" />
    <None Include="Resources\checkbuttons_16x162.png" />
    <None Include="Resources\converttorange_32x321.png" />
    <None Include="Resources\converttorange_16x161.png" />
    <None Include="Resources\trackingchanges_next_32x32.png" />
    <None Include="Resources\trackingchanges_next_16x16.png" />
    <None Include="Resources\sendxls_32x32.png" />
    <None Include="Resources\sendxls_16x16.png" />
    <None Include="Resources\fill_32x32.png" />
    <None Include="Resources\fill_16x16.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />

 DevApp/Gs.DevApp/Properties/Resources.Designer.cs

@@ -333,9 +333,29 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap checkbuttons_16x162 {
            get {
                object obj = ResourceManager.GetObject("checkbuttons_16x162", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap checkbuttons_32x32 {
            get {
                object obj = ResourceManager.GetObject("checkbuttons_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap checkbuttons_32x321 {
            get {
                object obj = ResourceManager.GetObject("checkbuttons_32x321", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
@@ -393,9 +413,29 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap converttorange_16x161 {
            get {
                object obj = ResourceManager.GetObject("converttorange_16x161", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap converttorange_32x32 {
            get {
                object obj = ResourceManager.GetObject("converttorange_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap converttorange_32x321 {
            get {
                object obj = ResourceManager.GetObject("converttorange_32x321", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
@@ -586,6 +626,26 @@
        internal static System.Drawing.Bitmap exportfile_32x32 {
            get {
                object obj = ResourceManager.GetObject("exportfile_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap fill_16x16 {
            get {
                object obj = ResourceManager.GetObject("fill_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap fill_32x32 {
            get {
                object obj = ResourceManager.GetObject("fill_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
@@ -1023,6 +1083,26 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap sendxls_16x16 {
            get {
                object obj = ResourceManager.GetObject("sendxls_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap sendxls_32x32 {
            get {
                object obj = ResourceManager.GetObject("sendxls_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap serieslines_32x32 {
            get {
                object obj = ResourceManager.GetObject("serieslines_32x32", resourceCulture);
@@ -1066,6 +1146,46 @@
        internal static System.Drawing.Bitmap sortasc_16x16 {
            get {
                object obj = ResourceManager.GetObject("sortasc_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap sortbyinvoice_16x16 {
            get {
                object obj = ResourceManager.GetObject("sortbyinvoice_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap sortbyinvoice_32x32 {
            get {
                object obj = ResourceManager.GetObject("sortbyinvoice_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap sortbyorderdate_16x16 {
            get {
                object obj = ResourceManager.GetObject("sortbyorderdate_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap sortbyorderdate_32x32 {
            get {
                object obj = ResourceManager.GetObject("sortbyorderdate_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
@@ -1126,6 +1246,26 @@
        internal static System.Drawing.Bitmap trackingchanges_allmarkup_32x32 {
            get {
                object obj = ResourceManager.GetObject("trackingchanges_allmarkup_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap trackingchanges_next_16x16 {
            get {
                object obj = ResourceManager.GetObject("trackingchanges_next_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap trackingchanges_next_32x32 {
            get {
                object obj = ResourceManager.GetObject("trackingchanges_next_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
@@ -1203,6 +1343,46 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap viewmergeddata_16x16 {
            get {
                object obj = ResourceManager.GetObject("viewmergeddata_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap viewmergeddata_32x32 {
            get {
                object obj = ResourceManager.GetObject("viewmergeddata_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap wraptext2_16x16 {
            get {
                object obj = ResourceManager.GetObject("wraptext2_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap wraptext2_32x32 {
            get {
                object obj = ResourceManager.GetObject("wraptext2_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap zoom100_16x16 {
            get {
                object obj = ResourceManager.GetObject("zoom100_16x16", resourceCulture);

 DevApp/Gs.DevApp/Properties/Resources.resx

@@ -128,6 +128,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sendxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -137,6 +140,9 @@
    <value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap,
@@ -173,6 +179,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -193,6 +204,12 @@
  </data>
  <data name="trackingchanges_showmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap,
@@ -221,11 +238,6 @@
  </data>
  <data name="zoom100_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\zoom100_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -281,8 +293,21 @@
  <data name="checkbox2_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -300,6 +325,9 @@
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="formatnumbertime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\formatnumbertime_16x16.png;System.Drawing.Bitmap,
@@ -331,9 +359,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -343,17 +368,21 @@
    <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="checkbuttons_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_trackchanges_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_32x32.png;System.Drawing.Bitmap,
@@ -398,15 +427,18 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
@@ -428,8 +460,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -471,6 +503,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -489,10 +526,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
@@ -508,6 +543,9 @@
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
@@ -537,10 +575,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
@@ -551,6 +587,9 @@
    <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
@@ -567,10 +606,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="editrangepermission_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editrangepermission_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap,
@@ -586,6 +623,9 @@
    <value>..\Resources\find_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doubleprev_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
@@ -610,13 +650,16 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="knowledgebasearticle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_16x16.png;System.Drawing.Bitmap,
  <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -625,8 +668,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap,
@@ -656,12 +702,20 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>

 DevApp/Gs.DevApp/Resources/fill_16x16.png

 DevApp/Gs.DevApp/Resources/fill_32x32.png

 DevApp/Gs.DevApp/Resources/wraptext2_16x16.png

 DevApp/Gs.DevApp/Resources/wraptext2_32x32.png

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs

@@ -44,7 +44,6 @@
            this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnPrint = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnHb = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnKG = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnQuery = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnIn = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -54,6 +53,7 @@
            this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFjianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnPiZhun = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnZhiLiangChk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnZhiLiangFchk = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -128,7 +128,6 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.btnFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnPrint),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnHb),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnLog),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnKG),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnQuery),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnIn),
@@ -142,7 +141,8 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangChk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouChk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk)});
            new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnLog)});
            this.bar2.OptionsBar.MultiLine = true;
            this.bar2.OptionsBar.UseWholeRow = true;
            this.bar2.Text = "Main menu";
@@ -259,15 +259,6 @@
            this.btnHb.Name = "btnHb";
            this.btnHb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnLog
            // 
            this.btnLog.Caption = "日志";
            this.btnLog.Id = 18;
            this.btnLog.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
            this.btnLog.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
            this.btnLog.Name = "btnLog";
            this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnKG
            // 
            this.btnKG.Caption = "开工";
@@ -281,8 +272,8 @@
            // 
            this.btnQuery.Caption = "查询";
            this.btnQuery.Id = 23;
            this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
            this.btnQuery.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.zoom100_32x32;
            this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
            this.btnQuery.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.viewmergeddata_32x32;
            this.btnQuery.Name = "btnQuery";
            this.btnQuery.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
@@ -290,8 +281,8 @@
            // 
            this.btnIn.Caption = "导入";
            this.btnIn.Id = 17;
            this.btnIn.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnIn.ImageOptions.Image")));
            this.btnIn.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnIn.ImageOptions.LargeImage")));
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sendxls_16x16;
            this.btnIn.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.sendxls_32x32;
            this.btnIn.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnIn.ItemAppearance.Normal.Options.UseFont = true;
            this.btnIn.Name = "btnIn";
@@ -302,8 +293,8 @@
            this.btnOut.Caption = "导出";
            this.btnOut.Description = "导出";
            this.btnOut.Id = 12;
            this.btnOut.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnOut.ImageOptions.Image")));
            this.btnOut.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnOut.ImageOptions.LargeImage")));
            this.btnOut.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.wraptext2_16x16;
            this.btnOut.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.wraptext2_32x32;
            this.btnOut.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnOut.ItemAppearance.Normal.Options.UseFont = true;
            this.btnOut.Name = "btnOut";
@@ -354,6 +345,15 @@
            this.btnFjianYan.Name = "btnFjianYan";
            this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnLog
            // 
            this.btnLog.Caption = "日志";
            this.btnLog.Id = 18;
            this.btnLog.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_16x16;
            this.btnLog.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.salesperiodlifetime_32x32;
            this.btnLog.Name = "btnLog";
            this.btnLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnPiZhun
            // 
            this.btnPiZhun.Caption = "批准";
@@ -367,8 +367,8 @@
            // 
            this.btnZhiLiangChk.Caption = "质量审核";
            this.btnZhiLiangChk.Id = 31;
            this.btnZhiLiangChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x161;
            this.btnZhiLiangChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbox2_32x322;
            this.btnZhiLiangChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x162;
            this.btnZhiLiangChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x321;
            this.btnZhiLiangChk.Name = "btnZhiLiangChk";
            this.btnZhiLiangChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
@@ -411,7 +411,7 @@
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 73);
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 69);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
            // 
@@ -432,7 +432,7 @@
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Name = "UcToolBarMenu";
            this.Size = new System.Drawing.Size(1543, 73);
            this.Size = new System.Drawing.Size(1543, 69);
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx

@@ -369,122 +369,6 @@
        T5oqAAAAAElFTkSuQmCC
</value>
  </data>
  <data name="btnIn.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAA50RVh0VGl0
        bGUAWGxzO1NlbmRxQ3oaAAACiElEQVQ4T3WQ2U8TYRTFhxYKuP4hCBXhD/HBV5cXFawkqJgCXYSyRCWF
        EMGkSX0gKgKxYWklBdkqJqaEQFQwhspSKoHQhek2nZbC8X7TOtIEJzmZb+Z+53fuvRyAHFW2F9pIqGxj
        UqGiVYUrLUwFKG8uwOUm0pN8qI1KqPVK22kAJFOHqCBAQkyhgszxREo2d08YwUdEHEQSKNUrcs0ZgAqi
        mJaShcQhyk0qROMpMudLyXxURJlBiTIylzaeAmDJvTPNkrlnuomS8xGJJ+W2u5xGhMICSnVKAuSBo0eR
        lZLpX3IBYsxIyZGYmJk5m2weN8AfEnCpgQCWfvfsq6FFWAcXsbSyIy1MEDIzRwmgpuRwduZOMgYPEpK5
        w6FDST0BdM+d8O3yODo6Rjp9jIcD17ILy8zMkuWZdQpKZcojM4cSLWfj2nrmMDa1gg/TqxIkmTqCmEzL
        Yt/s//KKF/PuNXxa2GRzF/7dGdfyYo7aE+Gc+wmzZQpxISm1HggKiMboTPPXmV7D8tYFj/cAevNHBiiS
        AU3dswjyCaz7eLwf/4ZHpiFs/Q5SDVjf2scNTS9e9rnw45cf69th1D+bZIBiGWDsnEGAF/F50YcJlwdb
        vhCazcO4eqsLtYY+LCxvYnRiFfNUX/PyeNzuZIAzMqCxYwqrHj8G7V8RjqWkbja2g1j67iN5qZuQ9J/V
        vyzv4IFpnAHOygDt00lYB9wIkdEfyipw4pwVq1vfuVFjdDDAeRlQ1+rEfjCOPVraXiCO3UDuWxbV2b3q
        xtFcwPWaN7P3DQ5oDHZo9HbcI1XrxujiGKroclXDCO7Wj+COdgS3tcO4WdvvylkiPUWkc6QL/9HFE2Lf
        xSRFBgDuD6syoJrXuXr4AAAAAElFTkSuQmCC
</value>
  </data>
  <data name="btnIn.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
        gCow0mM+bAAAAABJRU5ErkJggg==
</value>
  </data>
  <data name="btnOut.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB10RVh0VGl0
        bGUARXhwb3J0O1hscztFeHBvcnRUb1hscztMoJn+AAACZklEQVQ4T2WTWWsTYRSGszdtg1r/Rk3Tmv4S
        RWhUEAQFJVqLF7FNmqSpXdKqRazQDW/0pimBghKsuMRWaNJ7b70UsWaZJTOTmSSv5/tmGqY68CQzgfc5
        3zln4qDLSbgIN+Gx8Nrw/QP7zQnAwWCXK7tZKi5vHYGxtFVGdrOMJWJx44goYWG9jIW1Q8yvlZBZLe4z
        iV3gyW6U0aEnDn2YdDjtE9ommRffWMpvF3jn1g95SNVaUIiGaiIrBkdSWhAJvdVGamWfpfrsAh+zMoGs
        moGTEA/KLQgNA3WiabQRf/KFpfpPCVIrX/lxJUWH1NCpmtENMWqyjiqhNdv4cPDjP0HPFFlZnwIFJ3JX
        MDrfg9E5hg/hxz5cnGV4MTLjxXCaSHkQSroRSrjzTOCPLX7kgpps8HBTNxAmgarpCFO4oerd8PO9JOqi
        hpqoIphw8SP0TszuoUUTrko6CXzQaJCsskIzGcn4eFvDaQ+vXJc0DE27MUTh4JQliKYKXHBcb/LKLz/P
        8PDqpzRV9kBsNLvHXnmfRFVQEIy7SeDkgr47ibcwWh38rmu2yl7ILEiVRVkze7YqPy1M47iq4MKkKei/
        PbkLg1b0q6rxgSm0DdazRIIQVRasnp9RsFJTeXj5XRyDj0xB4GZsFzoJflZURN9ctgZm9swqd3uOu6gq
        w0lhBwZjDr6FwI2Hef6SiLRzgQZWp53z3Ys6KoKOP4JG89F4i/nCd1Z1wP4e+CN3XxevP9jB1fEdsO9r
        4zlE7ufoeRuRe3QfNRmLbuPSrVcHlDn1IrG/ci9xhjhLnLMYsHHegt0HCLcpgOMvLlVmbi0MtN8AAAAA
        SUVORK5CYII=
</value>
  </data>
  <data name="btnOut.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
</value>
  </data>
  <data name="btnReport.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAABw1JREFUWEe1