|
@@ -286,11 +286,11 @@ namespace WCS.Service.Works.Station
|
|
}
|
|
}
|
|
|
|
|
|
//先判断1340是否可以放货
|
|
//先判断1340是否可以放货
|
|
- foreach (var dev in stationDeviceGroup.Items)
|
|
|
|
|
|
+ foreach (var dev in devise)
|
|
{
|
|
{
|
|
- var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == dev.Data2.Tasknum) ?? throw new WarnException($"WCS无[{dev.Data2.Tasknum}]任务信息");
|
|
|
|
|
|
+ var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == dev.Station.Data2.Tasknum) ?? throw new WarnException($"WCS无[{dev.Station.Data2.Tasknum}]任务信息");
|
|
var addNext = "";
|
|
var addNext = "";
|
|
- switch (dev.Entity.CODE)
|
|
|
|
|
|
+ switch (dev.Station.Entity.CODE)
|
|
{
|
|
{
|
|
case "1337":
|
|
case "1337":
|
|
{
|
|
{
|
|
@@ -309,8 +309,8 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
task.ADDRNEXT = addNext;
|
|
task.ADDRNEXT = addNext;
|
|
task.CreateStatusLog(db, $"涂布出库分配AGV取货点{addNext}", this.GetType());
|
|
task.CreateStatusLog(db, $"涂布出库分配AGV取货点{addNext}", this.GetType());
|
|
- finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Entity.Create<StationDevice>()));
|
|
|
|
- stationList.Add(new FinishTaskList<WCS_TASK>(task, dev.Entity.Create<StationDevice>()));
|
|
|
|
|
|
+ finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station.Entity.Create<StationDevice>()));
|
|
|
|
+ stationList.Add(new FinishTaskList<WCS_TASK>(task, dev.Station.Entity.Create<StationDevice>()));
|
|
}
|
|
}
|
|
|
|
|
|
#region 校验两个地址是否一致
|
|
#region 校验两个地址是否一致
|