|
@@ -42,7 +42,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
|
|
|
public override void Do(Station obj)
|
|
|
{
|
|
|
- if (obj.Entity.HasFlag(DeviceFlags.出库))
|
|
|
+ if (obj.Entity.Code == "1018"/*.HasFlag(DeviceFlags.出库)*/)
|
|
|
{
|
|
|
|
|
|
List<WCS_AgvTaskInfo> agvTaskInfos = new List<WCS_AgvTaskInfo>();
|
|
@@ -118,7 +118,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
//}
|
|
|
}
|
|
|
}
|
|
|
- else if (obj.Entity.HasFlag(DeviceFlags.入库))
|
|
|
+ else if (obj.Entity.Code == "1017"/*.HasFlag(DeviceFlags.入库)*/)
|
|
|
{
|
|
|
List<WCS_AgvTaskInfo> agvTaskInfos = new List<WCS_AgvTaskInfo>();
|
|
|
//获取所有未结束的入库AGV任务
|
|
@@ -166,31 +166,67 @@ namespace WCS.WorkEngineering.Systems
|
|
|
if (task.Floor == 1) //一楼
|
|
|
{
|
|
|
//一楼三个入库口 新增一个巷道,两个入库口
|
|
|
- stations = devs.Where(v => v.Entity.Code is "1011" or "1013" or "1015" or "1117" or "1138").ToList();
|
|
|
-
|
|
|
- //过滤有任务的站台
|
|
|
- var taskinstations = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.TaskType == AGVTaskType.EnterDepot && v.Status < AGVTaskStatus.MissionCompleted && (v.Position == "1011" || v.Position == "1013" || v.Position == "1015" || v.Position == "1117" || v.Position == "1138")).SplitTable(v => v.Take(2)).Select(v => v.Position).ToList();
|
|
|
- stations = stations.Where(p => !taskinstations.Contains(p.Entity.Code)).ToList();
|
|
|
-
|
|
|
- //筛选出可用站台
|
|
|
- stations = stations.Where(v => v.Data.VoucherNo == v.Data2.VoucherNo && v.Data3.Status.HasFlag(StatusEunm.Auto))
|
|
|
- .Where(v => !v.Data3.Status.HasFlag(StatusEunm.PH_Status) && !v.Data3.Status.HasFlag(StatusEunm.OT_Status))
|
|
|
- .Where(v => !v.Data3.Status.HasFlag(StatusEunm.Run)).ToList(); // 筛选出可用站台
|
|
|
-
|
|
|
- //var putS = stations.Select(v => v.Entity.Code);
|
|
|
- var dev = devs.Find(v => v.Entity.Code == "1138");
|
|
|
- World.Log($"放货站台1138信号凭证号{dev.Data.VoucherNo}-{dev.Data2.VoucherNo}-自动{dev.Data3.Status.HasFlag(StatusEunm.Auto)}-光电{dev.Data3.Status.HasFlag(StatusEunm.PH_Status)}-有货光电{dev.Data3.Status.HasFlag(StatusEunm.OT_Status)}-{dev.Data3.Status.HasFlag(StatusEunm.Run)}");
|
|
|
- //World.Log($"可用放货站台{JsonConvert.SerializeObject(putS)}");
|
|
|
- this.ExRecord(obj.Entity.Code, $"AGV任务{agvInfo.ID},可用放货站台", stations.Select(v => v.Entity.Code).ToList());
|
|
|
- //可用堆垛机
|
|
|
- srm = stations.Select(v => v.Entity.Sources).SelectMany(v => v).Where(v => v.IsTunnel()) //上一个地址是巷道的
|
|
|
- .Select(v => v.Sources).SelectMany(v => v).Where(v => v.HasProtocol(typeof(ISRM520))) //筛选出堆垛机
|
|
|
- .Select(v => new SRM(v, this.World)) //转换为SRM
|
|
|
- .Where(v => v != null && !v.Data2.Status.HasFlag(SrmStatus.Alarm) && v.Data2.AutoStatus == SrmAutoStatus.Automatic) //筛选出可用堆垛机
|
|
|
- .Where(v => tunnelNo.Contains(v.Entity.Code)) //筛选出巷道优先级最高的堆垛机
|
|
|
- .MinBy(v => tunnelNo.IndexOf(v.Entity.Code));//按照巷道优先级排序
|
|
|
-
|
|
|
-
|
|
|
+ //proline 6-12
|
|
|
+ if (agvInfo.WorkShop == 1138)
|
|
|
+ {
|
|
|
+ stations = devs.Where(v => v.Entity.Code is "1138").ToList();
|
|
|
+ //过滤有任务的站台
|
|
|
+ var taskinstations = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.TaskType == AGVTaskType.EnterDepot && v.Status < AGVTaskStatus.MissionCompleted && (v.Position == "1138")).SplitTable(v => v.Take(2)).Select(v => v.Position).ToList();
|
|
|
+ stations = stations.Where(p => !taskinstations.Contains(p.Entity.Code)).ToList();
|
|
|
+ //筛选出可用站台
|
|
|
+ stations = stations.Where(v => v.Data.VoucherNo == v.Data2.VoucherNo && v.Data3.Status.HasFlag(StatusEunm.Auto))
|
|
|
+ .Where(v => !v.Data3.Status.HasFlag(StatusEunm.PH_Status) && !v.Data3.Status.HasFlag(StatusEunm.OT_Status))
|
|
|
+ .Where(v => !v.Data3.Status.HasFlag(StatusEunm.Run)).ToList(); // 筛选出可用站台
|
|
|
+
|
|
|
+ //可用堆垛机
|
|
|
+ srm = stations.Select(v => v.Entity.Sources).SelectMany(v => v).Where(v => v.IsTunnel()) //上一个地址是巷道的
|
|
|
+ .Select(v => v.Sources).SelectMany(v => v).Where(v => v.HasProtocol(typeof(ISRM520))) //筛选出堆垛机
|
|
|
+ .Select(v => new SRM(v, this.World)) //转换为SRM
|
|
|
+ .Where(v => v != null && !v.Data2.Status.HasFlag(SrmStatus.Alarm) && v.Data2.AutoStatus == SrmAutoStatus.Automatic) //筛选出可用堆垛机
|
|
|
+ .Where(v => tunnelNo.Contains(v.Entity.Code)) //筛选出巷道优先级最高的堆垛机
|
|
|
+ .MinBy(v => tunnelNo.IndexOf(v.Entity.Code));//按照巷道优先级排序
|
|
|
+ if (srm == null)
|
|
|
+ {
|
|
|
+ stations = devs.Where(v => v.Entity.Code is "1011" or "1013" or "1015" or "1117").ToList();
|
|
|
+ //过滤有任务的站台
|
|
|
+ var taskinstations1 = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.TaskType == AGVTaskType.EnterDepot && v.Status < AGVTaskStatus.MissionCompleted && (v.Position == "1011" || v.Position == "1013" || v.Position == "1015" || v.Position == "1117")).SplitTable(v => v.Take(2)).Select(v => v.Position).ToList();
|
|
|
+ stations = stations.Where(p => !taskinstations1.Contains(p.Entity.Code)).ToList();
|
|
|
+ //筛选出可用站台
|
|
|
+ stations = stations.Where(v => v.Data.VoucherNo == v.Data2.VoucherNo && v.Data3.Status.HasFlag(StatusEunm.Auto))
|
|
|
+ .Where(v => !v.Data3.Status.HasFlag(StatusEunm.PH_Status) && !v.Data3.Status.HasFlag(StatusEunm.OT_Status))
|
|
|
+ .Where(v => !v.Data3.Status.HasFlag(StatusEunm.Run)).ToList(); // 筛选出可用站台
|
|
|
+
|
|
|
+ //可用堆垛机
|
|
|
+ srm = stations.Select(v => v.Entity.Sources).SelectMany(v => v).Where(v => v.IsTunnel()) //上一个地址是巷道的
|
|
|
+ .Select(v => v.Sources).SelectMany(v => v).Where(v => v.HasProtocol(typeof(ISRM520))) //筛选出堆垛机
|
|
|
+ .Select(v => new SRM(v, this.World)) //转换为SRM
|
|
|
+ .Where(v => v != null && !v.Data2.Status.HasFlag(SrmStatus.Alarm) && v.Data2.AutoStatus == SrmAutoStatus.Automatic) //筛选出可用堆垛机
|
|
|
+ .Where(v => tunnelNo.Contains(v.Entity.Code)) //筛选出巷道优先级最高的堆垛机
|
|
|
+ .MinBy(v => tunnelNo.IndexOf(v.Entity.Code));//按照巷道优先级排序
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ stations = devs.Where(v => v.Entity.Code is "1011" or "1013" or "1015" or "1117").ToList();
|
|
|
+
|
|
|
+ //过滤有任务的站台
|
|
|
+ var taskinstations = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.TaskType == AGVTaskType.EnterDepot && v.Status < AGVTaskStatus.MissionCompleted && (v.Position == "1011" || v.Position == "1013" || v.Position == "1015" || v.Position == "1117")).SplitTable(v => v.Take(2)).Select(v => v.Position).ToList();
|
|
|
+ stations = stations.Where(p => !taskinstations.Contains(p.Entity.Code)).ToList();
|
|
|
+
|
|
|
+ //筛选出可用站台
|
|
|
+ stations = stations.Where(v => v.Data.VoucherNo == v.Data2.VoucherNo && v.Data3.Status.HasFlag(StatusEunm.Auto))
|
|
|
+ .Where(v => !v.Data3.Status.HasFlag(StatusEunm.PH_Status) && !v.Data3.Status.HasFlag(StatusEunm.OT_Status))
|
|
|
+ .Where(v => !v.Data3.Status.HasFlag(StatusEunm.Run)).ToList(); // 筛选出可用站台
|
|
|
+
|
|
|
+ this.ExRecord(obj.Entity.Code, $"AGV任务{agvInfo.ID},可用放货站台", stations.Select(v => v.Entity.Code).ToList());
|
|
|
+ //可用堆垛机
|
|
|
+ srm = stations.Select(v => v.Entity.Sources).SelectMany(v => v).Where(v => v.IsTunnel()) //上一个地址是巷道的
|
|
|
+ .Select(v => v.Sources).SelectMany(v => v).Where(v => v.HasProtocol(typeof(ISRM520))) //筛选出堆垛机
|
|
|
+ .Select(v => new SRM(v, this.World)) //转换为SRM
|
|
|
+ .Where(v => v != null && !v.Data2.Status.HasFlag(SrmStatus.Alarm) && v.Data2.AutoStatus == SrmAutoStatus.Automatic) //筛选出可用堆垛机
|
|
|
+ .Where(v => tunnelNo.Contains(v.Entity.Code)) //筛选出巷道优先级最高的堆垛机
|
|
|
+ .MinBy(v => tunnelNo.IndexOf(v.Entity.Code));//按照巷道优先级排序
|
|
|
+ }
|
|
|
}
|
|
|
else //二楼
|
|
|
{
|
|
@@ -229,11 +265,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
this.ExRecord(obj.Entity.Code, $"AGV任务{agvInfo.ID},放货站台{nextPos}");
|
|
|
|
|
|
bool flag = false;
|
|
|
- //if (((task.BusType == "二楼湿拉线退料回立库" || task.BusType == "二楼湿拉线余料回立库") && task.Floor == 2))
|
|
|
- //{
|
|
|
- // flag = true;
|
|
|
- // nextPos.Entity.Code = "1025";
|
|
|
- //}
|
|
|
+
|
|
|
var agvs = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status < AGVTaskStatus.MissionCompleted && v.Position == nextPos.Entity.Code).SplitTable(v => v.Take(2)).ToList();
|
|
|
if (agvs.Any())
|
|
|
{
|
|
@@ -246,6 +278,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
}
|
|
|
//wcs任务状态卡控,防止因光电异常误判
|
|
|
if (db.Default.Queryable<WCS_TaskInfo>().Any(v => v.AddrNext == nextPos.Entity.Code && v.Status == Entity.TaskStatus.ConveyorExecution)) return;
|
|
|
+ //if (db.Default.Queryable<WCS_TaskDtl>().SplitTable(v => v.Take(2)).Any(v => v.NextPoint == nextPos.Entity.Code && v.Desc.Contains("任务分配至堆垛机"))) return;
|
|
|
|
|
|
|
|
|
if (RedisHub.Default.Get("TaskTun:" + task.ID) != null && RedisHub.Default.Get("TaskTun:" + task.ID) != nextPos.Entity.Code)
|
|
@@ -352,7 +385,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
|
|
|
public override bool Select(Device dev)
|
|
|
{
|
|
|
- return dev.Code is "1011" or "1012";
|
|
|
+ return dev.Code is "1017" or "1018";
|
|
|
}
|
|
|
}
|
|
|
}
|