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 | 160 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 91 insertions(+), 69 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs index 420ee79..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. @@ -55,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(); @@ -68,16 +69,17 @@ 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(); @@ -97,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 @@ -154,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"; @@ -167,8 +170,9 @@ // 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 @@ -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"; @@ -234,7 +240,7 @@ // gv_lineNo // 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"; @@ -280,7 +286,7 @@ 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 @@ -293,7 +299,7 @@ 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 @@ -306,7 +312,7 @@ 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 @@ -319,34 +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.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.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 // @@ -382,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; @@ -389,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); @@ -397,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}); @@ -416,20 +441,6 @@ this.lbGuid.TabIndex = 1; this.lbGuid.Text = "lbGuid"; this.lbGuid.Visible = false; - // - // txt_lineType - // - this.txt_lineType.Location = new System.Drawing.Point(360, 75); - 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 // @@ -470,7 +481,7 @@ // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(84, 107); + this.txt_remark.Location = new System.Drawing.Point(360, 75); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; this.txt_remark.Size = new System.Drawing.Size(200, 24); @@ -489,12 +500,21 @@ // // txt_isZxbg // - this.txt_isZxbg.Location = new System.Drawing.Point(288, 107); + 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 // @@ -516,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; @@ -581,16 +601,6 @@ 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, 95); - 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; @@ -612,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, 63); - 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, 95); + 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 // @@ -662,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; @@ -703,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; @@ -716,13 +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.XtraLayout.LayoutControlItem layoutControlItem8; 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