From 9bfee8930ce7c7999c8163f80eb883f8196c3986 Mon Sep 17 00:00:00 2001 From: zhougf Date: Tue, 30 Apr 2024 08:34:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E6=96=99=E5=87=BA=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=8B=E5=8F=91=E4=B9=8B=E5=89=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E6=AD=A4=E6=89=98=E7=9B=98=E7=9A=84?= =?UTF-8?q?=E7=9B=98=E6=96=99=E7=9B=92=E5=85=A5=E5=BA=93=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E4=B8=8D=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1=EF=BC=9B?= =?UTF-8?q?=20=E7=9B=98=E6=96=99=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E8=BF=98=E6=9C=89=E5=8F=A6=E4=B8=80=E4=B8=AA=E6=AD=A4?= =?UTF-8?q?=E6=89=98=E7=9B=98=E7=9A=84=E7=9B=98=E6=96=99=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=90=A6=E5=88=99=E4=B8=8D=E5=BB=BA?= =?UTF-8?q?=E7=AB=8B=E7=9B=98=E6=96=99=E7=9B=92=E5=85=A5=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20=E7=9B=98=E6=96=99=E7=9B=92=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E5=B7=B2=E5=87=BA=E5=BA=93=E4=BD=86?= =?UTF-8?q?=E6=9C=AA=E6=8D=A1=E8=B4=A7=E7=9A=84=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 11 ++++++++++- HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) 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.盘料出库;