From 89429a639023829ae8c3bc6d4ba4193c3e98474f Mon Sep 17 00:00:00 2001 From: MomoWen Date: Thu, 25 Dec 2025 23:57:13 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8CAUTS=5FVendor=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=9D=97=EF=BC=8C=E7=94=9F=E6=88=90=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E8=BF=87=E7=A8=8B=E6=97=B6=E5=8F=96=E6=B6=88UFT8?= =?UTF-8?q?=E5=A3=B0=E6=98=8E=202,=20=20=E6=B5=81=E7=A8=8B=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=B0=86ControlType=E6=98=BE=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=EF=BC=88=E4=B9=8B=E5=89=8D=E5=AE=BD=E5=BA=A6=E4=B8=BA?= =?UTF-8?q?0=EF=BC=89=203=EF=BC=8Cif=20=E6=89=A7=E8=A1=8C=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=B5=8B=E8=AF=95ok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTS_Vendor/FrmMain.vb | 4 +- .../Station/FrmStationPlan.Designer.vb | 213 +++++----- .../UTSModule/Station/FrmStationPlan.resx | 377 +++++++++--------- UTS_Core/UTSModule/Station/StationPlanGrid.vb | 2 +- UTS_Core/UTSModule/Test/UtsTester.vb | 2 + 5 files changed, 306 insertions(+), 292 deletions(-) diff --git a/AUTS_Vendor/FrmMain.vb b/AUTS_Vendor/FrmMain.vb index 85abb9a..8241980 100644 --- a/AUTS_Vendor/FrmMain.vb +++ b/AUTS_Vendor/FrmMain.vb @@ -168,7 +168,7 @@ Public Class FrmMain sqlCmd.Append("DECLARE l_int int default 0;" & vbCrLf) sqlCmd.Append("DECLARE l_len int default 0;" & vbCrLf) sqlCmd.Append("DECLARE l_type varchar(16) default '';" & vbCrLf) - sqlCmd.Append("select count(*),`DATA_TYPE`,`CHARACTER_MAXIMUM_LENGTH` into l_int,l_type,l_len from `information_schema`.`COLUMNS` WHERE TABLE_SCHEMA = dbName and TABLE_NAME = tbName and COLUMN_NAME = filed COLLATE utf8_general_ci;" & vbCrLf) + sqlCmd.Append("select count(*),`DATA_TYPE`,`CHARACTER_MAXIMUM_LENGTH` into l_int,l_type,l_len from `information_schema`.`COLUMNS` WHERE TABLE_SCHEMA = dbName and TABLE_NAME = tbName and COLUMN_NAME = filed;" & vbCrLf) sqlCmd.Append("if l_int = 0 then" & vbCrLf) sqlCmd.Append("set @cmd = CONCAT('alter table ',dbName,'.',tbName,' add column ',filed,' varchar(',len,')');" & vbCrLf) sqlCmd.Append("PREPARE pre FROM @cmd;" & vbCrLf) @@ -193,7 +193,7 @@ Public Class FrmMain sqlCmd.Append($"Create Procedure `{dbName}`.`AlterSnListBarcode`(in orderid int,in orderinternalid int,in pid int,in code varchar(32),in sntype int)" & vbCrLf) sqlCmd.Append("begin " & vbCrLf) sqlCmd.Append("DECLARE l_int int default 0; " & vbCrLf) - sqlCmd.Append("select count(*) into l_int from `TBL_SnList` WHERE `BarCode` = code COLLATE utf8_general_ci; " & vbCrLf) + sqlCmd.Append("select count(*) into l_int from `TBL_SnList` WHERE `BarCode` = code; " & vbCrLf) sqlCmd.Append("if l_int = 0 then " & vbCrLf) sqlCmd.Append("set @cmd = CONCAT('Insert into TBL_SnList(OrderID,OrderInternalID,ProductID,BarCode,SnType) values(',orderid,',',orderinternalid,',',pid,',''',code,''',',sntype,')'); " & vbCrLf) sqlCmd.Append("PREPARE pre FROM @cmd; " & vbCrLf) diff --git a/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb b/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb index a5c3a83..2339872 100644 --- a/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb +++ b/UTS_Core/UTSModule/Station/FrmStationPlan.Designer.vb @@ -26,15 +26,15 @@ Namespace UTSModule.Station '不要使用代码编辑器修改它。 Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FrmStationPlan)) - Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() - Me.TsBtnOpen = New System.Windows.Forms.ToolStripButton() - Me.TsBtnSave = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() - Me.TsBtnLoad = New System.Windows.Forms.ToolStripButton() - Me.TsBtnSaveAs = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FrmStationPlan)) + Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.TsBtnOpen = New System.Windows.Forms.ToolStripButton() + Me.TsBtnSave = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() + Me.TsBtnLoad = New System.Windows.Forms.ToolStripButton() + Me.TsBtnSaveAs = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.TsBtnBackward = New System.Windows.Forms.ToolStripButton() Me.TsBtnForward = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() @@ -101,6 +101,7 @@ Namespace UTSModule.Station Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TpOutputInfo = New System.Windows.Forms.TabPage() Me.RtxOutputInfo = New System.Windows.Forms.RichTextBox() + Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStrip1.SuspendLayout() Me.StuMain.SuspendLayout() CType(Me.SplStationPlan, System.ComponentModel.ISupportInitialize).BeginInit() @@ -126,11 +127,11 @@ Namespace UTSModule.Station 'ToolStrip1 ' Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsBtnOpen, Me.TsBtnSave, Me.ToolStripSeparator4, Me.TsBtnLoad, Me.TsBtnSaveAs, Me.ToolStripSeparator3, Me.TsBtnBackward, Me.TsBtnForward, Me.ToolStripSeparator1, Me.TsBtnUndo, Me.TsBtnRedo, Me.ToolStripSeparator13, Me.tsBtnInsertRow, Me.tsBtnRemoveRow, Me.ToolStripSeparator14, Me.TsBtnMoveUp, Me.TsBtnMoveDown, Me.TsBtnMoveLeft, Me.TsBtnMoveRight, Me.ToolStripSeparator2, Me.TsBtnDebugMode, Me.TsBtnDebugStart, Me.TsBtnFailMode, Me.ToolStripSeparator10, Me.tslBtn_ActionOnly, Me.TsBtn_Record, Me.TsBtn_ExpandNode}) + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsBtnOpen, Me.TsBtnSave, Me.ToolStripSeparator4, Me.TsBtnLoad, Me.TsBtnSaveAs, Me.ToolStripSeparator3, Me.TsBtnBackward, Me.TsBtnForward, Me.ToolStripSeparator1, Me.TsBtnUndo, Me.TsBtnRedo, Me.ToolStripSeparator13, Me.tsBtnInsertRow, Me.tsBtnRemoveRow, Me.ToolStripSeparator14, Me.TsBtnMoveUp, Me.TsBtnMoveDown, Me.TsBtnMoveLeft, Me.TsBtnMoveRight, Me.ToolStripSeparator2, Me.TsBtnDebugMode, Me.TsBtnDebugStart, Me.ToolStripSeparator5, Me.TsBtnFailMode, Me.ToolStripSeparator10, Me.tslBtn_ActionOnly, Me.TsBtn_Record, Me.TsBtn_ExpandNode}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) - Me.ToolStrip1.Size = New System.Drawing.Size(1466, 58) + Me.ToolStrip1.Size = New System.Drawing.Size(1466, 57) Me.ToolStrip1.TabIndex = 0 Me.ToolStrip1.Text = "ToolStrip1" ' @@ -140,7 +141,7 @@ Namespace UTSModule.Station Me.TsBtnOpen.Image = CType(resources.GetObject("TsBtnOpen.Image"), System.Drawing.Image) Me.TsBtnOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnOpen.Name = "TsBtnOpen" - Me.TsBtnOpen.Size = New System.Drawing.Size(47, 53) + Me.TsBtnOpen.Size = New System.Drawing.Size(47, 52) Me.TsBtnOpen.Text = "打开" Me.TsBtnOpen.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -150,14 +151,14 @@ Namespace UTSModule.Station Me.TsBtnSave.Image = CType(resources.GetObject("TsBtnSave.Image"), System.Drawing.Image) Me.TsBtnSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnSave.Name = "TsBtnSave" - Me.TsBtnSave.Size = New System.Drawing.Size(47, 53) + Me.TsBtnSave.Size = New System.Drawing.Size(47, 52) Me.TsBtnSave.Text = "保存" Me.TsBtnSave.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 58) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 57) ' 'TsBtnLoad ' @@ -165,7 +166,7 @@ Namespace UTSModule.Station Me.TsBtnLoad.Image = CType(resources.GetObject("TsBtnLoad.Image"), System.Drawing.Image) Me.TsBtnLoad.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnLoad.Name = "TsBtnLoad" - Me.TsBtnLoad.Size = New System.Drawing.Size(47, 53) + Me.TsBtnLoad.Size = New System.Drawing.Size(47, 52) Me.TsBtnLoad.Text = "重载" Me.TsBtnLoad.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -175,14 +176,14 @@ Namespace UTSModule.Station Me.TsBtnSaveAs.Image = CType(resources.GetObject("TsBtnSaveAs.Image"), System.Drawing.Image) Me.TsBtnSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnSaveAs.Name = "TsBtnSaveAs" - Me.TsBtnSaveAs.Size = New System.Drawing.Size(47, 53) + Me.TsBtnSaveAs.Size = New System.Drawing.Size(47, 52) Me.TsBtnSaveAs.Text = "导出" Me.TsBtnSaveAs.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 58) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 57) ' 'TsBtnBackward ' @@ -190,7 +191,7 @@ Namespace UTSModule.Station Me.TsBtnBackward.Image = CType(resources.GetObject("TsBtnBackward.Image"), System.Drawing.Image) Me.TsBtnBackward.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnBackward.Name = "TsBtnBackward" - Me.TsBtnBackward.Size = New System.Drawing.Size(64, 53) + Me.TsBtnBackward.Size = New System.Drawing.Size(64, 52) Me.TsBtnBackward.Text = "上一步" Me.TsBtnBackward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -200,7 +201,7 @@ Namespace UTSModule.Station Me.TsBtnForward.Image = CType(resources.GetObject("TsBtnForward.Image"), System.Drawing.Image) Me.TsBtnForward.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnForward.Name = "TsBtnForward" - Me.TsBtnForward.Size = New System.Drawing.Size(64, 53) + Me.TsBtnForward.Size = New System.Drawing.Size(64, 52) Me.TsBtnForward.Text = "下一步" Me.TsBtnForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.TsBtnForward.ToolTipText = "下一步" @@ -208,7 +209,7 @@ Namespace UTSModule.Station 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 58) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 57) ' 'TsBtnUndo ' @@ -216,7 +217,7 @@ Namespace UTSModule.Station Me.TsBtnUndo.Image = CType(resources.GetObject("TsBtnUndo.Image"), System.Drawing.Image) Me.TsBtnUndo.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnUndo.Name = "TsBtnUndo" - Me.TsBtnUndo.Size = New System.Drawing.Size(47, 53) + Me.TsBtnUndo.Size = New System.Drawing.Size(47, 52) Me.TsBtnUndo.Text = "撤销" Me.TsBtnUndo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -226,7 +227,7 @@ Namespace UTSModule.Station Me.TsBtnRedo.Image = CType(resources.GetObject("TsBtnRedo.Image"), System.Drawing.Image) Me.TsBtnRedo.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnRedo.Name = "TsBtnRedo" - Me.TsBtnRedo.Size = New System.Drawing.Size(47, 53) + Me.TsBtnRedo.Size = New System.Drawing.Size(47, 52) Me.TsBtnRedo.Text = "重做" Me.TsBtnRedo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.TsBtnRedo.ToolTipText = "撤销" @@ -234,14 +235,14 @@ Namespace UTSModule.Station 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(6, 58) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(6, 57) ' 'tsBtnInsertRow ' Me.tsBtnInsertRow.Image = CType(resources.GetObject("tsBtnInsertRow.Image"), System.Drawing.Image) Me.tsBtnInsertRow.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsBtnInsertRow.Name = "tsBtnInsertRow" - Me.tsBtnInsertRow.Size = New System.Drawing.Size(73, 53) + Me.tsBtnInsertRow.Size = New System.Drawing.Size(68, 52) Me.tsBtnInsertRow.Text = "插入行" Me.tsBtnInsertRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -250,14 +251,14 @@ Namespace UTSModule.Station Me.tsBtnRemoveRow.Image = CType(resources.GetObject("tsBtnRemoveRow.Image"), System.Drawing.Image) Me.tsBtnRemoveRow.ImageTransparentColor = System.Drawing.Color.Magenta Me.tsBtnRemoveRow.Name = "tsBtnRemoveRow" - Me.tsBtnRemoveRow.Size = New System.Drawing.Size(73, 53) + Me.tsBtnRemoveRow.Size = New System.Drawing.Size(68, 52) Me.tsBtnRemoveRow.Text = "移除行" Me.tsBtnRemoveRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(6, 58) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(6, 57) ' 'TsBtnMoveUp ' @@ -265,7 +266,7 @@ Namespace UTSModule.Station Me.TsBtnMoveUp.Image = CType(resources.GetObject("TsBtnMoveUp.Image"), System.Drawing.Image) Me.TsBtnMoveUp.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveUp.Name = "TsBtnMoveUp" - Me.TsBtnMoveUp.Size = New System.Drawing.Size(47, 53) + Me.TsBtnMoveUp.Size = New System.Drawing.Size(47, 52) Me.TsBtnMoveUp.Text = "上移" Me.TsBtnMoveUp.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -275,7 +276,7 @@ Namespace UTSModule.Station Me.TsBtnMoveDown.Image = CType(resources.GetObject("TsBtnMoveDown.Image"), System.Drawing.Image) Me.TsBtnMoveDown.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveDown.Name = "TsBtnMoveDown" - Me.TsBtnMoveDown.Size = New System.Drawing.Size(47, 53) + Me.TsBtnMoveDown.Size = New System.Drawing.Size(47, 52) Me.TsBtnMoveDown.Text = "下移" Me.TsBtnMoveDown.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -285,7 +286,7 @@ Namespace UTSModule.Station Me.TsBtnMoveLeft.Image = CType(resources.GetObject("TsBtnMoveLeft.Image"), System.Drawing.Image) Me.TsBtnMoveLeft.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveLeft.Name = "TsBtnMoveLeft" - Me.TsBtnMoveLeft.Size = New System.Drawing.Size(47, 53) + Me.TsBtnMoveLeft.Size = New System.Drawing.Size(47, 52) Me.TsBtnMoveLeft.Text = "升级" Me.TsBtnMoveLeft.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -295,21 +296,21 @@ Namespace UTSModule.Station Me.TsBtnMoveRight.Image = CType(resources.GetObject("TsBtnMoveRight.Image"), System.Drawing.Image) Me.TsBtnMoveRight.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnMoveRight.Name = "TsBtnMoveRight" - Me.TsBtnMoveRight.Size = New System.Drawing.Size(47, 53) + Me.TsBtnMoveRight.Size = New System.Drawing.Size(47, 52) Me.TsBtnMoveRight.Text = "降级" Me.TsBtnMoveRight.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 58) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 57) ' 'TsBtnDebugMode ' Me.TsBtnDebugMode.Image = CType(resources.GetObject("TsBtnDebugMode.Image"), System.Drawing.Image) Me.TsBtnDebugMode.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnDebugMode.Name = "TsBtnDebugMode" - Me.TsBtnDebugMode.Size = New System.Drawing.Size(92, 53) + Me.TsBtnDebugMode.Size = New System.Drawing.Size(86, 52) Me.TsBtnDebugMode.Text = "调试模式" Me.TsBtnDebugMode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -318,7 +319,7 @@ Namespace UTSModule.Station Me.TsBtnDebugStart.Image = CType(resources.GetObject("TsBtnDebugStart.Image"), System.Drawing.Image) Me.TsBtnDebugStart.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnDebugStart.Name = "TsBtnDebugStart" - Me.TsBtnDebugStart.Size = New System.Drawing.Size(92, 53) + Me.TsBtnDebugStart.Size = New System.Drawing.Size(86, 52) Me.TsBtnDebugStart.Text = "开始调试" Me.TsBtnDebugStart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -327,21 +328,21 @@ Namespace UTSModule.Station Me.TsBtnFailMode.Image = CType(resources.GetObject("TsBtnFailMode.Image"), System.Drawing.Image) Me.TsBtnFailMode.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtnFailMode.Name = "TsBtnFailMode" - Me.TsBtnFailMode.Size = New System.Drawing.Size(92, 53) + Me.TsBtnFailMode.Size = New System.Drawing.Size(86, 52) Me.TsBtnFailMode.Text = "单步退出" Me.TsBtnFailMode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 58) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(6, 57) ' 'tslBtn_ActionOnly ' Me.tslBtn_ActionOnly.Image = CType(resources.GetObject("tslBtn_ActionOnly.Image"), System.Drawing.Image) Me.tslBtn_ActionOnly.ImageTransparentColor = System.Drawing.Color.Magenta Me.tslBtn_ActionOnly.Name = "tslBtn_ActionOnly" - Me.tslBtn_ActionOnly.Size = New System.Drawing.Size(67, 53) + Me.tslBtn_ActionOnly.Size = New System.Drawing.Size(70, 52) Me.tslBtn_ActionOnly.Text = "Action" Me.tslBtn_ActionOnly.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -350,7 +351,7 @@ Namespace UTSModule.Station Me.TsBtn_Record.Image = CType(resources.GetObject("TsBtn_Record.Image"), System.Drawing.Image) Me.TsBtn_Record.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtn_Record.Name = "TsBtn_Record" - Me.TsBtn_Record.Size = New System.Drawing.Size(71, 53) + Me.TsBtn_Record.Size = New System.Drawing.Size(75, 52) Me.TsBtn_Record.Text = "Record" Me.TsBtn_Record.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -359,7 +360,7 @@ Namespace UTSModule.Station Me.TsBtn_ExpandNode.Image = CType(resources.GetObject("TsBtn_ExpandNode.Image"), System.Drawing.Image) Me.TsBtn_ExpandNode.ImageTransparentColor = System.Drawing.Color.Magenta Me.TsBtn_ExpandNode.Name = "TsBtn_ExpandNode" - Me.TsBtn_ExpandNode.Size = New System.Drawing.Size(74, 53) + Me.TsBtn_ExpandNode.Size = New System.Drawing.Size(78, 52) Me.TsBtn_ExpandNode.Text = "Expand" Me.TsBtn_ExpandNode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText ' @@ -399,7 +400,7 @@ Namespace UTSModule.Station 'SplStationPlan ' Me.SplStationPlan.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplStationPlan.Location = New System.Drawing.Point(0, 58) + Me.SplStationPlan.Location = New System.Drawing.Point(0, 57) Me.SplStationPlan.Margin = New System.Windows.Forms.Padding(4) Me.SplStationPlan.Name = "SplStationPlan" Me.SplStationPlan.Orientation = System.Windows.Forms.Orientation.Horizontal @@ -411,7 +412,7 @@ Namespace UTSModule.Station 'SplStationPlan.Panel2 ' Me.SplStationPlan.Panel2.Controls.Add(Me.GrpOutputInfo) - Me.SplStationPlan.Size = New System.Drawing.Size(1466, 783) + Me.SplStationPlan.Size = New System.Drawing.Size(1466, 784) Me.SplStationPlan.SplitterDistance = 526 Me.SplStationPlan.SplitterWidth = 6 Me.SplStationPlan.TabIndex = 10 @@ -432,7 +433,7 @@ Namespace UTSModule.Station ' Me.SplPlanDesign.Panel2.Controls.Add(Me.GrpSingleRowInfo) Me.SplPlanDesign.Size = New System.Drawing.Size(1466, 526) - Me.SplPlanDesign.SplitterDistance = 1006 + Me.SplPlanDesign.SplitterDistance = 1004 Me.SplPlanDesign.SplitterWidth = 6 Me.SplPlanDesign.TabIndex = 0 ' @@ -444,7 +445,7 @@ Namespace UTSModule.Station Me.GrpStationPlan.Margin = New System.Windows.Forms.Padding(4) Me.GrpStationPlan.Name = "GrpStationPlan" Me.GrpStationPlan.Padding = New System.Windows.Forms.Padding(4) - Me.GrpStationPlan.Size = New System.Drawing.Size(1006, 526) + Me.GrpStationPlan.Size = New System.Drawing.Size(1004, 526) Me.GrpStationPlan.TabIndex = 45 Me.GrpStationPlan.TabStop = False Me.GrpStationPlan.Text = "执行流程" @@ -461,7 +462,7 @@ Namespace UTSModule.Station Me.GrdStationPlan.Margin = New System.Windows.Forms.Padding(4) Me.GrdStationPlan.MouseWheelSpeed = CType(3, Short) Me.GrdStationPlan.Name = "GrdStationPlan" - Me.GrdStationPlan.Size = New System.Drawing.Size(998, 497) + Me.GrdStationPlan.Size = New System.Drawing.Size(996, 497) Me.GrdStationPlan.TabIndex = 0 ' 'CmsPlanGrid @@ -469,7 +470,7 @@ Namespace UTSModule.Station Me.CmsPlanGrid.ImageScalingSize = New System.Drawing.Size(24, 24) Me.CmsPlanGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MsiGridRowBlockInsert, Me.MsiGridRowBlockDelete, Me.ToolStripSeparator7, Me.tsBtn_CheckAction, Me.tsBtn_UncheckAction, Me.ToolStripSeparator15, Me.MsiUndo, Me.MsiRedo, Me.ToolStripSeparator6, Me.MsiSaveNodeFile, Me.MsiLoadNodeFile, Me.ToolStripSeparator11, Me.TsmiDebugStart, Me.TsmiDebugEnd, Me.TsmiDebugContinue, Me.执行1ToolStripMenuItem, Me.执行2ToolStripMenuItem, Me.TsmiDebugStep, Me.ToolStripSeparator8, Me.TsmiDebugSetup, Me.TsmiDebugMain, Me.TsmiDebugPass, Me.TsmiDebugFail, Me.TsmiDebugCleanup, Me.ToolStripSeparator9, Me.TsmiDebugNode, Me.TsmiDebugNodeBegin, Me.TsmiJumpCall}) Me.CmsPlanGrid.Name = "CmsMain" - Me.CmsPlanGrid.Size = New System.Drawing.Size(303, 744) + Me.CmsPlanGrid.Size = New System.Drawing.Size(307, 744) ' 'MsiGridRowBlockInsert ' @@ -477,7 +478,7 @@ Namespace UTSModule.Station Me.MsiGridRowBlockInsert.Name = "MsiGridRowBlockInsert" Me.MsiGridRowBlockInsert.ShortcutKeyDisplayString = "Ctr+I" Me.MsiGridRowBlockInsert.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.I), System.Windows.Forms.Keys) - Me.MsiGridRowBlockInsert.Size = New System.Drawing.Size(302, 32) + Me.MsiGridRowBlockInsert.Size = New System.Drawing.Size(306, 32) Me.MsiGridRowBlockInsert.Text = "插入" ' 'MsiGridRowBlockDelete @@ -486,75 +487,75 @@ Namespace UTSModule.Station Me.MsiGridRowBlockDelete.Name = "MsiGridRowBlockDelete" Me.MsiGridRowBlockDelete.ShortcutKeyDisplayString = "Ctr+D" Me.MsiGridRowBlockDelete.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.D), System.Windows.Forms.Keys) - Me.MsiGridRowBlockDelete.Size = New System.Drawing.Size(302, 32) + Me.MsiGridRowBlockDelete.Size = New System.Drawing.Size(306, 32) Me.MsiGridRowBlockDelete.Text = "删除" ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(299, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(303, 6) ' 'tsBtn_CheckAction ' Me.tsBtn_CheckAction.Image = CType(resources.GetObject("tsBtn_CheckAction.Image"), System.Drawing.Image) Me.tsBtn_CheckAction.Name = "tsBtn_CheckAction" - Me.tsBtn_CheckAction.Size = New System.Drawing.Size(302, 32) + Me.tsBtn_CheckAction.Size = New System.Drawing.Size(306, 32) Me.tsBtn_CheckAction.Text = "勾选测试" ' 'tsBtn_UncheckAction ' Me.tsBtn_UncheckAction.Image = CType(resources.GetObject("tsBtn_UncheckAction.Image"), System.Drawing.Image) Me.tsBtn_UncheckAction.Name = "tsBtn_UncheckAction" - Me.tsBtn_UncheckAction.Size = New System.Drawing.Size(302, 32) + Me.tsBtn_UncheckAction.Size = New System.Drawing.Size(306, 32) Me.tsBtn_UncheckAction.Text = "取消勾选测试" ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(299, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(303, 6) ' 'MsiUndo ' Me.MsiUndo.Name = "MsiUndo" Me.MsiUndo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) - Me.MsiUndo.Size = New System.Drawing.Size(302, 32) + Me.MsiUndo.Size = New System.Drawing.Size(306, 32) Me.MsiUndo.Text = "撤销" ' 'MsiRedo ' Me.MsiRedo.Name = "MsiRedo" Me.MsiRedo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Y), System.Windows.Forms.Keys) - Me.MsiRedo.Size = New System.Drawing.Size(302, 32) + Me.MsiRedo.Size = New System.Drawing.Size(306, 32) Me.MsiRedo.Text = "重做" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(299, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(303, 6) ' 'MsiSaveNodeFile ' Me.MsiSaveNodeFile.Name = "MsiSaveNodeFile" - Me.MsiSaveNodeFile.Size = New System.Drawing.Size(302, 32) + Me.MsiSaveNodeFile.Size = New System.Drawing.Size(306, 32) Me.MsiSaveNodeFile.Text = "另存为节点文件" ' 'MsiLoadNodeFile ' Me.MsiLoadNodeFile.Name = "MsiLoadNodeFile" - Me.MsiLoadNodeFile.Size = New System.Drawing.Size(302, 32) + Me.MsiLoadNodeFile.Size = New System.Drawing.Size(306, 32) Me.MsiLoadNodeFile.Text = "加载节点文件" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(299, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(303, 6) ' 'TsmiDebugStart ' Me.TsmiDebugStart.Image = CType(resources.GetObject("TsmiDebugStart.Image"), System.Drawing.Image) Me.TsmiDebugStart.Name = "TsmiDebugStart" Me.TsmiDebugStart.ShortcutKeys = System.Windows.Forms.Keys.F5 - Me.TsmiDebugStart.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugStart.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugStart.Text = "开始执行" ' 'TsmiDebugEnd @@ -562,7 +563,7 @@ Namespace UTSModule.Station Me.TsmiDebugEnd.Image = CType(resources.GetObject("TsmiDebugEnd.Image"), System.Drawing.Image) Me.TsmiDebugEnd.Name = "TsmiDebugEnd" Me.TsmiDebugEnd.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F5), System.Windows.Forms.Keys) - Me.TsmiDebugEnd.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugEnd.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugEnd.Text = "退出执行" ' 'TsmiDebugContinue @@ -570,21 +571,21 @@ Namespace UTSModule.Station Me.TsmiDebugContinue.Image = CType(resources.GetObject("TsmiDebugContinue.Image"), System.Drawing.Image) Me.TsmiDebugContinue.Name = "TsmiDebugContinue" Me.TsmiDebugContinue.ShortcutKeys = CType((System.Windows.Forms.Keys.Alt Or System.Windows.Forms.Keys.F5), System.Windows.Forms.Keys) - Me.TsmiDebugContinue.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugContinue.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugContinue.Text = "继续执行" ' '执行1ToolStripMenuItem ' Me.执行1ToolStripMenuItem.Name = "执行1ToolStripMenuItem" Me.执行1ToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9 - Me.执行1ToolStripMenuItem.Size = New System.Drawing.Size(302, 32) + Me.执行1ToolStripMenuItem.Size = New System.Drawing.Size(306, 32) Me.执行1ToolStripMenuItem.Text = "单步重复" ' '执行2ToolStripMenuItem ' Me.执行2ToolStripMenuItem.Name = "执行2ToolStripMenuItem" Me.执行2ToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10 - Me.执行2ToolStripMenuItem.Size = New System.Drawing.Size(302, 32) + Me.执行2ToolStripMenuItem.Size = New System.Drawing.Size(306, 32) Me.执行2ToolStripMenuItem.Text = "单步调试" ' 'TsmiDebugStep @@ -592,73 +593,73 @@ Namespace UTSModule.Station Me.TsmiDebugStep.Image = CType(resources.GetObject("TsmiDebugStep.Image"), System.Drawing.Image) Me.TsmiDebugStep.Name = "TsmiDebugStep" Me.TsmiDebugStep.ShortcutKeys = System.Windows.Forms.Keys.F11 - Me.TsmiDebugStep.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugStep.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugStep.Text = "单步断点调试" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(299, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(303, 6) ' 'TsmiDebugSetup ' Me.TsmiDebugSetup.Name = "TsmiDebugSetup" Me.TsmiDebugSetup.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F1), System.Windows.Forms.Keys) - Me.TsmiDebugSetup.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugSetup.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugSetup.Text = "Setup模块执行" ' 'TsmiDebugMain ' Me.TsmiDebugMain.Name = "TsmiDebugMain" Me.TsmiDebugMain.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F2), System.Windows.Forms.Keys) - Me.TsmiDebugMain.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugMain.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugMain.Text = "Main模块执行" ' 'TsmiDebugPass ' Me.TsmiDebugPass.Name = "TsmiDebugPass" Me.TsmiDebugPass.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F3), System.Windows.Forms.Keys) - Me.TsmiDebugPass.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugPass.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugPass.Text = "Pass模块执行" ' 'TsmiDebugFail ' Me.TsmiDebugFail.Name = "TsmiDebugFail" Me.TsmiDebugFail.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys) - Me.TsmiDebugFail.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugFail.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugFail.Text = "Fail模块执行" ' 'TsmiDebugCleanup ' Me.TsmiDebugCleanup.Name = "TsmiDebugCleanup" Me.TsmiDebugCleanup.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F5), System.Windows.Forms.Keys) - Me.TsmiDebugCleanup.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugCleanup.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugCleanup.Text = "Cleanup模块执行" ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(299, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(303, 6) ' 'TsmiDebugNode ' Me.TsmiDebugNode.Name = "TsmiDebugNode" Me.TsmiDebugNode.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F10), System.Windows.Forms.Keys) - Me.TsmiDebugNode.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugNode.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugNode.Text = "节点测试" ' 'TsmiDebugNodeBegin ' Me.TsmiDebugNodeBegin.Name = "TsmiDebugNodeBegin" Me.TsmiDebugNodeBegin.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F11), System.Windows.Forms.Keys) - Me.TsmiDebugNodeBegin.Size = New System.Drawing.Size(302, 32) + Me.TsmiDebugNodeBegin.Size = New System.Drawing.Size(306, 32) Me.TsmiDebugNodeBegin.Text = "节点开始测试" ' 'TsmiJumpCall ' Me.TsmiJumpCall.Name = "TsmiJumpCall" Me.TsmiJumpCall.ShortcutKeys = System.Windows.Forms.Keys.F12 - Me.TsmiJumpCall.Size = New System.Drawing.Size(302, 32) + Me.TsmiJumpCall.Size = New System.Drawing.Size(306, 32) Me.TsmiJumpCall.Text = "函数跳转" Me.TsmiJumpCall.Visible = False ' @@ -670,7 +671,7 @@ Namespace UTSModule.Station Me.GrpSingleRowInfo.Margin = New System.Windows.Forms.Padding(4) Me.GrpSingleRowInfo.Name = "GrpSingleRowInfo" Me.GrpSingleRowInfo.Padding = New System.Windows.Forms.Padding(4) - Me.GrpSingleRowInfo.Size = New System.Drawing.Size(454, 526) + Me.GrpSingleRowInfo.Size = New System.Drawing.Size(456, 526) Me.GrpSingleRowInfo.TabIndex = 1 Me.GrpSingleRowInfo.TabStop = False Me.GrpSingleRowInfo.Text = "属性" @@ -691,8 +692,8 @@ Namespace UTSModule.Station 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.RtxColTip) - Me.SplitContainer1.Size = New System.Drawing.Size(446, 497) - Me.SplitContainer1.SplitterDistance = 407 + Me.SplitContainer1.Size = New System.Drawing.Size(448, 497) + Me.SplitContainer1.SplitterDistance = 405 Me.SplitContainer1.SplitterWidth = 6 Me.SplitContainer1.TabIndex = 1 ' @@ -707,7 +708,7 @@ Namespace UTSModule.Station Me.GrdRowNode.Margin = New System.Windows.Forms.Padding(4) Me.GrdRowNode.MouseWheelSpeed = CType(3, Short) Me.GrdRowNode.Name = "GrdRowNode" - Me.GrdRowNode.Size = New System.Drawing.Size(446, 407) + Me.GrdRowNode.Size = New System.Drawing.Size(448, 405) Me.GrdRowNode.TabIndex = 0 ' 'RtxColTip @@ -718,7 +719,7 @@ Namespace UTSModule.Station Me.RtxColTip.Location = New System.Drawing.Point(0, 0) Me.RtxColTip.Margin = New System.Windows.Forms.Padding(4) Me.RtxColTip.Name = "RtxColTip" - Me.RtxColTip.Size = New System.Drawing.Size(446, 84) + Me.RtxColTip.Size = New System.Drawing.Size(448, 86) Me.RtxColTip.TabIndex = 0 Me.RtxColTip.Text = "" ' @@ -730,7 +731,7 @@ Namespace UTSModule.Station Me.GrpOutputInfo.Margin = New System.Windows.Forms.Padding(4) Me.GrpOutputInfo.Name = "GrpOutputInfo" Me.GrpOutputInfo.Padding = New System.Windows.Forms.Padding(4) - Me.GrpOutputInfo.Size = New System.Drawing.Size(1466, 251) + Me.GrpOutputInfo.Size = New System.Drawing.Size(1466, 252) Me.GrpOutputInfo.TabIndex = 0 Me.GrpOutputInfo.TabStop = False Me.GrpOutputInfo.Text = "输出内容" @@ -743,7 +744,7 @@ Namespace UTSModule.Station Me.TabControl1.Margin = New System.Windows.Forms.Padding(4) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1458, 222) + Me.TabControl1.Size = New System.Drawing.Size(1458, 223) Me.TabControl1.TabIndex = 1 ' 'TpOutputInfo @@ -753,7 +754,7 @@ Namespace UTSModule.Station Me.TpOutputInfo.Margin = New System.Windows.Forms.Padding(4) Me.TpOutputInfo.Name = "TpOutputInfo" Me.TpOutputInfo.Padding = New System.Windows.Forms.Padding(4) - Me.TpOutputInfo.Size = New System.Drawing.Size(1450, 190) + Me.TpOutputInfo.Size = New System.Drawing.Size(1450, 191) Me.TpOutputInfo.TabIndex = 0 Me.TpOutputInfo.Text = "输出信息" Me.TpOutputInfo.UseVisualStyleBackColor = True @@ -765,10 +766,15 @@ Namespace UTSModule.Station Me.RtxOutputInfo.Location = New System.Drawing.Point(4, 4) Me.RtxOutputInfo.Margin = New System.Windows.Forms.Padding(4) Me.RtxOutputInfo.Name = "RtxOutputInfo" - Me.RtxOutputInfo.Size = New System.Drawing.Size(1442, 182) + Me.RtxOutputInfo.Size = New System.Drawing.Size(1442, 183) Me.RtxOutputInfo.TabIndex = 0 Me.RtxOutputInfo.Text = "" ' + 'ToolStripSeparator5 + ' + Me.ToolStripSeparator5.Name = "ToolStripSeparator5" + Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 57) + ' 'FrmStationPlan ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 18.0!) @@ -784,29 +790,29 @@ Namespace UTSModule.Station Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() Me.StuMain.ResumeLayout(False) - Me.StuMain.PerformLayout - Me.SplStationPlan.Panel1.ResumeLayout(false) - Me.SplStationPlan.Panel2.ResumeLayout(false) - CType(Me.SplStationPlan,System.ComponentModel.ISupportInitialize).EndInit - Me.SplStationPlan.ResumeLayout(false) - Me.SplPlanDesign.Panel1.ResumeLayout(false) - Me.SplPlanDesign.Panel2.ResumeLayout(false) - CType(Me.SplPlanDesign,System.ComponentModel.ISupportInitialize).EndInit - Me.SplPlanDesign.ResumeLayout(false) - Me.GrpStationPlan.ResumeLayout(false) - Me.CmsPlanGrid.ResumeLayout(false) - Me.GrpSingleRowInfo.ResumeLayout(false) - Me.SplitContainer1.Panel1.ResumeLayout(false) - Me.SplitContainer1.Panel2.ResumeLayout(false) - CType(Me.SplitContainer1,System.ComponentModel.ISupportInitialize).EndInit - Me.SplitContainer1.ResumeLayout(false) - Me.GrpOutputInfo.ResumeLayout(false) - Me.TabControl1.ResumeLayout(false) - Me.TpOutputInfo.ResumeLayout(false) - Me.ResumeLayout(false) - Me.PerformLayout + Me.StuMain.PerformLayout() + Me.SplStationPlan.Panel1.ResumeLayout(False) + Me.SplStationPlan.Panel2.ResumeLayout(False) + CType(Me.SplStationPlan, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplStationPlan.ResumeLayout(False) + Me.SplPlanDesign.Panel1.ResumeLayout(False) + Me.SplPlanDesign.Panel2.ResumeLayout(False) + CType(Me.SplPlanDesign, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplPlanDesign.ResumeLayout(False) + Me.GrpStationPlan.ResumeLayout(False) + Me.CmsPlanGrid.ResumeLayout(False) + Me.GrpSingleRowInfo.ResumeLayout(False) + Me.SplitContainer1.Panel1.ResumeLayout(False) + Me.SplitContainer1.Panel2.ResumeLayout(False) + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer1.ResumeLayout(False) + Me.GrpOutputInfo.ResumeLayout(False) + Me.TabControl1.ResumeLayout(False) + Me.TpOutputInfo.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() -End Sub + End Sub Friend WithEvents ToolStrip1 As ToolStrip Friend WithEvents StuMain As StatusStrip @@ -881,5 +887,6 @@ End Sub Friend WithEvents TsmiJumpCall As ToolStripMenuItem Friend WithEvents 执行1ToolStripMenuItem As ToolStripMenuItem Friend WithEvents 执行2ToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator5 As ToolStripSeparator End Class End Namespace \ No newline at end of file diff --git a/UTS_Core/UTSModule/Station/FrmStationPlan.resx b/UTS_Core/UTSModule/Station/FrmStationPlan.resx index c37e24d..ee032bf 100644 --- a/UTS_Core/UTSModule/Station/FrmStationPlan.resx +++ b/UTS_Core/UTSModule/Station/FrmStationPlan.resx @@ -124,255 +124,258 @@ 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 - 4MxjAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHOSURBVGhD1ZnLSgRBFEMbFN3rUv03H1v160T/wDfot+jo + VhNk4FqUk77dqRrnQGAgnZt+TS26hhnsQpfQPbSAvsziTM6+gNhl5QB6hWrFLfQCsdMC70bPk1+KF2F5 + EnxtagU9dA7N5gGKQ68g2+MNHELXUOy6g2bzDsWhLGrFERS73qDZxIFUa+x99oGCyX1b0OnPz19MHjiR + SX370DNUC0waOIN03za0PPlaIA6r+W7SfWfQqkD0ar6bdN8TtCoQvZrvJt33Ca0KRK/mu0n3qYDy3aT7 + VED5btJ9KqB8N+k+FVC+m3SfCijfTbpPBZTvJt2nAsp3k+5TAeW7SfepgPLdpPtUQPlu0n0qoHw36T4V + UL6bdJ8KKN9Nuk8FlO8m3acCyneT7lMB5btJ96mA8t2k+1RA+W7SfSqgfDfpPhVQvpt0nwr8+4+7MUCV + lJ/X+Qm8xUXw5G+g2DXq83oMUCXcsyqP6aVRGxxlqITbPNzuKY9rLXbuQJIyWIM7Mj0vIrXJV4b/gneD + j5TvZfnHdogzbyF2jLrzS8pBG8fGX0DPdb4Jvdb5ZqxznT+BZrOudf4R4saihd7rPE9+D7LSep3/gPh/ + O4a4sTiBYfgGl13a4+npcwkAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADWSURBVEhL5ZYxCsJAEEXfETyBeATPYSEewSN4BI9gZ2tl - bWVhZydWHkEsrbTSTvkywWU0wVkMBP3wYT87M28JSxJ4qg/sMrxMZlRqCNyAFbD40Adg7weVqQB0/EaF - Zj8BOAID57YvlHIB6vHWrBflAHTSbuLetwFe6v0jgK5fxFIIoLVeBbopc8tby6lVoz0pDBjbumV5lNQX - Uk1zAVfgBJwtXyynVk02YANMgKnlteXUqskG1P6IagdELIUAOlnEUgiQo2YAIh99b/WWAnJ/W95Zsx66 - A61XwcQ50MgGAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADQSURBVEhL5ZYxDgFBGEbnCE4gjuAcCnEER3AER9BpVWqV + QqcTlSOIUkVFx/fWSMYsyfx/FCu+5CX7ZWfmTbKT3Q1J+mLnYCmKMhQ3sRKLQg5iL4ryFHSqVpaZ+H3B + UQwy2qIWr4A5OaxVi0fATrsJPfFVQR7m/pGA42eBmARc8yrgpMxj38aewhjuEbNg/LgMLUEfVe01jGmu + 4CpO4hz7JfYUxrgFGzER09jXsacwxi34/WdggZgE7MwCMQk8aYbA8tHPYe5Hgfe35R2spYRwB61XwcSY + NxMjAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHOSURBVDhPvZHfS5NRAIb3p6QyxLr2DwgpLQoMDC/qIqjE - q13oVVeRoaDEjAXO5sKaNdmm33QR6SRl6lyazJzr16RlUBtM5ft0Oaff5iM7onOftIKgF56rc97n5XB0 - un+NZ/IzOaSJsMAxEqTP8xbtvd8mV9bGNhygoeXF30nc4+GCcia7R5d9DK8/zLWmzj9LHKMLouiNgPQe - QlGFR7bXSNMKrkkZp0/m6aiMaWhdoO3r+jyBo/Wd3QzKZppYIikE2rT2r1J5218osbp84rDXv4txROGe - 9JPmZ1Hsb9a0fZosCTyzCmfqh/MSs31MvHsrpbIqp1iJbfAxuob1VVyUOqSMILS8wQ1jnNP1L6moG6C8 - 9vmBJPfe7bR6tGywRmg0f+Chc6VgXfmlsvxjG//SJhZpHv3lJ3mBkkzz6VuChS8xAqHvTLz7Skvvwffe - 7U9iMMe5/iDClfuLAos0h/5id15QeeHmCZpNi0KgZvdIyCpL0S3GgwruqXUeDwQoqzad/JHjudU6KwTH - lw/pds1Qes5YXHD1jo/UThbrUJAe9zyWwTmxnCubHdOUVLUXF1QbvFTUOQXltTb0l3ooq+mi9HwnJVUd - nDrbVlzw37IPxZzRV+2pq28AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHJSURBVDhPvZHdK4NhGMb3pzAt4dgfIPmMosgBB8pHjnbA + kSMhijSa2pgJ89U23jEJExpmvhq2+ZoMxVZD78vYxjsue5+NMTVK+dV18jxdv7v7eXh/Rrt8BC7UkpVE + OWvCoHYdoeuf4cqRKCaNqGwY/p1Es2gN1YL4X14hGZmHzmBFcXX7zxLl3A4p6mwAtQuY7Qw6FTOgVhmo + l2mo9DT652iIJ25JQrUwg1ojEXA8PfvB3PvgcLmJIJKm0WskVxi+SuRqPbnsMzxDNMugnrpCzYAdIws3 + 5Pwz1TIXtBsMkoomwxJpYF9u70cPi2vag3PHHQ7sN5BPO0mplfKTmE/uUCpyIrFoCgkFY4jPGwpKuH29 + PvZjslBuQ5V0Hx2qcyJ4h3lgcXLphcFyDxm1DUFub1jAuH04PHNh59gBo/kCS1unaOgLfm/dqBtCqRMl + bTbkN+6RyKhNCLK7woLkrLJvqRHvEQEbWM9Fs7DYH7FoYqBZuUX3mBFxGeKvjxlJedMGEXye/J4u9Rr4 + aaLogsJaPTxPL5BPmNCj2YZsfJNM5spS5SpiU1uiCzKEusBrq0ji8xQQ5PQgLlMCfnp7oNyKmJTm6IJ/ + gsd7A8Wc0VfbPf1MAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACESURBVDhPtZDBDYAgDEV7YFZ3YgGHMZ5dgasbYEpFm08r - mOhP3sFKH1+J/kgIIWvwfRNcYPJKBZw3Qh7My35Rl7XIOmMK9M0InnMFT3QFowwJiKLLoGDKVnguoq4g - 4m4Jz1PabokvkAZyo4DPHYHdgPOyQfsTRXA2qBJkuIEf/a0eH+QAf0C4uBZ9A6wAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACMSURBVDhPtZDRDYAgDET7wazu5AIOY/x2BX/dAHO2KNQW + MMZLXiK1d5zSLwohxBwZ+9IGEBc6sd6JjYXBNO8XOOfG9Kx3xF4GJIOF3hP7M6BGM6CXrgCi0aUzYIiW + MOcgUa2BJcy3bb1DWg34RkafGwF2A+hlg/vnJThAGkAI0WDRU9HAV/6tHp9FdAB/QLi4qrG0hAAAAABJ + RU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHOSURBVDhPvZHfS5NRAIb3p6QyxLr2DwgpLQoMDC/qIqjE - q13oVVeRoaDEjAXO5sKaNdmm33QR6SRl6lyazJzr16RlUBtM5ft0Oaff5iM7onOftIKgF56rc97n5XB0 - un+NZ/IzOaSJsMAxEqTP8xbtvd8mV9bGNhygoeXF30nc4+GCcia7R5d9DK8/zLWmzj9LHKMLouiNgPQe - QlGFR7bXSNMKrkkZp0/m6aiMaWhdoO3r+jyBo/Wd3QzKZppYIikE2rT2r1J5218osbp84rDXv4txROGe - 9JPmZ1Hsb9a0fZosCTyzCmfqh/MSs31MvHsrpbIqp1iJbfAxuob1VVyUOqSMILS8wQ1jnNP1L6moG6C8 - 9vmBJPfe7bR6tGywRmg0f+Chc6VgXfmlsvxjG//SJhZpHv3lJ3mBkkzz6VuChS8xAqHvTLz7Skvvwffe - 7U9iMMe5/iDClfuLAos0h/5id15QeeHmCZpNi0KgZvdIyCpL0S3GgwruqXUeDwQoqzad/JHjudU6KwTH - lw/pds1Qes5YXHD1jo/UThbrUJAe9zyWwTmxnCubHdOUVLUXF1QbvFTUOQXltTb0l3ooq+mi9HwnJVUd - nDrbVlzw37IPxZzRV+2pq28AAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHJSURBVDhPvZHdK4NhGMb3pzAt4dgfIPmMosgBB8pHjnbA + kSMhijSa2pgJ89U23jEJExpmvhq2+ZoMxVZD78vYxjsue5+NMTVK+dV18jxdv7v7eXh/Rrt8BC7UkpVE + OWvCoHYdoeuf4cqRKCaNqGwY/p1Es2gN1YL4X14hGZmHzmBFcXX7zxLl3A4p6mwAtQuY7Qw6FTOgVhmo + l2mo9DT652iIJ25JQrUwg1ojEXA8PfvB3PvgcLmJIJKm0WskVxi+SuRqPbnsMzxDNMugnrpCzYAdIws3 + 5Pwz1TIXtBsMkoomwxJpYF9u70cPi2vag3PHHQ7sN5BPO0mplfKTmE/uUCpyIrFoCgkFY4jPGwpKuH29 + PvZjslBuQ5V0Hx2qcyJ4h3lgcXLphcFyDxm1DUFub1jAuH04PHNh59gBo/kCS1unaOgLfm/dqBtCqRMl + bTbkN+6RyKhNCLK7woLkrLJvqRHvEQEbWM9Fs7DYH7FoYqBZuUX3mBFxGeKvjxlJedMGEXye/J4u9Rr4 + aaLogsJaPTxPL5BPmNCj2YZsfJNM5spS5SpiU1uiCzKEusBrq0ji8xQQ5PQgLlMCfnp7oNyKmJTm6IJ/ + gsd7A8Wc0VfbPf1MAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACESURBVDhPtZDBDYAgDEV7YFZ3YgGHMZ5dgasbYEpFm08r - mOhP3sFKH1+J/kgIIWvwfRNcYPJKBZw3Qh7My35Rl7XIOmMK9M0InnMFT3QFowwJiKLLoGDKVnguoq4g - 4m4Jz1PabokvkAZyo4DPHYHdgPOyQfsTRXA2qBJkuIEf/a0eH+QAf0C4uBZ9A6wAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACMSURBVDhPtZDRDYAgDET7wazu5AIOY/x2BX/dAHO2KNQW + MMZLXiK1d5zSLwohxBwZ+9IGEBc6sd6JjYXBNO8XOOfG9Kx3xF4GJIOF3hP7M6BGM6CXrgCi0aUzYIiW + MOcgUa2BJcy3bb1DWg34RkafGwF2A+hlg/vnJThAGkAI0WDRU9HAV/6tHp9FdAB/QLi4qrG0hAAAAABJ + RU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADYSURBVDhPrVItD8IwFNxf4i/gsPsHpApJpmZJ1eRSNUlS - M7mkZnbJDJJkBomYmJx4AnHkddCQBvaRccmp3t3Le70gWAtTNtBFDZ0PVGcDmRr4up/AB+gxUKZ6YcDL - SD3Q9kAUq/kB76lstOyA8CDnB2x2At/o61ZDZQZMvo9MFMRRWvo6H07AZl6vuQP1DTAXgi5pNIAfHXmy - NV4BXRFkThDpeADDCaKTskZVEKKMECaEbdxOBjjwvv6h7bFN1cCUtWvj0MSlRfp3E8XqJu6n/9fBP8rS - Jj4BXasamGdFJGcAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADTSURBVDhPvVKrDoNAEOSX+gt1tfxBg6psUNjmFJKcQjY5 + gyQ5gyXBVDbBVFYgKitWVEzZ43qpoDwC6SSjZmc2uxlvMXRRQ+UVVNZRnjVEomHlceAL9OooEjUzwBrp + CTQtw0hOD/hsZaPhA/APYnrAZhegj1ZeDzLVYPJ/RCwRHIWhlX/CDbCZz6vvQHUD9IWgChoMYNGRNxvj + FVAlQWSEIBkOYLiB8CSNUeaEMCX4MWEbNaMBDnxv77N1WUMXbQttG7smzi2SxWpNDBY3cf+3JnreG12r + GpgvtOAmAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADdSURBVDhPY2CgBth28ML/tTtP/V+84dD/mct2/Z8wb/P/ - 3tnr/6OrwwnW7Tr9HwS+fP/3//HbP/8vPfr139QzmXgD5q/Zj6L5+K2f/53C8ok3YMK8jWAbQRikccbC - 1XA8ec7y/11TF/5v6pmFYiALEwtuC0AaD9/483/buZ//lx789n/S5k9gw0Ga0DG6XjAA2bjuxI//7cse - /C+defd/Ss8djDBB0YweC5WtU8BegXkLhpENQAHYYiEiuwm3BnSALRbw2ogOQAagO5ckA7B5gSQDKPYC - ckIiywsDCgCBjwD6FcXgCwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADdSURBVDhPY6AK2Hbwwv+1O0/9X7zh0P+Zy3b9nzBv8//e + 2ev/Q6UJg3W7Tv8HgS/f//1//PbP/0uPfv039Uwm3oD5a/ajaD5+6+d/p7B84g2YMG8j2EYQBmmcsXA1 + HE+es/x/19SF/5t6ZqEYyMLEgtsCkMbDN/7833bu5/+lB7/9n7T5E9hwkCZ0DNWCCkA2rjvx43/7sgf/ + S2fe/Z/ScwcjTFA0o8dCZesUsFdg3oJhqHJMgC0WIrKbcGtAB9hiAa+N6ABkALpzSTKAJgmJJAOQExIy + hkoPasDAAACBjwD6rwhXUgAAAABJRU5ErkJggg== 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 - hBBCCCHEEdkBVsTj8gS5a8wAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAGdSURBVHhe7Zg9SsRAGIajWFjaiXsBz+E5PIUn8BQWgpXV + ooexEUQQe8Ha1n1fyAfhY3bnJ8mSybwPPBAGspnvSbaZTgghhBBCiKNzBm96ed0UF/AN/vfymmvNcA9t + eJNrzbCFPgDXmuEF+gBcawYFgArgVADYDAoAFcCpALAZFAAqgFMBYDMoAKwyAE9teHDxDG+5UMjUAbgX + 7ol7m+1kied2w2Ms+ghPYC5TBeCzuYfh73CPs5wx8vBy+CCzJMIUAULDm9zr5OwLQHMjjA1waHg6S4DQ + X2BoToQxAWLDz/YXIJfwHYYeTJ/gKYxRGoDDP0B/r/kJN3BWpohQEmARwxtjI+QGWNTwxpgIOQEWObxR + GiE1wKKHN0oipASoYngjN0IsQFXDGzkRDgWocngjNcK+AFUPb6REeHVrlAGqH96IRfgOrH0F1syqhjdi + EVKtcnjjCn7A0GAp8l7+RtWUfglVv3lP7pewijfvSf0SVvXmPbEvYZVv3sMv4Qf64X/hat+85xr+QRue + 11xrinN418trIYQQQgghjkbX7QBWxOPySaszcAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEYSURBVHhe7ZoxigJBEEU/i4HhZuIF9h6ew1PsCTyHYGLo - ehgTxWzz9QCmStFTIE05Jjsq1e/Bhwm6Gd6H6YGmJAAAAACAZzOSNOtiz00xlbSTdOliz5/1oqyY/PFG - 3rOoF2bknrxlXS/ORp+8ZV5vyMQj+WW9IRMTSYdA2rOS9FFvygLygTTyyCOfE+QDaeSRRz4nyAfSTch/ - SToF0p5fSVtJPy/IprtUGexmaSzpHEi/W+x6bZA7xu/gZe8au2j9d5ovoPlPwLBD8C94qSf1IejYb3Af - yHtS/wYdSqCEAiVQQoESKKFACZRQoARKKFACJRSaHpBwHpWQekTG6Ssh/ZCUc6+EJsbknKYHJZ2mR2UB - AAAA4NVcAcDx5AIlrB0yAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEUSURBVHhe7ZoxSkRBEAU/YrChmXgB77Hn8BSewHMIJoar + hzFRzMz1AKZaD3ayWU1cd+mugoKfDe/Bn4GmFxERERGRf+cU11vz3YoLfMKvrfk+wxYk/CuO8MMbLM+u + 8PEeS/NT+HiFZfkt/C2W5RxfcBY83uEJlsTwOAseDY8lMTzOgkfDY0kMj7Pg0fBYEsPjLHg0PJbkEj9w + Fjy+4SM+HMANZqiyt8nSCj9xFvyYzHhtLzPGa5wdeIxm0PrntC+g/S8Qcgm+4+zgWPoSHOQZfMZZAbH0 + MziwBLAEsASwBLAEsASwBLAEsASwBLAEsARovSAxaL0iM2i9JDXYVUKLNblBSmi7KDlovSorIiIiIodl + Wb4BwPHkArNQmuIAAAAASUVORK5CYII= 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 - AAAAAElFTkSuQmCC + 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 + SUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEXSURBVGhD7ZfBCcJAFETnqNiFJ5uxBHuxJ4/W4smDHSie - lIUshGGWRAPZ+fAfzCW75M+Gl0CAJEkSdy4A9nwxEh8ATwBnABtejEA5QM0NwJE3uDM+QE0orbh8TRit - uDjHXisu3IqtVlz0BOAhrpe8Bq22fJOecMnCbij6FuslVlpxuTEHAFexp8ZCKy6lKE/7LvaWdP9acaEW - tlpxkSnstOICc7HRiof/goVWPPQfumrFw5bQRSsetJTVteIBSwl9gLAKhX2JV9dFwUPn0kUXBQ+foqsu - Ci7QwkIXBRdR2Oii4EJj7HRRcKmCrS4KLhf+p74VC10UXJRjpYuCC9d0/7rMhYuX2OqiCKWLIpQuilC6 - JEmSrMsX05VR/EVYTyAAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEPSURBVGhD7ZfBCcJAFERzVOzCk81Ygr3Yk0dr8eTBDhRP + +j+ysAwTogayM7APHoQk8GfDZEmGTqfTkecUbj+HnrzCe3gMV3nCjVxA8RLuQyvqBRStasUWkNrUioWv + la8VC82UrRUGPYQ3OFd8hFmrdSgDhkw2YQZ9hng9laoVhqvZhecQ7ylK1ApDMfJpX0O8N22+W2GgMWRr + hUGmkKsVBvgWmVrh8F+QqBUO/YemtcJhc2hSKxw0l8VrhQPmYr0A2wrZvsTW22iTujBw+BS2nxLWH3My + dWFgoBrbHxrZujAwnP1P/ZgSdWGwsLVSdWGw0Gnz3eVbWHjZujDq4PJ1YWRwm7owrOrS6XQ6SzIMb9OV + UfyTpgr5AAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFaSURBVGhD7Zk9TgMxEEYfNByBvyvRAaKAFkHFLbgQok1K - BBWXgAsEOpBAXxEJjbzyJjvrsYWfNFXGu99TxlllDZ1OZ4gd4AZ4AT6Bn0y9Ayf2IlEcActEyFy92QtF - sLtl+GoEbhPBxlQ1I6SZ/xvsEdi3TTXzYQQObEPt2NFoji4wEm14bXzVqf1wCqUE9JO7vscXcGEbtiVC - wFWilIDGRqHdJUoJiLOExDdwZRs3oaSAcJcoLSBcJSIEhJtElIBwkYgUEJMlNhVYP1Htujnq3t48hV2U - wz6Q5ix9E1nsohzNCzQ/Qt6cD2ziS9s4RKTA5PAiSsAlvIgQcAsvSgu4hhclBdzDi1ICzf+hsQ9Al/Ai - QsAtvCgl0PxrldloXmBlBJp6My2ejcADcGibauYuMUZjqpoDjj3gNRFwTFVxxCSOgUUiYK6qERA6Zr0G - nhKnNqmqZoQ6nf/ELxInwHd6df9CAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFpSURBVGhD7ZkxTgMxEEUXGo6QEK6ULiAKaBFU3IILIVoo + Eam4BFwA6IgE/xeRviwnXiUzxiP8pNdEmtn5ir2rXQ+dTmcjB/AaLuEX/Cn4DuewCWbwCeYG3eYb/HMO + 4S7D0yYC3MDccCWbWUJc8zrYA5zAMHxCDTCFodDhaTh6gJFww3Pj0wV/sKJWAN5y19f4hufQBB2eeqEB + qFkIbUq94LLh0HotkxDakHpyCtMQK3gJd0abUW/MQ2gjWgPTENqE1sIshDagNTEJocW0NnuH0EJaYv1E + Tes8vINF0qIS6QPJU/4TRdKiEuEDhF9C1pzB3Ca+gKPQQlqTvYcnWkxrYTI80Qa0BmbDE21CvTEdnmgj + 6on58ESbUS/Cv9CEf6UM/1If/rOKG+EDfEANEOrLNHmBGuAeHsMw3EINMFZuxiYOOI7gK8wNWZK3xiY4 + gY8wN+Q2mwlAeMx6BZ9hemqTs5kl1On8H4bhFxInwHev/ipmAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAFUSURBVDhPpZKhbsMwFEX7Cf2FsMGFDYcNzqyw8hdMRqWV - UWBlFFjJJDCSSWikkMJIJoEBBoEBBgV3em7TJN1CuitdmeSc9xS9zea/sY0Ftb7UqKsapjDQuYY+a+hM - Q50UZCrxzD1CoO89KK5zcP29rYO/evjBQ3yLdYEpzTR1nHiUAaLyHQf7ZOsClAKvdhKsxOQK5qygqZmE - PkmoVAJXD11q6MpgVUCw7+TUVsA3HLbgQUKwbtTfghEWu2QB+wuDrxL4MobMBWTFfwse8J5Nkhnsigj2 - HEFkHKJkS8Ecds1d0nCIPYExbBbBpBHEVwSeMvBiJiB4hOgnBUlFMAsrx29bJO/b8PK9QHJIwPOnDeSB - B3gswTaPkXxEwGCB3gJDDbQKJuNgx2QmGEFMAlxdWJ/eICC4vwme7uAG0NlicPA0iT7sDNBpoKWqZReC - F7s46VfzAzFvgHyRmx3AAAAAAElFTkSuQmCC + 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 @@ -384,73 +387,75 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAANhJREFUOE+tUi0PwjAU3F/iL+Cw+wekCkmmZknV5FI1SVIzuaRmdskMkmQGiZiY - nHgCceR10JAG9pFxyane3ct7vSBYC1M20EUNnQ9UZwOZGvi6n8AH6DFQpnphwMtIPdD2QBSr+QHvqWy0 - 7IDwIOcHbHYC3+jrVkNlBky+j0wUxFFa+jofTsBmXq+5A/UNMBeCLmk0gB8debI1XgFdEWROEOl4AMMJ - opOyRlUQoowQJoRt3E4GOPC+/qHtsU3VwJS1a+PQxKVF+ncTxeom7qf/18E/ytImPgFdqxqYZ0UkZwAA - AABJRU5ErkJggg== + vAAADrwBlbxySQAAANNJREFUOE+9UqsOg0AQ5Jf6C3W1/EGDqmxQ2OYUkpxCNjmDJDmDJcFUNsFUViAq + K1ZUTNnjeqmgPALpJKNmZza7GW8xdFFD5RVU1lGeNUSiYeVx4Av06igSNTPAGukJNC3DSE4P+Gxlo+ED + 8A9iesBmF6CPVl4PMtVg8n9ELBEchaGVf8INsJnPq+9AdQP0haAKGgxg0ZE3G+MVUCVBZIQgGQ5guIHw + JI1R5oQwJfgxYRs1owEOfG/vs3VZQxdtC20buybOLZLFak0MFjdx/7cmet4bXasamC+04CYAAAAASUVO + RK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAN1JREFUOE9jYKAG2Hbwwv+1O0/9X7zh0P+Zy3b9nzBv8//e2ev/o6vDCdbtOv0f - BL58//f/8ds//y89+vXf1DOZeAPmr9mPovn4rZ//ncLyiTdgwryNYBtBGKRxxsLVcDx5zvL/XVMX/m/q - mYViIAsTC24LQBoP3/jzf9u5n/+XHvz2f9LmT2DDQZrQMbpeMADZuO7Ej//tyx78L515939Kzx2MMEHR - jB4Lla1TwF6BeQuGkQ1AAdhiISK7CbcGdIAtFvDaiA5ABqA7lyQDsHmBJAMo9gJyQiLLCwMKAIGPAPoV - xeALAAAAAElFTkSuQmCC + vAAADrwBlbxySQAAAN1JREFUOE9joArYdvDC/7U7T/1fvOHQ/5nLdv2fMG/z/97Z6/9DpQmDdbtO/weB + L9///X/89s//S49+/Tf1TCbegPlr9qNoPn7r53+nsHziDZgwbyPYRhAGaZyxcDUcT56z/H/X1IX/m3pm + oRjIwsSC2wKQxsM3/vzfdu7n/6UHv/2ftPkT2HCQJnQM1YIKQDauO/Hjf/uyB/9LZ979n9JzByNMUDSj + x0Jl6xSwV2DegmGockyALRYisptwa0AH2GIBr43oAGQAunNJMoAmCYkkA5ATEjKGSg9qwMAAAIGPAPqv + CFdSAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAGNJREFUOE+lzMEJADEIRFFr2lq2nO0kvdmADXjb4EEIY1RCBv7NJ9H13u8/bsXM - HBKRkKr2GJHDFiOynkE9RuSwxX64gyXG4wzaWpzBEuMDhCX24wym2I/XdgsYUQZtAR93uwnUrvqqK2la - WwAAAABJRU5ErkJggg== + vAAADrwBlbxySQAAAGRJREFUOE+lzcENgDAIhWFmchbHcRN3YwEW4GblgDGFV9r0T96hCV9K+53Xs7yv + 98HMYSISpqo1RrDEGTxuqjGCJfbDDA5xf4ygVWIELYhHP3oQ+zGCVor9+L+sgGehFfDy9iJq1K76qrTi + CkcAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAFNJREFUOE+ly8ENACAIBEGLtBxrpQEa4Kfxp6fAGTfZ55TyXW39+RWLiLuqbtMY - oZlx+AYp7MEURzDEGXQxA2cHZmGKEa0wxIgQuhjRDc4O/PxvA9b+IgeMUL95AAAAAElFTkSuQmCC + vAAADrwBlbxySQAAAFdJREFUOE+ly7ENACEMQ9EMeeMwaxbIAukANyfdQRIjvuTCxZP7ntaP9zaPqoYz + s89o/IfuzuEdpHAES5zBFFcwxAxEC2YhSnEGUYgriLaYgWjBx7tLZADW/iIHX3Y7QQAAAABJRU5ErkJg + gg== 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 + gg== diff --git a/UTS_Core/UTSModule/Station/StationPlanGrid.vb b/UTS_Core/UTSModule/Station/StationPlanGrid.vb index 90c7b20..a5600df 100644 --- a/UTS_Core/UTSModule/Station/StationPlanGrid.vb +++ b/UTS_Core/UTSModule/Station/StationPlanGrid.vb @@ -845,7 +845,7 @@ Namespace UTSModule.Station .Column(ColNames.Pause).Width = 20 .Column(ColNames.Action).Width = 20 .Column(ColNames.Description).Width = 200 - .Column(ColNames.ControlType).Width = 0 + .Column(ColNames.ControlType).Width = 50 .Column(ColNames.CommandType).Width = 80 .Column(ColNames.Command).Width = 120 .Column(ColNames.Parameters).Width = 340 diff --git a/UTS_Core/UTSModule/Test/UtsTester.vb b/UTS_Core/UTSModule/Test/UtsTester.vb index 7702d48..c1154dc 100644 --- a/UTS_Core/UTSModule/Test/UtsTester.vb +++ b/UTS_Core/UTSModule/Test/UtsTester.vb @@ -686,6 +686,8 @@ Namespace UTSModule.Test Case "ElseIf" '执行判断条件命令成功则认为匹配成功，返回执行子节点的结果 tmpResult = ExecuteControlCondition(rowNode, localVariable) + '节点测试完成 + RaiseEvent TestNodeCompleted(Me, New TestNodeCompletedEventArgs(rowNode, tmpResult)) If tmpResult.ExecuteResult Then '判断条件成立 result = ExecuteModuleNode(rowNode, localVariable) Exit For