From 3da4bddb980cc398aeb6a978f444fbab7c43e06b Mon Sep 17 00:00:00 2001 From: zhougf Date: Tue, 28 Apr 2026 22:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=92=8C=E6=9C=AA=E5=9B=9E=E4=BC=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IDataController.cs | 2 +- HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/HHWMS.Web/Areas/Api/IDataController.cs b/HHWMS.Web/Areas/Api/IDataController.cs index bea234a..bfc3d83 100644 --- a/HHWMS.Web/Areas/Api/IDataController.cs +++ b/HHWMS.Web/Areas/Api/IDataController.cs @@ -248,7 +248,7 @@ namespace HHWMS.Web public IActionResult FindUnUpload(string warehousecode) { var data = _unitWork.Find(x => - x.ZoneId == (warehousecode == "xb" ? 1027 : 1025) + x.ZoneId == (warehousecode == "xb" ? 1027 : 1028) && x.UploadErpFlag != 1) .Select(x => new InventoryApi_View { diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs index 5ab2d01..ae08efb 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/FinishInJob.cs @@ -23,6 +23,8 @@ namespace HHWMS.Web var inv = _unitwork.Find(x => x.UploadErpFlag != 1 && x.TaskStatus != InventoryTaskStatusEnum.Locked + && x.ZoneId != 1025 + && x.UploadErpFlag != null // && !string.IsNullOrEmpty(x.ReceiptDetailId) ) .OrderByDescending(x => x.UploadErpFlag)