|
@@ -59,6 +59,7 @@ namespace WCS.WorkEngineering.Systems
|
|
|
|
|
|
var isPut = false;
|
|
|
var nextAdd = GetNext(obj);
|
|
|
+ if (nextAdd == 9999) return;
|
|
|
int taskId = 0;
|
|
|
SqlSugarHelper.Do(_db =>
|
|
|
{
|
|
@@ -83,9 +84,26 @@ namespace WCS.WorkEngineering.Systems
|
|
|
}
|
|
|
else if (taskInfo == null)
|
|
|
{
|
|
|
- World.Log($"未找到对应的WCS任务{obj.Data2.TaskNumber}",LogLevelEnum.Mid);
|
|
|
+ World.Log($"未找到对应的WCS任务{obj.Data2.TaskNumber}", LogLevelEnum.Mid);
|
|
|
return;
|
|
|
}
|
|
|
+ else if (taskInfo.addTime < DateTime.Now.AddHours(-12) && obj.Data2.TaskNumber == taskInfo.ID)
|
|
|
+ {
|
|
|
+ var goodsType = obj.Data4.Length.ToInt();
|
|
|
+ var type = goodsType.ToString();
|
|
|
+ //找到一条起点是当前位置且状态小于2的任务
|
|
|
+ taskInfo = db.Queryable<WCS_TaskInfo>().OrderBy(x => x.AddTime).First(x => x.AddrFrom == obj.Entity.Code && x.BarCode.Contains("Error") && x.AddrNext == null && x.GoodsType == goodsType);
|
|
|
+ if (taskInfo == null)
|
|
|
+ {
|
|
|
+ WmsApi.PalletizingCreateseErrorTasks(obj.Entity.Code, type);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (taskInfo.Status == TaskStatus.NewBuild)
|
|
|
+ {
|
|
|
+ World.Log($"等待任务{taskInfo.ID}完成初始化");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (!taskInfo.BarCode.Contains("Error"))
|
|
|
{
|