版面

lu

2025-03-22 09b9f82bc99868fe0ea90525d0b732618c5495cb

版面

 DevApp/Gs.DevApp/App.config

@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="广深科技 G-MES V2.0" />
        <add key="PageSize" value="50" />

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
@@ -34,6 +35,10 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;

          
           

        }
        private   void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs

@@ -69,7 +69,7 @@
            this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -98,7 +98,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -510,6 +510,7 @@
            // 
            this.toolBarMenu1.chkParameter = "MES_DEPOTS,check_date,check_status,check_by";
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -521,16 +522,16 @@
            this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // gcMain
            // gcMain1
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1264, 531);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1264, 531);
            this.gcMain1.TabIndex = 1;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
            // gridView1
@@ -555,7 +556,7 @@
            this.gridColumn4,
            this.gridColumn7,
            this.gridColumn3});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -655,7 +656,7 @@
            // 
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.gcMain1);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1264, 570);
@@ -760,7 +761,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
@@ -775,7 +776,7 @@
        }
        #endregion
        private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs

@@ -173,7 +173,6 @@
                return;
            }
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            var lst = new List<MesDepotSections>();
            for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -250,16 +249,16 @@
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gcMain1.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
@@ -334,7 +333,6 @@
            ButtonPressedEventArgs e)
        {
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs

@@ -29,174 +29,250 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.lb_isZxbg = new DevExpress.XtraEditors.LabelControl();
            this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lineType = new DevExpress.XtraEditors.LabelControl();
            this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_name = new DevExpress.XtraEditors.LabelControl();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_lineNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_org = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_workshopGuid = new DevExpress.XtraEditors.LabelControl();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            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.split1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_org = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_isZxbg = new DevExpress.XtraEditors.CheckEdit();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_lineType = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_dptId = new Gs.DevApp.UserControl.UcLookDepartment();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_isZxbg = new DevExpress.XtraEditors.CheckEdit();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
            this.split1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
            this.split1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.xtraTabPage2.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            this.SuspendLayout();
            // 
            // lb_isZxbg
            // toolBarMenu1
            // 
            this.lb_isZxbg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_isZxbg.Appearance.Options.UseFont = true;
            this.lb_isZxbg.Location = new System.Drawing.Point(333, 116);
            this.lb_isZxbg.Name = "lb_isZxbg";
            this.lb_isZxbg.Size = new System.Drawing.Size(68, 21);
            this.lb_isZxbg.TabIndex = 243;
            this.lb_isZxbg.Text = "整线报工";
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // gv_isZxbg
            // xtraTabControl1
            // 
            this.gv_isZxbg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
            this.gv_isZxbg.Caption = "整线报工";
            this.gv_isZxbg.FieldName = "isZxbg";
            this.gv_isZxbg.MinWidth = 50;
            this.gv_isZxbg.Name = "gv_isZxbg";
            this.gv_isZxbg.OptionsColumn.AllowEdit = false;
            this.gv_isZxbg.Tag = "query_a.is_zxbg";
            this.gv_isZxbg.Visible = true;
            this.gv_isZxbg.VisibleIndex = 10;
            this.gv_isZxbg.Width = 50;
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            // 
            // lb_lineType
            // xtraTabPage1
            // 
            this.lb_lineType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lineType.Appearance.Options.UseFont = true;
            this.lb_lineType.Location = new System.Drawing.Point(333, 84);
            this.lb_lineType.Name = "lb_lineType";
            this.lb_lineType.Size = new System.Drawing.Size(68, 21);
            this.lb_lineType.TabIndex = 240;
            this.lb_lineType.Text = "线体类别";
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // gv_lineType
            // split1
            // 
            this.gv_lineType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lineType.AppearanceCell.Options.UseFont = true;
            this.gv_lineType.Caption = "线体类别";
            this.gv_lineType.FieldName = "lineType";
            this.gv_lineType.MinWidth = 80;
            this.gv_lineType.Name = "gv_lineType";
            this.gv_lineType.OptionsColumn.AllowEdit = false;
            this.gv_lineType.Tag = "query_a.line_type";
            this.gv_lineType.Visible = true;
            this.gv_lineType.VisibleIndex = 9;
            this.gv_lineType.Width = 80;
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
            // 
            // lb_lastupdateDate
            // split1.Panel1
            // 
            this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateDate.Appearance.Options.UseFont = true;
            this.lb_lastupdateDate.Location = new System.Drawing.Point(333, 52);
            this.lb_lastupdateDate.Name = "lb_lastupdateDate";
            this.lb_lastupdateDate.Size = new System.Drawing.Size(68, 21);
            this.lb_lastupdateDate.TabIndex = 231;
            this.lb_lastupdateDate.Text = "更新时间";
            this.split1.Panel1.Controls.Add(this.gcMain1);
            this.split1.Panel1.Controls.Add(this.pageBar1);
            this.split1.Panel1.Text = "Panel1";
            // 
            // txt_lastupdateDate
            // split1.Panel2
            // 
            this.txt_lastupdateDate.Location = new System.Drawing.Point(405, 48);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(164, 28);
            this.txt_lastupdateDate.TabIndex = 231;
            this.txt_lastupdateDate.Tag = "readonly";
            this.split1.Panel2.Text = "Panel2";
            this.split1.Size = new System.Drawing.Size(1126, 570);
            this.split1.SplitterPosition = 558;
            this.split1.TabIndex = 0;
            // 
            // gv_lastupdateDate
            // gcMain1
            // 
            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateDate.Caption = "更新时间";
            this.gv_lastupdateDate.FieldName = "lastupdateDate";
            this.gv_lastupdateDate.MinWidth = 180;
            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 8;
            this.gv_lastupdateDate.Width = 180;
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
            // lb_lastupdateBy
            // gridView1
            // 
            this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lastupdateBy.Appearance.Options.UseFont = true;
            this.lb_lastupdateBy.Location = new System.Drawing.Point(350, 20);
            this.lb_lastupdateBy.Name = "lb_lastupdateBy";
            this.lb_lastupdateBy.Size = new System.Drawing.Size(51, 21);
            this.lb_lastupdateBy.TabIndex = 228;
            this.lb_lastupdateBy.Text = "更新者";
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_org,
            this.gridColumn1,
            this.gv_lineNo,
            this.gv_name,
            this.gv_remark,
            this.gv_createBy,
            this.gv_createDate,
            this.gv_lastupdateBy,
            this.gv_lastupdateDate,
            this.gv_lineType,
            this.gv_isZxbg});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // txt_lastupdateBy
            // gv_org
            // 
            this.txt_lastupdateBy.Location = new System.Drawing.Point(405, 16);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(164, 28);
            this.txt_lastupdateBy.TabIndex = 228;
            this.txt_lastupdateBy.Tag = "readonly";
            this.gv_org.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_org.AppearanceCell.Options.UseFont = true;
            this.gv_org.Caption = "使用组织";
            this.gv_org.FieldName = "fSubsidiary";
            this.gv_org.MinWidth = 50;
            this.gv_org.Name = "gv_org";
            this.gv_org.OptionsColumn.AllowEdit = false;
            this.gv_org.Tag = "org.fnamber";
            this.gv_org.Visible = true;
            this.gv_org.VisibleIndex = 0;
            this.gv_org.Width = 254;
            // 
            // gv_lastupdateBy
            // gridColumn1
            // 
            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateBy.Caption = "更新者";
            this.gv_lastupdateBy.FieldName = "lastupdateBy";
            this.gv_lastupdateBy.MinWidth = 50;
            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 7;
            this.gv_lastupdateBy.Width = 63;
            this.gridColumn1.Caption = "所在部门";
            this.gridColumn1.FieldName = "departName";
            this.gridColumn1.MinWidth = 60;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.departName";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            this.gridColumn1.Width = 94;
            // 
            // gv_lineNo
            // 
            this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lineNo.AppearanceCell.Options.UseFont = true;
            this.gv_lineNo.Caption = "产线编号";
            this.gv_lineNo.FieldName = "lineNo";
            this.gv_lineNo.MinWidth = 50;
            this.gv_lineNo.Name = "gv_lineNo";
            this.gv_lineNo.OptionsColumn.AllowEdit = false;
            this.gv_lineNo.Tag = "query_a.line_no";
            this.gv_lineNo.Visible = true;
            this.gv_lineNo.VisibleIndex = 2;
            this.gv_lineNo.Width = 82;
            // 
            // gv_name
            // 
            this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_name.AppearanceCell.Options.UseFont = true;
            this.gv_name.Caption = "产线名称";
            this.gv_name.FieldName = "name";
            this.gv_name.MinWidth = 60;
            this.gv_name.Name = "gv_name";
            this.gv_name.OptionsColumn.AllowEdit = false;
            this.gv_name.Tag = "query_a.name";
            this.gv_name.Visible = true;
            this.gv_name.VisibleIndex = 3;
            this.gv_name.Width = 100;
            // 
            // gv_remark
            // 
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 4;
            this.gv_remark.Width = 79;
            // 
            // gv_createBy
            // 
@@ -226,271 +302,134 @@
            this.gv_createDate.VisibleIndex = 6;
            this.gv_createDate.Width = 180;
            // 
            // lb_remark
            // gv_lastupdateBy
            // 
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(54, 116);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(34, 21);
            this.lb_remark.TabIndex = 219;
            this.lb_remark.Text = "备注";
            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateBy.Caption = "更新者";
            this.gv_lastupdateBy.FieldName = "lastupdateBy";
            this.gv_lastupdateBy.MinWidth = 50;
            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 7;
            this.gv_lastupdateBy.Width = 63;
            // 
            // txt_remark
            // gv_lastupdateDate
            // 
            this.txt_remark.Location = new System.Drawing.Point(94, 112);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(220, 28);
            this.txt_remark.TabIndex = 219;
            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateDate.Caption = "更新时间";
            this.gv_lastupdateDate.FieldName = "lastupdateDate";
            this.gv_lastupdateDate.MinWidth = 180;
            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 8;
            this.gv_lastupdateDate.Width = 180;
            // 
            // gv_remark
            // gv_lineType
            // 
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 4;
            this.gv_remark.Width = 79;
            this.gv_lineType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lineType.AppearanceCell.Options.UseFont = true;
            this.gv_lineType.Caption = "线体类别";
            this.gv_lineType.FieldName = "lineType";
            this.gv_lineType.MinWidth = 80;
            this.gv_lineType.Name = "gv_lineType";
            this.gv_lineType.OptionsColumn.AllowEdit = false;
            this.gv_lineType.Tag = "query_a.line_type";
            this.gv_lineType.Visible = true;
            this.gv_lineType.VisibleIndex = 9;
            this.gv_lineType.Width = 80;
            // 
            // lb_name
            // gv_isZxbg
            // 
            this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_name.Appearance.Options.UseFont = true;
            this.lb_name.Location = new System.Drawing.Point(20, 84);
            this.lb_name.Name = "lb_name";
            this.lb_name.Size = new System.Drawing.Size(68, 21);
            this.lb_name.TabIndex = 217;
            this.lb_name.Text = "产线名称";
            // 
            // txt_name
            // 
            this.txt_name.Location = new System.Drawing.Point(94, 80);
            this.txt_name.Name = "txt_name";
            this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_name.Properties.Appearance.Options.UseFont = true;
            this.txt_name.Size = new System.Drawing.Size(220, 28);
            this.txt_name.TabIndex = 217;
            // 
            // gv_name
            // 
            this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_name.AppearanceCell.Options.UseFont = true;
            this.gv_name.Caption = "产线名称";
            this.gv_name.FieldName = "name";
            this.gv_name.MinWidth = 60;
            this.gv_name.Name = "gv_name";
            this.gv_name.OptionsColumn.AllowEdit = false;
            this.gv_name.Tag = "query_a.name";
            this.gv_name.Visible = true;
            this.gv_name.VisibleIndex = 3;
            this.gv_name.Width = 100;
            // 
            // lb_lineNo
            // 
            this.lb_lineNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_lineNo.Appearance.Options.UseFont = true;
            this.lb_lineNo.Location = new System.Drawing.Point(20, 52);
            this.lb_lineNo.Name = "lb_lineNo";
            this.lb_lineNo.Size = new System.Drawing.Size(68, 21);
            this.lb_lineNo.TabIndex = 216;
            this.lb_lineNo.Text = "产线编号";
            // 
            // txt_lineNo
            // 
            this.txt_lineNo.Location = new System.Drawing.Point(94, 48);
            this.txt_lineNo.Name = "txt_lineNo";
            this.txt_lineNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
            this.txt_lineNo.Size = new System.Drawing.Size(220, 28);
            this.txt_lineNo.TabIndex = 216;
            this.txt_lineNo.Tag = "";
            // 
            // gv_lineNo
            // 
            this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lineNo.AppearanceCell.Options.UseFont = true;
            this.gv_lineNo.Caption = "产线编号";
            this.gv_lineNo.FieldName = "lineNo";
            this.gv_lineNo.MinWidth = 50;
            this.gv_lineNo.Name = "gv_lineNo";
            this.gv_lineNo.OptionsColumn.AllowEdit = false;
            this.gv_lineNo.Tag = "query_a.line_no";
            this.gv_lineNo.Visible = true;
            this.gv_lineNo.VisibleIndex = 2;
            this.gv_lineNo.Width = 82;
            // 
            // gv_org
            // 
            this.gv_org.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_org.AppearanceCell.Options.UseFont = true;
            this.gv_org.Caption = "使用组织";
            this.gv_org.FieldName = "fSubsidiary";
            this.gv_org.MinWidth = 50;
            this.gv_org.Name = "gv_org";
            this.gv_org.OptionsColumn.AllowEdit = false;
            this.gv_org.Tag = "org.fnamber";
            this.gv_org.Visible = true;
            this.gv_org.VisibleIndex = 0;
            this.gv_org.Width = 254;
            // 
            // lb_workshopGuid
            // 
            this.lb_workshopGuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_workshopGuid.Appearance.Options.UseFont = true;
            this.lb_workshopGuid.Location = new System.Drawing.Point(20, 20);
            this.lb_workshopGuid.Name = "lb_workshopGuid";
            this.lb_workshopGuid.Size = new System.Drawing.Size(68, 21);
            this.lb_workshopGuid.TabIndex = 211;
            this.lb_workshopGuid.Text = "所在部门";
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1126, 531);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            // 
            // gridView1
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_org,
            this.gridColumn1,
            this.gv_lineNo,
            this.gv_name,
            this.gv_remark,
            this.gv_createBy,
            this.gv_createDate,
            this.gv_lastupdateBy,
            this.gv_lastupdateDate,
            this.gv_lineType,
            this.gv_isZxbg});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn1
            // 
            this.gridColumn1.Caption = "所在部门";
            this.gridColumn1.FieldName = "departName";
            this.gridColumn1.MinWidth = 60;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "query_a.departName";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            this.gridColumn1.Width = 94;
            // 
            // xtraTabControl1
            // 
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            // 
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Text = "数据查询";
            this.gv_isZxbg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
            this.gv_isZxbg.Caption = "整线报工";
            this.gv_isZxbg.FieldName = "isZxbg";
            this.gv_isZxbg.MinWidth = 50;
            this.gv_isZxbg.Name = "gv_isZxbg";
            this.gv_isZxbg.OptionsColumn.AllowEdit = false;
            this.gv_isZxbg.Tag = "query_a.is_zxbg";
            this.gv_isZxbg.Visible = true;
            this.gv_isZxbg.VisibleIndex = 10;
            this.gv_isZxbg.Width = 50;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 531);
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // xtraTabPage2
            // 
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Text = "数据编辑";
            this.xtraTabPage2.Text = "数据详细";
            // 
            // panel1
            // splitMx1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_isZxbg);
            this.panel1.Controls.Add(this.txt_lineType);
            this.panel1.Controls.Add(this.txt_dptId);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_isZxbg);
            this.panel1.Controls.Add(this.lb_lineType);
            this.panel1.Controls.Add(this.lb_lastupdateDate);
            this.panel1.Controls.Add(this.txt_lastupdateDate);
            this.panel1.Controls.Add(this.lb_lastupdateBy);
            this.panel1.Controls.Add(this.txt_lastupdateBy);
            this.panel1.Controls.Add(this.lb_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_name);
            this.panel1.Controls.Add(this.txt_name);
            this.panel1.Controls.Add(this.lb_lineNo);
            this.panel1.Controls.Add(this.txt_lineNo);
            this.panel1.Controls.Add(this.lb_workshopGuid);
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(76, 20);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(673, 249);
            this.panel1.TabIndex = 1;
            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx1.Horizontal = false;
            this.splitMx1.Location = new System.Drawing.Point(0, 0);
            this.splitMx1.Name = "splitMx1";
            // 
            // txt_isZxbg
            // splitMx1.Panel1
            // 
            this.txt_isZxbg.Location = new System.Drawing.Point(405, 114);
            this.txt_isZxbg.Name = "txt_isZxbg";
            this.txt_isZxbg.Properties.Caption = "";
            this.txt_isZxbg.Size = new System.Drawing.Size(46, 24);
            this.txt_isZxbg.TabIndex = 246;
            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
            this.splitMx1.Panel1.Text = "Panel1";
            // 
            // splitMx1.Panel2
            // 
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 147;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_lineType);
            this.layoutMx1.Controls.Add(this.txt_dptId);
            this.layoutMx1.Controls.Add(this.txt_lineNo);
            this.layoutMx1.Controls.Add(this.txt_name);
            this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
            this.layoutMx1.Controls.Add(this.txt_isZxbg);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem9});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 147);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // lbGuid
            // 
            this.lbGuid.Location = new System.Drawing.Point(554, 107);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(267, 28);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            // 
            // txt_lineType
            // 
            this.txt_lineType.Location = new System.Drawing.Point(405, 82);
            this.txt_lineType.Location = new System.Drawing.Point(360, 76);
            this.txt_lineType.Name = "txt_lineType";
            this.txt_lineType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -498,35 +437,218 @@
            "手工线",
            "自动线"});
            this.txt_lineType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_lineType.Size = new System.Drawing.Size(164, 24);
            this.txt_lineType.Size = new System.Drawing.Size(200, 24);
            this.txt_lineType.StyleController = this.layoutMx1;
            this.txt_lineType.TabIndex = 245;
            // 
            // txt_dptId
            // 
            this.txt_dptId.IsReadly = false;
            this.txt_dptId.Location = new System.Drawing.Point(94, 16);
            this.txt_dptId.Location = new System.Drawing.Point(84, 12);
            this.txt_dptId.Name = "txt_dptId";
            this.txt_dptId.Size = new System.Drawing.Size(220, 28);
            this.txt_dptId.Size = new System.Drawing.Size(200, 28);
            this.txt_dptId.TabIndex = 244;
            // 
            // labelControl11
            // txt_lineNo
            // 
            this.labelControl11.Location = new System.Drawing.Point(485, 122);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
            this.labelControl11.TabIndex = 130;
            this.labelControl11.Text = "主键：";
            this.labelControl11.Visible = false;
            this.txt_lineNo.Location = new System.Drawing.Point(84, 44);
            this.txt_lineNo.Name = "txt_lineNo";
            this.txt_lineNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
            this.txt_lineNo.Size = new System.Drawing.Size(200, 28);
            this.txt_lineNo.StyleController = this.layoutMx1;
            this.txt_lineNo.TabIndex = 216;
            this.txt_lineNo.Tag = "";
            // 
            // lbGuid
            // txt_name
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(536, 122);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            this.txt_name.Location = new System.Drawing.Point(84, 76);
            this.txt_name.Name = "txt_name";
            this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_name.Properties.Appearance.Options.UseFont = true;
            this.txt_name.Size = new System.Drawing.Size(200, 28);
            this.txt_name.StyleController = this.layoutMx1;
            this.txt_name.TabIndex = 217;
            // 
            // txt_lastupdateDate
            // 
            this.txt_lastupdateDate.Location = new System.Drawing.Point(360, 44);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(200, 28);
            this.txt_lastupdateDate.StyleController = this.layoutMx1;
            this.txt_lastupdateDate.TabIndex = 231;
            this.txt_lastupdateDate.Tag = "readonly";
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(84, 108);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(200, 28);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 219;
            // 
            // txt_lastupdateBy
            // 
            this.txt_lastupdateBy.Location = new System.Drawing.Point(360, 12);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(200, 28);
            this.txt_lastupdateBy.StyleController = this.layoutMx1;
            this.txt_lastupdateBy.TabIndex = 228;
            this.txt_lastupdateBy.Tag = "readonly";
            // 
            // txt_isZxbg
            // 
            this.txt_isZxbg.Location = new System.Drawing.Point(288, 108);
            this.txt_isZxbg.Name = "txt_isZxbg";
            this.txt_isZxbg.Properties.Caption = "整线报工";
            this.txt_isZxbg.Size = new System.Drawing.Size(272, 24);
            this.txt_isZxbg.StyleController = this.layoutMx1;
            this.txt_isZxbg.TabIndex = 246;
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.lbGuid;
            this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem9.Text = "lbGuid";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
            // 
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
            this.layoutControlItem2,
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem5,
            this.layoutControlItem6,
            this.layoutControlItem7,
            this.layoutControlItem8});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1126, 148);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            this.layoutControlItem1.Control = this.txt_dptId;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem1.Text = "所在部门";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_lineNo;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem2.Text = "产线编号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_name;
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem3.Text = "产线名称";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_remark;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem4.Text = "备注";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_lastupdateBy;
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem5.Text = "更新者";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_lastupdateDate;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 32);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem6.Text = "更新时间";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_lineType;
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 64);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem7.Text = "线体类别";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_isZxbg;
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 96);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem8.Text = "整线报工";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
            // 
            // Frm_MesWorkshopLine
            // 
@@ -537,69 +659,84 @@
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesWorkshopLine";
            this.Text = "线体管理";
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
            this.split1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
            this.split1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            this.xtraTabPage2.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
            this.splitMx1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            this.ResumeLayout(false);

        }
        #endregion
      private UserControl.UcToolBarMenu toolBarMenu1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private UserControls.Data.UcPageBar pageBar1;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl labelControl11;
       //BQCreateConrolObejct
private DevExpress.XtraEditors.LabelControl lb_isZxbg;
 private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;

private DevExpress.XtraEditors.LabelControl lb_lineType;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;

private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;

private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_org;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_name;
        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
 private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;

private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
 private DevExpress.XtraGrid.Columns.GridColumn gv_remark;

private DevExpress.XtraEditors.LabelControl lb_name;
private DevExpress.XtraEditors.TextEdit txt_name;
 private DevExpress.XtraGrid.Columns.GridColumn gv_name;

private DevExpress.XtraEditors.LabelControl lb_lineNo;
private DevExpress.XtraEditors.TextEdit txt_lineNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
 private DevExpress.XtraGrid.Columns.GridColumn gv_org;

private DevExpress.XtraEditors.LabelControl lb_workshopGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private UserControl.UcLookDepartment txt_dptId;
        private DevExpress.XtraEditors.CheckEdit txt_isZxbg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraEditors.ComboBoxEdit txt_lineType;
        private UserControl.UcLookDepartment txt_dptId;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.TextEdit txt_name;
        private DevExpress.XtraEditors.TextEdit txt_lineNo;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.CheckEdit txt_isZxbg;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
    }
}

 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs

@@ -24,9 +24,7 @@
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, null, null, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -176,7 +174,7 @@
            }
            else
            {
                UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
            }
        }
        /// <summary>
@@ -188,7 +186,7 @@
        {
            lbGuid.Text = "";
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            UtilityHelper.CleanValueByControl(panel1.Controls, true);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
        }
        /// <summary>
        /// 保存事件
@@ -241,7 +239,7 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
                }
            }
            catch (Exception ex)
@@ -269,16 +267,16 @@
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    gcMain1.BindingContext = new BindingContext();
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
@@ -322,7 +320,7 @@
                {
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -1671,13 +1671,10 @@
            btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 距离顶部10像素
        }
        #region 设置搜索
        public static string getQueryWord(string str)
        {
            return str.ToUpper().Replace("query_".ToUpper(), "");
        }
    
        public static FilterEntity getFilterEntityWord(string id, string idDec, string val)
        {
            return new FilterEntity(getQueryWord(id), idDec + ")", " like ", "包含)", "%" + val + "%");
            return new FilterEntity(id, idDec + ")", " like ", "包含)", "%" + val + "%");
        }
        public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
        {

 DevApp/Gs.DevApp/UserControl/ShowFilter.Designer.cs

@@ -77,7 +77,6 @@
            this.gcQuery = new DevExpress.XtraGrid.GridControl();
            this.gvQuery = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemComboBoxSql = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -113,7 +112,7 @@
            this.panel1.Controls.Add(this.btnEsc);
            this.panel1.Controls.Add(this.btnQuery);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel1.Location = new System.Drawing.Point(0, 466);
            this.panel1.Location = new System.Drawing.Point(0, 517);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(734, 56);
            this.panel1.TabIndex = 1;
@@ -140,7 +139,7 @@
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(736, 554);
            this.xtraTabControl1.Size = new System.Drawing.Size(736, 605);
            this.xtraTabControl1.TabIndex = 2;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -151,7 +150,7 @@
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.panel1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(734, 522);
            this.xtraTabPage1.Size = new System.Drawing.Size(734, 573);
            this.xtraTabPage1.Text = "查询条件";
            // 
            // gcMain
@@ -164,7 +163,7 @@
            this.repositoryItemComboBox1,
            this.repositoryItemComboBox2,
            this.repositoryItemButtonEdit1});
            this.gcMain.Size = new System.Drawing.Size(734, 466);
            this.gcMain.Size = new System.Drawing.Size(734, 517);
            this.gcMain.TabIndex = 0;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -254,7 +253,7 @@
            // 
            this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(734, 522);
            this.xtraTabPage3.Size = new System.Drawing.Size(734, 573);
            this.xtraTabPage3.Text = "查询配置";
            // 
            // splitContainerControl1
@@ -274,7 +273,7 @@
            // 
            this.splitContainerControl1.Panel2.Controls.Add(this.gcQuery);
            this.splitContainerControl1.Panel2.Text = "Panel2";
            this.splitContainerControl1.Size = new System.Drawing.Size(734, 522);
            this.splitContainerControl1.Size = new System.Drawing.Size(734, 573);
            this.splitContainerControl1.SplitterPosition = 230;
            this.splitContainerControl1.TabIndex = 0;
            // 
@@ -434,7 +433,7 @@
            this.gcQuery.Name = "gcQuery";
            this.gcQuery.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemComboBoxSql});
            this.gcQuery.Size = new System.Drawing.Size(734, 280);
            this.gcQuery.Size = new System.Drawing.Size(734, 331);
            this.gcQuery.TabIndex = 3;
            this.gcQuery.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvQuery});
@@ -443,7 +442,6 @@
            // 
            this.gvQuery.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn9});
            this.gvQuery.GridControl = this.gcQuery;
@@ -451,23 +449,14 @@
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "列名";
            this.gridColumn5.FieldName = "gvColName";
            this.gridColumn5.Caption = "列ID(标题)";
            this.gridColumn5.FieldName = "gvNameCap";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 0;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "列标题";
            this.gridColumn6.FieldName = "gvColCaption";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 1;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn7
            // 
@@ -477,7 +466,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 2;
            this.gridColumn7.VisibleIndex = 1;
            this.gridColumn7.Width = 94;
            // 
            // repositoryItemComboBoxSql
@@ -495,15 +484,16 @@
            this.gridColumn9.FieldName = "lastUpdateDate";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 3;
            this.gridColumn9.VisibleIndex = 2;
            this.gridColumn9.Width = 94;
            // 
            // ShowFilter
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(736, 554);
            this.ClientSize = new System.Drawing.Size(736, 605);
            this.Controls.Add(this.xtraTabControl1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
@@ -567,7 +557,6 @@
        private DevExpress.XtraGrid.GridControl gcQuery;
        private DevExpress.XtraGrid.Views.Grid.GridView gvQuery;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBoxSql;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;

 DevApp/Gs.DevApp/UserControl/ShowFilter.cs

@@ -120,13 +120,12 @@
        private void getPageList()
        {
            foreach (GridColumn col in _columns)
                if (col.Tag != null && col.Tag.ToString().StartsWith("query"))
                if (col.Tag != null && !string.IsNullOrEmpty(col.Tag.ToString()))
                {
                    var item = new CboItemEntity();
                    item.Text = col.Tag.ToString().Replace("query_", "") +
                                "（" + col.Caption + "）";
                    item.Text = col.Tag.ToString() + "（" + col.Caption + "）";
                    //item.Value = col.FieldName;
                    item.Value = col.Tag.ToString().Replace("query_", "");
                    item.Value = col.Tag.ToString();
                    repositoryItemComboBox1.Items.Add(item);
                }

@@ -194,6 +193,7 @@
            {
                e.Value = e.Value.ToString();
                e.Handled = true;

            }
        }


 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -7,9 +7,11 @@
using System.Net;
using System.Text;
using System.Windows.Forms;
using DevExpress.Utils.Text.Internal;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
using Gs.DevApp.DevFrm.Rpt;
@@ -715,7 +717,8 @@
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;

                if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("查询")) {
                if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("查询"))
                {
                    if (dt == null || dt.Rows.Count <= 0)
                    {
                        dt.Columns.Add("guid", typeof(string));
@@ -1139,7 +1142,7 @@
        }

        /// <summary>
        /// 读取xml配置，目前配置gcMain1,layoutMx1
        /// 读取xml配置，目前配置gcMain1,layoutMx1,加查询条件
        /// </summary>
        public void getXmlConfig()
        {
@@ -1227,6 +1230,27 @@

                        }
                    }
                    //设置查询条件beg
                    GridControl gcMain = parentForm.Controls.Find("gcMain1", true).OfType<GridControl>().FirstOrDefault();
                    if (gcMain != null)
                    {
                        GridView gv1 = gcMain.MainView as GridView;
                        if (gv1 != null)
                        {
                            foreach (var a in _job["rtnData"]["list2"])
                            {
                                string _gvColName = a["gvColName"].ToString();
                                string _sqlField = a["sqlField"].ToString();
                                var column = gv1.Columns.Cast<DevExpress.XtraGrid.Columns.GridColumn>()
                                                .FirstOrDefault(c => c.Name == _gvColName);
                                if (column != null)
                                {
                                    column.Tag = _sqlField;
                                }
                            }
                        }
                    }
                    //设置查询条件end
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);