|
@@ -57,6 +57,21 @@ namespace WCS.Service.Works.Station
|
|
|
agvtask.UpdateTime = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
}
|
|
|
+ else if (agvtask.Status == AGVTaskStatus.确认)
|
|
|
+ {
|
|
|
+ if (agvtask.Station != obj.Entity.CODE) continue;
|
|
|
+ if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位))) continue;
|
|
|
+ if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.自动))) continue;
|
|
|
+ if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.光电状态))) continue;
|
|
|
+ if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) continue;
|
|
|
+ if (obj.Items.Any(v => v.Data2.Tasknum > 10000)) continue;
|
|
|
+
|
|
|
+ //暂时管控同一时间被执行的任务数为1
|
|
|
+ if (db.Default.Set<WCS_AGVTask>().Any(v => v.Status == AGVTaskStatus.执行 && v.Station == obj.Entity.CODE)) continue;
|
|
|
+ agvtask.Status = AGVTaskStatus.执行;
|
|
|
+ agvtask.UpdateTime = DateTime.Now;
|
|
|
+ db.Default.SaveChanges();
|
|
|
+ }
|
|
|
else if (agvtask.Status < agvtask.AGVStatus)
|
|
|
{
|
|
|
if (agvtask.AGVStatus == AGVTaskStatus.请求_允许)
|
|
@@ -254,7 +269,7 @@ namespace WCS.Service.Works.Station
|
|
|
|
|
|
task.DEVICE = tunnelInfo.SRM.Entity.CODE;
|
|
|
task.TUNNEL = tunnelInfo.Tunnel.CODE;
|
|
|
- task.ADDRNEXT = dev.Data.Goodsend.ToString();
|
|
|
+ task.ADDRNEXT = tunnelInfo.taskIN.CODE;
|
|
|
task.TaskGroupKey = res.WMSTaskGroupKey;
|
|
|
task.ADDRTO = task.DEVICE;
|
|
|
db.Default.SaveChanges();
|