From 12c3680f0b8d0c210b76a11819132d36fc938e26 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 26 七月 2025 10:29:30 +0800
Subject: [PATCH] 增加部门产线对应表

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs |  208 +++++++++++++++++++++++++++-------------------------
 1 files changed, 108 insertions(+), 100 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index a79ae60..2ecd22d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -1,7 +1,7 @@
 /* Create By GS EasyCode */
 namespace Gs.DevApp.DevFrm
 {
-    partial class Frm_MesWorkshopLine 
+    partial class Frm_MesWorkshopLine
     {
         /// <summary>
         /// Required designer variable.
@@ -29,6 +29,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -54,12 +55,13 @@
             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.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             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.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_name = new DevExpress.XtraEditors.TextEdit();
@@ -67,16 +69,18 @@
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
             this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_isZxbg = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_lineType = 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.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -95,23 +99,23 @@
             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.txt_lineType.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.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -152,6 +156,7 @@
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -165,14 +170,14 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
@@ -185,7 +190,6 @@
             // 
             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[] {
@@ -199,7 +203,9 @@
             this.gv_lastupdateBy,
             this.gv_lastupdateDate,
             this.gv_lineType,
-            this.gv_isZxbg});
+            this.gv_isZxbg,
+            this.gridColumn2,
+            this.gridColumn3});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -209,7 +215,6 @@
             // 
             // 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";
@@ -234,9 +239,8 @@
             // 
             // 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.Caption = "绾夸綋缂栧彿";
             this.gv_lineNo.FieldName = "lineNo";
             this.gv_lineNo.MinWidth = 50;
             this.gv_lineNo.Name = "gv_lineNo";
@@ -248,7 +252,6 @@
             // 
             // 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";
@@ -262,7 +265,6 @@
             // 
             // 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";
@@ -276,7 +278,6 @@
             // 
             // gv_createBy
             // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "寤虹珛鑰�";
             this.gv_createBy.FieldName = "createBy";
@@ -285,12 +286,11 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 5;
+            this.gv_createBy.VisibleIndex = 7;
             this.gv_createBy.Width = 63;
             // 
             // gv_createDate
             // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "寤虹珛鏃堕棿";
             this.gv_createDate.FieldName = "createDate";
@@ -299,12 +299,11 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 6;
+            this.gv_createDate.VisibleIndex = 8;
             this.gv_createDate.Width = 180;
             // 
             // gv_lastupdateBy
             // 
-            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";
@@ -313,12 +312,11 @@
             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.VisibleIndex = 9;
             this.gv_lastupdateBy.Width = 63;
             // 
             // gv_lastupdateDate
             // 
-            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";
@@ -327,36 +325,52 @@
             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.VisibleIndex = 10;
             this.gv_lastupdateDate.Width = 180;
             // 
             // gv_lineType
             // 
-            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.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.VisibleIndex = 6;
             this.gv_lineType.Width = 80;
             // 
             // gv_isZxbg
             // 
-            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.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.VisibleIndex = 5;
             this.gv_isZxbg.Width = 50;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "绾夸綋ID";
+            this.gridColumn2.FieldName = "id";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 11;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "涓婚敭Guid";
+            this.gridColumn3.FieldName = "guid";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Width = 94;
             // 
             // pageBar1
             // 
@@ -392,6 +406,7 @@
             // splitMx1.Panel2
             // 
             this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
             this.splitMx1.SplitterPosition = 147;
             this.splitMx1.TabIndex = 0;
@@ -399,7 +414,6 @@
             // 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);
@@ -407,6 +421,7 @@
             this.layoutMx1.Controls.Add(this.txt_remark);
             this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
             this.layoutMx1.Controls.Add(this.txt_isZxbg);
+            this.layoutMx1.Controls.Add(this.txt_lineType);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem9});
@@ -427,67 +442,49 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_lineType
-            // 
-            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)});
-            this.txt_lineType.Properties.Items.AddRange(new object[] {
-            "鎵嬪伐绾�",
-            "鑷姩绾�"});
-            this.txt_lineType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            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(84, 12);
             this.txt_dptId.Name = "txt_dptId";
-            this.txt_dptId.Size = new System.Drawing.Size(200, 28);
+            this.txt_dptId.Size = new System.Drawing.Size(200, 24);
             this.txt_dptId.TabIndex = 244;
             // 
             // txt_lineNo
             // 
-            this.txt_lineNo.Location = new System.Drawing.Point(84, 44);
+            this.txt_lineNo.Location = new System.Drawing.Point(84, 43);
             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.Size = new System.Drawing.Size(200, 24);
             this.txt_lineNo.StyleController = this.layoutMx1;
             this.txt_lineNo.TabIndex = 216;
             this.txt_lineNo.Tag = "";
             // 
             // txt_name
             // 
-            this.txt_name.Location = new System.Drawing.Point(84, 76);
+            this.txt_name.Location = new System.Drawing.Point(84, 75);
             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.Size = new System.Drawing.Size(200, 24);
             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.Location = new System.Drawing.Point(360, 43);
             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.Size = new System.Drawing.Size(200, 24);
             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.Location = new System.Drawing.Point(360, 75);
             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.Size = new System.Drawing.Size(200, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 219;
             // 
@@ -495,21 +492,29 @@
             // 
             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.Size = new System.Drawing.Size(200, 24);
             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.Location = new System.Drawing.Point(12, 107);
             this.txt_isZxbg.Name = "txt_isZxbg";
-            this.txt_isZxbg.Properties.Caption = "鏁寸嚎鎶ュ伐";
+            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;
+            // 
+            // txt_lineType
+            // 
+            this.txt_lineType.Location = new System.Drawing.Point(288, 107);
+            this.txt_lineType.Name = "txt_lineType";
+            this.txt_lineType.Properties.Caption = "杩囩珯鏃跺己鍒舵按妫�";
+            this.txt_lineType.Size = new System.Drawing.Size(272, 24);
+            this.txt_lineType.StyleController = this.layoutMx1;
+            this.txt_lineType.TabIndex = 247;
             // 
             // layoutControlItem9
             // 
@@ -531,11 +536,11 @@
             this.layoutControlItem1,
             this.layoutControlItem2,
             this.layoutControlItem3,
-            this.layoutControlItem4,
             this.layoutControlItem5,
             this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem8});
+            this.layoutControlItem4,
+            this.layoutControlItem8,
+            this.layoutControlItem10});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -564,7 +569,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1126, 148);
+            this.Root.Size = new System.Drawing.Size(1126, 147);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -572,14 +577,14 @@
             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.Size = new System.Drawing.Size(276, 31);
             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.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
@@ -589,22 +594,12 @@
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_name;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 63);
             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
             // 
@@ -612,14 +607,14 @@
             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.Size = new System.Drawing.Size(276, 31);
             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.Location = new System.Drawing.Point(276, 31);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
@@ -627,28 +622,38 @@
             this.layoutControlItem6.Text = "鏇存柊鏃堕棿";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem7
+            // layoutControlItem4
             // 
-            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);
+            this.layoutControlItem4.Control = this.txt_remark;
+            this.layoutControlItem4.Location = new System.Drawing.Point(276, 63);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem4.Text = "澶囨敞";
+            this.layoutControlItem4.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.Location = new System.Drawing.Point(0, 95);
             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.Text = "杩囩珯鏃跺己鍒堕噰闆嗘暟鎹�";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_lineType;
+            this.layoutControlItem10.Location = new System.Drawing.Point(276, 95);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
             // 
             // Frm_MesWorkshopLine
             // 
@@ -677,28 +682,28 @@
             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.txt_lineType.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.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
-      private UserControl.UcToolBarMenu toolBarMenu1;
+        private UserControl.UcToolBarMenu toolBarMenu1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraEditors.SplitContainerControl split1;
@@ -718,7 +723,6 @@
         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;
@@ -731,12 +735,16 @@
         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.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraEditors.CheckEdit txt_lineType;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3