From 8e11aa092b60f615dc599c282571305cb47dc760 Mon Sep 17 00:00:00 2001 From: zgf Date: Thu, 30 Nov 2023 16:53:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=20=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E7=94=9F=E6=88=90=E4=B8=A4=E4=B8=AA=E6=96=99=E7=9B=92?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=88=B0=E4=B8=80=E4=B8=AA=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1=20=E6=96=B0=E5=BB=BA=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=20=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ShipmentDetailController.cs | 27 +++++++++++++++++++ .../Controllers/ShipmentHeaderController.cs | 3 +++ .../Views/ShipmentDetail/Create.cshtml | 7 ++--- .../Views/ShipmentHeader/Create.cshtml | 8 +++--- .../System/Controllers/jobs/SendWmsJob.cs | 7 +++++ HHWMS.Web/Resources/Program.zh.resx | 3 +++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs index 4fd5c83..d5f8cdd 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs @@ -66,6 +66,33 @@ namespace HHWMS.Web.Controllers } else { + if (string.IsNullOrEmpty(vm.Entity.UniqueCode)) + { + return FFResult().Alert($"唯一码不能为空!"); + } + var header = _unitwork.FindSingle(x => x.ID == vm.Entity.ShipmentHeaderId); + if (header != null && header.FirstStatus != ShipStatusEnum.新建) + { + return FFResult().Alert($"非新建状态的出库单,无法新建明细!"); + } + var inv = _unitwork.FindSingle(x => x.UniqueCode == vm.Entity.UniqueCode + && x.TaskStatus != InventoryTaskStatus.任务中); + if(inv == null) + { + return FFResult().Alert($"{vm.Entity.UniqueCode}不存在或已有任务,检查后重新添加!"); + } + if(_unitwork.IsExit(x => x.UniqueCode == vm.Entity.UniqueCode)) + { + return FFResult().Alert($"{vm.Entity.UniqueCode}已在出库单内,请勿重复添加!"); + } + vm.Entity.MaterialCode = inv.MaterialCode; + vm.Entity.MaterialName = inv.MaterialName; + vm.Entity.MaterialSpec = inv.MaterialSpec; + vm.Entity.MaterialUnit = inv.MaterialUnit; + vm.Entity.MaterialType = inv.MaterialType; + vm.Entity.Batch = inv.Batch; + vm.Entity.Qty = inv.Qty; + vm.Entity.Status = ShipStatusEnum.新建; vm.DoAdd(); if (!ModelState.IsValid) { diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs index 9eaa861..c6ef520 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs @@ -54,6 +54,7 @@ namespace HHWMS.Web.Controllers public ActionResult Create() { var vm = Wtm.CreateVM(); + vm.Entity.Code = _unitwork.GetSerialNumber("SO"); return PartialView(vm); } @@ -67,6 +68,8 @@ namespace HHWMS.Web.Controllers } else { + vm.Entity.FirstStatus = ShipStatusEnum.新建; + vm.Entity.BillType = "sout"; vm.DoAdd(); if (!ModelState.IsValid) { diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml index 66a0003..bf6535d 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Create.cshtml @@ -1,10 +1,11 @@ -@model HHWMS.Web.ShipmentDetailVM +@model HHWMS.Web.ShipmentDetailVM @inject IStringLocalizer Localizer; - + +@* @@ -20,7 +21,7 @@ - + *@ diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Create.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Create.cshtml index 866cba8..48ff043 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Create.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/Create.cshtml @@ -1,17 +1,17 @@ -@model HHWMS.Web.ShipmentHeaderVM +@model HHWMS.Web.ShipmentHeaderVM @inject IStringLocalizer Localizer; - - + @* + - + *@ diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs index 73073ec..d359bd7 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs @@ -185,8 +185,15 @@ namespace HHWMS.Web gLoc = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) && x.Row == location.Row && x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault(); + if (gLoc != null) { + // 工位为空,先判断是否有去此工位的任务 + var gTask = _unitwork.FindSingle(x => x.ToLocation.Equals(gLoc.Code)); + if (gTask != null) + { + continue; + } var pTask = new TaskHeader { ZoneCode = ZoneCodeEnum.盘料库, diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index 219b769..aeb4486 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1382,5 +1382,8 @@ 回传 + Ship.ShipmentCode + + 出库单号