|
|
@@ -57,7 +57,7 @@ namespace WCS.Service.Works.Station
|
|
|
agvtask.UpdateTime = DateTime.Now;
|
|
|
db.Default.SaveChanges();
|
|
|
}
|
|
|
- else if (agvtask.Status == AGVTaskStatus.确认)
|
|
|
+ else if (agvtask.Status == AGVTaskStatus.确认 && agvtask.Status > agvtask.AGVStatus)
|
|
|
{
|
|
|
if (agvtask.Station != obj.Entity.CODE) continue;
|
|
|
if (obj.Items.Any(v => !v.Data3.Status.HasFlag(StationStatus.高位))) continue;
|
|
|
@@ -153,7 +153,7 @@ namespace WCS.Service.Works.Station
|
|
|
var station = dev.Entity.CODE;
|
|
|
DB.Do(db =>
|
|
|
{
|
|
|
- var agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库 && v.Status == AGVTaskStatus.完成).Where(v => v.Station == station).FirstOrDefault();
|
|
|
+ var agvTask = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库 && v.Status == AGVTaskStatus.完成).Where(v => v.Station == station).FirstOrDefault() ?? throw new WarnException("无完成AGV任务");
|
|
|
|
|
|
agvTask.Status = AGVTaskStatus.完成扫码;
|
|
|
agvTask.UpdateTime = DateTime.Now;
|
|
|
@@ -250,6 +250,11 @@ namespace WCS.Service.Works.Station
|
|
|
if (rgvDeliveryPoint == null) continue;
|
|
|
var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
|
|
|
|
|
|
+ //var rgvlIST = Device.Find(RGV8).Create<RGVDevice>();
|
|
|
+ //if (!rgv8.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲)
|
|
|
+ // && !rgv8.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动)
|
|
|
+ // && rgv8.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort()) continue;
|
|
|
+
|
|
|
tunnelInfos.Add(new TunnelInfo
|
|
|
{
|
|
|
Tunnel = item,
|
