|
|
@@ -158,7 +158,9 @@ namespace WCS.Service.Works.SRM
|
|
|
else if (LastIsOut)
|
|
|
{
|
|
|
#region 入库
|
|
|
-
|
|
|
+ var floor = obj.Entity.Get<int>("LastInFloor");
|
|
|
+ floor = floor % 2 + 1;
|
|
|
+ obj.Entity.Set("LastInFloor", floor);
|
|
|
if (enterPriority != null && outPriority != null && outPriority.Priority > enterPriority.Priority) return;
|
|
|
|
|
|
var arrIn = obj.GetPickPoint()
|
|
|
@@ -169,8 +171,8 @@ namespace WCS.Service.Works.SRM
|
|
|
|
|
|
//入库口设备信息 找一个有任务有光电且不在运行状态位的取货点 如果找不到代表任务还在输送途中
|
|
|
var station = arrIn.OrderBy(v => v.Data2.Tasknum > 0 && v.Data2.Status.HasFlag(IstationStatus.光电状态) && !v.Data3.Status.HasFlag(StationStatus.运行状态位) ? 0 : 1)
|
|
|
- .ThenBy(v => v.UpdateTime)
|
|
|
- .FirstOrDefault() ?? throw new WarnException($"[{deviceCode}]等待入库任务输送到位");
|
|
|
+ .ThenBy(v => v.UpdateTime)
|
|
|
+ .FirstOrDefault() ?? throw new WarnException($"[{deviceCode}]等待入库任务输送到位");
|
|
|
|
|
|
//根据上述筛选条件筛选出来的入库任务 找到对应的设备组
|
|
|
var item = Device.Where(v => v.DEVICEGROUP.Any(p => p.MEMBER.CODE == station.Entity.CODE)).Single();
|
|
|
@@ -255,9 +257,9 @@ namespace WCS.Service.Works.SRM
|
|
|
{
|
|
|
#region 出库
|
|
|
|
|
|
- var floor = obj.Entity.Get<int>("LastFloor");
|
|
|
+ var floor = obj.Entity.Get<int>("LastOutFloor");
|
|
|
floor = floor % 2 + 1;
|
|
|
- obj.Entity.Set("LastFloor", floor);
|
|
|
+ obj.Entity.Set("LastOutFloor", floor);
|
|
|
if (enterPriority != null && outPriority != null && enterPriority.Priority > outPriority.Priority) return;
|
|
|
|
|
|
//获取当前堆垛机所有的放货点
|
