Skip to content

顾剑亮 / AGVControl_Steel

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 9f36de97 由 张东亮
选项

风淋门

1 个父辈 d4de4c07
内嵌 并排
正在显示 42 个修改的文件 包含 280 行增加 和 140 行删除
AGVControl_Steel.sln

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30413.136
# Visual Studio Version 17
VisualStudioVersion = 17.5.33414.496
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{752A054D-58EC-460A-A936-F5483B1BC8B2}"
EndProject
......@@ -13,32 +13,64 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "UI\UI.csproj", "{6F08F614-2767-456A-80B8-A8FDB19F3988}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigHelper", "..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj", "{290182DB-D949-434E-9FF7-C59BDE3F433A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Debug|x64.ActiveCfg = Debug|Any CPU
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Debug|x64.Build.0 = Debug|Any CPU
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Release|Any CPU.Build.0 = Release|Any CPU
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Release|x64.ActiveCfg = Release|Any CPU
{752A054D-58EC-460A-A936-F5483B1BC8B2}.Release|x64.Build.0 = Release|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Debug|x64.ActiveCfg = Debug|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Debug|x64.Build.0 = Debug|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Release|Any CPU.Build.0 = Release|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Release|x64.ActiveCfg = Release|Any CPU
{C547FEDD-0B62-4AC3-96E7-C86DD38C670B}.Release|x64.Build.0 = Release|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Debug|x64.ActiveCfg = Debug|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Debug|x64.Build.0 = Debug|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Release|Any CPU.Build.0 = Release|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Release|x64.ActiveCfg = Release|Any CPU
{82C814D9-4407-4B98-AACE-82CAF714BDAD}.Release|x64.Build.0 = Release|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Debug|x64.ActiveCfg = Debug|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Debug|x64.Build.0 = Debug|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Release|Any CPU.Build.0 = Release|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Release|x64.ActiveCfg = Release|Any CPU
{AC764294-C5E4-441F-ACC8-F912366CA1BC}.Release|x64.Build.0 = Release|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Debug|x64.ActiveCfg = Debug|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Debug|x64.Build.0 = Debug|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|Any CPU.Build.0 = Release|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|x64.ActiveCfg = Release|Any CPU
{6F08F614-2767-456A-80B8-A8FDB19F3988}.Release|x64.Build.0 = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|x64.ActiveCfg = Debug|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Debug|x64.Build.0 = Debug|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|Any CPU.Build.0 = Release|Any CPU
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|x64.ActiveCfg = Release|x64
{290182DB-D949-434E-9FF7-C59BDE3F433A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
BLL/BLL.csproj
......@@ -68,6 +68,10 @@
<Compile Include="WebService\WebWork.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj">
<Project>{290182DB-D949-434E-9FF7-C59BDE3F433A}</Project>
<Name>ConfigHelper</Name>
</ProjectReference>
<ProjectReference Include="..\Model\Model.csproj">
<Project>{ac764294-c5e4-441f-acc8-f912366ca1bc}</Project>
<Name>Model</Name>
......
BLL/Job/ChargeJob.cs
......@@ -68,7 +68,7 @@ namespace BLL
}
else if (chargeStep.Equals(ChargeStep.Charging))
{
Common.log.Info(string.Format("{0} 充电中 当前{1} 最小{2} 最大{3}", _info.Name, _info.Battery, _info.BatteryMin, _info.BatteryMax));
Common.log.Debug(string.Format("{0} 充电中 当前{1} 最小{2} 最大{3}", _info.Name, _info.Battery, _info.BatteryMin, _info.BatteryMax));
move.Execute(_info);
if (_info.Battery == _info.BatteryMax)
......
BLL/Job/SendNewJob.cs
......@@ -59,7 +59,7 @@ namespace BLL
airPlace = place;
if (SteelManage.IsAirLines(place))
{
if (_info.In4CAirRoom())
if (_info.InAirRoom())
{
MoveLine(place);
}
......@@ -71,7 +71,7 @@ namespace BLL
}
else
{
if (_info.In4CAirRoom())
if (_info.InAirRoom())
{
sendNewStep.Msg = _info.Name + " 先暂停" + place;
LeaveAirAccess();
......@@ -98,7 +98,7 @@ namespace BLL
sendNewStep.Msg = info.Name + " 没有后续新钢板任务";
if (_info.In4CAirRoom())
if (_info.InAirRoom())
{
airPlace = "$WASH";
sendNewStep.Msg = _info.Name + " 先暂停去清洗点";
......
BLL/Job/TakeOldJob.cs
......@@ -49,7 +49,7 @@ namespace BLL
if (_info.OldSteel == 5)
{
takeOldStep.Msg = _info.Name + " 回收钢板已满";
if (_info.In4CAirRoom())
if (_info.InAirRoom())
{
airPlace = "$WASH";
LeaveAirAccess();
......@@ -148,7 +148,7 @@ namespace BLL
if (SteelManage.IsAirLines(place))
{
if (_info.In4CAirRoom())
if (_info.InAirRoom())
MoveLine(place);
else
{
......@@ -158,7 +158,7 @@ namespace BLL
}
else
{
if (_info.In4CAirRoom())
if (_info.InAirRoom())
{
takeOldStep.Msg = _info.Name + " 先暂停" + place;
LeaveAirAccess();
......@@ -170,7 +170,7 @@ namespace BLL
else
{
takeOldStep.Msg = _info.Name + " 没有后续旧钢板任务";
if (_info.In4CAirRoom())
if (_info.InAirRoom())
{
airPlace = "$WASH";
takeOldStep.Msg = _info.Name + " 先暂停去清洗点";
......
BLL/SteelManage.cs
using System;
using Model;
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
......@@ -530,11 +531,11 @@ namespace BLL
}
}
static string[] linesInAir=Config.AirRoom_Lines.Val.Split(',');
public static bool IsAirLines(string place)
{
//4C风淋门里面的产线，C8，C9
if (place == "C8" || place == "C9")
//风淋门里面的产线，C8，C9
if (linesInAir.Contains(place))
return true;
else
return false;
......
BLL/obj/Debug/BLL.csproj.CoreCompileInputs.cache
00f5424f3a1ea493a3b9a6b30c41ef3f33cd9381
e7ea990737cfa7630814f4fade31ff7166ba1468
BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
......@@ -82,3 +82,8 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInput
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\settings\app.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.dll.config
Model/AgvInfo.cs
......@@ -163,12 +163,12 @@ namespace Model
}
/// <summary>
/// 4C无尘室
/// 在无尘室内
/// </summary>
/// <returns></returns>
public bool In4CAirRoom()
public bool InAirRoom()
{
if (Position.X < 51.5f && Position.Y > 65.7f)
if (Config.AirRoom_PosX < 51.5f && Config.AirRoom_PosY > 65.7f)
return true;
else
return false;
......
Model/Common.cs
......@@ -46,8 +46,8 @@ namespace Model
public const string MISSION_MOVE_WASH = "MoveWash";
public const string MISSION_MOVE_STORAGE = "MoveSteelstorage";
public const string MISSION_MOVE_STEEL = "MoveSteel";
public const string MISSION_ENTER_AIR = "4CflowIOin";
public const string MISSION_LEAVE_AIR = "4CflowIOout";
public const string MISSION_ENTER_AIR = "PassInAirRoom";
public const string MISSION_LEAVE_AIR = "PassOutAirRoom";
public static readonly string PATH_AGV_NAME = Environment.CurrentDirectory + "\\Config\\AgvName.csv";
public static readonly string PATH_AGV_MISSION = Environment.CurrentDirectory + "\\Config\\AgvMission.csv";
......
Model/Config.cs 0 → 100644
using ConfigHelper;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Permissions;
using System.Text;
using System.Threading.Tasks;
namespace Model
{
public class Config
{
static Config()
{
ConfigHelper.Config.LoadMyConfig(typeof(Config));
}
[MyConfigComment("风淋门区域的起始X坐标,小于X")]
public static MyConfig<float> AirRoom_PosX = 17.4f;
[MyConfigComment("风淋门区域的起始Y坐标,大于Y")]
public static MyConfig<float> AirRoom_PosY = 20.15f;
[MyConfigComment("风淋门内的线体名")]
public static MyConfig<string> AirRoom_Lines = "S1,S2";
}
}
Model/Model.csproj
......@@ -57,6 +57,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="AgvInfo.cs" />
<Compile Include="Config.cs" />
<Compile Include="LogJson.cs" />
<Compile Include="Common.cs" />
<Compile Include="DisplayBoard.cs" />
......@@ -75,5 +76,11 @@
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj">
<Project>{290182db-d949-434e-9ff7-c59bde3f433a}</Project>
<Name>ConfigHelper</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
1add9d820c816619aab22017895542b1f0792511
f7f5811dbdc588dc6df664069a0ceffd7269e9a1
Model/obj/Debug/Model.csproj.FileListAbsolute.txt
......@@ -69,3 +69,8 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileI
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\settings\app.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.dll.config
UI/FrmMain.Designer.cs
......@@ -49,6 +49,7 @@
this.Column8 = new System.Windows.Forms.DataGridViewButtonColumn();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.LblVersion = new System.Windows.Forms.Label();
this.BtnClearLog = new System.Windows.Forms.Button();
this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
this.TxtAgvMission0 = new System.Windows.Forms.TextBox();
......@@ -87,7 +88,6 @@
this.BtnMissionClear = new System.Windows.Forms.Button();
this.BtnMissionAdd = new System.Windows.Forms.Button();
this.LstMission = new System.Windows.Forms.ListBox();
this.LblVersion = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.DgvName)).BeginInit();
this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout();
......@@ -131,7 +131,8 @@
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.DgvName.DefaultCellStyle = dataGridViewCellStyle9;
this.DgvName.Location = new System.Drawing.Point(12, 12);
this.DgvName.Location = new System.Drawing.Point(16, 15);
this.DgvName.Margin = new System.Windows.Forms.Padding(4);
this.DgvName.Name = "DgvName";
this.DgvName.ReadOnly = true;
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
......@@ -144,7 +145,7 @@
this.DgvName.RowHeadersDefaultCellStyle = dataGridViewCellStyle10;
this.DgvName.RowHeadersWidth = 50;
this.DgvName.RowTemplate.Height = 23;
this.DgvName.Size = new System.Drawing.Size(833, 88);
this.DgvName.Size = new System.Drawing.Size(1111, 110);
this.DgvName.TabIndex = 0;
this.DgvName.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DgvName_CellContentClick);
//
......@@ -154,9 +155,11 @@
dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
this.Column1.HeaderText = "名称";
this.Column1.MinimumWidth = 6;
this.Column1.Name = "Column1";
this.Column1.ReadOnly = true;
this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column1.Width = 125;
//
// Column2
//
......@@ -164,6 +167,7 @@
dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Column2.DefaultCellStyle = dataGridViewCellStyle3;
this.Column2.HeaderText = "地点";
this.Column2.MinimumWidth = 6;
this.Column2.Name = "Column2";
this.Column2.ReadOnly = true;
this.Column2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......@@ -175,9 +179,11 @@
dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Column5.DefaultCellStyle = dataGridViewCellStyle4;
this.Column5.HeaderText = "小车状态";
this.Column5.MinimumWidth = 6;
this.Column5.Name = "Column5";
this.Column5.ReadOnly = true;
this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column5.Width = 125;
//
// Column3
//
......@@ -185,6 +191,7 @@
dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Column3.DefaultCellStyle = dataGridViewCellStyle5;
this.Column3.HeaderText = "电量";
this.Column3.MinimumWidth = 6;
this.Column3.Name = "Column3";
this.Column3.ReadOnly = true;
this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......@@ -196,6 +203,7 @@
dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Column7.DefaultCellStyle = dataGridViewCellStyle6;
this.Column7.HeaderText = "在线";
this.Column7.MinimumWidth = 6;
this.Column7.Name = "Column7";
this.Column7.ReadOnly = true;
this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......@@ -208,6 +216,7 @@
dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Column4.DefaultCellStyle = dataGridViewCellStyle7;
this.Column4.HeaderText = "自动";
this.Column4.MinimumWidth = 6;
this.Column4.Name = "Column4";
this.Column4.ReadOnly = true;
this.Column4.Width = 80;
......@@ -218,8 +227,10 @@
dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Column8.DefaultCellStyle = dataGridViewCellStyle8;
this.Column8.HeaderText = "任务";
this.Column8.MinimumWidth = 6;
this.Column8.Name = "Column8";
this.Column8.ReadOnly = true;
this.Column8.Width = 125;
//
// tabControl1
//
......@@ -230,11 +241,13 @@
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Font = new System.Drawing.Font("宋体", 12F);
this.tabControl1.Location = new System.Drawing.Point(12, 106);
this.tabControl1.Location = new System.Drawing.Point(16, 132);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(833, 552);
this.tabControl1.Size = new System.Drawing.Size(1111, 690);
this.tabControl1.TabIndex = 1;
this.tabControl1.Click += new System.EventHandler(this.tabControl1_Click);
//
// tabPage2
//
......@@ -243,20 +256,32 @@
this.tabPage2.Controls.Add(this.tableLayoutPanel5);
this.tabPage2.Controls.Add(this.LblStorageIO);
this.tabPage2.Controls.Add(this.LblWeb);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Location = new System.Drawing.Point(4, 30);
this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(825, 522);
this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
this.tabPage2.Size = new System.Drawing.Size(1103, 656);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "状态";
this.tabPage2.UseVisualStyleBackColor = true;
//
// LblVersion
//
this.LblVersion.Location = new System.Drawing.Point(772, 11);
this.LblVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.LblVersion.Name = "LblVersion";
this.LblVersion.Size = new System.Drawing.Size(316, 41);
this.LblVersion.TabIndex = 12;
this.LblVersion.Text = "label4";
this.LblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// BtnClearLog
//
this.BtnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BtnClearLog.Location = new System.Drawing.Point(457, 6);
this.BtnClearLog.Location = new System.Drawing.Point(609, 8);
this.BtnClearLog.Margin = new System.Windows.Forms.Padding(4);
this.BtnClearLog.Name = "BtnClearLog";
this.BtnClearLog.Size = new System.Drawing.Size(116, 36);
this.BtnClearLog.Size = new System.Drawing.Size(155, 45);
this.BtnClearLog.TabIndex = 11;
this.BtnClearLog.Text = "清空日志";
this.BtnClearLog.UseVisualStyleBackColor = true;
......@@ -273,60 +298,64 @@
this.tableLayoutPanel5.Controls.Add(this.TxtAgvMission0, 1, 0);
this.tableLayoutPanel5.Controls.Add(this.TxtLog, 0, 0);
this.tableLayoutPanel5.Controls.Add(this.TxtAgvMission1, 1, 1);
this.tableLayoutPanel5.Location = new System.Drawing.Point(6, 48);
this.tableLayoutPanel5.Location = new System.Drawing.Point(8, 60);
this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel5.Name = "tableLayoutPanel5";
this.tableLayoutPanel5.RowCount = 2;
this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel5.Size = new System.Drawing.Size(813, 468);
this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel5.Size = new System.Drawing.Size(1084, 585);
this.tableLayoutPanel5.TabIndex = 10;
//
// TxtAgvMission0
//
this.TxtAgvMission0.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtAgvMission0.Font = new System.Drawing.Font("宋体", 12F);
this.TxtAgvMission0.Location = new System.Drawing.Point(572, 3);
this.TxtAgvMission0.Location = new System.Drawing.Point(762, 4);
this.TxtAgvMission0.Margin = new System.Windows.Forms.Padding(4);
this.TxtAgvMission0.Multiline = true;
this.TxtAgvMission0.Name = "TxtAgvMission0";
this.TxtAgvMission0.ReadOnly = true;
this.TxtAgvMission0.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.TxtAgvMission0.Size = new System.Drawing.Size(238, 228);
this.TxtAgvMission0.Size = new System.Drawing.Size(318, 284);
this.TxtAgvMission0.TabIndex = 11;
//
// TxtLog
//
this.TxtLog.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtLog.Font = new System.Drawing.Font("宋体", 12F);
this.TxtLog.Location = new System.Drawing.Point(3, 3);
this.TxtLog.Location = new System.Drawing.Point(4, 4);
this.TxtLog.Margin = new System.Windows.Forms.Padding(4);
this.TxtLog.Multiline = true;
this.TxtLog.Name = "TxtLog";
this.TxtLog.ReadOnly = true;
this.tableLayoutPanel5.SetRowSpan(this.TxtLog, 2);
this.TxtLog.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.TxtLog.Size = new System.Drawing.Size(563, 462);
this.TxtLog.Size = new System.Drawing.Size(750, 577);
this.TxtLog.TabIndex = 2;
//
// TxtAgvMission1
//
this.TxtAgvMission1.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtAgvMission1.Font = new System.Drawing.Font("宋体", 12F);
this.TxtAgvMission1.Location = new System.Drawing.Point(572, 237);
this.TxtAgvMission1.Location = new System.Drawing.Point(762, 296);
this.TxtAgvMission1.Margin = new System.Windows.Forms.Padding(4);
this.TxtAgvMission1.Multiline = true;
this.TxtAgvMission1.Name = "TxtAgvMission1";
this.TxtAgvMission1.ReadOnly = true;
this.TxtAgvMission1.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.TxtAgvMission1.Size = new System.Drawing.Size(238, 228);
this.TxtAgvMission1.Size = new System.Drawing.Size(318, 285);
this.TxtAgvMission1.TabIndex = 12;
//
// LblStorageIO
//
this.LblStorageIO.BackColor = System.Drawing.Color.Red;
this.LblStorageIO.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblStorageIO.Location = new System.Drawing.Point(165, 9);
this.LblStorageIO.Margin = new System.Windows.Forms.Padding(3, 6, 6, 6);
this.LblStorageIO.Location = new System.Drawing.Point(220, 11);
this.LblStorageIO.Margin = new System.Windows.Forms.Padding(4, 8, 8, 8);
this.LblStorageIO.Name = "LblStorageIO";
this.LblStorageIO.Size = new System.Drawing.Size(160, 30);
this.LblStorageIO.Size = new System.Drawing.Size(213, 38);
this.LblStorageIO.TabIndex = 9;
this.LblStorageIO.Tag = "0";
this.LblStorageIO.Text = "仓库IO信号 OFF (0)";
......@@ -336,10 +365,10 @@
//
this.LblWeb.BackColor = System.Drawing.Color.Red;
this.LblWeb.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblWeb.Location = new System.Drawing.Point(9, 9);
this.LblWeb.Margin = new System.Windows.Forms.Padding(6, 6, 3, 6);
this.LblWeb.Location = new System.Drawing.Point(12, 11);
this.LblWeb.Margin = new System.Windows.Forms.Padding(8, 8, 4, 8);
this.LblWeb.Name = "LblWeb";
this.LblWeb.Size = new System.Drawing.Size(150, 30);
this.LblWeb.Size = new System.Drawing.Size(200, 38);
this.LblWeb.TabIndex = 0;
this.LblWeb.Text = "WebService Close";
this.LblWeb.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -350,10 +379,11 @@
this.tabPage3.Controls.Add(this.ChkStorageIO);
this.tabPage3.Controls.Add(this.LblMissionHint);
this.tabPage3.Controls.Add(this.tableLayoutPanel1);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Location = new System.Drawing.Point(4, 30);
this.tabPage3.Margin = new System.Windows.Forms.Padding(4);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(825, 522);
this.tabPage3.Padding = new System.Windows.Forms.Padding(4);
this.tabPage3.Size = new System.Drawing.Size(1103, 656);
this.tabPage3.TabIndex = 3;
this.tabPage3.Text = "钢网任务";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -368,9 +398,10 @@
this.ChkMissionDebug.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.ChkMissionDebug.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
this.ChkMissionDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ChkMissionDebug.Location = new System.Drawing.Point(540, 6);
this.ChkMissionDebug.Location = new System.Drawing.Point(720, 8);
this.ChkMissionDebug.Margin = new System.Windows.Forms.Padding(4);
this.ChkMissionDebug.Name = "ChkMissionDebug";
this.ChkMissionDebug.Size = new System.Drawing.Size(130, 40);
this.ChkMissionDebug.Size = new System.Drawing.Size(173, 50);
this.ChkMissionDebug.TabIndex = 5;
this.ChkMissionDebug.Text = "调试功能";
this.ChkMissionDebug.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -381,9 +412,10 @@
//
this.ChkStorageIO.AutoSize = true;
this.ChkStorageIO.Enabled = false;
this.ChkStorageIO.Location = new System.Drawing.Point(542, 52);
this.ChkStorageIO.Location = new System.Drawing.Point(723, 65);
this.ChkStorageIO.Margin = new System.Windows.Forms.Padding(4);
this.ChkStorageIO.Name = "ChkStorageIO";
this.ChkStorageIO.Size = new System.Drawing.Size(171, 20);
this.ChkStorageIO.Size = new System.Drawing.Size(211, 24);
this.ChkStorageIO.TabIndex = 4;
this.ChkStorageIO.Text = "仓库IO信号始终为ON";
this.ChkStorageIO.UseVisualStyleBackColor = true;
......@@ -394,10 +426,10 @@
this.LblMissionHint.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.LblMissionHint.Font = new System.Drawing.Font("宋体", 9F);
this.LblMissionHint.Location = new System.Drawing.Point(540, 451);
this.LblMissionHint.Margin = new System.Windows.Forms.Padding(3);
this.LblMissionHint.Location = new System.Drawing.Point(720, 564);
this.LblMissionHint.Margin = new System.Windows.Forms.Padding(4);
this.LblMissionHint.Name = "LblMissionHint";
this.LblMissionHint.Size = new System.Drawing.Size(273, 65);
this.LblMissionHint.Size = new System.Drawing.Size(364, 81);
this.LblMissionHint.TabIndex = 3;
this.LblMissionHint.Text = "label4";
this.LblMissionHint.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
......@@ -407,8 +439,8 @@
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 400F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 128F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 533F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171F));
this.tableLayoutPanel1.Controls.Add(this.LstStorage, 0, 5);
this.tableLayoutPanel1.Controls.Add(this.LstOldSteel, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.LstNewSteel, 0, 3);
......@@ -419,16 +451,17 @@
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 4);
this.tableLayoutPanel1.Font = new System.Drawing.Font("宋体", 12F);
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 6);
this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 8);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 6;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(528, 510);
this.tableLayoutPanel1.Size = new System.Drawing.Size(704, 638);
this.tableLayoutPanel1.TabIndex = 2;
//
// LstStorage
......@@ -436,10 +469,11 @@
this.LstStorage.Dock = System.Windows.Forms.DockStyle.Fill;
this.LstStorage.FormattingEnabled = true;
this.LstStorage.IntegralHeight = false;
this.LstStorage.ItemHeight = 16;
this.LstStorage.Location = new System.Drawing.Point(3, 373);
this.LstStorage.ItemHeight = 20;
this.LstStorage.Location = new System.Drawing.Point(4, 466);
this.LstStorage.Margin = new System.Windows.Forms.Padding(4);
this.LstStorage.Name = "LstStorage";
this.LstStorage.Size = new System.Drawing.Size(394, 134);
this.LstStorage.Size = new System.Drawing.Size(525, 168);
this.LstStorage.TabIndex = 5;
//
// LstOldSteel
......@@ -447,10 +481,11 @@
this.LstOldSteel.Dock = System.Windows.Forms.DockStyle.Fill;
this.LstOldSteel.FormattingEnabled = true;
this.LstOldSteel.IntegralHeight = false;
this.LstOldSteel.ItemHeight = 16;
this.LstOldSteel.Location = new System.Drawing.Point(3, 33);
this.LstOldSteel.ItemHeight = 20;
this.LstOldSteel.Location = new System.Drawing.Point(4, 42);
this.LstOldSteel.Margin = new System.Windows.Forms.Padding(4);
this.LstOldSteel.Name = "LstOldSteel";
this.LstOldSteel.Size = new System.Drawing.Size(394, 134);
this.LstOldSteel.Size = new System.Drawing.Size(525, 166);
this.LstOldSteel.TabIndex = 3;
//
// LstNewSteel
......@@ -458,29 +493,31 @@
this.LstNewSteel.Dock = System.Windows.Forms.DockStyle.Fill;
this.LstNewSteel.FormattingEnabled = true;
this.LstNewSteel.IntegralHeight = false;
this.LstNewSteel.ItemHeight = 16;
this.LstNewSteel.Location = new System.Drawing.Point(3, 203);
this.LstNewSteel.ItemHeight = 20;
this.LstNewSteel.Location = new System.Drawing.Point(4, 254);
this.LstNewSteel.Margin = new System.Windows.Forms.Padding(4);
this.LstNewSteel.Name = "LstNewSteel";
this.LstNewSteel.Size = new System.Drawing.Size(394, 134);
this.LstNewSteel.Size = new System.Drawing.Size(525, 166);
this.LstNewSteel.TabIndex = 4;
//
// tableLayoutPanel2
//
this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F));
this.tableLayoutPanel2.Controls.Add(this.BtnOldSteelWorkDelAll, 0, 2);
this.tableLayoutPanel2.Controls.Add(this.BtnOldSteelWorkDel, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.BtnOldSteelWorkAdd, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(403, 33);
this.tableLayoutPanel2.Location = new System.Drawing.Point(537, 42);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 3;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(122, 134);
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(163, 166);
this.tableLayoutPanel2.TabIndex = 3;
//
// BtnOldSteelWorkDelAll
......@@ -488,9 +525,10 @@
this.BtnOldSteelWorkDelAll.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnOldSteelWorkDelAll.Enabled = false;
this.BtnOldSteelWorkDelAll.Font = new System.Drawing.Font("宋体", 12F);
this.BtnOldSteelWorkDelAll.Location = new System.Drawing.Point(3, 91);
this.BtnOldSteelWorkDelAll.Location = new System.Drawing.Point(4, 114);
this.BtnOldSteelWorkDelAll.Margin = new System.Windows.Forms.Padding(4);
this.BtnOldSteelWorkDelAll.Name = "BtnOldSteelWorkDelAll";
this.BtnOldSteelWorkDelAll.Size = new System.Drawing.Size(116, 40);
this.BtnOldSteelWorkDelAll.Size = new System.Drawing.Size(155, 48);
this.BtnOldSteelWorkDelAll.TabIndex = 17;
this.BtnOldSteelWorkDelAll.Text = "全部删除";
this.BtnOldSteelWorkDelAll.UseVisualStyleBackColor = true;
......@@ -501,9 +539,10 @@
this.BtnOldSteelWorkDel.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnOldSteelWorkDel.Enabled = false;
this.BtnOldSteelWorkDel.Font = new System.Drawing.Font("宋体", 12F);
this.BtnOldSteelWorkDel.Location = new System.Drawing.Point(3, 47);
this.BtnOldSteelWorkDel.Location = new System.Drawing.Point(4, 59);
this.BtnOldSteelWorkDel.Margin = new System.Windows.Forms.Padding(4);
this.BtnOldSteelWorkDel.Name = "BtnOldSteelWorkDel";
this.BtnOldSteelWorkDel.Size = new System.Drawing.Size(116, 38);
this.BtnOldSteelWorkDel.Size = new System.Drawing.Size(155, 47);
this.BtnOldSteelWorkDel.TabIndex = 16;
this.BtnOldSteelWorkDel.Text = "删除任务";
this.BtnOldSteelWorkDel.UseVisualStyleBackColor = true;
......@@ -514,9 +553,10 @@
this.BtnOldSteelWorkAdd.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnOldSteelWorkAdd.Enabled = false;
this.BtnOldSteelWorkAdd.Font = new System.Drawing.Font("宋体", 12F);
this.BtnOldSteelWorkAdd.Location = new System.Drawing.Point(3, 3);
this.BtnOldSteelWorkAdd.Location = new System.Drawing.Point(4, 4);
this.BtnOldSteelWorkAdd.Margin = new System.Windows.Forms.Padding(4);
this.BtnOldSteelWorkAdd.Name = "BtnOldSteelWorkAdd";
this.BtnOldSteelWorkAdd.Size = new System.Drawing.Size(116, 38);
this.BtnOldSteelWorkAdd.Size = new System.Drawing.Size(155, 47);
this.BtnOldSteelWorkAdd.TabIndex = 15;
this.BtnOldSteelWorkAdd.Text = "添加任务";
this.BtnOldSteelWorkAdd.UseVisualStyleBackColor = true;
......@@ -526,19 +566,20 @@
//
this.tableLayoutPanel3.ColumnCount = 1;
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F));
this.tableLayoutPanel3.Controls.Add(this.BtnNewSteelWorkDelAll, 0, 2);
this.tableLayoutPanel3.Controls.Add(this.BtnNewSteelWorkDel, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.BtnNewSteelWorkAdd, 0, 0);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel3.Location = new System.Drawing.Point(403, 203);
this.tableLayoutPanel3.Location = new System.Drawing.Point(537, 254);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 3;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(122, 134);
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(163, 166);
this.tableLayoutPanel3.TabIndex = 4;
//
// BtnNewSteelWorkDelAll
......@@ -546,9 +587,10 @@
this.BtnNewSteelWorkDelAll.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnNewSteelWorkDelAll.Enabled = false;
this.BtnNewSteelWorkDelAll.Font = new System.Drawing.Font("宋体", 12F);
this.BtnNewSteelWorkDelAll.Location = new System.Drawing.Point(3, 91);
this.BtnNewSteelWorkDelAll.Location = new System.Drawing.Point(4, 114);
this.BtnNewSteelWorkDelAll.Margin = new System.Windows.Forms.Padding(4);
this.BtnNewSteelWorkDelAll.Name = "BtnNewSteelWorkDelAll";
this.BtnNewSteelWorkDelAll.Size = new System.Drawing.Size(116, 40);
this.BtnNewSteelWorkDelAll.Size = new System.Drawing.Size(155, 48);
this.BtnNewSteelWorkDelAll.TabIndex = 17;
this.BtnNewSteelWorkDelAll.Text = "全部删除";
this.BtnNewSteelWorkDelAll.UseVisualStyleBackColor = true;
......@@ -559,9 +601,10 @@
this.BtnNewSteelWorkDel.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnNewSteelWorkDel.Enabled = false;
this.BtnNewSteelWorkDel.Font = new System.Drawing.Font("宋体", 12F);
this.BtnNewSteelWorkDel.Location = new System.Drawing.Point(3, 47);
this.BtnNewSteelWorkDel.Location = new System.Drawing.Point(4, 59);
this.BtnNewSteelWorkDel.Margin = new System.Windows.Forms.Padding(4);
this.BtnNewSteelWorkDel.Name = "BtnNewSteelWorkDel";
this.BtnNewSteelWorkDel.Size = new System.Drawing.Size(116, 38);
this.BtnNewSteelWorkDel.Size = new System.Drawing.Size(155, 47);
this.BtnNewSteelWorkDel.TabIndex = 16;
this.BtnNewSteelWorkDel.Text = "删除任务";
this.BtnNewSteelWorkDel.UseVisualStyleBackColor = true;
......@@ -572,9 +615,10 @@
this.BtnNewSteelWorkAdd.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnNewSteelWorkAdd.Enabled = false;
this.BtnNewSteelWorkAdd.Font = new System.Drawing.Font("宋体", 12F);
this.BtnNewSteelWorkAdd.Location = new System.Drawing.Point(3, 3);
this.BtnNewSteelWorkAdd.Location = new System.Drawing.Point(4, 4);
this.BtnNewSteelWorkAdd.Margin = new System.Windows.Forms.Padding(4);
this.BtnNewSteelWorkAdd.Name = "BtnNewSteelWorkAdd";
this.BtnNewSteelWorkAdd.Size = new System.Drawing.Size(116, 38);
this.BtnNewSteelWorkAdd.Size = new System.Drawing.Size(155, 47);
this.BtnNewSteelWorkAdd.TabIndex = 15;
this.BtnNewSteelWorkAdd.Text = "添加任务";
this.BtnNewSteelWorkAdd.UseVisualStyleBackColor = true;
......@@ -584,19 +628,20 @@
//
this.tableLayoutPanel4.ColumnCount = 1;
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F));
this.tableLayoutPanel4.Controls.Add(this.BtnStorageWorkDelAll, 0, 2);
this.tableLayoutPanel4.Controls.Add(this.BtnStorageWorkDel, 0, 1);
this.tableLayoutPanel4.Controls.Add(this.BtnStorageWorkAdd, 0, 0);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel4.Location = new System.Drawing.Point(403, 373);
this.tableLayoutPanel4.Location = new System.Drawing.Point(537, 466);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 3;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(122, 134);
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(163, 168);
this.tableLayoutPanel4.TabIndex = 5;
//
// BtnStorageWorkDelAll
......@@ -604,9 +649,10 @@
this.BtnStorageWorkDelAll.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnStorageWorkDelAll.Enabled = false;
this.BtnStorageWorkDelAll.Font = new System.Drawing.Font("宋体", 12F);
this.BtnStorageWorkDelAll.Location = new System.Drawing.Point(3, 91);
this.BtnStorageWorkDelAll.Location = new System.Drawing.Point(4, 116);
this.BtnStorageWorkDelAll.Margin = new System.Windows.Forms.Padding(4);
this.BtnStorageWorkDelAll.Name = "BtnStorageWorkDelAll";
this.BtnStorageWorkDelAll.Size = new System.Drawing.Size(116, 40);
this.BtnStorageWorkDelAll.Size = new System.Drawing.Size(155, 48);
this.BtnStorageWorkDelAll.TabIndex = 17;
this.BtnStorageWorkDelAll.Text = "全部删除";
this.BtnStorageWorkDelAll.UseVisualStyleBackColor = true;
......@@ -617,9 +663,10 @@
this.BtnStorageWorkDel.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnStorageWorkDel.Enabled = false;
this.BtnStorageWorkDel.Font = new System.Drawing.Font("宋体", 12F);
this.BtnStorageWorkDel.Location = new System.Drawing.Point(3, 47);
this.BtnStorageWorkDel.Location = new System.Drawing.Point(4, 60);
this.BtnStorageWorkDel.Margin = new System.Windows.Forms.Padding(4);
this.BtnStorageWorkDel.Name = "BtnStorageWorkDel";
this.BtnStorageWorkDel.Size = new System.Drawing.Size(116, 38);
this.BtnStorageWorkDel.Size = new System.Drawing.Size(155, 48);
this.BtnStorageWorkDel.TabIndex = 16;
this.BtnStorageWorkDel.Text = "删除任务";
this.BtnStorageWorkDel.UseVisualStyleBackColor = true;
......@@ -630,9 +677,10 @@
this.BtnStorageWorkAdd.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnStorageWorkAdd.Enabled = false;
this.BtnStorageWorkAdd.Font = new System.Drawing.Font("宋体", 12F);
this.BtnStorageWorkAdd.Location = new System.Drawing.Point(3, 3);
this.BtnStorageWorkAdd.Location = new System.Drawing.Point(4, 4);
this.BtnStorageWorkAdd.Margin = new System.Windows.Forms.Padding(4);
this.BtnStorageWorkAdd.Name = "BtnStorageWorkAdd";
this.BtnStorageWorkAdd.Size = new System.Drawing.Size(116, 38);
this.BtnStorageWorkAdd.Size = new System.Drawing.Size(155, 48);
this.BtnStorageWorkAdd.TabIndex = 15;
this.BtnStorageWorkAdd.Text = "添加任务";
this.BtnStorageWorkAdd.UseVisualStyleBackColor = true;
......@@ -641,10 +689,10 @@
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Location = new System.Drawing.Point(3, 3);
this.label1.Margin = new System.Windows.Forms.Padding(3);
this.label1.Location = new System.Drawing.Point(4, 4);
this.label1.Margin = new System.Windows.Forms.Padding(4);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(394, 24);
this.label1.Size = new System.Drawing.Size(525, 30);
this.label1.TabIndex = 10;
this.label1.Text = "回收钢板任务";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -652,10 +700,10 @@
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Location = new System.Drawing.Point(3, 173);
this.label2.Margin = new System.Windows.Forms.Padding(3);
this.label2.Location = new System.Drawing.Point(4, 216);
this.label2.Margin = new System.Windows.Forms.Padding(4);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(394, 24);
this.label2.Size = new System.Drawing.Size(525, 30);
this.label2.TabIndex = 12;
this.label2.Text = "送新钢板任务";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -663,10 +711,10 @@
// label3
//
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Location = new System.Drawing.Point(3, 343);
this.label3.Margin = new System.Windows.Forms.Padding(3);
this.label3.Location = new System.Drawing.Point(4, 428);
this.label3.Margin = new System.Windows.Forms.Padding(4);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(394, 24);
this.label3.Size = new System.Drawing.Size(525, 30);
this.label3.TabIndex = 14;
this.label3.Text = "仓库出入库任务";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -680,10 +728,11 @@
this.tabPage1.Controls.Add(this.BtnMissionClear);
this.tabPage1.Controls.Add(this.BtnMissionAdd);
this.tabPage1.Controls.Add(this.LstMission);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Location = new System.Drawing.Point(4, 30);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(825, 522);
this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
this.tabPage1.Size = new System.Drawing.Size(1103, 656);
this.tabPage1.TabIndex = 2;
this.tabPage1.Text = "小车任务";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -691,9 +740,10 @@
// ChkWorkTimeoutDel
//
this.ChkWorkTimeoutDel.AutoSize = true;
this.ChkWorkTimeoutDel.Location = new System.Drawing.Point(402, 72);
this.ChkWorkTimeoutDel.Location = new System.Drawing.Point(536, 90);
this.ChkWorkTimeoutDel.Margin = new System.Windows.Forms.Padding(4);
this.ChkWorkTimeoutDel.Name = "ChkWorkTimeoutDel";
this.ChkWorkTimeoutDel.Size = new System.Drawing.Size(155, 20);
this.ChkWorkTimeoutDel.Size = new System.Drawing.Size(191, 24);
this.ChkWorkTimeoutDel.TabIndex = 18;
this.ChkWorkTimeoutDel.Text = "删除1min前的任务";
this.ChkWorkTimeoutDel.UseVisualStyleBackColor = true;
......@@ -702,9 +752,10 @@
// ChkWorkAutoDel
//
this.ChkWorkAutoDel.AutoSize = true;
this.ChkWorkAutoDel.Location = new System.Drawing.Point(402, 27);
this.ChkWorkAutoDel.Location = new System.Drawing.Point(536, 34);
this.ChkWorkAutoDel.Margin = new System.Windows.Forms.Padding(4);
this.ChkWorkAutoDel.Name = "ChkWorkAutoDel";
this.ChkWorkAutoDel.Size = new System.Drawing.Size(331, 20);
this.ChkWorkAutoDel.Size = new System.Drawing.Size(411, 24);
this.ChkWorkAutoDel.TabIndex = 17;
this.ChkWorkAutoDel.Text = "当小车从手动切换为自动时，删除所有任务";
this.ChkWorkAutoDel.UseVisualStyleBackColor = true;
......@@ -713,9 +764,10 @@
// BtnMissionPause
//
this.BtnMissionPause.Font = new System.Drawing.Font("宋体", 12F);
this.BtnMissionPause.Location = new System.Drawing.Point(232, 204);
this.BtnMissionPause.Location = new System.Drawing.Point(309, 255);
this.BtnMissionPause.Margin = new System.Windows.Forms.Padding(4);
this.BtnMissionPause.Name = "BtnMissionPause";
this.BtnMissionPause.Size = new System.Drawing.Size(120, 60);
this.BtnMissionPause.Size = new System.Drawing.Size(160, 75);
this.BtnMissionPause.TabIndex = 16;
this.BtnMissionPause.Text = "暂停";
this.BtnMissionPause.UseVisualStyleBackColor = true;
......@@ -724,9 +776,10 @@
// BtnMissionRun
//
this.BtnMissionRun.Font = new System.Drawing.Font("宋体", 12F);
this.BtnMissionRun.Location = new System.Drawing.Point(232, 138);
this.BtnMissionRun.Location = new System.Drawing.Point(309, 172);
this.BtnMissionRun.Margin = new System.Windows.Forms.Padding(4);
this.BtnMissionRun.Name = "BtnMissionRun";
this.BtnMissionRun.Size = new System.Drawing.Size(120, 60);
this.BtnMissionRun.Size = new System.Drawing.Size(160, 75);
this.BtnMissionRun.TabIndex = 15;
this.BtnMissionRun.Text = "运行";
this.BtnMissionRun.UseVisualStyleBackColor = true;
......@@ -735,9 +788,10 @@
// BtnMissionClear
//
this.BtnMissionClear.Font = new System.Drawing.Font("宋体", 12F);
this.BtnMissionClear.Location = new System.Drawing.Point(232, 72);
this.BtnMissionClear.Location = new System.Drawing.Point(309, 90);
this.BtnMissionClear.Margin = new System.Windows.Forms.Padding(4);
this.BtnMissionClear.Name = "BtnMissionClear";
this.BtnMissionClear.Size = new System.Drawing.Size(120, 60);
this.BtnMissionClear.Size = new System.Drawing.Size(160, 75);
this.BtnMissionClear.TabIndex = 14;
this.BtnMissionClear.Text = "删除任务";
this.BtnMissionClear.UseVisualStyleBackColor = true;
......@@ -746,9 +800,10 @@
// BtnMissionAdd
//
this.BtnMissionAdd.Font = new System.Drawing.Font("宋体", 12F);
this.BtnMissionAdd.Location = new System.Drawing.Point(232, 6);
this.BtnMissionAdd.Location = new System.Drawing.Point(309, 8);
this.BtnMissionAdd.Margin = new System.Windows.Forms.Padding(4);
this.BtnMissionAdd.Name = "BtnMissionAdd";
this.BtnMissionAdd.Size = new System.Drawing.Size(120, 60);
this.BtnMissionAdd.Size = new System.Drawing.Size(160, 75);
this.BtnMissionAdd.TabIndex = 13;
this.BtnMissionAdd.Text = "添加任务";
this.BtnMissionAdd.UseVisualStyleBackColor = true;
......@@ -761,29 +816,22 @@
this.LstMission.Font = new System.Drawing.Font("宋体", 12F);
this.LstMission.FormattingEnabled = true;
this.LstMission.IntegralHeight = false;
this.LstMission.ItemHeight = 16;
this.LstMission.Location = new System.Drawing.Point(6, 6);
this.LstMission.ItemHeight = 20;
this.LstMission.Location = new System.Drawing.Point(8, 8);
this.LstMission.Margin = new System.Windows.Forms.Padding(4);
this.LstMission.Name = "LstMission";
this.LstMission.Size = new System.Drawing.Size(220, 510);
this.LstMission.Size = new System.Drawing.Size(292, 636);
this.LstMission.TabIndex = 12;
//
// LblVersion
//
this.LblVersion.Location = new System.Drawing.Point(579, 9);
this.LblVersion.Name = "LblVersion";
this.LblVersion.Size = new System.Drawing.Size(237, 33);
this.LblVersion.TabIndex = 12;
this.LblVersion.Text = "label4";
this.LblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// FrmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(857, 670);
this.ClientSize = new System.Drawing.Size(1143, 838);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.DgvName);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "钢网AGV";
......
UI/FrmMain.cs
......@@ -344,5 +344,10 @@ namespace AGVControl_Steel
System.Configuration.ConfigurationManager.RefreshSection("appSettings");
Common.log.Info("修改WorkTimeoutDel=" + Common.WorkTimeoutDel.ToString());
}
private void tabControl1_Click(object sender, EventArgs e)
{
ConfigHelper.AdvanceConfigForm.ShowEditDialog(this);
}
}
}
UI/UI.csproj
......@@ -94,6 +94,10 @@
<Content Include="图标.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\CSharp-Workspace\MyProject\DLL\ConfigHelper\ConfigHelper\ConfigHelper.csproj">
<Project>{290182db-d949-434e-9ff7-c59bde3f433a}</Project>
<Name>ConfigHelper</Name>
</ProjectReference>
<ProjectReference Include="..\BLL\BLL.csproj">
<Project>{c547fedd-0b62-4ac3-96e7-c86dd38c670b}</Project>
<Name>BLL</Name>
......
UI/bin/Debug/BLL.dll
此文件类型无法预览
UI/bin/Debug/BLL.pdb
此文件类型无法预览
UI/obj/Debug/UI.csproj.CoreCompileInputs.cache
5c1268f885abc88e59a20f2a27a918a50e654404
5a99a99f90ec837cec6027f79751a3f005ff1f41
UI/obj/Debug/UI.csproj.FileListAbsolute.txt
......@@ -121,3 +121,8 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CoreCompileInputs.
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\UI.csproj.CopyComplete
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.exe
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\obj\Debug\AGVControl_Steel.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\settings\app.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\UI\bin\Debug\ConfigHelper.dll.config
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!