|
@@ -378,17 +378,13 @@ namespace WCS.WorkEngineering.Systems
|
|
|
else if (task.BusType == TaskBusType.帘线退料重绕.GetDescription())
|
|
|
{
|
|
|
var con = db.Default.Queryable<fjSysConfig>().NoLock().First(x => x.Code == "CRTLZone").SContent;
|
|
|
- var isUse = false;
|
|
|
- if (con != null && con == "1")
|
|
|
- {
|
|
|
- isUse = true;
|
|
|
- }
|
|
|
+ var isUse = false || con != null && con == "1";
|
|
|
//首先判断退料输送线是否可放货
|
|
|
var ph_9001 = new Device<IStation523>(Device.All.First(x => x.Code == "9001"), World);
|
|
|
var ph_9101 = new Device<IStation523>(Device.All.First(x => x.Code == "9101"), World);
|
|
|
- var flag1 = !db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && v.Station == "9001")
|
|
|
+ var flag1 = !db.Default.Queryable<WCS_AgvTaskInfo>().NoLock().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && v.Station == "9001")
|
|
|
.SplitTable(v => v.Take(2)).Any() && !ph_9001.Data.Status.HasFlag(StationStatus.PH_Status);
|
|
|
- var flag2 = !db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && v.Station == "9101")
|
|
|
+ var flag2 = !db.Default.Queryable<WCS_AgvTaskInfo>().NoLock().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && v.Station == "9101")
|
|
|
.SplitTable(v => v.Take(2)).Any() && !ph_9101.Data.Status.HasFlag(StationStatus.PH_Status);
|
|
|
var taskApply = db.Default.Queryable<WCS_TaskInfo>().NoLock().Where(x => x.ID == agv.TaskId).First();
|
|
|
if (flag2)
|
|
@@ -433,7 +429,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
{
|
|
|
List<string> allDevs = new List<string> { "9210", "9211", "9212", "9213", "9214",/* "9215", "9216", "9217", "9218" */};
|
|
|
|
|
|
- var agvStas = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && (allDevs.Contains(v.Station)|| allDevs.Contains(v.Position)))
|
|
|
+ var agvStas = db.Default.Queryable<WCS_AgvTaskInfo>().NoLock().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && (allDevs.Contains(v.Station)|| allDevs.Contains(v.Position)))
|
|
|
.SplitTable(v => v.Take(2)).ToList();
|
|
|
var agvStaLists = agvStas.Select(x => x.Station).Distinct();
|
|
|
var devs = allDevs.Where(x => !agvStaLists.Contains(x)).ToList();
|
|
@@ -453,7 +449,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
foreach (var dev in devsPut)
|
|
|
{
|
|
|
if (!dev.Data3.Status.HasFlag(StationStatus.PH_Status) &&
|
|
|
- !db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && (v.Station == dev.Entity.Code || v.Position == dev.Entity.Code))
|
|
|
+ !db.Default.Queryable<WCS_AgvTaskInfo>().NoLock().Where(v => v.Status > AGVTaskStatus.Confirm && v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot && (v.Station == dev.Entity.Code || v.Position == dev.Entity.Code))
|
|
|
.SplitTable(v => v.Take(2)).Any())
|
|
|
{
|
|
|
var sta = dev.Entity.Code;
|
|
@@ -522,7 +518,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
{
|
|
|
throw new Exception($"{agv.Station}站台不在低位小车无法放货,请检查并处理");
|
|
|
}
|
|
|
- var tasking = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot
|
|
|
+ var tasking = db.Default.Queryable<WCS_AgvTaskInfo>().NoLock().Where(v => v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot
|
|
|
&& v.Station == agv.Station && v.GoodsSum == 1).SplitTable(tabs => tabs.Take(2)).First();
|
|
|
if (tasking != null)
|
|
|
{
|