|
@@ -182,17 +182,10 @@ namespace WCS.WorkEngineering.Systems
|
|
|
var taskList = new List<Tuple<WCS_TaskInfo, Device<IStation523, IStation524>>>();
|
|
|
SqlSugarHelper.Do(db =>
|
|
|
{
|
|
|
- ////跟据设备组中第一个设备任务号最小的一个先执行
|
|
|
- //var devGroup = arrIn.MinBy(x => x.Item2.MinBy(o => o.Data2.TaskNumber).Data2.TaskNumber).Item2
|
|
|
- // .Where(x => x.Data2.TaskNumber > 0 && x.Data.Status.HasFlag(StationStatus.PH_Status))
|
|
|
- // .OrderByDescending(x => x.Entity.Code.ToShort())
|
|
|
- // .Take(2);
|
|
|
-
|
|
|
//跟据设备组中第一个设备任务号最小的一个先执行
|
|
|
var devGroup = arrIn.MinBy(x => x.Item1.Data2.TaskNumber).Item2
|
|
|
.Where(x => x.Data2.TaskNumber > 0 && x.Data.Status.HasFlag(StationStatus.PH_Status));
|
|
|
- //.OrderByDescending(x => x.Entity.Code.ToShort())
|
|
|
- //.Take(2);
|
|
|
+
|
|
|
if (!devGroup.Any())
|
|
|
{
|
|
|
obj.Entity.SetFlag("InQuantity", 4); //在无有效取货位的情况下,只检查一次,下次直接查询是否有出库任务,避免无效检查周期的产生
|
|
@@ -203,19 +196,8 @@ namespace WCS.WorkEngineering.Systems
|
|
|
{
|
|
|
var task = db.Default.Queryable<WCS_TaskInfo>().First(v => v.Type == TaskType.SetPlate && v.Status == Entity.TaskStatus.FinishOfShunt && dev.Data2.TaskNumber == v.ID);
|
|
|
if (task == null) continue;
|
|
|
- //var res = WmsApi.RingApplyStockInLoc(task.ID, task.Device, dev.Entity.Code, task.GoodsType);
|
|
|
- //if (res.ResCode != ResponseStatusCodeEnum.Sucess)
|
|
|
- //{
|
|
|
- // World.Log(res.ResMsg);
|
|
|
- // obj.Entity.SetFlag("InQuantity", 4); //在获取货物异常的情况下,只检查一次,下次直接查询是否有出库任务,避免无效检查周期的产生
|
|
|
- // return;
|
|
|
- //}
|
|
|
+
|
|
|
task.Status = Entity.TaskStatus.StackerExecution;
|
|
|
- //task.AddrTo = res.ResData.CellNo;
|
|
|
- //task.Line = res.ResData.Row;
|
|
|
- //task.Col = res.ResData.Colomn;
|
|
|
- //task.Layer = res.ResData.Layer;
|
|
|
- //task.Depth = res.ResData.Row;
|
|
|
task.LastInteractionPoint = dev.Entity.Code;
|
|
|
task.SrmStation = dev.Entity.Code;
|
|
|
task.Device = obj.Entity.Code;
|