|
@@ -67,18 +67,19 @@ namespace WCS.Service.Works.Station
|
|
|
//}
|
|
|
|
|
|
//agvtask.Station = obj.Entity.CODE;
|
|
|
- agvtask.Status = AGVTaskStatus.确认;
|
|
|
+ agvtask.Status = AGVTaskStatus.执行;
|
|
|
agvtask.UpdateTime = DateTime.Now;
|
|
|
}
|
|
|
- else if (agvtask.Status == AGVTaskStatus.确认 && agvtask.Status == agvtask.AGVStatus)
|
|
|
+ else if (agvtask.Status == AGVTaskStatus.执行 && agvtask.AGVStatus== 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.完成);
|
|
|
- if (qty.Count(v => v.Station == obj.Entity.CODE) > qty.Count(v => v.Station != obj.Entity.CODE))
|
|
|
+ if (qty.Count(v => v.Station == obj.Entity.CODE) > qty.Count(v => v.Station != obj.Entity.CODE && !string.IsNullOrEmpty(v.Station)))
|
|
|
{
|
|
|
InfoLog.INFO_INFO($"{station}触发均分");
|
|
|
continue;
|