From 40a6810713af5e1cad01e708b1346bf918f5242c Mon Sep 17 00:00:00 2001 From: zhougf Date: Fri, 10 May 2024 13:22:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E6=96=99=E7=9B=92=E6=95=A3=E6=96=99?= =?UTF-8?q?=E7=9B=92=E5=85=A5=E5=BA=93=20=E6=9B=B4=E6=96=B0=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E8=AE=B0=E5=BD=95=20=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 36 ++++++++----------- .../Controllers/ReceiptInController.cs | 9 ++--- .../Areas/System/Controllers/jobs/TestJob.cs | 21 +++++++++-- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 0ab99f9..311ea1c 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -133,15 +133,6 @@ namespace HHWMS.Web tasktolocatioin.ContainerCode = task.ContainerCode; _unitwork.Update(tasktolocatioin); - _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode) - && string.IsNullOrEmpty(x.SourceCode), - x => new Inventory - { - LocationCode = tasktolocatioin.Code, - TaskStatus = InventoryTaskStatus.无任务, - UpdateTime = DateTime.Now, - UpdateBy = "wcs" - }); break; case TaskTypeEnum.散料盒出库: // 更新库位 @@ -194,16 +185,6 @@ namespace HHWMS.Web } _unitwork.Update(tasktolocatioin); - _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode) - && string.IsNullOrEmpty(x.SourceCode), - x => new Inventory - { - LocationCode = tasktolocatioin.Code, - TaskStatus = InventoryTaskStatus.无任务, - UpdateTime = DateTime.Now, - UpdateBy = "wcs" - }); - break; case TaskTypeEnum.盘料盒出库: // 更新库位 @@ -375,9 +356,10 @@ namespace HHWMS.Web if (task.TaskType == TaskTypeEnum.盘料盒入库 || task.TaskType == TaskTypeEnum.散料盒入库) { - var invList = _unitwork.Find(x => x.ContainerCode == task.ContainerCode - && x.TaskStatus == InventoryTaskStatus.任务中 - && string.IsNullOrEmpty(x.SourceCode)) + var invList = _unitwork.Find(x => x.ContainerCode.Equals(task.ContainerCode) + && x.TaskStatus.Equals(InventoryTaskStatus.任务中) + && string.IsNullOrEmpty(x.SourceCode) + ) .ToList(); var listInvtran = new List(); foreach (var inv in invList) @@ -403,6 +385,16 @@ namespace HHWMS.Web }); } _unitwork.BatchAdd(listInvtran.ToArray()); + + _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode) + && string.IsNullOrEmpty(x.SourceCode), + x => new Inventory + { + LocationCode = tasktolocatioin.Code, + TaskStatus = InventoryTaskStatus.无任务, + UpdateTime = DateTime.Now, + UpdateBy = "wcs" + }); } _unitwork.Update(task); if (task.Status == TaskStatusEnum.完成) diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index 5c4fb8a..c2d2919 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -137,13 +137,14 @@ namespace HHWMS.Web.Controllers return JsonMore(null, 500, $"尺寸{item.Key}的盘料盒无法满足入库需求,剩余数量{num}"); }*/ - var receiptHeaderList = _unitWork.Find(x => - data.Select(x => x.ReceiptCode).ToList().Contains(x.Code)) - .Include(x => x.ReceiptDetails).ToList(); + using (var tran = Wtm.DC.Database.BeginTransaction()) { try { + var receiptHeaderList = _unitWork.Find(x => + data.Select(x => x.ReceiptCode).ToList().Contains(x.Code)) + .Include(x => x.ReceiptDetails).ToList(); // 查找明细,修改对应状态,并且 绑定物料周转箱 foreach (Binding item in data) { @@ -157,6 +158,7 @@ namespace HHWMS.Web.Controllers { receipt.CompletedQty = receipt.Qty; receipt.Status = ReceiptStatusEnum.收完; + _unitWork.Update(receipt); if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完)) { header.FirstStatus = ReceiptStatusEnum.收完; @@ -168,7 +170,6 @@ namespace HHWMS.Web.Controllers throw new Exception($"入库单{item.ReceiptCode}不存在{item.UniqueCode}的明细!"); } - _unitWork.Update(receipt); // 新建库存 var inventory = new Inventory { diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs index 6ddd9b8..eb1e073 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/TestJob.cs @@ -25,6 +25,21 @@ namespace HHWMS.Web _unitwork.BatchDelete(x => x.FirstStatus == ReceiptStatusEnum.收完); } + var errorRec = _unitwork.Find(x => + x.FirstStatus < ReceiptStatusEnum.收完 + && x.CreateTime < DateTime.Now.AddDays(-1)) + .Include(u => + u.ReceiptDetails) + .ToList(); + foreach (var rec in errorRec.Where(x => + x.ReceiptDetails.Any() + && x.ReceiptDetails.All(y => y.Status == ReceiptStatusEnum.收完))) + { + rec.FirstStatus = ReceiptStatusEnum.收完; + _unitwork.Update(rec); + + } + if (_unitwork.IsExit(x => x.FirstStatus == ShipStatusEnum.拣货完成)) { _unitwork.BatchDelete(x => x.FirstStatus == ShipStatusEnum.拣货完成); @@ -40,10 +55,10 @@ namespace HHWMS.Web { if (ship.ShipmentDetails.All(x => x.Status != ShipStatusEnum.新建)) { - var invs = _unitwork.Find(x => + var invs = _unitwork.GetCount(x => ship.ShipmentDetails.Select(y => y.UniqueCode).ToList() - .Contains(x.UniqueCode)) - .Count(); + .Contains(x.UniqueCode) + && !string.IsNullOrEmpty(x.SourceCode)); if (invs == 0) { _unitwork.Delete(errorShip);