From 54b51891a0328447498995c7d498490ac6d9387d Mon Sep 17 00:00:00 2001 From: zgf Date: Tue, 28 Nov 2023 16:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=86=E6=9E=90=20?= =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD=E6=95=B0=E9=87=8F=20=E8=B4=A7?= =?UTF-8?q?=E6=9E=B6=E5=87=BA=E5=85=A5=E5=BA=93=E5=8A=A0=E4=B8=8A=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=20=E5=88=86=E8=A7=A3=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E5=88=A4=E6=96=AD=E6=95=B0=E9=87=8F=20?= =?UTF-8?q?=E5=88=86=E6=8B=A3=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventoryVMs/InventoryListVM.cs | 2 +- .../Controllers/ReceiptInController.cs | 2 +- .../Controllers/ReceiptShelfInController.cs | 8 +-- .../Receipt/Views/ReceiptShelfIn/Index.cshtml | 22 ++++++- .../Shipment/Controllers/ShipOutController.cs | 39 ++++++++++- .../Controllers/ShipmentHeaderController.cs | 65 ++++++++++--------- .../Views/ShipmentHeader/ShelfInv.cshtml | 16 +++-- .../System/Controllers/jobs/SendWmsJob.cs | 14 +--- HHWMS.Web/Resources/Program.zh.resx | 3 + HHWMS.Web/appsettings.json | 14 ++-- 10 files changed, 117 insertions(+), 68 deletions(-) diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index 5783ea6..226060f 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -136,7 +136,7 @@ namespace HHWMS.Web MaterialSpec = x.MaterialSpec, MaterialUnit = x.MaterialUnit, Batch = x.Batch, - //Lot = x.Lot, + Lot = x.Lot, //ManufactureDate = x.ManufactureDate, //ExpirationDate = x.ExpirationDate, //CompanyCode = x.CompanyCode, diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index c17da6d..79501d1 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -33,7 +33,7 @@ namespace HHWMS.Web.Controllers [HttpPost] public ActionResult SelectReceiptCode() { - var data = _unitWork.Find(x => x.FirstStatus <= ReceiptStatusEnum.收完) + var data = _unitWork.Find(x => x.FirstStatus < ReceiptStatusEnum.收完) .Select(x => new { label = x.Code, value = x.Code }); return JsonMore(data); } diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs index 2ebdd72..090d5d2 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs @@ -73,11 +73,6 @@ public class ReceiptShelfInController : BaseController var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode)); var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode)); if (receipt != null) - { - if (receipt.Status == ReceiptStatusEnum.收完) continue; - receipt.CompletedQty += item.BindQty; - } - if(receipt.CompletedQty == receipt.Qty) { receipt.Status = ReceiptStatusEnum.收完; if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完)) @@ -91,6 +86,7 @@ public class ReceiptShelfInController : BaseController invList.Add(new Inventory { ZoneCode = ZoneCodeEnum.货架库, + LocationCode = item.BoxCode, UniqueCode = item.UniqueCode, MaterialCode = receipt.MaterialCode, MaterialType = receipt.MaterialType, @@ -99,7 +95,7 @@ public class ReceiptShelfInController : BaseController Batch = receipt.Batch, MaterialUnit = receipt.MaterialUnit, SupplierCode = receipt.SupplierCode, - Qty = item.BindQty, + Qty = receipt.Qty, Status = "0", TaskStatus = InventoryTaskStatus.无任务, CreateBy = Wtm.LoginUserInfo.ITCode, diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptShelfIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptShelfIn/Index.cshtml index 7d4a299..389fcae 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptShelfIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptShelfIn/Index.cshtml @@ -1,7 +1,16 @@ - + - + + + + + + + + + + + + @@ -48,11 +62,12 @@