|
|
@@ -296,9 +296,19 @@ namespace WCS.WorkEngineering.Systems
|
|
|
}).Where(x => x.CacheLineId != 0).OrderBy(x => x.RowNo).Take(2).ToList();
|
|
|
|
|
|
//两个任务取货线体号相同时,只执行一个任务
|
|
|
- if (rowList.Count == 2 && rowList[0].LocationNo == rowList[1].LocationNo) rowList = rowList!.Take(1).ToList();
|
|
|
+ if (rowList.Count == 2 && rowList[0].LocationNo == rowList[1].LocationNo)
|
|
|
+ {
|
|
|
+ World.Log($"单抓拆分:取货线体号相同{rowList[0].LocationNo}-{rowList[1].LocationNo}");
|
|
|
+ rowList = rowList!.Take(1).ToList();
|
|
|
+ }
|
|
|
+
|
|
|
//两个行号,差值大于一时,只执行一个任务
|
|
|
- if (rowList.Count == 2 && rowList[0].RowNo + 1 != rowList[1].RowNo) rowList = rowList!.Take(1).ToList();
|
|
|
+ if (rowList.Count == 2 && rowList[0].RowNo + 1 != rowList[1].RowNo)
|
|
|
+ {
|
|
|
+ World.Log($"单抓拆分:行号拆分{rowList[0].RowNo}-{rowList[1].RowNo}");
|
|
|
+ rowList = rowList!.Take(1).ToList();
|
|
|
+ }
|
|
|
+
|
|
|
//如果取货行号是在18取货区域,只执行一个任务
|
|
|
if (rowList.Count == 2)
|
|
|
{
|
|
|
@@ -306,6 +316,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
var devCodes = Device.All.Where(x => x.HasFlag(DeviceFlags.桁架18取货点)).Select(x => x.Code.ToShort());
|
|
|
if (devCodes.Any(x => locationNos.Contains(x)))
|
|
|
{
|
|
|
+ World.Log($"单抓拆分:货物为18");
|
|
|
rowList = rowList!.Take(1).ToList();
|
|
|
}
|
|
|
}
|