From 19b6888b86359c49f8d463b43794170db1862b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= Date: Wed, 13 Mar 2024 18:21:03 +0800 Subject: [PATCH] mege --- .../SystemSetting/EditParaColForm.Designer.cs | 607 ++++++++++------- .../Forms/SystemSetting/EditParaColForm.cs | 52 +- .../ParaColManagerForm.Designer.cs | 292 +++++--- .../Forms/SystemSetting/ParaSettingForm.cs | 46 +- .../Forms/TestForms/EditTestStep.Designer.cs | 374 ++++++++++ .../Forms/TestForms/EditTestStep.cs | 136 ++++ .../Forms/TestForms/EditTestStep.resx | 120 ++++ .../TestForms/TestStepManager.Designer.cs | 642 ++++++++++++++++++ .../Forms/TestForms/TestStepManager.cs | 116 ++++ .../Forms/TestForms/TestStepManager.resx | 123 ++++ ProductionSystem/ProductionSystem.csproj | 18 + .../DbModel/Para/T_ParaColumnConfig.cs | 14 + ProductionSystem_Model/DbModel/Test_Step.cs | 63 ++ .../ProductionSystem_Model.csproj | 2 + .../ViewModel/Request/Test/TestStepVM.cs | 61 ++ .../ParaColumnConfigService.cs | 8 + .../ProductionSystem_Service.csproj | 1 + ProductionSystem_Service/TestStepService.cs | 139 ++++ 18 files changed, 2419 insertions(+), 395 deletions(-) create mode 100644 ProductionSystem/Forms/TestForms/EditTestStep.Designer.cs create mode 100644 ProductionSystem/Forms/TestForms/EditTestStep.cs create mode 100644 ProductionSystem/Forms/TestForms/EditTestStep.resx create mode 100644 ProductionSystem/Forms/TestForms/TestStepManager.Designer.cs create mode 100644 ProductionSystem/Forms/TestForms/TestStepManager.cs create mode 100644 ProductionSystem/Forms/TestForms/TestStepManager.resx create mode 100644 ProductionSystem_Model/DbModel/Test_Step.cs create mode 100644 ProductionSystem_Model/ViewModel/Request/Test/TestStepVM.cs create mode 100644 ProductionSystem_Service/TestStepService.cs diff --git a/ProductionSystem/Forms/SystemSetting/EditParaColForm.Designer.cs b/ProductionSystem/Forms/SystemSetting/EditParaColForm.Designer.cs index a7c86bf..9ffccde 100644 --- a/ProductionSystem/Forms/SystemSetting/EditParaColForm.Designer.cs +++ b/ProductionSystem/Forms/SystemSetting/EditParaColForm.Designer.cs @@ -40,6 +40,8 @@ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.lkTestTime = new DevExpress.XtraEditors.LookUpEdit(); + this.lkWaiterTime = new DevExpress.XtraEditors.LookUpEdit(); this.stackPanel1 = new DevExpress.Utils.Layout.StackPanel(); this.btnCancel = new DevExpress.XtraEditors.SimpleButton(); this.btnSave = new DevExpress.XtraEditors.SimpleButton(); @@ -61,13 +63,12 @@ this.lkUpCollectPlcStartAddress = new DevExpress.XtraEditors.LookUpEdit(); this.lkUpTestResultPlcStartAddress = new DevExpress.XtraEditors.LookUpEdit(); this.lkUpIsMustPlcStartAddress = new DevExpress.XtraEditors.LookUpEdit(); + this.ckIsShowColConfig = new DevExpress.XtraEditors.CheckEdit(); 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.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -75,17 +76,23 @@ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.Loading = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::ProductionSystem.Forms.CommonForms.WaitForm1), true, true); - this.ckIsShowColConfig = new DevExpress.XtraEditors.CheckEdit(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.waiterTime = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.lkTestTime.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.lkWaiterTime.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.stackPanel1)).BeginInit(); this.stackPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.cmbProductType.Properties)).BeginInit(); @@ -106,13 +113,12 @@ ((System.ComponentModel.ISupportInitialize)(this.lkUpCollectPlcStartAddress.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lkUpTestResultPlcStartAddress.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lkUpIsMustPlcStartAddress.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ckIsShowColConfig.Properties)).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.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); @@ -120,18 +126,24 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.ckIsShowColConfig.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.waiterTime)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); this.SuspendLayout(); // // layoutControl1 // + this.layoutControl1.Controls.Add(this.lkTestTime); + this.layoutControl1.Controls.Add(this.lkWaiterTime); this.layoutControl1.Controls.Add(this.stackPanel1); this.layoutControl1.Controls.Add(this.cmbProductType); this.layoutControl1.Controls.Add(this.cmbParaCategory); @@ -153,21 +165,59 @@ this.layoutControl1.Controls.Add(this.lkUpIsMustPlcStartAddress); this.layoutControl1.Controls.Add(this.ckIsShowColConfig); this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.layoutControl1.Location = new System.Drawing.Point(0, 43); + this.layoutControl1.Location = new System.Drawing.Point(0, 55); + this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1365, 399); + this.layoutControl1.Size = new System.Drawing.Size(1560, 513); this.layoutControl1.TabIndex = 2; this.layoutControl1.Text = "layoutControl1"; // + // lkTestTime + // + this.lkTestTime.Location = new System.Drawing.Point(1328, 230); + this.lkTestTime.Name = "lkTestTime"; + this.lkTestTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.lkTestTime.Properties.Appearance.Options.UseFont = true; + this.lkTestTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.lkTestTime.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + this.lkTestTime.Properties.NullText = ""; + this.lkTestTime.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); + this.lkTestTime.Size = new System.Drawing.Size(235, 28); + this.lkTestTime.StyleController = this.layoutControl1; + this.lkTestTime.TabIndex = 34; + // + // lkWaiterTime + // + this.lkWaiterTime.Location = new System.Drawing.Point(895, 230); + this.lkWaiterTime.Name = "lkWaiterTime"; + this.lkWaiterTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.lkWaiterTime.Properties.Appearance.Options.UseFont = true; + this.lkWaiterTime.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 10.5F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic)))); + this.lkWaiterTime.Properties.AppearanceFocused.Options.UseFont = true; + this.lkWaiterTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.lkWaiterTime.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + this.lkWaiterTime.Properties.NullText = ""; + this.lkWaiterTime.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); + this.lkWaiterTime.Size = new System.Drawing.Size(235, 28); + this.lkWaiterTime.StyleController = this.layoutControl1; + this.lkWaiterTime.TabIndex = 33; + // // stackPanel1 // this.stackPanel1.Controls.Add(this.btnCancel); this.stackPanel1.Controls.Add(this.btnSave); - this.stackPanel1.Location = new System.Drawing.Point(983, 336); + this.stackPanel1.Location = new System.Drawing.Point(1138, 414); + this.stackPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.stackPanel1.Name = "stackPanel1"; this.stackPanel1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.stackPanel1.Size = new System.Drawing.Size(370, 51); + this.stackPanel1.Size = new System.Drawing.Size(429, 66); this.stackPanel1.TabIndex = 25; // // btnCancel @@ -176,10 +226,11 @@ this.btnCancel.Appearance.Options.UseFont = true; this.btnCancel.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_gray; this.btnCancel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnCancel.Location = new System.Drawing.Point(267, 4); + this.btnCancel.Location = new System.Drawing.Point(312, 5); + this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnCancel.Name = "btnCancel"; this.btnCancel.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; - this.btnCancel.Size = new System.Drawing.Size(100, 43); + this.btnCancel.Size = new System.Drawing.Size(114, 55); this.btnCancel.TabIndex = 1; this.btnCancel.Text = "取消"; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); @@ -192,17 +243,19 @@ this.btnSave.Appearance.Options.UseForeColor = true; this.btnSave.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; this.btnSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.btnSave.Location = new System.Drawing.Point(161, 4); + this.btnSave.Location = new System.Drawing.Point(192, 5); + this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnSave.Name = "btnSave"; this.btnSave.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; - this.btnSave.Size = new System.Drawing.Size(100, 43); + this.btnSave.Size = new System.Drawing.Size(114, 55); this.btnSave.TabIndex = 0; this.btnSave.Text = "保存"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); // // cmbProductType // - this.cmbProductType.Location = new System.Drawing.Point(135, 25); + this.cmbProductType.Location = new System.Drawing.Point(202, 29); + this.cmbProductType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cmbProductType.Name = "cmbProductType"; this.cmbProductType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.cmbProductType.Properties.Appearance.Options.UseFont = true; @@ -216,15 +269,16 @@ this.cmbProductType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.cmbProductType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.cmbProductType.Size = new System.Drawing.Size(243, 24); + this.cmbProductType.Size = new System.Drawing.Size(235, 29); this.cmbProductType.StyleController = this.layoutControl1; this.cmbProductType.TabIndex = 4; this.cmbProductType.Tag = "NotNull&产品型号&True"; - this.cmbProductType.SelectedIndexChanged += new System.EventHandler(this.cmbProductType_SelectedIndexChanged); + this.cmbProductType.SelectedIndexChanged += new System.EventHandler(this.cmbTestStepCategory_SelectedIndexChanged); // // cmbParaCategory // - this.cmbParaCategory.Location = new System.Drawing.Point(508, 25); + this.cmbParaCategory.Location = new System.Drawing.Point(635, 29); + this.cmbParaCategory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cmbParaCategory.Name = "cmbParaCategory"; this.cmbParaCategory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.cmbParaCategory.Properties.Appearance.Options.UseFont = true; @@ -238,7 +292,7 @@ this.cmbParaCategory.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.cmbParaCategory.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.cmbParaCategory.Size = new System.Drawing.Size(94, 24); + this.cmbParaCategory.Size = new System.Drawing.Size(62, 29); this.cmbParaCategory.StyleController = this.layoutControl1; this.cmbParaCategory.TabIndex = 5; this.cmbParaCategory.Tag = "NotNull&参数类别&True"; @@ -246,43 +300,47 @@ // // txtParaCode // - this.txtParaCode.Location = new System.Drawing.Point(732, 25); + this.txtParaCode.Location = new System.Drawing.Point(895, 29); + this.txtParaCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtParaCode.Name = "txtParaCode"; this.txtParaCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.txtParaCode.Properties.Appearance.Options.UseFont = true; this.txtParaCode.Properties.AutoHeight = false; - this.txtParaCode.Size = new System.Drawing.Size(244, 24); + this.txtParaCode.Size = new System.Drawing.Size(235, 29); this.txtParaCode.StyleController = this.layoutControl1; this.txtParaCode.TabIndex = 6; this.txtParaCode.Tag = "NotNull&参数编码&True"; // // txtParaName // - this.txtParaName.Location = new System.Drawing.Point(1106, 25); + this.txtParaName.Location = new System.Drawing.Point(1328, 29); + this.txtParaName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtParaName.Name = "txtParaName"; this.txtParaName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.txtParaName.Properties.Appearance.Options.UseFont = true; this.txtParaName.Properties.AutoHeight = false; - this.txtParaName.Size = new System.Drawing.Size(244, 24); + this.txtParaName.Size = new System.Drawing.Size(235, 29); this.txtParaName.StyleController = this.layoutControl1; this.txtParaName.TabIndex = 7; this.txtParaName.Tag = "NotNull&参数名称&True"; // // txtSortIndex // - this.txtSortIndex.Location = new System.Drawing.Point(508, 187); + this.txtSortIndex.Location = new System.Drawing.Point(635, 230); + this.txtSortIndex.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtSortIndex.Name = "txtSortIndex"; this.txtSortIndex.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.txtSortIndex.Properties.Appearance.Options.UseFont = true; this.txtSortIndex.Properties.AutoHeight = false; - this.txtSortIndex.Size = new System.Drawing.Size(94, 24); + this.txtSortIndex.Size = new System.Drawing.Size(62, 29); this.txtSortIndex.StyleController = this.layoutControl1; this.txtSortIndex.TabIndex = 17; this.txtSortIndex.Tag = "NotNull&排序索引&True"; // // ckIsMust // - this.ckIsMust.Location = new System.Drawing.Point(15, 241); + this.ckIsMust.Location = new System.Drawing.Point(16, 297); + this.ckIsMust.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ckIsMust.Name = "ckIsMust"; this.ckIsMust.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.ckIsMust.Properties.Appearance.Options.UseFont = true; @@ -290,13 +348,14 @@ this.ckIsMust.Properties.AppearanceFocused.Options.UseFont = true; this.ckIsMust.Properties.AutoHeight = false; this.ckIsMust.Properties.Caption = "是否必须"; - this.ckIsMust.Size = new System.Drawing.Size(363, 24); + this.ckIsMust.Size = new System.Drawing.Size(421, 29); this.ckIsMust.StyleController = this.layoutControl1; this.ckIsMust.TabIndex = 18; // // ckIsShowMain // - this.ckIsShowMain.Location = new System.Drawing.Point(612, 241); + this.ckIsShowMain.Location = new System.Drawing.Point(709, 297); + this.ckIsShowMain.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ckIsShowMain.Name = "ckIsShowMain"; this.ckIsShowMain.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.ckIsShowMain.Properties.Appearance.Options.UseFont = true; @@ -304,14 +363,15 @@ this.ckIsShowMain.Properties.AppearanceFocused.Options.UseFont = true; this.ckIsShowMain.Properties.AutoHeight = false; this.ckIsShowMain.Properties.Caption = "是否在主界面显示"; - this.ckIsShowMain.Size = new System.Drawing.Size(364, 24); + this.ckIsShowMain.Size = new System.Drawing.Size(421, 29); this.ckIsShowMain.StyleController = this.layoutControl1; this.ckIsShowMain.TabIndex = 19; // // ckIsActive // this.ckIsActive.EditValue = true; - this.ckIsActive.Location = new System.Drawing.Point(986, 241); + this.ckIsActive.Location = new System.Drawing.Point(1142, 297); + this.ckIsActive.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ckIsActive.Name = "ckIsActive"; this.ckIsActive.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.ckIsActive.Properties.Appearance.Options.UseFont = true; @@ -319,24 +379,26 @@ this.ckIsActive.Properties.AppearanceFocused.Options.UseFont = true; this.ckIsActive.Properties.AutoHeight = false; this.ckIsActive.Properties.Caption = "是否有效"; - this.ckIsActive.Size = new System.Drawing.Size(364, 24); + this.ckIsActive.Size = new System.Drawing.Size(421, 29); this.ckIsActive.StyleController = this.layoutControl1; this.ckIsActive.TabIndex = 20; // // txtRemark // - this.txtRemark.Location = new System.Drawing.Point(135, 285); + this.txtRemark.Location = new System.Drawing.Point(202, 351); + this.txtRemark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtRemark.Name = "txtRemark"; this.txtRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.txtRemark.Properties.Appearance.Options.UseFont = true; this.txtRemark.Properties.AutoHeight = false; - this.txtRemark.Size = new System.Drawing.Size(1215, 44); + this.txtRemark.Size = new System.Drawing.Size(1361, 55); this.txtRemark.StyleController = this.layoutControl1; this.txtRemark.TabIndex = 21; // // ckTargetReadonly // - this.ckTargetReadonly.Location = new System.Drawing.Point(388, 79); + this.ckTargetReadonly.Location = new System.Drawing.Point(449, 96); + this.ckTargetReadonly.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ckTargetReadonly.Name = "ckTargetReadonly"; this.ckTargetReadonly.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.ckTargetReadonly.Properties.Appearance.Options.UseFont = true; @@ -344,13 +406,14 @@ this.ckTargetReadonly.Properties.AppearanceFocused.Options.UseFont = true; this.ckTargetReadonly.Properties.AutoHeight = false; this.ckTargetReadonly.Properties.Caption = "目标值是否只读"; - this.ckTargetReadonly.Size = new System.Drawing.Size(214, 24); + this.ckTargetReadonly.Size = new System.Drawing.Size(248, 29); this.ckTargetReadonly.StyleController = this.layoutControl1; this.ckTargetReadonly.TabIndex = 22; // // ckMaxReadonly // - this.ckMaxReadonly.Location = new System.Drawing.Point(986, 79); + this.ckMaxReadonly.Location = new System.Drawing.Point(1142, 96); + this.ckMaxReadonly.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ckMaxReadonly.Name = "ckMaxReadonly"; this.ckMaxReadonly.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.ckMaxReadonly.Properties.Appearance.Options.UseFont = true; @@ -358,13 +421,14 @@ this.ckMaxReadonly.Properties.AppearanceFocused.Options.UseFont = true; this.ckMaxReadonly.Properties.AutoHeight = false; this.ckMaxReadonly.Properties.Caption = "上限值是否只读"; - this.ckMaxReadonly.Size = new System.Drawing.Size(364, 24); + this.ckMaxReadonly.Size = new System.Drawing.Size(421, 29); this.ckMaxReadonly.StyleController = this.layoutControl1; this.ckMaxReadonly.TabIndex = 23; // // ckMinReadonly // - this.ckMinReadonly.Location = new System.Drawing.Point(388, 133); + this.ckMinReadonly.Location = new System.Drawing.Point(449, 163); + this.ckMinReadonly.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ckMinReadonly.Name = "ckMinReadonly"; this.ckMinReadonly.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.ckMinReadonly.Properties.Appearance.Options.UseFont = true; @@ -372,13 +436,14 @@ this.ckMinReadonly.Properties.AppearanceFocused.Options.UseFont = true; this.ckMinReadonly.Properties.AutoHeight = false; this.ckMinReadonly.Properties.Caption = "下限值是否只读"; - this.ckMinReadonly.Size = new System.Drawing.Size(214, 24); + this.ckMinReadonly.Size = new System.Drawing.Size(248, 29); this.ckMinReadonly.StyleController = this.layoutControl1; this.ckMinReadonly.TabIndex = 24; // // lkUpTargetPlcStartAddress // - this.lkUpTargetPlcStartAddress.Location = new System.Drawing.Point(135, 79); + this.lkUpTargetPlcStartAddress.Location = new System.Drawing.Point(202, 96); + this.lkUpTargetPlcStartAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lkUpTargetPlcStartAddress.Name = "lkUpTargetPlcStartAddress"; this.lkUpTargetPlcStartAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.lkUpTargetPlcStartAddress.Properties.Appearance.Options.UseFont = true; @@ -390,18 +455,19 @@ this.lkUpTargetPlcStartAddress.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.lkUpTargetPlcStartAddress.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 100, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 300, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); this.lkUpTargetPlcStartAddress.Properties.NullText = ""; - this.lkUpTargetPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(400, 0); - this.lkUpTargetPlcStartAddress.Size = new System.Drawing.Size(243, 24); + this.lkUpTargetPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); + this.lkUpTargetPlcStartAddress.Size = new System.Drawing.Size(235, 29); this.lkUpTargetPlcStartAddress.StyleController = this.layoutControl1; this.lkUpTargetPlcStartAddress.TabIndex = 8; this.lkUpTargetPlcStartAddress.Tag = "NotNull&目标值PLC地址&True"; // // lkUpMaxPlcStartAddress // - this.lkUpMaxPlcStartAddress.Location = new System.Drawing.Point(732, 79); + this.lkUpMaxPlcStartAddress.Location = new System.Drawing.Point(895, 96); + this.lkUpMaxPlcStartAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lkUpMaxPlcStartAddress.Name = "lkUpMaxPlcStartAddress"; this.lkUpMaxPlcStartAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.lkUpMaxPlcStartAddress.Properties.Appearance.Options.UseFont = true; @@ -413,18 +479,19 @@ this.lkUpMaxPlcStartAddress.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.lkUpMaxPlcStartAddress.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 100, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 300, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); this.lkUpMaxPlcStartAddress.Properties.NullText = ""; - this.lkUpMaxPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(400, 0); - this.lkUpMaxPlcStartAddress.Size = new System.Drawing.Size(244, 24); + this.lkUpMaxPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); + this.lkUpMaxPlcStartAddress.Size = new System.Drawing.Size(235, 29); this.lkUpMaxPlcStartAddress.StyleController = this.layoutControl1; this.lkUpMaxPlcStartAddress.TabIndex = 11; this.lkUpMaxPlcStartAddress.Tag = "NotNull&上限值PLC地址&True"; // // lkUpMinPlcStartAddress // - this.lkUpMinPlcStartAddress.Location = new System.Drawing.Point(135, 133); + this.lkUpMinPlcStartAddress.Location = new System.Drawing.Point(202, 163); + this.lkUpMinPlcStartAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lkUpMinPlcStartAddress.Name = "lkUpMinPlcStartAddress"; this.lkUpMinPlcStartAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.lkUpMinPlcStartAddress.Properties.Appearance.Options.UseFont = true; @@ -436,18 +503,19 @@ this.lkUpMinPlcStartAddress.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.lkUpMinPlcStartAddress.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 100, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 300, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); this.lkUpMinPlcStartAddress.Properties.NullText = ""; - this.lkUpMinPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(400, 0); - this.lkUpMinPlcStartAddress.Size = new System.Drawing.Size(243, 24); + this.lkUpMinPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); + this.lkUpMinPlcStartAddress.Size = new System.Drawing.Size(235, 29); this.lkUpMinPlcStartAddress.StyleController = this.layoutControl1; this.lkUpMinPlcStartAddress.TabIndex = 14; this.lkUpMinPlcStartAddress.Tag = "NotNull&下限值PLC地址&True"; // // lkUpCollectPlcStartAddress // - this.lkUpCollectPlcStartAddress.Location = new System.Drawing.Point(732, 133); + this.lkUpCollectPlcStartAddress.Location = new System.Drawing.Point(895, 163); + this.lkUpCollectPlcStartAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lkUpCollectPlcStartAddress.Name = "lkUpCollectPlcStartAddress"; this.lkUpCollectPlcStartAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.lkUpCollectPlcStartAddress.Properties.Appearance.Options.UseFont = true; @@ -459,18 +527,19 @@ this.lkUpCollectPlcStartAddress.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.lkUpCollectPlcStartAddress.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 100, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 300, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); this.lkUpCollectPlcStartAddress.Properties.NullText = ""; - this.lkUpCollectPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(400, 0); - this.lkUpCollectPlcStartAddress.Size = new System.Drawing.Size(244, 24); + this.lkUpCollectPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); + this.lkUpCollectPlcStartAddress.Size = new System.Drawing.Size(235, 29); this.lkUpCollectPlcStartAddress.StyleController = this.layoutControl1; this.lkUpCollectPlcStartAddress.TabIndex = 26; this.lkUpCollectPlcStartAddress.Tag = "NotNull&采集值PLC地址&True"; // // lkUpTestResultPlcStartAddress // - this.lkUpTestResultPlcStartAddress.Location = new System.Drawing.Point(1106, 133); + this.lkUpTestResultPlcStartAddress.Location = new System.Drawing.Point(1328, 163); + this.lkUpTestResultPlcStartAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lkUpTestResultPlcStartAddress.Name = "lkUpTestResultPlcStartAddress"; this.lkUpTestResultPlcStartAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.lkUpTestResultPlcStartAddress.Properties.Appearance.Options.UseFont = true; @@ -482,17 +551,18 @@ this.lkUpTestResultPlcStartAddress.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.lkUpTestResultPlcStartAddress.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 100, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 300, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); this.lkUpTestResultPlcStartAddress.Properties.NullText = ""; - this.lkUpTestResultPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(400, 0); - this.lkUpTestResultPlcStartAddress.Size = new System.Drawing.Size(244, 24); + this.lkUpTestResultPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); + this.lkUpTestResultPlcStartAddress.Size = new System.Drawing.Size(235, 29); this.lkUpTestResultPlcStartAddress.StyleController = this.layoutControl1; this.lkUpTestResultPlcStartAddress.TabIndex = 29; // // lkUpIsMustPlcStartAddress // - this.lkUpIsMustPlcStartAddress.Location = new System.Drawing.Point(135, 187); + this.lkUpIsMustPlcStartAddress.Location = new System.Drawing.Point(202, 230); + this.lkUpIsMustPlcStartAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lkUpIsMustPlcStartAddress.Name = "lkUpIsMustPlcStartAddress"; this.lkUpIsMustPlcStartAddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.lkUpIsMustPlcStartAddress.Properties.Appearance.Options.UseFont = true; @@ -504,26 +574,37 @@ this.lkUpIsMustPlcStartAddress.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.lkUpIsMustPlcStartAddress.Properties.Columns.AddRange(new DevExpress.XtraEditors.Controls.LookUpColumnInfo[] { - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 100, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), - new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 300, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Value", "点位地址", 114, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default), + new DevExpress.XtraEditors.Controls.LookUpColumnInfo("Text", "点位名称", 343, DevExpress.Utils.FormatType.None, "", true, DevExpress.Utils.HorzAlignment.Default, DevExpress.Data.ColumnSortOrder.None, DevExpress.Utils.DefaultBoolean.Default)}); this.lkUpIsMustPlcStartAddress.Properties.NullText = ""; - this.lkUpIsMustPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(400, 0); + this.lkUpIsMustPlcStartAddress.Properties.PopupFormMinSize = new System.Drawing.Size(457, 0); this.lkUpIsMustPlcStartAddress.Properties.PopupSizeable = false; - this.lkUpIsMustPlcStartAddress.Size = new System.Drawing.Size(243, 24); + this.lkUpIsMustPlcStartAddress.Size = new System.Drawing.Size(235, 29); this.lkUpIsMustPlcStartAddress.StyleController = this.layoutControl1; this.lkUpIsMustPlcStartAddress.TabIndex = 30; // + // ckIsShowColConfig + // + this.ckIsShowColConfig.Location = new System.Drawing.Point(449, 297); + this.ckIsShowColConfig.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ckIsShowColConfig.Name = "ckIsShowColConfig"; + this.ckIsShowColConfig.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.ckIsShowColConfig.Properties.Appearance.Options.UseFont = true; + this.ckIsShowColConfig.Properties.AutoHeight = false; + this.ckIsShowColConfig.Properties.Caption = "是否在参数配置页面展示"; + this.ckIsShowColConfig.Size = new System.Drawing.Size(248, 29); + this.ckIsShowColConfig.StyleController = this.layoutControl1; + this.ckIsShowColConfig.TabIndex = 31; + // // 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.layoutControlItem22, this.layoutControlItem19, this.layoutControlItem8, this.layoutControlItem20, @@ -531,13 +612,17 @@ this.layoutControlItem21, this.layoutControlItem23, this.layoutControlItem6, - this.layoutControlItem16, - this.layoutControlItem17, - this.layoutControlItem18, this.layoutControlItem7, this.layoutControlItem14, + this.layoutControlItem1, + this.layoutControlItem22, + this.layoutControlItem18, + this.layoutControlItem9, this.layoutControlItem15, - this.layoutControlItem9}); + this.layoutControlItem16, + this.layoutControlItem17, + this.layoutControlItem12, + this.layoutControlItem13}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -575,35 +660,22 @@ rowDefinition5, rowDefinition6, rowDefinition7}); - this.Root.Size = new System.Drawing.Size(1365, 399); + this.Root.Size = new System.Drawing.Size(1579, 492); this.Root.TextVisible = false; // - // layoutControlItem1 - // - this.layoutControlItem1.AllowHtmlStringInCaption = true; - this.layoutControlItem1.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); - this.layoutControlItem1.AppearanceItemCaption.Options.UseFont = true; - this.layoutControlItem1.Control = this.cmbProductType; - this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem1.Size = new System.Drawing.Size(373, 54); - this.layoutControlItem1.Text = "*产品型号："; - this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 17); - // // layoutControlItem2 // this.layoutControlItem2.AllowHtmlStringInCaption = true; this.layoutControlItem2.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem2.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem2.Control = this.cmbParaCategory; - this.layoutControlItem2.Location = new System.Drawing.Point(373, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(433, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem2.Size = new System.Drawing.Size(224, 54); + this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem2.Size = new System.Drawing.Size(260, 67); this.layoutControlItem2.Text = "*参数类别"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem2.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem3 // @@ -611,13 +683,13 @@ this.layoutControlItem3.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem3.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem3.Control = this.txtParaCode; - this.layoutControlItem3.Location = new System.Drawing.Point(597, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(693, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem3.Size = new System.Drawing.Size(374, 54); + this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem3.Size = new System.Drawing.Size(433, 67); this.layoutControlItem3.Text = "*参数编码"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem3.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem4 // @@ -625,13 +697,13 @@ this.layoutControlItem4.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem4.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem4.Control = this.txtParaName; - this.layoutControlItem4.Location = new System.Drawing.Point(971, 0); + this.layoutControlItem4.Location = new System.Drawing.Point(1126, 0); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem4.Size = new System.Drawing.Size(374, 54); + this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem4.Size = new System.Drawing.Size(433, 67); this.layoutControlItem4.Text = "*参数名称"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem4.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem5 // @@ -639,34 +711,23 @@ this.layoutControlItem5.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem5.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem5.Control = this.lkUpTargetPlcStartAddress; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 54); + this.layoutControlItem5.Location = new System.Drawing.Point(0, 67); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem5.Size = new System.Drawing.Size(373, 54); + this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem5.Size = new System.Drawing.Size(433, 67); this.layoutControlItem5.Text = "目标值PLC地址"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 17); - // - // layoutControlItem22 - // - this.layoutControlItem22.Control = this.stackPanel1; - this.layoutControlItem22.Location = new System.Drawing.Point(971, 324); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem22.Size = new System.Drawing.Size(374, 55); - this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem22.TextVisible = false; + this.layoutControlItem5.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem19 // this.layoutControlItem19.Control = this.ckTargetReadonly; - this.layoutControlItem19.Location = new System.Drawing.Point(373, 54); + this.layoutControlItem19.Location = new System.Drawing.Point(433, 67); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem19.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem19.Size = new System.Drawing.Size(224, 54); + this.layoutControlItem19.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem19.Size = new System.Drawing.Size(260, 67); this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem19.TextVisible = false; // @@ -676,26 +737,26 @@ this.layoutControlItem8.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem8.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem8.Control = this.lkUpMaxPlcStartAddress; - this.layoutControlItem8.Location = new System.Drawing.Point(597, 54); + this.layoutControlItem8.Location = new System.Drawing.Point(693, 67); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem8.Size = new System.Drawing.Size(374, 54); + this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem8.Size = new System.Drawing.Size(433, 67); this.layoutControlItem8.Text = "上限值PLC地址"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem8.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem20 // this.layoutControlItem20.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem20.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem20.Control = this.ckMaxReadonly; - this.layoutControlItem20.Location = new System.Drawing.Point(971, 54); + this.layoutControlItem20.Location = new System.Drawing.Point(1126, 67); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem20.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem20.Size = new System.Drawing.Size(374, 54); + this.layoutControlItem20.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem20.Size = new System.Drawing.Size(433, 67); this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem20.TextVisible = false; // @@ -705,23 +766,23 @@ this.layoutControlItem11.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem11.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem11.Control = this.lkUpMinPlcStartAddress; - this.layoutControlItem11.Location = new System.Drawing.Point(0, 108); + this.layoutControlItem11.Location = new System.Drawing.Point(0, 134); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem11.Size = new System.Drawing.Size(373, 54); + this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem11.Size = new System.Drawing.Size(433, 67); this.layoutControlItem11.Text = "下限值PLC地址"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem11.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem21 // this.layoutControlItem21.Control = this.ckMinReadonly; - this.layoutControlItem21.Location = new System.Drawing.Point(373, 108); + this.layoutControlItem21.Location = new System.Drawing.Point(433, 134); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem21.Size = new System.Drawing.Size(224, 54); + this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem21.Size = new System.Drawing.Size(260, 67); this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem21.TextVisible = false; // @@ -731,14 +792,14 @@ this.layoutControlItem23.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem23.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem23.Control = this.lkUpCollectPlcStartAddress; - this.layoutControlItem23.Location = new System.Drawing.Point(597, 108); + this.layoutControlItem23.Location = new System.Drawing.Point(693, 134); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem23.Size = new System.Drawing.Size(374, 54); + this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem23.Size = new System.Drawing.Size(433, 67); this.layoutControlItem23.Text = "采集值PLC地址"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem23.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem6 // @@ -746,69 +807,27 @@ this.layoutControlItem6.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem6.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem6.Control = this.lkUpTestResultPlcStartAddress; - this.layoutControlItem6.Location = new System.Drawing.Point(971, 108); + this.layoutControlItem6.Location = new System.Drawing.Point(1126, 134); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem6.Size = new System.Drawing.Size(374, 54); + this.layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem6.Size = new System.Drawing.Size(433, 67); this.layoutControlItem6.Text = "测试结果PLC地址"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 17); - // - // layoutControlItem16 - // - this.layoutControlItem16.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); - this.layoutControlItem16.AppearanceItemCaption.Options.UseFont = true; - this.layoutControlItem16.Control = this.ckIsShowMain; - this.layoutControlItem16.Location = new System.Drawing.Point(597, 216); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem16.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem16.Size = new System.Drawing.Size(374, 54); - this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem16.TextVisible = false; - // - // layoutControlItem17 - // - this.layoutControlItem17.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); - this.layoutControlItem17.AppearanceItemCaption.Options.UseFont = true; - this.layoutControlItem17.Control = this.ckIsActive; - this.layoutControlItem17.Location = new System.Drawing.Point(971, 216); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem17.Size = new System.Drawing.Size(374, 54); - this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem17.TextVisible = false; - // - // layoutControlItem18 - // - this.layoutControlItem18.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); - this.layoutControlItem18.AppearanceItemCaption.Options.UseFont = true; - this.layoutControlItem18.Control = this.txtRemark; - this.layoutControlItem18.Location = new System.Drawing.Point(0, 270); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 4; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem18.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5); - this.layoutControlItem18.Size = new System.Drawing.Size(1345, 54); - this.layoutControlItem18.Text = "备注"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem6.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem7 // this.layoutControlItem7.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem7.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem7.Control = this.lkUpIsMustPlcStartAddress; - this.layoutControlItem7.Location = new System.Drawing.Point(0, 162); + this.layoutControlItem7.Location = new System.Drawing.Point(0, 201); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem7.Size = new System.Drawing.Size(373, 54); + this.layoutControlItem7.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem7.Size = new System.Drawing.Size(433, 67); this.layoutControlItem7.Text = "是否使用PLC地址"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem7.TextSize = new System.Drawing.Size(174, 22); // // layoutControlItem14 // @@ -816,65 +835,163 @@ this.layoutControlItem14.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem14.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem14.Control = this.txtSortIndex; - this.layoutControlItem14.Location = new System.Drawing.Point(373, 162); + this.layoutControlItem14.Location = new System.Drawing.Point(433, 201); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem14.Size = new System.Drawing.Size(224, 54); + this.layoutControlItem14.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem14.Size = new System.Drawing.Size(260, 67); this.layoutControlItem14.Text = "*排序索引"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 17); + this.layoutControlItem14.TextSize = new System.Drawing.Size(174, 22); + // + // layoutControlItem1 + // + this.layoutControlItem1.AllowHtmlStringInCaption = true; + this.layoutControlItem1.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.layoutControlItem1.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem1.Control = this.cmbProductType; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem1.Size = new System.Drawing.Size(433, 67); + this.layoutControlItem1.Text = "*产品型号："; + this.layoutControlItem1.TextSize = new System.Drawing.Size(174, 22); + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.stackPanel1; + this.layoutControlItem22.Location = new System.Drawing.Point(1126, 402); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem22.Size = new System.Drawing.Size(433, 70); + this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem22.TextVisible = false; + // + // layoutControlItem18 + // + this.layoutControlItem18.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.layoutControlItem18.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem18.Control = this.txtRemark; + this.layoutControlItem18.Location = new System.Drawing.Point(0, 335); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 4; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem18.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6); + this.layoutControlItem18.Size = new System.Drawing.Size(1559, 67); + this.layoutControlItem18.Text = "备注"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(174, 22); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.ckIsShowColConfig; + this.layoutControlItem9.Location = new System.Drawing.Point(433, 268); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem9.Size = new System.Drawing.Size(260, 67); + this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem9.TextVisible = false; // // layoutControlItem15 // this.layoutControlItem15.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); this.layoutControlItem15.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem15.Control = this.ckIsMust; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 216); + this.layoutControlItem15.Location = new System.Drawing.Point(0, 268); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem15.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem15.Size = new System.Drawing.Size(373, 54); + this.layoutControlItem15.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem15.Size = new System.Drawing.Size(433, 67); this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem15.TextVisible = false; // - // Loading + // layoutControlItem16 // - this.Loading.ClosingDelay = 500; + this.layoutControlItem16.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.layoutControlItem16.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem16.Control = this.ckIsShowMain; + this.layoutControlItem16.Location = new System.Drawing.Point(693, 268); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem16.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem16.Size = new System.Drawing.Size(433, 67); + this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem16.TextVisible = false; // - // ckIsShowColConfig + // layoutControlItem17 // - this.ckIsShowColConfig.Location = new System.Drawing.Point(388, 241); - this.ckIsShowColConfig.Name = "ckIsShowColConfig"; - this.ckIsShowColConfig.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); - this.ckIsShowColConfig.Properties.Appearance.Options.UseFont = true; - this.ckIsShowColConfig.Properties.AutoHeight = false; - this.ckIsShowColConfig.Properties.Caption = "是否在参数配置页面展示"; - this.ckIsShowColConfig.Size = new System.Drawing.Size(214, 24); - this.ckIsShowColConfig.StyleController = this.layoutControl1; - this.ckIsShowColConfig.TabIndex = 31; + this.layoutControlItem17.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.layoutControlItem17.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem17.Control = this.ckIsActive; + this.layoutControlItem17.Location = new System.Drawing.Point(1126, 268); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem17.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem17.Size = new System.Drawing.Size(433, 67); + this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem17.TextVisible = false; // - // layoutControlItem9 + // Loading // - this.layoutControlItem9.Control = this.ckIsShowColConfig; - this.layoutControlItem9.Location = new System.Drawing.Point(373, 216); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem9.Size = new System.Drawing.Size(224, 54); - this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem9.TextVisible = false; + this.Loading.ClosingDelay = 500; + // + // waiterTime + // + this.waiterTime.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.waiterTime.AppearanceItemCaption.Options.UseFont = true; + this.waiterTime.Control = this.lkWaiterTime; + this.waiterTime.CustomizationFormText = "等待时间取自PLC地址"; + this.waiterTime.Location = new System.Drawing.Point(0, 264); + this.waiterTime.Name = "waiterTime"; + this.waiterTime.OptionsTableLayoutItem.RowIndex = 4; + this.waiterTime.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.waiterTime.Size = new System.Drawing.Size(433, 66); + this.waiterTime.Text = "等待时间取自PLC地址"; + this.waiterTime.TextSize = new System.Drawing.Size(174, 22); + // + // layoutControlItem12 + // + this.layoutControlItem12.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.layoutControlItem12.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem12.Control = this.lkWaiterTime; + this.layoutControlItem12.CustomizationFormText = "等待时间取自PLC地址"; + this.layoutControlItem12.Location = new System.Drawing.Point(693, 201); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem12.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem12.Size = new System.Drawing.Size(433, 67); + this.layoutControlItem12.Text = "等待时间取自PLC地址"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(174, 22); + // + // layoutControlItem13 + // + this.layoutControlItem13.AppearanceItemCaption.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.layoutControlItem13.AppearanceItemCaption.Options.UseFont = true; + this.layoutControlItem13.Control = this.lkTestTime; + this.layoutControlItem13.CustomizationFormText = "测试时间取自PLC地址"; + this.layoutControlItem13.Location = new System.Drawing.Point(1126, 201); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem13.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem13.Size = new System.Drawing.Size(433, 67); + this.layoutControlItem13.Text = "测试时间取自PLC地址"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(174, 22); // // EditParaColForm // this.Appearance.BackColor = System.Drawing.Color.White; this.Appearance.Options.UseBackColor = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1365, 442); + this.ClientSize = new System.Drawing.Size(1560, 568); this.Controls.Add(this.layoutControl1); - this.Margin = new System.Windows.Forms.Padding(5); + this.Margin = new System.Windows.Forms.Padding(6); this.Name = "EditParaColForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "EditParaColForm"; @@ -882,6 +999,8 @@ this.Controls.SetChildIndex(this.layoutControl1, 0); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.lkTestTime.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.lkWaiterTime.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.stackPanel1)).EndInit(); this.stackPanel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.cmbProductType.Properties)).EndInit(); @@ -902,13 +1021,12 @@ ((System.ComponentModel.ISupportInitialize)(this.lkUpCollectPlcStartAddress.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lkUpTestResultPlcStartAddress.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lkUpIsMustPlcStartAddress.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ckIsShowColConfig.Properties)).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.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); @@ -916,14 +1034,18 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.ckIsShowColConfig.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.waiterTime)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); this.ResumeLayout(false); } @@ -933,7 +1055,6 @@ private DevExpress.XtraLayout.LayoutControl layoutControl1; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraEditors.ComboBoxEdit cmbProductType; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraEditors.ComboBoxEdit cmbParaCategory; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraEditors.TextEdit txtParaCode; @@ -950,7 +1071,6 @@ private DevExpress.XtraEditors.CheckEdit ckMaxReadonly; private DevExpress.XtraEditors.CheckEdit ckMinReadonly; private DevExpress.Utils.Layout.StackPanel stackPanel1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; private DevExpress.XtraEditors.SimpleButton btnCancel; private DevExpress.XtraEditors.SimpleButton btnSave; private DevExpress.XtraSplashScreen.SplashScreenManager Loading; @@ -962,18 +1082,25 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraEditors.LookUpEdit lkUpMaxPlcStartAddress; private DevExpress.XtraEditors.LookUpEdit lkUpMinPlcStartAddress; private DevExpress.XtraEditors.LookUpEdit lkUpCollectPlcStartAddress; private DevExpress.XtraEditors.LookUpEdit lkUpTestResultPlcStartAddress; private DevExpress.XtraEditors.LookUpEdit lkUpIsMustPlcStartAddress; + private DevExpress.XtraEditors.LookUpEdit lkTestTime; + private DevExpress.XtraEditors.LookUpEdit lkWaiterTime; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraEditors.CheckEdit ckIsShowColConfig; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraLayout.LayoutControlItem waiterTime; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; } } \ No newline at end of file diff --git a/ProductionSystem/Forms/SystemSetting/EditParaColForm.cs b/ProductionSystem/Forms/SystemSetting/EditParaColForm.cs index 942fb05..6f6994f 100644 --- a/ProductionSystem/Forms/SystemSetting/EditParaColForm.cs +++ b/ProductionSystem/Forms/SystemSetting/EditParaColForm.cs @@ -1,4 +1,6 @@ -using DevExpress.XtraEditors.Controls; +using DevExpress.XtraEditors; +using DevExpress.XtraEditors.Controls; +using DevExpress.XtraEditors.Repository; using ProductionSystem.Common; using ProductionSystem.Forms.CommonForms; using ProductionSystem.Untils.System; @@ -6,6 +8,7 @@ using ProductionSystem_Model.DbModel.Para; using ProductionSystem_Service; using System; using System.Collections.Generic; +using System.Web.UI.WebControls; using System.Windows.Forms; namespace ProductionSystem.Forms.SystemSetting @@ -15,6 +18,7 @@ namespace ProductionSystem.Forms.SystemSetting private readonly ParaColumnConfigService _paraColumnConfigService = new ParaColumnConfigService(); private readonly DicService _dicService = new DicService(); private readonly ProductTypeService _productTypeService = new ProductTypeService(); + private readonly TestStepService _testStepService = new TestStepService(); /// /// 定义委托 @@ -42,6 +46,7 @@ namespace ProductionSystem.Forms.SystemSetting BindDropDownHelper.BindProductType(cmbProductType); //绑定参数类别 BindDropDownHelper.BindParaCategory(cmbParaCategory); + //绑定点位地址 BindDropDownHelper.BindPlcPoint(lkUpTargetPlcStartAddress, true); BindDropDownHelper.BindPlcPoint(lkUpMaxPlcStartAddress, true); @@ -49,6 +54,8 @@ namespace ProductionSystem.Forms.SystemSetting BindDropDownHelper.BindPlcPoint(lkUpCollectPlcStartAddress, true); BindDropDownHelper.BindPlcPoint(lkUpTestResultPlcStartAddress, true); BindDropDownHelper.BindPlcPoint(lkUpIsMustPlcStartAddress, true); + BindDropDownHelper.BindPlcPoint(lkWaiterTime, true); + BindDropDownHelper.BindPlcPoint(lkTestTime, true); } private void EditParaColForm_Load(object sender, EventArgs e) @@ -70,7 +77,7 @@ namespace ProductionSystem.Forms.SystemSetting Value = productType.ProductCode, Description = productType.ProductTypeName }; - cmbProductType.EditValue = productType.ProductCode; + cmbProductType.EditValue = productType.ProductTypeCode; } var paraCategory = _dicService.QueryActiveDicByCode(paraCol.ParaCategory); if (paraCategory != null) @@ -82,6 +89,7 @@ namespace ProductionSystem.Forms.SystemSetting }; cmbParaCategory.EditValue = checkedListBoxItem; } + //comboBoxEdit1.EditValue = paraCol.TestStepId; txtParaCode.Text = paraCol.ParaCode; txtParaName.Text = paraCol.ParaName; lkUpTargetPlcStartAddress.EditValue = paraCol.TargetPointAddress; @@ -96,6 +104,8 @@ namespace ProductionSystem.Forms.SystemSetting lkUpCollectPlcStartAddress.EditValue = paraCol.CollectPointAddress; lkUpTestResultPlcStartAddress.EditValue = paraCol.TestResultPointAddress; lkUpIsMustPlcStartAddress.EditValue = paraCol.IsMustPointAddress; + lkWaiterTime.EditValue = paraCol.WaiterTime; + lkTestTime.EditValue = paraCol.TestTime; txtSortIndex.Text = paraCol.SortIndex.ToString(); ckIsActive.Checked = paraCol.IsActive; txtRemark.Text = paraCol.Remark; @@ -129,6 +139,26 @@ namespace ProductionSystem.Forms.SystemSetting txtSortIndex.Text = (maxSortIndex + 5).ToString(); } + /// + /// 测试步骤下拉框Change事件 + /// + /// + /// + private void cmbTestStepCategory_SelectedIndexChanged(object sender, EventArgs e) + { + var testStepCategory = (cmbProductType.EditValue).ToString(); + var maxSortIndex = _paraColumnConfigService.QueryTestStepColumnByProductType(testStepCategory); + var dataArr = maxSortIndex.ConvertAll(x => new ListItem(x.TestName,x.Id)); + //comboBoxEdit1.Properties.Items.Clear(); + + //comboBoxEdit1.Properties.Items.AddRange(dataArr); + + //comboBoxEdit1.SelectedIndex = 0; + + } + + + /// /// 点击保存按钮 /// @@ -136,13 +166,14 @@ namespace ProductionSystem.Forms.SystemSetting /// private void btnSave_Click(object sender, EventArgs e) { - var flag = RegexCheckHelper.RegexSave(new Control[] { cmbProductType, cmbParaCategory, txtParaCode, txtParaName, txtSortIndex }, out _); + var flag = RegexCheckHelper.RegexSave(new Control[] { cmbProductType, cmbParaCategory, /*comboBoxEdit1,*/ txtParaCode, txtParaName, txtSortIndex }, out _); if (!flag) { return; } var productType = cmbProductType.EditValue.ToString(); var paraCategory = ((CheckedListBoxItem)cmbParaCategory.EditValue).Value.ToString(); + //var testStep = comboBoxEdit1.EditValue.ToString(); var paraCode = txtParaCode.Text.Trim(); if (CheckParaCodeIsExist(productType, paraCategory, paraCode, _id)) { @@ -186,6 +217,18 @@ namespace ProductionSystem.Forms.SystemSetting poins.Add(isMustPointAddress); } + var theWaiterTime = lkWaiterTime.EditValue?.ToString(); + if (!string.IsNullOrEmpty(theWaiterTime)) + { + poins.Add(theWaiterTime); + } + + var theTestTime = lkTestTime.EditValue?.ToString(); + if (!string.IsNullOrEmpty(theTestTime)) + { + poins.Add(theTestTime); + } + //if (CheckPLcPointAddressIsExist(productType, poins, _id)) //{ // CustomMessageBoxHelper.XtraMessageBoxShow($"PLC点位已被使用！"); @@ -205,6 +248,7 @@ namespace ProductionSystem.Forms.SystemSetting { ProductType = productType, ParaCategory = paraCategory, + //TestStepId = testStep, ParaCode = paraCode, ParaName = txtParaName.Text.Trim(), TargetPointAddress = targetPointAddress, @@ -216,6 +260,8 @@ namespace ProductionSystem.Forms.SystemSetting CollectPointAddress = collectPointAddress, TestResultPointAddress = testResultPointAddress, IsMustPointAddress = isMustPointAddress, + WaiterTime = theWaiterTime, + TestTime = theTestTime, SortIndex = sortIndex, IsMust = ckIsMust.Checked, IsShowMain = ckIsShowMain.Checked, diff --git a/ProductionSystem/Forms/SystemSetting/ParaColManagerForm.Designer.cs b/ProductionSystem/Forms/SystemSetting/ParaColManagerForm.Designer.cs index 84f8c39..f34931d 100644 --- a/ProductionSystem/Forms/SystemSetting/ParaColManagerForm.Designer.cs +++ b/ProductionSystem/Forms/SystemSetting/ParaColManagerForm.Designer.cs @@ -45,6 +45,7 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); this.stackPanel1 = new DevExpress.Utils.Layout.StackPanel(); + this.btnCopyParaCol = new DevExpress.XtraEditors.SimpleButton(); this.btnAdd = new DevExpress.XtraEditors.SimpleButton(); this.btnSearch = new DevExpress.XtraEditors.SimpleButton(); this.cmbParaCategory = new DevExpress.XtraEditors.ComboBoxEdit(); @@ -62,6 +63,7 @@ this.ParaCategoryName = new DevExpress.XtraGrid.Columns.GridColumn(); this.ParaCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.ParaName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.TestStep = new DevExpress.XtraGrid.Columns.GridColumn(); this.TargetPointAddress = new DevExpress.XtraGrid.Columns.GridColumn(); this.StrTargetReadonly = new DevExpress.XtraGrid.Columns.GridColumn(); this.MaxPointAddress = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -72,6 +74,8 @@ this.TestResultPointAddress = new DevExpress.XtraGrid.Columns.GridColumn(); this.IsMustPointAddress = new DevExpress.XtraGrid.Columns.GridColumn(); this.SortIndex = new DevExpress.XtraGrid.Columns.GridColumn(); + this.WaiterTime = new DevExpress.XtraGrid.Columns.GridColumn(); + this.TestTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.StrIsMust = new DevExpress.XtraGrid.Columns.GridColumn(); this.StrIsShowColConfig = new DevExpress.XtraGrid.Columns.GridColumn(); this.StrIsShowMain = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -80,7 +84,6 @@ this.operate = new DevExpress.XtraGrid.Columns.GridColumn(); this.repItemOperate = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.Loading = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::ProductionSystem.Forms.CommonForms.WaitForm1), true, true); - this.btnCopyParaCol = new DevExpress.XtraEditors.SimpleButton(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); this.layoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.stackPanel1)).BeginInit(); @@ -102,10 +105,11 @@ this.layoutControl1.Controls.Add(this.cmbParaCategory); this.layoutControl1.Controls.Add(this.cmbProductType); this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Top; - this.layoutControl1.Location = new System.Drawing.Point(0, 43); + this.layoutControl1.Location = new System.Drawing.Point(0, 55); + this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.Root; - this.layoutControl1.Size = new System.Drawing.Size(1332, 80); + this.layoutControl1.Size = new System.Drawing.Size(1522, 103); this.layoutControl1.TabIndex = 2; this.layoutControl1.Text = "layoutControl1"; // @@ -114,12 +118,30 @@ this.stackPanel1.Controls.Add(this.btnCopyParaCol); this.stackPanel1.Controls.Add(this.btnAdd); this.stackPanel1.Controls.Add(this.btnSearch); - this.stackPanel1.Location = new System.Drawing.Point(996, 12); + this.stackPanel1.Location = new System.Drawing.Point(1137, 12); + this.stackPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.stackPanel1.Name = "stackPanel1"; this.stackPanel1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.stackPanel1.Size = new System.Drawing.Size(324, 56); + this.stackPanel1.Size = new System.Drawing.Size(373, 79); this.stackPanel1.TabIndex = 5; // + // btnCopyParaCol + // + this.btnCopyParaCol.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.btnCopyParaCol.Appearance.ForeColor = System.Drawing.Color.White; + this.btnCopyParaCol.Appearance.Options.UseFont = true; + this.btnCopyParaCol.Appearance.Options.UseForeColor = true; + this.btnCopyParaCol.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; + this.btnCopyParaCol.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.btnCopyParaCol.Location = new System.Drawing.Point(271, 11); + this.btnCopyParaCol.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnCopyParaCol.Name = "btnCopyParaCol"; + this.btnCopyParaCol.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; + this.btnCopyParaCol.Size = new System.Drawing.Size(99, 57); + this.btnCopyParaCol.TabIndex = 2; + this.btnCopyParaCol.Text = "复制"; + this.btnCopyParaCol.Click += new System.EventHandler(this.btnCopyParaCol_Click); + // // btnAdd // this.btnAdd.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); @@ -128,10 +150,11 @@ this.btnAdd.Appearance.Options.UseForeColor = true; this.btnAdd.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; this.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnAdd.Location = new System.Drawing.Point(140, 6); + this.btnAdd.Location = new System.Drawing.Point(164, 12); + this.btnAdd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnAdd.Name = "btnAdd"; this.btnAdd.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; - this.btnAdd.Size = new System.Drawing.Size(88, 43); + this.btnAdd.Size = new System.Drawing.Size(101, 55); this.btnAdd.TabIndex = 1; this.btnAdd.Text = "新增"; this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click); @@ -144,17 +167,19 @@ this.btnSearch.Appearance.Options.UseForeColor = true; this.btnSearch.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; this.btnSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnSearch.Location = new System.Drawing.Point(46, 6); + this.btnSearch.Location = new System.Drawing.Point(57, 12); + this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnSearch.Name = "btnSearch"; this.btnSearch.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; - this.btnSearch.Size = new System.Drawing.Size(88, 43); + this.btnSearch.Size = new System.Drawing.Size(101, 55); this.btnSearch.TabIndex = 0; this.btnSearch.Text = "查询"; this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); // // cmbParaCategory // - this.cmbParaCategory.Location = new System.Drawing.Point(425, 25); + this.cmbParaCategory.Location = new System.Drawing.Point(493, 29); + this.cmbParaCategory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cmbParaCategory.Name = "cmbParaCategory"; this.cmbParaCategory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.cmbParaCategory.Properties.Appearance.Options.UseFont = true; @@ -168,13 +193,14 @@ this.cmbParaCategory.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.cmbParaCategory.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.cmbParaCategory.Size = new System.Drawing.Size(236, 30); + this.cmbParaCategory.Size = new System.Drawing.Size(261, 45); this.cmbParaCategory.StyleController = this.layoutControl1; this.cmbParaCategory.TabIndex = 4; // // cmbProductType // - this.cmbProductType.Location = new System.Drawing.Point(97, 25); + this.cmbProductType.Location = new System.Drawing.Point(118, 29); + this.cmbProductType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cmbProductType.Name = "cmbProductType"; this.cmbProductType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); this.cmbProductType.Properties.Appearance.Options.UseFont = true; @@ -188,7 +214,7 @@ this.cmbProductType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.cmbProductType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.cmbProductType.Size = new System.Drawing.Size(236, 30); + this.cmbProductType.Size = new System.Drawing.Size(261, 45); this.cmbProductType.StyleController = this.layoutControl1; this.cmbProductType.TabIndex = 6; // @@ -219,7 +245,7 @@ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1}); - this.Root.Size = new System.Drawing.Size(1332, 80); + this.Root.Size = new System.Drawing.Size(1522, 103); this.Root.TextVisible = false; // // layoutControlItem1 @@ -228,21 +254,21 @@ this.layoutControlItem1.AppearanceItemCaption.Options.UseFont = true; this.layoutControlItem1.Control = this.cmbParaCategory; this.layoutControlItem1.CustomizationFormText = "参数类别"; - this.layoutControlItem1.Location = new System.Drawing.Point(328, 0); + this.layoutControlItem1.Location = new System.Drawing.Point(375, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem1.Size = new System.Drawing.Size(328, 60); + this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem1.Size = new System.Drawing.Size(375, 83); this.layoutControlItem1.Text = "参数类别："; - this.layoutControlItem1.TextSize = new System.Drawing.Size(70, 17); + this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22); // // layoutControlItem2 // this.layoutControlItem2.Control = this.stackPanel1; - this.layoutControlItem2.Location = new System.Drawing.Point(984, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(1125, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem2.Size = new System.Drawing.Size(328, 60); + this.layoutControlItem2.Size = new System.Drawing.Size(377, 83); this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; // @@ -253,29 +279,31 @@ this.layoutControlItem3.Control = this.cmbProductType; this.layoutControlItem3.Location = new System.Drawing.Point(0, 0); this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(5, 5, 15, 15); - this.layoutControlItem3.Size = new System.Drawing.Size(328, 60); + this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 19, 19); + this.layoutControlItem3.Size = new System.Drawing.Size(375, 83); this.layoutControlItem3.Text = "产品型号："; - this.layoutControlItem3.TextSize = new System.Drawing.Size(70, 17); + this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22); // // gridPage // this.gridPage.Dock = System.Windows.Forms.DockStyle.Bottom; - this.gridPage.Location = new System.Drawing.Point(0, 790); - this.gridPage.Margin = new System.Windows.Forms.Padding(4); + this.gridPage.Location = new System.Drawing.Point(0, 1016); + this.gridPage.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.gridPage.Name = "gridPage"; - this.gridPage.Size = new System.Drawing.Size(1332, 50); + this.gridPage.Size = new System.Drawing.Size(1522, 64); this.gridPage.TabIndex = 12; // // gridParaCol // this.gridParaCol.Dock = System.Windows.Forms.DockStyle.Fill; - this.gridParaCol.Location = new System.Drawing.Point(0, 123); + this.gridParaCol.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.gridParaCol.Location = new System.Drawing.Point(0, 158); this.gridParaCol.MainView = this.grid_ParaCol; + this.gridParaCol.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.gridParaCol.Name = "gridParaCol"; this.gridParaCol.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repItemOperate}); - this.gridParaCol.Size = new System.Drawing.Size(1332, 667); + this.gridParaCol.Size = new System.Drawing.Size(1522, 858); this.gridParaCol.TabIndex = 13; this.gridParaCol.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.grid_ParaCol}); @@ -290,7 +318,7 @@ this.grid_ParaCol.Appearance.Row.Options.UseFont = true; this.grid_ParaCol.Appearance.Row.Options.UseTextOptions = true; this.grid_ParaCol.Appearance.Row.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.grid_ParaCol.ColumnPanelRowHeight = 39; + this.grid_ParaCol.ColumnPanelRowHeight = 50; this.grid_ParaCol.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.ID, this.SerialNumber, @@ -298,6 +326,7 @@ this.ParaCategoryName, this.ParaCode, this.ParaName, + this.TestStep, this.TargetPointAddress, this.StrTargetReadonly, this.MaxPointAddress, @@ -308,13 +337,15 @@ this.TestResultPointAddress, this.IsMustPointAddress, this.SortIndex, + this.WaiterTime, + this.TestTime, this.StrIsMust, this.StrIsShowColConfig, this.StrIsShowMain, this.StrIsActive, this.Remark, this.operate}); - this.grid_ParaCol.DetailHeight = 383; + this.grid_ParaCol.DetailHeight = 492; this.grid_ParaCol.GridControl = this.gridParaCol; this.grid_ParaCol.Name = "grid_ParaCol"; this.grid_ParaCol.OptionsBehavior.ReadOnly = true; @@ -326,15 +357,15 @@ this.grid_ParaCol.OptionsView.ShowGroupPanel = false; this.grid_ParaCol.OptionsView.ShowIndicator = false; this.grid_ParaCol.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.True; - this.grid_ParaCol.RowHeight = 39; + this.grid_ParaCol.RowHeight = 50; // // ID // this.ID.Caption = "gridColumn1"; this.ID.FieldName = "ID"; - this.ID.MinWidth = 22; + this.ID.MinWidth = 25; this.ID.Name = "ID"; - this.ID.Width = 82; + this.ID.Width = 94; // // SerialNumber // @@ -348,7 +379,7 @@ this.SerialNumber.AppearanceHeader.Options.UseForeColor = true; this.SerialNumber.Caption = "行号"; this.SerialNumber.FieldName = "SerialNumber"; - this.SerialNumber.MinWidth = 44; + this.SerialNumber.MinWidth = 50; this.SerialNumber.Name = "SerialNumber"; this.SerialNumber.OptionsColumn.AllowFocus = false; this.SerialNumber.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; @@ -357,7 +388,7 @@ this.SerialNumber.OptionsFilter.AllowFilter = false; this.SerialNumber.Visible = true; this.SerialNumber.VisibleIndex = 0; - this.SerialNumber.Width = 44; + this.SerialNumber.Width = 50; // // ProductType // @@ -371,7 +402,7 @@ this.ProductType.AppearanceHeader.Options.UseForeColor = true; this.ProductType.Caption = "产品型号"; this.ProductType.FieldName = "ProductType"; - this.ProductType.MinWidth = 87; + this.ProductType.MinWidth = 99; this.ProductType.Name = "ProductType"; this.ProductType.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.ProductType.OptionsColumn.AllowMove = false; @@ -379,7 +410,7 @@ this.ProductType.OptionsColumn.ReadOnly = true; this.ProductType.Visible = true; this.ProductType.VisibleIndex = 1; - this.ProductType.Width = 87; + this.ProductType.Width = 99; // // ParaCategoryName // @@ -393,14 +424,14 @@ this.ParaCategoryName.AppearanceHeader.Options.UseForeColor = true; this.ParaCategoryName.Caption = "参数类别"; this.ParaCategoryName.FieldName = "ParaCategoryName"; - this.ParaCategoryName.MinWidth = 87; + this.ParaCategoryName.MinWidth = 99; this.ParaCategoryName.Name = "ParaCategoryName"; this.ParaCategoryName.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.ParaCategoryName.OptionsColumn.AllowMove = false; this.ParaCategoryName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.ParaCategoryName.Visible = true; this.ParaCategoryName.VisibleIndex = 2; - this.ParaCategoryName.Width = 87; + this.ParaCategoryName.Width = 99; // // ParaCode // @@ -414,7 +445,7 @@ this.ParaCode.AppearanceHeader.Options.UseForeColor = true; this.ParaCode.Caption = "参数编码"; this.ParaCode.FieldName = "ParaCode"; - this.ParaCode.MinWidth = 140; + this.ParaCode.MinWidth = 160; this.ParaCode.Name = "ParaCode"; this.ParaCode.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.ParaCode.OptionsColumn.AllowMove = false; @@ -422,7 +453,7 @@ this.ParaCode.OptionsColumn.ReadOnly = true; this.ParaCode.Visible = true; this.ParaCode.VisibleIndex = 3; - this.ParaCode.Width = 140; + this.ParaCode.Width = 160; // // ParaName // @@ -436,7 +467,7 @@ this.ParaName.AppearanceHeader.Options.UseForeColor = true; this.ParaName.Caption = "参数名称"; this.ParaName.FieldName = "ParaName"; - this.ParaName.MinWidth = 150; + this.ParaName.MinWidth = 171; this.ParaName.Name = "ParaName"; this.ParaName.OptionsColumn.AllowFocus = false; this.ParaName.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; @@ -445,7 +476,25 @@ this.ParaName.OptionsColumn.ReadOnly = true; this.ParaName.Visible = true; this.ParaName.VisibleIndex = 4; - this.ParaName.Width = 150; + this.ParaName.Width = 171; + // + // TestStep + // + this.TestStep.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.TestStep.AppearanceCell.Options.UseFont = true; + this.TestStep.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.TestStep.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.TestStep.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.TestStep.AppearanceHeader.Options.UseBackColor = true; + this.TestStep.AppearanceHeader.Options.UseFont = true; + this.TestStep.AppearanceHeader.Options.UseForeColor = true; + this.TestStep.Caption = "测试步骤"; + this.TestStep.FieldName = "TestStep"; + this.TestStep.MinWidth = 25; + this.TestStep.Name = "TestStep"; + this.TestStep.Visible = true; + this.TestStep.VisibleIndex = 5; + this.TestStep.Width = 142; // // TargetPointAddress // @@ -459,15 +508,15 @@ this.TargetPointAddress.AppearanceHeader.Options.UseForeColor = true; this.TargetPointAddress.Caption = "目标值PLC地址"; this.TargetPointAddress.FieldName = "TargetPointAddress"; - this.TargetPointAddress.MinWidth = 120; + this.TargetPointAddress.MinWidth = 137; this.TargetPointAddress.Name = "TargetPointAddress"; this.TargetPointAddress.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.TargetPointAddress.OptionsColumn.AllowMove = false; this.TargetPointAddress.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.TargetPointAddress.OptionsColumn.ReadOnly = true; this.TargetPointAddress.Visible = true; - this.TargetPointAddress.VisibleIndex = 5; - this.TargetPointAddress.Width = 120; + this.TargetPointAddress.VisibleIndex = 6; + this.TargetPointAddress.Width = 137; // // StrTargetReadonly // @@ -481,15 +530,15 @@ this.StrTargetReadonly.AppearanceHeader.Options.UseForeColor = true; this.StrTargetReadonly.Caption = "目标值只读"; this.StrTargetReadonly.FieldName = "StrTargetReadonly"; - this.StrTargetReadonly.MinWidth = 100; + this.StrTargetReadonly.MinWidth = 114; this.StrTargetReadonly.Name = "StrTargetReadonly"; this.StrTargetReadonly.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.StrTargetReadonly.OptionsColumn.AllowMove = false; this.StrTargetReadonly.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.StrTargetReadonly.OptionsColumn.ReadOnly = true; this.StrTargetReadonly.Visible = true; - this.StrTargetReadonly.VisibleIndex = 6; - this.StrTargetReadonly.Width = 100; + this.StrTargetReadonly.VisibleIndex = 7; + this.StrTargetReadonly.Width = 114; // // MaxPointAddress // @@ -503,15 +552,15 @@ this.MaxPointAddress.AppearanceHeader.Options.UseForeColor = true; this.MaxPointAddress.Caption = "上限值PLC地址"; this.MaxPointAddress.FieldName = "MaxPointAddress"; - this.MaxPointAddress.MinWidth = 120; + this.MaxPointAddress.MinWidth = 137; this.MaxPointAddress.Name = "MaxPointAddress"; this.MaxPointAddress.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.MaxPointAddress.OptionsColumn.AllowMove = false; this.MaxPointAddress.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.MaxPointAddress.OptionsColumn.ReadOnly = true; this.MaxPointAddress.Visible = true; - this.MaxPointAddress.VisibleIndex = 7; - this.MaxPointAddress.Width = 120; + this.MaxPointAddress.VisibleIndex = 8; + this.MaxPointAddress.Width = 137; // // StrMaxReadonly // @@ -525,15 +574,15 @@ this.StrMaxReadonly.AppearanceHeader.Options.UseForeColor = true; this.StrMaxReadonly.Caption = "上限值只读"; this.StrMaxReadonly.FieldName = "StrMaxReadonly"; - this.StrMaxReadonly.MinWidth = 100; + this.StrMaxReadonly.MinWidth = 114; this.StrMaxReadonly.Name = "StrMaxReadonly"; this.StrMaxReadonly.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.StrMaxReadonly.OptionsColumn.AllowMove = false; this.StrMaxReadonly.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.StrMaxReadonly.OptionsColumn.ReadOnly = true; this.StrMaxReadonly.Visible = true; - this.StrMaxReadonly.VisibleIndex = 8; - this.StrMaxReadonly.Width = 100; + this.StrMaxReadonly.VisibleIndex = 9; + this.StrMaxReadonly.Width = 114; // // MinPointAddress // @@ -547,15 +596,15 @@ this.MinPointAddress.AppearanceHeader.Options.UseForeColor = true; this.MinPointAddress.Caption = "下限值PLC地址"; this.MinPointAddress.FieldName = "MinPointAddress"; - this.MinPointAddress.MinWidth = 120; + this.MinPointAddress.MinWidth = 137; this.MinPointAddress.Name = "MinPointAddress"; this.MinPointAddress.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.MinPointAddress.OptionsColumn.AllowMove = false; this.MinPointAddress.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.MinPointAddress.OptionsColumn.ReadOnly = true; this.MinPointAddress.Visible = true; - this.MinPointAddress.VisibleIndex = 9; - this.MinPointAddress.Width = 120; + this.MinPointAddress.VisibleIndex = 10; + this.MinPointAddress.Width = 137; // // StrMinReadonly // @@ -569,15 +618,15 @@ this.StrMinReadonly.AppearanceHeader.Options.UseForeColor = true; this.StrMinReadonly.Caption = "下限值只读"; this.StrMinReadonly.FieldName = "StrMinReadonly"; - this.StrMinReadonly.MinWidth = 100; + this.StrMinReadonly.MinWidth = 114; this.StrMinReadonly.Name = "StrMinReadonly"; this.StrMinReadonly.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.StrMinReadonly.OptionsColumn.AllowMove = false; this.StrMinReadonly.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.StrMinReadonly.OptionsColumn.ReadOnly = true; this.StrMinReadonly.Visible = true; - this.StrMinReadonly.VisibleIndex = 10; - this.StrMinReadonly.Width = 100; + this.StrMinReadonly.VisibleIndex = 11; + this.StrMinReadonly.Width = 114; // // CollectPointAddress // @@ -591,7 +640,7 @@ this.CollectPointAddress.AppearanceHeader.Options.UseForeColor = true; this.CollectPointAddress.Caption = "采集值PLC地址"; this.CollectPointAddress.FieldName = "CollectPointAddress"; - this.CollectPointAddress.MinWidth = 150; + this.CollectPointAddress.MinWidth = 171; this.CollectPointAddress.Name = "CollectPointAddress"; this.CollectPointAddress.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.CollectPointAddress.OptionsColumn.AllowMove = false; @@ -599,7 +648,7 @@ this.CollectPointAddress.OptionsColumn.ReadOnly = true; this.CollectPointAddress.Visible = true; this.CollectPointAddress.VisibleIndex = 12; - this.CollectPointAddress.Width = 150; + this.CollectPointAddress.Width = 171; // // TestResultPointAddress // @@ -613,7 +662,7 @@ this.TestResultPointAddress.AppearanceHeader.Options.UseForeColor = true; this.TestResultPointAddress.Caption = "测试结果PLC地址"; this.TestResultPointAddress.FieldName = "TestResultPointAddress"; - this.TestResultPointAddress.MinWidth = 150; + this.TestResultPointAddress.MinWidth = 171; this.TestResultPointAddress.Name = "TestResultPointAddress"; this.TestResultPointAddress.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.TestResultPointAddress.OptionsColumn.AllowMove = false; @@ -621,7 +670,7 @@ this.TestResultPointAddress.OptionsColumn.ReadOnly = true; this.TestResultPointAddress.Visible = true; this.TestResultPointAddress.VisibleIndex = 13; - this.TestResultPointAddress.Width = 150; + this.TestResultPointAddress.Width = 171; // // IsMustPointAddress // @@ -635,7 +684,7 @@ this.IsMustPointAddress.AppearanceHeader.Options.UseForeColor = true; this.IsMustPointAddress.Caption = "是否使用PLC地址"; this.IsMustPointAddress.FieldName = "IsMustPointAddress"; - this.IsMustPointAddress.MinWidth = 150; + this.IsMustPointAddress.MinWidth = 171; this.IsMustPointAddress.Name = "IsMustPointAddress"; this.IsMustPointAddress.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.IsMustPointAddress.OptionsColumn.AllowMove = false; @@ -643,7 +692,7 @@ this.IsMustPointAddress.OptionsColumn.ReadOnly = true; this.IsMustPointAddress.Visible = true; this.IsMustPointAddress.VisibleIndex = 14; - this.IsMustPointAddress.Width = 150; + this.IsMustPointAddress.Width = 171; // // SortIndex // @@ -657,15 +706,57 @@ this.SortIndex.AppearanceHeader.Options.UseForeColor = true; this.SortIndex.Caption = "排序索引"; this.SortIndex.FieldName = "SortIndex"; - this.SortIndex.MinWidth = 100; + this.SortIndex.MinWidth = 114; this.SortIndex.Name = "SortIndex"; this.SortIndex.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.SortIndex.OptionsColumn.AllowMove = false; this.SortIndex.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.SortIndex.OptionsColumn.ReadOnly = true; this.SortIndex.Visible = true; - this.SortIndex.VisibleIndex = 11; - this.SortIndex.Width = 100; + this.SortIndex.VisibleIndex = 15; + this.SortIndex.Width = 114; + // + // WaiterTime + // + this.WaiterTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.WaiterTime.AppearanceCell.Options.UseFont = true; + this.WaiterTime.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.WaiterTime.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.5F, System.Drawing.FontStyle.Bold); + this.WaiterTime.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.WaiterTime.AppearanceHeader.Options.UseBackColor = true; + this.WaiterTime.AppearanceHeader.Options.UseFont = true; + this.WaiterTime.AppearanceHeader.Options.UseForeColor = true; + this.WaiterTime.Caption = "等待时间"; + this.WaiterTime.FieldName = "WaiterTime"; + this.WaiterTime.MinWidth = 25; + this.WaiterTime.Name = "WaiterTime"; + this.WaiterTime.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.WaiterTime.OptionsColumn.AllowMove = false; + this.WaiterTime.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.WaiterTime.OptionsColumn.ReadOnly = true; + this.WaiterTime.Visible = true; + this.WaiterTime.VisibleIndex = 16; + this.WaiterTime.Width = 171; + // + // TestTime + // + this.TestTime.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.TestTime.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.5F, System.Drawing.FontStyle.Bold); + this.TestTime.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.TestTime.AppearanceHeader.Options.UseBackColor = true; + this.TestTime.AppearanceHeader.Options.UseFont = true; + this.TestTime.AppearanceHeader.Options.UseForeColor = true; + this.TestTime.Caption = "测试时间"; + this.TestTime.FieldName = "TestTime"; + this.TestTime.MinWidth = 25; + this.TestTime.Name = "TestTime"; + this.TestTime.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.TestTime.OptionsColumn.AllowMove = false; + this.TestTime.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.TestTime.OptionsColumn.ReadOnly = true; + this.TestTime.Visible = true; + this.TestTime.VisibleIndex = 17; + this.TestTime.Width = 171; // // StrIsMust // @@ -679,15 +770,15 @@ this.StrIsMust.AppearanceHeader.Options.UseForeColor = true; this.StrIsMust.Caption = "是否必须"; this.StrIsMust.FieldName = "StrIsMust"; - this.StrIsMust.MinWidth = 100; + this.StrIsMust.MinWidth = 114; this.StrIsMust.Name = "StrIsMust"; this.StrIsMust.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.StrIsMust.OptionsColumn.AllowMove = false; this.StrIsMust.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.StrIsMust.OptionsColumn.ReadOnly = true; this.StrIsMust.Visible = true; - this.StrIsMust.VisibleIndex = 15; - this.StrIsMust.Width = 100; + this.StrIsMust.VisibleIndex = 18; + this.StrIsMust.Width = 114; // // StrIsShowColConfig // @@ -701,15 +792,15 @@ this.StrIsShowColConfig.AppearanceHeader.Options.UseForeColor = true; this.StrIsShowColConfig.Caption = "是否在参数配置界面显示"; this.StrIsShowColConfig.FieldName = "StrIsShowColConfig"; - this.StrIsShowColConfig.MinWidth = 150; + this.StrIsShowColConfig.MinWidth = 171; this.StrIsShowColConfig.Name = "StrIsShowColConfig"; this.StrIsShowColConfig.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.StrIsShowColConfig.OptionsColumn.AllowMove = false; this.StrIsShowColConfig.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.StrIsShowColConfig.OptionsColumn.ReadOnly = true; this.StrIsShowColConfig.Visible = true; - this.StrIsShowColConfig.VisibleIndex = 17; - this.StrIsShowColConfig.Width = 150; + this.StrIsShowColConfig.VisibleIndex = 19; + this.StrIsShowColConfig.Width = 171; // // StrIsShowMain // @@ -723,15 +814,15 @@ this.StrIsShowMain.AppearanceHeader.Options.UseForeColor = true; this.StrIsShowMain.Caption = "是否在主界面显示"; this.StrIsShowMain.FieldName = "StrIsShowMain"; - this.StrIsShowMain.MinWidth = 150; + this.StrIsShowMain.MinWidth = 171; this.StrIsShowMain.Name = "StrIsShowMain"; this.StrIsShowMain.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.StrIsShowMain.OptionsColumn.AllowMove = false; this.StrIsShowMain.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.StrIsShowMain.OptionsColumn.ReadOnly = true; this.StrIsShowMain.Visible = true; - this.StrIsShowMain.VisibleIndex = 16; - this.StrIsShowMain.Width = 150; + this.StrIsShowMain.VisibleIndex = 20; + this.StrIsShowMain.Width = 171; // // StrIsActive // @@ -745,15 +836,15 @@ this.StrIsActive.AppearanceHeader.Options.UseForeColor = true; this.StrIsActive.Caption = "是否启用"; this.StrIsActive.FieldName = "StrIsActive"; - this.StrIsActive.MinWidth = 87; + this.StrIsActive.MinWidth = 99; this.StrIsActive.Name = "StrIsActive"; this.StrIsActive.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.StrIsActive.OptionsColumn.AllowMove = false; this.StrIsActive.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.StrIsActive.OptionsColumn.ReadOnly = true; this.StrIsActive.Visible = true; - this.StrIsActive.VisibleIndex = 18; - this.StrIsActive.Width = 87; + this.StrIsActive.VisibleIndex = 21; + this.StrIsActive.Width = 99; // // Remark // @@ -767,15 +858,15 @@ this.Remark.AppearanceHeader.Options.UseForeColor = true; this.Remark.Caption = "备注"; this.Remark.FieldName = "Remark"; - this.Remark.MinWidth = 200; + this.Remark.MinWidth = 229; this.Remark.Name = "Remark"; this.Remark.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; this.Remark.OptionsColumn.AllowMove = false; this.Remark.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.Remark.OptionsColumn.ReadOnly = true; this.Remark.Visible = true; - this.Remark.VisibleIndex = 19; - this.Remark.Width = 200; + this.Remark.VisibleIndex = 22; + this.Remark.Width = 229; // // operate // @@ -795,11 +886,11 @@ this.operate.ColumnEdit = this.repItemOperate; this.operate.FieldName = "Operate"; this.operate.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right; - this.operate.MinWidth = 100; + this.operate.MinWidth = 114; this.operate.Name = "operate"; this.operate.Visible = true; - this.operate.VisibleIndex = 20; - this.operate.Width = 100; + this.operate.VisibleIndex = 23; + this.operate.Width = 114; // // repItemOperate // @@ -818,33 +909,17 @@ // this.Loading.ClosingDelay = 500; // - // btnCopyParaCol - // - this.btnCopyParaCol.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); - this.btnCopyParaCol.Appearance.ForeColor = System.Drawing.Color.White; - this.btnCopyParaCol.Appearance.Options.UseFont = true; - this.btnCopyParaCol.Appearance.Options.UseForeColor = true; - this.btnCopyParaCol.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; - this.btnCopyParaCol.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.btnCopyParaCol.Location = new System.Drawing.Point(234, 6); - this.btnCopyParaCol.Name = "btnCopyParaCol"; - this.btnCopyParaCol.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; - this.btnCopyParaCol.Size = new System.Drawing.Size(87, 44); - this.btnCopyParaCol.TabIndex = 2; - this.btnCopyParaCol.Text = "复制"; - this.btnCopyParaCol.Click += new System.EventHandler(this.btnCopyParaCol_Click); - // // ParaColManagerForm // this.Appearance.BackColor = System.Drawing.Color.White; this.Appearance.Options.UseBackColor = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1332, 840); + this.ClientSize = new System.Drawing.Size(1522, 1080); this.Controls.Add(this.gridParaCol); this.Controls.Add(this.layoutControl1); this.Controls.Add(this.gridPage); - this.Margin = new System.Windows.Forms.Padding(5); + this.Margin = new System.Windows.Forms.Padding(6); this.Name = "ParaColManagerForm"; this.Text = "ParaColConfigForm"; this.Load += new System.EventHandler(this.ParaColManagerForm_Load); @@ -908,5 +983,8 @@ private DevExpress.XtraGrid.Columns.GridColumn IsMustPointAddress; private DevExpress.XtraGrid.Columns.GridColumn StrIsShowColConfig; private DevExpress.XtraEditors.SimpleButton btnCopyParaCol; + private DevExpress.XtraGrid.Columns.GridColumn TestStep; + private DevExpress.XtraGrid.Columns.GridColumn WaiterTime; + private DevExpress.XtraGrid.Columns.GridColumn TestTime; } } \ No newline at end of file diff --git a/ProductionSystem/Forms/SystemSetting/ParaSettingForm.cs b/ProductionSystem/Forms/SystemSetting/ParaSettingForm.cs index a35e97b..eb5c575 100644 --- a/ProductionSystem/Forms/SystemSetting/ParaSettingForm.cs +++ b/ProductionSystem/Forms/SystemSetting/ParaSettingForm.cs @@ -82,8 +82,6 @@ namespace ProductionSystem.Forms.SystemSetting myparaControls[j].MaxText = paraConfig.MaxVal?.ToString(); myparaControls[j].MinText = paraConfig.MinVal?.ToString(); myparaControls[j].CkIsActiveChecked = paraConfig.IsMust; - myparaControls[j].WaitTimeText = paraConfig.WaitTime.ToString(); - myparaControls[j].WaitTestText = paraConfig.TestTime.ToString(); } } } @@ -193,9 +191,7 @@ namespace ProductionSystem.Forms.SystemSetting MinPlcAddressTag = currentParaConfigs[j].MinPointAddress, MinValReadOnly = currentParaConfigs[j].MinReadonly, CheckEditVisible = !currentParaConfigs[j].IsMust, - - - + TabIndex = j }; layoutControlItem.Control = myParaControl; } @@ -303,46 +299,6 @@ namespace ProductionSystem.Forms.SystemSetting } #endregion - - #region 等待时间 - var waitTimeTxt = myparaControls[j].WaitTimeText.Trim(); - - - if (!string.IsNullOrEmpty(waitTimeTxt)) - { - - - if (int.TryParse(waitTimeTxt, out int waitTime)) - { - t_ParaConfig.WaitTime = waitTime; - } - else - { - errorMsg += $"等待时间:【{waitTimeTxt}】格式错误！"; - } - } - - #endregion - - - #region 测试时间 - var _waitTestTxt = myparaControls[j].WaitTestText.Trim(); - if (!string.IsNullOrEmpty(_waitTestTxt)) - { - - - if (int.TryParse(_waitTestTxt, out int waitTestTime)) - { - t_ParaConfig.TestTime = waitTestTime; - } - else - { - errorMsg += $"测试时间:【{_waitTestTxt}】格式错误！"; - } - } - - #endregion - if (!string.IsNullOrEmpty(errorMsg)) { errorMsg.Insert(0, groupControls[i].Text); diff --git a/ProductionSystem/Forms/TestForms/EditTestStep.Designer.cs b/ProductionSystem/Forms/TestForms/EditTestStep.Designer.cs new file mode 100644 index 0000000..bdfa94c --- /dev/null +++ b/ProductionSystem/Forms/TestForms/EditTestStep.Designer.cs @@ -0,0 +1,374 @@ +namespace ProductionSystem.Forms.TestForms +{ + partial class EditTestStep + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = 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(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.ptType = new DevExpress.XtraEditors.ComboBoxEdit(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.textEdit2 = new DevExpress.XtraEditors.TextEdit(); + this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); + this.textEdit21 = new DevExpress.XtraEditors.TextEdit(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.stackPanel1 = new DevExpress.Utils.Layout.StackPanel(); + this.btnCancel = new DevExpress.XtraEditors.SimpleButton(); + this.btnSave = new DevExpress.XtraEditors.SimpleButton(); + this.Loading = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::ProductionSystem.Forms.CommonForms.WaitForm1), true, true); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.textEdit3 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.ptType.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit21.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.stackPanel1)).BeginInit(); + this.stackPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + this.SuspendLayout(); + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.textEdit3); + this.layoutControl1.Controls.Add(this.ptType); + this.layoutControl1.Controls.Add(this.checkBox1); + this.layoutControl1.Controls.Add(this.textEdit2); + this.layoutControl1.Controls.Add(this.textEdit1); + this.layoutControl1.Controls.Add(this.textEdit21); + this.layoutControl1.Location = new System.Drawing.Point(3, 62); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.Root; + this.layoutControl1.Size = new System.Drawing.Size(762, 275); + this.layoutControl1.TabIndex = 2; + this.layoutControl1.Text = "layoutControl1"; + // + // ptType + // + this.ptType.Location = new System.Drawing.Point(97, 25); + this.ptType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.ptType.Name = "ptType"; + this.ptType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.ptType.Properties.Appearance.Options.UseFont = true; + this.ptType.Properties.AppearanceDropDown.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.ptType.Properties.AppearanceDropDown.Options.UseFont = true; + this.ptType.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 10.5F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ptType.Properties.AppearanceFocused.Options.UseFont = true; + this.ptType.Properties.AppearanceItemSelected.Font = new System.Drawing.Font("Tahoma", 10.5F, System.Drawing.FontStyle.Bold); + this.ptType.Properties.AppearanceItemSelected.Options.UseFont = true; + this.ptType.Properties.AutoHeight = false; + this.ptType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.ptType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; + this.ptType.Size = new System.Drawing.Size(279, 55); + this.ptType.StyleController = this.layoutControl1; + this.ptType.TabIndex = 8; + this.ptType.Tag = ""; + // + // checkBox1 + // + this.checkBox1.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.checkBox1.Location = new System.Drawing.Point(25, 210); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(351, 25); + this.checkBox1.TabIndex = 7; + this.checkBox1.Text = "是否启用"; + this.checkBox1.UseVisualStyleBackColor = true; + // + // textEdit2 + // + this.textEdit2.Location = new System.Drawing.Point(97, 110); + this.textEdit2.Name = "textEdit2"; + this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 22F); + this.textEdit2.Properties.Appearance.Options.UseFont = true; + this.textEdit2.Size = new System.Drawing.Size(279, 52); + this.textEdit2.StyleController = this.layoutControl1; + this.textEdit2.TabIndex = 6; + // + // textEdit1 + // + this.textEdit1.Location = new System.Drawing.Point(468, 25); + this.textEdit1.Name = "textEdit1"; + this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 22F); + this.textEdit1.Properties.Appearance.Options.UseFont = true; + this.textEdit1.Size = new System.Drawing.Size(279, 52); + this.textEdit1.StyleController = this.layoutControl1; + this.textEdit1.TabIndex = 5; + // + // textEdit21 + // + this.textEdit21.Location = new System.Drawing.Point(468, 110); + this.textEdit21.Name = "textEdit21"; + this.textEdit21.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 22F); + this.textEdit21.Properties.Appearance.Options.UseFont = true; + this.textEdit21.Size = new System.Drawing.Size(279, 52); + this.textEdit21.StyleController = this.layoutControl1; + this.textEdit21.TabIndex = 6; + // + // 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.layoutControlItem5, + this.layoutControlItem4, + this.layoutControlItem6}); + 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; + this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition1, + columnDefinition2}); + 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; + this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition1, + rowDefinition2, + rowDefinition3}); + this.Root.Size = new System.Drawing.Size(762, 275); + this.Root.TextVisible = false; + // + // stackPanel1 + // + this.stackPanel1.Appearance.BackColor = System.Drawing.Color.Transparent; + this.stackPanel1.Appearance.Options.UseBackColor = true; + this.stackPanel1.Controls.Add(this.btnCancel); + this.stackPanel1.Controls.Add(this.btnSave); + this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.stackPanel1.Location = new System.Drawing.Point(0, 334); + this.stackPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.stackPanel1.Name = "stackPanel1"; + this.stackPanel1.Padding = new System.Windows.Forms.Padding(11, 0, 11, 0); + this.stackPanel1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.stackPanel1.Size = new System.Drawing.Size(767, 71); + this.stackPanel1.TabIndex = 4; + // + // btnCancel + // + this.btnCancel.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.btnCancel.Appearance.ForeColor = System.Drawing.Color.Black; + this.btnCancel.Appearance.Options.UseFont = true; + this.btnCancel.Appearance.Options.UseForeColor = true; + this.btnCancel.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_gray; + this.btnCancel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnCancel.Location = new System.Drawing.Point(639, 6); + this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; + this.btnCancel.Size = new System.Drawing.Size(114, 58); + this.btnCancel.TabIndex = 4; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // btnSave + // + this.btnSave.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.btnSave.Appearance.ForeColor = System.Drawing.Color.White; + this.btnSave.Appearance.Options.UseFont = true; + this.btnSave.Appearance.Options.UseForeColor = true; + this.btnSave.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; + this.btnSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnSave.Location = new System.Drawing.Point(519, 6); + this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btnSave.Name = "btnSave"; + this.btnSave.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; + this.btnSave.Size = new System.Drawing.Size(114, 58); + this.btnSave.TabIndex = 4; + this.btnSave.Text = "保存"; + this.btnSave.Click += new System.EventHandler(this.btnSave_Click); + // + // Loading + // + this.Loading.ClosingDelay = 500; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.textEdit1; + this.layoutControlItem2.CustomizationFormText = "测试名称"; + this.layoutControlItem2.Location = new System.Drawing.Point(371, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(15, 5, 15, 15); + this.layoutControlItem2.Size = new System.Drawing.Size(371, 85); + this.layoutControlItem2.Text = "测试名称"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.textEdit2; + this.layoutControlItem3.CustomizationFormText = "测试内容"; + this.layoutControlItem3.Location = new System.Drawing.Point(0, 85); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(15, 5, 15, 15); + this.layoutControlItem3.Size = new System.Drawing.Size(371, 85); + this.layoutControlItem3.Text = "测试内容"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.textEdit21; + this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem5.CustomizationFormText = "索引"; + this.layoutControlItem5.Location = new System.Drawing.Point(371, 85); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(15, 5, 15, 15); + this.layoutControlItem5.Size = new System.Drawing.Size(371, 85); + this.layoutControlItem5.Text = "索引"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.checkBox1; + this.layoutControlItem4.CustomizationFormText = "是否启用"; + this.layoutControlItem4.Location = new System.Drawing.Point(0, 170); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(15, 5, 30, 15); + this.layoutControlItem4.Size = new System.Drawing.Size(371, 85); + this.layoutControlItem4.Text = "是否启用"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem4.TextVisible = false; + // + // layoutControlItem1 + // + this.layoutControlItem1.Control = this.ptType; + this.layoutControlItem1.CustomizationFormText = "产品类型"; + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(15, 5, 15, 15); + this.layoutControlItem1.Size = new System.Drawing.Size(371, 85); + this.layoutControlItem1.Text = "产品类型"; + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); + // + // textEdit3 + // + this.textEdit3.Location = new System.Drawing.Point(468, 195); + this.textEdit3.Name = "textEdit3"; + this.textEdit3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 22F); + this.textEdit3.Properties.Appearance.Options.UseFont = true; + this.textEdit3.Size = new System.Drawing.Size(279, 52); + this.textEdit3.StyleController = this.layoutControl1; + this.textEdit3.TabIndex = 9; + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.textEdit3; + this.layoutControlItem6.CustomizationFormText = "备注"; + this.layoutControlItem6.Location = new System.Drawing.Point(371, 170); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem6.Padding = new DevExpress.XtraLayout.Utils.Padding(15, 5, 15, 15); + this.layoutControlItem6.Size = new System.Drawing.Size(371, 85); + this.layoutControlItem6.Text = "备注"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // + // EditTestStep + // + this.Appearance.BackColor = System.Drawing.Color.White; + this.Appearance.Options.UseBackColor = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(767, 405); + this.Controls.Add(this.stackPanel1); + this.Controls.Add(this.layoutControl1); + this.Name = "EditTestStep"; + this.Text = "EditTestStep"; + this.Controls.SetChildIndex(this.layoutControl1, 0); + this.Controls.SetChildIndex(this.stackPanel1, 0); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.ptType.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit21.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.stackPanel1)).EndInit(); + this.stackPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraEditors.TextEdit textEdit2; + private DevExpress.XtraEditors.TextEdit textEdit1; + private DevExpress.XtraEditors.TextEdit textEdit21; + private DevExpress.Utils.Layout.StackPanel stackPanel1; + private DevExpress.XtraEditors.SimpleButton btnCancel; + private DevExpress.XtraEditors.SimpleButton btnSave; + private System.Windows.Forms.CheckBox checkBox1; + private DevExpress.XtraEditors.ComboBoxEdit ptType; + private DevExpress.XtraSplashScreen.SplashScreenManager Loading; + private DevExpress.XtraEditors.TextEdit textEdit3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + } +} \ No newline at end of file diff --git a/ProductionSystem/Forms/TestForms/EditTestStep.cs b/ProductionSystem/Forms/TestForms/EditTestStep.cs new file mode 100644 index 0000000..a846ebb --- /dev/null +++ b/ProductionSystem/Forms/TestForms/EditTestStep.cs @@ -0,0 +1,136 @@ +using Custom.Utils.Framework; +using DevExpress.XtraEditors.Controls; +using ProductionSystem.Common; +using ProductionSystem.Forms.CommonForms; +using ProductionSystem.Untils.System; +using ProductionSystem_Model.DbModel.System; +using ProductionSystem_Model.DbModel.Test; +using ProductionSystem_Service; +using SqlSugar.Extensions; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using static DevExpress.XtraEditors.Mask.MaskSettings; + +namespace ProductionSystem.Forms.TestForms +{ + public partial class EditTestStep : MyBaseForm + { + private readonly TestStepService testStepService = new TestStepService(); + private readonly ProductTypeService productTypeService = new ProductTypeService(); + + /// + /// 定义委托 + /// + public delegate void RefreshParent(); + + /// + /// 定义事件 + /// + public event RefreshParent refreshParent; + + private string _id = string.Empty; + + public EditTestStep(string id) + { + InitializeComponent(); + //窗体拖动 + this.MouseDown += base.Form_MouseDown; + var formTitle = "新增测试步骤"; + if(!string.IsNullOrEmpty(id)) + { + _id = id; + formTitle = "编辑测试步骤"; + } + UcTitle(formTitle, true); + BindDropDownHelper.BindProductType(ptType);//绑定产品类型下拉框 + } + + private void EditUser_Load(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(_id)) + { + var test = testStepService.QueryTestById(_id); + if (test == null) + { + CustomMessageBoxHelper.XtraMessageBoxShow("根据id未查询到相关测试步骤信息！"); + } + #region 给控件赋值 + var type = productTypeService.QueryActiveProductTypes(); + if (type != null) + { + var checkedListBoxItem = new CheckedListBoxItem(); + + ptType.EditValue = checkedListBoxItem; + } + textEdit1.Text = test.TestName; + textEdit2.Text = test.TestContent; + textEdit21.Text = test.Index.ToString(); + checkBox1.Checked = test.IsEnable; + textEdit3.Text = test.Remark; + #endregion + } + } + + /// + /// 点击保存按钮 + /// + /// + /// + private void btnSave_Click(object sender, EventArgs e) + { + //var flag = RegexCheckHelper.RegexSave(new Control[] { textEdit1, ptType }, out _); + //if (!flag) + //{ + // return; + //} + Loading.ShowWaitForm(); + #region 给Model赋值 + var test = new Test_Step + { + ProductType = ptType.EditValue.ToString(), + TestName = textEdit1.Text.Trim(), + TestContent = textEdit2.Text.Trim(), + Index = Convert.ToInt32(textEdit21.Text.Trim()), + IsEnable = checkBox1.Checked, + Remark = textEdit3.Text.Trim(), + }; + #endregion + + //编辑测试步骤 + if (!string.IsNullOrEmpty(_id)) + { + test.Id = _id; + var updateResult = testStepService.UpdateTestStep(test); + Loading.CloseWaitForm(); + CustomMessageBoxHelper.XtraMessageBoxShow(updateResult.msg); + refreshParent();//刷新父组件 + FindForm().Close(); + return; + } + var addResult = testStepService.AddTestStep(test); + Loading.CloseWaitForm(); + CustomMessageBoxHelper.XtraMessageBoxShow(addResult.msg); + refreshParent();//刷新父组件 + FindForm().Close(); + } + + /// + /// 点击取消按钮 + /// + /// + /// + private void btnCancel_Click(object sender, EventArgs e) + { + this.Dispose(); + this.Close(); + } + } +} diff --git a/ProductionSystem/Forms/TestForms/EditTestStep.resx b/ProductionSystem/Forms/TestForms/EditTestStep.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ProductionSystem/Forms/TestForms/EditTestStep.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProductionSystem/Forms/TestForms/TestStepManager.Designer.cs b/ProductionSystem/Forms/TestForms/TestStepManager.Designer.cs new file mode 100644 index 0000000..05a7d8c --- /dev/null +++ b/ProductionSystem/Forms/TestForms/TestStepManager.Designer.cs @@ -0,0 +1,642 @@ +namespace ProductionSystem.Forms.TestForms +{ + partial class TestStepManager + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + 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.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.stackPanel1 = new DevExpress.Utils.Layout.StackPanel(); + this.btnInsert = new DevExpress.XtraEditors.SimpleButton(); + this.btnSearch = new DevExpress.XtraEditors.SimpleButton(); + this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.gridTest = new DevExpress.XtraGrid.GridControl(); + this.grid_Test = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repItemOperate = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl(); + this.ID = new DevExpress.XtraGrid.Columns.GridColumn(); + this.SerialNumber = new DevExpress.XtraGrid.Columns.GridColumn(); + this.StrIsActive = new DevExpress.XtraGrid.Columns.GridColumn(); + this.Remark = new DevExpress.XtraGrid.Columns.GridColumn(); + this.operate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components); + this.Loading = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::ProductionSystem.Forms.CommonForms.WaitForm1), true, true); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.stackPanel1)).BeginInit(); + this.stackPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridTest)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.grid_Test)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repItemOperate)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).BeginInit(); + this.layoutControl2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit(); + this.SuspendLayout(); + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.stackPanel1); + this.layoutControl1.Location = new System.Drawing.Point(2, 63); + this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.Root; + this.layoutControl1.Size = new System.Drawing.Size(1490, 109); + this.layoutControl1.TabIndex = 2; + this.layoutControl1.Text = "layoutControl1"; + // + // stackPanel1 + // + this.stackPanel1.Controls.Add(this.btnInsert); + this.stackPanel1.Controls.Add(this.btnSearch); + this.stackPanel1.Location = new System.Drawing.Point(747, 12); + this.stackPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.stackPanel1.Name = "stackPanel1"; + this.stackPanel1.Size = new System.Drawing.Size(731, 85); + this.stackPanel1.TabIndex = 4; + // + // btnInsert + // + this.btnInsert.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.btnInsert.Appearance.ForeColor = System.Drawing.Color.White; + this.btnInsert.Appearance.Options.UseFont = true; + this.btnInsert.Appearance.Options.UseForeColor = true; + this.btnInsert.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; + this.btnInsert.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnInsert.Location = new System.Drawing.Point(450, 15); + this.btnInsert.Margin = new System.Windows.Forms.Padding(450, 4, 0, 4); + this.btnInsert.Name = "btnInsert"; + this.btnInsert.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; + this.btnInsert.Size = new System.Drawing.Size(114, 55); + this.btnInsert.TabIndex = 1; + this.btnInsert.Text = "新增"; + this.btnInsert.Click += new System.EventHandler(this.btnInsert_Click); + // + // btnSearch + // + this.btnSearch.Appearance.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.btnSearch.Appearance.ForeColor = System.Drawing.Color.White; + this.btnSearch.Appearance.Options.UseFont = true; + this.btnSearch.Appearance.Options.UseForeColor = true; + this.btnSearch.BackgroundImage = global::ProductionSystem.Properties.Resources.btn_background_blue; + this.btnSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnSearch.Location = new System.Drawing.Point(584, 15); + this.btnSearch.Margin = new System.Windows.Forms.Padding(20, 4, 0, 4); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light; + this.btnSearch.Size = new System.Drawing.Size(114, 55); + this.btnSearch.TabIndex = 3; + this.btnSearch.Text = "查询"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // Root + // + this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.Root.GroupBordersVisible = false; + this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem3}); + 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.AutoSize; + columnDefinition2.Width = 735D; + this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition1, + columnDefinition2}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition1}); + this.Root.Size = new System.Drawing.Size(1490, 109); + this.Root.TextVisible = false; + // + // layoutControlItem3 + // + this.layoutControlItem3.Control = this.stackPanel1; + this.layoutControlItem3.Location = new System.Drawing.Point(735, 0); + this.layoutControlItem3.Name = "layoutControlItem3"; + this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem3.Size = new System.Drawing.Size(735, 89); + this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem3.TextVisible = false; + // + // gridView1 + // + this.gridView1.Name = "gridView1"; + // + // repositoryItemButtonEdit1 + // + this.repositoryItemButtonEdit1.AutoHeight = false; + serializableAppearanceObject1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(2)))), ((int)(((byte)(167)))), ((int)(((byte)(240))))); + serializableAppearanceObject1.Options.UseForeColor = true; + serializableAppearanceObject5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(2)))), ((int)(((byte)(167)))), ((int)(((byte)(240))))); + serializableAppearanceObject5.Options.UseForeColor = true; + serializableAppearanceObject9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(2)))), ((int)(((byte)(167)))), ((int)(((byte)(240))))); + serializableAppearanceObject9.Options.UseForeColor = true; + this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "修改", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", "edit", null, DevExpress.Utils.ToolTipAnchor.Default), + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重置密码", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", "resetpwd", null, DevExpress.Utils.ToolTipAnchor.Default), + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "删除", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", "delete", null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; + this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + // + // layoutControlItem1 + // + this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem1.Name = "layoutControlItem1"; + this.layoutControlItem1.Size = new System.Drawing.Size(1287, 381); + this.layoutControlItem1.TextSize = new System.Drawing.Size(50, 20); + // + // layoutControlGroup1 + // + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.GroupBordersVisible = false; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem2}); + this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlGroup1.Size = new System.Drawing.Size(1494, 516); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.gridTest; + this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.Size = new System.Drawing.Size(1474, 496); + this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem2.TextVisible = false; + // + // gridTest + // + this.gridTest.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.gridTest.Location = new System.Drawing.Point(12, 12); + this.gridTest.MainView = this.grid_Test; + this.gridTest.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.gridTest.Name = "gridTest"; + this.gridTest.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.repItemOperate}); + this.gridTest.Size = new System.Drawing.Size(1470, 492); + this.gridTest.TabIndex = 11; + this.gridTest.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.grid_Test}); + this.gridTest.Load += new System.EventHandler(this.gridTestStep_Load); + // + // grid_Test + // + this.grid_Test.Appearance.HeaderPanel.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.grid_Test.Appearance.HeaderPanel.Options.UseFont = true; + this.grid_Test.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.grid_Test.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.grid_Test.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.grid_Test.Appearance.Row.Options.UseFont = true; + this.grid_Test.Appearance.Row.Options.UseTextOptions = true; + this.grid_Test.Appearance.Row.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.grid_Test.ColumnPanelRowHeight = 50; + this.grid_Test.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn3, + this.gridColumn4, + this.gridColumn5, + this.gridColumn6, + this.gridColumn7, + this.gridColumn8, + this.gridColumn9, + this.gridColumn1}); + this.grid_Test.DetailHeight = 492; + this.grid_Test.GridControl = this.gridTest; + this.grid_Test.Name = "grid_Test"; + this.grid_Test.OptionsBehavior.ReadOnly = true; + this.grid_Test.OptionsCustomization.AllowColumnMoving = false; + this.grid_Test.OptionsCustomization.AllowFilter = false; + this.grid_Test.OptionsCustomization.AllowSort = false; + this.grid_Test.OptionsSelection.EnableAppearanceFocusedCell = false; + this.grid_Test.OptionsView.ShowGroupPanel = false; + this.grid_Test.OptionsView.ShowIndicator = false; + this.grid_Test.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.True; + this.grid_Test.RowHeight = 50; + // + // gridColumn3 + // + this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn3.AppearanceCell.Options.UseFont = true; + this.gridColumn3.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn3.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn3.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn3.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn3.AppearanceHeader.Options.UseFont = true; + this.gridColumn3.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn3.Caption = "产品类型"; + this.gridColumn3.FieldName = "ProductType"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.OptionsColumn.AllowFocus = false; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 0; + this.gridColumn3.Width = 225; + // + // gridColumn4 + // + this.gridColumn4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn4.AppearanceCell.Options.UseFont = true; + this.gridColumn4.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn4.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn4.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn4.AppearanceHeader.Options.UseFont = true; + this.gridColumn4.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn4.Caption = "测试名称"; + this.gridColumn4.FieldName = "TestName"; + this.gridColumn4.MinWidth = 99; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.OptionsColumn.AllowFocus = false; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 1; + this.gridColumn4.Width = 229; + // + // gridColumn5 + // + this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn5.AppearanceCell.Options.UseFont = true; + this.gridColumn5.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn5.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn5.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn5.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn5.AppearanceHeader.Options.UseFont = true; + this.gridColumn5.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn5.Caption = "测试内容"; + this.gridColumn5.FieldName = "TestContent"; + this.gridColumn5.MinWidth = 99; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.OptionsColumn.AllowFocus = false; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 2; + this.gridColumn5.Width = 229; + // + // gridColumn6 + // + this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn6.AppearanceCell.Options.UseFont = true; + this.gridColumn6.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn6.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn6.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn6.AppearanceHeader.Options.UseFont = true; + this.gridColumn6.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn6.Caption = "索引"; + this.gridColumn6.FieldName = "Index"; + this.gridColumn6.MinWidth = 120; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.OptionsColumn.AllowFocus = false; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 3; + this.gridColumn6.Width = 275; + // + // gridColumn7 + // + this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn7.AppearanceCell.Options.UseFont = true; + this.gridColumn7.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn7.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn7.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn7.AppearanceHeader.Options.UseFont = true; + this.gridColumn7.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn7.Caption = "是否启用"; + this.gridColumn7.FieldName = "IsEnable"; + this.gridColumn7.MinWidth = 99; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.OptionsColumn.AllowFocus = false; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 4; + this.gridColumn7.Width = 229; + // + // gridColumn8 + // + this.gridColumn8.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn8.AppearanceCell.Options.UseFont = true; + this.gridColumn8.AppearanceCell.Options.UseTextOptions = true; + this.gridColumn8.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.gridColumn8.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn8.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn8.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn8.AppearanceHeader.Options.UseFont = true; + this.gridColumn8.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn8.AppearanceHeader.Options.UseTextOptions = true; + this.gridColumn8.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.gridColumn8.Caption = "备注"; + this.gridColumn8.MinWidth = 120; + this.gridColumn8.Name = "gridColumn8"; + this.gridColumn8.Visible = true; + this.gridColumn8.VisibleIndex = 5; + this.gridColumn8.Width = 120; + // + // gridColumn9 + // + this.gridColumn9.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn9.AppearanceCell.Options.UseFont = true; + this.gridColumn9.AppearanceCell.Options.UseTextOptions = true; + this.gridColumn9.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.gridColumn9.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn9.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn9.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn9.AppearanceHeader.Options.UseFont = true; + this.gridColumn9.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn9.AppearanceHeader.Options.UseTextOptions = true; + this.gridColumn9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.gridColumn9.Caption = "操作"; + this.gridColumn9.ColumnEdit = this.repItemOperate; + this.gridColumn9.FieldName = "Operate"; + this.gridColumn9.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right; + this.gridColumn9.MinWidth = 200; + this.gridColumn9.Name = "gridColumn9"; + this.gridColumn9.Visible = true; + this.gridColumn9.VisibleIndex = 6; + this.gridColumn9.Width = 200; + // + // repItemOperate + // + this.repItemOperate.AutoHeight = false; + serializableAppearanceObject13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(2)))), ((int)(((byte)(167)))), ((int)(((byte)(240))))); + serializableAppearanceObject13.Options.UseForeColor = true; + serializableAppearanceObject17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(2)))), ((int)(((byte)(167)))), ((int)(((byte)(240))))); + serializableAppearanceObject17.Options.UseForeColor = true; + this.repItemOperate.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "修改", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", "edit", null, DevExpress.Utils.ToolTipAnchor.Default), + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "删除", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", "delete", null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.repItemOperate.Name = "repItemOperate"; + this.repItemOperate.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + // + // gridColumn1 + // + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Width = 94; + // + // layoutControl2 + // + this.layoutControl2.Controls.Add(this.gridTest); + this.layoutControl2.Location = new System.Drawing.Point(0, 166); + this.layoutControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.layoutControl2.Name = "layoutControl2"; + this.layoutControl2.Root = this.layoutControlGroup1; + this.layoutControl2.Size = new System.Drawing.Size(1494, 516); + this.layoutControl2.TabIndex = 3; + this.layoutControl2.Text = "layoutControl2"; + this.layoutControl2.Click += new System.EventHandler(this.layoutControl2_Click); + // + // ID + // + this.ID.Caption = "gridColumn1"; + this.ID.FieldName = "ID"; + this.ID.MinWidth = 22; + this.ID.Name = "ID"; + this.ID.Width = 82; + // + // SerialNumber + // + this.SerialNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.SerialNumber.AppearanceCell.Options.UseFont = true; + this.SerialNumber.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.SerialNumber.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.SerialNumber.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.SerialNumber.AppearanceHeader.Options.UseBackColor = true; + this.SerialNumber.AppearanceHeader.Options.UseFont = true; + this.SerialNumber.AppearanceHeader.Options.UseForeColor = true; + this.SerialNumber.Caption = "行号"; + this.SerialNumber.FieldName = "SerialNumber"; + this.SerialNumber.MinWidth = 44; + this.SerialNumber.Name = "SerialNumber"; + this.SerialNumber.OptionsColumn.AllowFocus = false; + this.SerialNumber.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.SerialNumber.OptionsColumn.AllowMove = false; + this.SerialNumber.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.SerialNumber.OptionsFilter.AllowFilter = false; + this.SerialNumber.Width = 44; + // + // StrIsActive + // + this.StrIsActive.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.StrIsActive.AppearanceCell.Options.UseFont = true; + this.StrIsActive.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.StrIsActive.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.StrIsActive.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.StrIsActive.AppearanceHeader.Options.UseBackColor = true; + this.StrIsActive.AppearanceHeader.Options.UseFont = true; + this.StrIsActive.AppearanceHeader.Options.UseForeColor = true; + this.StrIsActive.Caption = "是否启用"; + this.StrIsActive.FieldName = "StrIsActive"; + this.StrIsActive.MinWidth = 87; + this.StrIsActive.Name = "StrIsActive"; + this.StrIsActive.OptionsColumn.AllowFocus = false; + this.StrIsActive.Width = 200; + // + // Remark + // + this.Remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.Remark.AppearanceCell.Options.UseFont = true; + this.Remark.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.Remark.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.Remark.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.Remark.AppearanceHeader.Options.UseBackColor = true; + this.Remark.AppearanceHeader.Options.UseFont = true; + this.Remark.AppearanceHeader.Options.UseForeColor = true; + this.Remark.Caption = "备注"; + this.Remark.FieldName = "Remark"; + this.Remark.MinWidth = 22; + this.Remark.Name = "Remark"; + this.Remark.OptionsColumn.AllowFocus = false; + this.Remark.Visible = true; + this.Remark.VisibleIndex = 5; + this.Remark.Width = 197; + // + // operate + // + this.operate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.operate.AppearanceCell.Options.UseFont = true; + this.operate.AppearanceCell.Options.UseTextOptions = true; + this.operate.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.operate.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.operate.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.operate.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.operate.AppearanceHeader.Options.UseBackColor = true; + this.operate.AppearanceHeader.Options.UseFont = true; + this.operate.AppearanceHeader.Options.UseForeColor = true; + this.operate.AppearanceHeader.Options.UseTextOptions = true; + this.operate.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.operate.Caption = "操作"; + this.operate.FieldName = "Operate"; + this.operate.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right; + this.operate.MinWidth = 175; + this.operate.Name = "operate"; + this.operate.Visible = true; + this.operate.VisibleIndex = 0; + this.operate.Width = 175; + // + // gridColumn10 + // + this.gridColumn10.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10.5F); + this.gridColumn10.AppearanceCell.Options.UseFont = true; + this.gridColumn10.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(242))))); + this.gridColumn10.AppearanceHeader.Font = new System.Drawing.Font("Tahoma", 10.8F, System.Drawing.FontStyle.Bold); + this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Black; + this.gridColumn10.AppearanceHeader.Options.UseBackColor = true; + this.gridColumn10.AppearanceHeader.Options.UseFont = true; + this.gridColumn10.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn10.Caption = "是否启用"; + this.gridColumn10.FieldName = "IsEnable"; + this.gridColumn10.MinWidth = 99; + this.gridColumn10.Name = "gridColumn10"; + this.gridColumn10.OptionsColumn.AllowFocus = false; + this.gridColumn10.Visible = true; + this.gridColumn10.VisibleIndex = 5; + this.gridColumn10.Width = 229; + // + // Loading + // + this.Loading.ClosingDelay = 500; + // + // TestStepManager + // + this.Appearance.BackColor = System.Drawing.Color.White; + this.Appearance.Options.UseBackColor = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1495, 810); + this.Controls.Add(this.layoutControl2); + this.Controls.Add(this.layoutControl1); + this.Margin = new System.Windows.Forms.Padding(6); + this.Name = "TestStepManager"; + this.Text = "测试步骤管理"; + this.Controls.SetChildIndex(this.layoutControl1, 0); + this.Controls.SetChildIndex(this.layoutControl2, 0); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.stackPanel1)).EndInit(); + this.stackPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridTest)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.grid_Test)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repItemOperate)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).EndInit(); + this.layoutControl2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup Root; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + private DevExpress.XtraLayout.LayoutControl layoutControl2; + private DevExpress.XtraGrid.Columns.GridColumn ID; + private DevExpress.XtraGrid.Columns.GridColumn SerialNumber; + private DevExpress.XtraGrid.Columns.GridColumn StrIsActive; + private DevExpress.XtraGrid.Columns.GridColumn operate; + private DevExpress.XtraGrid.Columns.GridColumn Remark; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraGrid.GridControl gridTest; + private DevExpress.XtraGrid.Views.Grid.GridView grid_Test; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repItemOperate; + private DevExpress.Utils.Layout.StackPanel stackPanel1; + private DevExpress.XtraSplashScreen.SplashScreenManager Loading; + private DevExpress.XtraEditors.SimpleButton btnInsert; + private DevExpress.XtraEditors.SimpleButton btnSearch; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; + private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + } +} \ No newline at end of file diff --git a/ProductionSystem/Forms/TestForms/TestStepManager.cs b/ProductionSystem/Forms/TestForms/TestStepManager.cs new file mode 100644 index 0000000..6351afd --- /dev/null +++ b/ProductionSystem/Forms/TestForms/TestStepManager.cs @@ -0,0 +1,116 @@ +using DevExpress.XtraEditors; +using ProductionSystem.Forms.CommonForms; +using ProductionSystem.Forms.SysForms.User; +using ProductionSystem.Untils.System; +using ProductionSystem_Model.DbModel.Test; +using ProductionSystem_Model.ViewModel.Request.System; +using ProductionSystem_Model.ViewModel.Response.System; +using ProductionSystem_Model.ViewModel.Response.Test; +using ProductionSystem_Service; +using ProductionSystem_UserControl.CompositeControls; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Text; +using System.Threading.Tasks; +using System.Web.UI.WebControls; +using System.Windows.Forms; + +namespace ProductionSystem.Forms.TestForms +{ + public partial class TestStepManager : MyBaseForm + { + private readonly TestStepService testStepService = new TestStepService(); + public TestStepManager() + { + InitializeComponent(); + UcTitle("测试步骤管理"); + + } + private void gridTestStep_Load(object sender, EventArgs e) + { + DataSource(); + Operate(); + } + + /// + /// 数据源 + /// + private void DataSource() + { + try + { + var testStep = testStepService.QueryTestStep(); + var list = testStep.ToList(); + gridTest.DataSource = list; + } + catch (Exception ex) + { + XtraMessageBox.Show("系统", ex == null ? "数据加载失败" : ex.Message); + } + } + + private void layoutControl2_Click(object sender, EventArgs e) + { + + } + + /// + /// 点击新增按钮 + /// + /// + /// + private void btnInsert_Click(object sender, EventArgs e) + { + EditTestStep editTestStep = new EditTestStep(null); + editTestStep.refreshParent += new EditTestStep.RefreshParent(DataSource); + editTestStep.ShowDialog(); + } + + /// + /// 点击查询按钮 + /// + /// + /// + private void btnSearch_Click(object sender, EventArgs e) + { + DataSource(); + } + + /// + /// 操作列 + /// + private void Operate() + { + repItemOperate.ButtonClick += (s, e) => + { + var rowHandle = grid_Test.FocusedRowHandle; + var rowData = grid_Test.GetRow(rowHandle) as Test_Step; + switch (e.Button.Tag.ToString()) + { + case "edit": + var editTest = new EditTestStep(rowData.Id); + editTest.refreshParent += new EditTestStep.RefreshParent(DataSource); + editTest.ShowDialog(); + break; + case "delete": + if (CustomMessageBoxHelper.XtraMessageBoxShow("确认要删除吗？", MessageBoxButtons.OKCancel) == DialogResult.OK) + { + Loading.ShowWaitForm(); + var delResult = testStepService.DelTestStepById(rowData.Id); + Loading.CloseWaitForm(); + CustomMessageBoxHelper.XtraMessageBoxShow(delResult.msg); + DataSource(); + } + break; + default: + break; + } + }; + } + } +} diff --git a/ProductionSystem/Forms/TestForms/TestStepManager.resx b/ProductionSystem/Forms/TestForms/TestStepManager.resx new file mode 100644 index 0000000..c523733 --- /dev/null +++ b/ProductionSystem/Forms/TestForms/TestStepManager.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 136, 17 + + \ No newline at end of file diff --git a/ProductionSystem/ProductionSystem.csproj b/ProductionSystem/ProductionSystem.csproj index 7d9945d..f6857a4 100644 --- a/ProductionSystem/ProductionSystem.csproj +++ b/ProductionSystem/ProductionSystem.csproj @@ -320,6 +320,18 @@ UpdatePwdForm.cs + + Form + + + EditTestStep.cs + + + Form + + + TestStepManager.cs + @@ -418,6 +430,12 @@ UpdatePwdForm.cs + + EditTestStep.cs + + + TestStepManager.cs + ResXFileCodeGenerator diff --git a/ProductionSystem_Model/DbModel/Para/T_ParaColumnConfig.cs b/ProductionSystem_Model/DbModel/Para/T_ParaColumnConfig.cs index fcabb67..687e27d 100644 --- a/ProductionSystem_Model/DbModel/Para/T_ParaColumnConfig.cs +++ b/ProductionSystem_Model/DbModel/Para/T_ParaColumnConfig.cs @@ -113,5 +113,19 @@ namespace ProductionSystem_Model.DbModel.Para /// [SugarColumn(ColumnName = "sortindex")] public int SortIndex { get; set; } + + + + /// + /// 等待时间 + /// + [SugarColumn(ColumnName = "waiter_time")] + public string WaiterTime { get; set; } + + /// + /// 测试时间 + /// + [SugarColumn(ColumnName = "test_time")] + public string TestTime { get; set; } } } diff --git a/ProductionSystem_Model/DbModel/Test_Step.cs b/ProductionSystem_Model/DbModel/Test_Step.cs new file mode 100644 index 0000000..0c4af56 --- /dev/null +++ b/ProductionSystem_Model/DbModel/Test_Step.cs @@ -0,0 +1,63 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProductionSystem_Model.DbModel.Test +{ + /// + /// 测试步骤配置表 + /// + [SugarTable("test_step")] + public class Test_Step + { + public Test_Step() + { + Id = Guid.NewGuid().ToString(); + } + + /// + /// 主键 + /// + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsNullable = false)] + public string Id { get; set; } + + /// + /// 测试名称 + /// + [SugarColumn(ColumnName = "test_name")] + public string TestName { get; set; } + + /// + /// 测试内容 + /// + [SugarColumn(ColumnName = "test_content")] + public string TestContent { get; set; } + + /// + /// 索引 + /// + [SugarColumn(ColumnName = "index")] + public int Index { get; set; } + + /// + /// 是否启用 + /// + [SugarColumn(ColumnName = "is_enable")] + public bool IsEnable { get; set; } + + /// + /// 产品类型 + /// + [SugarColumn(ColumnName = "product_type")] + public string ProductType { get; set; } + + /// + /// 备注 + /// + [SugarColumn(ColumnName = "remark")] + public string Remark { get; set; } + } +} diff --git a/ProductionSystem_Model/ProductionSystem_Model.csproj b/ProductionSystem_Model/ProductionSystem_Model.csproj index b8628e7..241da50 100644 --- a/ProductionSystem_Model/ProductionSystem_Model.csproj +++ b/ProductionSystem_Model/ProductionSystem_Model.csproj @@ -108,6 +108,7 @@ + @@ -128,6 +129,7 @@ + diff --git a/ProductionSystem_Model/ViewModel/Request/Test/TestStepVM.cs b/ProductionSystem_Model/ViewModel/Request/Test/TestStepVM.cs new file mode 100644 index 0000000..052491f --- /dev/null +++ b/ProductionSystem_Model/ViewModel/Request/Test/TestStepVM.cs @@ -0,0 +1,61 @@ +using Custom.Utils.Framework; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProductionSystem_Model.ViewModel.Response.Test +{ + public class TestStepVM + { + + /// + /// 主键 + /// + public string Id { get; set; } + + /// + /// 产品类型 + /// + [MyExportAttribute(true, 1)] + [Description("产品类型")] + public string ProductType { get; set; } + + /// + /// 测试名称 + /// + [MyExportAttribute(true, 2)] + [Description("测试名称")] + public string TestName { get; set; } + + /// + /// 测试内容 + /// + [MyExportAttribute(true, 3)] + [Description("测试内容")] + public string TestContent { get; set; } + + /// + /// 索引 + /// + [MyExportAttribute(true, 4)] + [Description("索引")] + public string Index { get; set; } + + /// + /// 是否启用 + /// + [MyExportAttribute(true, 5)] + [Description("是否启用")] + public string IsEnable { get; set; } + + /// + /// 备注 + /// + [MyExportAttribute(true, 6)] + [Description("备注")] + public string Remark { get; set; } + } +} diff --git a/ProductionSystem_Service/ParaColumnConfigService.cs b/ProductionSystem_Service/ParaColumnConfigService.cs index 805ca7c..acc6212 100644 --- a/ProductionSystem_Service/ParaColumnConfigService.cs +++ b/ProductionSystem_Service/ParaColumnConfigService.cs @@ -2,6 +2,7 @@ using ProductionSystem_Model.DbModel; using ProductionSystem_Model.DbModel.Para; using ProductionSystem_Model.DbModel.System; +using ProductionSystem_Model.DbModel.Test; using ProductionSystem_Model.ViewModel; using ProductionSystem_Model.ViewModel.Request.Para; using ProductionSystem_Model.ViewModel.Response.Para; @@ -14,6 +15,13 @@ namespace ProductionSystem_Service { public class ParaColumnConfigService : DbContext { + + + public List QueryTestStepColumnByProductType(string productType) + { + return db.Queryable() + .Where(x => x.ProductType == productType).ToList(); + } /// /// 分页查询参数字段配置项 /// diff --git a/ProductionSystem_Service/ProductionSystem_Service.csproj b/ProductionSystem_Service/ProductionSystem_Service.csproj index 1940df1..19686e6 100644 --- a/ProductionSystem_Service/ProductionSystem_Service.csproj +++ b/ProductionSystem_Service/ProductionSystem_Service.csproj @@ -117,6 +117,7 @@ + diff --git a/ProductionSystem_Service/TestStepService.cs b/ProductionSystem_Service/TestStepService.cs new file mode 100644 index 0000000..386b1e1 --- /dev/null +++ b/ProductionSystem_Service/TestStepService.cs @@ -0,0 +1,139 @@ +using ProductionSystem_Log; +using ProductionSystem_Model.DbModel.Para; +using ProductionSystem_Model.DbModel.System; +using ProductionSystem_Model.DbModel.Test; +using ProductionSystem_Model.ViewModel; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProductionSystem_Service +{ + public class TestStepService : DbContext + { + /// + /// 新增测试步骤 + /// + /// + /// + public (bool isOk, string msg) AddTestStep(Test_Step test_Step) + { + try + { + var row = db.Insertable(test_Step).ExecuteCommand(); + return (row > 0, row > 0 ? "操作成功！" : "操作失败！"); + } + catch (Exception ex) + { + var errorMsg = $"执行TestStepService下AddTestStep时异常：{ex.Message}"; + LogHelper.Error(ex, errorMsg); + return (false, errorMsg); + } + } + + /// + /// 更新测试步骤 + /// + /// + /// + public (bool isOk, string msg) UpdateTestStep(Test_Step test_Step) + { + try + { + var row = db.Updateable(test_Step).ExecuteCommand(); + return (row > 0, row > 0 ? "操作成功！" : "操作失败！"); + } + catch (Exception ex) + { + var errorMsg = $"执行TestStepService下UpdateTestStep时异常：{ex.Message}"; + LogHelper.Error(ex, errorMsg); + return (false, errorMsg); + } + } + + /// + /// 查询所有测试步骤 + /// + /// + public ISugarQueryable QueryTestStep() + { + try + { + return db.Queryable(); + } + catch (Exception ex) + { + LogHelper.Error(ex, "执行TestStepService下QueryTestStep时异常"); + return null; + } + } + + /// + /// 根据Id查询测试步骤 + /// + /// + /// + public Test_Step QueryTestById(string id) + { + try + { + return db.Queryable().First(m => m.Id == id); + } + catch (Exception ex) + { + LogHelper.Error(ex, "执行TestStepService下QueryTestStepById时异常"); + return null; + } + } + + /// + /// 根据Id删除测试步骤 + /// + /// + /// + public (bool isOk, string msg) DelTestStepById(string id) + { + try + { + var row = db.Deleteable() + .Where(m => m.Id == id) + .ExecuteCommand(); + return (row > 0, row > 0 ? "操作成功！" : "操作失败！"); + } + catch (Exception ex) + { + var errorMsg = $"执行TestStepService下DelTestStepById时异常：{ex.Message}"; + LogHelper.Error(ex, errorMsg); + return (false, errorMsg); + } + } + + /// + /// 查询测试步骤字段已存在的最大排序索引 + /// + /// + /// + /// + public int? QueryTestStepColumnMaxSortIndex(string productType, string testStepCategory) + { + try + { + return db.Queryable() + .Where(m => m.ProductType == productType) + .WhereIF(!string.IsNullOrEmpty(testStepCategory), m => m.TestName == testStepCategory) + .Select(m => new + { + sortIndex = SqlFunc.AggregateMax(m.Index) + }).First()?.sortIndex; + } + catch (Exception ex) + { + LogHelper.Error(ex, "执行TestStepService下QueryTestStepColumnMaxSortIndex时异常"); + return -1; + } + } + } +}