|
|
@@ -208,13 +208,12 @@ namespace WCS.Service.Works
|
|
|
if (dev.Data.RES is 3035 or 3036) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "3035" or "3036");
|
|
|
else if (dev.Data.RES is 3041 or 3040) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "3041" or "3040");
|
|
|
else if (dev.Data.RES is 3047 or 3048) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "3047" or "3048");
|
|
|
- //else if (dev.Data.RES is 2108 or 2359) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2108" or "2114");
|
|
|
- else if (dev.Data.RES is 2114 or 2359 or 2108) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2114" or "2108");
|
|
|
+ else if (dev.Data.RES is 2108 or 2390) validPickupPoint = validPickupPoints.FirstOrDefault(v => v.Entity.CODE is "2390" or "2108");
|
|
|
//当前站点没有需要取货的
|
|
|
if (validPickupPoint == null) validPickupPoint = validPickupPoints.OrderBy(v => v.UpdateTime).FirstOrDefault() ?? throw new Exception("没有站台需要取货");
|
|
|
|
|
|
var next1 = dev.Entity.GetNext(validPickupPoint.Data.GOODSEND.ToString());
|
|
|
- if (validPickupPoint.Entity.CODE is "2108") //一工位取货点
|
|
|
+ if (validPickupPoint.Entity.CODE is "2108" or "2114") //一工位取货点
|
|
|
{
|
|
|
dev.Data2.TaskID_1 = validPickupPoint.Data.TASKNUM;//dev.Data.TaskID_1;
|
|
|
dev.Data2.TaskType_1 = Convert.ToInt16(DRGVTaskType.取货);
|
|
|
@@ -222,24 +221,24 @@ namespace WCS.Service.Works
|
|
|
dev.Data2.DestPosition_1 = Convert.ToInt16(validPickupPoint.Entity.CODE);
|
|
|
dev.Data2.Trigger_1 = 1;
|
|
|
}
|
|
|
- else if (validPickupPoint.Entity.CODE is "2114") //二工位取货点
|
|
|
+ else if (validPickupPoint.Entity.CODE is "2390") //二工位取货点
|
|
|
{
|
|
|
- if (dev.Data.RES is 2114)
|
|
|
- {
|
|
|
+ //if (dev.Data.RES is 2114)
|
|
|
+ //{
|
|
|
dev.Data2.TaskID_2 = validPickupPoint.Data.TASKNUM;
|
|
|
dev.Data2.TaskType_2 = Convert.ToInt16(DRGVTaskType.取货);
|
|
|
dev.Data2.StartPosition_2 = Convert.ToInt16(next1.CODE);
|
|
|
dev.Data2.DestPosition_2 = Convert.ToInt16(validPickupPoint.Entity.CODE);
|
|
|
dev.Data2.Trigger_2 = 1;
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- dev.Data2.TaskID_2 = 100;
|
|
|
- dev.Data2.TaskType_2 = 3;
|
|
|
- dev.Data2.StartPosition_2 = dev.Data.RES;
|
|
|
- dev.Data2.DestPosition_2 = Convert.ToInt16(validPickupPoint.Entity.CODE);
|
|
|
- dev.Data2.Trigger_2 = 1;
|
|
|
- }
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // dev.Data2.TaskID_2 = 100;
|
|
|
+ // dev.Data2.TaskType_2 = 3;
|
|
|
+ // dev.Data2.StartPosition_2 = dev.Data.RES;
|
|
|
+ // dev.Data2.DestPosition_2 = Convert.ToInt16(validPickupPoint.Entity.CODE);
|
|
|
+ // dev.Data2.Trigger_2 = 1;
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
#endregion 取货任务
|
