Skip to content

顾剑亮 / AGVControl_Steel

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

风淋门

1 个父辈 d4de4c07
全部展开
内嵌 并排
正在显示 42 个修改的文件 包含 113 行增加 和 21 行删除
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.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!