|
|
@@ -17,90 +17,150 @@ namespace WCS.Service.Works.Station
|
|
|
/// 涂布堆垛机放货分配目标地址
|
|
|
/// </summary>
|
|
|
[WorkTitle(typeof(CoatingHandler), "涂布堆垛机放货分配目标地址")]
|
|
|
- public class 涂布堆垛机放货分配目标地址 : DeviceWork<StationDevice>
|
|
|
+ public class 涂布堆垛机放货分配目标地址 : Work<StationDeviceGroup>
|
|
|
{
|
|
|
- protected override void Do(StationDevice obj)
|
|
|
+ protected override void Do(StationDeviceGroup obj)
|
|
|
{
|
|
|
obj.EX(obj =>
|
|
|
{
|
|
|
- //正在运行
|
|
|
- if (obj.Data3.Status.HasFlag(StationStatus.运行状态位)) throw new DoException("运行中");
|
|
|
- //上一次的任务还未执行
|
|
|
- if (obj.Data.VoucherNo != obj.Data2.VoucherNo)
|
|
|
- throw new WarnException($"等待任务[{obj.Data2.Tasknum}]执行");
|
|
|
- //没有光电
|
|
|
- if (!obj.Data2.Status.HasFlag(IstationStatus.光电状态)) throw new DoException("无光电"); ;
|
|
|
- //没有请求
|
|
|
- if (obj.Data2.Request != IstationRequest.堆垛机放货完成请求目标地址)
|
|
|
- throw new WarnException($"有光电无堆垛机放货完成请求");
|
|
|
- //找到当前站台为当前设备且任务为堆垛机完成的任务
|
|
|
+ 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("运行中");
|
|
|
+ //成功处理的任务
|
|
|
+ var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
+
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.TYPE == TaskType.出库 && v.SRMSTATION == obj.Entity.CODE && v.STATUS == TaskStatus.堆垛机完成);
|
|
|
- var tasks = db.Default.Set<WCS_TASK>().Where(v => v.TaskGroupKey == task.TaskGroupKey);
|
|
|
- if (tasks.Any(v => v.STATUS != TaskStatus.堆垛机完成 && v.STATUS != TaskStatus.执行中))
|
|
|
- throw new WarnException("任务异常，同组任务状态不为堆垛机完成或执行中");
|
|
|
- if (task == null) throw new WarnException("WCS无该任务信息");
|
|
|
- if (task.SRMSTATION != obj.Entity.CODE && task.STATUS != TaskStatus.堆垛机完成) throw new WarnException("任务状态不是堆垛机完成");
|
|
|
- task.STATUS = TaskStatus.执行中;
|
|
|
+ var devs = new List<FinishTaskList<string>>();
|
|
|
+ foreach (var dev in obj.Items)
|
|
|
+ {
|
|
|
+ //没有请求
|
|
|
+ if (dev.Data2.Request != IstationRequest.堆垛机放货完成请求目标地址)
|
|
|
+ {
|
|
|
+ InfoLog.INFO_INFO($"{obj.Entity.CODE}无请求-堆垛机放货完成请求--4");
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ //没有光电
|
|
|
+ if (!dev.Data2.Status.HasFlag(IstationStatus.光电状态))
|
|
|
+ {
|
|
|
+ InfoLog.INFO_WarnDb($"{dev.Entity.CODE}有请求无光电", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ continue;
|
|
|
+ };
|
|
|
+ devs.Add(new FinishTaskList<string>(dev.Entity.CODE, dev.Entity.Create<StationDevice>()));
|
|
|
+ }
|
|
|
+
|
|
|
+ foreach (var dev in devs)
|
|
|
+ {
|
|
|
+ var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.TYPE == TaskType.出库 && v.SRMSTATION == dev.FinishCode && v.STATUS == TaskStatus.堆垛机完成) ?? throw new WarnException("无任务");
|
|
|
+ var tasks = db.Default.Set<WCS_TASK>().Where(v => v.TaskGroupKey == task.TaskGroupKey);
|
|
|
+ if (tasks.Any(v => v.STATUS != TaskStatus.堆垛机完成 && v.STATUS != TaskStatus.执行中)) throw new WarnException("任务异常，同组任务状态不为堆垛机完成或执行中");
|
|
|
+
|
|
|
+ task.STATUS = TaskStatus.执行中;
|
|
|
+ task.CreateStatusLog(db, $"状态由[{TaskStatus.堆垛机完成}]变更为[{task.STATUS}]-{obj.Entity.Code}", this.GetType());
|
|
|
+ finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
|
|
|
+ }
|
|
|
db.Default.SaveChanges();
|
|
|
- task.CreateStatusLog(db, $"状态由[{TaskStatus.堆垛机完成}]变更为[{task.STATUS}]-{obj.Entity.Code}", this.GetType());
|
|
|
- //开始写入目标地址
|
|
|
- obj.Data.Tasknum = task.ID;
|
|
|
- obj.Data.Goodsstart = obj.Entity.CODE.ToShort();
|
|
|
- obj.Data.Goodsnum = (short)tasks.Count();
|
|
|
- obj.Data.Goodsend = task.ADDRNEXT.ToShort();
|
|
|
- obj.Data.CmdType = IstationCmdType.堆垛机放货完成请求目标地址;
|
|
|
- obj.Data.VoucherNo++;
|
|
|
+ });
|
|
|
+
|
|
|
+ DB.Do(db =>
|
|
|
+ {
|
|
|
+ foreach (var finish in finishTaskList)
|
|
|
+ {
|
|
|
+ var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finish.FinishCode);
|
|
|
+ if (task == null) continue;
|
|
|
+ finish.Station.Data.Tasknum = task.ID;
|
|
|
+ finish.Station.Data.Goodsstart = obj.Entity.CODE.ToShort();
|
|
|
+ finish.Station.Data.Goodsend = task.ADDRNEXT.ToShort();
|
|
|
+ finish.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
|
|
|
+ finish.Station.Data.CmdType = IstationCmdType.堆垛机放货完成请求目标地址;
|
|
|
+ finish.Station.Data.VoucherNo++;
|
|
|
+ }
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
|
|
|
protected override bool SelectDevice(WCS_DEVICE dev)
|
|
|
{
|
|
|
- return dev.Is(DF.SRM涂布放货);
|
|
|
+ return devCodes.Contains(dev.CODE);
|
|
|
}
|
|
|
+
|
|
|
+ private List<string> devCodes = new List<string>() { "G1283", "G1290", "G1299", "G1301", "G1308", "G1310" };
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
/// 涂布出库分配出库口
|
|
|
/// </summary>
|
|
|
[WorkTitle(typeof(CoatingHandler), "涂布出库分配出库口")]
|
|
|
- public class 涂布出库分配出库口 : DeviceWork<StationDevice>
|
|
|
+ public class 涂布出库分配出库口 : Work<StationDeviceGroup>
|
|
|
{
|
|
|
- protected override void Do(StationDevice obj)
|
|
|
+ protected override void Do(StationDeviceGroup obj)
|
|
|
{
|
|
|
obj.EX(obj =>
|
|
|
{
|
|
|
- if (!obj.Data2.Status.HasFlag(IstationStatus.光电状态)) throw new DoException("无光电");
|
|
|
- if (obj.Data3.Status.HasFlag(StationStatus.运行状态位)) throw new DoException("设备运行中");
|
|
|
- if (obj.Data.VoucherNo != obj.Data2.VoucherNo)
|
|
|
- throw new WarnException($"等待任务[{obj.Data2.Tasknum}]执行--凭证号不一致[{obj.Data.VoucherNo}][{obj.Data2.VoucherNo}]");
|
|
|
- if (obj.Data2.Tasknum < 10000) throw new DoException("无任务");
|
|
|
- if (obj.Data2.Request != IstationRequest.请求分配目标地址) throw new WarnException("有任务无请求");
|
|
|
+ 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("运行中");
|
|
|
+
|
|
|
+ var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var task = db.Default.Set<WCS_TASK>().Find(obj.Data2.Tasknum);
|
|
|
- if (task == null) throw new WarnException("WCS无该任务信息");
|
|
|
- task.ADDRNEXT = "G1";
|
|
|
+ var devs = new List<FinishTaskList<string>>();
|
|
|
+ foreach (var dev in obj.Items)
|
|
|
+ {
|
|
|
+ if (dev.Data2.Request != IstationRequest.请求分配目标地址)
|
|
|
+ {
|
|
|
+ InfoLog.INFO_INFO($"{obj.Entity.CODE}无请求-分配目标地址--2");
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (!dev.Data2.Status.HasFlag(IstationStatus.光电状态))
|
|
|
+ {
|
|
|
+ InfoLog.INFO_WarnDb($"{dev.Entity.CODE}有请求无光电", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (dev.Data2.Tasknum < 10000)
|
|
|
+ {
|
|
|
+ InfoLog.INFO_WarnDb($"{dev.Entity.CODE}有请求有光电无任务", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ devs.Add(new FinishTaskList<string>(dev.Entity.CODE, dev.Entity.Create<StationDevice>()));
|
|
|
+ }
|
|
|
+
|
|
|
+ foreach (var dev in devs)
|
|
|
+ {
|
|
|
+ var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == dev.Station.Data2.Tasknum) ?? throw new WarnException("无任务");
|
|
|
+ var tasks = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == task.TaskGroupKey);
|
|
|
+ if (tasks != devs.Count) throw new WarnException($"可执行任务数{devs.Count},实际任务数{tasks}");
|
|
|
+
|
|
|
+ task.ADDRNEXT = "G1";
|
|
|
+ task.CreateStatusLog(db, $"分配目标地址{task.ADDRNEXT}", this.GetType());
|
|
|
+ finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
|
|
|
+ }
|
|
|
db.Default.SaveChanges();
|
|
|
- task.CreateStatusLog(db, $"分配目标地址{task.ADDRNEXT}", this.GetType());
|
|
|
- //开始写入目标地址
|
|
|
- obj.Data.Tasknum = task.ID;
|
|
|
- obj.Data.Goodsstart = obj.Entity.CODE.ToShort();
|
|
|
- obj.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();
|
|
|
- obj.Data.CmdType = IstationCmdType.堆垛机放货完成请求目标地址;
|
|
|
- obj.Data.GoodsSize = (short)task.Length;
|
|
|
- obj.Data.VoucherNo++;
|
|
|
+ });
|
|
|
+
|
|
|
+ DB.Do(db =>
|
|
|
+ {
|
|
|
+ foreach (var finish in finishTaskList)
|
|
|
+ {
|
|
|
+ var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finish.FinishCode);
|
|
|
+ if (task == null) continue;
|
|
|
+ finish.Station.Data.Tasknum = task.ID;
|
|
|
+ finish.Station.Data.Goodsstart = obj.Entity.CODE.ToShort();
|
|
|
+ finish.Station.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();
|
|
|
+ finish.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
|
|
|
+ finish.Station.Data.GoodsSize = task.Length.ToShort();
|
|
|
+ finish.Station.Data.CmdType = IstationCmdType.分配目标地址;
|
|
|
+ finish.Station.Data.VoucherNo++;
|
|
|
+ }
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
|
|
|
protected override bool SelectDevice(WCS_DEVICE dev)
|
|
|
{
|
|
|
- return dev.Is(DF.涂布出库RGV取货站台);
|
|
|
+ return devCodes.Contains(dev.CODE);
|
|
|
}
|
|
|
+
|
|
|
+ private List<string> devCodes = new List<string>() { "G5", "G7", "G9", "G11" };
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -115,11 +175,7 @@ namespace WCS.Service.Works.Station
|
|
|
{
|
|
|
//必须满足的条件
|
|
|
if (obj.Items.Any(v => v.Data2.VoucherNo != v.Data.VoucherNo)) throw new WarnException("凭证号不一致");
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位)))
|
|
|
- {
|
|
|
- InfoLog.INFO_INFO("设备运行中");
|
|
|
- return;
|
|
|
- }
|
|
|
+ if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new DoException("设备运行中");
|
|
|
|
|
|
//成功处理的任务
|
|
|
var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
@@ -143,24 +199,20 @@ namespace WCS.Service.Works.Station
|
|
|
}
|
|
|
if (dev.Data2.Request != IstationRequest.请求分配目标地址)
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb($"{dev.Entity.CODE}--有光电没有分配目标地址请求--2", dev.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb($"{dev.Entity.CODE}--有光电没有分配目标地址请求--2", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
};
|
|
|
if (dev.Data2.Tasknum < 10000)
|
|
|
{
|
|
|
- InfoLog.INFO_WarnDb($"{dev.Entity.CODE}--有光电有请求没有任务号", dev.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ InfoLog.INFO_WarnDb($"{dev.Entity.CODE}--有光电有请求没有任务号", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- devs.Add(new FinishTaskList<string>()
|
|
|
- {
|
|
|
- FinishCode = dev.Entity.CODE,
|
|
|
- Station = dev.Entity.Create<StationDevice>()
|
|
|
- });
|
|
|
+ devs.Add(new FinishTaskList<string>(dev.Entity.CODE, dev.Entity.Create<StationDevice>()));
|
|
|
}
|
|
|
|
|
|
if (!devs.Any()) return; //无可执行任务
|
|
|
- //验证可执行任务数与有效任务数是否一致
|
|
|
+ //验证可执行任务数与有效任务数是否一致
|
|
|
var taskIds = devs.Select(dev => dev.Station.Data2.Tasknum).ToList();
|
|
|
var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID)).ToList();
|
|
|
|
|
|
@@ -191,11 +243,7 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
task.ADDRNEXT = addNext;
|
|
|
task.CreateStatusLog(db, $"状态由[{WCS.Entity.TaskStatus.堆垛机完成}]变更为[{task.STATUS}]-{obj.Entity.Code}", this.GetType());
|
|
|
- finishTaskList.Add(new FinishTaskList<int>()
|
|
|
- {
|
|
|
- FinishCode = task.ID,
|
|
|
- Station = dev.Station
|
|
|
- });
|
|
|
+ finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
|
|
|
}
|
|
|
db.Default.SaveChanges();
|
|
|
});
|
|
|
@@ -228,35 +276,68 @@ namespace WCS.Service.Works.Station
|
|
|
/// 涂布出库返回任务长度
|
|
|
/// </summary>
|
|
|
[WorkTitle(typeof(CoatingHandler), "涂布出库返回任务长度")]
|
|
|
- public class 涂布出库返回任务长度 : DeviceWork<StationDevice>
|
|
|
+ public class 涂布出库返回任务长度 : Work<StationDeviceGroup>
|
|
|
{
|
|
|
- protected override void Do(StationDevice obj)
|
|
|
+ protected override void Do(StationDeviceGroup obj)
|
|
|
{
|
|
|
obj.EX(obj =>
|
|
|
{
|
|
|
- if (!obj.Data2.Status.HasFlag(IstationStatus.光电状态)) throw new DoException("无光电");
|
|
|
- if (obj.Data3.Status.HasFlag(StationStatus.运行状态位)) throw new DoException("设备运行中");
|
|
|
- if (obj.Data.VoucherNo != obj.Data2.VoucherNo)
|
|
|
- throw new WarnException($"等待任务[{obj.Data2.Tasknum}]执行--凭证号不一致[{obj.Data.VoucherNo}][{obj.Data2.VoucherNo}]");
|
|
|
- if (obj.Data2.Tasknum < 10000) throw new DoException("无任务");
|
|
|
- if (obj.Data2.Request != IstationRequest.请求分配目标地址) throw new WarnException("有任务无请求");
|
|
|
+ //必须满足的条件
|
|
|
+ if (obj.Items.Any(v => v.Data2.VoucherNo != v.Data.VoucherNo)) throw new WarnException("凭证号不一致");
|
|
|
+ if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new DoException("设备运行中");
|
|
|
+
|
|
|
+ //成功处理的任务
|
|
|
+ var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var task = db.Default.Set<WCS_TASK>().Find(obj.Data2.Tasknum);
|
|
|
- if (task == null) throw new WarnException("WCS无该任务信息");
|
|
|
+ var devs = new List<FinishTaskList<string>>();
|
|
|
|
|
|
- //开始写入目标地址
|
|
|
- obj.Data.CmdType = IstationCmdType.分配目标地址;
|
|
|
- obj.Data.GoodsSize = (short)task.Length;
|
|
|
- obj.Data.VoucherNo++;
|
|
|
+ //获取需要执行的设备信息
|
|
|
+ foreach (var dev in obj.Items)
|
|
|
+ {
|
|
|
+ if (dev.Data2.Request != IstationRequest.请求分配目标地址)
|
|
|
+ {
|
|
|
+ InfoLog.INFO_INFO($"{obj.Entity.CODE}无请求-分配目标地址--2");
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (!dev.Data2.Status.HasFlag(IstationStatus.光电状态))
|
|
|
+ {
|
|
|
+ InfoLog.INFO_WarnDb($"{dev.Entity.CODE}有请求无光电", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (dev.Data2.Tasknum < 10000)
|
|
|
+ {
|
|
|
+ InfoLog.INFO_WarnDb($"{dev.Entity.CODE}有请求有光电无任务", obj.Entity.CODE, WCS_EXCEPTIONTYPE.设备异常);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ devs.Add(new FinishTaskList<string>(dev.Entity.CODE, dev.Entity.Create<StationDevice>()));
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!devs.Any()) return;//无可执行任务
|
|
|
+ //验证可执行任务数与有效任务数是否一致
|
|
|
+ var taskIds = devs.Select(dev => dev.Station.Data2.Tasknum).ToList();
|
|
|
+ var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID)).ToList();
|
|
|
+ var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == taskList.FirstOrDefault().TaskGroupKey && v.TYPE == TaskType.出库);
|
|
|
+
|
|
|
+ if (devs.Count != taskCount) throw new WarnException($"可执行数{devs.Count},任务组任务数{taskCount},数量不匹配");
|
|
|
+
|
|
|
+ //开始处理需要分配目标地址的设备
|
|
|
+ foreach (var dev in devs)
|
|
|
+ {
|
|
|
+ var task = db.Default.Set<WCS_TASK>().Find(dev.Station.Data2.Tasknum);
|
|
|
+ if (task == null) throw new WarnException("WCS无该任务信息");
|
|
|
+
|
|
|
+ dev.Station.Data.GoodsSize = task.Length.ToShort();
|
|
|
+ dev.Station.Data.VoucherNo++;
|
|
|
+ }
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
|
|
|
protected override bool SelectDevice(WCS_DEVICE dev)
|
|
|
{
|
|
|
- return dev.CODE == "1334" || dev.CODE == "1335";
|
|
|
+ return dev.CODE == "G1334";
|
|
|
}
|
|
|
}
|
|
|
|
