|
|
|
|
@ -148,8 +148,10 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
{
|
|
|
|
|
if (wcsTask.endPointId == 36)//目的地是小包入口
|
|
|
|
|
{
|
|
|
|
|
bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == inEquip.objid).Any();
|
|
|
|
|
if (agvPutValue != null && Convert.ToInt32(agvPutValue) == 1 && !hasTask && Convert.ToInt32(PalletInIsHas2F) == 0 && Convert.ToInt32(ConnectStatus2F) == 1)//小包入口要料
|
|
|
|
|
bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == inEquip.objid && t.objid!=wcsTask.objid).Any();
|
|
|
|
|
|
|
|
|
|
if (agvPutValue != null && Convert.ToInt32(agvPutValue) == 1 && !hasTask && Convert.ToInt32(PalletInIsHas2F) == 0 && Convert.ToInt32(ConnectStatus2F) == 1)//小包入口要料
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
dbContext.Remove(wcsTask);
|
|
|
|
|
WcsTask newTask = CoreMapper.Map<WcsTask>(wcsTask);
|
|
|
|
|
@ -193,6 +195,7 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
newTask.endPointNo = endEquip.equipNo;
|
|
|
|
|
newTask.taskType = StaticTaskType.SecondLiftToTransit;//到周转位
|
|
|
|
|
newTask.useFlag = 1;
|
|
|
|
|
newTask.qty = 10;
|
|
|
|
|
dbContext.Add(newTask);
|
|
|
|
|
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(newTask);
|
|
|
|
|
dbContext.Add(wcsTaskLog);
|
|
|
|
|
|