From 1365920fee5747066e7815739eecff992b66d50b Mon Sep 17 00:00:00 2001 From: zgf Date: Fri, 24 Nov 2023 15:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=8E=E7=BB=86=20?= =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=20=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=20=E6=95=A3?= =?UTF-8?q?=E6=96=99=E5=85=A5=E6=96=B0=E5=A2=9E=E6=9D=A1=E4=BB=B6=20?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Receipt/Controllers/ReceiptDetailController.cs | 14 +++++++++++++- .../Receipt/Controllers/ReceiptSLInController.cs | 12 ++++++++---- .../ReceiptDetailHistoryListVM.cs | 2 +- .../Areas/Receipt/Views/ReceiptHeader/Count.cshtml | 9 +++++---- .../Areas/Receipt/Views/ReceiptSLIn/Index.cshtml | 4 ++-- .../Shipment/Controllers/ShipOutController.cs | 7 ++++++- .../Areas/System/Controllers/jobs/InvBackJob.cs | 6 ++++-- .../Areas/System/Controllers/jobs/LoopTaskJob.cs | 12 ++++++------ .../Areas/System/Controllers/jobs/SendWcsJob.cs | 8 ++++---- .../System/ViewModels/SysJobVMs/SysJobListVM.cs | 2 +- HHWMS.Web/Areas/System/Views/SysJob/Edit.cshtml | 2 +- .../ViewModels/TaskHeaderVMs/TaskHeaderListVM.cs | 4 ++-- HHWMS.Web/MESToWMSService/WmsMesService.cs | 4 +++- HHWMS.Web/Models/Receipt/ReceiptDetailHistory.cs | 8 ++++++-- HHWMS.Web/Models/Shipment/ShipmentDetailHistory.cs | 4 ++++ 15 files changed, 66 insertions(+), 32 deletions(-) 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 @@