diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 984bce7..0ab99f9 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -194,7 +194,8 @@ namespace HHWMS.Web } _unitwork.Update(tasktolocatioin); - _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode), + _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode) + && string.IsNullOrEmpty(x.SourceCode), x => new Inventory { LocationCode = tasktolocatioin.Code, @@ -338,6 +339,14 @@ namespace HHWMS.Web if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成)) { task.Status = TaskStatusEnum.完成; + // 查找此托盘是否存在任务 如果有两个盘料出库的任务,不新建回库任务 + var sameContainerCount = _unitwork.Find(x => + x.TaskType.Equals(TaskTypeEnum.盘料出库) + && x.ContainerCode.Equals(task.ContainerCode)).Count(); + if (sameContainerCount > 1) + { + break; + } // 查找回库的任务起点, var fromLocation = _unitwork.FindSingle(x => x.Code.Equals(task.FromLocation)).ContiguousCode; // 下发盘料盒回库任务,回原位 diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs index bedded4..8f59f43 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs @@ -294,6 +294,14 @@ namespace HHWMS.Web } else { + // 新建盘料出库之前,判断此托盘是否存在此料盒的入库任务,如果有,不再新建盘料出库任务 + var isExit = _unitwork.Find(x => + x.TaskType == TaskTypeEnum.盘料盒入库 + && x.ContainerCode.Equals(task.ContainerCode)).Any(); + if (isExit) + { + continue; + } task.ZoneCode = ZoneCodeEnum.盘料库; task.TaskNo = _unitwork.GetSerialNumber("pout", 4); task.TaskType = TaskTypeEnum.盘料出库;