From d1566502648acf462aab378ea27322ccdf5b2e8a Mon Sep 17 00:00:00 2001 From: zhougf Date: Sat, 18 Apr 2026 21:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E5=92=8C=E7=BA=BF?= =?UTF-8?q?=E8=BE=B9=E5=BA=93=E5=AD=98=E7=9A=84=E7=94=9F=E4=BA=A7=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Areas/Inventory/Controllers/InventoryController.cs | 4 +++- .../ViewModels/InventoryVMs/InventoryApiListVM.cs | 7 +++++++ .../ViewModels/InventoryVMs/InventoryApiSearcher.cs | 1 + HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml | 2 +- HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs | 2 +- HHWMS.Web/Properties/launchSettings.json | 2 +- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs b/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs index 66e6eda..803964e 100644 --- a/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs +++ b/HHWMS.Web/Areas/Inventory/Controllers/InventoryController.cs @@ -572,7 +572,9 @@ namespace HHWMS.Web.Controllers StepCode = inv.BatchCode, // 工序(批次编码) WorkerCode = inv.CreateBy, // 工人编码(创建人) Maker = _unitWork.FindSingle(x => - x.ITCode == inv.CreateBy).Name // 制单人(校验员) + x.ITCode == inv.CreateBy).Name, // 制单人(校验员) + Type = inv.ZoneId == 1027 ? 1: 2, + WhCode = inv.ZoneId == 1027 ? "xb": "cp", }, Details = new List() }; diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs index 2b637b9..4cdc454 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiListVM.cs @@ -23,12 +23,14 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.MaterialName), this.MakeGridHeader(x => x.MaterialSpec), this.MakeGridHeader(x => x.BatchCode), + this.MakeGridHeader(x => x.NextBatch), this.MakeGridHeader(x => x.SuFigureNo), this.MakeGridHeader(x => x.Company), this.MakeGridHeader(x => x.Remark), this.MakeGridHeader(x => x.LocationCode), this.MakeGridHeader(x => x.SourceCode), this.MakeGridHeader(x => x.Qty), + this.MakeGridHeader(x => x.Createtime), this.MakeGridHeaderAction(width: 200) }; } @@ -42,6 +44,7 @@ namespace HHWMS.Web .CheckContain(Searcher.MaterialName, x=>x.MaterialName) .CheckContain(Searcher.MaterialSpec, x=>x.MaterialSpec) .CheckContain(Searcher.BatchCode, x=>x.BatchCode) + .CheckContain(Searcher.NextBatch, x=>x.Lot) .CheckContain(Searcher.SuFigureNo, x=>x.SupplierCode) .Select(x => new InventoryApi_View { @@ -57,6 +60,8 @@ namespace HHWMS.Web SuFigureNo = x.SupplierCode, LocationCode = x.LocationCode, Qty = x.Qty, + Createtime = x.CreateTime, + NextBatch = x.Lot }).OrderBy(x => x.MaterialCode); return query; } @@ -69,6 +74,7 @@ namespace HHWMS.Web public string MaterialName { get; set; } public string MaterialSpec { get; set; } public string BatchCode { get; set; } + public string NextBatch { get; set; } public string SuFigureNo { get; set; } public string Remark { get; set; } public string SourceCode { get; set; } @@ -76,5 +82,6 @@ namespace HHWMS.Web public string FigureNo { get; set; } public string LocationCode { get; set; } public decimal? Qty { get; set; } + public DateTime? Createtime { get; set; } } } diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs index 5a4f6c2..a758c3a 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryApiSearcher.cs @@ -27,6 +27,7 @@ namespace HHWMS.Web public String SuFigureNo { get; set; } public String WareHouse { get; set; } + public string NextBatch { get; set; } protected override void InitVM() { } diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml index 05699bf..7eb7e88 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptIn/Index.cshtml @@ -44,7 +44,7 @@ - {{ item.label }} + {{ item.value }} diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs index b0964ab..5fc83f8 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs @@ -22,7 +22,7 @@ namespace HHWMS.Web var inv = _unitwork.FindSingle(x => x.UploadErpFlag == 0 && x.TaskStatus != InventoryTaskStatusEnum.Locked - && !string.IsNullOrEmpty(x.SourceCode) + && !string.IsNullOrEmpty(x.ReceiptDetailId) ); var request = new FinishInRequest diff --git a/HHWMS.Web/Properties/launchSettings.json b/HHWMS.Web/Properties/launchSettings.json index 5b54f76..2d5d6f8 100644 --- a/HHWMS.Web/Properties/launchSettings.json +++ b/HHWMS.Web/Properties/launchSettings.json @@ -23,7 +23,7 @@ "ASPNETCORE_ENVIRONMENT": "Development", "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" }, - "applicationUrl": "http://0.0.0.0:5000/" + "applicationUrl": "http://0.0.0.0:5001/" } } }