Skip to content

顾剑亮 / AGVControl_Steel

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

去立库和去线体分开

1 个父辈 4ee928d5
全部展开
内嵌 并排
正在显示 56 个修改的文件 包含 146 行增加 和 250 行删除
BLL/Job/SendNewJob.cs
...@@ -80,8 +80,18 @@ namespace BLL ...@@ -80,8 +80,18 @@ namespace BLL
{ {
if (place == "STORAGE") if (place == "STORAGE")
{ {
SteelManage.NewSteelWorkDel(_info.From, place); if (SteelManage.IsOnlyToStorage(info))
return new StorageJob(); {
SteelManage.NewSteelWorkDel(_info.From, place);
return new StorageJob();
}
else if (SteelManage.IsOnlyToLine(info))
{
SteelManage.NewSteelWorkDel(_info.From, place);
MoveWash();
}
//SteelManage.NewSteelWorkDel(_info.From, place);
//return new StorageJob();
} }
else else
{ {
...@@ -134,8 +144,16 @@ namespace BLL ...@@ -134,8 +144,16 @@ namespace BLL
} }
else if (airPlace == "STORAGE") else if (airPlace == "STORAGE")
{ {
SteelManage.NewSteelWorkDel(_info.From, airPlace); if(SteelManage.IsOnlyToStorage(info))
return new StorageJob(); {
SteelManage.NewSteelWorkDel(_info.From, airPlace);
return new StorageJob();
}
else if(SteelManage.IsOnlyToLine(info))
{
SteelManage.NewSteelWorkDel(_info.From, airPlace);
MoveWash();
}
} }
else else
{ {
......
BLL/Job/StandbyJob.cs
...@@ -65,9 +65,17 @@ namespace BLL ...@@ -65,9 +65,17 @@ namespace BLL
else if (standbyStep.Equals(StandbyStep.End)) else if (standbyStep.Equals(StandbyStep.End))
{ {
//_info.LogJson.SetMissionStep("回待机点任务结束", StandbyStep.End.ToString()); //_info.LogJson.SetMissionStep("回待机点任务结束", StandbyStep.End.ToString());
var othAgv = Common.GetOthAgvInWorkshop(info);
if (_info.Battery <= _info.BatteryMin) if (_info.Battery <= _info.BatteryMin)
{ {
if (othAgv != null)
{
if (othAgv.CurrentJob != null && othAgv.CurrentJob is ChargeJob)
{
standbyStep.Msg = $"{othAgv.Name} 正在充电，等待其离开";
return this;
}
}
standbyStep.Msg = _info.Name + " 电量小于" + _info.BatteryMin + "，执行充电任务"; standbyStep.Msg = _info.Name + " 电量小于" + _info.BatteryMin + "，执行充电任务";
return new ChargeJob(); return new ChargeJob();
} }
...@@ -78,6 +86,14 @@ namespace BLL ...@@ -78,6 +86,14 @@ namespace BLL
{ {
if (_info.Battery <= 80) if (_info.Battery <= 80)
{ {
if (othAgv != null)
{
if (othAgv.CurrentJob != null && othAgv.CurrentJob is ChargeJob)
{
standbyStep.Msg = $"{othAgv.Name} 正在充电，等待其离开";
return this;
}
}
standbyStep.Msg = string.Format("{0} 当前电量{1}%，电量小于80%，执行充电任务", _info.Name, _info.Battery); standbyStep.Msg = string.Format("{0} 当前电量{1}%，电量小于80%，执行充电任务", _info.Name, _info.Battery);
return new ChargeJob(); return new ChargeJob();
} }
......
BLL/Job/StorageJob.cs
...@@ -117,7 +117,7 @@ namespace BLL ...@@ -117,7 +117,7 @@ namespace BLL
} }
else if (storageStep.Equals(StorageStep.BackDoor)) else if (storageStep.Equals(StorageStep.BackDoor))
{ {
move.Execute(_info); move.Execute(_info);
if (move.IsEnd) if (move.IsEnd)
{ {
...@@ -143,7 +143,7 @@ namespace BLL ...@@ -143,7 +143,7 @@ namespace BLL
else if (storageStep.Equals(StorageStep.FindJob)) else if (storageStep.Equals(StorageStep.FindJob))
{ {
//_info.LogJson.SetMissionStep("查找任务", StorageStep.FindJob.ToString()); //_info.LogJson.SetMissionStep("查找任务", StorageStep.FindJob.ToString());
IJob job = SteelManage.GetNewSteelJob(info); IJob job = SteelManage.IsOnlyToStorage(info) ? null : SteelManage.GetNewSteelJob(info);
if (job == null) if (job == null)
{ {
storageStep.Msg = info.Name + " 没有找到仓库送新钢板任务，回清洗点"; storageStep.Msg = info.Name + " 没有找到仓库送新钢板任务，回清洗点";
...@@ -156,7 +156,7 @@ namespace BLL ...@@ -156,7 +156,7 @@ namespace BLL
return job; return job;
} }
} }
else if(storageStep.Equals(StorageStep.GoWashPoint)) else if (storageStep.Equals(StorageStep.GoWashPoint))
{ {
//_info.LogJson.SetMissionStep("去清洗房", StorageStep.GoWashPoint.ToString()); //_info.LogJson.SetMissionStep("去清洗房", StorageStep.GoWashPoint.ToString());
......
BLL/Job/WashPointJob.cs
using System; using System;
using System.Diagnostics.Eventing.Reader;
using Model; using Model;
namespace BLL namespace BLL
...@@ -69,12 +70,16 @@ namespace BLL ...@@ -69,12 +70,16 @@ namespace BLL
_info.Place = ""; _info.Place = "";
//_info.LogJson.SetMissionStep("到达清洗房", WashPointStep.End.ToString()); //_info.LogJson.SetMissionStep("到达清洗房", WashPointStep.End.ToString());
IJob job = SteelManage.GetNewSteelJob(info); IJob job = SteelManage.IsOnlyToStorage(info) ? null : SteelManage.GetNewSteelJob(info);
if (job == null) if (job == null)
{ {
job = SteelManage.GetSteelJob(info); job = SteelManage.GetSteelJob(info);
if (job == null) if (job == null)
return new StandbyJob(); return new StandbyJob();
//else if(job is WashPointJob)
//{
// return this;
//}
else else
return job; return job;
} }
......
BLL/SteelManage.cs
...@@ -205,7 +205,7 @@ namespace BLL ...@@ -205,7 +205,7 @@ namespace BLL
Common.log.Info("没有找到(" + from + "," + place + ")送新钢板任务"); Common.log.Info("没有找到(" + from + "," + place + ")送新钢板任务");
} }
} }
public static void NewSteelWorkDelAll(string workshop) public static void NewSteelWorkDelAll(string workshop)
{ {
int index = 0; int index = 0;
...@@ -486,30 +486,37 @@ namespace BLL ...@@ -486,30 +486,37 @@ namespace BLL
#endregion #endregion
#region 仓库入架子出钢板 #region 仓库入架子出钢板
rtn = GetStorageCall(info); if (IsOnlyToStorage(info))
if (rtn)
{ {
Common.log.Info(string.Format("{0} 仓库呼叫{1}小车", info.Name, info.Workshop)); rtn = GetStorageCall(info);
return new StorageJob(); if (rtn)
} {
else Common.log.Info(string.Format("{0} 仓库呼叫{1}小车", info.Name, info.Workshop));
{ return new StorageJob();
Common.log.Debug(info.Name + " 没有找到仓库呼叫"); }
else
{
Common.log.Debug(info.Name + " 没有找到仓库呼叫");
}
} }
#endregion #endregion
#region 回收钢板 #region 回收钢板
rtn = GetOldSteelCall(info); if (IsOnlyToLine(info))
if (rtn)
{
Common.log.Info(info.Name + " " + info.Workshop + "回收钢板");
return new TakeOldJob();
}
else
{ {
Common.log.Debug(info.Name + " 没有找到" + info.Workshop + "回收钢板任务"); rtn = GetOldSteelCall(info);
if (rtn)
{
Common.log.Info(info.Name + " " + info.Workshop + "回收钢板");
return new TakeOldJob();
}
else
{
Common.log.Debug(info.Name + " 没有找到" + info.Workshop + "回收钢板任务");
}
} }
#endregion #endregion
return null; return null;
...@@ -530,11 +537,33 @@ namespace BLL ...@@ -530,11 +537,33 @@ namespace BLL
} }
} }
/// <summary>
/// 固定去产线领用和返回
/// </summary>
/// <param name="agvInfo"></param>
/// <returns></returns>
public static bool IsOnlyToLine(AgvInfo agvInfo)
{
return (!string.IsNullOrEmpty(agvInfo.Scope) && ("1".Equals(agvInfo.Scope))) || IsCommon(agvInfo);
}
/// <summary>
/// 固定去钢网立库领用和退还
/// </summary>
/// <param name="agvInfo"></param>
/// <returns></returns>
public static bool IsOnlyToStorage(AgvInfo agvInfo)
{
return (!string.IsNullOrEmpty(agvInfo.Scope) && ("2".Equals(agvInfo.Scope))) || IsCommon(agvInfo);
}
public static bool IsCommon(AgvInfo agvInfo)
{
return string.IsNullOrEmpty(agvInfo.Scope) || !string.IsNullOrEmpty(agvInfo.Scope) && ("0".Equals(agvInfo.Scope));
}
public static bool IsAirLines(string place) public static bool IsAirLines(string place)
{ {
//4C风淋门里面的产线，C8，C9 //4C风淋门里面的产线，C8，C9
if (place == "C8" || place == "C9"|| place == "C14" || place == "C15") if (place == "C8" || place == "C9" || place == "C14" || place == "C15")
return true; return true;
else else
return false; return false;
......
BLL/obj/Debug/.NETFramework,Version=v4.6.AssemblyAttributes.cs deleted 100644 → 0
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
BLL/obj/Debug/BLL.csproj.CoreCompileInputs.cache
<<<<<<< Updated upstream a9c1f78ab641391144dc9cf62cfe25c1464c030486360e59a64e488597edb645
00f5424f3a1ea493a3b9a6b30c41ef3f33cd9381
=======
a74afb787bb464c0dbc0b1401461393e4787795f
>>>>>>> Stashed changes
BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\BLL.dll
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\Model.dll
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\log4net.dll
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\Model.pdb
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\log4net.xml
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
D:\Neotel_Beta\AGVControl_Steel\BLL\obj\Debug\BLL.csprojAssemblyReference.cache
D:\Neotel_Beta\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
D:\Neotel_Beta\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
D:\Neotel_Beta\AGVControl_Steel\BLL\obj\Debug\BLL.dll
D:\Neotel_Beta\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
D:\Neotel_Beta\AGVControl_Steel\BLL\bin\Debug\log4net.config
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\log4net.config
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\BLL.dll
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\Model.dll
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\log4net.dll
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\Model.pdb
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\log4net.xml
D:\Neotel\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
D:\Neotel\AGVControl_Steel\BLL\obj\Debug\BLL.csprojAssemblyReference.cache
D:\Neotel\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
D:\Neotel\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
D:\Neotel\AGVControl_Steel\BLL\obj\Debug\BLL.dll
D:\Neotel\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\log4net.config
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\BLL.dll
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\Model.dll
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\log4net.dll
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\Model.pdb
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\log4net.xml
C:\Neotel\Program\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
C:\Neotel\Program\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
C:\Neotel\Program\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
C:\Neotel\Program\AGVControl_Steel\BLL\obj\Debug\BLL.dll
C:\Neotel\Program\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
C:\Neotel\Program\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\log4net.config
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\BLL.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\Model.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\log4net.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\Model.pdb
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\log4net.xml
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.config
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.pdb
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.xml
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
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
<<<<<<< Updated upstream
=======
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
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.config E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.dll E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.pdb E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\BLL.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.dll E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.dll E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.pdb E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\Model.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.pdb E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.xml E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\ConfigHelper.dll.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.xml E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\log4net.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\bin\Debug\RestSharp.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CopyComplete E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.AssemblyReference.cache
>>>>>>> Stashed changes E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.csproj.Up2Date
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\BLL\obj\Debug\BLL.pdb
Model/AgvInfo.cs
...@@ -70,6 +70,10 @@ namespace Model ...@@ -70,6 +70,10 @@ namespace Model
public bool IsCall { set; get; } = false; public bool IsCall { set; get; } = false;
/// <summary> /// <summary>
/// 任务范围
/// </summary>
public string Scope { get; set; }
/// <summary>
/// 当前的工作 /// 当前的工作
/// </summary> /// </summary>
public IJob CurrentJob { set; get; } = null; public IJob CurrentJob { set; get; } = null;
......
Model/Common.cs
...@@ -29,6 +29,10 @@ namespace Model ...@@ -29,6 +29,10 @@ namespace Model
public static bool StorageDockFinish = false; //停靠完成 public static bool StorageDockFinish = false; //停靠完成
public static bool StorageDockAlway = false; //指定停靠状态，一直不改变 public static bool StorageDockAlway = false; //指定停靠状态，一直不改变
public static AgvInfo GetOthAgvInWorkshop(AgvInfo agvInfo)
{
return agvInfos.Find(s => !agvInfo.IP.Equals(s.IP) && agvInfo.Workshop.Equals(s.Workshop));
}
public const string STORAGE_ENTER_4C = "4C_ENTER"; public const string STORAGE_ENTER_4C = "4C_ENTER";
public const string STORAGE_ENTER_4D = "4D_ENTER"; public const string STORAGE_ENTER_4D = "4D_ENTER";
......
Model/obj/Debug/.NETFramework,Version=v4.6.AssemblyAttributes.cs deleted 100644 → 0
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
Model/obj/Debug/Common.csproj.FileListAbsolute.txt deleted 100644 → 0
D:\Neotel_Beta\AGVControl_Steel\Common\bin\Debug\Common.dll
D:\Neotel_Beta\AGVControl_Steel\Common\bin\Debug\Common.pdb
D:\Neotel_Beta\AGVControl_Steel\Common\bin\Debug\log4net.dll
D:\Neotel_Beta\AGVControl_Steel\Common\bin\Debug\log4net.xml
D:\Neotel_Beta\AGVControl_Steel\Common\obj\Debug\Common.csprojAssemblyReference.cache
D:\Neotel_Beta\AGVControl_Steel\Common\obj\Debug\Common.csproj.CoreCompileInputs.cache
D:\Neotel_Beta\AGVControl_Steel\Common\obj\Debug\Common.csproj.CopyComplete
D:\Neotel_Beta\AGVControl_Steel\Common\obj\Debug\Common.dll
D:\Neotel_Beta\AGVControl_Steel\Common\obj\Debug\Common.pdb
Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
<<<<<<< Updated upstream 9df50953336b70469a7ff55453ef1128f6f6a64eb2ec8896172eb04f13189429
1add9d820c816619aab22017895542b1f0792511
=======
79447146296903cb29b682d89c7989d53c2d73ec
>>>>>>> Stashed changes
Model/obj/Debug/Model.csproj.FileListAbsolute.txt
D:\Neotel_Beta\AGVControl_Steel\Model\bin\Debug\Model.dll
D:\Neotel_Beta\AGVControl_Steel\Model\bin\Debug\Model.pdb
D:\Neotel_Beta\AGVControl_Steel\Model\bin\Debug\log4net.dll
D:\Neotel_Beta\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
D:\Neotel_Beta\AGVControl_Steel\Model\bin\Debug\log4net.xml
D:\Neotel_Beta\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
D:\Neotel_Beta\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\Neotel_Beta\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
D:\Neotel_Beta\AGVControl_Steel\Model\obj\Debug\Model.dll
D:\Neotel_Beta\AGVControl_Steel\Model\obj\Debug\Model.pdb
D:\Neotel_Beta\AGVControl_Steel\Model\bin\Debug\log4net.config
D:\Neotel_Beta\AGVControl_Steel\Model\obj\Debug\Model.csprojAssemblyReference.cache
D:\Neotel\AGVControl_Steel\Model\bin\Debug\log4net.config
D:\Neotel\AGVControl_Steel\Model\bin\Debug\Model.dll
D:\Neotel\AGVControl_Steel\Model\bin\Debug\Model.pdb
D:\Neotel\AGVControl_Steel\Model\bin\Debug\log4net.dll
D:\Neotel\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
D:\Neotel\AGVControl_Steel\Model\bin\Debug\log4net.xml
D:\Neotel\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
D:\Neotel\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\Neotel\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
D:\Neotel\AGVControl_Steel\Model\obj\Debug\Model.dll
D:\Neotel\AGVControl_Steel\Model\obj\Debug\Model.pdb
D:\Neotel\AGVControl_Steel\Model\obj\Debug\Model.csprojAssemblyReference.cache
C:\Neotel\Program\AGVControl_Steel\Model\bin\Debug\log4net.config
C:\Neotel\Program\AGVControl_Steel\Model\bin\Debug\Model.dll
C:\Neotel\Program\AGVControl_Steel\Model\bin\Debug\Model.pdb
C:\Neotel\Program\AGVControl_Steel\Model\bin\Debug\log4net.dll
C:\Neotel\Program\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
C:\Neotel\Program\AGVControl_Steel\Model\bin\Debug\log4net.xml
C:\Neotel\Program\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
C:\Neotel\Program\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
C:\Neotel\Program\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
C:\Neotel\Program\AGVControl_Steel\Model\obj\Debug\Model.dll
C:\Neotel\Program\AGVControl_Steel\Model\obj\Debug\Model.pdb
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\bin\Debug\log4net.config
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\bin\Debug\Model.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\bin\Debug\Model.pdb
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\bin\Debug\log4net.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\bin\Debug\log4net.xml
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Neotel\Projects\Gitee\AGVControl_Steel\Model\obj\Debug\Model.pdb
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.config
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\bin\Debug\Model.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\bin\Debug\Model.pdb
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.xml
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Neotel\Projects\Gitee\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.config
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\Model.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\Model.pdb
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Codes\Neotel\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
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
<<<<<<< Updated upstream
=======
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
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.AssemblyReference.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.config E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\Model.dll E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\Model.pdb E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\Model.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.dll E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.dll E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.pdb E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.xml E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\ConfigHelper.dll.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.xml E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\log4net.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.xml E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\bin\Debug\RestSharp.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CopyComplete E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.AssemblyReference.cache
>>>>>>> Stashed changes E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.csproj.Up2Date
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Model\obj\Debug\Model.pdb
Test/obj/Debug/Test.csproj.CoreCompileInputs.cache
9fab8b76c32af56f51b8e63235670eeb5df8b6f4 597eb418a3985b2fe6bba512f37968abe5faf9bb83cadff8f5256a24c5fa20a8
Test/obj/Debug/Test.csproj.FileListAbsolute.txt
...@@ -51,3 +51,16 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.CoreCompileInp ...@@ -51,3 +51,16 @@ E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.CoreCompileInp
E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.CopyComplete E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.CopyComplete
E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.exe E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.exe
E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.pdb E:\Codes\Neotel\Qisda\AGVControl_Steel\Test\obj\Debug\Test.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\bin\Debug\Test.exe.config
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\bin\Debug\Test.exe
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\bin\Debug\Test.pdb
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\bin\Debug\RestSharp.dll
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\bin\Debug\RestSharp.xml
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.AssemblyReference.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.Form1.resources
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.Properties.Resources.resources
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.GenerateResource.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.CoreCompileInputs.cache
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.csproj.Up2Date
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.exe
E:\Neotel\Codes\Qisda\AGVControl_Steel\Test\obj\Debug\Test.pdb
UI/Program.cs
...@@ -80,12 +80,24 @@ namespace AGVControl_Steel ...@@ -80,12 +80,24 @@ namespace AGVControl_Steel
{ {
isUse = Common.appConfig.AppSettings.Settings[str[1]].Value; isUse = Common.appConfig.AppSettings.Settings[str[1]].Value;
} }
string scope = "0";
if (Common.appConfig.AppSettings.Settings[$"{str[1]}_Scope"] == null)
{
Common.appConfig.AppSettings.Settings.Add($"{str[1]}_Scope", "0");
Common.appConfig.Save();
System.Configuration.ConfigurationManager.RefreshSection("appSettings");
}
else
{
scope = Common.appConfig.AppSettings.Settings[$"{str[1]}_Scope"].Value;
}
AgvInfo info = new AgvInfo(str[0], str[1], str[2], str[3], str[4]) AgvInfo info = new AgvInfo(str[0], str[1], str[2], str[3], str[4])
{ {
IsAuto = Convert.ToBoolean(isUse), IsAuto = Convert.ToBoolean(isUse),
BatteryMax = Convert.ToInt32(Common.appConfig.AppSettings.Settings["AGV_BATTERY_MAX"].Value), BatteryMax = Convert.ToInt32(Common.appConfig.AppSettings.Settings["AGV_BATTERY_MAX"].Value),
BatteryMin = Convert.ToInt32(Common.appConfig.AppSettings.Settings["AGV_BATTERY_MIN"].Value) BatteryMin = Convert.ToInt32(Common.appConfig.AppSettings.Settings["AGV_BATTERY_MIN"].Value),
Scope = scope,
}; };
Common.agvInfos.Add(info); Common.agvInfos.Add(info);
} }
......
UI/bin/Debug/AGVControl_Steel.exe.config
...@@ -35,6 +35,6 @@ ...@@ -35,6 +35,6 @@
<add key="WorkTimeout" value="10"/> <add key="WorkTimeout" value="10"/>
<add key="WorkTimeoutDel" value="false"/> <add key="WorkTimeoutDel" value="false"/>
<add key="WorkAutoDel" value="false"/> <add key="WorkAutoDel" value="false"/>
<add key="21号_3S" value="false"/> <add key="11号_4C" value="false"/>
</appSettings> </appSettings>
</configuration> </configuration>
UI/bin/Debug/BLL.dll
此文件类型无法预览
UI/bin/Debug/BLL.pdb
此文件类型无法预览
UI/obj/Debug/.NETFramework,Version=v4.6.AssemblyAttributes.cs deleted 100644 → 0
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
UI/obj/Debug/UI.csproj.CoreCompileInputs.cache
<<<<<<< Updated upstream d57ab71649ea94bec15a51a1abee154d180e2a88b2c81596044353aef74e2fa2
5c1268f885abc88e59a20f2a27a918a50e654404
=======
5f8235700f6c1e5bc0f483284a186564c221ad2f
>>>>>>> Stashed changes
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!