|
@@ -353,8 +353,8 @@ namespace WCS.Service.Works.RGV
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- bool NeedToMove = obj.RGVList.Any(v => v.Data2.TaskType_1 == RGVTaskType.放货 && v.Position > 1777767 && v.Position < 2714350);
|
|
|
- if(pickStation.Entity.CODE == "G23" && NeedToMove)
|
|
|
+ bool needToMove = obj.RGVList.Any(v => v.Data2.TaskType_1 == RGVTaskType.放货 && v.Position > StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G19").Location && v.Position < StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G23").Location);
|
|
|
+ if(pickStation.Entity.CODE == "G23" && needToMove)
|
|
|
{
|
|
|
//找到当前所在站台的下一个取货点
|
|
|
var beforeStation = Device.Where(v => v.Is(DF.BOPPRGV取货设备组) && v.CODE != pickStation.Entity.CODE)
|
|
@@ -376,7 +376,6 @@ namespace WCS.Service.Works.RGV
|
|
|
//是否在一个放货站台
|
|
|
if (pickStation.Entity.Is(DF.BOPPRGV放货设备组))
|
|
|
{
|
|
|
- pickStation = obj.BeforeStation();
|
|
|
obj.Move(Device.Find("G19").Create<StationDeviceGroup>());
|
|
|
}
|
|
|
return;
|
|
@@ -386,7 +385,6 @@ namespace WCS.Service.Works.RGV
|
|
|
//找到距离这个RGV最近的一个取货点
|
|
|
//必须所有RGV都是空闲状态时才可以进行初始化
|
|
|
if (obj.RGVList.Any(v => v.Data2.SystemStatus != RGVRunStatus.空闲 || v.Data2.WorkMode != RGVMode.自动)) return;
|
|
|
- pickStation = obj.BeforeStation();
|
|
|
obj.Move(Device.Find("G19").Create<StationDeviceGroup>());
|
|
|
});
|
|
|
}
|