diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index 1c80e4e..fd74eee 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -167,10 +167,22 @@ namespace HHWMS.Web.Controllers { return FFResult().Alert("新增明细中,存在重复的唯一码!"); } + // 判断唯一码是否已在库内 + var invList = _unitwork.Find(x => 1 == 1) + .Select(x => x.UniqueCode) + .ToList(); + if(invList.Intersect(detailList.Select(x => x.UniqueCode)).Count() > 0) + { + return FFResult().Alert("新增明细中,存在已在库内的唯一码!"); + } // 补充物料明细 - foreach(var item in detailList) + foreach (var item in detailList) { var materialqr = _unitwork.FindSingle(x => x.UniqueCode.Equals(item.UniqueCode)); + if(materialqr == null) + { + return FFResult().Alert("新增明细中,存在不是WMS生成的唯一码!"); + } var material = _unitwork.FindSingle(x => x.QRCode.Equals(materialqr.QRCode)); item.MaterialCode = material.MaterialCode; item.MaterialName = material.MaterialName; diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs index 1190176..8b9056a 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs @@ -46,8 +46,10 @@ public class ReceiptSLInController : BaseController && x.Status != LocationStatus.任务锁 && x.Status != LocationStatus.满货 && x.Status != LocationStatus.空仓位 + && x.IsStop == false && x.Row == stations.First().Row) - .OrderBy(x => x.Layer) + .OrderBy(x => x.Status) + .ThenBy(x => x.Layer) .ThenByDescending(x => x.Line) .FirstOrDefault(); if (box == null && stations.Count == 2) @@ -55,8 +57,10 @@ public class ReceiptSLInController : BaseController && x.Status != LocationStatus.任务锁 && x.Status != LocationStatus.满货 && x.Status != LocationStatus.空仓位 + && x.IsStop == false && x.Row == stations.Last().Row) - .OrderBy(x => x.Layer) + .OrderBy(x => x.Status) + .ThenBy(x => x.Layer) .ThenByDescending(x => x.Line) .FirstOrDefault(); @@ -104,9 +108,9 @@ public class ReceiptSLInController : BaseController if (box != null) { - if (box.Type != LocationTypeEnum.散料库站台) + if (string.IsNullOrEmpty(box.ContainerCode)) { - return JsonMore(null, 500, $"{boxCode}不在站台,无法入库!"); + return JsonMore(null, 500, $"{boxCode}站台没有料箱,无法入库!"); } return JsonMore(null); } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs index 4e0b011..dfac10c 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailHistoryVMs/ReceiptDetailHistoryListVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml index b6442e4..dabe794 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Count.cshtml @@ -41,7 +41,7 @@