From faa3f5a9d3eafafdaf9cd16cb87af40678386987 Mon Sep 17 00:00:00 2001 From: zgf Date: Thu, 1 Feb 2024 13:43:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E6=96=99=20=E6=95=A3=E6=96=99?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=89=AB=E5=AE=8C=E7=A0=81=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=20=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=A3=E6=96=99=E6=89=AB=E5=AE=8C?= =?UTF-8?q?=E7=AB=99=E5=8F=B0=E7=A0=81=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=B7=B2=E7=BB=91=E5=AE=9A=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ReceiptDetailController.cs | 21 ++++++++++--- .../Controllers/ReceiptInController.cs | 4 ++- .../Controllers/ReceiptSLInController.cs | 5 +++- .../Receipt/Views/ReceiptIn/Index.cshtml | 7 ++++- .../Receipt/Views/ReceiptSLIn/Index.cshtml | 30 ++++++++++++++++--- HHWMS.Web/appsettings.json | 16 +++++----- 6 files changed, 64 insertions(+), 19 deletions(-) diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index 00ef48d..1cbc443 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -168,18 +168,31 @@ namespace HHWMS.Web.Controllers } } var uniqueGroup = detailList.GroupBy(x => x.UniqueCode); + if (uniqueGroup.Any(x => x.Count() > 1)) { - return FFResult().Alert("新增明细中,存在重复的唯一码!"); + var codeList = uniqueGroup.Where(x => x.Count() > 1) + .Select(x => x.Key) + .ToList(); + return FFResult().Alert($"新增明细中,存在重复的唯一码!{String.Join(", ", codeList.ToArray())}"); } // 判断唯一码是否已在库内 var reDetailList = _unitwork.Find(x => x.Status == ReceiptStatusEnum.新建) - .Select(x => x.UniqueCode) + .Select(x => new { x.UniqueCode, x.ReceiptHeader.Code }) .ToList(); - if (reDetailList.Intersect(detailList.Select(x => x.UniqueCode)).Count() > 0) + var reDel = reDetailList.Select(x => x.UniqueCode) + .Intersect(detailList.Select(x => x.UniqueCode)); + if (reDel.Count() > 0) { - return FFResult().Alert("新增明细中,存在已添加的唯一码!"); + var tt= reDetailList.Where(x => reDel.Contains(x.UniqueCode)) + .ToList(); + var returnStr = ""; + foreach (var item in tt) + { + returnStr += $"单号:{item.Code};唯一码:{item.UniqueCode};"; + } + return FFResult().Alert($"新增明细中,存在已添加的唯一码!{returnStr}"); } // 判断唯一码是否已在库内 diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index 79501d1..c42b008 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -145,7 +145,9 @@ namespace HHWMS.Web.Controllers { // 更新入库单明细状态 var header = receiptHeaderList.First(x => x.Code.Equals(item.ReceiptCode)); - var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode)); + var receipt = header.ReceiptDetails.First(x => + x.UniqueCode.Equals(item.UniqueCode) + && x.Status < ReceiptStatusEnum.收完); //var receipt = _unitWork.FindSingle(x => x.UniqueCode == item.UniqueCode); if (receipt != null) { diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs index a265951..ad46d22 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs @@ -112,7 +112,9 @@ public class ReceiptSLInController : BaseController { return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!"); } - return JsonMore(null); + var data = _unitWork.Find(x => x.LocationCode == boxCode + && x.TaskStatus == InventoryTaskStatus.任务中).ToList(); + return JsonMore(data); } else { @@ -187,6 +189,7 @@ public class ReceiptSLInController : BaseController Qty = item.BindQty, LocationCode = item.BoxCode, ContainerCode = station.ContainerCode, + ReceiptCode = item.ReceiptCode, Status = "0", TaskStatus = InventoryTaskStatus.任务中, Flag = item.Size, diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 3203378..490d2d1 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -40,7 +40,9 @@ - { + this.$refs.tableData.bodyWrapper.scrollTop = this.$refs.tableData.bodyWrapper.scrollHeight + }) }, // 删除已绑定行 deleteRow(index, rows) { diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml index d774ea0..a36c441 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptSLIn/Index.cshtml @@ -42,7 +42,9 @@ - +