|
|
@@ -19,13 +19,13 @@ namespace WCS.Service.Works.Station
|
|
|
/// 涂布入库AGV交互
|
|
|
/// </summary>
|
|
|
[WorkTitle(typeof(CoatingHandler), "涂布入库AGV交互")]
|
|
|
- public class 涂布入库AGV交互 : Work<StationDeviceGroup>
|
|
|
+ public class 涂布入库agv交互 : Work<StationDeviceGroup>
|
|
|
{
|
|
|
protected override void Do(StationDeviceGroup obj)
|
|
|
{
|
|
|
- obj.EX(obj =>
|
|
|
+ obj.EX(stationDeviceGroup =>
|
|
|
{
|
|
|
- var station = obj.Entity.CODE;
|
|
|
+ var station = stationDeviceGroup.Entity.CODE;
|
|
|
|
|
|
#region 处理新增AGV任务
|
|
|
|
|
|
@@ -35,113 +35,101 @@ namespace WCS.Service.Works.Station
|
|
|
var agvTasks = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库)
|
|
|
.Where(v => v.Status < AGVTaskStatus.完成).ToArray();
|
|
|
|
|
|
- foreach (var agvtask in agvTasks)
|
|
|
+ foreach (var tasking in agvTasks)
|
|
|
{
|
|
|
- var position = agvtask.Position;
|
|
|
+ var position = tasking.Position;
|
|
|
if (!ProtocolProxy.AllDatas.ContainsKey(position))
|
|
|
ProtocolProxy.AllDatas[position] = new ProdLineData();
|
|
|
var pld = ProtocolProxy.AllDatas[position] as ProdLineData;
|
|
|
- pld.Frame = LogicHandler.Frame;
|
|
|
+ pld!.Frame = LogicHandler.Frame;
|
|
|
pld.Code = position;
|
|
|
- pld.TaskList.Add(agvtask);
|
|
|
+ pld.TaskList.Add(tasking);
|
|
|
|
|
|
- if (agvtask.Status == AGVTaskStatus.新建)
|
|
|
+ if (tasking.Status == AGVTaskStatus.新建)
|
|
|
{
|
|
|
- //if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动)))
|
|
|
- //{
|
|
|
- // InfoLog.INFO_INFO($"{station}手动状态");
|
|
|
- // continue;
|
|
|
- //};
|
|
|
var qty = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库 && v.Status > AGVTaskStatus.新建 && v.Status < AGVTaskStatus.完成);
|
|
|
//同时最多只能有10个任务被确认
|
|
|
if (qty.Count() >= 10)
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb($"{obj.Entity.CODE}正在执行的入库任务数量已达{qty.Count()},暂停入库", obj.Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常);
|
|
|
+ InfoLog.INFO_WarnDb($"{stationDeviceGroup.Entity.CODE}正在执行的入库任务数量已达{qty.Count()},暂停入库", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.逻辑异常);
|
|
|
continue;
|
|
|
- };
|
|
|
-
|
|
|
- //if (qty.Count(v => v.Station == obj.Entity.CODE) > qty.Count(v => v.Station != obj.Entity.CODE))
|
|
|
- //{
|
|
|
- // InfoLog.INFO_INFO($"{station}触发均分");
|
|
|
- // continue;
|
|
|
- //}
|
|
|
+ }
|
|
|
|
|
|
- //agvtask.Station = obj.Entity.CODE;
|
|
|
- agvtask.Status = AGVTaskStatus.执行;
|
|
|
- agvtask.UpdateTime = DateTime.Now;
|
|
|
+ tasking.Status = AGVTaskStatus.执行;
|
|
|
+ tasking.UpdateTime = DateTime.Now;
|
|
|
}
|
|
|
//agv到达指定位置给确认后分配站台
|
|
|
- else if (agvtask.Status == AGVTaskStatus.执行 && agvtask.AGVStatus== AGVTaskStatus.确认 && string.IsNullOrEmpty(agvtask.Station))
|
|
|
+ else if (tasking.Status == AGVTaskStatus.执行 && tasking.AGVStatus == AGVTaskStatus.确认 && string.IsNullOrEmpty(tasking.Station))
|
|
|
{
|
|
|
//判断提升机是否被禁用
|
|
|
- obj.BcrStationIsForbid();
|
|
|
+ stationDeviceGroup.BcrStationIsForbid();
|
|
|
|
|
|
- if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动)))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动)))
|
|
|
{
|
|
|
InfoLog.INFO_INFO($"{station}手动状态");
|
|
|
continue;
|
|
|
- };
|
|
|
+ }
|
|
|
|
|
|
var qty = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库 && v.Status > AGVTaskStatus.新建 && v.Status < AGVTaskStatus.完成);
|
|
|
- if (qty.Count(v => v.Station == obj.Entity.CODE) > qty.Count(v => v.Station != obj.Entity.CODE && !string.IsNullOrEmpty(v.Station)))
|
|
|
+ if (qty.Count(v => v.Station == stationDeviceGroup.Entity.CODE) > qty.Count(v => v.Station != stationDeviceGroup.Entity.CODE && !string.IsNullOrEmpty(v.Station)))
|
|
|
{
|
|
|
InfoLog.INFO_INFO($"{station}触发均分");
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- agvtask.Station = obj.Entity.CODE;
|
|
|
- agvtask.Status = AGVTaskStatus.执行;
|
|
|
- agvtask.UpdateTime = DateTime.Now;
|
|
|
+ tasking.Station = stationDeviceGroup.Entity.CODE;
|
|
|
+ tasking.Status = AGVTaskStatus.执行;
|
|
|
+ tasking.UpdateTime = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
}
|
|
|
- else if (agvtask.Status < agvtask.AGVStatus)
|
|
|
+ else if (tasking.Status < tasking.AGVStatus)
|
|
|
{
|
|
|
- if (agvtask.Station != obj.Entity.CODE)
|
|
|
+ if (tasking.Station != stationDeviceGroup.Entity.CODE)
|
|
|
{
|
|
|
- InfoLog.INFO_INFO($"{obj.Entity.CODE}不是当前站台的AGV任务");
|
|
|
+ InfoLog.INFO_INFO($"{stationDeviceGroup.Entity.CODE}不是当前站台的AGV任务");
|
|
|
continue;
|
|
|
}
|
|
|
- if (agvtask.AGVStatus == AGVTaskStatus.请求_允许)
|
|
|
+ if (tasking.AGVStatus == AGVTaskStatus.请求_允许)
|
|
|
{
|
|
|
- if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动)))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动)))
|
|
|
{
|
|
|
InfoLog.INFO_INFO("不在自动状态");
|
|
|
continue;
|
|
|
}
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位)))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位)))
|
|
|
{
|
|
|
InfoLog.INFO_INFO("设备运行中");
|
|
|
continue;
|
|
|
}
|
|
|
- if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位)))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位)))
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("不在高位", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("不在高位", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
- if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态)))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态)))
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("AGV请求放货,但有光电", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("AGV请求放货,但有光电", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
- if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV放货完成信号)))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV放货完成信号)))
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("AGV放货完成信号未清除", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("AGV放货完成信号未清除", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
- if (obj.Items.Any(v => v.Data2.Tasknum > 0))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data2.Tasknum > 0))
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("已有WCS任务号", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("已有WCS任务号", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- if (db.Default.Set<WCS_AGVTask>().Any(v => v.Station == agvtask.Station && v.Status >= AGVTaskStatus.请求_允许 && v.Status < AGVTaskStatus.完成扫码 && v.ID != agvtask.ID)) //只能允许一个
|
|
|
+ if (db.Default.Set<WCS_AGVTask>().Any(v => v.Station == tasking.Station && v.Status >= AGVTaskStatus.请求_允许 && v.Status < AGVTaskStatus.完成扫码 && v.ID != tasking.ID)) //只能允许一个
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("上一个允许放货的AGV任务未完成", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("上一个允许放货的AGV任务未完成", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
//判断1435扫码位置条件
|
|
|
- var judge = Device.Find("1435").Device<IStation520,IStation521,IStation523>();
|
|
|
- if (obj.Entity.CODE == "G1394")
|
|
|
+ var judge = Device.Find("1435").Device<IStation520, IStation521, IStation523>();
|
|
|
+ if (stationDeviceGroup.Entity.CODE == "G1394")
|
|
|
{
|
|
|
if (!judge.Data3.Status.HasFlag(StationStatus.自动))
|
|
|
{
|
|
|
@@ -158,61 +146,61 @@ namespace WCS.Service.Works.Station
|
|
|
//判断是否有货
|
|
|
if (judge.Data2.Status.HasFlag(IstationStatus.光电状态))
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("前方有光电,不可放货", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("前方有光电,不可放货", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
if (judge.Data2.Tasknum > 0)
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("已 有WCS任务号", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("已 有WCS任务号", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- agvtask.Status = agvtask.AGVStatus;
|
|
|
- agvtask.UpdateTime = DateTime.Now;
|
|
|
+
|
|
|
+ tasking.Status = tasking.AGVStatus;
|
|
|
+ tasking.UpdateTime = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
}
|
|
|
- else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
|
|
|
+ else if (tasking.AGVStatus == AGVTaskStatus.取放完成)
|
|
|
{
|
|
|
- if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV放货完成信号)))
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV放货完成信号)))
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("AGV放货完成信号未清楚", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("AGV放货完成信号未清楚", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
- if (!obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态)))
|
|
|
+ if (!stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态)))
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb("放货完成无光电", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb("放货完成无光电", stationDeviceGroup.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- agvtask.Status = agvtask.AGVStatus;
|
|
|
- agvtask.UpdateTime = DateTime.Now;
|
|
|
+ tasking.Status = tasking.AGVStatus;
|
|
|
+ tasking.UpdateTime = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
- foreach (var dev in obj.Items)
|
|
|
+ foreach (var dev in stationDeviceGroup.Items)
|
|
|
{
|
|
|
if (dev.Data2.Status.HasFlag(IstationStatus.光电状态))
|
|
|
{
|
|
|
- dev.Data.Goodsnum = (short)agvtask.Goodsnum;
|
|
|
+ dev.Data.Goodsnum = (short)tasking.Goodsnum;
|
|
|
dev.Data.Istation521Status = IstationStatus.AGV放货完成信号;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.完成))
|
|
|
+ else if (Ltc.Do(tasking, v => v.AGVStatus == AGVTaskStatus.完成))
|
|
|
{
|
|
|
- agvtask.Status = agvtask.AGVStatus;
|
|
|
- agvtask.UpdateTime = DateTime.Now;
|
|
|
+ tasking.Status = tasking.AGVStatus;
|
|
|
+ tasking.UpdateTime = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
- var devs = Device.Find(agvtask.Station).Create<StationDeviceGroup>();
|
|
|
- foreach (var dev in devs.Items)
|
|
|
+ var devise = Device.Find(tasking.Station).Create<StationDeviceGroup>();
|
|
|
+ foreach (var dev in devise.Items)
|
|
|
{
|
|
|
- dev.Data.Goodscode = agvtask.ID;
|
|
|
+ dev.Data.Goodscode = tasking.ID;
|
|
|
}
|
|
|
}
|
|
|
- else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.取消))
|
|
|
+ else if (Ltc.Do(tasking, v => v.AGVStatus == AGVTaskStatus.取消))
|
|
|
{
|
|
|
- agvtask.Status = agvtask.AGVStatus;
|
|
|
- agvtask.UpdateTime = DateTime.Now;
|
|
|
+ tasking.Status = tasking.AGVStatus;
|
|
|
+ tasking.UpdateTime = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
}
|
|
|
}
|
|
|
@@ -226,7 +214,7 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
protected override bool SelectDevice(WCS_DEVICE dev)
|
|
|
{
|
|
|
- return dev.CODE == "G1394" || dev.CODE == "G1386";
|
|
|
+ return dev.CODE is "G1394" or "G1386";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -240,17 +228,17 @@ namespace WCS.Service.Works.Station
|
|
|
{
|
|
|
var timer = new Stopwatch();
|
|
|
timer.Start();
|
|
|
- obj.EX(obj =>
|
|
|
+ obj.EX(stationDeviceGroup =>
|
|
|
{
|
|
|
- obj.BcrStationIsForbid();
|
|
|
+ stationDeviceGroup.BcrStationIsForbid();
|
|
|
//设备组无论单卷还是双卷都必须满足的条件
|
|
|
- if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException($"等待任务执行--凭证号不一致");
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException($"等待任务执行--凭证号不一致");
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
|
|
|
|
|
|
- if (obj.Entity.CODE == "G1386")
|
|
|
+ if (stationDeviceGroup.Entity.CODE == "G1386")
|
|
|
{
|
|
|
- if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.低位))) throw new DoException("不在低位");
|
|
|
- }
|
|
|
+ if (stationDeviceGroup.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.低位))) throw new DoException("不在低位");
|
|
|
+ }
|
|
|
|
|
|
//成功创建的任务
|
|
|
var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
@@ -258,23 +246,23 @@ namespace WCS.Service.Works.Station
|
|
|
//创建对应的任务
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var devs = obj.GetBcrValid();
|
|
|
- devs.Valid();
|
|
|
- var infos = devs.GetWMSInTask();
|
|
|
+ var devise = stationDeviceGroup.GetBcrValid();
|
|
|
+ devise.Valid();
|
|
|
+ var infos = devise.GetWMSInTask();
|
|
|
|
|
|
WCS_AGVTask agvTask = null;
|
|
|
|
|
|
- if (!obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)))
|
|
|
+ if (!stationDeviceGroup.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.手动入库)))
|
|
|
{
|
|
|
- if (obj.Entity.CODE == "G1435")
|
|
|
+ if (stationDeviceGroup.Entity.CODE == "G1435")
|
|
|
{
|
|
|
- agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.Status == AGVTaskStatus.完成 && v.Station == "G1394").FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
+ agvTask = db.Default.Set<WCS_AGVTask>().FirstOrDefault(v => v.Status == AGVTaskStatus.完成 && v.Station == "G1394") ?? throw new WarnException("无完成AGV任务");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.Status == AGVTaskStatus.完成 && v.Station == obj.Entity.CODE).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
+ agvTask = db.Default.Set<WCS_AGVTask>().FirstOrDefault(v => v.Status == AGVTaskStatus.完成 && v.Station == stationDeviceGroup.Entity.CODE) ?? throw new WarnException("无完成AGV任务");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (agvTask.Status != AGVTaskStatus.完成扫码)
|
|
|
{
|
|
|
agvTask.Status = AGVTaskStatus.完成扫码;
|
|
|
@@ -282,29 +270,31 @@ namespace WCS.Service.Works.Station
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- foreach (var item in devs)
|
|
|
+ foreach (var item in devise)
|
|
|
{
|
|
|
var dev = item.Station;
|
|
|
var next = dev.Entity.GetPath("SRM");
|
|
|
var info = infos.FirstOrDefault(v => item.FinishCode.Contains(v.ContainerCode + "}"));
|
|
|
if (db.Default.Set<WCS_TASK>().AsNoTracking().Any(v => v.BARCODE == info.ContainerCode && v.STATUS < TaskStatus.已完成 && v.TYPE == TaskType.入库))
|
|
|
- throw new WarnException($"生产条码{info.ContainerCode}存在未完成任务,请检查是否为标签卡重复使用");
|
|
|
-
|
|
|
- var task = new WCS_TASK();
|
|
|
- task.BARCODE = info.ContainerCode;
|
|
|
- task.TYPE = TaskType.入库;
|
|
|
- task.STATUS = TaskStatus.执行中;
|
|
|
- task.ADDRFROM = dev.Entity.CODE;
|
|
|
- task.ADDRTO = info.EndPostion;
|
|
|
- task.STARTTIME = DateTime.Now;
|
|
|
- task.UPDATEUSER = "WCS";
|
|
|
- task.UPDATETIME = DateTime.Now;
|
|
|
- task.WMSTASK = int.Parse(info.WMSTaskNum);
|
|
|
- task.TaskGroupKey = info.TaskGroupKey;
|
|
|
- task.ADDRNEXT = next.CODE;
|
|
|
- task.HEIGHT = dev.Data2.GoodsSize;
|
|
|
- task.AgvTask = agvTask == null ? 0 : agvTask.ID;
|
|
|
- task.FLOOR = 2;
|
|
|
+ throw new WarnException($"生产条码{info?.ContainerCode}存在未完成任务,请检查是否为标签卡重复使用");
|
|
|
+
|
|
|
+ var task = new WCS_TASK
|
|
|
+ {
|
|
|
+ BARCODE = info?.ContainerCode,
|
|
|
+ TYPE = TaskType.入库,
|
|
|
+ STATUS = TaskStatus.执行中,
|
|
|
+ ADDRFROM = dev.Entity.CODE,
|
|
|
+ ADDRTO = info?.EndPostion,
|
|
|
+ STARTTIME = DateTime.Now,
|
|
|
+ UPDATEUSER = "WCS",
|
|
|
+ UPDATETIME = DateTime.Now,
|
|
|
+ WMSTASK = int.Parse(info?.WMSTaskNum!),
|
|
|
+ TaskGroupKey = info?.TaskGroupKey,
|
|
|
+ ADDRNEXT = next.CODE,
|
|
|
+ HEIGHT = dev.Data2.GoodsSize,
|
|
|
+ AgvTask = agvTask?.ID ?? 0,
|
|
|
+ FLOOR = 2
|
|
|
+ };
|
|
|
|
|
|
db.Default.Set<WCS_TASK>().Add(task);
|
|
|
finishTaskList.Add(new FinishTaskList<int>(task.WMSTASK, item.Station));
|
|
|
@@ -335,13 +325,13 @@ namespace WCS.Service.Works.Station
|
|
|
});
|
|
|
|
|
|
timer.Stop();
|
|
|
- InfoLog.INFO_TIMING($"{obj.Entity.CODE}--扫码入库,耗时{timer.ElapsedMilliseconds}");
|
|
|
+ InfoLog.INFO_TIMING($"{stationDeviceGroup.Entity.CODE}--扫码入库,耗时{timer.ElapsedMilliseconds}");
|
|
|
});
|
|
|
}
|
|
|
|
|
|
protected override bool SelectDevice(WCS_DEVICE dev)
|
|
|
{
|
|
|
- return dev.CODE == "G1386" || dev.CODE == "G1435";
|
|
|
+ return dev.CODE is "G1386" or "G1435";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -353,17 +343,17 @@ namespace WCS.Service.Works.Station
|
|
|
{
|
|
|
protected override void Do(StationDeviceGroup obj)
|
|
|
{
|
|
|
- obj.EX(obj =>
|
|
|
+ obj.EX(stationDeviceGroup =>
|
|
|
{
|
|
|
- var key = $"WCS:Lock:CoatingAllocationTunnel";
|
|
|
+ const string key = $"WCS:Lock:CoatingAllocationTunnel";
|
|
|
try
|
|
|
{
|
|
|
if (ProtocolProxy.YG150Redis.Get(key) != null) throw new WarnException($"[CoatingAllocationTunnel]--触发并发管控");
|
|
|
ProtocolProxy.YG150Redis.Set(key, key);
|
|
|
- var code = obj.Entity.CODE;
|
|
|
+ var code = stationDeviceGroup.Entity.CODE;
|
|
|
//两个设备都必须满足的条件
|
|
|
- if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException("等待执行任务,凭证号不一致");
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new DoException("运行状态");
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException("等待执行任务,凭证号不一致");
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new DoException("运行状态");
|
|
|
|
|
|
//成功分配巷道的任务的任务
|
|
|
var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
@@ -371,13 +361,14 @@ namespace WCS.Service.Works.Station
|
|
|
//变更数据库信息
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var devs = obj.Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Request == IstationRequest.请求分配目标地址)
|
|
|
+ var devise = stationDeviceGroup.Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Request == IstationRequest.请求分配目标地址)
|
|
|
.Where(v => v.Data2.Tasknum > 10000 && v.Data2.Goodsend != 0);
|
|
|
- if (!devs.Any()) return; //无可执行任务
|
|
|
- var taskIds = devs.Select(dev => dev.Data2.Tasknum).ToList();
|
|
|
+ var enumerable = devise as Device<IStation520, IStation521, IStation523>[] ?? devise.ToArray();
|
|
|
+ if (!enumerable.Any()) return; //无可执行任务
|
|
|
+ var taskIds = enumerable.Select(dev => dev.Data2.Tasknum).ToList();
|
|
|
var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID)).ToList();
|
|
|
|
|
|
- taskList.ValidTaskCheck(devs.Count(), db);
|
|
|
+ taskList.ValidTaskCheck(enumerable.Count(), db);
|
|
|
|
|
|
var res = WMS.GetTunnelList(taskList.Select(v => v.WMSTASK.ToString()).ToList(), code);
|
|
|
if (string.IsNullOrEmpty(res.TunnelNum)) throw new WarnException($"WMS未返回巷道");
|
|
|
@@ -385,7 +376,7 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
var tunnels = Device.Where(v => tunnelNo.Contains(v.CODE)).ToList();
|
|
|
|
|
|
- List<TunnelInfo> tunnelInfos = new List<TunnelInfo>();
|
|
|
+ var tunnelInfos = new List<TunnelInfo>();
|
|
|
foreach (var item in tunnels)
|
|
|
{
|
|
|
//当前巷道的取货点
|
|
|
@@ -406,7 +397,7 @@ namespace WCS.Service.Works.Station
|
|
|
.Distinct()
|
|
|
.FirstOrDefault();//去一次重
|
|
|
if (rgvDeliveryPoint == null) continue;
|
|
|
- var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
|
|
|
+ var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).MinBy(p => p.CODE);
|
|
|
//只能有一组任务的下一个地址是交货点
|
|
|
if (db.Default.Set<WCS_TASK>().Any(v => v.ADDRNEXT == taskInStation.CODE)) continue;
|
|
|
|
|
|
@@ -414,7 +405,7 @@ namespace WCS.Service.Works.Station
|
|
|
var rgvList = Device.Where(v => v.Is(DF.涂布RGV)).Select(v => v.Create<RGVDevice>());
|
|
|
if (rgvList.Any(v => (!v.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲) || !v.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动))
|
|
|
&& v.Data2.TaskType_1 == WCS.Entity.Protocol.RGV.RGVTaskType.放货
|
|
|
- && v.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort())) continue;
|
|
|
+ && v.Data2.DestPosition_1 == taskInStation?.CODE.Replace("G", "").ToShort())) continue;
|
|
|
|
|
|
tunnelInfos.Add(new TunnelInfo
|
|
|
{
|
|
|
@@ -425,12 +416,11 @@ namespace WCS.Service.Works.Station
|
|
|
}
|
|
|
//筛选出优先级最高的可用巷道
|
|
|
var tunnelInfo = tunnelInfos.Where(v => { try { return v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程; } catch { return false; } })
|
|
|
- .Where(v => !db.Default.Set<WCS_TASK>().Any(p => p.Priority > 0 && p.DEVICE == v.SRM.Entity.CODE && p.STATUS < TaskStatus.堆垛机完成))
|
|
|
- .OrderBy(v => tunnelNo.IndexOf(v.Tunnel.CODE)).FirstOrDefault();
|
|
|
+ .Where(v => !db.Default.Set<WCS_TASK>().Any(p => p.Priority > 0 && p.DEVICE == v.SRM.Entity.CODE && p.STATUS < TaskStatus.堆垛机完成)).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
|
|
|
if (tunnelInfo == null) throw new WarnException("无可用巷道");
|
|
|
|
|
|
//开始变更任务信息
|
|
|
- foreach (var item in devs)
|
|
|
+ foreach (var item in enumerable)
|
|
|
{
|
|
|
var dev = item.Entity.Create<StationDevice>();
|
|
|
var task = taskList.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
|
|
|
@@ -441,8 +431,8 @@ namespace WCS.Service.Works.Station
|
|
|
task.ADDRNEXT = tunnelInfo.taskIN.CODE;
|
|
|
task.TaskGroupKey = res.WMSTaskGroupKey;
|
|
|
task.ADDRTO = task.DEVICE;
|
|
|
- var msg = $"下达从{obj.Entity.CODE}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
|
|
|
- msg += $"[{dev.Data.Tasknum}][{obj.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
|
|
|
+ var msg = $"下达从{stationDeviceGroup.Entity.CODE}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
|
|
|
+ msg += $"[{dev.Data.Tasknum}][{stationDeviceGroup.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
|
|
|
task.CreateStatusLog(db, msg, this.GetType());
|
|
|
finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));
|
|
|
}
|
|
|
@@ -458,7 +448,7 @@ namespace WCS.Service.Works.Station
|
|
|
if (task == null) continue;
|
|
|
|
|
|
finishTask.Station.Data.Tasknum = task.ID;
|
|
|
- finishTask.Station.Data.Goodsstart = obj.Entity.CODE.Replace("G", "").ToShort();
|
|
|
+ finishTask.Station.Data.Goodsstart = stationDeviceGroup.Entity.CODE.Replace("G", "").ToShort();
|
|
|
finishTask.Station.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();
|
|
|
finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
|
|
|
finishTask.Station.Data.CmdType = IstationCmdType.分配目标地址;
|
|
|
@@ -475,7 +465,7 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
protected override bool SelectDevice(WCS_DEVICE dev)
|
|
|
{
|
|
|
- return dev.CODE == "G2" || dev.CODE == "G3";
|
|
|
+ return dev.CODE is "G2" or "G3";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -487,26 +477,27 @@ namespace WCS.Service.Works.Station
|
|
|
{
|
|
|
protected override void Do(StationDeviceGroup obj)
|
|
|
{
|
|
|
- obj.EX(obj =>
|
|
|
+ obj.EX(stationDeviceGroup =>
|
|
|
{
|
|
|
- var code = obj.Entity.CODE;
|
|
|
+ var code = stationDeviceGroup.Entity.CODE;
|
|
|
|
|
|
//两个设备都必须满足的条件
|
|
|
- if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException("等待执行任务--凭证号不一致");
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new DoException("运行中");
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException("等待执行任务--凭证号不一致");
|
|
|
+ if (stationDeviceGroup.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new DoException("运行中");
|
|
|
//成功分配巷道的任务的任务
|
|
|
var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
|
|
|
//变更数据库信息
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var devs = obj.Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Request == IstationRequest.请求分配目标地址)
|
|
|
+ var devise = stationDeviceGroup.Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Request == IstationRequest.请求分配目标地址)
|
|
|
.Where(v => v.Data2.Tasknum > 10000);
|
|
|
- if (!devs.Any()) return; //无可执行任务
|
|
|
- var taskIds = devs.Select(dev => dev.Data2.Tasknum).ToList();
|
|
|
+ var enumerable = devise as Device<IStation520, IStation521, IStation523>[] ?? devise.ToArray();
|
|
|
+ if (!enumerable.Any()) return; //无可执行任务
|
|
|
+ var taskIds = enumerable.Select(dev => dev.Data2.Tasknum).ToList();
|
|
|
var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID)).ToList();
|
|
|
|
|
|
- taskList.ValidTaskCheck(devs.Count(), db);
|
|
|
+ taskList.ValidTaskCheck(enumerable.Count(), db);
|
|
|
|
|
|
var res = WMS.GetTunnelList(taskList.Select(v => v.WMSTASK.ToString()).ToList(), code);
|
|
|
if (string.IsNullOrEmpty(res.TunnelNum)) throw new WarnException($"WMS未返回巷道");
|
|
|
@@ -514,7 +505,7 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
var tunnels = Device.Where(v => tunnelNo.Contains(v.CODE)).ToList();
|
|
|
|
|
|
- List<TunnelInfo> tunnelInfos = new List<TunnelInfo>();
|
|
|
+ var tunnelInfos = new List<TunnelInfo>();
|
|
|
foreach (var item in tunnels)
|
|
|
{
|
|
|
//当前巷道的取货点
|
|
|
@@ -524,11 +515,11 @@ namespace WCS.Service.Works.Station
|
|
|
.ToList();
|
|
|
//下一个目标地址包含取货点的设备,此时获得的数据是旋转台
|
|
|
var turntable = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && allIn.Contains(p.NEXT.CODE)))
|
|
|
- .Where(v => obj.Items.Any(p => p.Entity == v))// 筛选出包含在当前设备组的设备
|
|
|
+ .Where(v => stationDeviceGroup.Items.Any(p => p.Entity == v))// 筛选出包含在当前设备组的设备
|
|
|
.Distinct()
|
|
|
.FirstOrDefault();//去一次重
|
|
|
if (turntable == null) continue;
|
|
|
- var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == turntable)).OrderBy(p => p.CODE).FirstOrDefault();
|
|
|
+ var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == turntable)).MinBy(p => p.CODE);
|
|
|
|
|
|
tunnelInfos.Add(new TunnelInfo
|
|
|
{
|
|
|
@@ -538,12 +529,11 @@ namespace WCS.Service.Works.Station
|
|
|
});
|
|
|
}
|
|
|
//筛选出优先级最高的可用巷道
|
|
|
- var tunnelInfo = tunnelInfos.Where(v => { try { return v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程 && v.SRM.Data2.SRMStatus == SCRunStatus.空闲; } catch { return false; } })
|
|
|
- .OrderBy(v => tunnelNo.IndexOf(v.Tunnel.CODE)).FirstOrDefault();
|
|
|
+ var tunnelInfo = tunnelInfos.Where(v => { try { return v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程 && v.SRM.Data2.SRMStatus == SCRunStatus.空闲; } catch { return false; } }).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
|
|
|
if (tunnelInfo == null) throw new WarnException("无可用巷道");
|
|
|
|
|
|
//开始变更任务信息
|
|
|
- foreach (var item in devs)
|
|
|
+ foreach (var item in enumerable)
|
|
|
{
|
|
|
var dev = item.Entity.Create<StationDevice>();
|
|
|
var task = taskList.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
|
|
|
@@ -554,8 +544,8 @@ namespace WCS.Service.Works.Station
|
|
|
task.ADDRNEXT = dev.Entity.GetPath(task.DEVICE).CODE;
|
|
|
task.TaskGroupKey = res.WMSTaskGroupKey;
|
|
|
task.ADDRTO = task.DEVICE;
|
|
|
- var msg = $"下达从{obj.Entity.CODE}移动至{task.ADDRNEXT}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
|
|
|
- msg += $"[{dev.Data.Tasknum}][{obj.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
|
|
|
+ var msg = $"下达从{stationDeviceGroup.Entity.CODE}移动至{task.ADDRNEXT}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
|
|
|
+ msg += $"[{dev.Data.Tasknum}][{stationDeviceGroup.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
|
|
|
task.CreateStatusLog(db, msg, this.GetType());
|
|
|
finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));
|
|
|
}
|
|
|
@@ -571,7 +561,7 @@ namespace WCS.Service.Works.Station
|
|
|
if (task == null) continue;
|
|
|
|
|
|
finishTask.Station.Data.Tasknum = task.ID;
|
|
|
- finishTask.Station.Data.Goodsstart = obj.Entity.CODE.Replace("G", "").ToShort();
|
|
|
+ finishTask.Station.Data.Goodsstart = stationDeviceGroup.Entity.CODE.Replace("G", "").ToShort();
|
|
|
finishTask.Station.Data.Goodsend = finishTask.Station.Entity.GetPath(task.DEVICE).CODE.ToShort();
|
|
|
finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
|
|
|
finishTask.Station.Data.CmdType = IstationCmdType.分配目标地址;
|
|
|
@@ -583,14 +573,14 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
protected override bool SelectDevice(WCS_DEVICE dev)
|
|
|
{
|
|
|
- return devCodes.Contains(dev.CODE);
|
|
|
+ return _devCodes.Contains(dev.CODE);
|
|
|
}
|
|
|
|
|
|
- private List<string> devCodes = new List<string>() {
|
|
|
+ private readonly List<string> _devCodes = new() {
|
|
|
"G1404",
|
|
|
"G1413",
|
|
|
"G1420",
|
|
|
"G1429",
|
|
|
};
|
|
|
}
|
|
|
-}
|
|
|
+}
|